fix: ensure all commands with callbacks are parsed correctly

zwave-js · Oct 24, 2024 · 2a30a7b · 2a30a7b
1 parent c465a2b
commit 2a30a7b
Show file tree

Hide file tree

Showing 11 changed files with 77 additions and 12 deletions.
diff --git a/packages/zwave-js/src/lib/serialapi/network-mgmt/AssignPriorityReturnRouteMessages.ts b/packages/zwave-js/src/lib/serialapi/network-mgmt/AssignPriorityReturnRouteMessages.ts
@@ -14,6 +14,7 @@ import {
  Message,
  type MessageBaseOptions,
  type MessageEncodingContext,
+ MessageOrigin,
  type MessageParsingContext,
  type MessageRaw,
  MessageType,
@@ -32,7 +33,14 @@ export class AssignPriorityReturnRouteRequestBase extends Message {
  raw: MessageRaw,
  ctx: MessageParsingContext,
  ): AssignPriorityReturnRouteRequestBase {
- return AssignPriorityReturnRouteRequestTransmitReport.from(raw, ctx);
+ if (ctx.origin === MessageOrigin.Host) {
+ return AssignPriorityReturnRouteRequest.from(raw, ctx);
+ } else {
+ return AssignPriorityReturnRouteRequestTransmitReport.from(
+ raw,
+ ctx,
+ );
+ }
  }
 }
 

diff --git a/packages/zwave-js/src/lib/serialapi/network-mgmt/AssignPrioritySUCReturnRouteMessages.ts b/packages/zwave-js/src/lib/serialapi/network-mgmt/AssignPrioritySUCReturnRouteMessages.ts
@@ -14,6 +14,7 @@ import {
  Message,
  type MessageBaseOptions,
  type MessageEncodingContext,
+ MessageOrigin,
  type MessageParsingContext,
  type MessageRaw,
  MessageType,
@@ -32,7 +33,14 @@ export class AssignPrioritySUCReturnRouteRequestBase extends Message {
  raw: MessageRaw,
  ctx: MessageParsingContext,
  ): AssignPrioritySUCReturnRouteRequestBase {
- return AssignPrioritySUCReturnRouteRequestTransmitReport.from(raw, ctx);
+ if (ctx.origin === MessageOrigin.Host) {
+ return AssignPrioritySUCReturnRouteRequest.from(raw, ctx);
+ } else {
+ return AssignPrioritySUCReturnRouteRequestTransmitReport.from(
+ raw,
+ ctx,
+ );
+ }
  }
 }
 

diff --git a/packages/zwave-js/src/lib/serialapi/network-mgmt/AssignReturnRouteMessages.ts b/packages/zwave-js/src/lib/serialapi/network-mgmt/AssignReturnRouteMessages.ts
@@ -17,6 +17,7 @@ import {
  FunctionType,
  Message,
  type MessageBaseOptions,
+ MessageOrigin,
  MessageType,
  expectedCallback,
  expectedResponse,
@@ -32,7 +33,11 @@ export class AssignReturnRouteRequestBase extends Message {
  raw: MessageRaw,
  ctx: MessageParsingContext,
  ): AssignReturnRouteRequestBase {
- return AssignReturnRouteRequestTransmitReport.from(raw, ctx);
+ if (ctx.origin === MessageOrigin.Host) {
+ return AssignReturnRouteRequest.from(raw, ctx);
+ } else {
+ return AssignReturnRouteRequestTransmitReport.from(raw, ctx);
+ }
  }
 }
 

diff --git a/packages/zwave-js/src/lib/serialapi/network-mgmt/DeleteReturnRouteMessages.ts b/packages/zwave-js/src/lib/serialapi/network-mgmt/DeleteReturnRouteMessages.ts
@@ -17,6 +17,7 @@ import {
  FunctionType,
  Message,
  type MessageBaseOptions,
+ MessageOrigin,
  MessageType,
  expectedCallback,
  expectedResponse,
@@ -32,7 +33,11 @@ export class DeleteReturnRouteRequestBase extends Message {
  raw: MessageRaw,
  ctx: MessageParsingContext,
  ): DeleteReturnRouteRequestBase {
- return DeleteReturnRouteRequestTransmitReport.from(raw, ctx);
+ if (ctx.origin === MessageOrigin.Host) {
+ return DeleteReturnRouteRequest.from(raw, ctx);
+ } else {
+ return DeleteReturnRouteRequestTransmitReport.from(raw, ctx);
+ }
  }
 }
 

diff --git a/packages/zwave-js/src/lib/serialapi/network-mgmt/RemoveFailedNodeMessages.ts b/packages/zwave-js/src/lib/serialapi/network-mgmt/RemoveFailedNodeMessages.ts
@@ -9,6 +9,7 @@ import {
  FunctionType,
  Message,
  type MessageBaseOptions,
+ MessageOrigin,
  MessageType,
  expectedCallback,
  expectedResponse,
@@ -49,7 +50,11 @@ export class RemoveFailedNodeRequestBase extends Message {
  raw: MessageRaw,
  ctx: MessageParsingContext,
  ): RemoveFailedNodeRequestBase {
- return RemoveFailedNodeRequestStatusReport.from(raw, ctx);
+ if (ctx.origin === MessageOrigin.Host) {
+ return RemoveFailedNodeRequest.from(raw, ctx);
+ } else {
+ return RemoveFailedNodeRequestStatusReport.from(raw, ctx);
+ }
  }
 }
 

diff --git a/packages/zwave-js/src/lib/serialapi/network-mgmt/ReplaceFailedNodeRequest.ts b/packages/zwave-js/src/lib/serialapi/network-mgmt/ReplaceFailedNodeRequest.ts
@@ -9,6 +9,7 @@ import {
  FunctionType,
  Message,
  type MessageBaseOptions,
+ MessageOrigin,
  MessageType,
  expectedResponse,
  messageTypes,
@@ -49,7 +50,11 @@ export class ReplaceFailedNodeRequestBase extends Message {
  raw: MessageRaw,
  ctx: MessageParsingContext,
  ): ReplaceFailedNodeRequestBase {
- return ReplaceFailedNodeRequestStatusReport.from(raw, ctx);
+ if (ctx.origin === MessageOrigin.Host) {
+ return ReplaceFailedNodeRequest.from(raw, ctx);
+ } else {
+ return ReplaceFailedNodeRequestStatusReport.from(raw, ctx);
+ }
  }
 }
 

diff --git a/packages/zwave-js/src/lib/serialapi/network-mgmt/RequestNodeNeighborUpdateMessages.ts b/packages/zwave-js/src/lib/serialapi/network-mgmt/RequestNodeNeighborUpdateMessages.ts
@@ -11,6 +11,7 @@ import {
  FunctionType,
  Message,
  type MessageBaseOptions,
+ MessageOrigin,
  MessageType,
  expectedCallback,
  messageTypes,
@@ -31,7 +32,11 @@ export class RequestNodeNeighborUpdateRequestBase extends Message {
  raw: MessageRaw,
  ctx: MessageParsingContext,
  ): RequestNodeNeighborUpdateRequestBase {
- return RequestNodeNeighborUpdateReport.from(raw, ctx);
+ if (ctx.origin === MessageOrigin.Host) {
+ return RequestNodeNeighborUpdateRequest.from(raw, ctx);
+ } else {
+ return RequestNodeNeighborUpdateReport.from(raw, ctx);
+ }
  }
 }
 

diff --git a/packages/zwave-js/src/lib/serialapi/network-mgmt/SetLearnModeMessages.ts b/packages/zwave-js/src/lib/serialapi/network-mgmt/SetLearnModeMessages.ts
@@ -10,6 +10,7 @@ import {
  Message,
  type MessageBaseOptions,
  type MessageEncodingContext,
+ MessageOrigin,
  type MessageParsingContext,
  type MessageRaw,
  MessageType,
@@ -50,7 +51,11 @@ export class SetLearnModeRequestBase extends Message {
  raw: MessageRaw,
  ctx: MessageParsingContext,
  ): SetLearnModeRequestBase {
- return SetLearnModeCallback.from(raw, ctx);
+ if (ctx.origin === MessageOrigin.Host) {
+ return SetLearnModeRequest.from(raw, ctx);
+ } else {
+ return SetLearnModeCallback.from(raw, ctx);
+ }
  }
 }
 

diff --git a/packages/zwave-js/src/lib/serialapi/network-mgmt/SetSUCNodeIDMessages.ts b/packages/zwave-js/src/lib/serialapi/network-mgmt/SetSUCNodeIDMessages.ts
@@ -16,6 +16,7 @@ import {
  FunctionType,
  Message,
  type MessageBaseOptions,
+ MessageOrigin,
  MessageType,
  expectedCallback,
  expectedResponse,
@@ -43,7 +44,11 @@ export class SetSUCNodeIdRequestBase extends Message {
  raw: MessageRaw,
  ctx: MessageParsingContext,
  ): SetSUCNodeIdRequestBase {
- return SetSUCNodeIdRequestStatusReport.from(raw, ctx);
+ if (ctx.origin === MessageOrigin.Host) {
+ return SetSUCNodeIdRequest.from(raw, ctx);
+ } else {
+ return SetSUCNodeIdRequestStatusReport.from(raw, ctx);
+ }
  }
 }
 

diff --git a/packages/zwave-js/src/lib/serialapi/transport/SendDataBridgeMessages.ts b/packages/zwave-js/src/lib/serialapi/transport/SendDataBridgeMessages.ts
@@ -24,6 +24,7 @@ import {
  FunctionType,
  Message,
  type MessageBaseOptions,
+ MessageOrigin,
  MessageType,
  expectedCallback,
  expectedResponse,
@@ -45,7 +46,11 @@ export class SendDataBridgeRequestBase extends Message {
  raw: MessageRaw,
  ctx: MessageParsingContext,
  ): SendDataBridgeRequestBase {
- return SendDataBridgeRequestTransmitReport.from(raw, ctx);
+ if (ctx.origin === MessageOrigin.Host) {
+ return SendDataBridgeRequest.from(raw, ctx);
+ } else {
+ return SendDataBridgeRequestTransmitReport.from(raw, ctx);
+ }
  }
 }
 
@@ -317,7 +322,11 @@ export class SendDataMulticastBridgeRequestBase extends Message {
  raw: MessageRaw,
  ctx: MessageParsingContext,
  ): SendDataMulticastBridgeRequestBase {
- return SendDataMulticastBridgeRequestTransmitReport.from(raw, ctx);
+ if (ctx.origin === MessageOrigin.Host) {
+ return SendDataMulticastBridgeRequest.from(raw, ctx);
+ } else {
+ return SendDataMulticastBridgeRequestTransmitReport.from(raw, ctx);
+ }
  }
 }
 

diff --git a/packages/zwave-js/src/lib/serialapi/transport/SendTestFrameMessages.ts b/packages/zwave-js/src/lib/serialapi/transport/SendTestFrameMessages.ts
@@ -11,6 +11,7 @@ import {
  Message,
  type MessageBaseOptions,
  type MessageEncodingContext,
+ MessageOrigin,
  type MessageParsingContext,
  type MessageRaw,
  MessageType,
@@ -29,7 +30,11 @@ export class SendTestFrameRequestBase extends Message {
  raw: MessageRaw,
  ctx: MessageParsingContext,
  ): SendTestFrameRequestBase {
- return SendTestFrameTransmitReport.from(raw, ctx);
+ if (ctx.origin === MessageOrigin.Host) {
+ return SendTestFrameRequest.from(raw, ctx);
+ } else {
+ return SendTestFrameTransmitReport.from(raw, ctx);
+ }
  }
 }