@iobroker/socket-classes 0.1.10 → 0.3.0

package/README.md

@@ -69,6 +69,15 @@ io.close();
 -->
 
 ## Changelog
+### 0.3.0 (2022-05-16)
+* (bluefox) Process `writeDirAsZip` locally
+
+### 0.2.1 (2022-05-12)
+* (bluefox) fixed `getObjects` command
+
+### 0.2.0 (2022-05-09)
+* (bluefox) fixed `delObjects` command
+
 ### 0.1.10 (2022-05-09)
 * (bluefox) Added support for fileChanges
 

package/lib/socketCommands.js

@@ -1,4 +1,5 @@
 let axios = null;
+let zipFiles;
 
 // taken from here: https://github.com/ioBroker/ioBroker.js-controller/blob/master/packages/common/src/lib/common/tools.ts#L2386
 /**
@@ -79,6 +80,7 @@ class SocketCommands {
         this.adapter    = adapter;
         this.commands   = {};
         this.subscribes = {};
+        this.logEnabled = false;
 
         this._updateSession = updateSession;
 
@@ -287,7 +289,10 @@ class SocketCommands {
             } else if (type === 'objectChange') {
                 this.adapter.subscribeForeignObjects && this.adapter.subscribeForeignObjects(pattern);
             } else if (type === 'log') {
-                this.adapter.requireLog && this.adapter.requireLog(true);
+                if (!this.logEnabled && this.adapter.requireLog) {
+                    this.logEnabled = true;
+                    this.adapter.requireLog(true);
+                }
             } else if (type === 'fileChange') {
                 this.adapter.subscribeForeignFiles && this.adapter.subscribeForeignFiles(pattern, patternFile);
             }
@@ -331,7 +336,10 @@ class SocketCommands {
                                 this.adapter.unsubscribeForeignObjects && this.adapter.unsubscribeForeignObjects(pattern);
                             } else if (type === 'log') {
                                 //console.log((socket._name || socket.id) + ' requireLog false');
-                                this.adapter.requireLog && this.adapter.requireLog(false);
+                                if (this.logEnabled && this.adapter.requireLog) {
+                                    this.logEnabled = false;
+                                    this.adapter.requireLog(false);
+                                }
                             } else if (type === 'fileChange') {
                                 //console.log((socket._name || socket.id) + ' requireLog false');
                                 this.adapter.unsubscribeForeignFiles && this.adapter.unsubscribeForeignFiles(pattern, patternFile);
@@ -613,7 +621,30 @@ class SocketCommands {
                 if (this.sendToHost) {
                     this.sendToHost(host, command, message, callback);
                 } 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 agruments
+                                message.id,
+                                message.name,
+                                Buffer.from(message.data, 'base64'),
+                                message.options
+                            )
+                            .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);
+                    }
                 }
             }
         };

package/lib/socketCommandsAdmin.js

@@ -143,6 +143,7 @@ class SocketCommandsAdmin extends SocketCommands {
                         icon:        obj.common.icon,
                         materialize: obj.common.materialize,
                         jsonConfig:  obj.common.jsonConfig,
+                        version:     obj.common.version,
                     };
                     if (isTab) {
                         config.tab = true;
@@ -1071,7 +1072,19 @@ class SocketCommandsAdmin extends SocketCommands {
                     options = {};
                 }
                 options.user = socket._acl.user;
-                options.recursive = true;
+                // options.recursive = true; // the only difference between delObject and delObjects is this line
+                this.adapter.delForeignObject(id, options, (err, ...args) =>
+                    SocketCommands._fixCallback(callback, err, ...args));
+            }
+        };
+
+        this.commands['delObjects'] = (socket, id, options, callback) => {
+            if (this._checkPermissions(socket, 'delObject', callback, id)) {
+                if (!options || typeof options !== 'object') {
+                    options = {};
+                }
+                options.user = socket._acl.user;
+                options.recursive = true; // the only difference between delObject and delObjects is this line
                 this.adapter.delForeignObject(id, options, (err, ...args) =>
                     SocketCommands._fixCallback(callback, err, ...args));
             }
@@ -1099,9 +1112,10 @@ class SocketCommandsAdmin extends SocketCommands {
     __initCommandsObjects() {
         super.__initCommandsObjects();
 
-        this.commands['getAllObjects'] = (socket, callback) => {
-            return this._getAllObjects(socket, callback);
-        };
+        this.commands['getAllObjects'] = (socket, callback) => this._getAllObjects(socket, callback);
+
+        // Identical to getAllObjects
+        this.commands['getObjects'] = (socket, callback) => this._getAllObjects(socket, callback);
 
         this.commands['extendObject'] = (socket, id, obj, callback) => {
             if (this._checkPermissions(socket, 'extendObject', callback, id)) {

package/package.json

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