@fastybird/smart-panel-backend 0.1.0-alpha.5 → 0.1.0-alpha.7

package/dist/plugins/devices-zigbee2mqtt/services/virtual-property.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"virtual-property.types.js","sourceRoot":"","sources":["../../../../src/plugins/devices-zigbee2mqtt/services/virtual-property.types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"virtual-property.types.js","sourceRoot":"","sources":["../../../../src/plugins/devices-zigbee2mqtt/services/virtual-property.types.ts"],"names":[],"mappings":";;;AAkVA,wEAGC;AAKD,oEAMC;AAhWD,kFAKoD;AAKpD,IAAY,mBAkBX;AAlBD,WAAY,mBAAmB;IAK9B,wCAAiB,CAAA;IAMjB,0CAAmB,CAAA;IAMnB,0CAAmB,CAAA;AACpB,CAAC,EAlBW,mBAAmB,mCAAnB,mBAAmB,QAkB9B;AA+GD,IAAY,cAyBX;AAzBD,WAAY,cAAc;IAKzB,mFAAiE,CAAA;IAMjE,mFAAiE,CAAA;IAMjE,2EAAyD,CAAA;IAOzD,+EAA6D,CAAA;AAC9D,CAAC,EAzBW,cAAc,8BAAd,cAAc,QAyBzB;AAqFY,QAAA,0BAA0B,GAA+B;IAErE;QACC,gBAAgB,EAAE,mCAAe,CAAC,OAAO;QACzC,kBAAkB,EAAE;YAEnB;gBACC,iBAAiB,EAAE,oCAAgB,CAAC,MAAM;gBAC1C,YAAY,EAAE,mBAAmB,CAAC,OAAO;gBACzC,SAAS,EAAE,gCAAY,CAAC,IAAI;gBAC5B,WAAW,EAAE,CAAC,kCAAc,CAAC,SAAS,CAAC;gBACvC,MAAM,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,CAAC;gBACjC,eAAe,EAAE,SAAS;gBAC1B,UAAU,EAAE;oBACX,IAAI,EAAE,cAAc,CAAC,4BAA4B;oBACjD,MAAM,EAAE;wBACP,YAAY,EAAE,EAAE;wBAChB,aAAa,EAAE,IAAI;wBACnB,gBAAgB,EAAE,UAAU;qBAC5B;iBACD;aACD;SACD;KACD;IAGD;QACC,gBAAgB,EAAE,mCAAe,CAAC,WAAW;QAC7C,kBAAkB,EAAE;YAEnB;gBACC,iBAAiB,EAAE,oCAAgB,CAAC,KAAK;gBACzC,YAAY,EAAE,mBAAmB,CAAC,OAAO;gBACzC,SAAS,EAAE,gCAAY,CAAC,IAAI;gBAC5B,WAAW,EAAE,CAAC,kCAAc,CAAC,SAAS,CAAC;gBACvC,MAAM,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC;gBAC/C,eAAe,EAAE,aAAa;gBAC9B,UAAU,EAAE;oBACX,IAAI,EAAE,cAAc,CAAC,8BAA8B;oBACnD,MAAM,EAAE;wBACP,eAAe,EAAE,IAAI;wBACrB,iBAAiB,EAAE,GAAG;wBACtB,cAAc,EAAE,EAAE;qBAClB;iBACD;aACD;SACD;KACD;IAID;QACC,gBAAgB,EAAE,mCAAe,CAAC,eAAe;QACjD,kBAAkB,EAAE;YAEnB;gBACC,iBAAiB,EAAE,oCAAgB,CAAC,IAAI;gBACxC,YAAY,EAAE,mBAAmB,CAAC,MAAM;gBACxC,SAAS,EAAE,gCAAY,CAAC,IAAI;gBAC5B,WAAW,EAAE,CAAC,kCAAc,CAAC,SAAS,CAAC;gBACvC,MAAM,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe,CAAC;gBACvD,YAAY,EAAE,SAAS;aACvB;YAGD;gBACC,iBAAiB,EAAE,oCAAgB,CAAC,OAAO;gBAC3C,YAAY,EAAE,mBAAmB,CAAC,OAAO;gBACzC,SAAS,EAAE,gCAAY,CAAC,IAAI;gBAC5B,WAAW,EAAE,CAAC,kCAAc,CAAC,UAAU,CAAC;gBACxC,MAAM,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC;gBACjC,eAAe,EAAE,OAAO;gBACxB,cAAc,EAAE;oBACf,IAAI,EAAE,MAAM;oBACZ,KAAK,EAAE,OAAO;oBACd,IAAI,EAAE,MAAM;iBACZ;aACD;SAKD;KACD;CACD,CAAC;AAKF,SAAgB,8BAA8B,CAAC,eAAgC;IAC9E,MAAM,eAAe,GAAG,kCAA0B,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,gBAAgB,KAAK,eAAe,CAAC,CAAC;IAC3G,OAAO,eAAe,EAAE,kBAAkB,IAAI,EAAE,CAAC;AAClD,CAAC;AAKD,SAAgB,4BAA4B,CAC3C,eAAgC,EAChC,gBAAkC;IAElC,MAAM,QAAQ,GAAG,8BAA8B,CAAC,eAAe,CAAC,CAAC;IACjE,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,iBAAiB,KAAK,gBAAgB,CAAC,IAAI,IAAI,CAAC;AACjF,CAAC"}

package/dist/plugins/devices-zigbee2mqtt/services/ws-client-adapter.service.d.ts

@@ -0,0 +1,14 @@
+import { Z2mSetPayload, Z2mWsConfig } from '../interfaces/zigbee2mqtt.interface';
+import { Z2mBaseClientAdapter } from './base-client-adapter';
+export declare class Z2mWsClientAdapterService extends Z2mBaseClientAdapter {
+    private ws;
+    private config;
+    constructor();
+    connect(config: Z2mWsConfig): Promise<void>;
+    disconnect(): Promise<void>;
+    publishCommand(friendlyName: string, payload: Z2mSetPayload): Promise<boolean>;
+    requestState(friendlyName: string, properties?: string[]): Promise<boolean>;
+    private buildWsUrl;
+    private handleWsMessage;
+    private scheduleReconnect;
+}

package/dist/plugins/devices-zigbee2mqtt/services/ws-client-adapter.service.js

@@ -0,0 +1,199 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Z2mWsClientAdapterService = void 0;
+const ws_1 = __importDefault(require("ws"));
+const common_1 = require("@nestjs/common");
+const base_client_adapter_1 = require("./base-client-adapter");
+let Z2mWsClientAdapterService = class Z2mWsClientAdapterService extends base_client_adapter_1.Z2mBaseClientAdapter {
+    constructor() {
+        super('WsClientAdapter');
+        this.ws = null;
+        this.config = null;
+    }
+    async connect(config) {
+        this.configBaseTopic = config.baseTopic;
+        this.clearReconnectTimer();
+        await this.disconnect();
+        this.config = config;
+        const wsUrl = this.buildWsUrl(config);
+        this.logger.log(`Connecting to Zigbee2MQTT WebSocket: ${wsUrl}`);
+        return new Promise((resolve, reject) => {
+            let settled = false;
+            try {
+                const timeoutId = setTimeout(() => {
+                    if (!settled && !this.connected) {
+                        settled = true;
+                        this.logger.error('WebSocket connection timed out');
+                        this.ws?.terminate();
+                        this.ws = null;
+                        reject(new Error('WebSocket connection timed out'));
+                    }
+                }, config.connectTimeout);
+                this.ws = new ws_1.default(wsUrl);
+                this.ws.on('open', () => {
+                    clearTimeout(timeoutId);
+                    settled = true;
+                    this.logger.log('Connected to Zigbee2MQTT WebSocket');
+                    this.connected = true;
+                    resolve();
+                });
+                this.ws.on('error', (error) => {
+                    clearTimeout(timeoutId);
+                    this.logger.error('WebSocket client error', {
+                        message: error.message,
+                    });
+                    if (!settled && !this.connected) {
+                        settled = true;
+                        reject(error);
+                    }
+                });
+                this.ws.on('close', () => {
+                    clearTimeout(timeoutId);
+                    const wasConnected = this.connected;
+                    this.connected = false;
+                    this.bridgeOnline = false;
+                    this.ws = null;
+                    this.logger.log('Disconnected from Zigbee2MQTT WebSocket');
+                    if (wasConnected) {
+                        this.scheduleReconnect();
+                    }
+                });
+                this.ws.on('message', (data) => {
+                    this.handleWsMessage(data);
+                });
+            }
+            catch (error) {
+                this.logger.error('Failed to create WebSocket client', {
+                    message: error instanceof Error ? error.message : String(error),
+                });
+                reject(error instanceof Error ? error : new Error(String(error)));
+            }
+        });
+    }
+    async disconnect() {
+        this.clearReconnectTimer();
+        this.connected = false;
+        this.bridgeOnline = false;
+        this.config = null;
+        if (this.ws) {
+            this.logger.log('Disconnecting from Zigbee2MQTT WebSocket');
+            await new Promise((resolve) => {
+                if (!this.ws) {
+                    resolve();
+                    return;
+                }
+                const closingWs = this.ws;
+                closingWs.removeAllListeners();
+                const forceCloseTimer = setTimeout(() => {
+                    closingWs.terminate();
+                    if (this.ws === closingWs) {
+                        this.ws = null;
+                    }
+                    resolve();
+                }, 2000);
+                closingWs.on('close', () => {
+                    clearTimeout(forceCloseTimer);
+                    if (this.ws === closingWs) {
+                        this.ws = null;
+                    }
+                    resolve();
+                });
+                closingWs.close();
+            });
+        }
+        this.resetState();
+    }
+    async publishCommand(friendlyName, payload) {
+        if (!this.ws || !this.connected) {
+            this.logger.warn('Cannot publish: not connected to Zigbee2MQTT WebSocket');
+            return false;
+        }
+        const topic = `${friendlyName}/set`;
+        const message = { topic, payload };
+        this.logger.debug(`Sending WS command to ${topic}: ${JSON.stringify(payload)}`);
+        return new Promise((resolve) => {
+            this.ws?.send(JSON.stringify(message), (error) => {
+                if (error) {
+                    this.logger.error(`Failed to send WS command to ${topic}`, {
+                        message: error.message,
+                    });
+                    resolve(false);
+                }
+                else {
+                    resolve(true);
+                }
+            });
+        });
+    }
+    async requestState(friendlyName, properties = []) {
+        if (!this.ws || !this.connected) {
+            return false;
+        }
+        const topic = `${friendlyName}/get`;
+        const payload = properties.length > 0 ? Object.fromEntries(properties.map((p) => [p, ''])) : { state: '' };
+        const message = { topic, payload };
+        return new Promise((resolve) => {
+            this.ws?.send(JSON.stringify(message), (error) => {
+                resolve(!error);
+            });
+        });
+    }
+    buildWsUrl(config) {
+        const protocol = config.secure ? 'wss' : 'ws';
+        return `${protocol}://${config.host}:${config.port}/api`;
+    }
+    handleWsMessage(data) {
+        try {
+            const raw = typeof data === 'string' ? data : Buffer.from(data).toString('utf-8');
+            const wsMessage = JSON.parse(raw);
+            if (!wsMessage.topic) {
+                this.logger.debug('Received WS message without topic, ignoring');
+                return;
+            }
+            const payloadStr = typeof wsMessage.payload === 'string' ? wsMessage.payload : JSON.stringify(wsMessage.payload);
+            this.handleMessage(wsMessage.topic, payloadStr, true);
+        }
+        catch (error) {
+            this.logger.warn('Failed to parse WebSocket message', {
+                message: error instanceof Error ? error.message : String(error),
+            });
+        }
+    }
+    scheduleReconnect() {
+        if (this.reconnectTimer || !this.config) {
+            return;
+        }
+        const interval = this.config.reconnectInterval;
+        this.logger.log(`Scheduling WebSocket reconnection in ${interval}ms`);
+        this.reconnectTimer = setTimeout(() => {
+            this.reconnectTimer = null;
+            if (!this.connected && this.config) {
+                this.connect(this.config).catch((error) => {
+                    const errorMessage = error instanceof Error ? error.message : JSON.stringify(error);
+                    this.logger.error('WebSocket reconnection failed', {
+                        message: errorMessage,
+                    });
+                    this.scheduleReconnect();
+                });
+            }
+        }, interval);
+    }
+};
+exports.Z2mWsClientAdapterService = Z2mWsClientAdapterService;
+exports.Z2mWsClientAdapterService = Z2mWsClientAdapterService = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [])
+], Z2mWsClientAdapterService);
+//# sourceMappingURL=ws-client-adapter.service.js.map

package/dist/plugins/devices-zigbee2mqtt/services/ws-client-adapter.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ws-client-adapter.service.js","sourceRoot":"","sources":["../../../../src/plugins/devices-zigbee2mqtt/services/ws-client-adapter.service.ts"],"names":[],"mappings":"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"}

package/dist/plugins/devices-zigbee2mqtt/services/zigbee2mqtt-config-validator.service.d.ts

@@ -8,4 +8,6 @@ export declare class Zigbee2mqttConfigValidatorService implements IPluginConfigV
     constructor(pluginConfigValidator: PluginConfigValidatorService);
     onModuleInit(): void;
     validate(config: Record<string, unknown>): Promise<IConfigValidationResult>;
+    private validateMqtt;
+    private validateWs;
 }

package/dist/plugins/devices-zigbee2mqtt/services/zigbee2mqtt-config-validator.service.js

@@ -8,9 +8,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Zigbee2mqttConfigValidatorService = void 0;
 const mqtt_1 = require("mqtt");
+const ws_1 = __importDefault(require("ws"));
 const common_1 = require("@nestjs/common");
 const logger_1 = require("../../../common/logger");
 const plugin_config_validator_service_1 = require("../../../modules/config/services/plugin-config-validator.service");
@@ -25,6 +29,13 @@ let Zigbee2mqttConfigValidatorService = class Zigbee2mqttConfigValidatorService
         this.pluginConfigValidator.register(this);
     }
     async validate(config) {
+        const connectionType = (config['connectionType'] ?? config['connection_type']) || 'mqtt';
+        if (connectionType === 'ws') {
+            return this.validateWs(config);
+        }
+        return this.validateMqtt(config);
+    }
+    async validateMqtt(config) {
         const mqtt = config['mqtt'];
         if (!mqtt) {
             return { valid: false, errors: [{ message: 'MQTT configuration is required' }] };
@@ -93,6 +104,64 @@ let Zigbee2mqttConfigValidatorService = class Zigbee2mqttConfigValidatorService
             });
         });
     }
+    async validateWs(config) {
+        const wsConfig = config['ws'];
+        if (!wsConfig) {
+            return { valid: false, errors: [{ message: 'WebSocket configuration is required' }] };
+        }
+        const host = wsConfig['host'];
+        const port = wsConfig['port'] || 8080;
+        const secure = wsConfig['secure'] === true;
+        if (!host) {
+            return { valid: false, errors: [{ message: 'WebSocket host is required', field: 'ws.host' }] };
+        }
+        const protocol = secure ? 'wss' : 'ws';
+        const wsUrl = `${protocol}://${host}:${port}/api`;
+        return new Promise((resolve) => {
+            const timeoutMs = 10000;
+            let settled = false;
+            const settle = (result) => {
+                if (settled)
+                    return;
+                settled = true;
+                try {
+                    ws.terminate();
+                }
+                catch {
+                }
+                resolve(result);
+            };
+            const timer = setTimeout(() => {
+                settle({
+                    valid: false,
+                    errors: [
+                        {
+                            message: 'Connection timed out — check Zigbee2MQTT host and port',
+                            field: 'ws.host',
+                        },
+                    ],
+                });
+            }, timeoutMs);
+            const ws = new ws_1.default(wsUrl);
+            ws.on('open', () => {
+                clearTimeout(timer);
+                settle({ valid: true });
+            });
+            ws.on('error', (err) => {
+                clearTimeout(timer);
+                this.logger.error(`WebSocket connection test failed: ${err.message}`);
+                settle({
+                    valid: false,
+                    errors: [
+                        {
+                            message: `Cannot connect to Zigbee2MQTT WebSocket: ${err.message}`,
+                            field: 'ws.host',
+                        },
+                    ],
+                });
+            });
+        });
+    }
 };
 exports.Zigbee2mqttConfigValidatorService = Zigbee2mqttConfigValidatorService;
 exports.Zigbee2mqttConfigValidatorService = Zigbee2mqttConfigValidatorService = __decorate([

package/dist/plugins/devices-zigbee2mqtt/services/zigbee2mqtt-config-validator.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"zigbee2mqtt-config-validator.service.js","sourceRoot":"","sources":["../../../../src/plugins/devices-zigbee2mqtt/services/zigbee2mqtt-config-validator.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"zigbee2mqtt-config-validator.service.js","sourceRoot":"","sources":["../../../../src/plugins/devices-zigbee2mqtt/services/zigbee2mqtt-config-validator.service.ts"],"names":[],"mappings":"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"}

package/dist/plugins/devices-zigbee2mqtt/services/zigbee2mqtt.service.d.ts

@@ -3,11 +3,14 @@ import { DeviceConnectivityService } from '../../../modules/devices/services/dev
 import { DevicesService } from '../../../modules/devices/services/devices.service';
 import { ConfigChangeResult, IManagedPluginService, ServiceState } from '../../../modules/extensions/services/managed-plugin-service.interface';
 import { PluginServiceManagerService } from '../../../modules/extensions/services/plugin-service-manager.service';
+import { Z2mBaseClientAdapter } from './base-client-adapter';
 import { Z2mDeviceMapperService } from './device-mapper.service';
 import { Z2mMqttClientAdapterService } from './mqtt-client-adapter.service';
+import { Z2mWsClientAdapterService } from './ws-client-adapter.service';
 export declare class Zigbee2mqttService implements IManagedPluginService {
     private readonly configService;
     private readonly mqttAdapter;
+    private readonly wsAdapter;
     private readonly deviceMapper;
     private readonly devicesService;
     private readonly deviceConnectivityService;
@@ -23,7 +26,9 @@ export declare class Zigbee2mqttService implements IManagedPluginService {
     private pendingDevices;
     private isSyncing;
     private transformersRestored;
-    constructor(configService: ConfigService, mqttAdapter: Z2mMqttClientAdapterService, deviceMapper: Z2mDeviceMapperService, devicesService: DevicesService, deviceConnectivityService: DeviceConnectivityService, pluginServiceManager: PluginServiceManagerService);
+    private activeAdapter;
+    constructor(configService: ConfigService, mqttAdapter: Z2mMqttClientAdapterService, wsAdapter: Z2mWsClientAdapterService, deviceMapper: Z2mDeviceMapperService, devicesService: DevicesService, deviceConnectivityService: DeviceConnectivityService, pluginServiceManager: PluginServiceManagerService);
+    getActiveAdapter(): Z2mBaseClientAdapter;
     start(): Promise<void>;
     stop(): Promise<void>;
     getState(): ServiceState;
@@ -36,7 +41,9 @@ export declare class Zigbee2mqttService implements IManagedPluginService {
     private initialize;
     private doStart;
     private doStop;
+    private registerCallbacks;
     private buildMqttConfig;
+    private buildWsConfig;
     private handleBridgeOnline;
     private handleBridgeOffline;
     private handleDevicesReceived;

package/dist/plugins/devices-zigbee2mqtt/services/zigbee2mqtt.service.js

@@ -20,10 +20,12 @@ const plugin_service_manager_service_1 = require("../../../modules/extensions/se
 const devices_zigbee2mqtt_constants_1 = require("../devices-zigbee2mqtt.constants");
 const device_mapper_service_1 = require("./device-mapper.service");
 const mqtt_client_adapter_service_1 = require("./mqtt-client-adapter.service");
+const ws_client_adapter_service_1 = require("./ws-client-adapter.service");
 let Zigbee2mqttService = class Zigbee2mqttService {
-    constructor(configService, mqttAdapter, deviceMapper, devicesService, deviceConnectivityService, pluginServiceManager) {
+    constructor(configService, mqttAdapter, wsAdapter, deviceMapper, devicesService, deviceConnectivityService, pluginServiceManager) {
         this.configService = configService;
         this.mqttAdapter = mqttAdapter;
+        this.wsAdapter = wsAdapter;
         this.deviceMapper = deviceMapper;
         this.devicesService = devicesService;
         this.deviceConnectivityService = deviceConnectivityService;
@@ -39,15 +41,11 @@ let Zigbee2mqttService = class Zigbee2mqttService {
         this.pendingDevices = null;
         this.isSyncing = false;
         this.transformersRestored = false;
-        this.mqttAdapter.setCallbacks({
-            onBridgeOnline: () => this.handleBridgeOnline(),
-            onBridgeOffline: () => this.handleBridgeOffline(),
-            onDevicesReceived: (devices) => this.handleDevicesReceived(devices),
-            onDeviceStateChanged: (friendlyName, state) => this.handleDeviceStateChanged(friendlyName, state),
-            onDeviceAvailabilityChanged: (friendlyName, available) => this.handleDeviceAvailabilityChanged(friendlyName, available),
-            onDeviceJoined: (ieeeAddress, friendlyName) => this.handleDeviceJoined(ieeeAddress, friendlyName),
-            onDeviceLeft: (ieeeAddress, friendlyName) => this.handleDeviceLeft(ieeeAddress, friendlyName),
-        });
+        this.activeAdapter = this.mqttAdapter;
+        this.registerCallbacks(this.activeAdapter);
+    }
+    getActiveAdapter() {
+        return this.activeAdapter;
     }
     async start() {
         await this.withLock(async () => {
@@ -99,21 +97,39 @@ let Zigbee2mqttService = class Zigbee2mqttService {
         if (this.state === 'started' && this.pluginConfig) {
             const oldConfig = this.pluginConfig;
             const newConfig = this.configService.getPluginConfig(devices_zigbee2mqtt_constants_1.DEVICES_ZIGBEE2MQTT_PLUGIN_NAME);
-            const mqttChanged = oldConfig.mqtt.host !== newConfig.mqtt.host ||
-                oldConfig.mqtt.port !== newConfig.mqtt.port ||
-                oldConfig.mqtt.username !== newConfig.mqtt.username ||
-                oldConfig.mqtt.password !== newConfig.mqtt.password ||
-                oldConfig.mqtt.baseTopic !== newConfig.mqtt.baseTopic ||
-                oldConfig.mqtt.clientId !== newConfig.mqtt.clientId;
-            const tlsChanged = oldConfig.tls.enabled !== newConfig.tls.enabled ||
-                oldConfig.tls.rejectUnauthorized !== newConfig.tls.rejectUnauthorized ||
-                oldConfig.tls.ca !== newConfig.tls.ca ||
-                oldConfig.tls.cert !== newConfig.tls.cert ||
-                oldConfig.tls.key !== newConfig.tls.key;
-            if (mqttChanged || tlsChanged) {
-                this.logger.log('Config changed, restart required');
+            if (oldConfig.connectionType !== newConfig.connectionType) {
+                this.logger.log('Connection type changed, restart required');
                 return Promise.resolve({ restartRequired: true });
             }
+            if (newConfig.connectionType === 'mqtt') {
+                const mqttChanged = oldConfig.mqtt.host !== newConfig.mqtt.host ||
+                    oldConfig.mqtt.port !== newConfig.mqtt.port ||
+                    oldConfig.mqtt.username !== newConfig.mqtt.username ||
+                    oldConfig.mqtt.password !== newConfig.mqtt.password ||
+                    oldConfig.mqtt.baseTopic !== newConfig.mqtt.baseTopic ||
+                    oldConfig.mqtt.clientId !== newConfig.mqtt.clientId;
+                const tlsChanged = oldConfig.tls.enabled !== newConfig.tls.enabled ||
+                    oldConfig.tls.rejectUnauthorized !== newConfig.tls.rejectUnauthorized ||
+                    oldConfig.tls.ca !== newConfig.tls.ca ||
+                    oldConfig.tls.cert !== newConfig.tls.cert ||
+                    oldConfig.tls.key !== newConfig.tls.key;
+                if (mqttChanged || tlsChanged) {
+                    this.logger.log('MQTT config changed, restart required');
+                    return Promise.resolve({ restartRequired: true });
+                }
+            }
+            else {
+                const wsChanged = oldConfig.ws.host !== newConfig.ws.host ||
+                    oldConfig.ws.port !== newConfig.ws.port ||
+                    oldConfig.ws.baseTopic !== newConfig.ws.baseTopic ||
+                    oldConfig.ws.secure !== newConfig.ws.secure ||
+                    oldConfig.ws.connectTimeout !== newConfig.ws.connectTimeout ||
+                    oldConfig.ws.reconnectInterval !== newConfig.ws.reconnectInterval;
+                if (wsChanged) {
+                    this.logger.log('WebSocket config changed, restart required');
+                    return Promise.resolve({ restartRequired: true });
+                }
+            }
             return Promise.resolve({ restartRequired: false });
         }
         this.pluginConfig = null;
@@ -126,16 +142,16 @@ let Zigbee2mqttService = class Zigbee2mqttService {
         }
     }
     isBridgeOnline() {
-        return this.mqttAdapter.isBridgeOnline();
+        return this.activeAdapter.isBridgeOnline();
     }
     getRegisteredDevices() {
-        return this.mqttAdapter.getRegisteredDevices();
+        return this.activeAdapter.getRegisteredDevices();
     }
     async requestDeviceState(friendlyName) {
-        return this.mqttAdapter.requestState(friendlyName);
+        return this.activeAdapter.requestState(friendlyName);
     }
     getCachedState(friendlyName) {
-        return this.mqttAdapter.getCachedState(friendlyName);
+        return this.activeAdapter.getCachedState(friendlyName);
     }
     async initialize() {
         const devices = await this.devicesService.findAll(devices_zigbee2mqtt_constants_1.DEVICES_ZIGBEE2MQTT_TYPE);
@@ -149,8 +165,23 @@ let Zigbee2mqttService = class Zigbee2mqttService {
         this.state = 'starting';
         this.logger.log('Starting Zigbee2MQTT plugin service');
         try {
-            const mqttConfig = this.buildMqttConfig();
-            await this.mqttAdapter.connect(mqttConfig);
+            const config = this.config;
+            const previousAdapter = this.activeAdapter;
+            this.activeAdapter = config.connectionType === 'ws' ? this.wsAdapter : this.mqttAdapter;
+            if (this.activeAdapter !== previousAdapter) {
+                previousAdapter.setCallbacks({});
+                this.registerCallbacks(this.activeAdapter);
+            }
+            if (config.connectionType === 'ws') {
+                const wsConfig = this.buildWsConfig();
+                this.logger.log('Using WebSocket connection to Zigbee2MQTT');
+                await this.activeAdapter.connect(wsConfig);
+            }
+            else {
+                const mqttConfig = this.buildMqttConfig();
+                this.logger.log('Using MQTT connection to Zigbee2MQTT');
+                await this.activeAdapter.connect(mqttConfig);
+            }
             this.logger.log('Zigbee2MQTT plugin service started successfully');
             this.state = 'started';
         }
@@ -168,7 +199,7 @@ let Zigbee2mqttService = class Zigbee2mqttService {
         this.transformersRestored = false;
         this.logger.log('Stopping Zigbee2MQTT plugin service');
         try {
-            await this.mqttAdapter.disconnect();
+            await this.activeAdapter.disconnect();
             const devices = await this.devicesService.findAll(devices_zigbee2mqtt_constants_1.DEVICES_ZIGBEE2MQTT_TYPE);
             for (const device of devices) {
                 await this.deviceConnectivityService.setConnectionState(device.id, {
@@ -185,6 +216,17 @@ let Zigbee2mqttService = class Zigbee2mqttService {
             this.state = 'stopped';
         }
     }
+    registerCallbacks(adapter) {
+        adapter.setCallbacks({
+            onBridgeOnline: () => this.handleBridgeOnline(),
+            onBridgeOffline: () => this.handleBridgeOffline(),
+            onDevicesReceived: (devices) => this.handleDevicesReceived(devices),
+            onDeviceStateChanged: (friendlyName, state) => this.handleDeviceStateChanged(friendlyName, state),
+            onDeviceAvailabilityChanged: (friendlyName, available) => this.handleDeviceAvailabilityChanged(friendlyName, available),
+            onDeviceJoined: (ieeeAddress, friendlyName) => this.handleDeviceJoined(ieeeAddress, friendlyName),
+            onDeviceLeft: (ieeeAddress, friendlyName) => this.handleDeviceLeft(ieeeAddress, friendlyName),
+        });
+    }
     buildMqttConfig() {
         const config = this.config;
         return {
@@ -209,6 +251,17 @@ let Zigbee2mqttService = class Zigbee2mqttService {
                 : undefined,
         };
     }
+    buildWsConfig() {
+        const config = this.config;
+        return {
+            host: config.ws.host,
+            port: config.ws.port,
+            baseTopic: config.ws.baseTopic,
+            secure: config.ws.secure,
+            connectTimeout: config.ws.connectTimeout,
+            reconnectInterval: config.ws.reconnectInterval,
+        };
+    }
     async handleBridgeOnline() {
         this.logger.log('Bridge is online');
         this.bridgeOnline = true;
@@ -249,12 +302,12 @@ let Zigbee2mqttService = class Zigbee2mqttService {
             this.pendingDevices = devices;
             return;
         }
-        const registeredDevices = this.mqttAdapter.getRegisteredDevices();
+        const registeredDevices = this.activeAdapter.getRegisteredDevices();
         await this.deviceMapper.restoreTransformersForExistingDevices(registeredDevices);
         this.transformersRestored = true;
         const existingDevices = await this.devicesService.findAll(devices_zigbee2mqtt_constants_1.DEVICES_ZIGBEE2MQTT_TYPE);
         for (const device of existingDevices) {
-            const cachedState = this.mqttAdapter.getCachedState(device.identifier);
+            const cachedState = this.activeAdapter.getCachedState(device.identifier);
             if (Object.keys(cachedState).length > 0) {
                 try {
                     await this.deviceMapper.updateDeviceState(device.identifier, cachedState);
@@ -369,6 +422,7 @@ exports.Zigbee2mqttService = Zigbee2mqttService = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [config_service_1.ConfigService,
         mqtt_client_adapter_service_1.Z2mMqttClientAdapterService,
+        ws_client_adapter_service_1.Z2mWsClientAdapterService,
         device_mapper_service_1.Z2mDeviceMapperService,
         devices_service_1.DevicesService,
         device_connectivity_service_1.DeviceConnectivityService,