zwave-js 14.3.3 → 14.3.4
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/build/cjs/lib/_version.d.ts +1 -1
- package/build/cjs/lib/_version.js +1 -1
- package/build/cjs/lib/_version.js.map +1 -1
- package/build/cjs/lib/controller/Controller.js +66 -60
- package/build/cjs/lib/controller/Controller.js.map +1 -1
- package/build/cjs/lib/controller/ControllerStatistics.js +4 -0
- package/build/cjs/lib/controller/ControllerStatistics.js.map +1 -1
- package/build/cjs/lib/controller/FirmwareUpdateService.js +8 -0
- package/build/cjs/lib/controller/FirmwareUpdateService.js.map +1 -1
- package/build/cjs/lib/controller/MockControllerBehaviors.js +3 -0
- package/build/cjs/lib/controller/MockControllerBehaviors.js.map +1 -1
- package/build/cjs/lib/controller/NVMIO.js +7 -0
- package/build/cjs/lib/controller/NVMIO.js.map +1 -1
- package/build/cjs/lib/controller/NodeInformationFrame.js +2 -0
- package/build/cjs/lib/controller/NodeInformationFrame.js.map +1 -1
- package/build/cjs/lib/controller/ZWaveSDKVersions.js +3 -0
- package/build/cjs/lib/controller/ZWaveSDKVersions.js.map +1 -1
- package/build/cjs/lib/controller/utils.js +4 -0
- package/build/cjs/lib/controller/utils.js.map +1 -1
- package/build/cjs/lib/driver/Bootloader.js +4 -0
- package/build/cjs/lib/driver/Bootloader.js.map +1 -1
- package/build/cjs/lib/driver/Driver.js +63 -56
- package/build/cjs/lib/driver/Driver.js.map +1 -1
- package/build/cjs/lib/driver/DriverMock.js +6 -3
- package/build/cjs/lib/driver/DriverMock.js.map +1 -1
- package/build/cjs/lib/driver/MessageGenerators.js +26 -18
- package/build/cjs/lib/driver/MessageGenerators.js.map +1 -1
- package/build/cjs/lib/driver/NetworkCache.js +43 -23
- package/build/cjs/lib/driver/NetworkCache.js.map +1 -1
- package/build/cjs/lib/driver/Queue.js +6 -2
- package/build/cjs/lib/driver/Queue.js.map +1 -1
- package/build/cjs/lib/driver/SerialAPICommandMachine.js +45 -40
- package/build/cjs/lib/driver/SerialAPICommandMachine.js.map +1 -1
- package/build/cjs/lib/driver/StateMachineShared.js +5 -0
- package/build/cjs/lib/driver/StateMachineShared.js.map +1 -1
- package/build/cjs/lib/driver/Statistics.js +4 -0
- package/build/cjs/lib/driver/Statistics.js.map +1 -1
- package/build/cjs/lib/driver/Task.js +9 -2
- package/build/cjs/lib/driver/Task.js.map +1 -1
- package/build/cjs/lib/driver/Transaction.js +8 -4
- package/build/cjs/lib/driver/Transaction.js.map +1 -1
- package/build/cjs/lib/driver/TransportServiceMachine.js +9 -7
- package/build/cjs/lib/driver/TransportServiceMachine.js.map +1 -1
- package/build/cjs/lib/driver/UpdateConfig.js +8 -4
- package/build/cjs/lib/driver/UpdateConfig.js.map +1 -1
- package/build/cjs/lib/driver/UserAgent.js +4 -0
- package/build/cjs/lib/driver/UserAgent.js.map +1 -1
- package/build/cjs/lib/driver/mDNSDiscovery.js +2 -0
- package/build/cjs/lib/driver/mDNSDiscovery.js.map +1 -1
- package/build/cjs/lib/log/Driver.js +6 -2
- package/build/cjs/lib/log/Driver.js.map +1 -1
- package/build/cjs/lib/log/Zniffer.js +6 -2
- package/build/cjs/lib/log/Zniffer.js.map +1 -1
- package/build/cjs/lib/node/DeviceClass.js +4 -0
- package/build/cjs/lib/node/DeviceClass.js.map +1 -1
- package/build/cjs/lib/node/Endpoint.js +9 -5
- package/build/cjs/lib/node/Endpoint.js.map +1 -1
- package/build/cjs/lib/node/HealthCheck.js +6 -0
- package/build/cjs/lib/node/HealthCheck.js.map +1 -1
- package/build/cjs/lib/node/MockNodeBehaviors.js +2 -0
- package/build/cjs/lib/node/MockNodeBehaviors.js.map +1 -1
- package/build/cjs/lib/node/MultiCCAPIWrapper.js +10 -8
- package/build/cjs/lib/node/MultiCCAPIWrapper.js.map +1 -1
- package/build/cjs/lib/node/Node.js +51 -46
- package/build/cjs/lib/node/Node.js.map +1 -1
- package/build/cjs/lib/node/NodeReadyMachine.js +3 -1
- package/build/cjs/lib/node/NodeReadyMachine.js.map +1 -1
- package/build/cjs/lib/node/NodeStatistics.js +5 -0
- package/build/cjs/lib/node/NodeStatistics.js.map +1 -1
- package/build/cjs/lib/node/NodeStatusMachine.js +5 -2
- package/build/cjs/lib/node/NodeStatusMachine.js.map +1 -1
- package/build/cjs/lib/node/VirtualEndpoint.js +8 -4
- package/build/cjs/lib/node/VirtualEndpoint.js.map +1 -1
- package/build/cjs/lib/node/VirtualNode.js +7 -2
- package/build/cjs/lib/node/VirtualNode.js.map +1 -1
- package/build/cjs/lib/node/mixins/00_Base.js +4 -0
- package/build/cjs/lib/node/mixins/00_Base.js.map +1 -1
- package/build/cjs/lib/node/mixins/01_NetworkRole.js +4 -0
- package/build/cjs/lib/node/mixins/01_NetworkRole.js.map +1 -1
- package/build/cjs/lib/node/mixins/05_Security.js +7 -3
- package/build/cjs/lib/node/mixins/05_Security.js.map +1 -1
- package/build/cjs/lib/node/mixins/10_Events.js +4 -0
- package/build/cjs/lib/node/mixins/10_Events.js.map +1 -1
- package/build/cjs/lib/node/mixins/20_Status.js +4 -0
- package/build/cjs/lib/node/mixins/20_Status.js.map +1 -1
- package/build/cjs/lib/node/mixins/30_Wakeup.js +4 -0
- package/build/cjs/lib/node/mixins/30_Wakeup.js.map +1 -1
- package/build/cjs/lib/node/mixins/40_Values.js +4 -0
- package/build/cjs/lib/node/mixins/40_Values.js.map +1 -1
- package/build/cjs/lib/node/mixins/50_Endpoints.js +4 -0
- package/build/cjs/lib/node/mixins/50_Endpoints.js.map +1 -1
- package/build/cjs/lib/node/mixins/60_ScheduledPoll.js +4 -0
- package/build/cjs/lib/node/mixins/60_ScheduledPoll.js.map +1 -1
- package/build/cjs/lib/node/mixins/70_FirmwareUpdate.js +8 -3
- package/build/cjs/lib/node/mixins/70_FirmwareUpdate.js.map +1 -1
- package/build/cjs/lib/node/mixins/index.js +4 -0
- package/build/cjs/lib/node/mixins/index.js.map +1 -1
- package/build/cjs/lib/node/mockCCBehaviors/ColorSwitch.js +2 -1
- package/build/cjs/lib/node/mockCCBehaviors/ColorSwitch.js.map +1 -1
- package/build/cjs/lib/node/mockCCBehaviors/Configuration.js +2 -1
- package/build/cjs/lib/node/mockCCBehaviors/Configuration.js.map +1 -1
- package/build/cjs/lib/node/mockCCBehaviors/ScheduleEntryLock.js +2 -1
- package/build/cjs/lib/node/mockCCBehaviors/ScheduleEntryLock.js.map +1 -1
- package/build/cjs/lib/node/mockCCBehaviors/ThermostatSetpoint.js +3 -2
- package/build/cjs/lib/node/mockCCBehaviors/ThermostatSetpoint.js.map +1 -1
- package/build/cjs/lib/node/mockCCBehaviors/UserCode.js +3 -2
- package/build/cjs/lib/node/mockCCBehaviors/UserCode.js.map +1 -1
- package/build/cjs/lib/node/utils.js +22 -2
- package/build/cjs/lib/node/utils.js.map +1 -1
- package/build/cjs/lib/telemetry/deviceConfig.js +2 -0
- package/build/cjs/lib/telemetry/deviceConfig.js.map +1 -1
- package/build/cjs/lib/telemetry/statistics.js +3 -0
- package/build/cjs/lib/telemetry/statistics.js.map +1 -1
- package/build/cjs/lib/zniffer/MPDU.js +57 -0
- package/build/cjs/lib/zniffer/MPDU.js.map +1 -1
- package/build/cjs/lib/zniffer/Zniffer.js +10 -3
- package/build/cjs/lib/zniffer/Zniffer.js.map +1 -1
- package/build/cjs/mockServer.js +14 -0
- package/build/cjs/mockServer.js.map +1 -1
- package/build/esm/lib/_version.d.ts +1 -1
- package/build/esm/lib/_version.js +1 -1
- package/package.json +12 -12
|
@@ -22,7 +22,7 @@ __export(version_exports, {
|
|
|
22
22
|
PACKAGE_VERSION: () => PACKAGE_VERSION
|
|
23
23
|
});
|
|
24
24
|
module.exports = __toCommonJS(version_exports);
|
|
25
|
-
const PACKAGE_VERSION = "14.3.
|
|
25
|
+
const PACKAGE_VERSION = "14.3.4";
|
|
26
26
|
const PACKAGE_NAME = "zwave-js";
|
|
27
27
|
// Annotate the CommonJS export names for ESM import in node:
|
|
28
28
|
0 && (module.exports = {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/lib/_version.ts"],
|
|
4
|
-
"sourcesContent": ["// This file is auto-generated by the codegen maintenance script\nexport const PACKAGE_VERSION = \"14.3.
|
|
4
|
+
"sourcesContent": ["// This file is auto-generated by the codegen maintenance script\nexport const PACKAGE_VERSION = \"14.3.4\";\nexport const PACKAGE_NAME = \"zwave-js\";\n"],
|
|
5
5
|
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;;;;;;AACO,MAAM,kBAAkB;AACxB,MAAM,eAAe;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
|
@@ -5,6 +5,7 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
|
5
5
|
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
6
6
|
var __getProtoOf = Object.getPrototypeOf;
|
|
7
7
|
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
8
|
+
var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
|
|
8
9
|
var __export = (target, all) => {
|
|
9
10
|
for (var name in all)
|
|
10
11
|
__defProp(target, name, { get: all[name], enumerable: true });
|
|
@@ -105,6 +106,7 @@ var __esDecorate = function(ctor, descriptorIn, decorators, contextIn, initializ
|
|
|
105
106
|
if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected");
|
|
106
107
|
return f;
|
|
107
108
|
}
|
|
109
|
+
__name(accept, "accept");
|
|
108
110
|
var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
|
|
109
111
|
var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
|
|
110
112
|
var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
|
|
@@ -146,6 +148,9 @@ let ZWaveController = (() => {
|
|
|
146
148
|
let _classThis;
|
|
147
149
|
let _classSuper = import_shared.TypedEventEmitter;
|
|
148
150
|
var ZWaveController2 = class extends _classSuper {
|
|
151
|
+
static {
|
|
152
|
+
__name(this, "ZWaveController");
|
|
153
|
+
}
|
|
149
154
|
static {
|
|
150
155
|
_classThis = this;
|
|
151
156
|
}
|
|
@@ -1728,11 +1733,11 @@ let ZWaveController = (() => {
|
|
|
1728
1733
|
}
|
|
1729
1734
|
}
|
|
1730
1735
|
async secureBootstrapS2(node, assumeSupported = false) {
|
|
1731
|
-
const unGrantSecurityClasses = () => {
|
|
1736
|
+
const unGrantSecurityClasses = /* @__PURE__ */ __name(() => {
|
|
1732
1737
|
for (const secClass of import_core.securityClassOrder) {
|
|
1733
1738
|
node.securityClasses.set(secClass, false);
|
|
1734
1739
|
}
|
|
1735
|
-
};
|
|
1740
|
+
}, "unGrantSecurityClasses");
|
|
1736
1741
|
const securityManager = node.protocol === import_core.Protocols.ZWaveLongRange ? this.driver.securityManagerLR : this.driver.securityManager2;
|
|
1737
1742
|
if (!securityManager) {
|
|
1738
1743
|
unGrantSecurityClasses();
|
|
@@ -1746,18 +1751,18 @@ let ZWaveController = (() => {
|
|
|
1746
1751
|
userCallbacks = {
|
|
1747
1752
|
abort() {
|
|
1748
1753
|
},
|
|
1749
|
-
grantSecurityClasses: (requested) => {
|
|
1754
|
+
grantSecurityClasses: /* @__PURE__ */ __name((requested) => {
|
|
1750
1755
|
return Promise.resolve({
|
|
1751
1756
|
clientSideAuth: false,
|
|
1752
1757
|
securityClasses: requested.securityClasses.filter((r) => grantedSecurityClasses.includes(r))
|
|
1753
1758
|
});
|
|
1754
|
-
},
|
|
1755
|
-
validateDSKAndEnterPIN: (dsk) => {
|
|
1759
|
+
}, "grantSecurityClasses"),
|
|
1760
|
+
validateDSKAndEnterPIN: /* @__PURE__ */ __name((dsk) => {
|
|
1756
1761
|
const pin = fullDSK.slice(0, 5);
|
|
1757
1762
|
if (pin + dsk !== fullDSK)
|
|
1758
1763
|
return Promise.resolve(false);
|
|
1759
1764
|
return Promise.resolve(pin);
|
|
1760
|
-
}
|
|
1765
|
+
}, "validateDSKAndEnterPIN")
|
|
1761
1766
|
};
|
|
1762
1767
|
} else if (inclusionOptions && "userCallbacks" in inclusionOptions && !!inclusionOptions.userCallbacks) {
|
|
1763
1768
|
userCallbacks = inclusionOptions.userCallbacks;
|
|
@@ -1774,10 +1779,10 @@ let ZWaveController = (() => {
|
|
|
1774
1779
|
version: 1
|
|
1775
1780
|
});
|
|
1776
1781
|
}
|
|
1777
|
-
const deleteTempKey = () => {
|
|
1782
|
+
const deleteTempKey = /* @__PURE__ */ __name(() => {
|
|
1778
1783
|
securityManager.deleteNonce(node.id);
|
|
1779
1784
|
securityManager.tempKeys.delete(node.id);
|
|
1780
|
-
};
|
|
1785
|
+
}, "deleteTempKey");
|
|
1781
1786
|
this._bootstrappingS2NodeId = node.id;
|
|
1782
1787
|
this.cancelBootstrapS2Promise = (0, import_deferred_promise.createDeferredPromise)();
|
|
1783
1788
|
try {
|
|
@@ -1786,7 +1791,7 @@ let ZWaveController = (() => {
|
|
|
1786
1791
|
// Timing is critical here
|
|
1787
1792
|
s2VerifyDelivery: false
|
|
1788
1793
|
});
|
|
1789
|
-
const abort = async (failType) => {
|
|
1794
|
+
const abort = /* @__PURE__ */ __name(async (failType) => {
|
|
1790
1795
|
if (failType != void 0) {
|
|
1791
1796
|
try {
|
|
1792
1797
|
await api.abortKeyExchange(failType);
|
|
@@ -1797,8 +1802,8 @@ let ZWaveController = (() => {
|
|
|
1797
1802
|
deleteTempKey();
|
|
1798
1803
|
this._bootstrappingS2NodeId = void 0;
|
|
1799
1804
|
this.cancelBootstrapS2Promise = void 0;
|
|
1800
|
-
};
|
|
1801
|
-
const abortUser = async () => {
|
|
1805
|
+
}, "abort");
|
|
1806
|
+
const abortUser = /* @__PURE__ */ __name(async () => {
|
|
1802
1807
|
setImmediate(() => {
|
|
1803
1808
|
try {
|
|
1804
1809
|
userCallbacks.abort();
|
|
@@ -1807,15 +1812,15 @@ let ZWaveController = (() => {
|
|
|
1807
1812
|
});
|
|
1808
1813
|
await abort(import_cc.KEXFailType.BootstrappingCanceled);
|
|
1809
1814
|
return import_Inclusion.SecurityBootstrapFailure.UserCanceled;
|
|
1810
|
-
};
|
|
1811
|
-
const abortTimeout = async () => {
|
|
1815
|
+
}, "abortUser");
|
|
1816
|
+
const abortTimeout = /* @__PURE__ */ __name(async () => {
|
|
1812
1817
|
this.driver.controllerLog.logNode(node.id, {
|
|
1813
1818
|
message: `Security S2 bootstrapping failed: a secure inclusion timer has elapsed`,
|
|
1814
1819
|
level: "warn"
|
|
1815
1820
|
});
|
|
1816
1821
|
await abort();
|
|
1817
1822
|
return import_Inclusion.SecurityBootstrapFailure.Timeout;
|
|
1818
|
-
};
|
|
1823
|
+
}, "abortTimeout");
|
|
1819
1824
|
const kexParams = await api.withOptions({ reportTimeoutMs: import_cc.inclusionTimeouts.TA1 }).getKeyExchangeParameters();
|
|
1820
1825
|
if (!kexParams) {
|
|
1821
1826
|
this.driver.controllerLog.logNode(node.id, {
|
|
@@ -2494,7 +2499,7 @@ let ZWaveController = (() => {
|
|
|
2494
2499
|
const pendingNodes = new Set([...this._rebuildRoutesProgress].filter(([, status]) => status === "pending").map(([nodeId]) => nodeId));
|
|
2495
2500
|
const todoListening = [];
|
|
2496
2501
|
const todoSleeping = [];
|
|
2497
|
-
const addTodo = (nodeId) => {
|
|
2502
|
+
const addTodo = /* @__PURE__ */ __name((nodeId) => {
|
|
2498
2503
|
if ((0, import_core.isLongRangeNodeId)(nodeId))
|
|
2499
2504
|
return;
|
|
2500
2505
|
if (pendingNodes.has(nodeId)) {
|
|
@@ -2510,12 +2515,12 @@ let ZWaveController = (() => {
|
|
|
2510
2515
|
todoListening.push(nodeId);
|
|
2511
2516
|
}
|
|
2512
2517
|
}
|
|
2513
|
-
};
|
|
2518
|
+
}, "addTodo");
|
|
2514
2519
|
const self = this;
|
|
2515
2520
|
return {
|
|
2516
2521
|
priority: import_Task.TaskPriority.Lower,
|
|
2517
2522
|
tag: { id: "rebuild-routes" },
|
|
2518
|
-
task: async function* rebuildRoutesTask() {
|
|
2523
|
+
task: /* @__PURE__ */ __name(async function* rebuildRoutesTask() {
|
|
2519
2524
|
try {
|
|
2520
2525
|
const neighbors = await self.getNodeNeighbors(self._ownNodeId);
|
|
2521
2526
|
neighbors.forEach((id) => addTodo(id));
|
|
@@ -2540,6 +2545,7 @@ let ZWaveController = (() => {
|
|
|
2540
2545
|
}
|
|
2541
2546
|
yield;
|
|
2542
2547
|
}
|
|
2548
|
+
__name(doRebuildRoutes, "doRebuildRoutes");
|
|
2543
2549
|
while (todoListening.length > 0) {
|
|
2544
2550
|
const nodeId = todoListening.shift();
|
|
2545
2551
|
yield* doRebuildRoutes(nodeId);
|
|
@@ -2570,7 +2576,7 @@ let ZWaveController = (() => {
|
|
|
2570
2576
|
self.driver.controllerLog.print("rebuilding routes completed");
|
|
2571
2577
|
self.emit("rebuild routes done", new Map(self._rebuildRoutesProgress));
|
|
2572
2578
|
self._rebuildRoutesProgress.clear();
|
|
2573
|
-
}
|
|
2579
|
+
}, "rebuildRoutesTask")
|
|
2574
2580
|
};
|
|
2575
2581
|
}
|
|
2576
2582
|
/**
|
|
@@ -2631,7 +2637,7 @@ let ZWaveController = (() => {
|
|
|
2631
2637
|
// This task is executed by users and by the network-wide route rebuilding process.
|
|
2632
2638
|
priority: import_Task.TaskPriority.Lower,
|
|
2633
2639
|
tag: { id: "rebuild-node-routes", nodeId: node.id },
|
|
2634
|
-
task: async function* rebuildNodeRoutesTask() {
|
|
2640
|
+
task: /* @__PURE__ */ __name(async function* rebuildNodeRoutesTask() {
|
|
2635
2641
|
keepAwake = node.keepAwake;
|
|
2636
2642
|
node.keepAwake = true;
|
|
2637
2643
|
if (node.canSleep && node.supportsCC(import_core.CommandClasses["Wake Up"])) {
|
|
@@ -2734,8 +2740,8 @@ let ZWaveController = (() => {
|
|
|
2734
2740
|
direction: "none"
|
|
2735
2741
|
});
|
|
2736
2742
|
return true;
|
|
2737
|
-
},
|
|
2738
|
-
cleanup: () => {
|
|
2743
|
+
}, "rebuildNodeRoutesTask"),
|
|
2744
|
+
cleanup: /* @__PURE__ */ __name(() => {
|
|
2739
2745
|
node.keepAwake = keepAwake;
|
|
2740
2746
|
if (!keepAwake) {
|
|
2741
2747
|
setImmediate(() => {
|
|
@@ -2743,7 +2749,7 @@ let ZWaveController = (() => {
|
|
|
2743
2749
|
});
|
|
2744
2750
|
}
|
|
2745
2751
|
return Promise.resolve();
|
|
2746
|
-
}
|
|
2752
|
+
}, "cleanup")
|
|
2747
2753
|
};
|
|
2748
2754
|
}
|
|
2749
2755
|
/** Configures the given Node to be SUC/SIS or not */
|
|
@@ -4298,16 +4304,16 @@ let ZWaveController = (() => {
|
|
|
4298
4304
|
let read;
|
|
4299
4305
|
let close;
|
|
4300
4306
|
if (this.supportedFunctionTypes?.includes(import_serial.FunctionType.ExtendedNVMOperations)) {
|
|
4301
|
-
open = async () => {
|
|
4307
|
+
open = /* @__PURE__ */ __name(async () => {
|
|
4302
4308
|
const { size: size2 } = await this.externalNVMOpenExt();
|
|
4303
4309
|
return size2;
|
|
4304
|
-
};
|
|
4305
|
-
read = (offset2, length) => this.externalNVMReadBufferExt(offset2, length);
|
|
4306
|
-
close = () => this.externalNVMCloseExt();
|
|
4310
|
+
}, "open");
|
|
4311
|
+
read = /* @__PURE__ */ __name((offset2, length) => this.externalNVMReadBufferExt(offset2, length), "read");
|
|
4312
|
+
close = /* @__PURE__ */ __name(() => this.externalNVMCloseExt(), "close");
|
|
4307
4313
|
} else {
|
|
4308
|
-
open = () => this.externalNVMOpen();
|
|
4309
|
-
read = (offset2, length) => this.externalNVMReadBuffer700(offset2, length);
|
|
4310
|
-
close = () => this.externalNVMClose();
|
|
4314
|
+
open = /* @__PURE__ */ __name(() => this.externalNVMOpen(), "open");
|
|
4315
|
+
read = /* @__PURE__ */ __name((offset2, length) => this.externalNVMReadBuffer700(offset2, length), "read");
|
|
4316
|
+
close = /* @__PURE__ */ __name(() => this.externalNVMClose(), "close");
|
|
4311
4317
|
}
|
|
4312
4318
|
const size = await open();
|
|
4313
4319
|
const ret = new import_shared.Bytes(size);
|
|
@@ -4433,18 +4439,18 @@ let ZWaveController = (() => {
|
|
|
4433
4439
|
let write;
|
|
4434
4440
|
let close;
|
|
4435
4441
|
if (this.supportedFunctionTypes?.includes(import_serial.FunctionType.ExtendedNVMOperations)) {
|
|
4436
|
-
open = async () => {
|
|
4442
|
+
open = /* @__PURE__ */ __name(async () => {
|
|
4437
4443
|
const { size: size2 } = await this.externalNVMOpenExt();
|
|
4438
4444
|
return size2;
|
|
4439
|
-
};
|
|
4440
|
-
read = (offset, length) => this.externalNVMReadBufferExt(offset, length);
|
|
4441
|
-
write = (offset, buffer) => this.externalNVMWriteBufferExt(offset, buffer);
|
|
4442
|
-
close = () => this.externalNVMCloseExt();
|
|
4445
|
+
}, "open");
|
|
4446
|
+
read = /* @__PURE__ */ __name((offset, length) => this.externalNVMReadBufferExt(offset, length), "read");
|
|
4447
|
+
write = /* @__PURE__ */ __name((offset, buffer) => this.externalNVMWriteBufferExt(offset, buffer), "write");
|
|
4448
|
+
close = /* @__PURE__ */ __name(() => this.externalNVMCloseExt(), "close");
|
|
4443
4449
|
} else {
|
|
4444
|
-
open = () => this.externalNVMOpen();
|
|
4445
|
-
read = (offset, length) => this.externalNVMReadBuffer700(offset, length);
|
|
4446
|
-
write = (offset, buffer) => this.externalNVMWriteBuffer700(offset, buffer);
|
|
4447
|
-
close = () => this.externalNVMClose();
|
|
4450
|
+
open = /* @__PURE__ */ __name(() => this.externalNVMOpen(), "open");
|
|
4451
|
+
read = /* @__PURE__ */ __name((offset, length) => this.externalNVMReadBuffer700(offset, length), "read");
|
|
4452
|
+
write = /* @__PURE__ */ __name((offset, buffer) => this.externalNVMWriteBuffer700(offset, buffer), "write");
|
|
4453
|
+
close = /* @__PURE__ */ __name(() => this.externalNVMClose(), "close");
|
|
4448
4454
|
}
|
|
4449
4455
|
const size = await open();
|
|
4450
4456
|
if (size !== nvmData.length) {
|
|
@@ -4996,18 +5002,18 @@ let ZWaveController = (() => {
|
|
|
4996
5002
|
bootstrappingNode.securityClasses.set(secClass, false);
|
|
4997
5003
|
}
|
|
4998
5004
|
}
|
|
4999
|
-
const unGrantSecurityClass = () => {
|
|
5005
|
+
const unGrantSecurityClass = /* @__PURE__ */ __name(() => {
|
|
5000
5006
|
this.driver["_securityManager"] = void 0;
|
|
5001
5007
|
bootstrappingNode.securityClasses.set(import_core.SecurityClass.S0_Legacy, false);
|
|
5002
|
-
};
|
|
5003
|
-
const abortTimeout = () => {
|
|
5008
|
+
}, "unGrantSecurityClass");
|
|
5009
|
+
const abortTimeout = /* @__PURE__ */ __name(() => {
|
|
5004
5010
|
this.driver.controllerLog.logNode(bootstrappingNode.id, {
|
|
5005
5011
|
message: `Security S0 bootstrapping failed: a secure inclusion timer has elapsed`,
|
|
5006
5012
|
level: "warn"
|
|
5007
5013
|
});
|
|
5008
5014
|
unGrantSecurityClass();
|
|
5009
5015
|
return import_Inclusion.SecurityBootstrapFailure.Timeout;
|
|
5010
|
-
};
|
|
5016
|
+
}, "abortTimeout");
|
|
5011
5017
|
try {
|
|
5012
5018
|
const api = bootstrappingNode.commandClasses.Security;
|
|
5013
5019
|
this.driver["_securityManager"] = new import_core.SecurityManager({
|
|
@@ -5068,23 +5074,23 @@ let ZWaveController = (() => {
|
|
|
5068
5074
|
// Timing is critical here
|
|
5069
5075
|
s2VerifyDelivery: false
|
|
5070
5076
|
});
|
|
5071
|
-
const unGrantSecurityClasses = () => {
|
|
5077
|
+
const unGrantSecurityClasses = /* @__PURE__ */ __name(() => {
|
|
5072
5078
|
for (const secClass of import_core.securityClassOrder) {
|
|
5073
5079
|
bootstrappingNode.securityClasses.set(secClass, false);
|
|
5074
5080
|
}
|
|
5075
|
-
};
|
|
5081
|
+
}, "unGrantSecurityClasses");
|
|
5076
5082
|
const securityManager = (0, import_core.isLongRangeNodeId)(this._ownNodeId) ? this.driver.securityManagerLR : this.driver.securityManager2;
|
|
5077
5083
|
if (!securityManager) {
|
|
5078
5084
|
unGrantSecurityClasses();
|
|
5079
5085
|
return import_Inclusion.SecurityBootstrapFailure.NoKeysConfigured;
|
|
5080
5086
|
}
|
|
5081
5087
|
const receivedKeys = /* @__PURE__ */ new Map();
|
|
5082
|
-
const deleteTempKey = () => {
|
|
5088
|
+
const deleteTempKey = /* @__PURE__ */ __name(() => {
|
|
5083
5089
|
securityManager.deleteNonce(bootstrappingNode.id);
|
|
5084
5090
|
securityManager.tempKeys.delete(bootstrappingNode.id);
|
|
5085
|
-
};
|
|
5091
|
+
}, "deleteTempKey");
|
|
5086
5092
|
let dskHidden = false;
|
|
5087
|
-
const applicationHideDSK = () => {
|
|
5093
|
+
const applicationHideDSK = /* @__PURE__ */ __name(() => {
|
|
5088
5094
|
if (dskHidden)
|
|
5089
5095
|
return;
|
|
5090
5096
|
dskHidden = true;
|
|
@@ -5092,8 +5098,8 @@ let ZWaveController = (() => {
|
|
|
5092
5098
|
userCallbacks?.done();
|
|
5093
5099
|
} catch {
|
|
5094
5100
|
}
|
|
5095
|
-
};
|
|
5096
|
-
const abort = async (failType) => {
|
|
5101
|
+
}, "applicationHideDSK");
|
|
5102
|
+
const abort = /* @__PURE__ */ __name(async (failType) => {
|
|
5097
5103
|
applicationHideDSK();
|
|
5098
5104
|
if (failType != void 0) {
|
|
5099
5105
|
try {
|
|
@@ -5103,16 +5109,16 @@ let ZWaveController = (() => {
|
|
|
5103
5109
|
}
|
|
5104
5110
|
unGrantSecurityClasses();
|
|
5105
5111
|
deleteTempKey();
|
|
5106
|
-
};
|
|
5107
|
-
const abortTimeout = async () => {
|
|
5112
|
+
}, "abort");
|
|
5113
|
+
const abortTimeout = /* @__PURE__ */ __name(async () => {
|
|
5108
5114
|
this.driver.controllerLog.logNode(bootstrappingNode.id, {
|
|
5109
5115
|
message: `Security S2 bootstrapping failed: a secure inclusion timer has elapsed`,
|
|
5110
5116
|
level: "warn"
|
|
5111
5117
|
});
|
|
5112
5118
|
await abort();
|
|
5113
5119
|
return import_Inclusion.SecurityBootstrapFailure.Timeout;
|
|
5114
|
-
};
|
|
5115
|
-
const abortCanceled = async () => {
|
|
5120
|
+
}, "abortTimeout");
|
|
5121
|
+
const abortCanceled = /* @__PURE__ */ __name(async () => {
|
|
5116
5122
|
this.driver.controllerLog.logNode(bootstrappingNode.id, {
|
|
5117
5123
|
message: `The including node canceled the Security S2 bootstrapping.`,
|
|
5118
5124
|
direction: "inbound",
|
|
@@ -5120,7 +5126,7 @@ let ZWaveController = (() => {
|
|
|
5120
5126
|
});
|
|
5121
5127
|
await abort();
|
|
5122
5128
|
return import_Inclusion.SecurityBootstrapFailure.NodeCanceled;
|
|
5123
|
-
};
|
|
5129
|
+
}, "abortCanceled");
|
|
5124
5130
|
try {
|
|
5125
5131
|
await api.requestKeys({
|
|
5126
5132
|
requestedKeys: requested.securityClasses,
|
|
@@ -5382,25 +5388,25 @@ let ZWaveController = (() => {
|
|
|
5382
5388
|
let initPredicate;
|
|
5383
5389
|
if (supportsS0 && supportsS2) {
|
|
5384
5390
|
initTimeout = import_cc.inclusionTimeouts.TB1;
|
|
5385
|
-
initPredicate = (cc) => cc instanceof import_cc.SecurityCCSchemeGet || cc instanceof import_cc.Security2CCKEXGet;
|
|
5391
|
+
initPredicate = /* @__PURE__ */ __name((cc) => cc instanceof import_cc.SecurityCCSchemeGet || cc instanceof import_cc.Security2CCKEXGet, "initPredicate");
|
|
5386
5392
|
} else if (supportsS2) {
|
|
5387
5393
|
initTimeout = import_cc.inclusionTimeouts.TB1;
|
|
5388
|
-
initPredicate = (cc) => cc instanceof import_cc.Security2CCKEXGet;
|
|
5394
|
+
initPredicate = /* @__PURE__ */ __name((cc) => cc instanceof import_cc.Security2CCKEXGet, "initPredicate");
|
|
5389
5395
|
} else if (supportsS0) {
|
|
5390
5396
|
initTimeout = 1e4;
|
|
5391
|
-
initPredicate = (cc) => cc instanceof import_cc.SecurityCCSchemeGet;
|
|
5397
|
+
initPredicate = /* @__PURE__ */ __name((cc) => cc instanceof import_cc.SecurityCCSchemeGet, "initPredicate");
|
|
5392
5398
|
} else {
|
|
5393
5399
|
initTimeout = 0;
|
|
5394
|
-
initPredicate = () => false;
|
|
5400
|
+
initPredicate = /* @__PURE__ */ __name(() => false, "initPredicate");
|
|
5395
5401
|
}
|
|
5396
5402
|
const bootstrapInitPromise = this.driver.waitForCommand(initPredicate, initTimeout).catch(() => "timeout");
|
|
5397
|
-
const identifySelf = async () => {
|
|
5403
|
+
const identifySelf = /* @__PURE__ */ __name(async () => {
|
|
5398
5404
|
await this.identify().catch(import_shared.noop);
|
|
5399
5405
|
this.emit("network found", this._homeId, this._ownNodeId);
|
|
5400
5406
|
await this.getControllerCapabilities().catch(import_shared.noop);
|
|
5401
5407
|
const { nodeIds } = await this.getSerialApiInitData();
|
|
5402
5408
|
await this.initNodes(nodeIds, [], () => Promise.resolve());
|
|
5403
|
-
};
|
|
5409
|
+
}, "identifySelf");
|
|
5404
5410
|
const [bootstrapInit] = await Promise.all([
|
|
5405
5411
|
bootstrapInitPromise,
|
|
5406
5412
|
identifySelf()
|