@iobroker/socket-classes 0.4.4 → 0.4.7

package/README.md

@@ -69,6 +69,15 @@ io.close();
 -->
 
 ## Changelog
+### 0.4.7 (2022-06-20)
+* (bluefox) Allowed to overload system language
+
+### 0.4.6 (2022-06-20)
+* (bluefox) updated `passport`
+
+### 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
 

package/lib/socketCommands.js

@@ -217,6 +217,10 @@ class SocketCommands {
         if (socket && socket.subscribe && socket.subscribe[type] && this._updateSession(socket)) {
             return !!socket.subscribe[type].find(sub => {
                 if (sub.regex.test(id)) {
+                    // replace language
+                    if (this.adapter._language && id === 'system.config' && obj.common) {
+                        obj.common.language = this.adapter._language;
+                    }
                     socket.emit(type, id, obj);
                     return true;
                 }
@@ -1028,8 +1032,13 @@ class SocketCommands {
     __initCommandsObjects() {
         this.commands['getObject'] = (socket, id, callback) => {
             if (this._checkPermissions(socket, 'getObject', callback, id)) {
-                this.adapter.getForeignObject(id, {user: socket._acl.user}, (err, ...args) =>
-                    SocketCommands._fixCallback(callback, err, ...args));
+                this.adapter.getForeignObject(id, {user: socket._acl.user}, (err, obj) => {
+                    // overload language from current instance
+                    if (this.adapter._language && id === 'system.config' && obj.common) {
+                        obj.common.language = this.adapter._language;
+                    }
+                    SocketCommands._fixCallback(callback, err, obj);
+                });
             }
         };
 
@@ -1038,6 +1047,11 @@ class SocketCommands {
             if (this._checkPermissions(socket, 'getObjects', callback)) {
                 this.adapter.getForeignObjects('*', 'state', 'rooms', {user: socket._acl.user}, (err, objs) => {
                     if (typeof callback === 'function') {
+                        // overload language
+                        if (this.adapter._language && objs['system.config'] && objs['system.config'].common) {
+                            objs['system.config'].common.language = this.adapter._language;
+                        }
+
                         callback(err, objs);
                     } else {
                         this.adapter.log.warn('[getObjects] Invalid callback');

package/lib/socketCommon.js

@@ -18,6 +18,7 @@ class SocketCommon {
         this.infoTimeout  = null;
         this.eventHandlers = {};
         this.store        = null; // will be set in __initAuthentication
+        this.adapter._language = this.settings.language;
     }
 
     __getIsNoDisconnect() {
@@ -75,6 +76,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 +98,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 +111,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();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iobroker/socket-classes",
-  "version": "0.4.4",
+  "version": "0.4.7",
   "description": "ioBroker server-side web sockets",
   "author": {
     "name": "bluefox",
@@ -21,7 +21,7 @@
     "url": "https://github.com/ioBroker/ioBroker.socket-classes"
   },
   "dependencies": {
-    "passport": "^0.5.2",
+    "passport": "^0.6.0",
     "cookie-parser": "^1.4.6",
     "axios": "^0.27.2"
   },