matterbridge 2.1.5-dev.1 → 2.1.5-dev.2

package/dist/matterbridgeEndpoint.js

@@ -2,7 +2,7 @@ import { AnsiLogger, BLUE, CYAN, YELLOW, db, debugStringify, er, hk, or, zb } fr
 import { bridgedNode } from './matterbridgeDeviceTypes.js';
 import { isValidNumber, isValidObject } from './utils/utils.js';
 import { MatterbridgeBehavior, MatterbridgeBehaviorDevice, 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, } from './matterbridgeEndpointHelpers.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 { getClusterNameById, MeasurementType } from '@matter/main/types';
 import { Descriptor } from '@matter/main/clusters/descriptor';
@@ -130,7 +130,7 @@ export class MatterbridgeEndpoint extends Endpoint {
         }
         else
             this.deviceTypes.set(firstDefinition.code, firstDefinition);
-        this.log = new AnsiLogger({ logName: 'MatterbridgeEndpoint', logTimestampFormat: 4, logLevel: debug === true ? "debug" : MatterbridgeEndpoint.logLevel });
+        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) });
@@ -171,24 +171,8 @@ export class MatterbridgeEndpoint extends Endpoint {
     async updateAttribute(cluster, attribute, value, log) {
         return await updateAttribute(this, cluster, attribute, value, log);
     }
-    async subscribeAttribute(clusterId, attribute, listener, log) {
-        const clusterName = lowercaseFirstLetter(getClusterNameById(clusterId));
-        if (this.construction.status !== Lifecycle.Status.Active) {
-            await this.construction.ready;
-        }
-        const events = this.events;
-        if (!(clusterName in events)) {
-            this.log.error(`subscribeAttribute ${hk}${attribute}${er} error: Cluster ${'0x' + clusterId.toString(16).padStart(4, '0')}:${clusterName} not found on endpoint ${or}${this.maybeId}${er}:${or}${this.maybeNumber}${er}`);
-            return false;
-        }
-        attribute = lowercaseFirstLetter(attribute) + '$Changed';
-        if (!(attribute in events[clusterName])) {
-            this.log.error(`subscribeAttribute error: Attribute ${hk}${attribute}${er} not found on Cluster ${'0x' + clusterId.toString(16).padStart(4, '0')}:${clusterName} on endpoint ${or}${this.maybeId}${er}:${or}${this.maybeNumber}${er}`);
-            return false;
-        }
-        events[clusterName][attribute].on(listener);
-        log?.info(`${db}Subscribed endpoint ${or}${this.id}${db}:${or}${this.number}${db} attribute ${hk}${capitalizeFirstLetter(clusterName)}${db}.${hk}${attribute}${db}`);
-        return true;
+    async subscribeAttribute(cluster, attribute, listener, log) {
+        return await subscribeAttribute(this, cluster, attribute, listener, log);
     }
     async triggerEvent(clusterId, event, payload, log) {
         const clusterName = lowercaseFirstLetter(getClusterNameById(clusterId));
@@ -207,6 +191,7 @@ export class MatterbridgeEndpoint extends Endpoint {
     }
     addClusterServers(serverList) {
         addClusterServers(this, serverList);
+        return this;
     }
     async addFixedLabel(label, value) {
         await addFixedLabel(this, label, value);

package/dist/matterbridgeEndpointHelpers.js

@@ -479,6 +479,26 @@ export async function updateAttribute(endpoint, cluster, attribute, value, log)
         `to ${YELLOW}${value !== null && typeof value === 'object' ? debugStringify(value) : value}${db}`);
     return true;
 }
+export async function subscribeAttribute(endpoint, cluster, attribute, listener, log) {
+    const clusterName = getBehavior(endpoint, cluster)?.id;
+    if (!clusterName) {
+        endpoint.log.error(`subscribeAttribute ${hk}${attribute}${er} error: cluster not found on endpoint ${or}${endpoint.maybeId}${er}:${or}${endpoint.maybeNumber}${er}`);
+        return false;
+    }
+    if (endpoint.construction.status !== Lifecycle.Status.Active) {
+        endpoint.log.debug(`subscribeAttribute ${hk}${clusterName}.${attribute}${db}: Endpoint ${or}${endpoint.maybeId}${db}:${or}${endpoint.maybeNumber}${db} is in the ${BLUE}${endpoint.construction.status}${db} state`);
+        await endpoint.construction.ready;
+    }
+    const events = endpoint.events;
+    attribute = lowercaseFirstLetter(attribute) + '$Changed';
+    if (!(clusterName in events) || !(attribute in events[clusterName])) {
+        endpoint.log.error(`subscribeAttribute error: Attribute ${hk}${attribute.replace('$Changed', '')}${er} not found on Cluster ${'0x' + getClusterId(endpoint, clusterName)?.toString(16).padStart(4, '0')}:${clusterName} on endpoint ${or}${endpoint.maybeId}${er}:${or}${endpoint.maybeNumber}${er}`);
+        return false;
+    }
+    events[clusterName][attribute].on(listener);
+    log?.info(`${db}Subscribed endpoint ${or}${endpoint.id}${db}:${or}${endpoint.number}${db} attribute ${hk}${capitalizeFirstLetter(clusterName)}${db}.${hk}${attribute}${db}`);
+    return true;
+}
 export function getDefaultTemperatureMeasurementClusterServer(measuredValue = 0) {
     return optionsFor(TemperatureMeasurementServer, {
         measuredValue,

package/dist/utils/utils.js

@@ -1,8 +1,5 @@
 import os from 'os';
 import path from 'path';
-import { createWriteStream, statSync } from 'fs';
-import { promises as fs } from 'fs';
-import * as dns from 'dns';
 import { AnsiLogger, idn, rs } from 'node-ansi-logger';
 const log = new AnsiLogger({ logName: 'MatterbridgeUtils', logTimestampFormat: 4, logLevel: "info" });
 export function deepEqual(a, b, excludeProperties = []) {
@@ -263,6 +260,7 @@ export async function wait(timeout = 1000, name, debug = false) {
 export async function createZip(outputPath, ...sourcePaths) {
     const { default: archiver } = await import('archiver');
     const { glob } = await import('glob');
+    const { createWriteStream, statSync } = await import('fs');
     log.logLevel = "info";
     log.logName = 'Archive';
     log.debug(`creating archive ${outputPath} from ${sourcePaths.join(', ')} ...`);
@@ -328,6 +326,7 @@ export async function createZip(outputPath, ...sourcePaths) {
     });
 }
 export async function copyDirectory(srcDir, destDir) {
+    const fs = await import('fs').then((mod) => mod.promises);
     log.debug(`copyDirectory: copying directory from ${srcDir} to ${destDir}`);
     try {
         await fs.mkdir(destDir, { recursive: true });
@@ -350,6 +349,7 @@ export async function copyDirectory(srcDir, destDir) {
     }
 }
 export async function resolveHostname(hostname, family = 4) {
+    const dns = await import('dns');
     try {
         const addresses = await dns.promises.lookup(hostname.toLowerCase(), { family });
         return addresses.address;

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge",
-  "version": "2.1.5-dev.1",
+  "version": "2.1.5-dev.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "2.1.5-dev.1",
+      "version": "2.1.5-dev.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@matter/main": "0.12.3",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "2.1.5-dev.1",
+  "version": "2.1.5-dev.2",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",