wip

Author: pgivel

src/DeviceRenderer.js

@@ -244,9 +244,16 @@ module.exports = class DeviceRenderer {
         // closure to expose the right video and store context to onclose event
         const video = this.video;
         const store = this.store;
+        const keyboardPlugin = this.keyboardEvents;
+        const mousePlugin = this.mouseEvents;
+        const keymappingPlugin = this.keyboardMapping;
 
         this.webRTCWebsocket.onclose = (event) => {
             store.dispatch({type: 'WEBRTC_CONNECTION_READY', payload: false});
+            // remove callbacks for clean deletion, but do not update the store
+            keyboardPlugin?.removeKeyboardCallbacks();
+            mousePlugin?.removeMouseCallbacks();
+            keymappingPlugin?.removeKeyboardCallbacks();
             video.style.background = this.videoBackupStyleBackground;
             this.initialized = false;
             log.debug('Error! Maybe your VM is not available yet? (' + event.code + ') ' + event.reason);
@@ -478,6 +485,17 @@ module.exports = class DeviceRenderer {
                 this.gamepadManager.addGamepadCallbacks();
             }
 
+            // in case this is a re-start, we want to add the callbacks again depending on the state
+            if (this.store.get('KEYBOARD_EVENTS_ENABLED')) {
+                this.keyboardEvents.addKeyboardCallbacks();
+            }
+            if (this.store.get('MOUSE_EVENTS_ENABLED')) {
+                this.mouseEvents.addMouseCallbacks();
+            }
+            if (!this.store.get('KEYBOARD_EVENTS_ENABLED') && !this.store.get('MOUSE_EVENTS_ENABLED')) {
+                this.keyboardMapping.addKeyboardCallbacks();
+            }
+
             const playWithSound = this.video.play(); // needed on Safari (web & iOs)
             if (!playWithSound) {
                 return;