zwave-js 14.2.0 → 14.3.1
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/Utils.d.ts +1 -1
- package/build/cjs/Utils.js +6 -2
- package/build/cjs/Utils.js.map +2 -2
- package/build/cjs/index_safe.js.map +2 -2
- 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 +13 -13
- package/build/cjs/lib/controller/Controller.js.map +2 -2
- package/build/cjs/lib/controller/FirmwareUpdateService.js +3 -6
- package/build/cjs/lib/controller/FirmwareUpdateService.js.map +3 -3
- package/build/cjs/lib/driver/Driver.js +18 -19
- package/build/cjs/lib/driver/Driver.js.map +2 -2
- package/build/cjs/lib/node/Node.d.ts +2 -1
- package/build/cjs/lib/node/Node.js +22 -9
- package/build/cjs/lib/node/Node.js.map +2 -2
- package/build/cjs/lib/node/mixins/70_FirmwareUpdate.js +3 -4
- package/build/cjs/lib/node/mixins/70_FirmwareUpdate.js.map +2 -2
- package/build/cjs/lib/telemetry/statistics.js +4 -4
- package/build/cjs/lib/telemetry/statistics.js.map +2 -2
- package/build/cjs/lib/zniffer/Zniffer.js +10 -10
- package/build/cjs/lib/zniffer/Zniffer.js.map +2 -2
- package/build/esm/Utils.d.ts +1 -1
- package/build/esm/Utils.d.ts.map +1 -1
- package/build/esm/Utils.js +1 -1
- package/build/esm/Utils.js.map +1 -1
- package/build/esm/index_safe.d.ts.map +1 -1
- package/build/esm/index_safe.js +1 -0
- package/build/esm/index_safe.js.map +1 -1
- package/build/esm/lib/_version.d.ts +1 -1
- package/build/esm/lib/_version.js +1 -1
- package/build/esm/lib/controller/Controller.d.ts.map +1 -1
- package/build/esm/lib/controller/Controller.js +16 -14
- package/build/esm/lib/controller/Controller.js.map +1 -1
- package/build/esm/lib/controller/FirmwareUpdateService.d.ts.map +1 -1
- package/build/esm/lib/controller/FirmwareUpdateService.js +5 -11
- package/build/esm/lib/controller/FirmwareUpdateService.js.map +1 -1
- package/build/esm/lib/driver/Driver.d.ts.map +1 -1
- package/build/esm/lib/driver/Driver.js +19 -20
- package/build/esm/lib/driver/Driver.js.map +1 -1
- package/build/esm/lib/node/Node.d.ts +2 -1
- package/build/esm/lib/node/Node.d.ts.map +1 -1
- package/build/esm/lib/node/Node.js +27 -9
- package/build/esm/lib/node/Node.js.map +1 -1
- package/build/esm/lib/node/mixins/70_FirmwareUpdate.d.ts.map +1 -1
- package/build/esm/lib/node/mixins/70_FirmwareUpdate.js +1 -2
- package/build/esm/lib/node/mixins/70_FirmwareUpdate.js.map +1 -1
- package/build/esm/lib/telemetry/statistics.d.ts.map +1 -1
- package/build/esm/lib/telemetry/statistics.js +7 -9
- package/build/esm/lib/telemetry/statistics.js.map +1 -1
- package/build/esm/lib/zniffer/Zniffer.d.ts.map +1 -1
- package/build/esm/lib/zniffer/Zniffer.js +12 -10
- package/build/esm/lib/zniffer/Zniffer.js.map +1 -1
- package/package.json +11 -11
package/build/cjs/Utils.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export { ProtocolDataRate, ProtocolType, ProtocolVersion, Protocols, QRCodeVersion, RouteProtocolDataRate, extractFirmware, guessFirmwareFileFormat, parseQRCodeString, rssiToString, } from "@zwave-js/core";
|
|
1
|
+
export { ProtocolDataRate, ProtocolType, ProtocolVersion, Protocols, QRCodeVersion, RouteProtocolDataRate, extractFirmware, extractFirmwareAsync, guessFirmwareFileFormat, parseQRCodeString, rssiToString, tryUnzipFirmwareFile, } from "@zwave-js/core";
|
|
2
2
|
export type { Firmware, FirmwareFileFormat, QRProvisioningInformation, protocolDataRateToString, } from "@zwave-js/core";
|
|
3
3
|
export { buffer2hex, formatId, getEnumMemberName, num2hex, } from "@zwave-js/shared/safe";
|
|
4
4
|
export { createDefaultBehaviors as createDefaultMockControllerBehaviors } from "./lib/controller/MockControllerBehaviors.js";
|
package/build/cjs/Utils.js
CHANGED
|
@@ -29,6 +29,7 @@ __export(Utils_exports, {
|
|
|
29
29
|
createDefaultMockNodeBehaviors: () => import_MockNodeBehaviors.createDefaultBehaviors,
|
|
30
30
|
driverPresets: () => import_ZWaveOptions.driverPresets,
|
|
31
31
|
extractFirmware: () => import_core.extractFirmware,
|
|
32
|
+
extractFirmwareAsync: () => import_core.extractFirmwareAsync,
|
|
32
33
|
formatId: () => import_safe.formatId,
|
|
33
34
|
formatLifelineHealthCheckRound: () => import_HealthCheck.formatLifelineHealthCheckRound,
|
|
34
35
|
formatLifelineHealthCheckSummary: () => import_HealthCheck.formatLifelineHealthCheckSummary,
|
|
@@ -39,7 +40,8 @@ __export(Utils_exports, {
|
|
|
39
40
|
healthCheckRatingToWord: () => import_HealthCheck.healthCheckRatingToWord,
|
|
40
41
|
num2hex: () => import_safe.num2hex,
|
|
41
42
|
parseQRCodeString: () => import_core.parseQRCodeString,
|
|
42
|
-
rssiToString: () => import_core.rssiToString
|
|
43
|
+
rssiToString: () => import_core.rssiToString,
|
|
44
|
+
tryUnzipFirmwareFile: () => import_core.tryUnzipFirmwareFile
|
|
43
45
|
});
|
|
44
46
|
module.exports = __toCommonJS(Utils_exports);
|
|
45
47
|
var import_core = require("@zwave-js/core");
|
|
@@ -61,6 +63,7 @@ var import_MockNodeBehaviors = require("./lib/node/MockNodeBehaviors.js");
|
|
|
61
63
|
createDefaultMockNodeBehaviors,
|
|
62
64
|
driverPresets,
|
|
63
65
|
extractFirmware,
|
|
66
|
+
extractFirmwareAsync,
|
|
64
67
|
formatId,
|
|
65
68
|
formatLifelineHealthCheckRound,
|
|
66
69
|
formatLifelineHealthCheckSummary,
|
|
@@ -71,6 +74,7 @@ var import_MockNodeBehaviors = require("./lib/node/MockNodeBehaviors.js");
|
|
|
71
74
|
healthCheckRatingToWord,
|
|
72
75
|
num2hex,
|
|
73
76
|
parseQRCodeString,
|
|
74
|
-
rssiToString
|
|
77
|
+
rssiToString,
|
|
78
|
+
tryUnzipFirmwareFile
|
|
75
79
|
});
|
|
76
80
|
//# sourceMappingURL=Utils.js.map
|
package/build/cjs/Utils.js.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Utils.ts"],
|
|
4
|
-
"sourcesContent": ["export {\n\tProtocolDataRate,\n\tProtocolType,\n\tProtocolVersion,\n\tProtocols,\n\tQRCodeVersion,\n\tRouteProtocolDataRate,\n\textractFirmware,\n\tguessFirmwareFileFormat,\n\tparseQRCodeString,\n\trssiToString,\n} from \"@zwave-js/core\";\nexport type {\n\tFirmware,\n\tFirmwareFileFormat,\n\tQRProvisioningInformation,\n\tprotocolDataRateToString,\n} from \"@zwave-js/core\";\nexport {\n\tbuffer2hex,\n\tformatId,\n\tgetEnumMemberName,\n\tnum2hex,\n} from \"@zwave-js/shared/safe\";\nexport { createDefaultBehaviors as createDefaultMockControllerBehaviors } from \"./lib/controller/MockControllerBehaviors.js\";\nexport { driverPresets } from \"./lib/driver/ZWaveOptions.js\";\nexport {\n\tformatLifelineHealthCheckRound,\n\tformatLifelineHealthCheckSummary,\n\tformatRouteHealthCheckRound,\n\tformatRouteHealthCheckSummary,\n\thealthCheckRatingToWord,\n} from \"./lib/node/HealthCheck.js\";\nexport { createDefaultBehaviors as createDefaultMockNodeBehaviors } from \"./lib/node/MockNodeBehaviors.js\";\n"],
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA
|
|
4
|
+
"sourcesContent": ["export {\n\tProtocolDataRate,\n\tProtocolType,\n\tProtocolVersion,\n\tProtocols,\n\tQRCodeVersion,\n\tRouteProtocolDataRate,\n\textractFirmware,\n\textractFirmwareAsync,\n\tguessFirmwareFileFormat,\n\tparseQRCodeString,\n\trssiToString,\n\ttryUnzipFirmwareFile,\n} from \"@zwave-js/core\";\nexport type {\n\tFirmware,\n\tFirmwareFileFormat,\n\tQRProvisioningInformation,\n\tprotocolDataRateToString,\n} from \"@zwave-js/core\";\nexport {\n\tbuffer2hex,\n\tformatId,\n\tgetEnumMemberName,\n\tnum2hex,\n} from \"@zwave-js/shared/safe\";\nexport { createDefaultBehaviors as createDefaultMockControllerBehaviors } from \"./lib/controller/MockControllerBehaviors.js\";\nexport { driverPresets } from \"./lib/driver/ZWaveOptions.js\";\nexport {\n\tformatLifelineHealthCheckRound,\n\tformatLifelineHealthCheckSummary,\n\tformatRouteHealthCheckRound,\n\tformatRouteHealthCheckSummary,\n\thealthCheckRatingToWord,\n} from \"./lib/node/HealthCheck.js\";\nexport { createDefaultBehaviors as createDefaultMockNodeBehaviors } from \"./lib/node/MockNodeBehaviors.js\";\n"],
|
|
5
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kBAaO;AAOP,kBAKO;AACP,qCAA+E;AAC/E,0BAA8B;AAC9B,yBAMO;AACP,+BAAyE;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/index_safe.ts"],
|
|
4
|
-
"sourcesContent": ["/* @forbiddenImports external */\n\nexport * from \"./Controller_safe.js\";\n// export * from \"./Driver\";\nexport * from \"./Error.js\";\nexport * from \"./Node_safe.js\";\nexport * from \"./Utils_safe.js\";\nexport * from \"./Values.js\";\nexport * from \"./Zniffer_safe.js\";\n"],
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;;
|
|
4
|
+
"sourcesContent": ["/* @forbiddenImports external */\n\n// eslint-disable-next-line @zwave-js/no-forbidden-imports -- FIXME: This is actually wrong, but I need to get the release done\nexport * from \"./Controller_safe.js\";\n// export * from \"./Driver\";\nexport * from \"./Error.js\";\nexport * from \"./Node_safe.js\";\nexport * from \"./Utils_safe.js\";\nexport * from \"./Values.js\";\nexport * from \"./Zniffer_safe.js\";\n"],
|
|
5
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;;AAGA,+BAAc,iCAHd;AAKA,+BAAc,uBALd;AAMA,+BAAc,2BANd;AAOA,+BAAc,4BAPd;AAQA,+BAAc,wBARd;AASA,+BAAc,8BATd;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
|
@@ -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.
|
|
25
|
+
const PACKAGE_VERSION = "14.3.1";
|
|
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.
|
|
4
|
+
"sourcesContent": ["// This file is auto-generated by the codegen maintenance script\nexport const PACKAGE_VERSION = \"14.3.1\";\nexport const PACKAGE_NAME = \"zwave-js\";\n"],
|
|
5
5
|
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;;;;;;AACO,MAAM,kBAAkB;AACxB,MAAM,eAAe;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
|
@@ -208,7 +208,7 @@ let ZWaveController = (() => {
|
|
|
208
208
|
get dsk() {
|
|
209
209
|
if (this._dsk == void 0) {
|
|
210
210
|
const keyPair = this.driver.getLearnModeAuthenticatedKeyPair();
|
|
211
|
-
const publicKey = (0, import_core.
|
|
211
|
+
const publicKey = (0, import_core.extractRawECDHPublicKeySync)(keyPair.publicKey);
|
|
212
212
|
this._dsk = publicKey.subarray(0, 16);
|
|
213
213
|
}
|
|
214
214
|
return this._dsk;
|
|
@@ -1906,8 +1906,8 @@ let ZWaveController = (() => {
|
|
|
1906
1906
|
}
|
|
1907
1907
|
const nodePublicKey = import_shared.Bytes.from(pubKeyResponse.publicKey);
|
|
1908
1908
|
const timerStartTAI2 = Date.now();
|
|
1909
|
-
const keyPair = (0, import_core.
|
|
1910
|
-
const publicKey = (0, import_core.
|
|
1909
|
+
const keyPair = (0, import_core.generateECDHKeyPairSync)();
|
|
1910
|
+
const publicKey = (0, import_core.extractRawECDHPublicKeySync)(keyPair.publicKey);
|
|
1911
1911
|
await api.sendPublicKey(publicKey);
|
|
1912
1912
|
if (grantedKeys.includes(import_core.SecurityClass.S2_AccessControl) || grantedKeys.includes(import_core.SecurityClass.S2_Authenticated)) {
|
|
1913
1913
|
const dsk = (0, import_core.dskToString)(nodePublicKey.subarray(0, 16)).slice(5);
|
|
@@ -1931,10 +1931,10 @@ let ZWaveController = (() => {
|
|
|
1931
1931
|
nodePublicKey.writeUInt16BE(parseInt(pinResult, 10), 0);
|
|
1932
1932
|
}
|
|
1933
1933
|
const sharedSecret = import_node_crypto.default.diffieHellman({
|
|
1934
|
-
publicKey: (0, import_core.
|
|
1934
|
+
publicKey: (0, import_core.importRawECDHPublicKeySync)(nodePublicKey),
|
|
1935
1935
|
privateKey: keyPair.privateKey
|
|
1936
1936
|
});
|
|
1937
|
-
const tempKeys = (0, import_core.
|
|
1937
|
+
const tempKeys = await (0, import_core.deriveTempKeysAsync)(await (0, import_core.computePRKAsync)(sharedSecret, publicKey, nodePublicKey));
|
|
1938
1938
|
securityManager.deleteNonce(node.id);
|
|
1939
1939
|
securityManager.tempKeys.set(node.id, {
|
|
1940
1940
|
keyCCM: tempKeys.tempKeyCCM,
|
|
@@ -4955,7 +4955,7 @@ let ZWaveController = (() => {
|
|
|
4955
4955
|
* Is called when a RemoveNode request is received from the controller.
|
|
4956
4956
|
* Handles and controls the exclusion process.
|
|
4957
4957
|
*/
|
|
4958
|
-
handleLearnModeCallback(msg) {
|
|
4958
|
+
async handleLearnModeCallback(msg) {
|
|
4959
4959
|
if (this._currentLearnMode == void 0)
|
|
4960
4960
|
return false;
|
|
4961
4961
|
const wasJoining = this._currentLearnMode === import_serialapi33.LearnModeIntent.Inclusion || this._currentLearnMode === import_serialapi33.LearnModeIntent.SmartStart || this._currentLearnMode === import_serialapi33.LearnModeIntent.LegacyNetworkWideInclusion || this._currentLearnMode === import_serialapi33.LearnModeIntent.LegacyInclusionExclusion && this.role === import_core.ControllerRole.Primary;
|
|
@@ -4977,8 +4977,8 @@ let ZWaveController = (() => {
|
|
|
4977
4977
|
if (wasJoining) {
|
|
4978
4978
|
this._currentLearnMode = void 0;
|
|
4979
4979
|
this.driver["_securityManager"] = void 0;
|
|
4980
|
-
this.driver["_securityManager2"] =
|
|
4981
|
-
this.driver["_securityManagerLR"] =
|
|
4980
|
+
this.driver["_securityManager2"] = await import_core.SecurityManager2.create();
|
|
4981
|
+
this.driver["_securityManagerLR"] = await import_core.SecurityManager2.create();
|
|
4982
4982
|
this._nodes.clear();
|
|
4983
4983
|
process.nextTick(() => this.afterJoiningNetwork().catch(import_shared.noop));
|
|
4984
4984
|
return true;
|
|
@@ -5174,8 +5174,8 @@ let ZWaveController = (() => {
|
|
|
5174
5174
|
}
|
|
5175
5175
|
const highestGranted = (0, import_core.getHighestSecurityClass)(matchingKeys);
|
|
5176
5176
|
const requiresAuthentication = highestGranted === import_core.SecurityClass.S2_AccessControl || highestGranted === import_core.SecurityClass.S2_Authenticated;
|
|
5177
|
-
const keyPair = requiresAuthentication ? this.driver.getLearnModeAuthenticatedKeyPair() : (0, import_core.
|
|
5178
|
-
const publicKey = (0, import_core.
|
|
5177
|
+
const keyPair = requiresAuthentication ? this.driver.getLearnModeAuthenticatedKeyPair() : (0, import_core.generateECDHKeyPairSync)();
|
|
5178
|
+
const publicKey = (0, import_core.extractRawECDHPublicKeySync)(keyPair.publicKey);
|
|
5179
5179
|
const transmittedPublicKey = import_shared.Bytes.from(publicKey);
|
|
5180
5180
|
if (requiresAuthentication) {
|
|
5181
5181
|
transmittedPublicKey.writeUInt16BE(0, 0);
|
|
@@ -5194,10 +5194,10 @@ let ZWaveController = (() => {
|
|
|
5194
5194
|
}
|
|
5195
5195
|
const includingNodePubKey = pubKeyReport.publicKey;
|
|
5196
5196
|
const sharedSecret = import_node_crypto.default.diffieHellman({
|
|
5197
|
-
publicKey: (0, import_core.
|
|
5197
|
+
publicKey: (0, import_core.importRawECDHPublicKeySync)(includingNodePubKey),
|
|
5198
5198
|
privateKey: keyPair.privateKey
|
|
5199
5199
|
});
|
|
5200
|
-
const tempKeys = (0, import_core.
|
|
5200
|
+
const tempKeys = await (0, import_core.deriveTempKeysAsync)(await (0, import_core.computePRKAsync)(sharedSecret, includingNodePubKey, publicKey));
|
|
5201
5201
|
securityManager.deleteNonce(bootstrappingNode.id);
|
|
5202
5202
|
securityManager.tempKeys.set(bootstrappingNode.id, {
|
|
5203
5203
|
keyCCM: tempKeys.tempKeyCCM,
|
|
@@ -5305,7 +5305,7 @@ let ZWaveController = (() => {
|
|
|
5305
5305
|
return import_Inclusion.SecurityBootstrapFailure.ParameterMismatch;
|
|
5306
5306
|
}
|
|
5307
5307
|
receivedKeys.set(securityClass, keyReport.networkKey);
|
|
5308
|
-
securityManager.
|
|
5308
|
+
await securityManager.setKeyAsync(securityClass, keyReport.networkKey);
|
|
5309
5309
|
if (securityClass === import_core.SecurityClass.S0_Legacy) {
|
|
5310
5310
|
this.driver["_securityManager"] = new import_core.SecurityManager({
|
|
5311
5311
|
ownNodeId: this._ownNodeId,
|