zwave-js 10.15.0 → 10.17.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/mock-server.js +58 -0
- package/build/Testing.d.ts +1 -0
- package/build/Testing.d.ts.map +1 -1
- package/build/Testing.js +3 -1
- package/build/Testing.js.map +1 -1
- package/build/lib/controller/MockControllerBehaviors.d.ts.map +1 -1
- package/build/lib/controller/MockControllerBehaviors.js +34 -5
- package/build/lib/controller/MockControllerBehaviors.js.map +1 -1
- package/build/lib/controller/NodeInformationFrame.d.ts.map +1 -1
- package/build/lib/controller/NodeInformationFrame.js +21 -28
- package/build/lib/controller/NodeInformationFrame.js.map +1 -1
- package/build/lib/driver/Driver.d.ts +4 -2
- package/build/lib/driver/Driver.d.ts.map +1 -1
- package/build/lib/driver/Driver.js +29 -11
- package/build/lib/driver/Driver.js.map +1 -1
- package/build/lib/driver/MessageGenerators.d.ts.map +1 -1
- package/build/lib/driver/MessageGenerators.js +39 -4
- package/build/lib/driver/MessageGenerators.js.map +1 -1
- package/build/lib/driver/TransportServiceMachine.d.ts +6 -4
- package/build/lib/driver/TransportServiceMachine.d.ts.map +1 -1
- package/build/lib/driver/TransportServiceMachine.js +12 -10
- package/build/lib/driver/TransportServiceMachine.js.map +1 -1
- package/build/lib/driver/ZWaveOptions.d.ts +27 -0
- package/build/lib/driver/ZWaveOptions.d.ts.map +1 -1
- package/build/lib/node/Endpoint.d.ts +2 -0
- package/build/lib/node/Endpoint.d.ts.map +1 -1
- package/build/lib/node/Endpoint.js +7 -0
- package/build/lib/node/Endpoint.js.map +1 -1
- package/build/lib/node/MockNodeBehaviors.d.ts.map +1 -1
- package/build/lib/node/MockNodeBehaviors.js +6 -0
- package/build/lib/node/MockNodeBehaviors.js.map +1 -1
- package/build/lib/node/Node.d.ts +4 -0
- package/build/lib/node/Node.d.ts.map +1 -1
- package/build/lib/node/Node.js +62 -10
- package/build/lib/node/Node.js.map +1 -1
- package/build/lib/node/mockCCBehaviors/Notification.d.ts +3 -0
- package/build/lib/node/mockCCBehaviors/Notification.d.ts.map +1 -0
- package/build/lib/node/mockCCBehaviors/Notification.js +60 -0
- package/build/lib/node/mockCCBehaviors/Notification.js.map +1 -0
- package/build/lib/node/mockCCBehaviors/SoundSwitch.d.ts +3 -0
- package/build/lib/node/mockCCBehaviors/SoundSwitch.d.ts.map +1 -0
- package/build/lib/node/mockCCBehaviors/SoundSwitch.js +101 -0
- package/build/lib/node/mockCCBehaviors/SoundSwitch.js.map +1 -0
- package/build/lib/node/mockCCBehaviors/WindowCovering.d.ts +3 -0
- package/build/lib/node/mockCCBehaviors/WindowCovering.d.ts.map +1 -0
- package/build/lib/node/mockCCBehaviors/WindowCovering.js +31 -0
- package/build/lib/node/mockCCBehaviors/WindowCovering.js.map +1 -0
- package/build/mockServer.d.ts +15 -0
- package/build/mockServer.d.ts.map +1 -0
- package/build/mockServer.js +90 -0
- package/build/mockServer.js.map +1 -0
- package/package.json +24 -51
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
// @ts-check
|
|
2
|
+
const { MockServer } = require("../build/Testing");
|
|
3
|
+
const { readFileSync } = require("fs");
|
|
4
|
+
const path = require("path");
|
|
5
|
+
|
|
6
|
+
const args = process.argv.slice(2);
|
|
7
|
+
|
|
8
|
+
if (args.includes("--help") || args.includes("-h")) {
|
|
9
|
+
// Print a help text explaining the usage of this script and mention the options it supports
|
|
10
|
+
console.log(`
|
|
11
|
+
Usage: node ${path.basename(__filename)} [options]
|
|
12
|
+
|
|
13
|
+
Options:
|
|
14
|
+
-h, --help Displays this help
|
|
15
|
+
-i, --interface The network interface to bind to. Default: all interfaces
|
|
16
|
+
-p, --port The port to bind to. Default: 5555
|
|
17
|
+
-c, --config Path to a config file (either .js or .json), which defines the mock
|
|
18
|
+
|
|
19
|
+
`);
|
|
20
|
+
process.exit(0);
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
// Parse config
|
|
24
|
+
const configIndex = args.findIndex((arg) => arg === "--config" || arg === "-c");
|
|
25
|
+
const configPath = configIndex === -1 ? undefined : args[configIndex + 1];
|
|
26
|
+
let config;
|
|
27
|
+
if (configPath?.endsWith(".js")) {
|
|
28
|
+
config = require(path.join(process.cwd(), configPath)).default;
|
|
29
|
+
} else if (configPath?.endsWith(".json")) {
|
|
30
|
+
// TODO: JSON5 support
|
|
31
|
+
config = JSON.parse(readFileSync(configPath, "utf8"));
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
// Parse interface
|
|
35
|
+
const interfaceIndex = args.findIndex(
|
|
36
|
+
(arg) => arg === "--interface" || arg === "-i",
|
|
37
|
+
);
|
|
38
|
+
const interface = interfaceIndex === -1 ? undefined : args[interfaceIndex + 1];
|
|
39
|
+
|
|
40
|
+
// Parse port
|
|
41
|
+
const portIndex = args.findIndex((arg) => arg === "--port" || arg === "-p");
|
|
42
|
+
let port = portIndex === -1 ? undefined : parseInt(args[portIndex + 1]);
|
|
43
|
+
if (Number.isNaN(port)) port = undefined;
|
|
44
|
+
|
|
45
|
+
let server;
|
|
46
|
+
(async () => {
|
|
47
|
+
server = new MockServer({
|
|
48
|
+
interface,
|
|
49
|
+
port,
|
|
50
|
+
config,
|
|
51
|
+
});
|
|
52
|
+
await server.start();
|
|
53
|
+
})();
|
|
54
|
+
|
|
55
|
+
process.on("SIGINT", async () => {
|
|
56
|
+
await server.stop();
|
|
57
|
+
process.exit(0);
|
|
58
|
+
});
|
package/build/Testing.d.ts
CHANGED
package/build/Testing.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Testing.d.ts","sourceRoot":"","sources":["../src/Testing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gCAAgC,EAAE,MAAM,yBAAyB,CAAC"}
|
|
1
|
+
{"version":3,"file":"Testing.d.ts","sourceRoot":"","sources":["../src/Testing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gCAAgC,EAAE,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC"}
|
package/build/Testing.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createAndStartDriverWithMockPort = void 0;
|
|
3
|
+
exports.MockServer = exports.createAndStartDriverWithMockPort = void 0;
|
|
4
4
|
var DriverMock_1 = require("./lib/driver/DriverMock");
|
|
5
5
|
Object.defineProperty(exports, "createAndStartDriverWithMockPort", { enumerable: true, get: function () { return DriverMock_1.createAndStartDriverWithMockPort; } });
|
|
6
|
+
var mockServer_1 = require("./mockServer");
|
|
7
|
+
Object.defineProperty(exports, "MockServer", { enumerable: true, get: function () { return mockServer_1.MockServer; } });
|
|
6
8
|
//# sourceMappingURL=Testing.js.map
|
package/build/Testing.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Testing.js","sourceRoot":"","sources":["../src/Testing.ts"],"names":[],"mappings":";;;AAAA,sDAA2E;AAAlE,8HAAA,gCAAgC,OAAA"}
|
|
1
|
+
{"version":3,"file":"Testing.js","sourceRoot":"","sources":["../src/Testing.ts"],"names":[],"mappings":";;;AAAA,sDAA2E;AAAlE,8HAAA,gCAAgC,OAAA;AACzC,2CAA0C;AAAjC,wGAAA,UAAU,OAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MockControllerBehaviors.d.ts","sourceRoot":"","sources":["../../../src/lib/controller/MockControllerBehaviors.ts"],"names":[],"mappings":"AAgBA,OAAO,EAEN,sBAAsB,EAGtB,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"MockControllerBehaviors.d.ts","sourceRoot":"","sources":["../../../src/lib/controller/MockControllerBehaviors.ts"],"names":[],"mappings":"AAgBA,OAAO,EAEN,sBAAsB,EAGtB,MAAM,mBAAmB,CAAC;AAqf3B,+FAA+F;AAC/F,wBAAgB,sBAAsB,IAAI,sBAAsB,EAAE,CAejE"}
|
|
@@ -165,11 +165,40 @@ const handleSendData = {
|
|
|
165
165
|
// Simulate the frame being transmitted via radio
|
|
166
166
|
const ackPromise = (0, async_1.wait)(node.capabilities.txDelay).then(() => {
|
|
167
167
|
// Deserialize on the node after a short delay
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
168
|
+
try {
|
|
169
|
+
msg.command = cc_1.CommandClass.from(node.host, {
|
|
170
|
+
nodeId: controller.host.ownNodeId,
|
|
171
|
+
data: msg.payload,
|
|
172
|
+
origin: serial_1.MessageOrigin.Host,
|
|
173
|
+
});
|
|
174
|
+
}
|
|
175
|
+
catch (e) {
|
|
176
|
+
let handled = false;
|
|
177
|
+
if ((0, core_1.isZWaveError)(e)) {
|
|
178
|
+
// We want to know when we're using a command in tests that cannot be decoded yet
|
|
179
|
+
if (e.code ===
|
|
180
|
+
core_1.ZWaveErrorCodes.Deserialization_NotImplemented) {
|
|
181
|
+
console.error(e.message);
|
|
182
|
+
}
|
|
183
|
+
else if (e.code === core_1.ZWaveErrorCodes.CC_NotImplemented) {
|
|
184
|
+
// The whole CC is not implemented yet. If this happens in tests, it is because we sent a raw CC.
|
|
185
|
+
try {
|
|
186
|
+
msg.command = new cc_1.CommandClass(host, {
|
|
187
|
+
nodeId: controller.host.ownNodeId,
|
|
188
|
+
ccId: msg.payload[0],
|
|
189
|
+
ccCommand: msg.payload[1],
|
|
190
|
+
payload: msg.payload.slice(2),
|
|
191
|
+
});
|
|
192
|
+
handled = true;
|
|
193
|
+
}
|
|
194
|
+
catch (e) {
|
|
195
|
+
console.error(e.message);
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
if (!handled)
|
|
200
|
+
throw e;
|
|
201
|
+
}
|
|
173
202
|
// Send the data to the node
|
|
174
203
|
const frame = (0, testing_1.createMockZWaveRequestFrame)(msg.command, {
|
|
175
204
|
ackRequested: !!(msg.transmitOptions & core_1.TransmitOptions.ACK),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MockControllerBehaviors.js","sourceRoot":"","sources":["../../../src/lib/controller/MockControllerBehaviors.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"MockControllerBehaviors.js","sourceRoot":"","sources":["../../../src/lib/controller/MockControllerBehaviors.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeInformationFrame.d.ts","sourceRoot":"","sources":["../../../src/lib/controller/NodeInformationFrame.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"NodeInformationFrame.d.ts","sourceRoot":"","sources":["../../../src/lib/controller/NodeInformationFrame.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,cAAc,EAAoB,MAAM,qBAAqB,CAAC;AAE/E,wBAAgB,YAAY,IAAI;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,YAAY,EAAE,cAAc,EAAE,CAAC;IAC/B,aAAa,EAAE,cAAc,EAAE,CAAC;CAChC,CAgDA"}
|
|
@@ -9,46 +9,39 @@ function determineNIF() {
|
|
|
9
9
|
const specificDeviceClass = 0x07; // Gateway
|
|
10
10
|
const implementedCCs = safe_1.allCCs.filter((cc) => (0, cc_1.getImplementedVersion)(cc) > 0);
|
|
11
11
|
// Encapsulation CCs are always supported
|
|
12
|
-
const implementedEncapsulationCCs = safe_1.encapsulationCCs.filter((cc) => implementedCCs.includes(cc)
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
12
|
+
const implementedEncapsulationCCs = safe_1.encapsulationCCs.filter((cc) => implementedCCs.includes(cc) &&
|
|
13
|
+
// A node MUST advertise support for Multi Channel Command Class only if it implements End Points.
|
|
14
|
+
// A node able to communicate using the Multi Channel encapsulation but implementing no End Point
|
|
15
|
+
// MUST NOT advertise support for the Multi Channel Command Class.
|
|
16
|
+
// --> We do not implement end points
|
|
17
|
+
cc !== safe_1.CommandClasses["Multi Channel"]);
|
|
18
|
+
// The supported CCs are mostly determined by the Z-Wave+ v2 device type specification
|
|
19
|
+
const supportedCCs = new Set([
|
|
16
20
|
// Z-Wave Plus Info must be listed first
|
|
17
21
|
safe_1.CommandClasses["Z-Wave Plus Info"],
|
|
18
|
-
// Z-Wave Plus v2
|
|
19
|
-
//
|
|
20
|
-
safe_1.CommandClasses["Inclusion Controller"],
|
|
21
|
-
safe_1.CommandClasses.Time,
|
|
22
|
-
...implementedEncapsulationCCs,
|
|
23
|
-
];
|
|
24
|
-
const controlledCCs = [
|
|
25
|
-
// Non-actuator CCs that MUST be supported by the gateway DT:
|
|
22
|
+
// Mandatory CCs for Z-Wave Plus v2 devices:
|
|
23
|
+
// Association SHOULD be within the first 6 entries
|
|
26
24
|
safe_1.CommandClasses.Association,
|
|
27
25
|
safe_1.CommandClasses["Association Group Information"],
|
|
28
|
-
safe_1.CommandClasses
|
|
29
|
-
safe_1.CommandClasses["Central Scene"],
|
|
30
|
-
safe_1.CommandClasses["CRC-16 Encapsulation"],
|
|
26
|
+
safe_1.CommandClasses["Device Reset Locally"],
|
|
31
27
|
safe_1.CommandClasses["Firmware Update Meta Data"],
|
|
32
28
|
safe_1.CommandClasses.Indicator,
|
|
33
|
-
safe_1.CommandClasses
|
|
34
|
-
safe_1.CommandClasses["Multi Channel"],
|
|
29
|
+
safe_1.CommandClasses["Manufacturer Specific"],
|
|
35
30
|
safe_1.CommandClasses["Multi Channel Association"],
|
|
36
|
-
safe_1.CommandClasses
|
|
37
|
-
safe_1.CommandClasses.Notification,
|
|
38
|
-
safe_1.CommandClasses.Security,
|
|
39
|
-
safe_1.CommandClasses["Security 2"],
|
|
31
|
+
safe_1.CommandClasses.Powerlevel,
|
|
40
32
|
safe_1.CommandClasses.Version,
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
33
|
+
// Gateway device type MUST support Inclusion Controller and Time CC
|
|
34
|
+
safe_1.CommandClasses["Inclusion Controller"],
|
|
35
|
+
safe_1.CommandClasses.Time,
|
|
36
|
+
...implementedEncapsulationCCs,
|
|
37
|
+
]);
|
|
38
|
+
// CC:0000.00.00.12.004: It is NOT RECOMMENDED to advertise controlled Command Classes.
|
|
46
39
|
return {
|
|
47
40
|
basicDeviceClass,
|
|
48
41
|
genericDeviceClass,
|
|
49
42
|
specificDeviceClass,
|
|
50
|
-
supportedCCs,
|
|
51
|
-
controlledCCs,
|
|
43
|
+
supportedCCs: [...supportedCCs],
|
|
44
|
+
controlledCCs: [],
|
|
52
45
|
};
|
|
53
46
|
}
|
|
54
47
|
exports.determineNIF = determineNIF;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeInformationFrame.js","sourceRoot":"","sources":["../../../src/lib/controller/NodeInformationFrame.ts"],"names":[],"mappings":";;;AAAA,qCAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"NodeInformationFrame.js","sourceRoot":"","sources":["../../../src/lib/controller/NodeInformationFrame.ts"],"names":[],"mappings":";;;AAAA,qCAAqD;AACrD,8CAA+E;AAE/E,SAAgB,YAAY;IAO3B,MAAM,gBAAgB,GAAG,IAAI,CAAC,CAAC,oBAAoB;IACnD,MAAM,kBAAkB,GAAG,IAAI,CAAC,CAAC,oBAAoB;IACrD,MAAM,mBAAmB,GAAG,IAAI,CAAC,CAAC,UAAU;IAE5C,MAAM,cAAc,GAAG,aAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAA,0BAAqB,EAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAE5E,yCAAyC;IACzC,MAAM,2BAA2B,GAAG,uBAAgB,CAAC,MAAM,CAC1D,CAAC,EAAE,EAAE,EAAE,CACN,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC3B,kGAAkG;QAClG,iGAAiG;QACjG,kEAAkE;QAClE,qCAAqC;QACrC,EAAE,KAAK,qBAAc,CAAC,eAAe,CAAC,CACvC,CAAC;IAEF,sFAAsF;IACtF,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC;QAC5B,wCAAwC;QACxC,qBAAc,CAAC,kBAAkB,CAAC;QAClC,4CAA4C;QAC5C,mDAAmD;QACnD,qBAAc,CAAC,WAAW;QAC1B,qBAAc,CAAC,+BAA+B,CAAC;QAC/C,qBAAc,CAAC,sBAAsB,CAAC;QACtC,qBAAc,CAAC,2BAA2B,CAAC;QAC3C,qBAAc,CAAC,SAAS;QACxB,qBAAc,CAAC,uBAAuB,CAAC;QACvC,qBAAc,CAAC,2BAA2B,CAAC;QAC3C,qBAAc,CAAC,UAAU;QACzB,qBAAc,CAAC,OAAO;QACtB,oEAAoE;QACpE,qBAAc,CAAC,sBAAsB,CAAC;QACtC,qBAAc,CAAC,IAAI;QACnB,GAAG,2BAA2B;KAC9B,CAAC,CAAC;IAEH,uFAAuF;IAEvF,OAAO;QACN,gBAAgB;QAChB,kBAAkB;QAClB,mBAAmB;QACnB,YAAY,EAAE,CAAC,GAAG,YAAY,CAAC;QAC/B,aAAa,EAAE,EAAE;KACjB,CAAC;AACH,CAAC;AAtDD,oCAsDC"}
|
|
@@ -27,6 +27,7 @@ interface AwaitedThing<T> {
|
|
|
27
27
|
handler: (thing: T) => void;
|
|
28
28
|
timeout?: NodeJS.Timeout;
|
|
29
29
|
predicate: (msg: T) => boolean;
|
|
30
|
+
refreshPredicate?: (msg: T) => boolean;
|
|
30
31
|
}
|
|
31
32
|
export type AwaitedBootloaderChunkEntry = AwaitedThing<BootloaderChunk>;
|
|
32
33
|
export interface DriverEventCallbacks {
|
|
@@ -370,9 +371,10 @@ export declare class Driver extends TypedEventEmitter<DriverEventCallbacks> impl
|
|
|
370
371
|
*
|
|
371
372
|
* **Note:** To wait for a certain CommandClass, better use {@link waitForCommand}.
|
|
372
373
|
* @param timeout The number of milliseconds to wait. If the timeout elapses, the returned promise will be rejected
|
|
373
|
-
* @param predicate A predicate function to test all incoming messages
|
|
374
|
+
* @param predicate A predicate function to test all incoming messages.
|
|
375
|
+
* @param refreshPredicate A predicate function to test partial messages. If this returns `true` for a message, the timer will be restarted.
|
|
374
376
|
*/
|
|
375
|
-
waitForMessage<T extends Message>(predicate: (msg: Message) => boolean, timeout: number): Promise<T>;
|
|
377
|
+
waitForMessage<T extends Message>(predicate: (msg: Message) => boolean, timeout: number, refreshPredicate?: (msg: Message) => boolean): Promise<T>;
|
|
376
378
|
/**
|
|
377
379
|
* Waits until a CommandClass is received or a timeout has elapsed. Returns the received command.
|
|
378
380
|
* @param timeout The number of milliseconds to wait. If the timeout elapses, the returned promise will be rejected
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Driver.d.ts","sourceRoot":"","sources":["../../../src/lib/driver/Driver.ts"],"names":[],"mappings":";;AAEA,OAAO,EAEN,YAAY,EAMZ,sBAAsB,EA2BtB,MAAM,cAAc,CAAC;AACtB,OAAO,EACN,aAAa,EAGb,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACN,cAAc,EAMd,aAAa,EAEb,SAAS,EAYT,kBAAkB,EAClB,qBAAqB,EACrB,kBAAkB,EAelB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAEX,oBAAoB,EACpB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACN,eAAe,EAEf,YAAY,EAMZ,OAAO,EAOP,6BAA6B,EAE7B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAIN,WAAW,EAQX,iBAAiB,EACjB,MAAM,kBAAkB,CAAC;AAa1B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAG3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAY9C,OAAO,EACN,qBAAqB,EACrB,8BAA8B,EAC9B,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAGN,wBAAwB,EACxB,eAAe,EACf,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAMN,eAAe,EACf,MAAM,uCAAuC,CAAC;AAG/C,OAAO,EACN,OAAO,EAGP,MAAM,yBAAyB,CAAC;AAgBjC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAW5C,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAMzE,eAAO,MAAM,UAAU,EAAE,MAA4B,CAAC;AACtD,eAAO,MAAM,OAAO,EAAE,MAAyB,CAAC;AAiKhD;;;GAGG;AACH,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,IAAI,CACzD,GAAG,EAAE,CAAC,KACF,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAMhC,UAAU,YAAY,CAAC,CAAC;IACvB,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IACzB,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"Driver.d.ts","sourceRoot":"","sources":["../../../src/lib/driver/Driver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1019,6 +1019,10 @@ class Driver extends shared_1.TypedEventEmitter {
|
|
|
1019
1019
|
}
|
|
1020
1020
|
})();
|
|
1021
1021
|
}
|
|
1022
|
+
// If we only have sleeping nodes or a controller-only network, the send
|
|
1023
|
+
// thread is idle before the driver gets marked ready, the idle tasks won't be triggered.
|
|
1024
|
+
// So do it manually.
|
|
1025
|
+
this.handleSendThreadIdleChange(this.sendThreadIdle);
|
|
1022
1026
|
}
|
|
1023
1027
|
}
|
|
1024
1028
|
/**
|
|
@@ -1545,7 +1549,7 @@ class Driver extends shared_1.TypedEventEmitter {
|
|
|
1545
1549
|
return Math.min(supportedVersion, implementedVersion);
|
|
1546
1550
|
}
|
|
1547
1551
|
}
|
|
1548
|
-
throw new core_1.ZWaveError("Cannot retrieve the version of a CC that is not implemented", core_1.ZWaveErrorCodes.
|
|
1552
|
+
throw new core_1.ZWaveError("Cannot retrieve the version of a CC that is not implemented", core_1.ZWaveErrorCodes.CC_NotImplemented);
|
|
1549
1553
|
}
|
|
1550
1554
|
/**
|
|
1551
1555
|
* Determines whether a CC must be secure for a given node and endpoint.
|
|
@@ -2034,8 +2038,17 @@ class Driver extends shared_1.TypedEventEmitter {
|
|
|
2034
2038
|
});
|
|
2035
2039
|
}
|
|
2036
2040
|
// Assemble partial CCs on the driver level. Only forward complete messages to the send thread machine
|
|
2037
|
-
if (!this.assemblePartialCCs(msg))
|
|
2041
|
+
if (!this.assemblePartialCCs(msg)) {
|
|
2042
|
+
// Check if a message timer needs to be refreshed.
|
|
2043
|
+
for (const entry of this.awaitedMessages) {
|
|
2044
|
+
if (entry.refreshPredicate?.(msg)) {
|
|
2045
|
+
entry.timeout?.refresh();
|
|
2046
|
+
// Since this is a partial message there may be no clear 1:1 match.
|
|
2047
|
+
// Therefore we loop through all awaited messages
|
|
2048
|
+
}
|
|
2049
|
+
}
|
|
2038
2050
|
return;
|
|
2051
|
+
}
|
|
2039
2052
|
// Make sure we are allowed to handle this command
|
|
2040
2053
|
if (this.shouldDiscardCC(msg.command)) {
|
|
2041
2054
|
if (!wasMessageLogged) {
|
|
@@ -2266,7 +2279,8 @@ class Driver extends shared_1.TypedEventEmitter {
|
|
|
2266
2279
|
}
|
|
2267
2280
|
return true;
|
|
2268
2281
|
}
|
|
2269
|
-
else if (e.code === core_1.ZWaveErrorCodes.
|
|
2282
|
+
else if ((e.code === core_1.ZWaveErrorCodes.Security2CC_NoMPAN ||
|
|
2283
|
+
e.code === core_1.ZWaveErrorCodes.Security2CC_CannotDecodeMulticast) &&
|
|
2270
2284
|
(0, cc_1.isCommandClassContainer)(msg)) {
|
|
2271
2285
|
// Decoding the command failed because the MPAN used by the other node
|
|
2272
2286
|
// is not known to us yet
|
|
@@ -2442,16 +2456,16 @@ class Driver extends shared_1.TypedEventEmitter {
|
|
|
2442
2456
|
direction: "inbound",
|
|
2443
2457
|
});
|
|
2444
2458
|
const RXStateMachine = (0, TransportServiceMachine_1.createTransportServiceRXMachine)({
|
|
2445
|
-
requestMissingSegment: async (
|
|
2459
|
+
requestMissingSegment: async (offset) => {
|
|
2446
2460
|
this.controllerLog.logNode(command.nodeId, {
|
|
2447
|
-
message: `Transport Service RX session #${command.sessionId}: Segment ${
|
|
2461
|
+
message: `Transport Service RX session #${command.sessionId}: Segment with offset ${offset} missing - requesting it...`,
|
|
2448
2462
|
level: "debug",
|
|
2449
2463
|
direction: "outbound",
|
|
2450
2464
|
});
|
|
2451
2465
|
const cc = new cc_1.TransportServiceCCSegmentRequest(this, {
|
|
2452
2466
|
nodeId: command.nodeId,
|
|
2453
2467
|
sessionId: command.sessionId,
|
|
2454
|
-
datagramOffset:
|
|
2468
|
+
datagramOffset: offset,
|
|
2455
2469
|
});
|
|
2456
2470
|
await this.sendCommand(cc, {
|
|
2457
2471
|
maxSendAttempts: 1,
|
|
@@ -2476,7 +2490,8 @@ class Driver extends shared_1.TypedEventEmitter {
|
|
|
2476
2490
|
}, {
|
|
2477
2491
|
// TODO: Figure out how to know which timeout is the correct one. For now use the larger one
|
|
2478
2492
|
missingSegmentTimeout: cc_1.TransportServiceTimeouts.requestMissingSegmentR2,
|
|
2479
|
-
|
|
2493
|
+
datagramSize: command.datagramSize,
|
|
2494
|
+
firstSegmentSize: command.partialDatagram.length,
|
|
2480
2495
|
});
|
|
2481
2496
|
const interpreter = (0, xstate_1.interpret)(RXStateMachine).start();
|
|
2482
2497
|
nodeSessions.transportService.set(command.sessionId, {
|
|
@@ -2501,7 +2516,8 @@ class Driver extends shared_1.TypedEventEmitter {
|
|
|
2501
2516
|
if (transportSession) {
|
|
2502
2517
|
transportSession.interpreter.send({
|
|
2503
2518
|
type: "segment",
|
|
2504
|
-
|
|
2519
|
+
offset: command.datagramOffset,
|
|
2520
|
+
length: command.partialDatagram.length,
|
|
2505
2521
|
});
|
|
2506
2522
|
}
|
|
2507
2523
|
else {
|
|
@@ -2589,7 +2605,7 @@ ${handlers.length} left`);
|
|
|
2589
2605
|
// For Command Classes supported securely, a controlling node MUST discard
|
|
2590
2606
|
// the command from a supporting node if not received at the highest common
|
|
2591
2607
|
// security level between the controlling node and the sending S2 node.
|
|
2592
|
-
const node = this.
|
|
2608
|
+
const node = this._controller?.nodes.get(cc.nodeId);
|
|
2593
2609
|
if (!node) {
|
|
2594
2610
|
// Node does not exist, don't accept the CC
|
|
2595
2611
|
this.controllerLog.logNode(cc.nodeId, `is unknown - discarding received command...`, "warn");
|
|
@@ -3289,13 +3305,15 @@ ${handlers.length} left`);
|
|
|
3289
3305
|
*
|
|
3290
3306
|
* **Note:** To wait for a certain CommandClass, better use {@link waitForCommand}.
|
|
3291
3307
|
* @param timeout The number of milliseconds to wait. If the timeout elapses, the returned promise will be rejected
|
|
3292
|
-
* @param predicate A predicate function to test all incoming messages
|
|
3308
|
+
* @param predicate A predicate function to test all incoming messages.
|
|
3309
|
+
* @param refreshPredicate A predicate function to test partial messages. If this returns `true` for a message, the timer will be restarted.
|
|
3293
3310
|
*/
|
|
3294
|
-
waitForMessage(predicate, timeout) {
|
|
3311
|
+
waitForMessage(predicate, timeout, refreshPredicate) {
|
|
3295
3312
|
return new Promise((resolve, reject) => {
|
|
3296
3313
|
const promise = (0, deferred_promise_1.createDeferredPromise)();
|
|
3297
3314
|
const entry = {
|
|
3298
3315
|
predicate,
|
|
3316
|
+
refreshPredicate,
|
|
3299
3317
|
handler: (msg) => promise.resolve(msg),
|
|
3300
3318
|
timeout: undefined,
|
|
3301
3319
|
};
|