Fix bug preventing manual snes reconnect. Update WebUI to automatically connect if only one SNES device is detected.

MultiClient.py

@@ -1209,7 +1209,7 @@ async def websocket_server(websocket: websockets.WebSocketServerProtocol, path,
         async for incoming_data in websocket:
             try:
                 data = json.loads(incoming_data)
-                logging.debug(f"WebUIData:{data}")
+                logging.info(f"WebUIData:{data}")
                 if ('type' not in data) or ('content' not in data):
                     raise Exception('Invalid data received in websocket')
 
@@ -1229,11 +1229,10 @@ async def websocket_server(websocket: websockets.WebSocketServerProtocol, path,
                             ctx.ui_node.manual_snes = None
                             ctx.snes_reconnect_address = None
                             await snes_disconnect(ctx)
-                            return
+                        else:
-
+                            await snes_disconnect(ctx)
-                        await snes_disconnect(ctx)
+                            ctx.ui_node.manual_snes = data['content']['deviceId']
-                        ctx.ui_node.manual_snes = data['content']['deviceId']
+                            await snes_connect(ctx, ctx.snes_address)
-                        await snes_connect(ctx, ctx.snes_address)
 
                 elif data['type'] == 'webControl':
                     if 'disconnect' in data['content']:

data/web/package-lock.json

@@ -5044,14 +5044,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5066,20 +5064,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5196,8 +5191,7 @@
         "inherits": {
           "version": "2.0.4",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5209,7 +5203,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5224,7 +5217,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5232,14 +5224,12 @@
         "minimist": {
           "version": "1.2.5",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "minipass": {
           "version": "2.9.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5258,7 +5248,6 @@
           "version": "0.5.3",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "^1.2.5"
           }
@@ -5320,8 +5309,7 @@
         "npm-normalize-package-bin": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "npm-packlist": {
           "version": "1.4.8",
@@ -5349,8 +5337,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5362,7 +5349,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5476,7 +5462,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",

data/web/src/js/Monitor/containers/MonitorControls.js

@@ -41,20 +41,24 @@ class MonitorControls extends Component {
       if (this.props.webSocket) {
       // Poll for available devices
         this.pollSnesDevices();
-
-        setTimeout(() => {
-          if (this.props.availableDevices.length === 1) {
-            this.setState({ deviceId: this.props.availableDevices[0] }, () => {
-              if (!this.props.snesConnected) {
-                this.connectToSnes();
-              }
-            });
-          }
-        }, 500);
       }
     }, 500);
   }
 
+  componentDidUpdate(prevProps) {
+    if (
+      prevProps.availableDevices.length !== this.props.availableDevices.length &&
+      this.props.availableDevices.length === 1
+    ) {
+      // eslint-disable-next-line react/no-did-update-set-state
+      this.setState({ deviceId: this.props.availableDevices[0] }, () => {
+        if (!this.props.snesConnected) {
+          this.connectToSnes();
+        }
+      });
+    }
+  }
+
   increaseTextSize = () => {
     if (this.props.fontSize >= 25) return;
     this.props.updateFontSize(this.props.fontSize + 1);