@iobroker/socket-classes 1.3.1 → 1.3.3

package/README.md

@@ -122,6 +122,7 @@ function sendImage(camera, data) {
 * [authenticate](#authenticate_w)
 * [error](#error_w)
 * [log](#log_w)
+* [checkFeatureSupported](#checkfeaturesupported_w)
 * [getHistory](#gethistory_w)
 * [httpGet](#httpget_w)
 * [sendTo](#sendto_w)
@@ -183,6 +184,11 @@ Write log entry into ioBroker log
 * text *(string)*: log text
 * level *(string)*: one of `['silly', 'debug', 'info', 'warn', 'error']`. Default is 'debug'.
 
+### <a name="checkfeaturesupported_w"></a>checkFeatureSupported(feature, callback)
+Checks, if the same feature is supported by the current js-controller
+* feature *(string)*: feature name like `CONTROLLER_LICENSE_MANAGER`
+* callback *(function)*: `function (error, isSupported)`
+
 ### <a name="gethistory_w"></a>getHistory(id, options, callback)
 Get history data from specific instance
 * id *(string)*: object ID
@@ -456,6 +462,7 @@ Read all instances of the given adapter, or all instances of all adapters if ada
 * [authenticate](#authenticate_a)
 * [error](#error_a)
 * [log](#log_a)
+* [checkFeatureSupported](#checkfeaturesupported_a)
 * [getHistory](#gethistory_a)
 * [httpGet](#httpget_a)
 * [sendTo](#sendto_a)
@@ -474,7 +481,6 @@ Read all instances of the given adapter, or all instances of all adapters if ada
 * [eventsThreshold](#eventsthreshold_a)
 * [getRatings](#getratings_a)
 * [getCurrentInstance](#getcurrentinstance_a)
-* [checkFeatureSupported](#checkfeaturesupported_a)
 * [decrypt](#decrypt_a)
 * [encrypt](#encrypt_a)
 * [getIsEasyModeStrict](#getiseasymodestrict_a)
@@ -548,6 +554,11 @@ Write log entry into ioBroker log
 * text *(string)*: log text
 * level *(string)*: one of `['silly', 'debug', 'info', 'warn', 'error']`. Default is 'debug'.
 
+### <a name="checkfeaturesupported_a"></a>checkFeatureSupported(feature, callback)
+Checks, if the same feature is supported by the current js-controller
+* feature *(string)*: feature name like `CONTROLLER_LICENSE_MANAGER`
+* callback *(function)*: `function (error, isSupported)`
+
 ### <a name="gethistory_a"></a>getHistory(id, options, callback)
 Get history data from specific instance
 * id *(string)*: object ID
@@ -638,11 +649,6 @@ Read ratings of adapters
 Return current instance name like `admin.0`
 * callback *(function)*: `function (error, namespace)`
 
-### <a name="checkfeaturesupported_a"></a>checkFeatureSupported(feature, callback)
-Checks, if the same feature is supported by the current js-controller
-* feature *(string)*: feature name like `CONTROLLER_LICENSE_MANAGER`
-* callback *(function)*: `function (error, isSupported)`
-
 ### <a name="decrypt_a"></a>decrypt(encryptedText, callback)
 Decrypts text with the system secret key
 * encryptedText *(string)*: encrypted text
@@ -972,8 +978,9 @@ Read all instances of the given adapter, or all instances of all adapters if ada
 -->
 
 ## Changelog
-### 1.3.1 (2023-07-31)
+### 1.3.3 (2023-08-01)
 * (bluefox) Implemented subscribes of a client on messages from specific instance
+* (bluefox) Moved checkFeatureSupported to regular connection and not only admin
 
 ### 1.2.0 (2023-07-07)
 * (foxriver76) fixed crash on invalid patterns with js-controller version 5
@@ -1029,13 +1036,13 @@ Read all instances of the given adapter, or all instances of all adapters if ada
 * (bluefox) Do not show error with failed authentication
 
 ### 0.4.7 (2022-06-20)
-* (bluefox) Allowed to overload system language
+* (bluefox) Allowed overloading system language
 
 ### 0.4.6 (2022-06-20)
 * (bluefox) updated `passport`
 
 ### 0.4.5 (2022-06-20)
-* (bluefox) allow to run socket.io behind reverse proxy
+* (bluefox) allowed running socket.io behind reverse proxy
 
 ### 0.4.4 (2022-06-09)
 * (bluefox) Do not show requireLog message

package/lib/socketCommands.js

@@ -238,11 +238,11 @@ class SocketCommands {
         ) {
             socket.emit('im', messageType, sourceInstance, data);
             return true;
-        } else {
-            // inform instance about missing subscription
-            this.adapter.sendTo(sourceInstance, 'clientSubscribeError', {type: messageType, sid: socket.id});
-            return false;
         }
+
+        // inform instance about missing subscription
+        this.adapter.sendTo(sourceInstance, 'clientSubscribeError', {type: messageType, sid: socket.id, reason: 'no one subscribed'});
+        return false;
     }
 
     _showSubscribes(socket, type) {
@@ -663,6 +663,17 @@ class SocketCommands {
             }
         };
 
+        this.commands['checkFeatureSupported'] = (socket, feature, callback) => {
+            // Checks, if the same feature is supported by the current js-controller
+            // @param {string} feature - feature name like `CONTROLLER_LICENSE_MANAGER`
+            // @param {function} callback - `function (error, isSupported)`
+            if (feature === 'INSTANCE_MESSAGES') {
+                SocketCommands._fixCallback(callback, null, true);
+            } else {
+                SocketCommands._fixCallback(callback, null, this.adapter.supportsFeature && this.adapter.supportsFeature(feature));
+            }
+        };
+
         // new History
         this.commands['getHistory'] = (socket, id, options, callback) => {
             // Get history data from specific instance
@@ -1593,6 +1604,9 @@ class SocketCommands {
                 callback = data;
                 data = null;
             }
+            if (!targetInstance.startsWith('system.adapter.')) {
+                targetInstance = `system.adapter.${targetInstance}`;
+            }
             const sid = socket.id;
             // GUI subscribes for messages from targetInstance
             this.clientSubscribes[sid] = this.clientSubscribes[sid] || {};
@@ -1611,13 +1625,17 @@ class SocketCommands {
             // @param {string} messageType - message type, e.g. "startRecording/cam1"
             // @param {function} callback - `function (error, wasSubscribed)`, target instance MUST NOT acknowledge the un-subscription
             const sid = socket.id;
+            if (!targetInstance.startsWith('system.adapter.')) {
+                targetInstance = `system.adapter.${targetInstance}`;
+            }
+
             // GUI unsubscribes for messages from targetInstance
             if (this.clientSubscribes[sid] && this.clientSubscribes[sid][targetInstance]) {
                 const pos = this.clientSubscribes[sid][targetInstance].indexOf(messageType);
                 if (pos !== -1) {
                     this.clientSubscribes[sid][targetInstance].splice(pos, 1);
                     // inform instance about unsubscription
-                    this.adapter.sendTo(targetInstance, 'clientUnsubscribe', {type: [messageType], sid});
+                    this.adapter.sendTo(targetInstance, 'clientUnsubscribe', {type: [messageType], sid, reason: 'client'});
                     SocketCommands._fixCallback(callback, null, true);
                     return;
                 }
@@ -1640,7 +1658,7 @@ class SocketCommands {
                 this.adapter.sendTo(targetInstance, 'clientUnsubscribe', {
                     message: this.clientSubscribes[socketId][targetInstance],
                     sid: socketId,
-                    provider: this.adapter.namespace
+                    reason: 'disconnect',
                 });
             });
             delete this.clientSubscribes[socketId];

package/lib/socketCommandsAdmin.js

@@ -230,7 +230,7 @@ class SocketCommandsAdmin extends SocketCommands {
 
                                 systemLicenses.native.readTime = new Date().toISOString();
 
-                                // save only if object changed
+                                // save only if an object changed
                                 return this.adapter.setForeignObjectAsync('system.licenses', systemLicenses, options)
                                     .then(() => licenses);
                             })
@@ -810,13 +810,6 @@ class SocketCommandsAdmin extends SocketCommands {
             SocketCommands._fixCallback(callback, null, this.adapter.namespace);
         };
 
-        this.commands['checkFeatureSupported'] = (socket, feature, callback) => {
-            // Checks, if the same feature is supported by the current js-controller
-            // @param {string} feature - feature name like `CONTROLLER_LICENSE_MANAGER`
-            // @param {function} callback - `function (error, isSupported)`
-            SocketCommands._fixCallback(callback, null, this.adapter.supportsFeature && this.adapter.supportsFeature(feature));
-        };
-
         this.commands['decrypt'] = (socket, encryptedText, callback) => {
             // Decrypts text with the system secret key
             // @param {string} encryptedText - encrypted text

package/package.json

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