@matter/nodejs-shell 0.17.9 → 0.18.0-alpha.0-20260807-335c3291b

package/dist/esm/shell/cmd_cluster-attributes.js

@@ -3,10 +3,14 @@
  * Copyright 2022-2026 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Diagnostic } from "@matter/general";
+import { Diagnostic, ImplementationError } from "@matter/general";
 import { Matter } from "@matter/model";
-import { AttributeId, ClusterId, EndpointNumber, ValidationError } from "@matter/types";
-import { SupportedAttributeClient } from "@project-chip/matter.js/cluster";
+import { AttributeId, ClusterId, ClusterLookup, EndpointNumber, ValidationError } from "@matter/types";
+import {
+  elementKnownUnsupported,
+  readAttributesRemote,
+  resolveClusterEndpoint
+} from "../util/ClusterEndpoint.js";
 import { convertJsonDataWithModel } from "../util/Json.js";
 function generateAllAttributeHandlersForCluster(yargs, theNode) {
   Matter.clusters.forEach((cluster) => {
@@ -43,31 +47,32 @@ function generateAllAttributeHandlersForCluster(yargs, theNode) {
       const attributeId = rawAttributeId === "*" ? void 0 : parseInt(rawAttributeId);
       const node = (await theNode.connectAndGetNodes(nodeId))[0];
       try {
-        const interactionClient = await node.getInteractionClient();
-        const result = await interactionClient.getMultipleAttributes({
-          attributes: [
+        const values = await readAttributesRemote(
+          node,
+          [
             {
               endpointId: EndpointNumber(endpointId),
               clusterId: ClusterId(clusterId),
               attributeId: attributeId !== void 0 ? AttributeId(attributeId) : void 0
             }
           ],
-          isFabricFiltered: fabricFiltered
-        });
+          fabricFiltered
+        );
         console.log(
-          `Attribute values for cluster ${node.nodeId.toString()}/${endpointId}/${clusterId}/${attributeId}:`
+          `Attribute values for cluster ${node.peerAddress?.nodeId}/${endpointId}/${clusterId}/${attributeId}:`
         );
         for (const {
-          path: { attributeId: attributeId2, attributeName },
+          path: { attributeId: id },
           value
-        } of result) {
+        } of values) {
+          const attributeName = ClusterLookup.attributeName(ClusterId(clusterId), id, node.matter);
           console.log(
-            `    ${Diagnostic.hex(attributeId2)}${attributeName !== void 0 ? ` (${attributeName})` : ""}: ${Diagnostic.json(value)}`
+            `    ${Diagnostic.hex(id)}${attributeName !== void 0 ? ` (${attributeName})` : ""}: ${Diagnostic.json(value)}`
           );
         }
       } catch (error) {
         console.log(
-          `ERROR: Could not get attribute ${node.nodeId.toString()}/${endpointId}/${clusterId}/${attributeId}: ${error}`
+          `ERROR: Could not get attribute ${node.peerAddress?.nodeId}/${endpointId}/${clusterId}/${attributeId}: ${error}`
         );
       }
     }
@@ -113,29 +118,27 @@ function generateClusterAttributeHandlers(yargs, cluster, theNode) {
               });
             },
             async (argv) => {
-              const clusterId2 = cluster.id;
               const { nodeId, endpointId, remote, fabricFiltered } = argv;
-              const requestRemote = remote ? true : void 0;
-              const node = (await theNode.connectAndGetNodes(nodeId))[0];
-              const clusterClient = node.getDeviceById(endpointId)?.getClusterClientById(ClusterId(clusterId2));
-              if (clusterClient === void 0) {
-                console.log(
-                  `ERROR: Cluster ${node.nodeId.toString()}/${endpointId}/${clusterId2} not found.`
-                );
+              const resolved = await resolveClusterEndpoint(theNode, nodeId, endpointId, clusterId);
+              if (resolved === void 0) {
                 return;
               }
+              const { node, endpoint, behaviorType } = resolved;
               console.log(
-                `Attribute values for cluster ${cluster.name} (${node.nodeId.toString()}/${endpointId}/${clusterId2}):`
+                `Attribute values for cluster ${cluster.name} (${node.peerAddress?.nodeId}/${endpointId}/${clusterId}):`
               );
               for (const attribute of cluster.attributes) {
                 const attributeName = attribute.propertyName;
-                const attributeClient = clusterClient.attributes[attributeName];
-                if (attributeClient === void 0 || !remote && !(attributeClient instanceof SupportedAttributeClient)) {
+                if (!remote && elementKnownUnsupported(endpoint, behaviorType, "attributes", attributeName)) {
                   continue;
                 }
-                console.log(
-                  `    ${attributeName} (${attribute.id}): ${Diagnostic.json(await attributeClient.get(requestRemote, fabricFiltered))}`
-                );
+                try {
+                  console.log(
+                    `    ${attributeName} (${attribute.id}): ${Diagnostic.json(await getAttributeValue(resolved, clusterId, attribute, remote, fabricFiltered))}`
+                  );
+                } catch (error) {
+                  console.log(`    ${attributeName} (${attribute.id}): ERROR: ${error}`);
+                }
               }
             }
           );
@@ -174,6 +177,27 @@ function generateClusterAttributeHandlers(yargs, cluster, theNode) {
   );
   return yargs;
 }
+async function getAttributeValue(resolved, clusterId, attribute, requestRemote, fabricFiltered) {
+  const { node, endpoint, behaviorType } = resolved;
+  if (requestRemote) {
+    const values = await readAttributesRemote(
+      node,
+      [
+        {
+          endpointId: endpoint.number,
+          clusterId: ClusterId(clusterId),
+          attributeId: AttributeId(attribute.id)
+        }
+      ],
+      fabricFiltered
+    );
+    if (values.length === 0) {
+      throw new ImplementationError(`No value returned for attribute ${attribute.propertyName}`);
+    }
+    return values[0].value;
+  }
+  return endpoint.stateOf(behaviorType.id)[attribute.propertyName];
+}
 function generateAttributeReadHandler(yargs, clusterId, clusterName, attribute, theNode) {
   const attributeName = attribute.propertyName;
   return yargs.command(
@@ -201,23 +225,20 @@ function generateAttributeReadHandler(yargs, clusterId, clusterName, attribute,
     }),
     async (argv) => {
       const { nodeId, endpointId, remote, fabricFiltered } = argv;
-      const requestRemote = remote ? true : void 0;
-      const node = (await theNode.connectAndGetNodes(nodeId))[0];
-      const clusterClient = node.getDeviceById(endpointId)?.getClusterClientById(ClusterId(clusterId));
-      if (clusterClient === void 0) {
-        console.log(`ERROR: Cluster ${node.nodeId.toString()}/${endpointId}/${clusterId} not found.`);
+      const resolved = await resolveClusterEndpoint(theNode, nodeId, endpointId, clusterId);
+      if (resolved === void 0) {
         return;
       }
-      const attributeClient = clusterClient.attributes[attributeName];
-      if (attributeClient === void 0 || !remote && !(attributeClient instanceof SupportedAttributeClient)) {
+      const { node, endpoint, behaviorType } = resolved;
+      if (!remote && elementKnownUnsupported(endpoint, behaviorType, "attributes", attributeName)) {
         console.log(
-          `ERROR: Attribute ${node.nodeId.toString()}/${endpointId}/${clusterId}/${attribute.id} not supported by the device.`
+          `ERROR: Attribute ${node.peerAddress?.nodeId}/${endpointId}/${clusterId}/${attribute.id} not supported by the device.`
         );
         return;
       }
       try {
         console.log(
-          `Attribute value for ${attributeName} ${node.nodeId.toString()}/${endpointId}/${clusterId}/${attribute.id}: ${Diagnostic.json(await attributeClient.get(requestRemote, fabricFiltered))}`
+          `Attribute value for ${attributeName} ${node.peerAddress?.nodeId}/${endpointId}/${clusterId}/${attribute.id}: ${Diagnostic.json(await getAttributeValue(resolved, clusterId, attribute, remote, fabricFiltered))}`
         );
       } catch (error) {
         console.log(`ERROR: Could not get attribute ${attribute.name}: ${error}`);
@@ -263,24 +284,22 @@ function generateAttributeWriteHandler(yargs, clusterId, clusterName, attribute,
           return;
         }
       }
-      const node = (await theNode.connectAndGetNodes(nodeId))[0];
-      const clusterClient = node.getDeviceById(endpointId)?.getClusterClientById(ClusterId(clusterId));
-      if (clusterClient === void 0) {
-        console.log(`ERROR: Cluster ${node.nodeId.toString()}/${endpointId}/${clusterId} not found.`);
+      const resolved = await resolveClusterEndpoint(theNode, nodeId, endpointId, clusterId);
+      if (resolved === void 0) {
         return;
       }
-      const attributeClient = clusterClient.attributes[attributeName];
-      if (!force && !(attributeClient instanceof SupportedAttributeClient)) {
+      const { node, endpoint, behaviorType } = resolved;
+      if (!force && elementKnownUnsupported(endpoint, behaviorType, "attributes", attributeName)) {
         console.log(
-          `ERROR: Attribute ${node.nodeId.toString()}/${endpointId}/${clusterId}/${attribute.id} not supported by the device.`
+          `ERROR: Attribute ${node.peerAddress?.nodeId}/${endpointId}/${clusterId}/${attribute.id} not supported by the device.`
         );
         return;
       }
       try {
         parsedValue = convertJsonDataWithModel(attribute, parsedValue);
-        await attributeClient.set(parsedValue);
+        await endpoint.setStateOf(behaviorType.id, { [attributeName]: parsedValue });
         console.log(
-          `Attribute ${attributeName} ${node.nodeId.toString()}/${endpointId}/${clusterId}/${attribute.id} set to ${Diagnostic.json(value)}`
+          `Attribute ${attributeName} ${node.peerAddress?.nodeId}/${endpointId}/${clusterId}/${attribute.id} set to ${Diagnostic.json(value)}`
         );
       } catch (error) {
         if (error instanceof ValidationError) {

package/dist/esm/shell/cmd_cluster-attributes.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/shell/cmd_cluster-attributes.ts"],
-  "mappings": "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",
-  "names": ["yargs", "attributeId", "clusterId"]
+  "mappings": "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",
+  "names": ["yargs"]
 }

package/dist/esm/shell/cmd_cluster-commands.js

@@ -5,7 +5,8 @@
  */
 import { Diagnostic } from "@matter/general";
 import { Matter } from "@matter/model";
-import { ClusterId, ValidationError } from "@matter/types";
+import { ValidationError } from "@matter/types";
+import { elementKnownUnsupported, resolveClusterEndpoint } from "../util/ClusterEndpoint.js";
 import { convertJsonDataWithModel } from "../util/Json.js";
 function generateAllCommandHandlersForCluster(yargs, theNode) {
   Matter.clusters.forEach((cluster) => {
@@ -88,23 +89,24 @@ function generateCommandHandler(yargs, clusterId, clusterName, command, theNode)
 }
 async function executeCommand(theNode, nodeId, endpointId, clusterId, command, requestData) {
   const commandName = command.propertyName;
-  const node = (await theNode.connectAndGetNodes(nodeId))[0];
-  const clusterClient = node.getDeviceById(endpointId)?.getClusterClientById(ClusterId(clusterId));
-  if (clusterClient === void 0) {
-    console.log(`ERROR: Cluster ${node.nodeId.toString()}/${endpointId}/${clusterId} not found.`);
+  const resolved = await resolveClusterEndpoint(theNode, nodeId, endpointId, clusterId);
+  if (resolved === void 0) {
     return;
   }
-  if (clusterClient.commands[commandName] === void 0) {
-    console.log(`ERROR: Command ${node.nodeId.toString()}/${endpointId}/${clusterId}/${command.id} not supported.`);
+  const { node, endpoint, behaviorType } = resolved;
+  if (elementKnownUnsupported(endpoint, behaviorType, "commands", commandName)) {
+    console.log(
+      `ERROR: Command ${node.peerAddress?.nodeId}/${endpointId}/${clusterId}/${command.id} not supported.`
+    );
     return;
   }
   try {
     if (requestData !== void 0) {
       requestData = convertJsonDataWithModel(command, requestData);
     }
-    const result = await clusterClient.commands[commandName](requestData);
+    const result = await endpoint.commandsOf(behaviorType.id)[commandName](requestData);
     console.log(
-      `Command ${command.name} ${node.nodeId.toString()}/${endpointId}/${clusterId}/${command.id} invoked ${requestData ? `with ${Diagnostic.json(requestData)}` : ""}`
+      `Command ${command.name} ${node.peerAddress?.nodeId}/${endpointId}/${clusterId}/${command.id} invoked ${requestData ? `with ${Diagnostic.json(requestData)}` : ""}`
     );
     if (result !== void 0) {
       console.log(`Result: ${Diagnostic.json(result)}`);

package/dist/esm/shell/cmd_cluster-commands.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/shell/cmd_cluster-commands.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["yargs"]
 }

package/dist/esm/shell/cmd_cluster-events.js

@@ -5,7 +5,8 @@
  */
 import { Diagnostic } from "@matter/general";
 import { Matter } from "@matter/model";
-import { ClusterId } from "@matter/types";
+import { ClusterId, EventId } from "@matter/types";
+import { readEventsRemote, resolveClusterEndpoint } from "../util/ClusterEndpoint.js";
 function generateAllEventHandlersForCluster(yargs, theNode) {
   Matter.clusters.forEach((cluster) => {
     yargs = generateClusterEventHandlers(yargs, cluster, theNode);
@@ -48,16 +49,42 @@ function generateEventHandler(yargs, clusterId, clusterName, event, theNode) {
     }),
     async (argv) => {
       const { nodeId, endpointId } = argv;
-      const node = (await theNode.connectAndGetNodes(nodeId))[0];
-      const clusterClient = node.getDeviceById(endpointId)?.getClusterClientById(ClusterId(clusterId));
-      if (clusterClient === void 0) {
-        console.log(`ERROR: Cluster ${node.nodeId.toString()}/${endpointId}/${clusterId} not found.`);
+      const resolved = await resolveClusterEndpoint(theNode, nodeId, endpointId, clusterId);
+      if (resolved === void 0) {
         return;
       }
-      const eventClient = clusterClient.events[eventName];
-      console.log(
-        `Event value for ${eventName} ${node.nodeId.toString()}/${endpointId}/${clusterId}/${event.id}: ${Diagnostic.json(await eventClient.get())}`
-      );
+      const { node, endpoint } = resolved;
+      try {
+        const reports = await readEventsRemote(
+          node,
+          [{ endpointId: endpoint.number, clusterId: ClusterId(clusterId), eventId: EventId(event.id) }],
+          true
+        );
+        const events = reports.map(
+          ({
+            number,
+            priority,
+            epochTimestamp,
+            systemTimestamp,
+            deltaEpochTimestamp,
+            deltaSystemTimestamp,
+            value
+          }) => ({
+            eventNumber: number,
+            priority,
+            epochTimestamp,
+            systemTimestamp,
+            deltaEpochTimestamp,
+            deltaSystemTimestamp,
+            data: value
+          })
+        );
+        console.log(
+          `Event value for ${eventName} ${node.peerAddress?.nodeId}/${endpointId}/${clusterId}/${event.id}: ${Diagnostic.json(events)}`
+        );
+      } catch (error) {
+        console.log(`ERROR: Could not get event ${event.name}: ${error}`);
+      }
     }
   );
 }

package/dist/esm/shell/cmd_cluster-events.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/shell/cmd_cluster-events.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,kBAAkB;AAC3B,SAAmC,cAAc;AACjD,SAAS,iBAAiB;AAI1B,SAAS,mCAAmC,OAAa,SAAqB;AAC1E,SAAO,SAAS,QAAQ,aAAW;AAC/B,YAAQ,6BAA6B,OAAO,SAAS,OAAO;AAAA,EAChE,CAAC;AACD,SAAO;AACX;AAEA,SAAS,6BAA6B,OAAa,SAAuB,SAAqB;AAC3F,QAAM,YAAY,QAAQ;AAC1B,MAAI,cAAc,QAAW;AACzB,WAAO;AAAA,EACX;AAEA,UAAQ,MAAM;AAAA,IACV,CAAC,QAAQ,KAAK,YAAY,GAAG,KAAK,UAAU,SAAS,EAAE,CAAC,EAAE;AAAA,IAC1D,QAAQ,QAAQ,IAAI;AAAA,IACpB,CAAAA,WAAS;AACL,cAAQ,OAAO,QAAQ,WAAS;AAC5B,QAAAA,SAAQ,qBAAqBA,QAAO,WAAW,QAAQ,MAAM,OAAO,OAAO;AAAA,MAC/E,CAAC;AACD,aAAOA;AAAA,IACX;AAAA,IACA,OAAO,SAAc;AACjB,WAAK,YAAY;AAAA,IACrB;AAAA,EACJ;AAEA,SAAO;AACX;AAEA,SAAS,qBACL,OACA,WACA,aACA,OACA,SACF;AAEE,QAAM,YAAY,MAAM;AACxB,SAAO,MAAM;AAAA,IACT,CAAC,GAAG,MAAM,KAAK,YAAY,CAAC,4BAA4B,KAAK,MAAM,GAAG,SAAS,EAAE,CAAC,EAAE;AAAA,IACpF,QAAQ,WAAW,IAAI,MAAM,IAAI;AAAA,IACjC,CAAAA,WACIA,OACK,WAAW,WAAW;AAAA,MACnB,UAAU;AAAA,MACV,MAAM;AAAA,MACN,cAAc;AAAA,IAClB,CAAC,EACA,WAAW,eAAe;AAAA,MACvB,UAAU;AAAA,MACV,MAAM;AAAA,MACN,cAAc;AAAA,IAClB,CAAC;AAAA,IACT,OAAM,SAAQ;AACV,YAAM,EAAE,QAAQ,WAAW,IAAI;AAC/B,YAAM,QAAQ,MAAM,QAAQ,mBAAmB,MAAM,GAAG,CAAC;AAEzD,YAAM,gBAAgB,KAAK,cAAc,UAAU,GAAG,qBAAqB,UAAU,SAAS,CAAC;AAC/F,UAAI,kBAAkB,QAAW;AAC7B,gBAAQ,IAAI,kBAAkB,KAAK,OAAO,SAAS,CAAC,IAAI,UAAU,IAAI,SAAS,aAAa;AAC5F;AAAA,MACJ;AACA,YAAM,cAAc,cAAc,OAAO,SAAS;AAClD,cAAQ;AAAA,QACJ,mBAAmB,SAAS,IAAI,KAAK,OAAO,SAAS,CAAC,IAAI,UAAU,IAAI,SAAS,IAAI,MAAM,EAAE,KAAK,WAAW,KAAK,MAAM,YAAY,IAAI,CAAC,CAAC;AAAA,MAC9I;AAAA,IACJ;AAAA,EACJ;AACJ;AAEe,SAAR,UAA2B,SAAqB;AACnD,SAAO;AAAA,IACH,SAAS,CAAC,UAAU,GAAG;AAAA,IACvB,UAAU;AAAA,IACV,SAAS,CAAC,UAAgB,mCAAmC,OAAO,OAAO;AAAA,IAC3E,SAAS,OAAO,SAAc;AAC1B,WAAK,YAAY;AAAA,IACrB;AAAA,EACJ;AACJ;",
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,kBAAkB;AAC3B,SAAmC,cAAc;AACjD,SAAS,WAAW,eAAe;AAGnC,SAAS,kBAAkB,8BAA8B;AAEzD,SAAS,mCAAmC,OAAa,SAAqB;AAC1E,SAAO,SAAS,QAAQ,aAAW;AAC/B,YAAQ,6BAA6B,OAAO,SAAS,OAAO;AAAA,EAChE,CAAC;AACD,SAAO;AACX;AAEA,SAAS,6BAA6B,OAAa,SAAuB,SAAqB;AAC3F,QAAM,YAAY,QAAQ;AAC1B,MAAI,cAAc,QAAW;AACzB,WAAO;AAAA,EACX;AAEA,UAAQ,MAAM;AAAA,IACV,CAAC,QAAQ,KAAK,YAAY,GAAG,KAAK,UAAU,SAAS,EAAE,CAAC,EAAE;AAAA,IAC1D,QAAQ,QAAQ,IAAI;AAAA,IACpB,CAAAA,WAAS;AACL,cAAQ,OAAO,QAAQ,WAAS;AAC5B,QAAAA,SAAQ,qBAAqBA,QAAO,WAAW,QAAQ,MAAM,OAAO,OAAO;AAAA,MAC/E,CAAC;AACD,aAAOA;AAAA,IACX;AAAA,IACA,OAAO,SAAc;AACjB,WAAK,YAAY;AAAA,IACrB;AAAA,EACJ;AAEA,SAAO;AACX;AAEA,SAAS,qBACL,OACA,WACA,aACA,OACA,SACF;AACE,QAAM,YAAY,MAAM;AACxB,SAAO,MAAM;AAAA,IACT,CAAC,GAAG,MAAM,KAAK,YAAY,CAAC,4BAA4B,KAAK,MAAM,GAAG,SAAS,EAAE,CAAC,EAAE;AAAA,IACpF,QAAQ,WAAW,IAAI,MAAM,IAAI;AAAA,IACjC,CAAAA,WACIA,OACK,WAAW,WAAW;AAAA,MACnB,UAAU;AAAA,MACV,MAAM;AAAA,MACN,cAAc;AAAA,IAClB,CAAC,EACA,WAAW,eAAe;AAAA,MACvB,UAAU;AAAA,MACV,MAAM;AAAA,MACN,cAAc;AAAA,IAClB,CAAC;AAAA,IACT,OAAM,SAAQ;AACV,YAAM,EAAE,QAAQ,WAAW,IAAI;AAC/B,YAAM,WAAW,MAAM,uBAAuB,SAAS,QAAQ,YAAY,SAAS;AACpF,UAAI,aAAa,QAAW;AACxB;AAAA,MACJ;AACA,YAAM,EAAE,MAAM,SAAS,IAAI;AAE3B,UAAI;AAEA,cAAM,UAAU,MAAM;AAAA,UAClB;AAAA,UACA,CAAC,EAAE,YAAY,SAAS,QAAQ,WAAW,UAAU,SAAS,GAAG,SAAS,QAAQ,MAAM,EAAE,EAAE,CAAC;AAAA,UAC7F;AAAA,QACJ;AACA,cAAM,SAAS,QAAQ;AAAA,UACnB,CAAC;AAAA,YACG;AAAA,YACA;AAAA,YACA;AAAA,YACA;AAAA,YACA;AAAA,YACA;AAAA,YACA;AAAA,UACJ,OAAO;AAAA,YACH,aAAa;AAAA,YACb;AAAA,YACA;AAAA,YACA;AAAA,YACA;AAAA,YACA;AAAA,YACA,MAAM;AAAA,UACV;AAAA,QACJ;AACA,gBAAQ;AAAA,UACJ,mBAAmB,SAAS,IAAI,KAAK,aAAa,MAAM,IAAI,UAAU,IAAI,SAAS,IAAI,MAAM,EAAE,KAAK,WAAW,KAAK,MAAM,CAAC;AAAA,QAC/H;AAAA,MACJ,SAAS,OAAO;AACZ,gBAAQ,IAAI,8BAA8B,MAAM,IAAI,KAAK,KAAK,EAAE;AAAA,MACpE;AAAA,IACJ;AAAA,EACJ;AACJ;AAEe,SAAR,UAA2B,SAAqB;AACnD,SAAO;AAAA,IACH,SAAS,CAAC,UAAU,GAAG;AAAA,IACvB,UAAU;AAAA,IACV,SAAS,CAAC,UAAgB,mCAAmC,OAAO,OAAO;AAAA,IAC3E,SAAS,OAAO,SAAc;AAC1B,WAAK,YAAY;AAAA,IACrB;AAAA,EACJ;AACJ;",
   "names": ["yargs"]
 }