@iobroker/socket-classes 0.4.2 → 0.4.5

package/README.md

@@ -69,6 +69,15 @@ io.close();
 -->
 
 ## Changelog
+### 0.4.5 (2022-06-20)
+* (bluefox) allow to run socket.io behind reverse proxy
+
+### 0.4.4 (2022-06-09)
+* (bluefox) Do not show requireLog message
+
+### 0.4.3 (2022-06-03)
+* (bluefox) Allowed call of getAdapterInstances for non admin
+
 ### 0.4.2 (2022-05-23)
 * (bluefox) Corrected renameFile command for admin
 

package/lib/socketCommands.js

@@ -253,6 +253,10 @@ class SocketCommands {
         }
     }
 
+    isLogEnabled() {
+        return this.logEnabled;
+    }
+
     subscribe(socket, type, pattern, patternFile) {
         this.subscribes[type] = this.subscribes[type] || {};
 
@@ -875,6 +879,35 @@ class SocketCommands {
         this.commands['subscribeFiles'] = (socket, id, pattern, callback) => this._subscribeFiles(socket, id, pattern, callback);
 
         this.commands['unsubscribeFiles'] = (socket, id, pattern, callback) => this._unsubscribeFiles(socket, id, pattern, callback);
+
+        this.commands['getAdapterInstances'] = (socket, adapterName, callback) => {
+            if (typeof callback === 'function') {
+                if (this._checkPermissions(socket, 'getObject', callback)) {
+                    let _adapterName = adapterName || this.adapterName || '';
+                    if (_adapterName) {
+                        _adapterName += '.'
+                    }
+                    this.adapter.getObjectView('system', 'instance',
+                        {startkey: `system.adapter.${_adapterName}`, endkey: `system.adapter.${_adapterName}\u9999`},
+                        (err, doc) => {
+                            if (err) {
+                                callback(err);
+                            } else {
+                                callback(null, doc.rows
+                                    .map(item => {
+                                        const obj = item.value;
+                                        if (obj.common) {
+                                            delete obj.common.news;
+                                        }
+                                        this._fixAdminUI(obj);
+                                        return obj;
+                                    })
+                                    .filter(obj => obj && (!adapterName || (obj.common && obj.common.name === adapterName))));
+                            }
+                        });
+                }
+            }
+        };
     }
 
     __initCommandsStates() {

package/lib/socketCommandsAdmin.js

@@ -830,35 +830,6 @@ class SocketCommandsAdmin extends SocketCommands {
             }
         };
 
-        this.commands['getAdapterInstances'] = (socket, adapterName, callback) => {
-            if (typeof callback === 'function') {
-                if (this._checkPermissions(socket, 'getObject', callback)) {
-                    let _adapterName = adapterName || this.adapterName || '';
-                    if (_adapterName) {
-                        _adapterName += '.'
-                    }
-                    this.adapter.getObjectView('system', 'instance',
-                        {startkey: `system.adapter.${_adapterName}`, endkey: `system.adapter.${_adapterName}\u9999`},
-                        (err, doc) => {
-                            if (err) {
-                                callback(err);
-                            } else {
-                                callback(null, doc.rows
-                                    .map(item => {
-                                        const obj = item.value;
-                                        if (obj.common) {
-                                            delete obj.common.news;
-                                        }
-                                        this._fixAdminUI(obj);
-                                        return obj;
-                                    })
-                                    .filter(obj => obj && (!adapterName || (obj.common && obj.common.name === adapterName))));
-                            }
-                        });
-                }
-            }
-        };
-
         this.commands['getAdapters'] = (socket, adapterName, callback) => {
             if (typeof callback === 'function' && this._checkPermissions(socket, 'getObject', callback)) {
                 this.adapter.getObjectView('system', 'adapter',

package/lib/socketCommon.js

@@ -75,6 +75,10 @@ class SocketCommon {
                     this.server = socketClass(server, socketOptions);
                 }
 
+                if (typeof this.server.of === 'function') {
+                    this.allNamespaces = this.server.of(/.*/);
+                }
+
                 server.__inited = true;
                 this.adapter.log.info(`${this.settings.secure ? 'Secure ' : ''}socket.io server listening on port ${this.settings.port}`);
             }
@@ -93,6 +97,11 @@ class SocketCommon {
                 this.eventHandlers.connect && this.eventHandlers.connect(socket);
                 this._initSocket(socket, cb);
             });
+            // support of dynamic namespaces (because of reverse proxy)
+            this.allNamespaces && this.allNamespaces.on('connection', (socket, cb) => {
+                this.eventHandlers.connect && this.eventHandlers.connect(socket);
+                this._initSocket(socket, cb);
+            });
         }
 
         this.server.on('error', (error, details) => {
@@ -101,6 +110,13 @@ class SocketCommon {
                 this.adapter.log.error(`Error: ${(error && error.message) || JSON.stringify(error)}${details ? ' - ' + details : ''}`);
             }
         });
+        // support of dynamic namespaces (because of reverse proxy)
+        this.allNamespaces && this.allNamespaces.on('error', (error, details) => {
+            // ignore "failed connection" as it already shown
+            if (!error || !error.message || !error.message.includes('failed connection')) {
+                this.adapter.log.error(`Error: ${(error && error.message) || JSON.stringify(error)}${details ? ' - ' + details : ''}`);
+            }
+        });
 
         this._updateConnectedInfo();
     }
@@ -266,7 +282,7 @@ class SocketCommon {
             this._updateConnectedInfo();
 
             // Disable logging if no one browser is connected
-            if (this.adapter.requireLog) {
+            if (this.adapter.requireLog && this.commands && this.commands.isLogEnabled()) {
                 this.adapter.log.debug('Disable logging, because no one socket connected');
                 this.adapter.requireLog(!!(this.server && this.server.engine && this.server.engine.clientsCount));
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iobroker/socket-classes",
-  "version": "0.4.2",
+  "version": "0.4.5",
   "description": "ioBroker server-side web sockets",
   "author": {
     "name": "bluefox",