zwave-js 9.2.1 → 9.3.0

package/build/lib/controller/Controller.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZWaveController = void 0;
 const core_1 = require("@zwave-js/core");
 const nvmedit_1 = require("@zwave-js/nvmedit");
+const serial_1 = require("@zwave-js/serial");
 const shared_1 = require("@zwave-js/shared");
 const arrays_1 = require("alcalzone-shared/arrays");
 const async_1 = require("alcalzone-shared/async");
@@ -20,11 +21,13 @@ const crypto_1 = __importDefault(require("crypto"));
 const semver_1 = __importDefault(require("semver"));
 const util_1 = __importDefault(require("util"));
 const commandclass_1 = require("../commandclass");
+const AssociationCC_1 = require("../commandclass/AssociationCC");
+const AssociationGroupInfoCC_1 = require("../commandclass/AssociationGroupInfoCC");
 const ManufacturerSpecificCC_1 = require("../commandclass/ManufacturerSpecificCC");
+const MultiChannelAssociationCC_1 = require("../commandclass/MultiChannelAssociationCC");
 const shared_2 = require("../commandclass/Security2/shared");
 const VersionCC_1 = require("../commandclass/VersionCC");
 const NetworkCache_1 = require("../driver/NetworkCache");
-const Constants_1 = require("../message/Constants");
 const DeviceClass_1 = require("../node/DeviceClass");
 const Node_1 = require("../node/Node");
 const VirtualNode_1 = require("../node/VirtualNode");
@@ -36,6 +39,7 @@ const GetSerialApiCapabilitiesMessages_1 = require("../serialapi/capability/GetS
 const GetSerialApiInitDataMessages_1 = require("../serialapi/capability/GetSerialApiInitDataMessages");
 const HardResetRequest_1 = require("../serialapi/capability/HardResetRequest");
 const SerialAPISetupMessages_1 = require("../serialapi/capability/SerialAPISetupMessages");
+const SetApplicationNodeInformationRequest_1 = require("../serialapi/capability/SetApplicationNodeInformationRequest");
 const GetControllerIdMessages_1 = require("../serialapi/memory/GetControllerIdMessages");
 const GetBackgroundRSSIMessages_1 = require("../serialapi/misc/GetBackgroundRSSIMessages");
 const SetRFReceiveModeMessages_1 = require("../serialapi/misc/SetRFReceiveModeMessages");
@@ -63,6 +67,8 @@ const _Types_2 = require("../serialapi/_Types");
 const ControllerStatistics_1 = require("./ControllerStatistics");
 const Features_1 = require("./Features");
 const Inclusion_1 = require("./Inclusion");
+const NodeInformationFrame_1 = require("./NodeInformationFrame");
+const utils_1 = require("./utils");
 const ZWaveSDKVersions_1 = require("./ZWaveSDKVersions");
 let ZWaveController = class ZWaveController extends shared_1.TypedEventEmitter {
     /** @internal */
@@ -75,18 +81,13 @@ let ZWaveController = class ZWaveController extends shared_1.TypedEventEmitter {
         this._includeController = false;
         this._unprovisionRemovedNode = false;
         this._healNetworkProgress = new Map();
-        this._nodes = new Map();
-        this._nodes.getOrThrow = function (nodeId) {
-            const node = this.get(nodeId);
-            if (!node) {
-                throw new core_1.ZWaveError(`Node ${nodeId} was not found!`, core_1.ZWaveErrorCodes.Controller_NodeNotFound);
-            }
-            return node;
-        }.bind(this._nodes);
+        this._nodes = (0, shared_1.createThrowingMap)((nodeId) => {
+            throw new core_1.ZWaveError(`Node ${nodeId} was not found!`, core_1.ZWaveErrorCodes.Controller_NodeNotFound);
+        });
         // register message handlers
-        driver.registerRequestHandler(Constants_1.FunctionType.AddNodeToNetwork, this.handleAddNodeStatusReport.bind(this));
-        driver.registerRequestHandler(Constants_1.FunctionType.RemoveNodeFromNetwork, this.handleRemoveNodeStatusReport.bind(this));
-        driver.registerRequestHandler(Constants_1.FunctionType.ReplaceFailedNode, this.handleReplaceNodeStatusReport.bind(this));
+        driver.registerRequestHandler(serial_1.FunctionType.AddNodeToNetwork, this.handleAddNodeStatusReport.bind(this));
+        driver.registerRequestHandler(serial_1.FunctionType.RemoveNodeFromNetwork, this.handleRemoveNodeStatusReport.bind(this));
+        driver.registerRequestHandler(serial_1.FunctionType.ReplaceFailedNode, this.handleReplaceNodeStatusReport.bind(this));
     }
     get type() {
         return this._type;
@@ -94,6 +95,12 @@ let ZWaveController = class ZWaveController extends shared_1.TypedEventEmitter {
     get sdkVersion() {
         return this._sdkVersion;
     }
+    get zwaveApiVersion() {
+        return this._zwaveApiVersion;
+    }
+    get zwaveChipType() {
+        return this._zwaveChipType;
+    }
     /** A 32bit number identifying the current network */
     get homeId() {
         return this._homeId;
@@ -102,8 +109,13 @@ let ZWaveController = class ZWaveController extends shared_1.TypedEventEmitter {
     get ownNodeId() {
         return this._ownNodeId;
     }
+    get isPrimary() {
+        return this._isPrimary;
+    }
+    /** @deprecated Use {@link isPrimary} instead */
     get isSecondary() {
-        return this._isSecondary;
+        if (typeof this._isPrimary === "boolean")
+            return !this._isPrimary;
     }
     get isUsingHomeIdFromOtherNetwork() {
         return this._isUsingHomeIdFromOtherNetwork;
@@ -114,11 +126,24 @@ let ZWaveController = class ZWaveController extends shared_1.TypedEventEmitter {
     get wasRealPrimary() {
         return this._wasRealPrimary;
     }
+    get isSIS() {
+        return this._isSIS;
+    }
+    get isSUC() {
+        return this._isSUC;
+    }
+    /** @deprecated Use {@link isSUC} instead */
     get isStaticUpdateController() {
-        return this._isStaticUpdateController;
+        return this._isSUC;
+    }
+    get nodeType() {
+        return this._nodeType;
     }
+    /** @deprecated Use the {@link nodeType} property to check for Controller vs. End Node instead */
     get isSlave() {
-        return this._isSlave;
+        if (this._nodeType != undefined) {
+            return this._nodeType !== core_1.NodeType.Controller;
+        }
     }
     /** Checks if the SDK version is greater than the given one */
     sdkVersionGt(version) {
@@ -257,6 +282,8 @@ let ZWaveController = class ZWaveController extends shared_1.TypedEventEmitter {
     provisionSmartStartNode(entry) {
         // Make sure the controller supports SmartStart
         this.assertFeature(Features_1.ZWaveFeature.SmartStart);
+        // And that the entry contains valid data
+        (0, utils_1.assertProvisioningEntry)(entry);
         const provisioningList = [...this.provisioningList];
         const index = provisioningList.findIndex((e) => e.dsk === entry.dsk);
         if (index === -1) {
@@ -332,9 +359,11 @@ let ZWaveController = class ZWaveController extends shared_1.TypedEventEmitter {
             };
         });
     }
-    /** Returns whether the SmartStart provisioning list contains entries that have not been included yet */
+    /** Returns whether the SmartStart provisioning list contains active entries that have not been included yet */
     hasPlannedProvisioningEntries() {
-        return this.provisioningList.some((e) => !this.getNodeByDSK(e.dsk));
+        return this.provisioningList.some((e) => (e.status == undefined ||
+            e.status === Inclusion_1.ProvisioningEntryStatus.Active) &&
+            !this.getNodeByDSK(e.dsk));
     }
     /**
      * @internal
@@ -384,7 +413,7 @@ let ZWaveController = class ZWaveController extends shared_1.TypedEventEmitter {
   product type:        ${(0, shared_1.num2hex)(this._productType)}
   product ID:          ${(0, shared_1.num2hex)(this._productId)}
   supported functions: ${this._supportedFunctionTypes
-            .map((fn) => `\n  · ${Constants_1.FunctionType[fn]} (${(0, shared_1.num2hex)(fn)})`)
+            .map((fn) => `\n  · ${serial_1.FunctionType[fn]} (${(0, shared_1.num2hex)(fn)})`)
             .join("")}`);
     }
     /**
@@ -398,13 +427,13 @@ let ZWaveController = class ZWaveController extends shared_1.TypedEventEmitter {
         const version = await this.driver.sendMessage(new GetControllerVersionMessages_1.GetControllerVersionRequest(this.driver), {
             supportCheck: false,
         });
-        this._sdkVersion = version.sdkVersion;
+        this._sdkVersion = version.libraryVersion;
         this._type = version.controllerType;
         this.driver.controllerLog.print(`received version info:
   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)) {
+        if (this.isFunctionSupported(serial_1.FunctionType.GetProtocolVersion)) {
             this.driver.controllerLog.print(`querying protocol version info...`);
             const protocol = await this.driver.sendMessage(new GetProtocolVersionMessages_1.GetProtocolVersionRequest(this.driver));
             // Overwrite the SDK version with the more fine grained protocol version. We can assume this to be
@@ -434,20 +463,20 @@ let ZWaveController = class ZWaveController extends shared_1.TypedEventEmitter {
         const ctrlCaps = await this.driver.sendMessage(new GetControllerCapabilitiesMessages_1.GetControllerCapabilitiesRequest(this.driver), {
             supportCheck: false,
         });
-        this._isSecondary = ctrlCaps.isSecondary;
+        this._isPrimary = !ctrlCaps.isSecondary;
         this._isUsingHomeIdFromOtherNetwork =
             ctrlCaps.isUsingHomeIdFromOtherNetwork;
         this._isSISPresent = ctrlCaps.isSISPresent;
         this._wasRealPrimary = ctrlCaps.wasRealPrimary;
-        this._isStaticUpdateController = ctrlCaps.isStaticUpdateController;
+        this._isSUC = ctrlCaps.isStaticUpdateController;
         this.driver.controllerLog.print(`received controller capabilities:
-  controller role:     ${this._isSecondary ? "secondary" : "primary"}
-  is in other network: ${this._isUsingHomeIdFromOtherNetwork}
-  is SIS present:      ${this._isSISPresent}
-  was real primary:    ${this._wasRealPrimary}
-  is a SUC:            ${this._isStaticUpdateController}`);
+  controller role:      ${this._isPrimary ? "primary" : "secondary"}
+  is the SUC:           ${this._isSUC}
+  started this network: ${!this._isUsingHomeIdFromOtherNetwork}
+  SIS is present:       ${this._isSISPresent}
+  was real primary:     ${this._wasRealPrimary}`);
         // Figure out which sub commands of SerialAPISetup are supported
-        if (this.isFunctionSupported(Constants_1.FunctionType.SerialAPISetup)) {
+        if (this.isFunctionSupported(serial_1.FunctionType.SerialAPISetup)) {
             this.driver.controllerLog.print(`querying serial API setup capabilities...`);
             const setupCaps = await this.driver.sendMessage(new SerialAPISetupMessages_1.SerialAPISetup_GetSupportedCommandsRequest(this.driver));
             this._supportedSerialAPISetupCommands = setupCaps.supportedCommands;
@@ -481,9 +510,9 @@ let ZWaveController = class ZWaveController extends shared_1.TypedEventEmitter {
         }
         // There needs to be a SUC/SIS in the network. If not, we promote ourselves to one if the following conditions are met:
         // We are the primary controller, but we are not SUC, there is no SUC and there is no SIS
-        if (!this._isSecondary &&
+        if (this._isPrimary &&
             this._sucNodeId === 0 &&
-            !this._isStaticUpdateController &&
+            !this._isSUC &&
             !this._isSISPresent) {
             this.driver.controllerLog.print(`There is no SUC/SIS in the network - promoting ourselves...`);
             try {
@@ -499,23 +528,30 @@ let ZWaveController = class ZWaveController extends shared_1.TypedEventEmitter {
         }
         // if it's a bridge controller, request the virtual nodes
         if (this.type === _Types_2.ZWaveLibraryTypes["Bridge Controller"] &&
-            this.isFunctionSupported(Constants_1.FunctionType.FUNC_ID_ZW_GET_VIRTUAL_NODES)) {
+            this.isFunctionSupported(serial_1.FunctionType.FUNC_ID_ZW_GET_VIRTUAL_NODES)) {
             // TODO: send FUNC_ID_ZW_GET_VIRTUAL_NODES message
         }
-        // Request information about all nodes with the GetInitData message
-        this.driver.controllerLog.print(`querying node information...`);
+        // Request additional information about the controller/Z-Wave chip
+        this.driver.controllerLog.print(`querying additional controller information...`);
         const initData = await this.driver.sendMessage(new GetSerialApiInitDataMessages_1.GetSerialApiInitDataRequest(this.driver));
-        // override the information we might already have
-        this._isSecondary = initData.isSecondary;
-        this._isStaticUpdateController = initData.isStaticUpdateController;
         // and remember the new info
-        this._isSlave = initData.isSlave;
+        this._zwaveApiVersion = initData.zwaveApiVersion;
+        this._zwaveChipType = initData.zwaveChipType;
+        this._isPrimary = initData.isPrimary;
+        this._isSIS = initData.isSIS;
+        this._nodeType = initData.nodeType;
         this._supportsTimers = initData.supportsTimers;
         // ignore the initVersion, no clue what to do with it
-        this.driver.controllerLog.print(`received node information:
-  controller role:            ${this._isSecondary ? "secondary" : "primary"}
-  controller is a SUC:        ${this._isStaticUpdateController}
-  controller is a slave:      ${this._isSlave}
+        this.driver.controllerLog.print(`received additional controller information:
+  Z-Wave API version:         ${this._zwaveApiVersion.version} (${this._zwaveApiVersion.kind})${this._zwaveChipType
+            ? `
+  Z-Wave chip type:           ${typeof this._zwaveChipType === "string"
+                ? this._zwaveChipType
+                : `unknown (type: ${(0, shared_1.num2hex)(this._zwaveChipType.type)}, version: ${(0, shared_1.num2hex)(this._zwaveChipType.version)})`}`
+            : ""}
+  node type                   ${(0, shared_1.getEnumMemberName)(core_1.NodeType, this._nodeType)}
+  controller role:            ${this._isPrimary ? "primary" : "secondary"}
+  controller is the SIS:      ${this._isSIS}
   controller supports timers: ${this._supportsTimers}
   nodes in the network:       ${initData.nodeIds.join(", ")}`);
         // Index the value DB for optimal performance
@@ -547,7 +583,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 !== _Types_2.ZWaveLibraryTypes["Bridge Controller"] &&
-            this.isFunctionSupported(Constants_1.FunctionType.SetSerialApiTimeouts)) {
+            this.isFunctionSupported(serial_1.FunctionType.SetSerialApiTimeouts)) {
             const { ack, byte } = this.driver.options.timeouts;
             this.driver.controllerLog.print(`setting serial API timeouts: ack = ${ack} ms, byte = ${byte} ms`);
             const resp = await this.driver.sendMessage(new SetSerialApiTimeoutsMessages_1.SetSerialApiTimeoutsRequest(this.driver, {
@@ -556,85 +592,44 @@ let ZWaveController = class ZWaveController extends shared_1.TypedEventEmitter {
             }));
             this.driver.controllerLog.print(`serial API timeouts overwritten. The old values were: ack = ${resp.oldAckTimeout} ms, byte = ${resp.oldByteTimeout} ms`);
         }
-        // TODO: Tell the Z-Wave stick what kind of application this is
-        //   The Z-Wave Application Layer MUST use the \ref ApplicationNodeInformation
-        //   function to generate the Node Information frame and to save information about
-        //   node capabilities. All Z Wave application related fields of the Node Information
-        //   structure MUST be initialized by this function.
-        // Afterwards, a hard reset is required, so we need to move this into another method
-        // if (
-        // 	this.isFunctionSupported(
-        // 		FunctionType.FUNC_ID_SERIAL_API_APPL_NODE_INFORMATION,
-        // 	)
-        // ) {
-        // 	this.driver.controllerLog.print(`sending application info...`);
-        // 	// TODO: Generate this list dynamically
-        // 	// A list of all CCs the controller will respond to
-        // 	const supportedCCs = [CommandClasses.Time];
-        // 	// Turn the CCs into buffers and concat them
-        // 	const supportedCCBuffer = Buffer.concat(
-        // 		supportedCCs.map(cc =>
-        // 			cc >= 0xf1
-        // 				? // extended CC
-        // 				  Buffer.from([cc >>> 8, cc & 0xff])
-        // 				: // normal CC
-        // 				  Buffer.from([cc]),
-        // 		),
-        // 	);
-        // 	const appInfoMsg = new Message(this.driver, {
-        // 		type: MessageType.Request,
-        // 		functionType:
-        // 			FunctionType.FUNC_ID_SERIAL_API_APPL_NODE_INFORMATION,
-        // 		payload: Buffer.concat([
-        // 			Buffer.from([
-        // 				0x01, // APPLICATION_NODEINFO_LISTENING
-        // 				GenericDeviceClasses["Static Controller"],
-        // 				0x01, // specific static PC controller
-        // 				supportedCCBuffer.length, // length of supported CC list
-        // 			]),
-        // 			// List of supported CCs
-        // 			supportedCCBuffer,
-        // 		]),
-        // 	});
-        // 	await this.driver.sendMessage(appInfoMsg, {
-        // 		priority: MessagePriority.Controller,
-        // 		supportCheck: false,
-        // 	});
-        // }
         this.driver.controllerLog.print("Interview completed");
     }
     createValueDBForNode(nodeId, ownKeys) {
         return new core_1.ValueDB(nodeId, this.driver.valueDB, this.driver.metadataDB, ownKeys);
     }
+    /**
+     * Sets the NIF of the controller to the Gateway device type and to include the CCs supported by Z-Wave JS.
+     * Warning: This only works when followed up by a hard-reset, so don't call this directly
+     * @internal
+     */
+    async setControllerNIF() {
+        this.driver.controllerLog.print("Updating the controller NIF...");
+        await this.driver.sendMessage(new SetApplicationNodeInformationRequest_1.SetApplicationNodeInformationRequest(this.driver, {
+            isListening: true,
+            ...(0, NodeInformationFrame_1.determineNIF)(),
+        }));
+    }
     /**
      * Performs a hard reset on the controller. This wipes out all configuration!
      * Warning: The driver needs to re-interview the controller, so don't call this directly
      * @internal
      */
-    hardReset() {
-        this.driver.controllerLog.print("performing hard reset...");
-        return new Promise(async (resolve, reject) => {
-            // handle the incoming message
-            const handler = (_msg) => {
-                this.driver.controllerLog.print(`  hard reset succeeded`);
-                // Clean up
-                this._nodes.forEach((node) => node.removeAllListeners());
-                this._nodes.clear();
-                resolve();
-                return true;
-            };
-            this.driver.registerRequestHandler(Constants_1.FunctionType.HardReset, handler, true);
-            // begin the reset process
-            try {
-                await this.driver.sendMessage(new HardResetRequest_1.HardResetRequest(this.driver), { supportCheck: false });
-            }
-            catch (e) {
-                // in any case unregister the handler
-                this.driver.controllerLog.print(`  hard reset failed: ${(0, shared_1.getErrorMessage)(e)}`, "error");
-                this.driver.unregisterRequestHandler(Constants_1.FunctionType.HardReset, handler);
-                reject(e);
-            }
-        });
+    async hardReset() {
+        // begin the reset process
+        try {
+            this.driver.controllerLog.print("performing hard reset...");
+            await this.driver.sendMessage(new HardResetRequest_1.HardResetRequest(this.driver), {
+                supportCheck: false,
+            });
+            this.driver.controllerLog.print(`hard reset succeeded`);
+            // Clean up
+            this._nodes.forEach((node) => node.removeAllListeners());
+            this._nodes.clear();
+        }
+        catch (e) {
+            this.driver.controllerLog.print(`hard reset failed: ${(0, shared_1.getErrorMessage)(e)}`, "error");
+            throw e;
+        }
     }
     get inclusionState() {
         return this._inclusionState;
@@ -1495,7 +1490,7 @@ let ZWaveController = class ZWaveController extends shared_1.TypedEventEmitter {
                         version: supportedVersion,
                     });
                     const instance = node.createCCInstance(core_1.CommandClasses["Wake Up"]);
-                    await instance.interview();
+                    await instance.interview(this.driver);
                 }
             }
             catch (e) {
@@ -2209,41 +2204,40 @@ ${associatedNodes.join(", ")}`,
         let assocInstance;
         let mcInstance;
         if (endpoint.supportsCC(core_1.CommandClasses.Association)) {
-            assocInstance = endpoint.createCCInstanceUnsafe(core_1.CommandClasses.Association);
+            assocInstance = AssociationCC_1.AssociationCC;
         }
         else {
             throw new core_1.ZWaveError(`Node ${nodeId}${endpointIndex > 0 ? `, endpoint ${endpointIndex}` : ""} does not support associations!`, core_1.ZWaveErrorCodes.CC_NotSupported);
         }
         if (endpoint.supportsCC(core_1.CommandClasses["Multi Channel Association"])) {
-            mcInstance =
-                endpoint.createCCInstanceUnsafe(core_1.CommandClasses["Multi Channel Association"]);
+            mcInstance = MultiChannelAssociationCC_1.MultiChannelAssociationCC;
         }
-        const assocGroupCount = (_b = assocInstance.getGroupCountCached()) !== null && _b !== void 0 ? _b : 0;
-        const mcGroupCount = (_c = mcInstance === null || mcInstance === void 0 ? void 0 : mcInstance.getGroupCountCached()) !== null && _c !== void 0 ? _c : 0;
+        const assocGroupCount = (_b = assocInstance.getGroupCountCached(this.driver, endpoint)) !== null && _b !== void 0 ? _b : 0;
+        const mcGroupCount = (_c = mcInstance === null || mcInstance === void 0 ? void 0 : mcInstance.getGroupCountCached(this.driver, endpoint)) !== null && _c !== void 0 ? _c : 0;
         const groupCount = Math.max(assocGroupCount, mcGroupCount);
         const ret = new Map();
         if (endpoint.supportsCC(core_1.CommandClasses["Association Group Information"])) {
             // We can read all information we need from the AGI CC
-            const agiInstance = endpoint.createCCInstance(core_1.CommandClasses["Association Group Information"]);
+            const agiInstance = AssociationGroupInfoCC_1.AssociationGroupInfoCC;
             for (let group = 1; group <= groupCount; group++) {
                 const assocConfig = (_d = node.deviceConfig) === null || _d === void 0 ? void 0 : _d.getAssociationConfigForEndpoint(endpointIndex, group);
                 const multiChannel = !!mcInstance && group <= mcGroupCount;
                 ret.set(group, {
                     maxNodes: (multiChannel
                         ? mcInstance
-                        : assocInstance).getMaxNodesCached(group) || 1,
+                        : assocInstance).getMaxNodesCached(this.driver, endpoint, group) || 1,
                     // AGI implies Z-Wave+ where group 1 is the lifeline
                     isLifeline: group === 1,
                     label: 
                     // prefer the configured label if we have one
                     (_f = (_e = assocConfig === null || assocConfig === void 0 ? void 0 : assocConfig.label) !== null && _e !== void 0 ? _e : 
                     // the ones reported by AGI are sometimes pretty bad
-                    agiInstance.getGroupNameCached(group)) !== null && _f !== void 0 ? _f : 
+                    agiInstance.getGroupNameCached(this.driver, endpoint, group)) !== null && _f !== void 0 ? _f : 
                     // but still better than "unnamed"
                     `Unnamed group ${group}`,
                     multiChannel,
-                    profile: agiInstance.getGroupProfileCached(group),
-                    issuedCommands: agiInstance.getIssuedCommandsCached(group),
+                    profile: agiInstance.getGroupProfileCached(this.driver, endpoint, group),
+                    issuedCommands: agiInstance.getIssuedCommandsCached(this.driver, endpoint, group),
                 });
             }
         }
@@ -2255,7 +2249,7 @@ ${associatedNodes.join(", ")}`,
                 ret.set(group, {
                     maxNodes: (multiChannel
                         ? mcInstance
-                        : assocInstance).getMaxNodesCached(group) ||
+                        : assocInstance).getMaxNodesCached(this.driver, endpoint, group) ||
                         (assocConfig === null || assocConfig === void 0 ? void 0 : assocConfig.maxNodes) ||
                         1,
                     isLifeline: (_h = assocConfig === null || assocConfig === void 0 ? void 0 : assocConfig.isLifeline) !== null && _h !== void 0 ? _h : group === 1,
@@ -2291,8 +2285,7 @@ ${associatedNodes.join(", ")}`,
         const endpoint = node.getEndpointOrThrow(endpointIndex);
         const ret = new Map();
         if (endpoint.supportsCC(core_1.CommandClasses.Association)) {
-            const cc = endpoint.createCCInstanceUnsafe(core_1.CommandClasses.Association);
-            const destinations = cc.getAllDestinationsCached();
+            const destinations = AssociationCC_1.AssociationCC.getAllDestinationsCached(this.driver, endpoint);
             for (const [groupId, assocs] of destinations) {
                 ret.set(groupId, assocs);
             }
@@ -2302,8 +2295,7 @@ ${associatedNodes.join(", ")}`,
         }
         // Merge the "normal" destinations with multi channel destinations
         if (endpoint.supportsCC(core_1.CommandClasses["Multi Channel Association"])) {
-            const cc = endpoint.createCCInstanceUnsafe(core_1.CommandClasses["Multi Channel Association"]);
-            const destinations = cc.getAllDestinationsCached();
+            const destinations = MultiChannelAssociationCC_1.MultiChannelAssociationCC.getAllDestinationsCached(this.driver, endpoint);
             for (const [groupId, assocs] of destinations) {
                 if (ret.has(groupId)) {
                     const normalAssociations = ret.get(groupId);
@@ -2367,9 +2359,7 @@ ${associatedNodes.join(", ")}`,
         // The following checks don't apply to Lifeline associations
         if (destination.nodeId === this._ownNodeId)
             return true;
-        const groupCommandList = endpoint
-            .createCCInstanceInternal(core_1.CommandClasses["Association Group Information"])
-            .getIssuedCommandsCached(group);
+        const groupCommandList = AssociationGroupInfoCC_1.AssociationGroupInfoCC.getIssuedCommandsCached(this.driver, endpoint, group);
         if (!groupCommandList || !groupCommandList.size) {
             // We don't know which CCs this group controls, just allow it
             return true;
@@ -2404,20 +2394,19 @@ ${associatedNodes.join(", ")}`,
             .map((a) => a.nodeId));
         const endpointAssociations = destinations.filter((a) => a.endpoint != undefined);
         if (endpoint.supportsCC(core_1.CommandClasses.Association)) {
-            assocInstance = endpoint.createCCInstanceUnsafe(core_1.CommandClasses.Association);
+            assocInstance = AssociationCC_1.AssociationCC;
         }
         else if (nodeAssociations.length > 0) {
             throw new core_1.ZWaveError(`Node ${nodeAndEndpointString} does not support associations!`, core_1.ZWaveErrorCodes.CC_NotSupported);
         }
         if (endpoint.supportsCC(core_1.CommandClasses["Multi Channel Association"])) {
-            mcInstance =
-                endpoint.createCCInstanceUnsafe(core_1.CommandClasses["Multi Channel Association"]);
+            mcInstance = MultiChannelAssociationCC_1.MultiChannelAssociationCC;
         }
         else if (endpointAssociations.length > 0) {
             throw new core_1.ZWaveError(`Node ${nodeAndEndpointString} does not support multi channel associations!`, core_1.ZWaveErrorCodes.CC_NotSupported);
         }
-        const assocGroupCount = (_b = assocInstance === null || assocInstance === void 0 ? void 0 : assocInstance.getGroupCountCached()) !== null && _b !== void 0 ? _b : 0;
-        const mcGroupCount = (_c = mcInstance === null || mcInstance === void 0 ? void 0 : mcInstance.getGroupCountCached()) !== null && _c !== void 0 ? _c : 0;
+        const assocGroupCount = (_b = assocInstance === null || assocInstance === void 0 ? void 0 : assocInstance.getGroupCountCached(this.driver, endpoint)) !== null && _b !== void 0 ? _b : 0;
+        const mcGroupCount = (_c = mcInstance === null || mcInstance === void 0 ? void 0 : mcInstance.getGroupCountCached(this.driver, endpoint)) !== null && _c !== void 0 ? _c : 0;
         const groupCount = Math.max(assocGroupCount, mcGroupCount);
         if (group > groupCount) {
             throw new core_1.ZWaveError(`Group ${group} does not exist on node ${nodeAndEndpointString}`, core_1.ZWaveErrorCodes.AssociationCC_InvalidGroup);
@@ -2487,9 +2476,8 @@ ${associatedNodes.join(", ")}`,
         // To remove a multi channel association, we need to make sure that the group exists
         // and the node supports multi channel associations
         if (endpoint.supportsCC(core_1.CommandClasses["Multi Channel Association"])) {
-            mcInstance =
-                endpoint.createCCInstanceUnsafe(core_1.CommandClasses["Multi Channel Association"]);
-            if (group <= mcInstance.getGroupCountCached()) {
+            mcInstance = MultiChannelAssociationCC_1.MultiChannelAssociationCC;
+            if (group <= mcInstance.getGroupCountCached(this.driver, endpoint)) {
                 groupExistsAsMultiChannel = true;
             }
         }
@@ -2499,8 +2487,9 @@ ${associatedNodes.join(", ")}`,
         // To remove a normal association, we need to make sure that the group exists either as a normal association
         // or as a multi channel association
         if (endpoint.supportsCC(core_1.CommandClasses.Association)) {
-            assocInstance = endpoint.createCCInstanceUnsafe(core_1.CommandClasses.Association);
-            if (group <= assocInstance.getGroupCountCached()) {
+            assocInstance = AssociationCC_1.AssociationCC;
+            if (group <=
+                assocInstance.getGroupCountCached(this.driver, endpoint)) {
                 groupExistsAsNodeAssociation = true;
             }
         }