zwave-js 14.3.9 → 15.0.0-beta.0

package/build/cjs/Driver.d.ts

@@ -5,6 +5,7 @@ export { FunctionType, Message, MessageType } from "@zwave-js/serial";
 export type { MessageOptions, ResponsePredicate, ResponseRole, } from "@zwave-js/serial";
 export { type CommandRequest, type ContainsCC, type ContainsSerializedCC, type MessageWithCC, containsCC, containsSerializedCC, isCommandRequest, isMessageWithCC, } from "@zwave-js/serial/serialapi";
 export { Driver, libName, libVersion } from "./lib/driver/Driver.js";
+export * from "./lib/driver/DriverMode.js";
 export type { EditableZWaveOptions, PartialZWaveOptions, ZWaveOptions, } from "./lib/driver/ZWaveOptions.js";
 export type { DriverLogContext } from "./lib/log/Driver.js";
 //# sourceMappingURL=Driver.d.ts.map

package/build/cjs/Driver.js

@@ -15,6 +15,7 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var Driver_exports = {};
 __export(Driver_exports, {
@@ -35,6 +36,7 @@ var import_core = require("@zwave-js/core");
 var import_serial = require("@zwave-js/serial");
 var import_serialapi = require("@zwave-js/serial/serialapi");
 var import_Driver = require("./lib/driver/Driver.js");
+__reExport(Driver_exports, require("./lib/driver/DriverMode.js"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Driver,
@@ -47,6 +49,7 @@ var import_Driver = require("./lib/driver/Driver.js");
   isCommandRequest,
   isMessageWithCC,
   libName,
-  libVersion
+  libVersion,
+  ...require("./lib/driver/DriverMode.js")
 });
 //# sourceMappingURL=Driver.js.map

package/build/cjs/Driver.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/Driver.ts"],
-  "sourcesContent": ["export { MessagePriority } from \"@zwave-js/core\";\nexport type { SendMessageOptions } from \"@zwave-js/core\";\nexport type { FileSystem } from \"@zwave-js/core\";\nexport { FunctionType, Message, MessageType } from \"@zwave-js/serial\";\nexport type {\n\tMessageOptions,\n\tResponsePredicate,\n\tResponseRole,\n} from \"@zwave-js/serial\";\nexport {\n\ttype CommandRequest,\n\ttype ContainsCC,\n\ttype ContainsSerializedCC,\n\ttype MessageWithCC,\n\tcontainsCC,\n\tcontainsSerializedCC,\n\tisCommandRequest,\n\tisMessageWithCC,\n} from \"@zwave-js/serial/serialapi\";\nexport { Driver, libName, libVersion } from \"./lib/driver/Driver.js\";\nexport type {\n\tEditableZWaveOptions,\n\tPartialZWaveOptions,\n\tZWaveOptions,\n} from \"./lib/driver/ZWaveOptions.js\";\nexport type { DriverLogContext } from \"./lib/log/Driver.js\";\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;;AAAA,kBAAgC;AAGhC,oBAAmD;AAMnD,uBASO;AACP,oBAA4C;",
+  "sourcesContent": ["export { MessagePriority } from \"@zwave-js/core\";\nexport type { SendMessageOptions } from \"@zwave-js/core\";\nexport type { FileSystem } from \"@zwave-js/core\";\nexport { FunctionType, Message, MessageType } from \"@zwave-js/serial\";\nexport type {\n\tMessageOptions,\n\tResponsePredicate,\n\tResponseRole,\n} from \"@zwave-js/serial\";\nexport {\n\ttype CommandRequest,\n\ttype ContainsCC,\n\ttype ContainsSerializedCC,\n\ttype MessageWithCC,\n\tcontainsCC,\n\tcontainsSerializedCC,\n\tisCommandRequest,\n\tisMessageWithCC,\n} from \"@zwave-js/serial/serialapi\";\nexport { Driver, libName, libVersion } from \"./lib/driver/Driver.js\";\nexport * from \"./lib/driver/DriverMode.js\";\nexport type {\n\tEditableZWaveOptions,\n\tPartialZWaveOptions,\n\tZWaveOptions,\n} from \"./lib/driver/ZWaveOptions.js\";\nexport type { DriverLogContext } from \"./lib/log/Driver.js\";\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;;AAAA,kBAAgC;AAGhC,oBAAmD;AAMnD,uBASO;AACP,oBAA4C;AAC5C,2BAAc,uCApBd;",
   "names": []
 }

package/build/cjs/Testing.d.ts

@@ -1,4 +1,6 @@
+export { createDefaultBehaviors as createDefaultMockControllerBehaviors } from "./lib/controller/MockControllerBehaviors.js";
 export { createAndStartDriverWithMockPort } from "./lib/driver/DriverMock.js";
+export { createDefaultBehaviors as createDefaultMockNodeBehaviors } from "./lib/node/MockNodeBehaviors.js";
 export { MockServer, createMockNodeOptionsFromDump } from "./mockServer.js";
 export type { MockServerControllerOptions, MockServerNodeOptions, MockServerOptions, } from "./mockServer.js";
 //# sourceMappingURL=Testing.d.ts.map

package/build/cjs/Testing.js

@@ -20,15 +20,21 @@ var Testing_exports = {};
 __export(Testing_exports, {
   MockServer: () => import_mockServer.MockServer,
   createAndStartDriverWithMockPort: () => import_DriverMock.createAndStartDriverWithMockPort,
+  createDefaultMockControllerBehaviors: () => import_MockControllerBehaviors.createDefaultBehaviors,
+  createDefaultMockNodeBehaviors: () => import_MockNodeBehaviors.createDefaultBehaviors,
   createMockNodeOptionsFromDump: () => import_mockServer.createMockNodeOptionsFromDump
 });
 module.exports = __toCommonJS(Testing_exports);
+var import_MockControllerBehaviors = require("./lib/controller/MockControllerBehaviors.js");
 var import_DriverMock = require("./lib/driver/DriverMock.js");
+var import_MockNodeBehaviors = require("./lib/node/MockNodeBehaviors.js");
 var import_mockServer = require("./mockServer.js");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   MockServer,
   createAndStartDriverWithMockPort,
+  createDefaultMockControllerBehaviors,
+  createDefaultMockNodeBehaviors,
   createMockNodeOptionsFromDump
 });
 //# sourceMappingURL=Testing.js.map

package/build/cjs/Testing.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/Testing.ts"],
-  "sourcesContent": ["export { createAndStartDriverWithMockPort } from \"./lib/driver/DriverMock.js\";\nexport { MockServer, createMockNodeOptionsFromDump } from \"./mockServer.js\";\nexport type {\n\tMockServerControllerOptions,\n\tMockServerNodeOptions,\n\tMockServerOptions,\n} from \"./mockServer.js\";\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;;;;;;;AAAA,wBAAiD;AACjD,wBAA0D;",
+  "sourcesContent": ["export { createDefaultBehaviors as createDefaultMockControllerBehaviors } from \"./lib/controller/MockControllerBehaviors.js\";\nexport { createAndStartDriverWithMockPort } from \"./lib/driver/DriverMock.js\";\nexport { createDefaultBehaviors as createDefaultMockNodeBehaviors } from \"./lib/node/MockNodeBehaviors.js\";\nexport { MockServer, createMockNodeOptionsFromDump } from \"./mockServer.js\";\nexport type {\n\tMockServerControllerOptions,\n\tMockServerNodeOptions,\n\tMockServerOptions,\n} from \"./mockServer.js\";\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;AAAA,qCAA+E;AAC/E,wBAAiD;AACjD,+BAAyE;AACzE,wBAA0D;",
   "names": []
 }

package/build/cjs/Utils.d.ts

@@ -1,8 +1,6 @@
-export { ProtocolDataRate, ProtocolType, ProtocolVersion, Protocols, QRCodeVersion, RouteProtocolDataRate, extractFirmware, extractFirmwareAsync, guessFirmwareFileFormat, parseQRCodeString, rssiToString, tryUnzipFirmwareFile, } from "@zwave-js/core";
+export { ProtocolDataRate, ProtocolType, ProtocolVersion, Protocols, QRCodeVersion, RouteProtocolDataRate, extractFirmware, guessFirmwareFileFormat, parseQRCodeString, rssiToString, tryUnzipFirmwareFile, } from "@zwave-js/core";
 export type { Firmware, FirmwareFileFormat, QRProvisioningInformation, protocolDataRateToString, } from "@zwave-js/core";
 export { buffer2hex, formatId, getEnumMemberName, num2hex, } from "@zwave-js/shared/safe";
-export { createDefaultBehaviors as createDefaultMockControllerBehaviors } from "./lib/controller/MockControllerBehaviors.js";
 export { driverPresets } from "./lib/driver/ZWaveOptions.js";
 export { formatLifelineHealthCheckRound, formatLifelineHealthCheckSummary, formatRouteHealthCheckRound, formatRouteHealthCheckSummary, healthCheckRatingToWord, } from "./lib/node/HealthCheck.js";
-export { createDefaultBehaviors as createDefaultMockNodeBehaviors } from "./lib/node/MockNodeBehaviors.js";
 //# sourceMappingURL=Utils.d.ts.map

package/build/cjs/Utils.js

@@ -25,11 +25,8 @@ __export(Utils_exports, {
   QRCodeVersion: () => import_core.QRCodeVersion,
   RouteProtocolDataRate: () => import_core.RouteProtocolDataRate,
   buffer2hex: () => import_safe.buffer2hex,
-  createDefaultMockControllerBehaviors: () => import_MockControllerBehaviors.createDefaultBehaviors,
-  createDefaultMockNodeBehaviors: () => import_MockNodeBehaviors.createDefaultBehaviors,
   driverPresets: () => import_ZWaveOptions.driverPresets,
   extractFirmware: () => import_core.extractFirmware,
-  extractFirmwareAsync: () => import_core.extractFirmwareAsync,
   formatId: () => import_safe.formatId,
   formatLifelineHealthCheckRound: () => import_HealthCheck.formatLifelineHealthCheckRound,
   formatLifelineHealthCheckSummary: () => import_HealthCheck.formatLifelineHealthCheckSummary,
@@ -46,10 +43,8 @@ __export(Utils_exports, {
 module.exports = __toCommonJS(Utils_exports);
 var import_core = require("@zwave-js/core");
 var import_safe = require("@zwave-js/shared/safe");
-var import_MockControllerBehaviors = require("./lib/controller/MockControllerBehaviors.js");
 var import_ZWaveOptions = require("./lib/driver/ZWaveOptions.js");
 var import_HealthCheck = require("./lib/node/HealthCheck.js");
-var import_MockNodeBehaviors = require("./lib/node/MockNodeBehaviors.js");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ProtocolDataRate,
@@ -59,11 +54,8 @@ var import_MockNodeBehaviors = require("./lib/node/MockNodeBehaviors.js");
   QRCodeVersion,
   RouteProtocolDataRate,
   buffer2hex,
-  createDefaultMockControllerBehaviors,
-  createDefaultMockNodeBehaviors,
   driverPresets,
   extractFirmware,
-  extractFirmwareAsync,
   formatId,
   formatLifelineHealthCheckRound,
   formatLifelineHealthCheckSummary,

package/build/cjs/Utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/Utils.ts"],
-  "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"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kBAaO;AAOP,kBAKO;AACP,qCAA+E;AAC/E,0BAA8B;AAC9B,yBAMO;AACP,+BAAyE;",
+  "sourcesContent": ["export {\n\tProtocolDataRate,\n\tProtocolType,\n\tProtocolVersion,\n\tProtocols,\n\tQRCodeVersion,\n\tRouteProtocolDataRate,\n\textractFirmware,\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 { driverPresets } from \"./lib/driver/ZWaveOptions.js\";\nexport {\n\tformatLifelineHealthCheckRound,\n\tformatLifelineHealthCheckSummary,\n\tformatRouteHealthCheckRound,\n\tformatRouteHealthCheckSummary,\n\thealthCheckRatingToWord,\n} from \"./lib/node/HealthCheck.js\";\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kBAYO;AAOP,kBAKO;AACP,0BAA8B;AAC9B,yBAMO;",
   "names": []
 }

package/build/cjs/index_browser.d.ts

@@ -0,0 +1,10 @@
+import "reflect-metadata";
+export * from "@zwave-js/cc";
+export * from "./Controller.js";
+export * from "./Driver.js";
+export * from "./Error.js";
+export * from "./Node.js";
+export * from "./Utils.js";
+export * from "./Values.js";
+export * from "./Zniffer.js";
+//# sourceMappingURL=index_browser.d.ts.map

package/build/cjs/index_browser.js

@@ -0,0 +1,38 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var index_browser_exports = {};
+module.exports = __toCommonJS(index_browser_exports);
+var import_reflect_metadata = require("reflect-metadata");
+__reExport(index_browser_exports, require("@zwave-js/cc"), module.exports);
+__reExport(index_browser_exports, require("./Controller.js"), module.exports);
+__reExport(index_browser_exports, require("./Driver.js"), module.exports);
+__reExport(index_browser_exports, require("./Error.js"), module.exports);
+__reExport(index_browser_exports, require("./Node.js"), module.exports);
+__reExport(index_browser_exports, require("./Utils.js"), module.exports);
+__reExport(index_browser_exports, require("./Values.js"), module.exports);
+__reExport(index_browser_exports, require("./Zniffer.js"), module.exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ...require("@zwave-js/cc"),
+  ...require("./Controller.js"),
+  ...require("./Driver.js"),
+  ...require("./Error.js"),
+  ...require("./Node.js"),
+  ...require("./Utils.js"),
+  ...require("./Values.js"),
+  ...require("./Zniffer.js")
+});
+//# sourceMappingURL=index_browser.js.map

package/build/cjs/index_browser.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/index_browser.ts"],
+  "sourcesContent": ["// organize-imports-ignore\n\n/* @forbiddenImports sinon */\n\n// This module is the main entry point. Requiring reflect-metadata here avoids forgetting it\nimport \"reflect-metadata\";\n\n// Export some frequently-used things and types - this also loads all CC files including metadata\nexport * from \"@zwave-js/cc\";\nexport * from \"./Controller.js\";\nexport * from \"./Driver.js\";\nexport * from \"./Error.js\";\nexport * from \"./Node.js\";\nexport * from \"./Utils.js\";\nexport * from \"./Values.js\";\nexport * from \"./Zniffer.js\";\n"],
+  "mappings": ";;;;;;;;;;;;;;;AAAA;;AAKA,8BAAO;AAGP,kCAAc,yBARd;AASA,kCAAc,4BATd;AAUA,kCAAc,wBAVd;AAWA,kCAAc,uBAXd;AAYA,kCAAc,sBAZd;AAaA,kCAAc,uBAbd;AAcA,kCAAc,wBAdd;AAeA,kCAAc,yBAfd;",
+  "names": []
+}

package/build/cjs/lib/_version.d.ts

@@ -1,3 +1,3 @@
-export declare const PACKAGE_VERSION = "14.3.9";
+export declare const PACKAGE_VERSION = "15.0.0-beta.0";
 export declare const PACKAGE_NAME = "zwave-js";
 //# sourceMappingURL=_version.d.ts.map

package/build/cjs/lib/_version.js

@@ -22,7 +22,7 @@ __export(version_exports, {
   PACKAGE_VERSION: () => PACKAGE_VERSION
 });
 module.exports = __toCommonJS(version_exports);
-const PACKAGE_VERSION = "14.3.9";
+const PACKAGE_VERSION = "15.0.0-beta.0";
 const PACKAGE_NAME = "zwave-js";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/build/cjs/lib/_version.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/_version.ts"],
-  "sourcesContent": ["// This file is auto-generated by the codegen maintenance script\nexport const PACKAGE_VERSION = \"14.3.9\";\nexport const PACKAGE_NAME = \"zwave-js\";\n"],
+  "sourcesContent": ["// This file is auto-generated by the codegen maintenance script\nexport const PACKAGE_VERSION = \"15.0.0-beta.0\";\nexport const PACKAGE_NAME = \"zwave-js\";\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;AAAA;;;;;;AACO,MAAM,kBAAkB;AACxB,MAAM,eAAe;",
   "names": []
 }

package/build/cjs/lib/controller/Controller.d.ts

@@ -62,7 +62,7 @@ export declare class ZWaveController extends TypedEventTarget<ControllerEventCal
     /**
      * The device specific key (DSK) of the controller in binary format.
      */
-    get dsk(): Uint8Array;
+    getDSK(): Promise<Uint8Array>;
     /** @deprecated Use {@link role} instead */
     get isPrimary(): MaybeNotKnown<boolean>;
     private _isPrimary;
@@ -275,6 +275,9 @@ export declare class ZWaveController extends TypedEventTarget<ControllerEventCal
      * and false if the inclusion was not active.
      */
     stopExclusion(): Promise<boolean>;
+    private _proxyInclusionMachine;
+    private _proxyInclusionInitiateTimeout;
+    private updateProxyInclusionMachine;
     /**
      * Handles bootstrapping the security keys for a node that was included by an inclusion controller
      */
@@ -860,6 +863,7 @@ export declare class ZWaveController extends TypedEventTarget<ControllerEventCal
     private expectSecurityBootstrapS0;
     private expectSecurityBootstrapS2;
     private afterJoiningNetwork;
+    destroy(): void;
 }
 export {};
 //# sourceMappingURL=Controller.d.ts.map

package/build/cjs/lib/controller/Controller.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -18,14 +16,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var Controller_exports = {};
 __export(Controller_exports, {
@@ -85,7 +75,7 @@ var import_async = require("alcalzone-shared/async");
 var import_deferred_promise = require("alcalzone-shared/deferred-promise");
 var import_math = require("alcalzone-shared/math");
 var import_typeguards = require("alcalzone-shared/typeguards");
-var import_node_crypto = __toESM(require("node:crypto"), 1);
+var import_DriverMode = require("../driver/DriverMode.js");
 var import_NetworkCache = require("../driver/NetworkCache.js");
 var import_Task = require("../driver/Task.js");
 var import_DeviceClass = require("../node/DeviceClass.js");
@@ -98,6 +88,7 @@ var import_FirmwareUpdateService = require("./FirmwareUpdateService.js");
 var import_Inclusion = require("./Inclusion.js");
 var import_NVMIO = require("./NVMIO.js");
 var import_NodeInformationFrame = require("./NodeInformationFrame.js");
+var import_ProxyInclusionMachine = require("./ProxyInclusionMachine.js");
 var import_ZWaveSDKVersions = require("./ZWaveSDKVersions.js");
 var import_Types2 = require("./_Types.js");
 var import_utils = require("./utils.js");
@@ -210,10 +201,9 @@ let ZWaveController = (() => {
     /**
      * The device specific key (DSK) of the controller in binary format.
      */
-    get dsk() {
+    async getDSK() {
       if (this._dsk == void 0) {
-        const keyPair = this.driver.getLearnModeAuthenticatedKeyPair();
-        const publicKey = (0, import_core.extractRawECDHPublicKeySync)(keyPair.publicKey);
+        const { publicKey } = await this.driver.getLearnModeAuthenticatedKeyPair();
         this._dsk = publicKey.subarray(0, 16);
       }
       return this._dsk;
@@ -1406,6 +1396,104 @@ let ZWaveController = (() => {
         throw e;
       }
     }
+    _proxyInclusionMachine;
+    _proxyInclusionInitiateTimeout;
+    async updateProxyInclusionMachine(input) {
+      this._proxyInclusionMachine ??= (0, import_ProxyInclusionMachine.createProxyInclusionMachine)();
+      const newState = this._proxyInclusionMachine.next(input)?.newState;
+      if (!newState)
+        return;
+      this._proxyInclusionMachine.transition(newState);
+      switch (newState.value) {
+        case "hasNIF": {
+          this.setInclusionState(import_Inclusion.InclusionState.Busy);
+          this.driver.controllerLog.logNode(newState.nodeInfo.nodeId, "Waiting for initiate command to bootstrap node...");
+          if (this._proxyInclusionInitiateTimeout) {
+            clearTimeout(this._proxyInclusionInitiateTimeout);
+          }
+          this._proxyInclusionInitiateTimeout = setTimeout(() => {
+            void this.updateProxyInclusionMachine({
+              value: "INITIATE_TIMEOUT"
+            }).catch(import_shared.noop);
+          }, 1e4).unref();
+          return;
+        }
+        case "hasInitiate": {
+          this.setInclusionState(import_Inclusion.InclusionState.Busy);
+          if (this._proxyInclusionInitiateTimeout) {
+            clearTimeout(this._proxyInclusionInitiateTimeout);
+          }
+          this._proxyInclusionInitiateTimeout = setTimeout(() => {
+            void this.updateProxyInclusionMachine({
+              value: "NIF_TIMEOUT"
+            }).catch(import_shared.noop);
+          }, 1e4).unref();
+          return;
+        }
+        case "bootstrapping": {
+          if (this._proxyInclusionInitiateTimeout) {
+            clearTimeout(this._proxyInclusionInitiateTimeout);
+            this._proxyInclusionInitiateTimeout = void 0;
+          }
+          const nodeId = newState.includedNodeId;
+          let newNode = newState.newNode ?? new import_Node.ZWaveNode(nodeId, this.driver);
+          this._nodes.set(nodeId, newNode);
+          const inclCtrlr = this.nodes.getOrThrow(newState.inclusionControllerNodeId);
+          this.driver.controllerLog.logNode(nodeId, `Initiate command received from node ${inclCtrlr.id}`);
+          newNode.hasSUCReturnRoute = true;
+          const nodeInfo = await newNode.requestNodeInfo().catch(() => void 0);
+          if (nodeInfo) {
+            if (newState.newNode) {
+              newNode.updateNodeInfo(nodeInfo);
+            } else {
+              const deviceClass = new import_DeviceClass.DeviceClass(nodeInfo.basicDeviceClass, nodeInfo.genericDeviceClass, nodeInfo.specificDeviceClass);
+              newNode = new import_Node.ZWaveNode(
+                nodeId,
+                this.driver,
+                deviceClass,
+                nodeInfo.supportedCCs,
+                void 0,
+                // Create an empty value DB and specify that it contains no values
+                // to avoid indexing the existing values
+                this.createValueDBForNode(nodeId, /* @__PURE__ */ new Set())
+              );
+              this._nodes.set(nodeId, newNode);
+            }
+          }
+          newNode.markAsAlive();
+          const bootstrapFailure = await this.proxyBootstrap(newNode, inclCtrlr);
+          const result = bootstrapFailure != void 0 ? {
+            lowSecurity: true,
+            lowSecurityReason: bootstrapFailure
+          } : { lowSecurity: false };
+          this.setInclusionState(import_Inclusion.InclusionState.Idle);
+          this.emit("node added", newNode, result);
+          this._proxyInclusionMachine = void 0;
+          if (inclCtrlr && newState.step != void 0) {
+            const step = newState.step;
+            newNode.once("ready", () => {
+              this.driver.controllerLog.logNode(inclCtrlr.nodeId, `Notifying inclusion controller of finished inclusion`);
+              const api = inclCtrlr.createAPI(import_core.CommandClasses["Inclusion Controller"], false);
+              void api.completeStep(step, import_cc.InclusionControllerStatus.OK).catch(import_shared.noop);
+            });
+          }
+          return;
+        }
+        case "interview": {
+          this._proxyInclusionMachine = void 0;
+          if (this._proxyInclusionInitiateTimeout) {
+            clearTimeout(this._proxyInclusionInitiateTimeout);
+            this._proxyInclusionInitiateTimeout = void 0;
+          }
+          this.setInclusionState(import_Inclusion.InclusionState.Idle);
+          this.emit("node added", newState.newNode, {
+            lowSecurity: false
+          });
+          this._proxyInclusionMachine = void 0;
+          return;
+        }
+      }
+    }
     /** @internal */
     async handleApplicationUpdateRequest(msg) {
       const nodeId = msg.getNodeId();
@@ -1482,7 +1570,6 @@ let ZWaveController = (() => {
           this.driver.controllerLog.print(`Node ${nodeId2} was (supposedly) included by another controller, but it is already part of the network. Ignoring the message...`, "warn");
           return;
         }
-        this.setInclusionState(import_Inclusion.InclusionState.Busy);
         const deviceClass = new import_DeviceClass.DeviceClass(nodeInfo.basicDeviceClass, nodeInfo.genericDeviceClass, nodeInfo.specificDeviceClass);
         const newNode = new import_Node.ZWaveNode(
           nodeId2,
@@ -1506,68 +1593,30 @@ let ZWaveController = (() => {
   specific device class: ${newNode.deviceClass.specific.label}` : ""}
   supported CCs: ${nodeInfo.supportedCCs.map((cc) => `
   \xB7 ${import_core.CommandClasses[cc]} (${(0, import_shared.num2hex)(cc)})`).join("")}`);
-        this.driver.controllerLog.logNode(nodeId2, "Waiting for initiate command to bootstrap node...");
-        process.nextTick(async () => {
-          const initiate = await this.driver.waitForCommand((cc) => cc instanceof import_cc.InclusionControllerCCInitiate && cc.isSinglecast() && cc.includedNodeId === nodeId2 && cc.step === import_cc.InclusionControllerStep.ProxyInclusion, 1e4).catch(() => void 0);
-          newNode.markAsAlive();
-          let inclCtrlr;
-          let bootstrapFailure;
-          if (initiate) {
-            inclCtrlr = this.nodes.getOrThrow(initiate.nodeId);
-            this.driver.controllerLog.logNode(nodeId2, `Initiate command received from node ${inclCtrlr.id}`);
-            newNode.hasSUCReturnRoute = true;
-            const requestedNodeInfo = await newNode.requestNodeInfo().catch(() => void 0);
-            if (requestedNodeInfo) {
-              newNode.updateNodeInfo(requestedNodeInfo);
-            }
-            bootstrapFailure = await this.proxyBootstrap(newNode, inclCtrlr);
-          } else {
-            this.driver.controllerLog.logNode(nodeId2, "no initiate command received, bootstrapping node...");
-            if (newNode.protocol == import_core.Protocols.ZWave) {
-              newNode.hasSUCReturnRoute = await this.assignSUCReturnRoutes(newNode.id);
-            }
-            if (newNode.supportsCC(import_core.CommandClasses["Security 2"])) {
-              bootstrapFailure = await this.secureBootstrapS2(newNode);
-              if (bootstrapFailure == void 0) {
-                const actualSecurityClass = newNode.getHighestSecurityClass();
-                if (actualSecurityClass == void 0 || actualSecurityClass < import_core.SecurityClass.S2_Unauthenticated) {
-                  bootstrapFailure = import_Inclusion.SecurityBootstrapFailure.Unknown;
-                }
-              }
-            } else if (newNode.supportsCC(import_core.CommandClasses.Security) && (deviceClass.specific ?? deviceClass.generic).requiresSecurity) {
-              bootstrapFailure = await this.secureBootstrapS0(newNode);
-              if (bootstrapFailure == void 0) {
-                const actualSecurityClass = newNode.getHighestSecurityClass();
-                if (actualSecurityClass == void 0 || actualSecurityClass < import_core.SecurityClass.S0_Legacy) {
-                  bootstrapFailure = import_Inclusion.SecurityBootstrapFailure.Unknown;
-                }
-              }
-            } else {
-              for (const secClass of import_core.securityClassOrder) {
-                newNode.securityClasses.set(secClass, false);
-              }
-            }
-          }
-          const result = bootstrapFailure != void 0 ? {
-            lowSecurity: true,
-            lowSecurityReason: bootstrapFailure
-          } : { lowSecurity: false };
-          this.setInclusionState(import_Inclusion.InclusionState.Idle);
-          this.emit("node added", newNode, result);
-          if (inclCtrlr && initiate) {
-            const inclCtrlrId = inclCtrlr.id;
-            const step = initiate.step;
-            newNode.once("ready", () => {
-              this.driver.controllerLog.logNode(nodeId2, `Notifying node ${inclCtrlrId} of finished inclusion`);
-              const api = inclCtrlr.createAPI(import_core.CommandClasses["Inclusion Controller"], false);
-              void api.completeStep(step, import_cc.InclusionControllerStatus.OK).catch(import_shared.noop);
-            });
-          }
+        await this.updateProxyInclusionMachine({
+          value: "NIF",
+          nodeInfo,
+          newNode
         });
       } else if (msg instanceof import_serialapi.ApplicationUpdateRequestSUCIdChanged) {
         this._sucNodeId = msg.sucNodeID;
       }
     }
+    /**
+     * @internal
+     * Handles proxy inclusion requests from an inclusion controller
+     */
+    handleInclusionControllerCCInitiateProxyInclusion(initiate) {
+      if (initiate.step !== import_cc.InclusionControllerStep.ProxyInclusion) {
+        throw new import_core.ZWaveError("Expected an inclusion controller proxy inclusion request, but got a different step", import_core.ZWaveErrorCodes.Argument_Invalid);
+      }
+      void this.updateProxyInclusionMachine({
+        value: "INITIATE",
+        step: initiate.step,
+        inclusionControllerNodeId: initiate.nodeId,
+        includedNodeId: initiate.includedNodeId
+      }).catch(import_shared.noop);
+    }
     /**
      * @internal
      * Handles replace requests from an inclusion controller
@@ -1911,9 +1960,8 @@ let ZWaveController = (() => {
         }
         const nodePublicKey = import_shared.Bytes.from(pubKeyResponse.publicKey);
         const timerStartTAI2 = Date.now();
-        const keyPair = (0, import_core.generateECDHKeyPairSync)();
-        const publicKey = (0, import_core.extractRawECDHPublicKeySync)(keyPair.publicKey);
-        await api.sendPublicKey(publicKey);
+        const keyPair = await (0, import_core.generateECDHKeyPair)();
+        await api.sendPublicKey(keyPair.publicKey);
         if (grantedKeys.includes(import_core.SecurityClass.S2_AccessControl) || grantedKeys.includes(import_core.SecurityClass.S2_Authenticated)) {
           const dsk = (0, import_core.dskToString)(nodePublicKey.subarray(0, 16)).slice(5);
           const tai2RemainingMs2 = import_cc.inclusionTimeouts.TAI2 - (Date.now() - timerStartTAI2);
@@ -1935,11 +1983,11 @@ let ZWaveController = (() => {
           }
           nodePublicKey.writeUInt16BE(parseInt(pinResult, 10), 0);
         }
-        const sharedSecret = import_node_crypto.default.diffieHellman({
-          publicKey: (0, import_core.importRawECDHPublicKeySync)(nodePublicKey),
+        const sharedSecret = await (0, import_core.deriveSharedECDHSecret)({
+          publicKey: nodePublicKey,
           privateKey: keyPair.privateKey
         });
-        const tempKeys = await (0, import_core.deriveTempKeysAsync)(await (0, import_core.computePRKAsync)(sharedSecret, publicKey, nodePublicKey));
+        const tempKeys = await (0, import_core.deriveTempKeys)(await (0, import_core.computePRK)(sharedSecret, keyPair.publicKey, nodePublicKey));
         securityManager.deleteNonce(node.id);
         securityManager.tempKeys.set(node.id, {
           keyCCM: tempKeys.tempKeyCCM,
@@ -2703,9 +2751,9 @@ let ZWaveController = (() => {
           }
           let associatedNodes = [];
           try {
-            associatedNodes = (0, import_arrays.distinct)((0, import_shared.flatMap)([
+            associatedNodes = (0, import_arrays.distinct)([
               ...self.getAssociations({ nodeId: node.id }).values()
-            ], (assocs) => assocs.map((a) => a.nodeId))).filter((id) => id !== self._ownNodeId).filter((id) => id !== node.id).sort();
+            ].flatMap((assocs) => assocs.map((a) => a.nodeId))).filter((id) => id !== self._ownNodeId).filter((id) => id !== node.id).sort();
           } catch {
           }
           if (associatedNodes.length > 0) {
@@ -4684,7 +4732,7 @@ let ZWaveController = (() => {
         this.driver.controllerLog.print(message, "error");
         throw new import_core.ZWaveError(message, import_core.ZWaveErrorCodes.OTW_Update_Busy);
       }
-      if (this.driver.isInBootloader() || this.sdkVersionGte("7.0")) {
+      if (this.driver.mode === import_DriverMode.DriverMode.Bootloader || this.sdkVersionGte("7.0")) {
         return this.firmwareUpdateOTW700(data);
       } else if (this.sdkVersionGte("6.50.0") && this.supportedFunctionTypes?.includes(import_serial.FunctionType.FirmwareUpdateNVM)) {
         const wasUpdated = await this.firmwareUpdateOTW500(data);
@@ -4758,9 +4806,7 @@ let ZWaveController = (() => {
       this._firmwareUpdateInProgress = true;
       let destroy = false;
       try {
-        if (!this.driver.isInBootloader()) {
-          await this.driver.enterBootloader();
-        }
+        await this.driver.enterBootloader();
         this.driver.controllerLog.print("Beginning firmware upload");
         await this.driver.bootloader.beginUpload();
         try {
@@ -5180,12 +5226,11 @@ let ZWaveController = (() => {
         }
         const highestGranted = (0, import_core.getHighestSecurityClass)(matchingKeys);
         const requiresAuthentication = highestGranted === import_core.SecurityClass.S2_AccessControl || highestGranted === import_core.SecurityClass.S2_Authenticated;
-        const keyPair = requiresAuthentication ? this.driver.getLearnModeAuthenticatedKeyPair() : (0, import_core.generateECDHKeyPairSync)();
-        const publicKey = (0, import_core.extractRawECDHPublicKeySync)(keyPair.publicKey);
-        const transmittedPublicKey = import_shared.Bytes.from(publicKey);
+        const keyPair = requiresAuthentication ? await this.driver.getLearnModeAuthenticatedKeyPair() : await (0, import_core.generateECDHKeyPair)();
+        const transmittedPublicKey = import_shared.Bytes.from(keyPair.publicKey);
         if (requiresAuthentication) {
           transmittedPublicKey.writeUInt16BE(0, 0);
-          const dsk = (0, import_core.dskToString)(publicKey.subarray(0, 16));
+          const dsk = (0, import_core.dskToString)(keyPair.publicKey.subarray(0, 16));
           try {
             userCallbacks?.showDSK(dsk);
           } catch {
@@ -5199,11 +5244,11 @@ let ZWaveController = (() => {
           return abortCanceled();
         }
         const includingNodePubKey = pubKeyReport.publicKey;
-        const sharedSecret = import_node_crypto.default.diffieHellman({
-          publicKey: (0, import_core.importRawECDHPublicKeySync)(includingNodePubKey),
+        const sharedSecret = await (0, import_core.deriveSharedECDHSecret)({
+          publicKey: includingNodePubKey,
           privateKey: keyPair.privateKey
         });
-        const tempKeys = await (0, import_core.deriveTempKeysAsync)(await (0, import_core.computePRKAsync)(sharedSecret, includingNodePubKey, publicKey));
+        const tempKeys = await (0, import_core.deriveTempKeys)(await (0, import_core.computePRK)(sharedSecret, includingNodePubKey, keyPair.publicKey));
         securityManager.deleteNonce(bootstrappingNode.id);
         securityManager.tempKeys.set(bootstrappingNode.id, {
           keyCCM: tempKeys.tempKeyCCM,
@@ -5311,7 +5356,7 @@ let ZWaveController = (() => {
             return import_Inclusion.SecurityBootstrapFailure.ParameterMismatch;
           }
           receivedKeys.set(securityClass, keyReport.networkKey);
-          await securityManager.setKeyAsync(securityClass, keyReport.networkKey);
+          await securityManager.setKey(securityClass, keyReport.networkKey);
           if (securityClass === import_core.SecurityClass.S0_Legacy) {
             this.driver["_securityManager"] = new import_core.SecurityManager({
               ownNodeId: this._ownNodeId,
@@ -5487,6 +5532,11 @@ let ZWaveController = (() => {
       }
       this.emit("network joined");
     }
+    destroy() {
+      this._nodes.forEach((node) => node.destroy());
+      this._nodes.clear();
+      this.removeAllListeners();
+    }
   };
   return ZWaveController2 = _classThis;
 })();