@iobroker/socket-classes 1.6.2 → 2.0.0

package/dist/lib/socketCommon.js

@@ -0,0 +1,496 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SocketCommon = void 0;
+const socketCommands_1 = require("./socketCommands");
+// this class can manage 3 types of Socket.io
+// - socket.io v2
+// - socket.io v4
+// - iobroker ws socket
+class SocketCommon {
+    static COMMAND_RE_AUTHENTICATE = 'reauthenticate';
+    server = null;
+    serverMode = false;
+    settings;
+    adapter;
+    infoTimeout = null;
+    store = null; // will be set in __initAuthentication
+    // @ts-expect-error commands actually cannot be null
+    commands;
+    noDisconnect;
+    eventHandlers = {};
+    wsRoutes = {};
+    // Structure for socket.io 4
+    allNamespaces;
+    context;
+    initialized = false;
+    constructor(settings, adapter) {
+        this.settings = settings || {};
+        this.adapter = adapter;
+        this.noDisconnect = this.__getIsNoDisconnect();
+        this.settings.defaultUser = this.settings.defaultUser || 'system.user.admin';
+        if (!this.settings.defaultUser.match(/^system\.user\./)) {
+            this.settings.defaultUser = `system.user.${this.settings.defaultUser}`;
+        }
+        this.settings.ttl = parseInt(this.settings.ttl, 10) || 3600;
+        this.context = {
+            language: this.settings.language || 'en',
+            ratings: null,
+            ratingTimeout: null,
+        };
+    }
+    __getIsNoDisconnect() {
+        throw new Error('"__getIsNoDisconnect" must be implemented in SocketCommon!');
+    }
+    __initAuthentication(_authOptions) {
+        throw new Error('"__initAuthentication" must be implemented in SocketCommon!');
+    }
+    // Extract username from socket
+    __getUserFromSocket(_socket, _callback) {
+        throw new Error('"__getUserFromSocket" must be implemented in SocketCommon!');
+    }
+    __getClientAddress(_socket) {
+        throw new Error('"__getClientAddress" must be implemented in SocketCommon!');
+    }
+    // update session ID, but not ofter than 60 seconds
+    __updateSession(_socket) {
+        throw new Error('"__updateSession" must be implemented in SocketCommon!');
+    }
+    __getSessionID(_socket) {
+        throw new Error('"__getSessionID" must be implemented in SocketCommon!');
+    }
+    /** Install handler on connecting and disconnecting events */
+    addEventHandler(eventName, handler) {
+        this.eventHandlers[eventName] = handler;
+    }
+    /**
+     * Add a new route for the websocket
+     *
+     * @param path the path to listen for like "/cameras.0/*"
+     * @param handler Web socket custom handler
+     */
+    addWsRoute(path, handler) {
+        this.wsRoutes[path] = handler;
+    }
+    start(server, socketClass, authOptions, socketOptions) {
+        this.serverMode = !!socketClass;
+        this.commands ||= new socketCommands_1.SocketCommands(this.adapter, socket => this.__updateSession(socket), this.context);
+        if (!server) {
+            throw new Error('Server cannot be empty');
+        }
+        // it can be used as a client too for cloud
+        if (socketClass) {
+            if (!this.initialized) {
+                // @ts-expect-error socket.io v2 has listen function
+                if (typeof socketClass.listen === 'function') {
+                    // old socket.io@2.x and ws
+                    // @ts-expect-error socket.io v2 has the listen function
+                    this.server = socketClass.listen(server, socketOptions);
+                }
+                else if (typeof socketClass.constructor === 'function') {
+                    // iobroker socket
+                    this.server = new socketClass(server);
+                }
+                else {
+                    // socket.io 4.x
+                    // @ts-expect-error socket.io v4 could be created without new
+                    this.server = socketClass(server, socketOptions);
+                }
+                // @ts-expect-error socket.io v4 supports namespaces
+                if (typeof this.server.of === 'function') {
+                    // @ts-expect-error socket.io v4 supports namespaces
+                    this.allNamespaces = this.server.of(/.*/);
+                }
+                this.initialized = true;
+                this.adapter.log.info(`${this.settings.secure ? 'Secure ' : ''}socket.io server listening on port ${this.settings.port}`);
+            }
+            if (this.settings.auth && this.server) {
+                this.__initAuthentication(authOptions);
+            }
+            // Enable cross-domain access
+            // deprecated, because no more used in socket.io@4 only(in @2)
+            // @ts-expect-error socket.io v2 has "set" for options
+            if (this.settings.crossDomain && this.server.set) {
+                // @ts-expect-error socket.io v2 has "set" for options
+                this.server.set('origins', '*:*');
+            }
+            this.server.on('connection', (socket, cb) => {
+                // Support of handlers for web sockets by path
+                // Todo: support of wildcards like /cameras.0/*
+                if (socket.conn?.request?.pathname && this.wsRoutes[socket.conn.request.pathname]) {
+                    this.wsRoutes[socket.conn.request.pathname](socket, cb);
+                    return;
+                }
+                this.eventHandlers.connect?.(socket);
+                this._initSocket(socket, cb);
+            });
+            // support of dynamic namespaces (because of reverse proxy) for socket.io 4
+            this.allNamespaces?.on('connection', (socket, cb) => {
+                // Support of handlers for web sockets by path
+                // Todo: support of wildcards like /cameras.0/*
+                if (socket.conn?.request?.pathname && this.wsRoutes[socket.conn.request.pathname]) {
+                    this.wsRoutes[socket.conn.request.pathname](socket, cb);
+                    return;
+                }
+                this.eventHandlers.connect?.(socket);
+                this._initSocket(socket, cb);
+            });
+        }
+        this.server.on('error', (error, details) => {
+            // ignore "failed connection" as it already shown
+            if (!error?.message?.includes('failed connection')) {
+                if (error?.message?.includes('authentication failed') ||
+                    details?.toString().includes('authentication failed')) {
+                    this.adapter.log.debug(`Error: ${error?.message || JSON.stringify(error)}${details ? ` - ${!details || typeof details === 'object' ? JSON.stringify(details) : details.toString()}` : ''}`);
+                }
+                else {
+                    this.adapter.log.error(`Error: ${error?.message || JSON.stringify(error)}${details ? ` - ${!details || typeof details === 'object' ? JSON.stringify(details) : details.toString()}` : ''}`);
+                }
+            }
+        });
+        // support of dynamic namespaces (because of reverse proxy)
+        this.allNamespaces?.on('error', (error, details) => {
+            // ignore "failed connection" as it already shown
+            if (!error?.message?.includes('failed connection')) {
+                if (error && error.message && error.message.includes('authentication failed')) {
+                    this.adapter.log.debug(`Error: ${(error && error.message) || JSON.stringify(error)}${details ? ` - ${!details || typeof details === 'object' ? JSON.stringify(details) : details.toString()}` : ''}`);
+                }
+                else {
+                    this.adapter.log.error(`Error: ${(error && error.message) || JSON.stringify(error)}${details ? ` - ${!details || typeof details === 'object' ? JSON.stringify(details) : details.toString()}` : ''}`);
+                }
+            }
+        });
+        this.#updateConnectedInfo();
+    }
+    _initSocket(socket, cb) {
+        this.commands.disableEventThreshold();
+        const address = this.__getClientAddress(socket);
+        if (!socket._acl) {
+            if (this.settings.auth) {
+                this.__getUserFromSocket(socket, (err, user) => {
+                    if (err || !user) {
+                        socket.emit(SocketCommon.COMMAND_RE_AUTHENTICATE);
+                        this.adapter.log.error(`socket.io [init] ${err || 'No user found in cookies'}`);
+                        // ws does not require disconnect
+                        if (!this.noDisconnect) {
+                            socket.close();
+                        }
+                    }
+                    else {
+                        socket._secure = true;
+                        this.adapter.log.debug(`socket.io client ${user} connected`);
+                        if (!user.startsWith('system.user.')) {
+                            user = `system.user.${user}`;
+                        }
+                        void this.adapter.calculatePermissions(user, socketCommands_1.SocketCommands.COMMANDS_PERMISSIONS, (acl) => {
+                            socket._acl = SocketCommon._mergeACLs(address.address, acl, this.settings.whiteListSettings);
+                            this._socketEvents(socket, address.address, cb);
+                        });
+                    }
+                });
+            }
+            else {
+                void this.adapter.calculatePermissions(this.settings.defaultUser || '', socketCommands_1.SocketCommands.COMMANDS_PERMISSIONS, (acl) => {
+                    socket._acl = SocketCommon._mergeACLs(address.address, acl, this.settings.whiteListSettings);
+                    this._socketEvents(socket, address.address, cb);
+                });
+            }
+        }
+        else {
+            this._socketEvents(socket, address.address, cb);
+        }
+    }
+    unsubscribeSocket(socket, type) {
+        return this.commands.unsubscribeSocket(socket, type);
+    }
+    _unsubscribeAll() {
+        if (this.server?.ioBroker) {
+            // this could be an object or array
+            const sockets = this.getSocketsList();
+            // this could be an object or array: an array is ioBroker, object is socket.io
+            if (Array.isArray(sockets)) {
+                for (const socket of sockets) {
+                    this.commands.unsubscribeSocket(socket);
+                }
+            }
+            else {
+                Object.values(sockets).forEach(socket => {
+                    this.commands.unsubscribeSocket(socket);
+                });
+            }
+        }
+        else if (this.server?.sockets) {
+            // It is socket.io
+            for (const socket in this.server.sockets) {
+                if (Object.prototype.hasOwnProperty.call(this.server.sockets, socket)) {
+                    // @ts-expect-error socket.io has own structure
+                    this.commands.unsubscribeSocket(this.server.sockets[socket]);
+                }
+            }
+        }
+    }
+    static getWhiteListIpForAddress(address, whiteList) {
+        if (!whiteList) {
+            return null;
+        }
+        // check IPv6 or IPv4 direct match
+        if (Object.prototype.hasOwnProperty.call(whiteList, address)) {
+            return address;
+        }
+        // check if the address is IPv4
+        const addressParts = address.split('.');
+        if (addressParts.length !== 4) {
+            return null;
+        }
+        // do we have settings for wild-carded ips?
+        const wildCardIps = Object.keys(whiteList).filter(key => key.includes('*'));
+        if (!wildCardIps.length) {
+            // no wild-carded ips => no ip configured
+            return null;
+        }
+        wildCardIps.forEach(ip => {
+            const ipParts = ip.split('.');
+            if (ipParts.length === 4) {
+                for (let i = 0; i < 4; i++) {
+                    if (ipParts[i] === '*' && i === 3) {
+                        // match
+                        return ip;
+                    }
+                    if (ipParts[i] !== addressParts[i]) {
+                        break;
+                    }
+                }
+            }
+        });
+        return null;
+    }
+    static _getPermissionsForIp(address, whiteList) {
+        return whiteList[SocketCommon.getWhiteListIpForAddress(address, whiteList) || 'default'];
+    }
+    static _mergeACLs(address, acl, whiteList) {
+        if (whiteList && address) {
+            const whiteListAcl = SocketCommon._getPermissionsForIp(address, whiteList);
+            if (whiteListAcl) {
+                if (acl.object && whiteListAcl.object) {
+                    if (whiteListAcl.object.list !== undefined) {
+                        acl.object.list = acl.object.list && whiteListAcl.object.list;
+                    }
+                    if (whiteListAcl.object.read !== undefined) {
+                        acl.object.read = acl.object.read && whiteListAcl.object.read;
+                    }
+                    if (whiteListAcl.object.write !== undefined) {
+                        acl.object.write = acl.object.write && whiteListAcl.object.write;
+                    }
+                    if (whiteListAcl.object.delete !== undefined) {
+                        acl.object.delete = acl.object.delete && whiteListAcl.object.delete;
+                    }
+                }
+                if (acl.state && whiteListAcl.state) {
+                    if (whiteListAcl.state.list !== undefined) {
+                        acl.state.list = acl.state.list && whiteListAcl.state.list;
+                    }
+                    if (whiteListAcl.state.read !== undefined) {
+                        acl.state.read = acl.state.read && whiteListAcl.state.read;
+                    }
+                    if (whiteListAcl.state.write !== undefined) {
+                        acl.state.write = acl.state.write && whiteListAcl.state.write;
+                    }
+                    if (whiteListAcl.state.create !== undefined) {
+                        acl.state.create = acl.state.create && whiteListAcl.state.create;
+                    }
+                    if (whiteListAcl.state.delete !== undefined) {
+                        acl.state.delete = acl.state.delete && whiteListAcl.state.delete;
+                    }
+                }
+                if (acl.file && whiteListAcl.file) {
+                    if (whiteListAcl.file.list !== undefined) {
+                        acl.file.list = acl.file.list && whiteListAcl.file.list;
+                    }
+                    if (whiteListAcl.file.read !== undefined) {
+                        acl.file.read = acl.file.read && whiteListAcl.file.read;
+                    }
+                    if (whiteListAcl.file.write !== undefined) {
+                        acl.file.write = acl.file.write && whiteListAcl.file.write;
+                    }
+                    if (whiteListAcl.file.create !== undefined) {
+                        acl.file.create = acl.file.create && whiteListAcl.file.create;
+                    }
+                    if (whiteListAcl.file.delete !== undefined) {
+                        acl.file.delete = acl.file.delete && whiteListAcl.file.delete;
+                    }
+                }
+                if (whiteListAcl.user !== 'auth') {
+                    acl.user = `system.user.${whiteListAcl.user}`;
+                }
+            }
+        }
+        return acl;
+    }
+    // install event handlers on socket
+    _socketEvents(socket, address, cb) {
+        if (this.serverMode) {
+            this.adapter.log.info(`==> Connected ${socket._acl?.user} from ${address}`);
+        }
+        else {
+            this.adapter.log.info(`Trying to connect as ${socket._acl?.user} to ${address}`);
+        }
+        this.#updateConnectedInfo();
+        if (!this.commands.getCommandHandler('name')) {
+            // socket sends its name => update list of sockets
+            this.addCommandHandler('name', (_socket, name, cb) => {
+                this.adapter.log.debug(`Connection from "${name}"`);
+                if (_socket._name === undefined) {
+                    _socket._name = name;
+                    this.#updateConnectedInfo();
+                }
+                else if (_socket._name !== name) {
+                    this.adapter.log.warn(`socket ${_socket.id} changed socket name from ${_socket._name} to ${name}`);
+                    _socket._name = name;
+                    this.#updateConnectedInfo();
+                }
+                if (typeof cb === 'function') {
+                    cb();
+                }
+            });
+        }
+        this.commands.applyCommands(socket);
+        // disconnect
+        socket.on('disconnect', (error) => {
+            this.commands.unsubscribeSocket(socket);
+            this.#updateConnectedInfo();
+            // Disable logging if no one browser is connected
+            if (this.adapter.requireLog && this.commands && this.commands.isLogEnabled()) {
+                this.adapter.log.debug('Disable logging, because no one socket connected');
+                void this.adapter.requireLog(!!this.server?.engine?.clientsCount);
+            }
+            if (this.eventHandlers.disconnect) {
+                this.eventHandlers.disconnect(socket, error?.toString());
+            }
+            else {
+                this.adapter.log.info(`<== Disconnect ${socket._acl?.user} from ${this.__getClientAddress(socket).address} ${socket._name || ''}`);
+            }
+        });
+        if (typeof this.settings.extensions === 'function') {
+            this.settings.extensions(socket);
+        }
+        // if server mode
+        if (this.serverMode) {
+            const sessionId = this.__getSessionID(socket);
+            if (sessionId) {
+                socket._secure = true;
+                socket._sessionID = sessionId;
+                // Get user for session
+                this.store?.get(socket._sessionID, (err, obj) => {
+                    if (!obj?.passport) {
+                        if (socket._acl) {
+                            socket._acl.user = '';
+                        }
+                        socket.emit(SocketCommon.COMMAND_RE_AUTHENTICATE);
+                        // ws does not require disconnect
+                        if (!this.noDisconnect) {
+                            socket.close();
+                        }
+                    }
+                    if (socket._authPending) {
+                        socket._authPending(!!socket._acl?.user, true);
+                        delete socket._authPending;
+                    }
+                });
+            }
+        }
+        this.commands.subscribeSocket(socket);
+        cb && cb();
+    }
+    #updateConnectedInfo() {
+        // only in server mode
+        if (this.serverMode) {
+            if (this.infoTimeout) {
+                clearTimeout(this.infoTimeout);
+                this.infoTimeout = null;
+            }
+            this.infoTimeout = setTimeout(() => {
+                this.infoTimeout = null;
+                if (this.server) {
+                    const clientsArray = [];
+                    const sockets = this.getSocketsList();
+                    // this could be an object or array: an array is ioBroker, object is socket.io
+                    if (Array.isArray(sockets)) {
+                        for (const socket of sockets) {
+                            clientsArray.push(socket._name || 'noname');
+                        }
+                    }
+                    else {
+                        Object.values(sockets).forEach(socket => {
+                            clientsArray.push(socket._name || 'noname');
+                        });
+                    }
+                    const text = `[${clientsArray.length}]${clientsArray.join(', ')}`;
+                    void this.adapter.setState('info.connected', text, true);
+                }
+            }, 1000);
+        }
+    }
+    checkPermissions(socket, command, callback, ...args) {
+        return this.commands._checkPermissions(socket, command, callback, args);
+    }
+    addCommandHandler(command, handler) {
+        this.commands.addCommandHandler(command, handler);
+    }
+    sendLog(obj) {
+        // TODO Build in some threshold
+        this.server?.sockets?.emit('log', obj);
+    }
+    publish(socket, type, id, obj) {
+        return this.commands.publish(socket, type, id, obj);
+    }
+    publishInstanceMessage(socket, sourceInstance, messageType, data) {
+        return this.commands.publishInstanceMessage(socket, sourceInstance, messageType, data);
+    }
+    publishFile(socket, id, fileName, size) {
+        return this.commands.publishFile(socket, id, fileName, size);
+    }
+    getSocketsList() {
+        if (this.server?.sockets) {
+            // this could be an object or array
+            return this.server.sockets.sockets || this.server.sockets.connected;
+        }
+        return null;
+    }
+    publishInstanceMessageAll(sourceInstance, messageType, sid, data) {
+        const sockets = this.getSocketsList();
+        if (sockets) {
+            // this could be an object or array: an array is ioBroker, an object is socket.io
+            if (Array.isArray(sockets)) {
+                for (const socket of sockets) {
+                    if (socket.id === sid) {
+                        this.publishInstanceMessage(socket, sourceInstance, messageType, data);
+                    }
+                }
+            }
+            else {
+                Object.values(sockets).forEach(socket => {
+                    if (socket.id === sid) {
+                        this.publishInstanceMessage(socket, sourceInstance, messageType, data);
+                    }
+                });
+            }
+        }
+    }
+    close() {
+        this._unsubscribeAll();
+        this.commands.destroy();
+        // IO server will be closed
+        try {
+            this.server?.close?.();
+            this.server = null;
+        }
+        catch {
+            // ignore
+        }
+        if (this.infoTimeout) {
+            clearTimeout(this.infoTimeout);
+            this.infoTimeout = null;
+        }
+    }
+}
+exports.SocketCommon = SocketCommon;
+//# sourceMappingURL=socketCommon.js.map

package/dist/lib/socketCommon.js.map

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

package/dist/types.d.ts

@@ -0,0 +1,62 @@
+export type SocketOperation = 'read' | 'write' | 'list' | 'delete' | 'create' | 'http' | 'execute' | 'sendto' | '';
+
+export type PermissionCommands =
+    | 'subscribe'
+    | 'unsubscribe'
+    | 'subscribeFiles'
+    | 'unsubscribeFiles'
+    | 'getStateHistory'
+    | 'httpGet'
+    | 'sendTo'
+    | 'cmdExec'
+    | 'sendToHost'
+    | 'authEnabled'
+    | 'getUserPermissions'
+    | 'getVersion'
+    | 'getAdapterName'
+    | 'readFile'
+    | 'readFile64'
+    | 'writeFile64'
+    | 'writeFile'
+    | 'unlink'
+    | 'rename'
+    | 'mkdir'
+    | 'readDir'
+    | 'chmodFile'
+    | 'chownFile'
+    | 'fileExists'
+    | 'getObject'
+    | 'setObject'
+    | 'getObjects'
+    | 'subscribeObjects'
+    | 'unsubscribeObjects'
+    | 'getStates'
+    | 'getState'
+    | 'setState'
+    | 'getObjectView'
+    | 'delObject'
+    | 'requireLog'
+    | 'createState'
+    | 'createFile'
+    | 'deleteFile'
+    | 'disconnect'
+    | 'listPermissions'
+
+    // admin
+    | 'getHostByIp'
+    | 'delGroup'
+    | 'addGroup'
+    | 'delUser'
+    | 'addUser'
+    | 'changePassword'
+    | 'readLogs'
+    | 'delState'
+    | 'extendObject';
+
+export type SocketSubscribeTypes = 'fileChange' | 'stateChange' | 'objectChange' | 'log';
+
+export interface CallOptions {
+    user?: string;
+}
+
+export type SocketCallback = (error: string | Error | null | undefined, ...args: any[]) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iobroker/socket-classes",
-  "version": "1.6.2",
+  "version": "2.0.0",
   "description": "ioBroker server-side web sockets",
   "author": {
     "name": "bluefox",
@@ -21,41 +21,47 @@
     "url": "https://github.com/ioBroker/ioBroker.socket-classes"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^3.2.2",
-    "axios": "^1.7.8",
+    "@iobroker/adapter-core": "^3.2.3",
+    "axios": "^1.7.9",
     "cookie-parser": "^1.4.7",
     "passport": "^0.7.0"
   },
   "devDependencies": {
     "@alcalzone/release-script": "^3.8.0",
     "@alcalzone/release-script-plugin-license": "^3.7.0",
-    "@foxriver76/eslint-config": "^1.0.5",
+    "@iobroker/eslint-config": "^1.0.0",
+    "@iobroker/js-controller-common-db": "^7.0.6",
+    "@iobroker/ws-server": "^4.2.2",
+    "@iobroker/types": "^7.0.6",
+    "@types/axios": "^0.14.4",
+    "@types/cookie-parser": "^1.4.8",
+    "@types/node": "^22.13.1",
+    "@types/passport": "^1.0.17",
     "chai": "^4.5.0",
-    "gulp": "^4.0.2",
-    "iobroker.js-controller": "^6.0.11",
-    "mocha": "^10.8.2"
+    "iobroker.js-controller": "^7.0.6",
+    "mocha": "^11.1.0",
+    "typescript": "^5.7.3"
   },
   "bugs": {
     "url": "https://github.com/ioBroker/ioBroker.web/issues"
   },
-  "main": "index.js",
+  "main": "dist/index.js",
   "files": [
     "LICENSE",
-    "lib/",
-    "index.js",
-    "lib/socketCommon.js",
-    "lib/socketAdmin.js"
+    "dist/"
   ],
   "scripts": {
-    "lint": "eslint .",
-    "test": "node node_modules/mocha/bin/mocha --exit",
+    "lint": "eslint -c eslint.config.mjs",
+    "test": "mocha --exit",
+    "build": "npm run build-backend && npm run docs",
+    "build-backend": "tsc -p tsconfig.build.json && node tasks --prebuild",
     "release": "release-script",
     "release-patch": "release-script patch --no-update-lockfile --yes",
     "release-minor": "release-script minor --no-update-lockfile --yes",
     "release-major": "release-script major --no-update-lockfile --yes",
-    "update-packages": "ncu --upgrade",
-    "npm": "npm install --ignore-script",
-    "docs": "gulp"
+    "update-packages": "npx -y npm-check-updates --upgrade",
+    "docs": "node tasks",
+    "npm": "npm i -f"
   },
   "license": "MIT",
   "maintainers": [