@iobroker/socket-classes 1.0.1 → 1.0.2

package/README.md

@@ -882,6 +882,9 @@ Read all instances of the given adapter, or all instances of all adapters if ada
 -->
 
 ## Changelog
+### 1.0.2 (2022-11-08)
+* (bluefox) Function `getObjects`for web was extended by devices, channels and enums
+
 ### 1.0.1 (2022-10-10)
 * (bluefox) Fixed error with delObject
 

package/lib/socketCommands.js

@@ -1372,18 +1372,28 @@ class SocketCommands {
             // @param {function} callback - `function (error, obj)`
             if (this._checkPermissions(socket, 'getObjects', callback)) {
                 try {
-                    this.adapter.getForeignObjects('*', 'state', 'rooms', {user: socket._acl.user}, (error, objs) => {
-                        if (typeof callback === 'function') {
+                    if (typeof callback === 'function') {
+                        this.adapter.getForeignObjects('*', 'state', 'rooms', {user: socket._acl.user}, async (error, objs) => {
+                            try {
+                                const channels = await this.adapter.getForeignObjectsAsync('*', 'channel', null, {user: socket._acl.user});
+                                const devices = await this.adapter.getForeignObjectsAsync('*', 'device', null, {user: socket._acl.user});
+                                const enums = await this.adapter.getForeignObjectsAsync('*', 'enum', null, {user: socket._acl.user});
+                                const config = await this.adapter.getForeignObjectAsync('system.config', {user: socket._acl.user});
+                                Object.assign(objs, channels, devices, enums);
+                                objs['system.config'] = config;
+                            } catch (e) {
+                                this.adapter.log.error('[getObjects] ERROR: ' + e.toString());
+                            }
                             // overload language
                             if (this.adapter._language && objs['system.config'] && objs['system.config'].common) {
                                 objs['system.config'].common.language = this.adapter._language;
                             }
 
                             SocketCommands._fixCallback(callback, error, objs);
-                        } else {
-                            this.adapter.log.warn('[getObjects] Invalid callback');
-                        }
-                    });
+                        });
+                    } else {
+                        this.adapter.log.warn('[getObjects] Invalid callback');
+                    }
                 } catch (error) {
                     this.adapter.log.error('[getObjects] ERROR: ' + error.toString());
                     SocketCommands._fixCallback(callback, error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iobroker/socket-classes",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "ioBroker server-side web sockets",
   "author": {
     "name": "bluefox",
@@ -31,8 +31,8 @@
     "@alcalzone/release-script-plugin-license": "^3.5.9",
     "iobroker.js-controller": "dev",
     "gulp": "^4.0.2",
-    "chai": "^4.3.6",
-    "mocha": "^10.0.0"
+    "chai": "^4.3.7",
+    "mocha": "^10.1.0"
   },
   "bugs": {
     "url": "https://github.com/ioBroker/ioBroker.web/issues"