From b38696596a5d0a9951fc02dce61a7b89fe6ffce5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= <sedivy.miro@gmail.com>
Date: Sat, 7 Nov 2020 13:26:07 +0100
Subject: [PATCH] add websocket and webrtc to state.

---
 src/app.vue               |  6 ++++++
 src/components/canvas.vue | 29 ++++++++++++++++++-----------
 src/types/state.ts        |  2 ++
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/app.vue b/src/app.vue
index fbc8e904..af3f292b 100644
--- a/src/app.vue
+++ b/src/app.vue
@@ -50,5 +50,11 @@
       this.container.style.width = this.width
       this.container.style.height = this.height
     }
+
+    mounted() {
+      this.neko.events.on('connected', () => {
+        console.log('connected...')
+      })
+    }
   }
 </script>
diff --git a/src/components/canvas.vue b/src/components/canvas.vue
index 6c94edcf..f14e4ec0 100644
--- a/src/components/canvas.vue
+++ b/src/components/canvas.vue
@@ -1,9 +1,8 @@
 <template>
   <div ref="component" class="component">
-    <div ref="container" class="player-container">
+    <div ref="container" class="player-container" v-show="state.websocket == 'connected' && state.webrtc == 'connected'">
       <video ref="video" />
       <neko-overlay
-        v-if="websocket_state == 'connected' && webrtc_state == 'connected'"
         :webrtc="webrtc"
         :screenWidth="state.screen_size.width"
         :screenHeight="state.screen_size.height"
@@ -43,6 +42,7 @@
 <script lang="ts">
   import { Vue, Component, Ref, Watch, Prop } from 'vue-property-decorator'
   import ResizeObserver from 'resize-observer-polyfill'
+  import EventEmitter from 'eventemitter3'
 
   import { NekoWebSocket } from '~/internal/websocket'
   import { NekoWebRTC } from '~/internal/webrtc'
@@ -51,6 +51,12 @@
   import NekoState from '~/types/state'
   import Overlay from './overlay.vue'
 
+  export interface NekoEvents {
+    connecting: () => void
+    connected: () => void
+    disconnected: (error?: Error) => void
+  }
+
   @Component({
     name: 'neko-canvas',
     components: {
@@ -66,6 +72,7 @@
     private websocket = new NekoWebSocket()
     private webrtc = new NekoWebRTC()
     private messages = new NekoMessages()
+    public readonly events = new EventEmitter<NekoEvents>()
 
     private state = {
       id: null,
@@ -76,11 +83,10 @@
         rate: 30,
       },
       is_controlling: false,
+      websocket: 'disconnected',
+      webrtc: 'disconnected',
     } as NekoState
 
-    private websocket_state = 'disconnected'
-    private webrtc_state = 'disconnected'
-
     public control = {
       request: () => {
         this.websocket.send('control/request')
@@ -146,13 +152,13 @@
         }
       })
       this.websocket.on('connecting', () => {
-        this.websocket_state = 'connecting'
+        Vue.set(this.state, 'websocket', 'connecting')
       })
       this.websocket.on('connected', () => {
-        this.websocket_state = 'connected'
+        Vue.set(this.state, 'websocket', 'connected')
       })
       this.websocket.on('disconnected', () => {
-        this.websocket_state = 'disconnected'
+        Vue.set(this.state, 'websocket', 'disconnected')
         this.webrtc.disconnect()
       })
 
@@ -174,13 +180,14 @@
         this.video.play()
       })
       this.webrtc.on('connecting', () => {
-        this.webrtc_state = 'connecting'
+        Vue.set(this.state, 'webrtc', 'connecting')
       })
       this.webrtc.on('connected', () => {
-        this.webrtc_state = 'connected'
+        Vue.set(this.state, 'webrtc', 'connected')
+        this.events.emit('connected')
       })
       this.webrtc.on('disconnected', () => {
-        this.webrtc_state = 'disconnected'
+        Vue.set(this.state, 'webrtc', 'disconnected')
       })
     }
 
diff --git a/src/types/state.ts b/src/types/state.ts
index ffc6843e..a0486b35 100644
--- a/src/types/state.ts
+++ b/src/types/state.ts
@@ -8,4 +8,6 @@ export default interface State {
   id: string | null
   display_name: string | null
   screen_size: ScreenSize
+  websocket: 'connected' | 'connecting' | 'disconnected'
+  webrtc: 'connected' | 'connecting' | 'disconnected'
 }