zwave-js 9.0.7 → 9.1.0

package/build/lib/controller/Controller.js

@@ -29,40 +29,40 @@ const DeviceClass_1 = require("../node/DeviceClass");
 const Node_1 = require("../node/Node");
 const VirtualNode_1 = require("../node/VirtualNode");
 const _Types_1 = require("../node/_Types");
+const GetControllerCapabilitiesMessages_1 = require("../serialapi/capability/GetControllerCapabilitiesMessages");
+const GetControllerVersionMessages_1 = require("../serialapi/capability/GetControllerVersionMessages");
 const GetProtocolVersionMessages_1 = require("../serialapi/capability/GetProtocolVersionMessages");
+const GetSerialApiCapabilitiesMessages_1 = require("../serialapi/capability/GetSerialApiCapabilitiesMessages");
+const GetSerialApiInitDataMessages_1 = require("../serialapi/capability/GetSerialApiInitDataMessages");
+const HardResetRequest_1 = require("../serialapi/capability/HardResetRequest");
+const SerialAPISetupMessages_1 = require("../serialapi/capability/SerialAPISetupMessages");
+const GetControllerIdMessages_1 = require("../serialapi/memory/GetControllerIdMessages");
 const GetBackgroundRSSIMessages_1 = require("../serialapi/misc/GetBackgroundRSSIMessages");
-const SerialAPISetupMessages_1 = require("../serialapi/misc/SerialAPISetupMessages");
 const SetRFReceiveModeMessages_1 = require("../serialapi/misc/SetRFReceiveModeMessages");
+const SetSerialApiTimeoutsMessages_1 = require("../serialapi/misc/SetSerialApiTimeoutsMessages");
+const AddNodeToNetworkRequest_1 = require("../serialapi/network-mgmt/AddNodeToNetworkRequest");
+const AssignReturnRouteMessages_1 = require("../serialapi/network-mgmt/AssignReturnRouteMessages");
+const AssignSUCReturnRouteMessages_1 = require("../serialapi/network-mgmt/AssignSUCReturnRouteMessages");
+const DeleteReturnRouteMessages_1 = require("../serialapi/network-mgmt/DeleteReturnRouteMessages");
+const DeleteSUCReturnRouteMessages_1 = require("../serialapi/network-mgmt/DeleteSUCReturnRouteMessages");
+const GetRoutingInfoMessages_1 = require("../serialapi/network-mgmt/GetRoutingInfoMessages");
+const GetSUCNodeIdMessages_1 = require("../serialapi/network-mgmt/GetSUCNodeIdMessages");
+const IsFailedNodeMessages_1 = require("../serialapi/network-mgmt/IsFailedNodeMessages");
+const RemoveFailedNodeMessages_1 = require("../serialapi/network-mgmt/RemoveFailedNodeMessages");
+const RemoveNodeFromNetworkRequest_1 = require("../serialapi/network-mgmt/RemoveNodeFromNetworkRequest");
+const ReplaceFailedNodeRequest_1 = require("../serialapi/network-mgmt/ReplaceFailedNodeRequest");
+const RequestNodeNeighborUpdateMessages_1 = require("../serialapi/network-mgmt/RequestNodeNeighborUpdateMessages");
+const SetSUCNodeIDMessages_1 = require("../serialapi/network-mgmt/SetSUCNodeIDMessages");
 const ExtNVMReadLongBufferMessages_1 = require("../serialapi/nvm/ExtNVMReadLongBufferMessages");
 const ExtNVMReadLongByteMessages_1 = require("../serialapi/nvm/ExtNVMReadLongByteMessages");
 const ExtNVMWriteLongBufferMessages_1 = require("../serialapi/nvm/ExtNVMWriteLongBufferMessages");
 const ExtNVMWriteLongByteMessages_1 = require("../serialapi/nvm/ExtNVMWriteLongByteMessages");
 const GetNVMIdMessages_1 = require("../serialapi/nvm/GetNVMIdMessages");
 const NVMOperationsMessages_1 = require("../serialapi/nvm/NVMOperationsMessages");
-const AddNodeToNetworkRequest_1 = require("./AddNodeToNetworkRequest");
-const AssignReturnRouteMessages_1 = require("./AssignReturnRouteMessages");
-const AssignSUCReturnRouteMessages_1 = require("./AssignSUCReturnRouteMessages");
+const _Types_2 = require("../serialapi/_Types");
 const ControllerStatistics_1 = require("./ControllerStatistics");
-const DeleteReturnRouteMessages_1 = require("./DeleteReturnRouteMessages");
-const DeleteSUCReturnRouteMessages_1 = require("./DeleteSUCReturnRouteMessages");
 const Features_1 = require("./Features");
-const GetControllerCapabilitiesMessages_1 = require("./GetControllerCapabilitiesMessages");
-const GetControllerIdMessages_1 = require("./GetControllerIdMessages");
-const GetControllerVersionMessages_1 = require("./GetControllerVersionMessages");
-const GetRoutingInfoMessages_1 = require("./GetRoutingInfoMessages");
-const GetSerialApiCapabilitiesMessages_1 = require("./GetSerialApiCapabilitiesMessages");
-const GetSerialApiInitDataMessages_1 = require("./GetSerialApiInitDataMessages");
-const GetSUCNodeIdMessages_1 = require("./GetSUCNodeIdMessages");
-const HardResetRequest_1 = require("./HardResetRequest");
 const Inclusion_1 = require("./Inclusion");
-const IsFailedNodeMessages_1 = require("./IsFailedNodeMessages");
-const RemoveFailedNodeMessages_1 = require("./RemoveFailedNodeMessages");
-const RemoveNodeFromNetworkRequest_1 = require("./RemoveNodeFromNetworkRequest");
-const ReplaceFailedNodeRequest_1 = require("./ReplaceFailedNodeRequest");
-const RequestNodeNeighborUpdateMessages_1 = require("./RequestNodeNeighborUpdateMessages");
-const SetSerialApiTimeoutsMessages_1 = require("./SetSerialApiTimeoutsMessages");
-const SetSUCNodeIDMessages_1 = require("./SetSUCNodeIDMessages");
-const ZWaveLibraryTypes_1 = require("./ZWaveLibraryTypes");
 const ZWaveSDKVersions_1 = require("./ZWaveSDKVersions");
 let ZWaveController = class ZWaveController extends shared_1.TypedEventEmitter {
     /** @internal */
@@ -393,7 +393,7 @@ let ZWaveController = class ZWaveController extends shared_1.TypedEventEmitter {
         this._sdkVersion = version.sdkVersion;
         this._type = version.controllerType;
         this.driver.controllerLog.print(`received version info:
-  controller type: ${ZWaveLibraryTypes_1.ZWaveLibraryTypes[this._type]}
+  controller type: ${(0, shared_1.getEnumMemberName)(_Types_2.ZWaveLibraryTypes, this._type)}
   library version: ${this._sdkVersion}`);
         // If supported, get more fine-grained version info
         if (this.isFunctionSupported(Constants_1.FunctionType.GetProtocolVersion)) {
@@ -490,7 +490,7 @@ let ZWaveController = class ZWaveController extends shared_1.TypedEventEmitter {
             }
         }
         // if it's a bridge controller, request the virtual nodes
-        if (this.type === ZWaveLibraryTypes_1.ZWaveLibraryTypes["Bridge Controller"] &&
+        if (this.type === _Types_2.ZWaveLibraryTypes["Bridge Controller"] &&
             this.isFunctionSupported(Constants_1.FunctionType.FUNC_ID_ZW_GET_VIRTUAL_NODES)) {
             // TODO: send FUNC_ID_ZW_GET_VIRTUAL_NODES message
         }
@@ -538,7 +538,7 @@ let ZWaveController = class ZWaveController extends shared_1.TypedEventEmitter {
         ]);
         controllerValueDB.setMetadata((0, VersionCC_1.getSDKVersionValueId)(), (0, VersionCC_1.getSDKVersionMetadata)());
         controllerValueDB.setValue((0, VersionCC_1.getSDKVersionValueId)(), this._sdkVersion);
-        if (this.type !== ZWaveLibraryTypes_1.ZWaveLibraryTypes["Bridge Controller"] &&
+        if (this.type !== _Types_2.ZWaveLibraryTypes["Bridge Controller"] &&
             this.isFunctionSupported(Constants_1.FunctionType.SetSerialApiTimeouts)) {
             const { ack, byte } = this.driver.options.timeouts;
             this.driver.controllerLog.print(`setting serial API timeouts: ack = ${ack} ms, byte = ${byte} ms`);
@@ -669,10 +669,8 @@ let ZWaveController = class ZWaveController extends shared_1.TypedEventEmitter {
             options.strategy === Inclusion_1.InclusionStrategy.SmartStart) {
             throw new core_1.ZWaveError(`Invalid inclusion strategy: ${options.strategy}`, core_1.ZWaveErrorCodes.Argument_Invalid);
         }
-        if (this._inclusionState === Inclusion_1.InclusionState.SmartStart) {
-            // Disable listening mode so we can switch to inclusion mode
-            await this.stopInclusion();
-        }
+        // Leave SmartStart listening mode so we can switch to exclusion mode
+        await this.pauseSmartStart();
         this.setInclusionState(Inclusion_1.InclusionState.Including);
         this._inclusionOptions = options;
         try {
@@ -841,7 +839,12 @@ let ZWaveController = class ZWaveController extends shared_1.TypedEventEmitter {
             this.setInclusionState(Inclusion_1.InclusionState.Idle);
             this.driver.controllerLog.print(`disabling Smart Start listening mode...`);
             try {
-                await this.stopInclusion();
+                await this.driver.sendMessage(new AddNodeToNetworkRequest_1.AddNodeToNetworkRequest(this.driver, {
+                    callbackId: 0,
+                    addNodeType: AddNodeToNetworkRequest_1.AddNodeType.Stop,
+                    highPower: true,
+                    networkWide: true,
+                }));
                 this.driver.controllerLog.print(`Smart Start listening mode disabled`);
                 return true;
             }
@@ -859,6 +862,30 @@ let ZWaveController = class ZWaveController extends shared_1.TypedEventEmitter {
             return true;
         }
     }
+    async pauseSmartStart() {
+        if (!this.supportsFeature(Features_1.ZWaveFeature.SmartStart))
+            return true;
+        if (this._inclusionState === Inclusion_1.InclusionState.SmartStart) {
+            this.driver.controllerLog.print(`Leaving Smart Start listening mode...`);
+            try {
+                await this.driver.sendMessage(new AddNodeToNetworkRequest_1.AddNodeToNetworkRequest(this.driver, {
+                    callbackId: 0,
+                    addNodeType: AddNodeToNetworkRequest_1.AddNodeType.Stop,
+                    highPower: true,
+                    networkWide: true,
+                }));
+                this.driver.controllerLog.print(`Left Smart Start listening mode`);
+                return true;
+            }
+            catch (e) {
+                this.driver.controllerLog.print(`Smart Start listening mode could not be left: ${(0, shared_1.getErrorMessage)(e)}`, "error");
+                throw e;
+            }
+        }
+        else {
+            return true;
+        }
+    }
     /**
      * Starts the exclusion process of new nodes.
      * Resolves to true when the process was started, and false if an inclusion or exclusion process was already active.
@@ -871,10 +898,8 @@ let ZWaveController = class ZWaveController extends shared_1.TypedEventEmitter {
             this._inclusionState === Inclusion_1.InclusionState.Busy) {
             return false;
         }
-        if (this._inclusionState === Inclusion_1.InclusionState.SmartStart) {
-            // Disable listening mode so we can switch to exclusion mode
-            await this.stopInclusion();
-        }
+        // Leave SmartStart listening mode so we can switch to exclusion mode
+        await this.pauseSmartStart();
         this.setInclusionState(Inclusion_1.InclusionState.Excluding);
         this.driver.controllerLog.print(`starting exclusion process...`);
         try {
@@ -2527,7 +2552,7 @@ ${associatedNodes.join(", ")}`,
     async removeFailedNode(nodeId) {
         const node = this.nodes.getOrThrow(nodeId);
         if (await node.ping()) {
-            throw new core_1.ZWaveError(`The node removal process could not be started because the node responded to a ping.`, core_1.ZWaveErrorCodes.ReplaceFailedNode_Failed);
+            throw new core_1.ZWaveError(`The node removal process could not be started because the node responded to a ping.`, core_1.ZWaveErrorCodes.RemoveFailedNode_Failed);
         }
         const result = await this.driver.sendMessage(new RemoveFailedNodeMessages_1.RemoveFailedNodeRequest(this.driver, { failedNodeId: nodeId }));
         if (result instanceof RemoveFailedNodeMessages_1.RemoveFailedNodeResponse) {
@@ -2573,10 +2598,8 @@ ${associatedNodes.join(", ")}`,
             this._inclusionState === Inclusion_1.InclusionState.Busy) {
             return false;
         }
-        if (this._inclusionState === Inclusion_1.InclusionState.SmartStart) {
-            // Disable listening mode so we can switch to exclusion mode
-            await this.stopInclusion();
-        }
+        // Leave SmartStart listening mode so we can switch to exclusion mode
+        await this.pauseSmartStart();
         this.setInclusionState(Inclusion_1.InclusionState.Busy);
         if (options == undefined) {
             options = {