fix: keep separate supervision session ID counters for each node

zwave-js · Aug 16, 2023 · aa5afbd · aa5afbd
1 parent 9d9407f
commit aa5afbd
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 12 deletions.
diff --git a/packages/cc/src/cc/SupervisionCC.ts b/packages/cc/src/cc/SupervisionCC.ts
@@ -387,7 +387,7 @@ export class SupervisionCCGet extends SupervisionCC {
 				origin: options.origin,
 			});
 		} else {
-			this.sessionId = host.getNextSupervisionSessionId();
+			this.sessionId = host.getNextSupervisionSessionId(this.nodeId);
 			this.requestStatusUpdates = options.requestStatusUpdates;
 			this.encapsulated = options.encapsulated;
 			options.encapsulated.encapsulatingCC = this as any;

diff --git a/packages/host/src/ZWaveHost.ts b/packages/host/src/ZWaveHost.ts
@@ -84,7 +84,7 @@ export interface ZWaveHost {
 	/**
 	 * Returns the next session ID for supervised communication
 	 */
-	getNextSupervisionSessionId(): number;
+	getNextSupervisionSessionId(nodeId: number): number;
 
 	getDeviceConfig?: (nodeId: number) => DeviceConfig | undefined;
 

diff --git a/packages/host/src/mocks.ts b/packages/host/src/mocks.ts
@@ -35,6 +35,7 @@ export function createTestingHost(
 	const valuesStorage = new Map();
 	const metadataStorage = new Map();
 	const valueDBCache = new Map<number, ValueDB>();
+	const supervisionSessionIDs = new Map<number, () => number>();
 
 	const ret: TestingHost = {
 		homeId: options.homeId ?? 0x7e570001,
@@ -76,9 +77,15 @@ export function createTestingHost(
 			options.getSafeCCVersion ??
 			(() => 100),
 		getNextCallbackId: createWrappingCounter(0xff),
-		getNextSupervisionSessionId: createWrappingCounter(
-			MAX_SUPERVISION_SESSION_ID,
-		),
+		getNextSupervisionSessionId: (nodeId) => {
+			if (!supervisionSessionIDs.has(nodeId)) {
+				supervisionSessionIDs.set(
+					nodeId,
+					createWrappingCounter(MAX_SUPERVISION_SESSION_ID, true),
+				);
+			}
+			return supervisionSessionIDs.get(nodeId)!();
+		},
 		getValueDB: (nodeId) => {
 			if (!valueDBCache.has(nodeId)) {
 				valueDBCache.set(

diff --git a/packages/testing/src/MockController.ts b/packages/testing/src/MockController.ts
@@ -48,6 +48,7 @@ export class MockController {
 		// const valuesStorage = new Map();
 		// const metadataStorage = new Map();
 		// const valueDBCache = new Map<number, ValueDB>();
+		const supervisionSessionIDs = new Map<number, () => number>();
 
 		this.host = {
 			ownNodeId: options.ownNodeId ?? 1,
@@ -56,9 +57,15 @@ export class MockController {
 			securityManager2: undefined,
 			// nodes: this.nodes as any,
 			getNextCallbackId: () => 1,
-			getNextSupervisionSessionId: createWrappingCounter(
-				MAX_SUPERVISION_SESSION_ID,
-			),
+			getNextSupervisionSessionId: (nodeId) => {
+				if (!supervisionSessionIDs.has(nodeId)) {
+					supervisionSessionIDs.set(
+						nodeId,
+						createWrappingCounter(MAX_SUPERVISION_SESSION_ID, true),
+					);
+				}
+				return supervisionSessionIDs.get(nodeId)!();
+			},
 			getSafeCCVersion: () => 100,
 			getSupportedCCVersion: (cc, nodeId, endpointIndex = 0) => {
 				if (!this.nodes.has(nodeId)) {

diff --git a/packages/zwave-js/src/lib/driver/Driver.ts b/packages/zwave-js/src/lib/driver/Driver.ts
@@ -4103,13 +4103,19 @@ ${handlers.length} left`,
 	 */
 	public readonly getNextCallbackId = createWrappingCounter(0xff);
 
+	private readonly supervisionSessionIDs = new Map<number, () => number>();
 	/**
 	 * Returns the next session ID for Supervision CC
 	 */
-	public readonly getNextSupervisionSessionId = createWrappingCounter(
-		MAX_SUPERVISION_SESSION_ID,
-		true,
-	);
+	public getNextSupervisionSessionId(nodeId: number): number {
+		if (!this.supervisionSessionIDs.has(nodeId)) {
+			this.supervisionSessionIDs.set(
+				nodeId,
+				createWrappingCounter(MAX_SUPERVISION_SESSION_ID, true),
+			);
+		}
+		return this.supervisionSessionIDs.get(nodeId)!();
+	}
 
 	/**
 	 * Returns the next session ID for Transport Service CC