@iobroker/socket-classes 2.0.0 → 2.0.2

package/README.md

@@ -992,14 +992,14 @@ Unsubscribe from file changes in ioBroker DB
 -->
 
 ## Changelog
-### 2.0.0 (2025-02-07)
+### 2.0.2 (2025-02-07)
 * (@GermanBluefox) Code migrated to TypeScript
 
 ### 1.6.2 (2024-12-01)
 * (@GermanBluefox) Caught the error if no authentication and logout called
 
 ### 1.6.1 (2024-10-05)
-* (@GermanBluefox) Added support of iobroker.SocketIO with typescript
+* (@GermanBluefox) Added support for iobroker.SocketIO with TypeScript
 
 ### 1.5.6 (2024-06-26)
 * (@GermanBluefox) Corrected call of getObjectView with null parameter

package/dist/index.d.ts

@@ -3,5 +3,6 @@ import cookieParser from 'cookie-parser';
 export { SocketCommandsAdmin } from './lib/socketCommandsAdmin';
 export { SocketCommands, type SupportedFeature } from './lib/socketCommands';
 export { SocketCommon } from './lib/socketCommon';
-import { authorize as passportSocket } from './lib/passportSocket';
-export { passport, cookieParser, passportSocket };
+export { SocketAdmin } from './lib/socketAdmin';
+import { authorize as passportSocket, type PassportHttpRequest } from './lib/passportSocket';
+export { passport, cookieParser, passportSocket, type PassportHttpRequest };

package/dist/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.passportSocket = exports.cookieParser = exports.passport = exports.SocketCommon = exports.SocketCommands = exports.SocketCommandsAdmin = void 0;
+exports.passportSocket = exports.cookieParser = exports.passport = exports.SocketAdmin = exports.SocketCommon = exports.SocketCommands = exports.SocketCommandsAdmin = void 0;
 const passport_1 = __importDefault(require("passport"));
 exports.passport = passport_1.default;
 const cookie_parser_1 = __importDefault(require("cookie-parser"));
@@ -14,6 +14,8 @@ var socketCommands_1 = require("./lib/socketCommands");
 Object.defineProperty(exports, "SocketCommands", { enumerable: true, get: function () { return socketCommands_1.SocketCommands; } });
 var socketCommon_1 = require("./lib/socketCommon");
 Object.defineProperty(exports, "SocketCommon", { enumerable: true, get: function () { return socketCommon_1.SocketCommon; } });
+var socketAdmin_1 = require("./lib/socketAdmin");
+Object.defineProperty(exports, "SocketAdmin", { enumerable: true, get: function () { return socketAdmin_1.SocketAdmin; } });
 const passportSocket_1 = require("./lib/passportSocket");
 Object.defineProperty(exports, "passportSocket", { enumerable: true, get: function () { return passportSocket_1.authorize; } });
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAgC;AAMvB,mBANF,kBAAQ,CAME;AALjB,kEAAyC;AAKtB,uBALZ,uBAAY,CAKY;AAJ/B,iEAAgE;AAAvD,0HAAA,mBAAmB,OAAA;AAC5B,uDAA6E;AAApE,gHAAA,cAAc,OAAA;AACvB,mDAAkD;AAAzC,4GAAA,YAAY,OAAA;AACrB,yDAAmE;AAClC,+FADX,0BAAc,OACW"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAgC;AAOvB,mBAPF,kBAAQ,CAOE;AANjB,kEAAyC;AAMtB,uBANZ,uBAAY,CAMY;AAL/B,iEAAgE;AAAvD,0HAAA,mBAAmB,OAAA;AAC5B,uDAA6E;AAApE,gHAAA,cAAc,OAAA;AACvB,mDAAkD;AAAzC,4GAAA,YAAY,OAAA;AACrB,iDAAgD;AAAvC,0GAAA,WAAW,OAAA;AACpB,yDAA6F;AAC5D,+FADX,0BAAc,OACW"}

package/dist/lib/passportSocket.d.ts

@@ -1,9 +1,16 @@
-interface AuthRequest {
-    signedCookies?: Record<string, string>;
-    cookies?: Record<string, string>;
+import type { IncomingMessage } from 'node:http';
+import type * as express from 'express';
+import type * as passport from 'passport';
+export interface PassportHttpRequest extends IncomingMessage {
     headers: {
         cookie: string;
     };
+    query: Record<string, string>;
+    cookie: Record<string, string> | undefined;
+    sessionID: string;
+    user: {
+        logged_in: boolean;
+    };
 }
 export interface Store {
     get: (key: string, cb: (err: Error, session: Record<string, {
@@ -13,25 +20,15 @@ export interface Store {
     }>) => void) => void;
 }
 export declare function authorize(options: {
-    passport: {
+    passport: passport.PassportStatic & {
         _key: string;
     };
-    cookieParser: (secret: string | null) => (req: AuthRequest, options: Record<string, any>, cb: (err: string) => void) => void;
+    cookieParser: (secret: string | null, options?: {
+        decode?(val: string): string;
+    }) => express.RequestHandler;
     checkUser?: (user: string, pass: string, cb: (error: Error | null, result?: {
         logged_in: boolean;
     }) => void) => void;
-    fail: (data: any, message: string, critical: boolean, accept: (err: Error | null) => void) => void;
-    success: (data: any, accept: (err: Error | null) => void) => void;
-}): (data: {
-    headers: {
-        cookie: string;
-    };
-    url: string;
-    query: Record<string, string>;
-    cookie: Record<string, string> | undefined;
-    sessionID: string;
-    user: {
-        logged_in: boolean;
-    };
-}, accept: (err: Error | null) => void) => void;
-export {};
+    fail: (data: PassportHttpRequest, message: string, critical: boolean, accept: (err: boolean) => void) => void;
+    success: (data: PassportHttpRequest, accept: (err: boolean) => void) => void;
+}): (req: IncomingMessage, accept: (err: boolean) => void) => void;

package/dist/lib/passportSocket.js

@@ -5,13 +5,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.authorize = authorize;
 function parseCookie(auth, cookieHeader) {
     const cookieParser = auth.cookieParser(auth.secret);
+    // Simulate header
     const req = {
         headers: {
             cookie: cookieHeader,
         },
     };
     let result;
-    cookieParser(req, {}, err => {
+    void cookieParser(req, {}, (err) => {
         if (err) {
             throw new Error(err);
         }
@@ -20,7 +21,7 @@ function parseCookie(auth, cookieHeader) {
     return result;
 }
 function getQuery(url) {
-    const query = url.split('?')[1] || '';
+    const query = (url || '').split('?')[1] || '';
     const parts = query.split('&');
     const result = {};
     for (let p = 0; p < parts.length; p++) {
@@ -43,45 +44,47 @@ function authorize(options) {
     if (!auth.cookieParser) {
         throw new Error("cookieParser is required use require('cookie-parser'), connect.cookieParser or express.cookieParser");
     }
-    return function (data, accept) {
-        data.query = getQuery(data.url);
-        if (options.checkUser && data.query.user && data.query.pass) {
-            return options.checkUser(data.query.user, data.query.pass, (error, result) => {
+    return function (req, accept) {
+        const extendedReq = req;
+        extendedReq.query = getQuery(extendedReq.url);
+        if (options.checkUser && extendedReq.query.user && extendedReq.query.pass) {
+            return options.checkUser(extendedReq.query.user, extendedReq.query.pass, (error, result) => {
                 if (error) {
-                    return auth.fail(data, 'Cannot check user', false, accept);
+                    return auth.fail(extendedReq, 'Cannot check user', false, accept);
                 }
                 if (!result) {
-                    return auth.fail(data, 'User not found', false, accept);
+                    return auth.fail(extendedReq, 'User not found', false, accept);
                 }
-                data[auth.userProperty] = result;
-                data[auth.userProperty].logged_in = true;
-                auth.success(data, accept);
+                extendedReq[auth.userProperty] = result;
+                extendedReq[auth.userProperty].logged_in = true;
+                auth.success(extendedReq, accept);
             });
         }
-        data.cookie = parseCookie(auth, data.headers.cookie || '');
-        if (data.cookie) {
-            data.sessionID = data.cookie[auth.key] || '';
+        extendedReq.cookie = parseCookie(auth, extendedReq.headers.cookie || '');
+        if (extendedReq.cookie) {
+            extendedReq.sessionID = extendedReq.cookie[auth.key] || '';
         }
-        data[auth.userProperty] = {
+        extendedReq[auth.userProperty] = {
             logged_in: false,
         };
-        auth.store?.get(data.sessionID, (err, session) => {
+        auth.store?.get(extendedReq.sessionID, (err, session) => {
             if (err) {
-                return auth.fail(data, `Error in session store:\n${err.message}`, true, accept);
+                return auth.fail(extendedReq, `Error in session store:\n${err.message}`, true, accept);
             }
             if (!session) {
-                return auth.fail(data, 'No session found', false, accept);
+                return auth.fail(extendedReq, 'No session found', false, accept);
             }
             if (!session[auth.passport._key]) {
-                return auth.fail(data, 'Passport was not initialized', true, accept);
+                return auth.fail(extendedReq, 'Passport was not initialized', true, accept);
             }
             const userKey = session[auth.passport._key].user;
             if (typeof userKey === 'undefined') {
-                return auth.fail(data, 'User not authorized through passport. (User Property not found)', false, accept);
+                return auth.fail(extendedReq, 'User not authorized through passport. (User Property not found)', false, accept);
             }
-            data[auth.userProperty] = userKey;
-            data[auth.userProperty].logged_in = true;
-            auth.success(data, accept);
+            // extendedReq.user
+            extendedReq[auth.userProperty] = userKey;
+            extendedReq[auth.userProperty].logged_in = true;
+            auth.success(extendedReq, accept);
         });
     };
 }

package/dist/lib/passportSocket.js.map

@@ -1 +1 @@
-{"version":3,"file":"passportSocket.js","sourceRoot":"","sources":["../../src/lib/passportSocket.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"passportSocket.js","sourceRoot":"","sources":["../../src/lib/passportSocket.ts"],"names":[],"mappings":"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"}

package/dist/lib/socketAdmin.d.ts

@@ -0,0 +1,42 @@
+/**
+ *      Class Socket
+ *
+ *      Copyright 2014-2025 bluefox <dogafox@gmail.com>,
+ *      MIT License
+ *
+ */
+import { type Server, SocketCommon, type SocketIoOptions, type SocketSettings } from './socketCommon';
+import { type Store } from './passportSocket';
+import type { Socket as WebSocketClient, SocketIO } from '@iobroker/ws-server';
+import type { AddressInfo } from 'node:net';
+import type { SocketSubscribeTypes } from '../types';
+import type { Ratings } from './socketCommands';
+export declare class SocketAdmin extends SocketCommon {
+    #private;
+    private adminCommands;
+    constructor(settings: SocketSettings, adapter: ioBroker.Adapter, objects: Record<string, ioBroker.Object>);
+    __getIsNoDisconnect(): boolean;
+    __initAuthentication(authOptions: {
+        store: Store;
+        userKey: string;
+        secret: string;
+    }): void;
+    __getUserFromSocket(socket: WebSocketClient, callback: (error: string | null, user?: string) => void): void;
+    __getClientAddress(socket: WebSocketClient): AddressInfo;
+    __updateSession(socket: WebSocketClient): boolean;
+    __getSessionID(socket: WebSocketClient): string | null;
+    start(server: Server, socketClass: typeof SocketIO, authOptions: {
+        store: Store;
+        userKey: string;
+        secret: string;
+    }, socketOptions?: SocketIoOptions): void;
+    onThresholdChanged(enabled: boolean): void;
+    stateChange(id: string, state: ioBroker.State | null | undefined): void;
+    fileChange(id: string, fileName: string, size: number): void;
+    repoUpdated(): void;
+    objectChange(id: string, obj: ioBroker.Object | null | undefined): void;
+    subscribe(type: SocketSubscribeTypes, pattern: string): void;
+    subscribeFile(id: string, patternFile: string): void;
+    sendCommand(obj: ioBroker.Message): void;
+    updateRatings(uuid: string, isAutoUpdate?: boolean): Promise<Ratings | null>;
+}

package/dist/lib/socketAdmin.js

@@ -0,0 +1,246 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SocketAdmin = void 0;
+/**
+ *      Class Socket
+ *
+ *      Copyright 2014-2025 bluefox <dogafox@gmail.com>,
+ *      MIT License
+ *
+ */
+const socketCommon_1 = require("./socketCommon");
+const socketCommandsAdmin_1 = require("./socketCommandsAdmin");
+const passport = __importStar(require("passport"));
+const cookieParser = __importStar(require("cookie-parser"));
+const passportSocket_1 = require("./passportSocket");
+class SocketAdmin extends socketCommon_1.SocketCommon {
+    adminCommands;
+    constructor(settings, adapter, objects) {
+        super(settings, adapter);
+        // user another set of commands for admin
+        this.commands = new socketCommandsAdmin_1.SocketCommandsAdmin(adapter, socket => this.__updateSession(socket), this.context, objects);
+        this.adminCommands = this.commands;
+    }
+    __getIsNoDisconnect() {
+        // ws does not require disconnect
+        return true;
+    }
+    #onAuthorizeSuccess = (data, accept) => {
+        this.adapter.log.debug(`successful connection to socket.io from ${(data.socket || data.connection).remoteAddress}`);
+        // no error
+        accept(false);
+    };
+    #onAuthorizeFail = (data, message, critical, accept) => {
+        setTimeout(() => data.socket.emit(socketCommon_1.SocketCommon.COMMAND_RE_AUTHENTICATE), 100);
+        if (critical) {
+            this.adapter?.log.info(`failed connection to socket.io from ${(data.socket || data.connection).remoteAddress}: ${message}`);
+        }
+        // this error will be sent to the user as a special error-package
+        // see: http://socket.io/docs/client-api/#socket > error-object
+        if (critical) {
+            // @ts-expect-error
+            accept(new Error(message));
+        }
+        else {
+            // @ts-expect-error
+            accept(new Error(`failed connection to socket.io: ${message}`));
+        }
+    };
+    __initAuthentication(authOptions) {
+        this.store = authOptions.store;
+        this.server?.use((0, passportSocket_1.authorize)({
+            // @ts-expect-error fix later
+            passport,
+            // @ts-expect-error fix later
+            cookieParser,
+            key: authOptions.userKey, // the name of the cookie where express/connect stores its session_id
+            secret: authOptions.secret, // the session_secret to parse the cookie
+            store: authOptions.store, // we NEED to use a sessionstore. no memorystore, please
+            success: this.#onAuthorizeSuccess, // *optional* callback on success - read more below
+            fail: this.#onAuthorizeFail, // *optional* callback on fail/error - read more below
+        }));
+    }
+    // Extract username from socket
+    __getUserFromSocket(socket, callback) {
+        if (socket.conn.request.sessionID) {
+            socket._secure = true;
+            socket._sessionID = socket.conn.request.sessionID;
+            // Get user for session
+            void this.adapter.getSession(socket.conn.request.sessionID, obj => {
+                if (!obj?.passport) {
+                    if (socket._acl) {
+                        socket._acl.user = '';
+                    }
+                    socket.emit(socketCommon_1.SocketCommon.COMMAND_RE_AUTHENTICATE);
+                    callback('Cannot detect user');
+                }
+                else {
+                    callback(null, obj.passport.user ? `system.user.${obj.passport.user}` : '');
+                }
+            });
+        }
+        else {
+            callback('Cannot detect user');
+        }
+    }
+    __getClientAddress(socket) {
+        let address;
+        if (socket.connection) {
+            address = socket.connection.remoteAddress;
+        }
+        else {
+            // @ts-expect-error socket.io
+            address = socket.ws._socket.remoteAddress;
+        }
+        // @ts-expect-error socket.io
+        if (!address && socket.handshake) {
+            // @ts-expect-error socket.io
+            address = socket.handshake.address;
+        }
+        // @ts-expect-error socket.io
+        if (!address && socket.conn.request?.connection) {
+            // @ts-expect-error socket.io
+            address = socket.conn.request.connection.remoteAddress;
+        }
+        return address;
+    }
+    // update session ID, but not ofter than 60 seconds
+    __updateSession(socket) {
+        if (socket._sessionID) {
+            const time = Date.now();
+            if (socket._lastActivity && time - socket._lastActivity > (this.settings.ttl || 3600) * 1000) {
+                this.adapter.log.warn('REAUTHENTICATE!');
+                socket.emit(socketCommon_1.SocketCommon.COMMAND_RE_AUTHENTICATE);
+                return false;
+            }
+            socket._lastActivity = time;
+            socket._sessionTimer ||= setTimeout(() => {
+                socket._sessionTimer = undefined;
+                void this.adapter.getSession(socket._sessionID, obj => {
+                    if (obj) {
+                        void this.adapter.setSession(socket._sessionID, this.settings.ttl || 3600, obj);
+                    }
+                    else {
+                        this.adapter.log.warn('REAUTHENTICATE!');
+                        socket.emit(socketCommon_1.SocketCommon.COMMAND_RE_AUTHENTICATE);
+                    }
+                });
+            }, 60_000);
+        }
+        return true;
+    }
+    __getSessionID(socket) {
+        return this.settings.auth ? socket.conn.request.sessionID : null;
+    }
+    start(server, socketClass, authOptions, socketOptions) {
+        super.start(server, socketClass, authOptions, socketOptions);
+        this.adminCommands.start(thresholdEnabled => this.onThresholdChanged(thresholdEnabled));
+    }
+    onThresholdChanged(enabled) {
+        this.server && this.server.sockets && this.server.sockets.emit('eventsThreshold', enabled);
+    }
+    stateChange(id, state) {
+        this.adminCommands.stateChange(id, state);
+        const sockets = this.getSocketsList();
+        if (sockets) {
+            if (Array.isArray(sockets)) {
+                sockets.forEach(socket => this.commands.publish(socket, 'stateChange', id, state));
+            }
+            else {
+                Object.values(sockets).forEach(socket => this.commands.publish(socket, 'stateChange', id, state));
+            }
+        }
+    }
+    fileChange(id, fileName, size) {
+        const sockets = this.getSocketsList();
+        if (sockets) {
+            if (Array.isArray(sockets)) {
+                sockets.forEach(socket => this.commands.publishFile(socket, id, fileName, size));
+            }
+            else {
+                Object.values(sockets).forEach(socket => this.commands.publishFile(socket, id, fileName, size));
+            }
+        }
+    }
+    repoUpdated() {
+        const sockets = this.getSocketsList();
+        if (sockets) {
+            if (Array.isArray(sockets)) {
+                sockets.forEach(socket => this.__updateSession(socket));
+            }
+            else {
+                Object.values(sockets).forEach(socket => this.__updateSession(socket));
+            }
+            this.server?.sockets.emit('repoUpdated');
+        }
+    }
+    objectChange(id, obj) {
+        const sockets = this.getSocketsList();
+        if (sockets) {
+            if (Array.isArray(sockets)) {
+                sockets.forEach(socket => this.commands.publish(socket, 'objectChange', id, obj));
+            }
+            else {
+                Object.values(sockets).forEach(socket => this.commands.publish(socket, 'objectChange', id, obj));
+            }
+        }
+    }
+    subscribe(type, pattern) {
+        this.commands.subscribe(null, type, pattern);
+    }
+    subscribeFile(id, patternFile) {
+        this.commands.subscribe(null, 'fileChange', id, patternFile);
+    }
+    sendCommand(obj) {
+        if (this.adminCommands.sendCommand(obj)) {
+            const sockets = this.getSocketsList();
+            if (sockets) {
+                if (Array.isArray(sockets)) {
+                    sockets.forEach(socket => this.__updateSession(socket));
+                }
+                else {
+                    Object.values(sockets).forEach(socket => this.__updateSession(socket));
+                }
+                this.server?.sockets.emit(obj.command, obj.message.id, obj.message.data);
+            }
+        }
+    }
+    updateRatings(uuid, isAutoUpdate) {
+        return this.adminCommands.updateRatings(uuid, isAutoUpdate);
+    }
+}
+exports.SocketAdmin = SocketAdmin;
+//# sourceMappingURL=socketAdmin.js.map

package/dist/lib/socketAdmin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"socketAdmin.js","sourceRoot":"","sources":["../../src/lib/socketAdmin.ts"],"names":[],"mappings":"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"}

package/dist/lib/socketCommands.d.ts

@@ -41,7 +41,7 @@ export declare class SocketCommands {
         error?: string;
         result?: any;
     }) => void) => void) | null;
-    states: Record<string, ioBroker.State> | null;
+    states: Record<string, ioBroker.State> | undefined;
     constructor(adapter: ioBroker.Adapter, updateSession: (socket: WebSocketClient) => boolean, context: SocketDataContext);
     /**
      * Convert errors into strings and then call cb
@@ -52,12 +52,12 @@ export declare class SocketCommands {
      */
     static _fixCallback(callback: SocketCallback | null | undefined, error: string | Error | null | undefined, ...args: any[]): void;
     _checkPermissions(socket: WebSocketClient, command: PermissionCommands, callback: ((error: string | null, ...args: any[]) => void) | undefined, ...args: any[]): boolean;
-    publish(socket: WebSocketClient, type: SocketSubscribeTypes, id: string, obj: ioBroker.Object | ioBroker.State): boolean;
+    publish(socket: WebSocketClient, type: SocketSubscribeTypes, id: string, obj: ioBroker.Object | ioBroker.State | null | undefined): boolean;
     publishFile(socket: WebSocketClient, id: string, fileName: string, size: number): boolean;
     publishInstanceMessage(socket: WebSocketClient, sourceInstance: string, messageType: string, data: any): boolean;
     _showSubscribes(socket: WebSocketClient, type: SocketSubscribeTypes): void;
     isLogEnabled(): boolean;
-    subscribe(socket: WebSocketClient, type: SocketSubscribeTypes, pattern: string, patternFile?: string): void;
+    subscribe(socket: WebSocketClient | null, type: SocketSubscribeTypes, pattern: string, patternFile?: string): void;
     unsubscribe(socket: WebSocketClient, type: SocketSubscribeTypes, pattern: string, patternFile?: string): void;
     subscribeSocket(socket: WebSocketClient, type?: SocketSubscribeTypes): void;
     unsubscribeSocket(socket: WebSocketClient, type?: SocketSubscribeTypes): void;

package/dist/lib/socketCommands.js

@@ -68,7 +68,7 @@ class SocketCommands {
     #updateSession;
     adapterName;
     _sendToHost;
-    states = null;
+    states;
     constructor(adapter, updateSession, context) {
         this.adapter = adapter;
         this.#updateSession = updateSession;
@@ -908,8 +908,6 @@ class SocketCommands {
          * @param callback callback `(error?: Error) => void`
          */
         this.commands.logout = (socket, callback) => {
-            // Logout user
-            // @param {function} callback - function (error)
             if (socket.id) {
                 void this.adapter.destroySession(socket.id, callback);
             }
@@ -940,8 +938,6 @@ class SocketCommands {
          * @param callback callback `(error: string | null | undefined, userPermissions?: SocketACL | null) => void`
          */
         this.commands.getUserPermissions = (socket, callback) => {
-            // Get user permissions
-            // @param {function} callback - `function (error, permissions)`
             if (this._checkPermissions(socket, 'getUserPermissions', callback)) {
                 if (typeof callback === 'function') {
                     callback(null, socket._acl);
@@ -959,8 +955,6 @@ class SocketCommands {
          * @param callback callback `(error: string | Error | null | undefined, version: string | undefined, adapterName: string) => void`
          */
         this.commands.getVersion = (socket, callback) => {
-            // Get the adapter version. Not the socket-classes version!
-            // @param {function} callback - `function (error, adapterVersion, adapterName)`
             if (this._checkPermissions(socket, 'getVersion', callback)) {
                 if (typeof callback === 'function') {
                     callback(null, this.adapter.version, this.adapter.name);
@@ -978,8 +972,6 @@ class SocketCommands {
          * @param callback callback `(error: string | Error | null | undefined, version: string | undefined, adapterName: string) => void`
          */
         this.commands.getAdapterName = (socket, callback) => {
-            // Get adapter name. Not the socket-classes version!
-            // @param {function} callback - `function (error, adapterVersion)`
             if (this._checkPermissions(socket, 'getAdapterName', callback)) {
                 if (typeof callback === 'function') {
                     callback(null, this.adapter.name || 'unknown');
@@ -1963,7 +1955,6 @@ class SocketCommands {
          * @param callback Callback `(error: string | null) => void`
          */
         this.commands.clientUnsubscribe = (socket, targetInstance, messageType, callback) => {
-            // @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}`;