zigbee-herdsman 4.5.0 → 5.0.1

package/src/zspec/zcl/buffaloZcl.ts

@@ -548,13 +548,15 @@ export class BuffaloZcl extends Buffalo {
             while (this.position - start < options.payload.payloadSize) {
                 const attributeID = this.readUInt16();
                 const type = this.readUInt8();
+                /* v8 ignore next */
+                let attribute: string | undefined | number = cluster.getAttribute(attributeID)?.name;
 
-                let attribute: number | string = attributeID;
-                try {
-                    attribute = cluster.getAttribute(attributeID).name;
-                } catch {
+                // number type is only used when going into this if
+                if (!attribute) {
                     // this is spammy because of the many manufacturer-specific attributes not currently used
                     logger.debug(`Unknown attribute ${attributeID} in cluster ${cluster.name}`, NS);
+
+                    attribute = attributeID;
                 }
 
                 frame.attributes[attribute] = this.read(type, options);

package/src/zspec/zcl/definition/tstype.ts

@@ -86,8 +86,7 @@ export interface Cluster {
     commandsResponse: {
         [s: string]: Command;
     };
-    getAttribute: (key: number | string) => Attribute;
-    hasAttribute: (key: number | string) => boolean;
+    getAttribute: (key: number | string) => Attribute | undefined;
     getCommand: (key: number | string) => Command;
     getCommandResponse: (key: number | string) => Command;
 }

package/src/zspec/zcl/utils.ts

@@ -187,7 +187,7 @@ function createCluster(name: string, cluster: ClusterDefinition, manufacturerCod
     const commands: Record<string, Command> = cloneClusterEntriesWithName(cluster.commands);
     const commandsResponse: Record<string, Command> = cloneClusterEntriesWithName(cluster.commandsResponse);
 
-    const getAttributeInternal = (key: number | string): Attribute | undefined => {
+    const getAttribute = (key: number | string): Attribute | undefined => {
         if (typeof key === "number") {
             let partialMatchAttr: Attribute | undefined;
 
@@ -208,29 +208,7 @@ function createCluster(name: string, cluster: ClusterDefinition, manufacturerCod
             return partialMatchAttr;
         }
 
-        for (const attrKey in attributes) {
-            const attr = attributes[attrKey];
-
-            if (attr.name === key) {
-                return attr;
-            }
-        }
-
-        return undefined;
-    };
-
-    const getAttribute = (key: number | string): Attribute => {
-        const result = getAttributeInternal(key);
-        if (!result) {
-            throw new Error(`Cluster '${name}' has no attribute '${key}'`);
-        }
-
-        return result;
-    };
-
-    const hasAttribute = (key: number | string): boolean => {
-        const result = getAttributeInternal(key);
-        return !!result;
+        return attributes[key];
     };
 
     const getCommand = (key: number | string): Command => {
@@ -243,12 +221,10 @@ function createCluster(name: string, cluster: ClusterDefinition, manufacturerCod
                 }
             }
         } else {
-            for (const cmdKey in commands) {
-                const cmd = commands[cmdKey];
+            const cmd = commands[key];
 
-                if (cmd.name === key) {
-                    return cmd;
-                }
+            if (cmd) {
+                return cmd;
             }
         }
 
@@ -265,12 +241,10 @@ function createCluster(name: string, cluster: ClusterDefinition, manufacturerCod
                 }
             }
         } else {
-            for (const cmdKey in commandsResponse) {
-                const cmd = commandsResponse[cmdKey];
+            const cmd = commandsResponse[key];
 
-                if (cmd.name === key) {
-                    return cmd;
-                }
+            if (cmd) {
+                return cmd;
             }
         }
 
@@ -285,7 +259,6 @@ function createCluster(name: string, cluster: ClusterDefinition, manufacturerCod
         commands,
         commandsResponse,
         getAttribute,
-        hasAttribute,
         getCommand,
         getCommandResponse,
     };

package/src/zspec/zcl/zclFrame.ts

@@ -45,19 +45,21 @@ export class ZclFrame {
         disableDefaultResponse: boolean,
         manufacturerCode: number | undefined,
         transactionSequenceNumber: number,
-        commandKey: number | string,
-        clusterKey: number | string,
+        commandKey: number | string | Command,
+        clusterKey: number | string | Cluster,
         payload: ZclPayload,
         customClusters: CustomClusters,
         reservedBits = 0,
     ): ZclFrame {
-        const cluster = Utils.getCluster(clusterKey, manufacturerCode, customClusters);
+        const cluster = typeof clusterKey === "object" ? clusterKey : Utils.getCluster(clusterKey, manufacturerCode, customClusters);
         const command: Command =
-            frameType === FrameType.GLOBAL
-                ? Utils.getGlobalCommand(commandKey)
-                : direction === Direction.CLIENT_TO_SERVER
-                  ? cluster.getCommand(commandKey)
-                  : cluster.getCommandResponse(commandKey);
+            typeof commandKey === "object"
+                ? commandKey
+                : frameType === FrameType.GLOBAL
+                  ? Utils.getGlobalCommand(commandKey)
+                  : direction === Direction.CLIENT_TO_SERVER
+                    ? cluster.getCommand(commandKey)
+                    : cluster.getCommandResponse(commandKey);
 
         const header = new ZclHeader(
             {reservedBits, frameType, direction, disableDefaultResponse, manufacturerSpecific: manufacturerCode != null},