Fix socket id to be correct again

(suspect socket.io updates moved it - or maybe we always picked the wrong one)

to close #738

Author: Dave Conway-Jones

CHANGELOG.md

@@ -1,4 +1,11 @@
 
+### 3.1.3: Maintenance Release
+
+**Fixes**
+
+ - Allow ui-dropdown to accept single string for one valid option.
+ - Fix socketid back to be in sync with reality. Issue #738
+
 ### 3.1.2: Maintenance Release
 
 **Fixes**

dist/dashboard.appcache

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Time: Fri Nov 19 2021 16:53:05 GMT+0000 (Greenwich Mean Time)
+# Time: Tue Nov 23 2021 17:13:30 GMT+0000 (Greenwich Mean Time)
 
 CACHE:
 i18n.js

nodes/ui_dropdown.js

@@ -59,7 +59,9 @@ module.exports = function(RED) {
 
                 emitOptions = {isOptionsValid:false, value:undefined, newOptions:undefined};
                 do {
-                    if (!msg.options || !Array.isArray(msg.options)) { break; }
+                    if (!msg.options) { break; }
+                    if (typeof msg.options === "string" ) { msg.options = [ msg.options ]; }
+                    if (!Array.isArray(msg.options)) { break; }
                     emitOptions.newOptions = [];
                     if (msg.options.length === 0) {
                         emitOptions.isOptionsValid = true;

package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-dashboard",
-    "version": "3.1.2",
+    "version": "3.1.3",
     "description": "A set of dashboard nodes for Node-RED",
     "keywords": [
         "node-red"

ui.js

@@ -392,8 +392,7 @@ function init(server, app, log, redSettings) {
     }
 
     io.on('connection', function(socket) {
-
-        ev.emit("newsocket", socket.client.id, socket.request.headers['x-real-ip'] || socket.request.headers['x-forwarded-for'] || socket.request.connection.remoteAddress);
+        ev.emit("newsocket", socket.id, socket.request.headers['x-real-ip'] || socket.request.headers['x-forwarded-for'] || socket.request.connection.remoteAddress);
         updateUi(socket);
 
         socket.on(updateValueEventName, ev.emit.bind(ev, updateValueEventName));
@@ -410,20 +409,20 @@ function init(server, app, log, redSettings) {
             var name = "";
             if ((index != null) && !isNaN(index) && (menu.length > 0) && (index < menu.length) && menu[index]) {
                 name = (menu[index].hasOwnProperty("header") && typeof menu[index].header !== 'undefined') ? menu[index].header : menu[index].name;
-                ev.emit("changetab", index, name, socket.client.id, socket.request.headers['x-real-ip'] || socket.request.headers['x-forwarded-for'] || socket.request.connection.remoteAddress, params);
+                ev.emit("changetab", index, name, socket.id, socket.request.headers['x-real-ip'] || socket.request.headers['x-forwarded-for'] || socket.request.connection.remoteAddress, params);
             }
         });
         socket.on('ui-collapse', function(d) {
-            ev.emit("collapse", d.group, d.state, socket.client.id, socket.request.headers['x-real-ip'] || socket.request.headers['x-forwarded-for'] || socket.request.connection.remoteAddress);
+            ev.emit("collapse", d.group, d.state, socket.id, socket.request.headers['x-real-ip'] || socket.request.headers['x-forwarded-for'] || socket.request.connection.remoteAddress);
         });
         socket.on('ui-refresh', function() {
             updateUi();
         });
         socket.on('disconnect', function() {
-            ev.emit("endsocket", socket.client.id, socket.request.headers['x-real-ip'] || socket.request.headers['x-forwarded-for'] || socket.request.connection.remoteAddress);
+            ev.emit("endsocket", socket.id, socket.request.headers['x-real-ip'] || socket.request.headers['x-forwarded-for'] || socket.request.connection.remoteAddress);
         });
         socket.on('ui-audio', function(audioStatus) {
-            ev.emit("audiostatus", audioStatus, socket.client.id, socket.request.headers['x-real-ip'] || socket.request.headers['x-forwarded-for'] || socket.request.connection.remoteAddress);
+            ev.emit("audiostatus", audioStatus, socket.id, socket.request.headers['x-real-ip'] || socket.request.headers['x-forwarded-for'] || socket.request.connection.remoteAddress);
         });
         socket.on('ui-params', function(p) {
             delete p.socketid;