@iobroker/socket-classes 1.4.4 → 1.4.6

package/README.md

@@ -978,6 +978,9 @@ Read all instances of the given adapter, or all instances of all adapters if ada
 -->
 
 ## Changelog
+### 1.4.6 (2023-10-19)
+* (bluefox) Added `publishInstanceMessageAll` command
+
 ### 1.4.4 (2023-10-11)
 * (bluefox) Caught errors by subscribe/unsubscribe
 

package/lib/socketAdmin.js

@@ -140,27 +140,24 @@ class SocketAdmin extends SocketCommon {
     stateChange(id, state) {
         this.commands.stateChange(id, state);
 
-        if (this.server && this.server.sockets) {
-            const sockets = this.server.sockets.sockets || this.server.sockets.connected;
-
+        const sockets = this.getSocketsList();
+        if (sockets) {
             sockets.forEach(socket =>
                 this.commands.publish(socket, 'stateChange', id, state));
         }
     }
 
     fileChange(id, fileName, size) {
-        if (this.server && this.server.sockets) {
-            const sockets = this.server.sockets.sockets || this.server.sockets.connected;
-
+        const sockets = this.getSocketsList();
+        if (sockets) {
             sockets.forEach(socket =>
                 this.commands.publishFile(socket, id, fileName, size));
         }
     }
 
     repoUpdated() {
-        if (this.server && this.server.sockets) {
-            const sockets = this.server.sockets.sockets || this.server.sockets.connected;
-
+        const sockets = this.getSocketsList();
+        if (sockets) {
             sockets.forEach(socket =>
                 this.__updateSession(socket));
 
@@ -169,9 +166,8 @@ class SocketAdmin extends SocketCommon {
     }
 
     objectChange(id, obj) {
-        if (this.server && this.server.sockets) {
-            const sockets = this.server.sockets.sockets || this.server.sockets.connected;
-
+        const sockets = this.getSocketsList();
+        if (sockets) {
             sockets.forEach(socket =>
                 this.commands.publish(socket, 'objectChange', id, obj));
         }
@@ -186,13 +182,14 @@ class SocketAdmin extends SocketCommon {
     }
 
     sendCommand(obj) {
-        if (this.commands.sendCommand(obj) && this.server && this.server.sockets) {
-            const sockets = this.server.sockets.sockets || this.server.sockets.connected;
+        if (this.commands.sendCommand(obj)) {
+            const sockets = this.getSocketsList();
+            if (sockets) {
+                sockets.forEach(socket =>
+                    this.__updateSession(socket));
 
-            sockets.forEach(socket =>
-                this.__updateSession(socket));
-
-            this.server.sockets.emit(obj.command, obj.message.id, obj.message.data);
+                this.server.sockets.emit(obj.command, obj.message.id, obj.message.data);
+            }
         }
     }
 

package/lib/socketCommon.js

@@ -198,9 +198,10 @@ class SocketCommon {
     _unsubscribeAll() {
         if (this.server && this.server.ioBroker) {
             // this could be an object or array
-            const sockets = this.server.sockets.sockets || this.server.sockets.connected;
-
-            Object.keys(sockets).forEach(i => this.commands.unsubscribeSocket(sockets[i]));
+            const sockets = this.getSocketsList();
+            if (sockets) {
+                Object.keys(sockets).forEach(i => this.commands.unsubscribeSocket(sockets[i]));
+            }
         } else if (this.server && this.server.sockets) {
             for (const socket in this.server.sockets) {
                 if (Object.prototype.hasOwnProperty.call(this.server.sockets, socket)) {
@@ -383,10 +384,9 @@ class SocketCommon {
 
                 if (this.server) {
                     const clientsArray = [];
-                    if (this.server.sockets) {
+                    const sockets = this.getSocketsList();
+                    if (sockets) {
                         // this could be an object or array
-                        const sockets = this.server.sockets.sockets || this.server.sockets.connected;
-
                         Object.keys(sockets).forEach(i => clientsArray.push(sockets[i]._name || 'noname'));
                     }
                     const text = `[${clientsArray.length}]${clientsArray.join(', ')}`;
@@ -423,15 +423,33 @@ class SocketCommon {
         return this.commands.publishFile(socket, id, fileName, size);
     }
 
+    getSocketsList() {
+        if (this.server && this.server.sockets) {
+            // this could be an object or array
+            return this.server.sockets.sockets || this.server.sockets.connected;
+        }
+        return null;
+    }
+
+    publishInstanceMessageAll(sourceInstance, messageType, sid, data) {
+        const sockets = this.getSocketsList();
+        if (sockets) {
+            Object.keys(sockets).forEach(i => {
+                if (sockets[i].id === sid) {
+                    this.publishInstanceMessage(sockets[i], sourceInstance, messageType, data);
+                }
+            });
+        }
+    }
+
     close() {
         this._unsubscribeAll();
 
         this.commands.destroy();
 
-        if (this.server && this.server.sockets) {
+        const sockets = this.getSocketsList();
+        if (sockets) {
             // this could be an object or array
-            const sockets = this.server.sockets.sockets || this.server.sockets.connected;
-
             Object.keys(sockets).forEach(i => {
                 const socket = sockets[i];
                 if (socket._sessionTimer) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iobroker/socket-classes",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "description": "ioBroker server-side web sockets",
   "author": {
     "name": "bluefox",
@@ -21,7 +21,7 @@
     "url": "https://github.com/ioBroker/ioBroker.socket-classes"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^3.0.3",
+    "@iobroker/adapter-core": "^3.0.4",
     "axios": "^1.5.1",
     "cookie-parser": "^1.4.6",
     "passport": "^0.6.0"