matterbridge 3.0.0-edge.2 → 3.0.0-edge.4

package/dist/matterbridgeEndpoint.js

@@ -1,10 +1,10 @@
 import { AnsiLogger, BLUE, CYAN, YELLOW, db, debugStringify, er, hk, or, zb } from './logger/export.js';
 import { bridgedNode } from './matterbridgeDeviceTypes.js';
 import { isValidNumber, isValidObject } from './utils/export.js';
-import { MatterbridgeBehavior, MatterbridgeBehaviorDevice, MatterbridgeIdentifyServer, MatterbridgeOnOffServer, MatterbridgeLevelControlServer, MatterbridgeColorControlServer, MatterbridgeWindowCoveringServer, MatterbridgeThermostatServer, MatterbridgeFanControlServer, MatterbridgeDoorLockServer, MatterbridgeModeSelectServer, MatterbridgeValveConfigurationAndControlServer, MatterbridgeSmokeCoAlarmServer, MatterbridgeBooleanStateConfigurationServer, MatterbridgeSwitchServer, MatterbridgeRvcRunModeServer, MatterbridgeRvcCleanModeServer, MatterbridgeRvcOperationalStateServer, } from './matterbridgeBehaviors.js';
+import { MatterbridgeServer, MatterbridgeServerDevice, MatterbridgeIdentifyServer, MatterbridgeOnOffServer, MatterbridgeLevelControlServer, MatterbridgeColorControlServer, MatterbridgeWindowCoveringServer, MatterbridgeThermostatServer, MatterbridgeFanControlServer, MatterbridgeDoorLockServer, MatterbridgeModeSelectServer, MatterbridgeValveConfigurationAndControlServer, MatterbridgeSmokeCoAlarmServer, MatterbridgeBooleanStateConfigurationServer, MatterbridgeSwitchServer, } from './matterbridgeBehaviors.js';
 import { addClusterServers, addFixedLabel, addOptionalClusterServers, addRequiredClusterServers, addUserLabel, capitalizeFirstLetter, createUniqueId, getBehavior, getBehaviourTypesFromClusterClientIds, getBehaviourTypesFromClusterServerIds, getDefaultFlowMeasurementClusterServer, getDefaultIlluminanceMeasurementClusterServer, getDefaultPressureMeasurementClusterServer, getDefaultRelativeHumidityMeasurementClusterServer, getDefaultTemperatureMeasurementClusterServer, getDefaultOccupancySensingClusterServer, lowercaseFirstLetter, updateAttribute, getClusterId, getAttributeId, setAttribute, getAttribute, checkNotLatinCharacters, generateUniqueId, subscribeAttribute, } from './matterbridgeEndpointHelpers.js';
 import { Endpoint, Lifecycle, MutableEndpoint, NamedHandler, SupportedBehaviors, VendorId } from '@matter/main';
-import { ClusterType, getClusterNameById, MeasurementType } from '@matter/main/types';
+import { getClusterNameById, MeasurementType } from '@matter/main/types';
 import { Descriptor } from '@matter/main/clusters/descriptor';
 import { PowerSource } from '@matter/main/clusters/power-source';
 import { BridgedDeviceBasicInformation } from '@matter/main/clusters/bridged-device-basic-information';
@@ -26,8 +26,6 @@ import { ElectricalPowerMeasurement } from '@matter/main/clusters/electrical-pow
 import { ElectricalEnergyMeasurement } from '@matter/main/clusters/electrical-energy-measurement';
 import { AirQuality } from '@matter/main/clusters/air-quality';
 import { ConcentrationMeasurement } from '@matter/main/clusters/concentration-measurement';
-import { RvcRunMode } from '@matter/main/clusters/rvc-run-mode';
-import { RvcOperationalState } from '@matter/main/clusters/rvc-operational-state';
 import { OccupancySensing } from '@matter/main/clusters/occupancy-sensing';
 import { DescriptorServer } from '@matter/main/behaviors/descriptor';
 import { PowerSourceServer } from '@matter/main/behaviors/power-source';
@@ -57,7 +55,6 @@ import { Pm25ConcentrationMeasurementServer } from '@matter/main/behaviors/pm25-
 import { Pm10ConcentrationMeasurementServer } from '@matter/main/behaviors/pm10-concentration-measurement';
 import { RadonConcentrationMeasurementServer } from '@matter/main/behaviors/radon-concentration-measurement';
 import { TotalVolatileOrganicCompoundsConcentrationMeasurementServer } from '@matter/main/behaviors/total-volatile-organic-compounds-concentration-measurement';
-import { RvcCleanMode } from '@matter/main/clusters/rvc-clean-mode';
 export class MatterbridgeEndpoint extends Endpoint {
     static bridgeMode = '';
     static logLevel = "info";
@@ -137,7 +134,7 @@ export class MatterbridgeEndpoint extends Endpoint {
         this.log = new AnsiLogger({ logName: options.uniqueStorageKey ?? 'MatterbridgeEndpoint', logTimestampFormat: 4, logLevel: debug === true ? "debug" : MatterbridgeEndpoint.logLevel });
         this.log.debug(`${YELLOW}new${db} MatterbridgeEndpoint: ${zb}${'0x' + firstDefinition.code.toString(16).padStart(4, '0')}${db}-${zb}${firstDefinition.name}${db} ` +
             `id: ${CYAN}${options.uniqueStorageKey}${db} number: ${CYAN}${options.endpointId}${db} taglist: ${CYAN}${options.tagList ? debugStringify(options.tagList) : 'undefined'}${db}`);
-        this.behaviors.require(MatterbridgeBehavior, { deviceCommand: new MatterbridgeBehaviorDevice(this.log, this.commandHandler, undefined) });
+        this.behaviors.require(MatterbridgeServer, { deviceCommand: new MatterbridgeServerDevice(this.log, this.commandHandler, undefined) });
     }
     static async loadInstance(definition, options = {}, debug = false) {
         return new MatterbridgeEndpoint(definition, options, debug);
@@ -522,7 +519,7 @@ export class MatterbridgeEndpoint extends Endpoint {
         return this;
     }
     createOnOffClusterServer(onOff = false) {
-        this.behaviors.require(MatterbridgeOnOffServer.for(ClusterType(OnOff.Base)), {
+        this.behaviors.require(MatterbridgeOnOffServer, {
             onOff,
         });
         return this;
@@ -548,6 +545,17 @@ export class MatterbridgeEndpoint extends Endpoint {
         });
         return this;
     }
+    createLevelControlClusterServer(currentLevel = 254, onLevel = null) {
+        this.behaviors.require(MatterbridgeLevelControlServer, {
+            currentLevel,
+            onLevel,
+            options: {
+                executeIfOff: false,
+                coupleColorTempToLevel: false,
+            },
+        });
+        return this;
+    }
     createDefaultColorControlClusterServer(currentX = 0, currentY = 0, currentHue = 0, currentSaturation = 0, colorTemperatureMireds = 500, colorTempPhysicalMinMireds = 147, colorTempPhysicalMaxMireds = 500) {
         this.behaviors.require(MatterbridgeColorControlServer.with(ColorControl.Feature.Xy, ColorControl.Feature.HueSaturation, ColorControl.Feature.ColorTemperature), {
             colorMode: ColorControl.ColorMode.CurrentHueAndCurrentSaturation,
@@ -1154,48 +1162,4 @@ export class MatterbridgeEndpoint extends Endpoint {
         });
         return this;
     }
-    createDefaultRvcRunModeClusterServer() {
-        this.behaviors.require(MatterbridgeRvcRunModeServer.with(RvcRunMode.Feature.OnOff), {
-            supportedModes: [
-                { label: 'Idle', mode: 1, modeTags: [{ value: RvcRunMode.ModeTag.Idle }] },
-                { label: 'Cleaning', mode: 2, modeTags: [{ value: RvcRunMode.ModeTag.Cleaning }] },
-                { label: 'SpotCleaning', mode: 3, modeTags: [{ value: RvcRunMode.ModeTag.Cleaning }] },
-            ],
-            currentMode: 1,
-            startUpMode: null,
-            onMode: null,
-        });
-        return this;
-    }
-    createDefaultRvcCleanModeClusterServer() {
-        this.behaviors.require(MatterbridgeRvcCleanModeServer.with(RvcCleanMode.Feature.OnOff), {
-            supportedModes: [
-                { label: 'Vacuum', mode: 1, modeTags: [{ value: RvcCleanMode.ModeTag.Vacuum }] },
-                { label: 'Mop', mode: 2, modeTags: [{ value: RvcCleanMode.ModeTag.Mop }] },
-                { label: 'Clean', mode: 3, modeTags: [{ value: RvcCleanMode.ModeTag.DeepClean }] },
-            ],
-            currentMode: 1,
-            startUpMode: null,
-            onMode: null,
-        });
-        return this;
-    }
-    createDefaultRvcOperationalStateClusterServer() {
-        this.behaviors.require(MatterbridgeRvcOperationalStateServer, {
-            phaseList: [],
-            currentPhase: null,
-            operationalStateList: [
-                { operationalStateId: RvcOperationalState.OperationalState.Stopped, operationalStateLabel: 'Stopped' },
-                { operationalStateId: RvcOperationalState.OperationalState.Running, operationalStateLabel: 'Running' },
-                { operationalStateId: RvcOperationalState.OperationalState.Paused, operationalStateLabel: 'Paused' },
-                { operationalStateId: RvcOperationalState.OperationalState.Error, operationalStateLabel: 'Error' },
-                { operationalStateId: RvcOperationalState.OperationalState.SeekingCharger, operationalStateLabel: 'SeekingCharger' },
-                { operationalStateId: RvcOperationalState.OperationalState.Charging, operationalStateLabel: 'Charging' },
-                { operationalStateId: RvcOperationalState.OperationalState.Docked, operationalStateLabel: 'Docked' },
-            ],
-            operationalState: RvcOperationalState.OperationalState.Docked,
-            operationalError: { errorStateId: RvcOperationalState.ErrorState.NoError, errorStateLabel: 'No Error', errorStateDetails: 'Fully operative' },
-        });
-        return this;
-    }
 }

package/dist/matterbridgePlatform.js

@@ -115,8 +115,8 @@ export class MatterbridgePlatform {
         if (device.deviceName)
             this._registeredEndpointsByName.delete(device.deviceName);
     }
-    async unregisterAllDevices() {
-        await this.matterbridge.removeAllBridgedEndpoints(this.name);
+    async unregisterAllDevices(delay = 0) {
+        await this.matterbridge.removeAllBridgedEndpoints(this.name, delay);
         this._registeredEndpoints.clear();
         this._registeredEndpointsByName.clear();
     }

package/frontend/build/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "./static/css/main.ea7910e9.css",
-    "main.js": "./static/js/main.fe57dcc8.js",
+    "main.js": "./static/js/main.e11d6bb4.js",
     "static/js/453.d855a71b.chunk.js": "./static/js/453.d855a71b.chunk.js",
     "static/media/roboto-latin-700-normal.woff2": "./static/media/roboto-latin-700-normal.c4d6cab43bec89049809.woff2",
     "static/media/roboto-latin-500-normal.woff2": "./static/media/roboto-latin-500-normal.599f66a60bdf974e578e.woff2",
@@ -77,11 +77,11 @@
     "static/media/roboto-greek-ext-300-normal.woff": "./static/media/roboto-greek-ext-300-normal.60729cafbded24073dfb.woff",
     "index.html": "./index.html",
     "main.ea7910e9.css.map": "./static/css/main.ea7910e9.css.map",
-    "main.fe57dcc8.js.map": "./static/js/main.fe57dcc8.js.map",
+    "main.e11d6bb4.js.map": "./static/js/main.e11d6bb4.js.map",
     "453.d855a71b.chunk.js.map": "./static/js/453.d855a71b.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.ea7910e9.css",
-    "static/js/main.fe57dcc8.js"
+    "static/js/main.e11d6bb4.js"
   ]
 }

package/frontend/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><base href="./"><link rel="icon" href="./matterbridge 32x32.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Matterbridge</title><link rel="manifest" href="./manifest.json"/><script defer="defer" src="./static/js/main.fe57dcc8.js"></script><link href="./static/css/main.ea7910e9.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><base href="./"><link rel="icon" href="./matterbridge 32x32.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Matterbridge</title><link rel="manifest" href="./manifest.json"/><script defer="defer" src="./static/js/main.e11d6bb4.js"></script><link href="./static/css/main.ea7910e9.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>