From 214d3e04f4effcf85f05ec91b80b1ec1d44bfed2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= <sedivy.miro@gmail.com>
Date: Sun, 8 Nov 2020 22:44:37 +0100
Subject: [PATCH] connection state.

---
 src/app.vue               |  6 ++---
 src/components/canvas.vue | 46 +++++++++++++++++----------------------
 2 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/src/app.vue b/src/app.vue
index 6f5acd71..1c1c1b95 100644
--- a/src/app.vue
+++ b/src/app.vue
@@ -11,15 +11,15 @@
           <th>connection.webrtc</th>
           <td>{{ neko.state.connection.webrtc }}</td>
         </tr>
-        <tr>
+        <tr class="ok">
           <th>connection.type</th>
           <td>{{ neko.state.connection.type }}</td>
         </tr>
-        <tr>
+        <tr class="ok">
           <th>connection.can_watch</th>
           <td>{{ neko.state.connection.can_watch }}</td>
         </tr>
-        <tr>
+        <tr class="ok">
           <th>connection.can_control</th>
           <td>{{ neko.state.connection.can_control }}</td>
         </tr>
diff --git a/src/components/canvas.vue b/src/components/canvas.vue
index eb0664de..15a7aa0c 100644
--- a/src/components/canvas.vue
+++ b/src/components/canvas.vue
@@ -1,10 +1,6 @@
 <template>
   <div ref="component" class="component">
-    <div
-      ref="container"
-      class="player-container"
-      v-show="state.connection.websocket == 'connected' && state.connection.webrtc == 'connected'"
-    >
+    <div ref="container" class="player-container">
       <video ref="video" />
       <neko-overlay
         :webrtc="webrtc"
@@ -175,17 +171,8 @@
       },
     }
 
-    public scroll = {
-      sensitivity: (sensitivity: number) => {
-        Vue.set(this.state.control.scroll, 'sensitivity', sensitivity)
-      },
-      inverse: (inverse: boolean) => {
-        Vue.set(this.state.control.scroll, 'inverse', inverse)
-      },
-    }
-
     public connect(url: string, password: string, name: string) {
-      if (this.websocket.connected) {
+      if (this.connected) {
         throw new Error('client already connected')
       }
 
@@ -194,30 +181,39 @@
     }
 
     public disconnect() {
-      if (!this.websocket.connected) {
+      if (!this.connected) {
         throw new Error('client not connected')
       }
 
       this.websocket.disconnect()
+
+      // TODO: reset state
+      Vue.set(this.state.member, 'is_controlling', false)
     }
 
     private mounted() {
-      // Update canvas on resize
+      // update canvas on resize
       this.observer.observe(this._component)
 
+      // change host
       this.events.on('control.host', (id: string | null) => {
         Vue.set(this.state.member, 'is_controlling', id != null && id === this.state.member.id)
       })
 
+      // hardcoded webrtc for now
+      Vue.set(this.state.connection, 'type', 'webrtc')
+      Vue.set(this.state.connection, 'can_watch', this.webrtc.supported)
+      Vue.set(this.state.connection, 'can_control', this.webrtc.supported)
+
       this._component.addEventListener('fullscreenchange', () => {
         Vue.set(this.state.screen, 'fullscreen', document.fullscreenElement !== null)
         this.onResize()
       })
 
-      // Video
+      // video
       VideoRegister(this.video, this.state.video)
 
-      // WebSocket
+      // websocket
       this.websocket.on('message', async (event: string, payload: any) => {
         switch (event) {
           case 'signal/provide':
@@ -244,12 +240,12 @@
         this.webrtc.disconnect()
       })
 
-      // WebRTC
+      // webrtc
       this.webrtc.on('track', (event: RTCTrackEvent) => {
         const { track, streams } = event
         if (track.kind === 'audio') return
 
-        // Create stream
+        // create stream
         if ('srcObject' in this.video) {
           this.video.srcObject = streams[0]
         } else {
@@ -282,15 +278,13 @@
     }
 
     private onResize() {
-      console.log('Resize event triggered.')
-
       const { width, height } = this.state.screen.size
       const screen_ratio = width / height
 
       const { offsetWidth, offsetHeight } = this._component
       const canvas_ratio = offsetWidth / offsetHeight
 
-      // Vertical centering
+      // vertical centering
       if (screen_ratio > canvas_ratio) {
         const vertical = offsetWidth / screen_ratio
         this._container.style.width = `${offsetWidth}px`
@@ -298,7 +292,7 @@
         this._container.style.marginTop = `${(offsetHeight - vertical) / 2}px`
         this._container.style.marginLeft = `0px`
       }
-      // Horizontal centering
+      // horizontal centering
       else if (screen_ratio < canvas_ratio) {
         const horizontal = screen_ratio * offsetHeight
         this._container.style.width = `${horizontal}px`
@@ -306,7 +300,7 @@
         this._container.style.marginTop = `0px`
         this._container.style.marginLeft = `${(offsetWidth - horizontal) / 2}px`
       }
-      // No centering
+      // no centering
       else {
         this._container.style.width = `${offsetWidth}px`
         this._container.style.height = `${offsetHeight}px`