fix: do not mark Basic CC as supported if in secure command list (#7010)

zwave-js · Jul 15, 2024 · c2c8eef · c2c8eef
1 parent da9951a
commit c2c8eef
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 9 deletions.
diff --git a/packages/cc/src/cc/Security2CC.ts b/packages/cc/src/cc/Security2CC.ts
@@ -739,10 +739,17 @@ export class Security2CC extends CommandClass {
 
  // Remember which commands are supported securely
  for (const cc of supportedCCs) {
- endpoint.addCC(cc, {
- isSupported: true,
- secure: true,
- });
+ // Basic CC has special rules for when it is considered supported
+ // Therefore we mark all other CCs as supported, but not Basic CC,
+ // for which support is determined later.
+ if (cc === CommandClasses.Basic) {
+ endpoint.addCC(cc, { secure: true });
+ } else {
+ endpoint.addCC(cc, {
+ isSupported: true,
+ secure: true,
+ });
+ }
  }
  }
  }

diff --git a/packages/cc/src/cc/SecurityCC.ts b/packages/cc/src/cc/SecurityCC.ts
@@ -377,10 +377,30 @@ export class SecurityCC extends CommandClass {
 
  // Remember which commands are supported securely
  for (const cc of supportedCCs) {
- endpoint.addCC(cc, { isSupported: true, secure: true });
+ // Basic CC has special rules for when it is considered supported
+ // Therefore we mark all other CCs as supported, but not Basic CC,
+ // for which support is determined later.
+ if (cc === CommandClasses.Basic) {
+ endpoint.addCC(cc, { secure: true });
+ } else {
+ endpoint.addCC(cc, {
+ isSupported: true,
+ secure: true,
+ });
+ }
  }
  for (const cc of controlledCCs) {
- endpoint.addCC(cc, { isControlled: true, secure: true });
+ // Basic CC has special rules for when it is considered supported
+ // Therefore we mark all other CCs as supported, but not Basic CC,
+ // for which support is determined later.
+ if (cc === CommandClasses.Basic) {
+ endpoint.addCC(cc, { secure: true });
+ } else {
+ endpoint.addCC(cc, {
+ isControlled: true,
+ secure: true,
+ });
+ }
  }
 
  // We know for sure that the node is included securely

diff --git a/packages/cc/src/cc/VersionCC.ts b/packages/cc/src/cc/VersionCC.ts
@@ -475,9 +475,7 @@ export class VersionCC extends CommandClass {
  // Therefore we mark all other CCs as supported, but not Basic CC,
  // for which support is determined later.
  if (cc === CommandClasses.Basic) {
- endpoint.addCC(cc, {
- version: supportedVersion,
- });
+ endpoint.addCC(cc, { version: supportedVersion });
  } else {
  endpoint.addCC(cc, {
  isSupported: true,