@iobroker/socket-classes 0.4.6 → 0.4.9

package/README.md

@@ -69,6 +69,12 @@ io.close();
 -->
 
 ## Changelog
+### 0.4.9 (2022-06-20)
+* (bluefox) Do not show error with failed authentication
+
+### 0.4.7 (2022-06-20)
+* (bluefox) Allowed to overload system language
+
 ### 0.4.6 (2022-06-20)
 * (bluefox) updated `passport`
 

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;
                 }
@@ -622,34 +626,32 @@ class SocketCommands {
             // host can answer following commands: cmdExec, getRepository, getInstalled, getInstalledAdapter, getVersion, getDiagData, getLocationOnDisk, getDevList, getLogs, getHostInfo,
             // delLogs, readDirAsZip, writeDirAsZip, readObjectsAsZip, writeObjectsAsZip, checkLogging, updateMultihost
             if (this._checkPermissions(socket, protectedCommands.includes(command) ? 'cmdExec' : 'sendToHost', callback, command)) {
-                if (this.sendToHost) {
-                    this.sendToHost(host, command, message, callback);
-                } else {
-                    // Try to decode this file locally as redis has a limitation for files bigger than 20MB
-                    if (command === 'writeDirAsZip' && message && message.data.length > 1024 * 1024) {
-                        if (!zipFiles) {
-                            const utils = require('@iobroker/adapter-core'); // Get common adapter utils
-                            zipFiles = require(utils.controllerDir + '/lib/zipFiles.js');
-                        }
-                        zipFiles
-                            .writeDirAsZip(
-                                this.adapter, // normally we have to pass here the internal "objects" object, but as
-                                // only writeFile is used, and it has the same name we can pass here the
-                                // adapter, which has the function with the same name and arguments
-                                message.id,
-                                message.name,
-                                Buffer.from(message.data, 'base64'),
-                                message.options,
-                                error => callback({ error }) // this is for back compatibility with js-controller@4.0 or older
-                            )
-                            .then(() => callback({}))
-                            .catch(error => {
-                                this.adapter.log.error(`Cannot write zip file as folder: ${error}`);
-                                callback({ error });
-                            });
-                    } else {
-                        this.adapter.sendToHost(host, command, message, callback);
+                // Try to decode this file locally as redis has a limitation for files bigger than 20MB
+                if (command === 'writeDirAsZip' && message && message.data.length > 1024 * 1024) {
+                    if (!zipFiles) {
+                        const utils = require('@iobroker/adapter-core'); // Get common adapter utils
+                        zipFiles = require(utils.controllerDir + '/lib/zipFiles.js');
                     }
+                    zipFiles
+                        .writeDirAsZip(
+                            this.adapter, // normally we have to pass here the internal "objects" object, but as
+                            // only writeFile is used, and it has the same name we can pass here the
+                            // adapter, which has the function with the same name and arguments
+                            message.id,
+                            message.name,
+                            Buffer.from(message.data, 'base64'),
+                            message.options,
+                            error => callback({ error }) // this is for back compatibility with js-controller@4.0 or older
+                        )
+                        .then(() => callback({}))
+                        .catch(error => {
+                            this.adapter.log.error(`Cannot write zip file as folder: ${error}`);
+                            callback({ error });
+                        });
+                } else if (this._sendToHost) {
+                    this._sendToHost(host, command, message, callback);
+                } else {
+                    this.adapter.sendToHost(host, command, message, callback);
                 }
             }
         };
@@ -1028,8 +1030,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 +1045,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/socketCommandsAdmin.js

@@ -171,6 +171,7 @@ class SocketCommandsAdmin extends SocketCommands {
                 delete this.cache[hash];
             }
         }
+
         this.adapter.sendToHost(host, command, message, res => {
             if (!message && SocketCommandsAdmin.ALLOW_CACHE.includes(command)) {
                 this.cache[hash] = {ts: Date.now(), res: JSON.stringify(res)};

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() {
@@ -107,14 +108,25 @@ class SocketCommon {
         this.server.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 : ''}`);
+                if ((error && error.message && error.message.includes('authentication failed') ||
+                    (details && details.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 : ''}`);
+                }
             }
         });
+
         // 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 : ''}`);
+                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 : ''}`);
+                }
             }
         });
 

package/package.json

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