@iobroker/adapter-react-v5 4.12.3 → 4.13.1

package/LegacyConnection.d.ts

@@ -31,6 +31,7 @@ export declare const ERRORS: {
     PERMISSION_ERROR: string;
     NOT_CONNECTED: string;
 };
+export type BinaryStateChangeHandler = (id: string, base64: string | null) => void;
 /** Converts ioB pattern into regex */
 export declare function pattern2RegEx(pattern: string): string;
 interface ConnectionProps {
@@ -173,9 +174,9 @@ declare class Connection {
     /** The ioBroker state ID. */
     id: string | string[], 
     /** Set to true if the given state is binary and requires Base64 decoding. */
-    binary: boolean | ioBroker.StateChangeHandler | ((id: string, base64: string) => void), 
+    binary: boolean | ioBroker.StateChangeHandler | BinaryStateChangeHandler, 
     /** The callback. */
-    cb?: ioBroker.StateChangeHandler | ((id: string, base64: string) => void)): void;
+    cb?: ioBroker.StateChangeHandler | BinaryStateChangeHandler): void;
     /**
      * Subscribe to changes of the given state.
      */
@@ -191,7 +192,7 @@ declare class Connection {
     /** The ioBroker state ID or array of states */
     id: string | string[], 
     /** The callback. */
-    cb?: ioBroker.StateChangeHandler | ((id: string, base64: string) => void)): void;
+    cb?: ioBroker.StateChangeHandler | BinaryStateChangeHandler): void;
     /**
      * Subscribe to changes of the given object.
      */
@@ -199,7 +200,7 @@ declare class Connection {
     /** The ioBroker object ID. */
     id: string | string[], 
     /** The callback. */
-    cb: ioBroker.ObjectChangeHandler): void;
+    cb: ioBroker.ObjectChangeHandler): Promise<void>;
     /**
      * Unsubscribes all or the given callback from changes of the given object.
      */

package/LegacyConnection.js

@@ -479,24 +479,26 @@ class Connection {
                 !this.statesSubscribes[_id].cbs.includes(cb) && this.statesSubscribes[_id].cbs.push(cb);
             }
         }
-        if (toSubscribe.length && this.connected) {
+        if (!this.connected) {
+            return;
+        }
+        if (toSubscribe.length) {
             // no answer from server required
             this._socket.emit('subscribe', toSubscribe);
         }
-        if (typeof cb === 'function' && this.connected) {
-            if (binary) {
-                // todo: if array of ids
-                this.getBinaryState(ids[0])
-                    .then((base64) => cb && cb(ids[0], base64))
-                    .catch(e => console.error(`Cannot getForeignStates "${id}": ${JSON.stringify(e)}`));
-            }
-            else {
-                this._socket.emit(Connection.isWeb() ? 'getStates' : 'getForeignStates', id, (err, states) => {
-                    err && console.error(`Cannot getForeignStates "${id}": ${JSON.stringify(err)}`);
-                    states && Object.keys(states).forEach(_id => cb(_id, states[_id]));
-                });
+        if (binary) {
+            for (let i = 0; i < ids.length; i++) {
+                this.getBinaryState(ids[i])
+                    .then((base64) => cb && cb(ids[i], base64))
+                    .catch(e => console.error(`Cannot getBinaryState "${ids[i]}": ${JSON.stringify(e)}`));
             }
         }
+        else {
+            this._socket.emit(Connection.isWeb() ? 'getStates' : 'getForeignStates', id, (err, states) => {
+                err && console.error(`Cannot getForeignStates "${id}": ${JSON.stringify(err)}`);
+                states && Object.keys(states).forEach(_id => cb(_id, states[_id]));
+            });
+        }
     }
     /**
      * Subscribe to changes of the given state.
@@ -628,6 +630,7 @@ class Connection {
         if (this.connected && toSubscribe.length) {
             this._socket.emit('subscribeObjects', toSubscribe);
         }
+        return Promise.resolve();
     }
     /**
      * Unsubscribes all or the given callback from changes of the given object.

package/README.md

@@ -670,6 +670,9 @@ socket.getObjectViewCustom('custom', 'state', 'startKey', 'endKey')
 -->
 
 ## Changelog
+### 4.13.1 (2024-03-30)
+* (bluefox) used new connection classes
+
 ### 4.12.3 (2024-03-30)
 * (bluefox) Migrated legacy connection to typescript
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iobroker/adapter-react-v5",
-  "version": "4.12.3",
+  "version": "4.13.1",
   "description": "React classes to develop admin interfaces for ioBroker with react.",
   "author": {
     "name": "Denis Haev (bluefox)",
@@ -28,19 +28,19 @@
   "devDependencies": {},
   "dependencies": {
     "@emotion/react": "^11.11.4",
-    "@emotion/styled": "^11.11.0",
+    "@emotion/styled": "^11.11.5",
     "@iobroker/dm-utils": "^0.1.9",
-    "@iobroker/json-config": "^6.14.1",
-    "@iobroker/socket-client": "^2.3.16",
+    "@iobroker/json-config": "^6.15.2",
+    "@iobroker/socket-client": "^2.4.0",
     "@iobroker/types": "^5.0.19",
     "@iobroker/js-controller-common": "^5.0.19",
     "@iobroker/js-controller-common-db": "^5.0.19",
-    "@mui/icons-material": "^5.15.11",
+    "@mui/icons-material": "^5.15.14",
     "@mui/material": "5.14.14",
     "@mui/styles": "5.14.14",
-    "@mui/x-date-pickers": "^6.19.5",
-    "@sentry/browser": "^7.104.0",
-    "@sentry/integrations": "^7.106.0",
+    "@mui/x-date-pickers": "^7.1.0",
+    "@sentry/browser": "^7.109.0",
+    "@sentry/integrations": "^7.109.0",
     "react-color": "^2.19.3",
     "react-colorful": "^5.6.1",
     "react-cropper": "^2.3.3",