@matterbridge/core 3.10.9-dev-20260908-a3f4064 → 3.10.9-dev-20260910-ca91bcb

package/dist/matterbridgeEndpointHelpers.js

@@ -1,5 +1,5 @@
 import { createHash } from 'node:crypto';
-import { Lifecycle } from '@matter/general';
+import { Lifecycle, Observable } from '@matter/general';
 import { ClusterBehavior } from '@matter/node';
 import { ActivatedCarbonFilterMonitoringServer } from '@matter/node/behaviors/activated-carbon-filter-monitoring';
 import { AirQualityServer } from '@matter/node/behaviors/air-quality';
@@ -792,10 +792,59 @@ export function subscribeAttribute(endpoint, cluster, attribute, listener, log)
         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 endpoint;
     }
-    events[clusterName][attribute].on(listener);
+    events[clusterName][attribute].on((newValue, oldValue, context) => {
+        listener(newValue, oldValue, context);
+    });
     log?.info(`${db}Subscribed endpoint ${or}${endpoint.maybeId}${db}:${or}${endpoint.maybeNumber}${db} attribute ${hk}${capitalizeFirstLetter(clusterName)}${db}.${hk}${attribute}${db}`);
     return endpoint;
 }
+function getCommandObservable(endpoint, clusterName, commandName, create) {
+    const events = endpoint.events;
+    const clusterEvents = events?.[clusterName];
+    if (!clusterEvents)
+        return undefined;
+    const eventName = commandName + '$executed';
+    let observable = clusterEvents[eventName];
+    if (!observable && create) {
+        observable = Observable();
+        clusterEvents.addEvent(eventName, observable);
+        Object.defineProperty(clusterEvents, eventName, { value: observable, enumerable: true, configurable: true });
+    }
+    return observable;
+}
+export function subscribeCommand(endpoint, cluster, command, listener, log) {
+    const behavior = getBehavior(endpoint, cluster);
+    const clusterName = behavior?.id;
+    if (!behavior || !clusterName) {
+        endpoint.log.error(`subscribeCommand ${hk}${command}${er} error: cluster not found on endpoint ${or}${endpoint.maybeId}${er}:${or}${endpoint.maybeNumber}${er}`);
+        return endpoint;
+    }
+    command = lowercaseFirstLetter(command);
+    if (!ClusterBehavior.isType(behavior) || !behavior.schema.commands(command)) {
+        endpoint.log.error(`subscribeCommand error: Command ${hk}${command}${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 endpoint;
+    }
+    const observable = getCommandObservable(endpoint, clusterName, command, true);
+    if (!observable) {
+        endpoint.log.error(`subscribeCommand error: Cluster ${'0x' + getClusterId(endpoint, clusterName)?.toString(16).padStart(4, '0')}:${clusterName} has no events on endpoint ${or}${endpoint.maybeId}${er}:${or}${endpoint.maybeNumber}${er}`);
+        return endpoint;
+    }
+    observable.on((data) => {
+        listener(data);
+    });
+    log?.info(`${db}Subscribed endpoint ${or}${endpoint.maybeId}${db}:${or}${endpoint.maybeNumber}${db} command ${hk}${capitalizeFirstLetter(clusterName)}${db}.${hk}${command}${db}`);
+    return endpoint;
+}
+export function emitCommand(endpoint, cluster, command, request, context) {
+    if (!isCommandEndpoint(endpoint))
+        return;
+    const clusterName = lowercaseFirstLetter(cluster);
+    const commandName = lowercaseFirstLetter(command);
+    getCommandObservable(endpoint, clusterName, commandName, false)?.emit({ command: commandName, cluster: clusterName, request, endpoint, context });
+}
+function isCommandEndpoint(endpoint) {
+    return 'subscribeCommand' in endpoint && typeof endpoint.subscribeCommand === 'function';
+}
 export async function setCluster(endpoint, cluster, value, log) {
     const clusterName = getBehavior(endpoint, cluster)?.id;
     if (!clusterName) {

package/dist/matterbridgeEndpointTypes.d.ts

@@ -1,6 +1,9 @@
+import type { Observable } from '@matter/general';
+import type { ActionContext } from '@matter/node';
 import type { ClusterId, EndpointNumber } from '@matter/types/datatype';
 import type { Semtag } from '@matter/types/globals';
 import type { DeviceTypeDefinition } from './matterbridgeDeviceTypes.js';
+import type { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
 export type PrimitiveTypes = boolean | number | bigint | string | object | undefined | null;
 export interface SerializedMatterbridgeEndpoint {
     pluginName: string;
@@ -29,3 +32,15 @@ export interface MatterbridgeEndpointOptions {
     id?: string;
     number?: EndpointNumber;
 }
+export interface SubscribeCommandData<R = any> {
+    command: string;
+    cluster: string;
+    request: R;
+    endpoint: MatterbridgeEndpoint;
+    context: ActionContext;
+}
+export type SubscribeCommandListener<R = any> = (data: SubscribeCommandData<R>) => void;
+export type SubscribeCommandObservable = Observable<[data: SubscribeCommandData]>;
+export type SubscribeCommandEvents = Record<string, SubscribeCommandObservable | undefined> & {
+    addEvent(name: string, event: SubscribeCommandObservable): void;
+};

package/dist/matterbridgeEndpointTypes.js

@@ -1,2 +1 @@
-import { logModuleLoaded } from '@matterbridge/utils/loader';
-logModuleLoaded('MatterbridgeEndpointTypes');
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matterbridge/core",
-  "version": "3.10.9-dev-20260908-a3f4064",
+  "version": "3.10.9-dev-20260910-ca91bcb",
   "description": "Matterbridge core library",
   "author": "https://github.com/Luligu",
   "homepage": "https://matterbridge.io/",
@@ -132,16 +132,17 @@
   },
   "dependencies": {
     "@matter/main": "0.17.9",
-    "@matterbridge/dgram": "3.10.9-dev-20260908-a3f4064",
-    "@matterbridge/thread": "3.10.9-dev-20260908-a3f4064",
-    "@matterbridge/types": "3.10.9-dev-20260908-a3f4064",
-    "@matterbridge/utils": "3.10.9-dev-20260908-a3f4064",
+    "@matterbridge/dgram": "3.10.9-dev-20260910-ca91bcb",
+    "@matterbridge/thread": "3.10.9-dev-20260910-ca91bcb",
+    "@matterbridge/types": "3.10.9-dev-20260910-ca91bcb",
+    "@matterbridge/utils": "3.10.9-dev-20260910-ca91bcb",
     "escape-html": "1.0.3",
     "express": "5.2.1",
     "express-rate-limit": "8.7.0",
     "multer": "2.3.0",
     "node-ansi-logger": "3.3.1",
     "node-persist-manager": "2.1.1",
+    "werift": "0.24.4",
     "ws": "8.21.3"
   }
 }