@iobroker/socket-classes 1.4.2 → 1.4.3

package/lib/socketCommon.js

@@ -11,13 +11,13 @@ class SocketCommon {
     static COMMAND_RE_AUTHENTICATE = 'reauthenticate';
 
     constructor(settings, adapter) {
-        this.settings     = settings || {};
-        this.adapter      = adapter;
-        this.commands     = null;
+        this.settings = settings || {};
+        this.adapter = adapter;
+        this.commands = null;
         this.noDisconnect = this.__getIsNoDisconnect();
-        this.infoTimeout  = null;
+        this.infoTimeout = null;
         this.eventHandlers = {};
-        this.store        = null; // will be set in __initAuthentication
+        this.store = null; // will be set in __initAuthentication
         this.adapter._language = this.settings.language;
     }
 
@@ -81,7 +81,9 @@ class SocketCommon {
                 }
 
                 server.__inited = true;
-                this.adapter.log.info(`${this.settings.secure ? 'Secure ' : ''}socket.io server listening on port ${this.settings.port}`);
+                this.adapter.log.info(
+                    `${this.settings.secure ? 'Secure ' : ''}socket.io server listening on port ${this.settings.port}`
+                );
             }
 
             if (this.settings.auth && this.server) {
@@ -99,36 +101,51 @@ class SocketCommon {
                 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.allNamespaces &&
+                this.allNamespaces.on('connection', (socket, cb) => {
+                    this.eventHandlers.connect && this.eventHandlers.connect(socket);
+                    this._initSocket(socket, cb);
+                });
         }
 
         this.server.on('error', (error, details) => {
             // ignore "failed connection" as it already shown
             if (!error || !error.message || !error.message.includes('failed connection')) {
-                if ((error && error.message && error.message.includes('authentication failed') ||
-                    (details && details.toString().includes('authentication failed')))
+                if (
+                    (error && error.message && error.message.includes('authentication failed')) ||
+                    (details && details.toString().includes('authentication failed'))
                 ) {
-                    this.adapter.log.debug(`Error: ${(error && error.message) || JSON.stringify(error)}${details ? ` - ${details}` : ''}`);
+                    this.adapter.log.debug(
+                        `Error: ${(error && error.message) || JSON.stringify(error)}${details ? ` - ${details}` : ''}`
+                    );
                 } else {
-                    this.adapter.log.error(`Error: ${(error && error.message) || JSON.stringify(error)}${details ? ` - ${details}` : ''}`);
+                    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')) {
-                if (error && error.message && error.message.includes('authentication failed')) {
-                    this.adapter.log.debug(`Error: ${(error && error.message) || JSON.stringify(error)}${details ? ` - ${details}` : ''}`);
-                } else {
-                    this.adapter.log.error(`Error: ${(error && error.message) || JSON.stringify(error)}${details ? ` - ${details}` : ''}`);
+        this.allNamespaces &&
+            this.allNamespaces.on('error', (error, details) => {
+                // ignore "failed connection" as it already shown
+                if (!error || !error.message || !error.message.includes('failed connection')) {
+                    if (error && error.message && error.message.includes('authentication failed')) {
+                        this.adapter.log.debug(
+                            `Error: ${(error && error.message) || JSON.stringify(error)}${
+                                details ? ` - ${details}` : ''
+                            }`
+                        );
+                    } else {
+                        this.adapter.log.error(
+                            `Error: ${(error && error.message) || JSON.stringify(error)}${
+                                details ? ` - ${details}` : ''
+                            }`
+                        );
+                    }
                 }
-            }
-        });
+            });
 
         this._updateConnectedInfo();
     }
@@ -160,10 +177,14 @@ class SocketCommon {
                     }
                 });
             } else {
-                this.adapter.calculatePermissions(this.settings.defaultUser, SocketCommands.COMMANDS_PERMISSIONS, acl => {
-                    socket._acl = SocketCommon._mergeACLs(address, acl, this.settings.whiteListSettings);
-                    this._socketEvents(socket, address, cb);
-                });
+                this.adapter.calculatePermissions(
+                    this.settings.defaultUser,
+                    SocketCommands.COMMANDS_PERMISSIONS,
+                    acl => {
+                        socket._acl = SocketCommon._mergeACLs(address, acl, this.settings.whiteListSettings);
+                        this._socketEvents(socket, address, cb);
+                    }
+                );
             }
         } else {
             this._socketEvents(socket, address, cb);
@@ -179,17 +200,15 @@ class SocketCommon {
             // 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]));
-        } else
-        if (this.server && this.server.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)) {
                     this.commands.unsubscribeSocket(socket);
                 }
             }
         }
-    };
+    }
 
     static getWhiteListIpForAddress(address, whiteList) {
         if (!whiteList) {
@@ -243,7 +262,10 @@ class SocketCommon {
             const whiteListAcl = SocketCommon._getPermissionsForIp(address, whiteList);
             if (whiteListAcl) {
                 ['object', 'state', 'file'].forEach(key => {
-                    if (Object.prototype.hasOwnProperty.call(acl, key) && Object.prototype.hasOwnProperty.call(whiteListAcl, key)) {
+                    if (
+                        Object.prototype.hasOwnProperty.call(acl, key) &&
+                        Object.prototype.hasOwnProperty.call(whiteListAcl, key)
+                    ) {
                         Object.keys(acl[key]).forEach(permission => {
                             if (Object.prototype.hasOwnProperty.call(whiteListAcl[key], permission)) {
                                 acl[key][permission] = acl[key][permission] && whiteListAcl[key][permission];
@@ -309,7 +331,9 @@ class SocketCommon {
             if (this.eventHandlers.disconnect) {
                 this.eventHandlers.disconnect(socket, error);
             } else {
-                this.adapter.log.info(`<== Disconnect ${socket._acl.user} from ${this.__getClientAddress(socket)} ${socket._name || ''}`);
+                this.adapter.log.info(
+                    `<== Disconnect ${socket._acl.user} from ${this.__getClientAddress(socket)} ${socket._name || ''}`
+                );
             }
         });
 
@@ -321,23 +345,24 @@ class SocketCommon {
         if (this.serverMode) {
             const sessionId = this.__getSessionID(socket);
             if (sessionId) {
-                socket._secure    = true;
+                socket._secure = true;
                 socket._sessionID = sessionId;
                 // Get user for session
-                this.store && this.store.get(socket._sessionID, (err, obj) => {
-                    if (!obj || !obj.passport) {
-                        socket._acl.user = '';
-                        socket.emit(SocketCommon.COMMAND_RE_AUTHENTICATE);
-                        // ws does not require disconnect
-                        if (!this.noDisconnect) {
-                            socket.disconnect();
+                this.store &&
+                    this.store.get(socket._sessionID, (err, obj) => {
+                        if (!obj || !obj.passport) {
+                            socket._acl.user = '';
+                            socket.emit(SocketCommon.COMMAND_RE_AUTHENTICATE);
+                            // ws does not require disconnect
+                            if (!this.noDisconnect) {
+                                socket.disconnect();
+                            }
                         }
-                    }
-                    if (socket._authPending) {
-                        socket._authPending(!!socket._acl.user, true);
-                        delete socket._authPending;
-                    }
-                });
+                        if (socket._authPending) {
+                            socket._authPending(!!socket._acl.user, true);
+                            delete socket._authPending;
+                        }
+                    });
             }
         }
 
@@ -357,13 +382,12 @@ class SocketCommon {
                 this.infoTimeout = null;
 
                 if (this.server) {
-                    let clientsArray = [];
+                    const clientsArray = [];
                     if (this.server.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'));
+                        Object.keys(sockets).forEach(i => clientsArray.push(sockets[i]._name || 'noname'));
                     }
                     const text = `[${clientsArray.length}]${clientsArray.join(', ')}`;
                     this.adapter.setState('info.connected', text, true);
@@ -421,7 +445,7 @@ class SocketCommon {
         try {
             this.server && this.server.close && this.server.close();
             this.server = null;
-        } catch (e) {
+        } catch {
             // ignore
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iobroker/socket-classes",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "ioBroker server-side web sockets",
   "author": {
     "name": "bluefox",
@@ -22,16 +22,17 @@
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.0.3",
-    "passport": "^0.6.0",
+    "axios": "^1.5.1",
     "cookie-parser": "^1.4.6",
-    "axios": "^1.5.1"
+    "passport": "^0.6.0"
   },
   "devDependencies": {
     "@alcalzone/release-script": "^3.6.0",
     "@alcalzone/release-script-plugin-license": "^3.5.9",
-    "iobroker.js-controller": "dev",
-    "gulp": "^4.0.2",
+    "@foxriver76/eslint-config": "^1.0.1",
     "chai": "^4.3.10",
+    "gulp": "^4.0.2",
+    "iobroker.js-controller": "dev",
     "mocha": "^10.2.0"
   },
   "bugs": {