@zwave-js/cc 13.10.1 → 14.0.0-beta.0

package/build/cc/UserCodeCC.js

@@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var UserCodeCC_1;
+var UserCodeCC_1, UserCodeCCSet_1, UserCodeCCReport_1, UserCodeCCGet_1, UserCodeCCUsersNumberReport_1, UserCodeCCCapabilitiesReport_1, UserCodeCCKeypadModeSet_1, UserCodeCCKeypadModeReport_1, UserCodeCCAdminCodeSet_1, UserCodeCCAdminCodeReport_1, UserCodeCCUserCodeChecksumReport_1, UserCodeCCExtendedUserCodeReport_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserCodeCCExtendedUserCodeGet = exports.UserCodeCCExtendedUserCodeReport = exports.UserCodeCCExtendedUserCodeSet = exports.UserCodeCCUserCodeChecksumGet = exports.UserCodeCCUserCodeChecksumReport = exports.UserCodeCCAdminCodeGet = exports.UserCodeCCAdminCodeReport = exports.UserCodeCCAdminCodeSet = exports.UserCodeCCKeypadModeGet = exports.UserCodeCCKeypadModeReport = exports.UserCodeCCKeypadModeSet = exports.UserCodeCCCapabilitiesGet = exports.UserCodeCCCapabilitiesReport = exports.UserCodeCCUsersNumberGet = exports.UserCodeCCUsersNumberReport = exports.UserCodeCCGet = exports.UserCodeCCReport = exports.UserCodeCCSet = exports.UserCodeCC = exports.UserCodeCCAPI = exports.UserCodeCCValues = void 0;
 exports.userCodeToLogString = userCodeToLogString;
@@ -335,11 +335,12 @@ function validateCode(code, supportedChars) {
         return false;
     return [...code].every((char) => supportedChars.includes(char));
 }
-function setUserCodeMetadata(applHost, userId, userCode) {
+function setUserCodeMetadata(ctx, userId, userCode) {
     const statusValue = exports.UserCodeCCValues.userIdStatus(userId);
     const codeValue = exports.UserCodeCCValues.userCode(userId);
-    const supportedUserIDStatuses = this.getValue(applHost, exports.UserCodeCCValues.supportedUserIDStatuses)
-        ?? (this.version === 1
+    const ccVersion = (0, CommandClass_1.getEffectiveCCVersion)(ctx, this);
+    const supportedUserIDStatuses = this.getValue(ctx, exports.UserCodeCCValues.supportedUserIDStatuses)
+        ?? (ccVersion === 1
             ? [
                 _Types_1.UserIDStatus.Available,
                 _Types_1.UserIDStatus.Enabled,
@@ -352,7 +353,7 @@ function setUserCodeMetadata(applHost, userId, userCode) {
                 _Types_1.UserIDStatus.Messaging,
                 _Types_1.UserIDStatus.PassageMode,
             ]);
-    this.ensureMetadata(applHost, statusValue, {
+    this.ensureMetadata(ctx, statusValue, {
         ...statusValue.meta,
         states: (0, safe_1.enumValuesToMetadataStates)(_Types_1.UserIDStatus, supportedUserIDStatuses),
     });
@@ -364,26 +365,26 @@ function setUserCodeMetadata(applHost, userId, userCode) {
         maxLength: 10,
         label: `User Code (${userId})`,
     };
-    if (this.getMetadata(applHost, codeValue)?.type !== codeMetadata.type) {
-        this.setMetadata(applHost, codeValue, codeMetadata);
+    if (this.getMetadata(ctx, codeValue)?.type !== codeMetadata.type) {
+        this.setMetadata(ctx, codeValue, codeMetadata);
     }
 }
-function persistUserCode(applHost, userId, userIdStatus, userCode) {
+function persistUserCode(ctx, userId, userIdStatus, userCode) {
     const statusValue = exports.UserCodeCCValues.userIdStatus(userId);
     const codeValue = exports.UserCodeCCValues.userCode(userId);
     // Check if this code is supported
     if (userIdStatus === _Types_1.UserIDStatus.StatusNotAvailable) {
         // It is not, remove all values if any exist
-        this.removeValue(applHost, statusValue);
-        this.removeValue(applHost, codeValue);
-        this.removeMetadata(applHost, statusValue);
-        this.removeMetadata(applHost, codeValue);
+        this.removeValue(ctx, statusValue);
+        this.removeValue(ctx, codeValue);
+        this.removeMetadata(ctx, statusValue);
+        this.removeMetadata(ctx, codeValue);
     }
     else {
         // Always create metadata in case it does not exist
-        setUserCodeMetadata.call(this, applHost, userId, userCode);
-        this.setValue(applHost, statusValue, userIdStatus);
-        this.setValue(applHost, codeValue, userCode);
+        setUserCodeMetadata.call(this, ctx, userId, userCode);
+        this.setValue(ctx, statusValue, userIdStatus);
+        this.setValue(ctx, codeValue, userCode);
     }
     return true;
 }
@@ -511,11 +512,11 @@ let UserCodeCCAPI = class UserCodeCCAPI extends API_1.PhysicalCCAPI {
     }
     async getUsersCount() {
         this.assertSupportsCommand(_Types_1.UserCodeCommand, _Types_1.UserCodeCommand.UsersNumberGet);
-        const cc = new UserCodeCCUsersNumberGet(this.applHost, {
+        const cc = new UserCodeCCUsersNumberGet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
         });
-        const response = await this.applHost.sendCommand(cc, this.commandOptions);
+        const response = await this.host.sendCommand(cc, this.commandOptions);
         return response?.supportedUsers;
     }
     async get(userId, multiple = false) {
@@ -523,13 +524,13 @@ let UserCodeCCAPI = class UserCodeCCAPI extends API_1.PhysicalCCAPI {
         __assertType("multiple", "(optional) boolean", __assertType__optional_boolean.bind(void 0, multiple));
         if (userId > 255 || multiple) {
             this.assertSupportsCommand(_Types_1.UserCodeCommand, _Types_1.UserCodeCommand.ExtendedUserCodeGet);
-            const cc = new UserCodeCCExtendedUserCodeGet(this.applHost, {
+            const cc = new UserCodeCCExtendedUserCodeGet({
                 nodeId: this.endpoint.nodeId,
-                endpoint: this.endpoint.index,
+                endpointIndex: this.endpoint.index,
                 userId,
                 reportMore: multiple,
             });
-            const response = await this.applHost.sendCommand(cc, this.commandOptions);
+            const response = await this.host.sendCommand(cc, this.commandOptions);
             if (!response) {
                 return;
             }
@@ -545,12 +546,12 @@ let UserCodeCCAPI = class UserCodeCCAPI extends API_1.PhysicalCCAPI {
         }
         else {
             this.assertSupportsCommand(_Types_1.UserCodeCommand, _Types_1.UserCodeCommand.Get);
-            const cc = new UserCodeCCGet(this.applHost, {
+            const cc = new UserCodeCCGet({
                 nodeId: this.endpoint.nodeId,
-                endpoint: this.endpoint.index,
+                endpointIndex: this.endpoint.index,
                 userId,
             });
-            const response = await this.applHost.sendCommand(cc, this.commandOptions);
+            const response = await this.host.sendCommand(cc, this.commandOptions);
             if (response)
                 return (0, safe_2.pick)(response, ["userIdStatus", "userCode"]);
         }
@@ -564,27 +565,27 @@ let UserCodeCCAPI = class UserCodeCCAPI extends API_1.PhysicalCCAPI {
             return this.setMany([{ userId, userIdStatus, userCode }]);
         }
         this.assertSupportsCommand(_Types_1.UserCodeCommand, _Types_1.UserCodeCommand.Set);
-        const numUsers = UserCodeCC.getSupportedUsersCached(this.applHost, this.endpoint);
+        const numUsers = UserCodeCC.getSupportedUsersCached(this.host, this.endpoint);
         if (numUsers != undefined && userId > numUsers) {
             throw new safe_1.ZWaveError(`The user ID must be between 0 and the number of supported users ${numUsers}.`, safe_1.ZWaveErrorCodes.Argument_Invalid);
         }
-        const cc = new UserCodeCCSet(this.applHost, {
+        const cc = new UserCodeCCSet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             userId,
             userIdStatus,
             userCode,
         });
-        return this.applHost.sendCommand(cc, this.commandOptions);
+        return this.host.sendCommand(cc, this.commandOptions);
     }
     /** Configures multiple user codes */
     async setMany(codes) {
         __assertType("codes", undefined, __assertType__sa_su__3__4__5_eu_ea_2.bind(void 0, codes));
         this.assertSupportsCommand(_Types_1.UserCodeCommand, _Types_1.UserCodeCommand.ExtendedUserCodeSet);
-        const numUsers = UserCodeCC.getSupportedUsersCached(this.applHost, this.endpoint);
-        const supportedStatuses = UserCodeCC.getSupportedUserIDStatusesCached(this.applHost, this.endpoint);
-        const supportedASCIIChars = UserCodeCC.getSupportedASCIICharsCached(this.applHost, this.endpoint);
-        const supportsMultipleUserCodeSet = UserCodeCC.supportsMultipleUserCodeSetCached(this.applHost, this.endpoint) ?? false;
+        const numUsers = UserCodeCC.getSupportedUsersCached(this.host, this.endpoint);
+        const supportedStatuses = UserCodeCC.getSupportedUserIDStatusesCached(this.host, this.endpoint);
+        const supportedASCIIChars = UserCodeCC.getSupportedASCIICharsCached(this.host, this.endpoint);
+        const supportsMultipleUserCodeSet = UserCodeCC.supportsMultipleUserCodeSetCached(this.host, this.endpoint) ?? false;
         // Validate options
         if (numUsers != undefined) {
             if (codes.some((code) => code.userId < 0 || code.userId > numUsers)) {
@@ -620,12 +621,12 @@ let UserCodeCCAPI = class UserCodeCCAPI extends API_1.PhysicalCCAPI {
                 }
             }
         }
-        const cc = new UserCodeCCExtendedUserCodeSet(this.applHost, {
+        const cc = new UserCodeCCExtendedUserCodeSet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             userCodes: codes,
         });
-        return this.applHost.sendCommand(cc, this.commandOptions);
+        return this.host.sendCommand(cc, this.commandOptions);
     }
     /**
      * Clears one or all user code
@@ -640,27 +641,27 @@ let UserCodeCCAPI = class UserCodeCCAPI extends API_1.PhysicalCCAPI {
         }
         else {
             this.assertSupportsCommand(_Types_1.UserCodeCommand, _Types_1.UserCodeCommand.Set);
-            const numUsers = UserCodeCC.getSupportedUsersCached(this.applHost, this.endpoint);
+            const numUsers = UserCodeCC.getSupportedUsersCached(this.host, this.endpoint);
             if (numUsers != undefined && userId > numUsers) {
                 throw new safe_1.ZWaveError(`The user ID must be between 0 and the number of supported users ${numUsers}.`, safe_1.ZWaveErrorCodes.Argument_Invalid);
             }
-            const cc = new UserCodeCCSet(this.applHost, {
+            const cc = new UserCodeCCSet({
                 nodeId: this.endpoint.nodeId,
-                endpoint: this.endpoint.index,
+                endpointIndex: this.endpoint.index,
                 userId,
                 userIdStatus: _Types_1.UserIDStatus.Available,
             });
-            return this.applHost.sendCommand(cc, this.commandOptions);
+            return this.host.sendCommand(cc, this.commandOptions);
         }
     }
     // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
     async getCapabilities() {
         this.assertSupportsCommand(_Types_1.UserCodeCommand, _Types_1.UserCodeCommand.CapabilitiesGet);
-        const cc = new UserCodeCCCapabilitiesGet(this.applHost, {
+        const cc = new UserCodeCCCapabilitiesGet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
         });
-        const response = await this.applHost.sendCommand(cc, this.commandOptions);
+        const response = await this.host.sendCommand(cc, this.commandOptions);
         if (response) {
             return (0, safe_2.pick)(response, [
                 "supportsAdminCode",
@@ -676,50 +677,50 @@ let UserCodeCCAPI = class UserCodeCCAPI extends API_1.PhysicalCCAPI {
     }
     async getKeypadMode() {
         this.assertSupportsCommand(_Types_1.UserCodeCommand, _Types_1.UserCodeCommand.KeypadModeGet);
-        const cc = new UserCodeCCKeypadModeGet(this.applHost, {
+        const cc = new UserCodeCCKeypadModeGet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
         });
-        const response = await this.applHost.sendCommand(cc, this.commandOptions);
+        const response = await this.host.sendCommand(cc, this.commandOptions);
         return response?.keypadMode;
     }
     async setKeypadMode(keypadMode) {
         __assertType("keypadMode", "KeypadMode", __assertType__KeypadMode.bind(void 0, keypadMode));
         this.assertSupportsCommand(_Types_1.UserCodeCommand, _Types_1.UserCodeCommand.KeypadModeSet);
-        const supportedModes = UserCodeCC.getSupportedKeypadModesCached(this.applHost, this.endpoint);
+        const supportedModes = UserCodeCC.getSupportedKeypadModesCached(this.host, this.endpoint);
         if (!supportedModes) {
             throw new safe_1.ZWaveError(`The keypad mode can only be set after the interview is complete!`, safe_1.ZWaveErrorCodes.Argument_Invalid);
         }
         else if (!supportedModes.includes(keypadMode)) {
             throw new safe_1.ZWaveError(`The keypad mode ${(0, safe_2.getEnumMemberName)(_Types_1.KeypadMode, keypadMode)} is not supported by the node!`, safe_1.ZWaveErrorCodes.Argument_Invalid);
         }
-        const cc = new UserCodeCCKeypadModeSet(this.applHost, {
+        const cc = new UserCodeCCKeypadModeSet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             keypadMode,
         });
-        return this.applHost.sendCommand(cc, this.commandOptions);
+        return this.host.sendCommand(cc, this.commandOptions);
     }
     async getAdminCode() {
         this.assertSupportsCommand(_Types_1.UserCodeCommand, _Types_1.UserCodeCommand.AdminCodeGet);
-        const cc = new UserCodeCCAdminCodeGet(this.applHost, {
+        const cc = new UserCodeCCAdminCodeGet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
         });
-        const response = await this.applHost.sendCommand(cc, this.commandOptions);
+        const response = await this.host.sendCommand(cc, this.commandOptions);
         return response?.adminCode;
     }
     async setAdminCode(adminCode) {
         __assertType("adminCode", "string", __assertType__string.bind(void 0, adminCode));
         this.assertSupportsCommand(_Types_1.UserCodeCommand, _Types_1.UserCodeCommand.AdminCodeSet);
-        const supportedASCIIChars = UserCodeCC.getSupportedASCIICharsCached(this.applHost, this.endpoint);
+        const supportedASCIIChars = UserCodeCC.getSupportedASCIICharsCached(this.host, this.endpoint);
         if (!supportedASCIIChars) {
             throw new safe_1.ZWaveError(`The admin code can only be set after the interview is complete!`, safe_1.ZWaveErrorCodes.Argument_Invalid);
         }
         // Validate the code
         if (!adminCode) {
             const supportsDeactivation = UserCodeCC
-                .supportsAdminCodeDeactivationCached(this.applHost, this.endpoint);
+                .supportsAdminCodeDeactivationCached(this.host, this.endpoint);
             if (!supportsDeactivation) {
                 throw new safe_1.ZWaveError(`The node does not support deactivating the admin code!`, safe_1.ZWaveErrorCodes.Argument_Invalid);
             }
@@ -727,20 +728,20 @@ let UserCodeCCAPI = class UserCodeCCAPI extends API_1.PhysicalCCAPI {
         else if (!validateCode(adminCode, supportedASCIIChars)) {
             throw new safe_1.ZWaveError(`The admin code must consist of 4 to 10 of the following characters: ${supportedASCIIChars}`, safe_1.ZWaveErrorCodes.Argument_Invalid);
         }
-        const cc = new UserCodeCCAdminCodeSet(this.applHost, {
+        const cc = new UserCodeCCAdminCodeSet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             adminCode,
         });
-        return this.applHost.sendCommand(cc, this.commandOptions);
+        return this.host.sendCommand(cc, this.commandOptions);
     }
     async getUserCodeChecksum() {
         this.assertSupportsCommand(_Types_1.UserCodeCommand, _Types_1.UserCodeCommand.UserCodeChecksumGet);
-        const cc = new UserCodeCCUserCodeChecksumGet(this.applHost, {
+        const cc = new UserCodeCCUserCodeChecksumGet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
         });
-        const response = await this.applHost.sendCommand(cc, this.commandOptions);
+        const response = await this.host.sendCommand(cc, this.commandOptions);
         return response?.userCodeChecksum;
     }
 };
@@ -749,26 +750,26 @@ exports.UserCodeCCAPI = UserCodeCCAPI = __decorate([
     (0, CommandClassDecorators_1.API)(safe_1.CommandClasses["User Code"])
 ], UserCodeCCAPI);
 let UserCodeCC = UserCodeCC_1 = class UserCodeCC extends CommandClass_1.CommandClass {
-    async interview(applHost) {
-        const node = this.getNode(applHost);
-        const endpoint = this.getEndpoint(applHost);
-        const api = API_1.CCAPI.create(safe_1.CommandClasses["User Code"], applHost, endpoint).withOptions({
+    async interview(ctx) {
+        const node = this.getNode(ctx);
+        const endpoint = this.getEndpoint(ctx);
+        const api = API_1.CCAPI.create(safe_1.CommandClasses["User Code"], ctx, endpoint).withOptions({
             priority: safe_1.MessagePriority.NodeQuery,
         });
-        applHost.controllerLog.logNode(node.id, {
+        ctx.logNode(node.id, {
             endpoint: this.endpointIndex,
             message: `Interviewing ${this.ccName}...`,
             direction: "none",
         });
         // Query capabilities first to determine what needs to be done when refreshing
-        if (this.version >= 2) {
-            applHost.controllerLog.logNode(node.id, {
+        if (api.version >= 2) {
+            ctx.logNode(node.id, {
                 message: "querying capabilities...",
                 direction: "outbound",
             });
             const caps = await api.getCapabilities();
             if (!caps) {
-                applHost.controllerLog.logNode(node.id, {
+                ctx.logNode(node.id, {
                     endpoint: this.endpointIndex,
                     message: "User Code capabilities query timed out, skipping interview...",
                     level: "warn",
@@ -776,13 +777,13 @@ let UserCodeCC = UserCodeCC_1 = class UserCodeCC extends CommandClass_1.CommandC
                 return;
             }
         }
-        applHost.controllerLog.logNode(node.id, {
+        ctx.logNode(node.id, {
             message: "querying number of user codes...",
             direction: "outbound",
         });
         const supportedUsers = await api.getUsersCount();
         if (supportedUsers == undefined) {
-            applHost.controllerLog.logNode(node.id, {
+            ctx.logNode(node.id, {
                 endpoint: this.endpointIndex,
                 message: "Querying number of user codes timed out, skipping interview...",
                 level: "warn",
@@ -790,47 +791,47 @@ let UserCodeCC = UserCodeCC_1 = class UserCodeCC extends CommandClass_1.CommandC
             return;
         }
         for (let userId = 1; userId <= supportedUsers; userId++) {
-            setUserCodeMetadata.call(this, applHost, userId);
+            setUserCodeMetadata.call(this, ctx, userId);
         }
         // Synchronize user codes and settings
-        if (applHost.options.interview?.queryAllUserCodes) {
-            await this.refreshValues(applHost);
+        if (ctx.getInterviewOptions()?.queryAllUserCodes) {
+            await this.refreshValues(ctx);
         }
         // Remember that the interview is complete
-        this.setInterviewComplete(applHost, true);
+        this.setInterviewComplete(ctx, true);
     }
-    async refreshValues(applHost) {
-        const node = this.getNode(applHost);
-        const endpoint = this.getEndpoint(applHost);
-        const api = API_1.CCAPI.create(safe_1.CommandClasses["User Code"], applHost, endpoint).withOptions({
+    async refreshValues(ctx) {
+        const node = this.getNode(ctx);
+        const endpoint = this.getEndpoint(ctx);
+        const api = API_1.CCAPI.create(safe_1.CommandClasses["User Code"], ctx, endpoint).withOptions({
             priority: safe_1.MessagePriority.NodeQuery,
         });
-        const supportsAdminCode = UserCodeCC_1.supportsAdminCodeCached(applHost, endpoint);
-        const supportsUserCodeChecksum = this.getValue(applHost, exports.UserCodeCCValues.supportsUserCodeChecksum) ?? false;
-        const supportedKeypadModes = this.getValue(applHost, exports.UserCodeCCValues.supportedKeypadModes)
+        const supportsAdminCode = UserCodeCC_1.supportsAdminCodeCached(ctx, endpoint);
+        const supportsUserCodeChecksum = this.getValue(ctx, exports.UserCodeCCValues.supportsUserCodeChecksum) ?? false;
+        const supportedKeypadModes = this.getValue(ctx, exports.UserCodeCCValues.supportedKeypadModes)
             ?? [];
-        const supportedUsers = this.getValue(applHost, exports.UserCodeCCValues.supportedUsers) ?? 0;
-        const supportsMultipleUserCodeReport = !!this.getValue(applHost, exports.UserCodeCCValues.supportsMultipleUserCodeReport);
+        const supportedUsers = this.getValue(ctx, exports.UserCodeCCValues.supportedUsers) ?? 0;
+        const supportsMultipleUserCodeReport = !!this.getValue(ctx, exports.UserCodeCCValues.supportsMultipleUserCodeReport);
         // Check for changed values and codes
-        if (this.version >= 2) {
+        if (api.version >= 2) {
             if (supportsAdminCode) {
-                applHost.controllerLog.logNode(node.id, {
+                ctx.logNode(node.id, {
                     message: "querying admin code...",
                     direction: "outbound",
                 });
                 await api.getAdminCode();
             }
             if (supportedKeypadModes.length > 1) {
-                applHost.controllerLog.logNode(node.id, {
+                ctx.logNode(node.id, {
                     message: "querying active keypad mode...",
                     direction: "outbound",
                 });
                 await api.getKeypadMode();
             }
-            const storedUserCodeChecksum = this.getValue(applHost, exports.UserCodeCCValues.userCodeChecksum) ?? 0;
+            const storedUserCodeChecksum = this.getValue(ctx, exports.UserCodeCCValues.userCodeChecksum) ?? 0;
             let currentUserCodeChecksum = 0;
             if (supportsUserCodeChecksum) {
-                applHost.controllerLog.logNode(node.id, {
+                ctx.logNode(node.id, {
                     message: "retrieving current user code checksum...",
                     direction: "outbound",
                 });
@@ -838,7 +839,7 @@ let UserCodeCC = UserCodeCC_1 = class UserCodeCC extends CommandClass_1.CommandC
             }
             if (!supportsUserCodeChecksum
                 || currentUserCodeChecksum !== storedUserCodeChecksum) {
-                applHost.controllerLog.logNode(node.id, {
+                ctx.logNode(node.id, {
                     message: "checksum changed or is not supported, querying all user codes...",
                     direction: "outbound",
                 });
@@ -851,7 +852,7 @@ let UserCodeCC = UserCodeCC_1 = class UserCodeCC extends CommandClass_1.CommandC
                             nextUserId = response.nextUserId;
                         }
                         else {
-                            applHost.controllerLog.logNode(node.id, {
+                            ctx.logNode(node.id, {
                                 endpoint: this.endpointIndex,
                                 message: `Querying user code #${nextUserId} timed out, skipping the remaining interview...`,
                                 level: "warn",
@@ -870,7 +871,7 @@ let UserCodeCC = UserCodeCC_1 = class UserCodeCC extends CommandClass_1.CommandC
         }
         else {
             // V1
-            applHost.controllerLog.logNode(node.id, {
+            ctx.logNode(node.id, {
                 message: "querying all user codes...",
                 direction: "outbound",
             });
@@ -883,8 +884,8 @@ let UserCodeCC = UserCodeCC_1 = class UserCodeCC extends CommandClass_1.CommandC
      * Returns the number of supported users.
      * This only works AFTER the interview process
      */
-    static getSupportedUsersCached(applHost, endpoint) {
-        return applHost
+    static getSupportedUsersCached(ctx, endpoint) {
+        return ctx
             .getValueDB(endpoint.nodeId)
             .getValue(exports.UserCodeCCValues.supportedUsers.endpoint(endpoint.index));
     }
@@ -892,8 +893,8 @@ let UserCodeCC = UserCodeCC_1 = class UserCodeCC extends CommandClass_1.CommandC
      * Returns the supported keypad modes.
      * This only works AFTER the interview process
      */
-    static getSupportedKeypadModesCached(applHost, endpoint) {
-        return applHost
+    static getSupportedKeypadModesCached(ctx, endpoint) {
+        return ctx
             .getValueDB(endpoint.nodeId)
             .getValue(exports.UserCodeCCValues.supportedKeypadModes.endpoint(endpoint.index));
     }
@@ -901,8 +902,8 @@ let UserCodeCC = UserCodeCC_1 = class UserCodeCC extends CommandClass_1.CommandC
      * Returns the supported user ID statuses.
      * This only works AFTER the interview process
      */
-    static getSupportedUserIDStatusesCached(applHost, endpoint) {
-        return applHost
+    static getSupportedUserIDStatusesCached(ctx, endpoint) {
+        return ctx
             .getValueDB(endpoint.nodeId)
             .getValue(exports.UserCodeCCValues.supportedUserIDStatuses.endpoint(endpoint.index));
     }
@@ -910,8 +911,8 @@ let UserCodeCC = UserCodeCC_1 = class UserCodeCC extends CommandClass_1.CommandC
      * Returns the supported ASCII characters.
      * This only works AFTER the interview process
      */
-    static getSupportedASCIICharsCached(applHost, endpoint) {
-        return applHost
+    static getSupportedASCIICharsCached(ctx, endpoint) {
+        return ctx
             .getValueDB(endpoint.nodeId)
             .getValue(exports.UserCodeCCValues.supportedASCIIChars.endpoint(endpoint.index));
     }
@@ -919,8 +920,8 @@ let UserCodeCC = UserCodeCC_1 = class UserCodeCC extends CommandClass_1.CommandC
      * Returns whether the admin code functionality is supported.
      * This only works AFTER the interview process
      */
-    static supportsAdminCodeCached(applHost, endpoint) {
-        const valueDB = applHost
+    static supportsAdminCodeCached(ctx, endpoint) {
+        const valueDB = ctx
             .getValueDB(endpoint.nodeId);
         return valueDB.getValue(exports.UserCodeCCValues.supportsAdminCode.endpoint(endpoint.index)) ?? valueDB.getValue(exports.UserCodeCCValues._deprecated_supportsMasterCode.endpoint(endpoint.index)) ?? false;
     }
@@ -928,8 +929,8 @@ let UserCodeCC = UserCodeCC_1 = class UserCodeCC extends CommandClass_1.CommandC
      * Returns whether deactivating the admin code is supported.
      * This only works AFTER the interview process
      */
-    static supportsAdminCodeDeactivationCached(applHost, endpoint) {
-        const valueDB = applHost
+    static supportsAdminCodeDeactivationCached(ctx, endpoint) {
+        const valueDB = ctx
             .getValueDB(endpoint.nodeId);
         return valueDB.getValue(exports.UserCodeCCValues.supportsAdminCodeDeactivation.endpoint(endpoint.index)) ?? valueDB.getValue(exports.UserCodeCCValues._deprecated_supportsMasterCodeDeactivation
             .endpoint(endpoint.index)) ?? false;
@@ -938,8 +939,8 @@ let UserCodeCC = UserCodeCC_1 = class UserCodeCC extends CommandClass_1.CommandC
      * Returns whether setting multiple user codes at once is supported.
      * This only works AFTER the interview process
      */
-    static supportsMultipleUserCodeSetCached(applHost, endpoint) {
-        return !!applHost
+    static supportsMultipleUserCodeSetCached(ctx, endpoint) {
+        return !!ctx
             .getValueDB(endpoint.nodeId)
             .getValue(exports.UserCodeCCValues.supportsMultipleUserCodeSet.endpoint(endpoint.index));
     }
@@ -947,8 +948,8 @@ let UserCodeCC = UserCodeCC_1 = class UserCodeCC extends CommandClass_1.CommandC
      * Returns the current status of a user ID.
      * This only works AFTER the user IDs have been queried.
      */
-    static getUserIdStatusCached(applHost, endpoint, userId) {
-        return applHost
+    static getUserIdStatusCached(ctx, endpoint, userId) {
+        return ctx
             .getValueDB(endpoint.nodeId)
             .getValue(exports.UserCodeCCValues.userIdStatus(userId).endpoint(endpoint.index));
     }
@@ -956,8 +957,8 @@ let UserCodeCC = UserCodeCC_1 = class UserCodeCC extends CommandClass_1.CommandC
      * Returns the current code belonging to a user ID.
      * This only works AFTER the user IDs have been queried.
      */
-    static getUserCodeCached(applHost, endpoint, userId) {
-        return applHost
+    static getUserCodeCached(ctx, endpoint, userId) {
+        return ctx
             .getValueDB(endpoint.nodeId)
             .getValue(exports.UserCodeCCValues.userCode(userId).endpoint(endpoint.index));
     }
@@ -968,61 +969,69 @@ exports.UserCodeCC = UserCodeCC = UserCodeCC_1 = __decorate([
     (0, CommandClassDecorators_1.implementedVersion)(2),
     (0, CommandClassDecorators_1.ccValues)(exports.UserCodeCCValues)
 ], UserCodeCC);
-let UserCodeCCSet = class UserCodeCCSet extends UserCodeCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 2);
-            this.userId = this.payload[0];
-            this.userIdStatus = this.payload[1];
-            if (this.userIdStatus !== _Types_1.UserIDStatus.Available
-                && this.userIdStatus !== _Types_1.UserIDStatus.StatusNotAvailable) {
-                this.userCode = this.payload.subarray(2);
-            }
-            else {
-                this.userCode = Buffer.alloc(4, 0x00);
-            }
+let UserCodeCCSet = UserCodeCCSet_1 = class UserCodeCCSet extends UserCodeCC {
+    constructor(options) {
+        super(options);
+        this.userId = options.userId;
+        this.userIdStatus = options.userIdStatus;
+        // Validate options
+        if (this.userId < 0) {
+            throw new safe_1.ZWaveError(`${this.constructor.name}: The user ID must be between greater than 0.`, safe_1.ZWaveErrorCodes.Argument_Invalid);
+        }
+        else if (this.userId === 0
+            && this.userIdStatus !== _Types_1.UserIDStatus.Available) {
+            throw new safe_1.ZWaveError(`${this.constructor.name}: User ID 0 may only be used to clear all user codes`, safe_1.ZWaveErrorCodes.Argument_Invalid);
+        }
+        else if (this.userIdStatus === _Types_1.UserIDStatus.Available) {
+            this.userCode = "\0".repeat(4);
         }
         else {
-            this.userId = options.userId;
-            this.userIdStatus = options.userIdStatus;
-            // Validate options
-            if (this.userId < 0) {
-                throw new safe_1.ZWaveError(`${this.constructor.name}: The user ID must be between greater than 0.`, safe_1.ZWaveErrorCodes.Argument_Invalid);
-            }
-            else if (this.userId === 0
-                && this.userIdStatus !== _Types_1.UserIDStatus.Available) {
-                throw new safe_1.ZWaveError(`${this.constructor.name}: User ID 0 may only be used to clear all user codes`, safe_1.ZWaveErrorCodes.Argument_Invalid);
-            }
-            else if (this.userIdStatus === _Types_1.UserIDStatus.Available) {
-                this.userCode = "\0".repeat(4);
-            }
-            else {
-                this.userCode = options.userCode;
-                // Specs say ASCII 0-9, manufacturers don't care :)
-                if (this.userCode.length < 4 || this.userCode.length > 10) {
-                    throw new safe_1.ZWaveError(`${this.constructor.name}: The user code must have a length of 4 to 10 ${typeof this.userCode === "string"
-                        ? "characters"
-                        : "bytes"}`, safe_1.ZWaveErrorCodes.Argument_Invalid);
-                }
+            this.userCode = options.userCode;
+            // Specs say ASCII 0-9, manufacturers don't care :)
+            if (this.userCode.length < 4 || this.userCode.length > 10) {
+                throw new safe_1.ZWaveError(`${this.constructor.name}: The user code must have a length of 4 to 10 ${typeof this.userCode === "string"
+                    ? "characters"
+                    : "bytes"}`, safe_1.ZWaveErrorCodes.Argument_Invalid);
             }
         }
     }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 2);
+        const userId = raw.payload[0];
+        const userIdStatus = raw.payload[1];
+        if (userIdStatus === _Types_1.UserIDStatus.StatusNotAvailable) {
+            safe_1.validatePayload.fail("Invalid user ID status");
+        }
+        if (userIdStatus === _Types_1.UserIDStatus.Available) {
+            return new UserCodeCCSet_1({
+                nodeId: ctx.sourceNodeId,
+                userId,
+                userIdStatus,
+            });
+        }
+        const userCode = raw.payload.subarray(2);
+        return new UserCodeCCSet_1({
+            nodeId: ctx.sourceNodeId,
+            userId,
+            userIdStatus,
+            userCode,
+        });
+    }
     userId;
     userIdStatus;
     userCode;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.concat([
             Buffer.from([this.userId, this.userIdStatus]),
             typeof this.userCode === "string"
                 ? Buffer.from(this.userCode, "ascii")
                 : this.userCode,
         ]);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: {
                 "user id": this.userId,
                 "id status": (0, safe_2.getEnumMemberName)(_Types_1.UserIDStatus, this.userIdStatus),
@@ -1032,63 +1041,67 @@ let UserCodeCCSet = class UserCodeCCSet extends UserCodeCC {
     }
 };
 exports.UserCodeCCSet = UserCodeCCSet;
-exports.UserCodeCCSet = UserCodeCCSet = __decorate([
+exports.UserCodeCCSet = UserCodeCCSet = UserCodeCCSet_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.UserCodeCommand.Set),
     (0, CommandClassDecorators_1.useSupervision)()
 ], UserCodeCCSet);
-let UserCodeCCReport = class UserCodeCCReport extends UserCodeCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 2);
-            this.userId = this.payload[0];
-            this.userIdStatus = this.payload[1];
-            if (this.payload.length === 2
-                && (this.userIdStatus === _Types_1.UserIDStatus.Available
-                    || this.userIdStatus === _Types_1.UserIDStatus.StatusNotAvailable)) {
-                // The user code is not set or not available and this report contains no user code
-                this.userCode = "";
+let UserCodeCCReport = UserCodeCCReport_1 = class UserCodeCCReport extends UserCodeCC {
+    constructor(options) {
+        super(options);
+        this.userId = options.userId;
+        this.userIdStatus = options.userIdStatus;
+        this.userCode = options.userCode ?? "";
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 2);
+        const userId = raw.payload[0];
+        const userIdStatus = raw.payload[1];
+        let userCode;
+        if (raw.payload.length === 2
+            && (userIdStatus === _Types_1.UserIDStatus.Available
+                || userIdStatus === _Types_1.UserIDStatus.StatusNotAvailable)) {
+            // The user code is not set or not available and this report contains no user code
+            userCode = "";
+        }
+        else {
+            // The specs require the user code to be at least 4 digits
+            (0, safe_1.validatePayload)(raw.payload.length >= 6);
+            let userCodeBuffer = raw.payload.subarray(2);
+            // Specs say infer user code from payload length, manufacturers send zero-padded strings
+            while (userCodeBuffer.at(-1) === 0) {
+                userCodeBuffer = userCodeBuffer.subarray(0, -1);
+            }
+            // Specs say ASCII 0-9, manufacturers don't care :)
+            // Thus we check if the code is printable using ASCII, if not keep it as a Buffer
+            const userCodeString = userCodeBuffer.toString("utf8");
+            if ((0, safe_2.isPrintableASCII)(userCodeString)) {
+                userCode = userCodeString;
+            }
+            else if ((0, safe_2.isPrintableASCIIWithWhitespace)(userCodeString)) {
+                // Ignore leading and trailing whitespace in V1 reports if the rest is ASCII
+                userCode = userCodeString.trim();
             }
             else {
-                // The specs require the user code to be at least 4 digits
-                (0, safe_1.validatePayload)(this.payload.length >= 6);
-                let userCodeBuffer = this.payload.subarray(2);
-                // Specs say infer user code from payload length, manufacturers send zero-padded strings
-                while (userCodeBuffer.at(-1) === 0) {
-                    userCodeBuffer = userCodeBuffer.subarray(0, -1);
-                }
-                // Specs say ASCII 0-9, manufacturers don't care :)
-                // Thus we check if the code is printable using ASCII, if not keep it as a Buffer
-                const userCodeString = userCodeBuffer.toString("utf8");
-                if ((0, safe_2.isPrintableASCII)(userCodeString)) {
-                    this.userCode = userCodeString;
-                }
-                else if (this.version === 1
-                    && (0, safe_2.isPrintableASCIIWithWhitespace)(userCodeString)) {
-                    // Ignore leading and trailing whitespace in V1 reports if the rest is ASCII
-                    this.userCode = userCodeString.trim();
-                }
-                else {
-                    this.userCode = userCodeBuffer;
-                }
+                userCode = userCodeBuffer;
             }
         }
-        else {
-            this.userId = options.userId;
-            this.userIdStatus = options.userIdStatus;
-            this.userCode = options.userCode ?? "";
-        }
+        return new UserCodeCCReport_1({
+            nodeId: ctx.sourceNodeId,
+            userId,
+            userIdStatus,
+            userCode,
+        });
     }
     userId;
     userIdStatus;
     userCode;
-    persistValues(applHost) {
-        if (!super.persistValues(applHost))
+    persistValues(ctx) {
+        if (!super.persistValues(ctx))
             return false;
-        persistUserCode.call(this, applHost, this.userId, this.userIdStatus, this.userCode);
+        persistUserCode.call(this, ctx, this.userId, this.userIdStatus, this.userCode);
         return true;
     }
-    serialize() {
+    serialize(ctx) {
         let userCodeBuffer;
         if (typeof this.userCode === "string") {
             userCodeBuffer = Buffer.from(this.userCode, "ascii");
@@ -1100,11 +1113,11 @@ let UserCodeCCReport = class UserCodeCCReport extends UserCodeCC {
             Buffer.from([this.userId, this.userIdStatus]),
             userCodeBuffer,
         ]);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: {
                 "user id": this.userId,
                 "id status": (0, safe_2.getEnumMemberName)(_Types_1.UserIDStatus, this.userIdStatus),
@@ -1118,66 +1131,71 @@ let UserCodeCCReport = class UserCodeCCReport extends UserCodeCC {
     }
 };
 exports.UserCodeCCReport = UserCodeCCReport;
-exports.UserCodeCCReport = UserCodeCCReport = __decorate([
+exports.UserCodeCCReport = UserCodeCCReport = UserCodeCCReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.UserCodeCommand.Report)
 ], UserCodeCCReport);
-let UserCodeCCGet = class UserCodeCCGet extends UserCodeCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 1);
-            this.userId = this.payload[0];
-        }
-        else {
-            this.userId = options.userId;
-        }
+let UserCodeCCGet = UserCodeCCGet_1 = class UserCodeCCGet extends UserCodeCC {
+    constructor(options) {
+        super(options);
+        this.userId = options.userId;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 1);
+        const userId = raw.payload[0];
+        return new UserCodeCCGet_1({
+            nodeId: ctx.sourceNodeId,
+            userId,
+        });
     }
     userId;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.from([this.userId]);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: { "user id": this.userId },
         };
     }
 };
 exports.UserCodeCCGet = UserCodeCCGet;
-exports.UserCodeCCGet = UserCodeCCGet = __decorate([
+exports.UserCodeCCGet = UserCodeCCGet = UserCodeCCGet_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.UserCodeCommand.Get),
     (0, CommandClassDecorators_1.expectedCCResponse)(UserCodeCCReport)
 ], UserCodeCCGet);
-let UserCodeCCUsersNumberReport = class UserCodeCCUsersNumberReport extends UserCodeCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 1);
-            if (this.payload.length >= 3) {
-                // V2+
-                this.supportedUsers = this.payload.readUInt16BE(1);
-            }
-            else {
-                // V1
-                this.supportedUsers = this.payload[0];
-            }
+let UserCodeCCUsersNumberReport = UserCodeCCUsersNumberReport_1 = class UserCodeCCUsersNumberReport extends UserCodeCC {
+    constructor(options) {
+        super(options);
+        this.supportedUsers = options.supportedUsers;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 1);
+        let supportedUsers;
+        if (raw.payload.length >= 3) {
+            // V2+
+            supportedUsers = raw.payload.readUInt16BE(1);
         }
         else {
-            this.supportedUsers = options.supportedUsers;
+            // V1
+            supportedUsers = raw.payload[0];
         }
+        return new UserCodeCCUsersNumberReport_1({
+            nodeId: ctx.sourceNodeId,
+            supportedUsers,
+        });
     }
     supportedUsers;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.allocUnsafe(3);
         // If the node implements more than 255 users, this field MUST be set to 255
         this.payload[0] = Math.min(255, this.supportedUsers);
         this.payload.writeUInt16BE(this.supportedUsers, 1);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: { "supported users": this.supportedUsers },
         };
     }
@@ -1186,7 +1204,7 @@ exports.UserCodeCCUsersNumberReport = UserCodeCCUsersNumberReport;
 __decorate([
     (0, CommandClassDecorators_1.ccValue)(exports.UserCodeCCValues.supportedUsers)
 ], UserCodeCCUsersNumberReport.prototype, "supportedUsers", void 0);
-exports.UserCodeCCUsersNumberReport = UserCodeCCUsersNumberReport = __decorate([
+exports.UserCodeCCUsersNumberReport = UserCodeCCUsersNumberReport = UserCodeCCUsersNumberReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.UserCodeCommand.UsersNumberReport)
 ], UserCodeCCUsersNumberReport);
 let UserCodeCCUsersNumberGet = class UserCodeCCUsersNumberGet extends UserCodeCC {
@@ -1196,45 +1214,53 @@ exports.UserCodeCCUsersNumberGet = UserCodeCCUsersNumberGet = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.UserCodeCommand.UsersNumberGet),
     (0, CommandClassDecorators_1.expectedCCResponse)(UserCodeCCUsersNumberReport)
 ], UserCodeCCUsersNumberGet);
-let UserCodeCCCapabilitiesReport = class UserCodeCCCapabilitiesReport extends UserCodeCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            let offset = 0;
-            (0, safe_1.validatePayload)(this.payload.length >= offset + 1);
-            this.supportsAdminCode = !!(this.payload[offset] & 0b100_00000);
-            this.supportsAdminCodeDeactivation = !!(this.payload[offset] & 0b010_00000);
-            const statusBitMaskLength = this.payload[offset] & 0b000_11111;
-            offset += 1;
-            (0, safe_1.validatePayload)(this.payload.length >= offset + statusBitMaskLength + 1);
-            this.supportedUserIDStatuses = (0, safe_1.parseBitMask)(this.payload.subarray(offset, offset + statusBitMaskLength), _Types_1.UserIDStatus.Available);
-            offset += statusBitMaskLength;
-            this.supportsUserCodeChecksum = !!(this.payload[offset] & 0b100_00000);
-            this.supportsMultipleUserCodeReport = !!(this.payload[offset] & 0b010_00000);
-            this.supportsMultipleUserCodeSet = !!(this.payload[offset] & 0b001_00000);
-            const keypadModesBitMaskLength = this.payload[offset] & 0b000_11111;
-            offset += 1;
-            (0, safe_1.validatePayload)(this.payload.length >= offset + keypadModesBitMaskLength + 1);
-            this.supportedKeypadModes = (0, safe_1.parseBitMask)(this.payload.subarray(offset, offset + keypadModesBitMaskLength), _Types_1.KeypadMode.Normal);
-            offset += keypadModesBitMaskLength;
-            const keysBitMaskLength = this.payload[offset] & 0b000_11111;
-            offset += 1;
-            (0, safe_1.validatePayload)(this.payload.length >= offset + keysBitMaskLength);
-            this.supportedASCIIChars = Buffer.from((0, safe_1.parseBitMask)(this.payload.subarray(offset, offset + keysBitMaskLength), 0)).toString("ascii");
-        }
-        else {
-            this.supportsAdminCode = options.supportsAdminCode;
-            this.supportsAdminCodeDeactivation =
-                options.supportsAdminCodeDeactivation;
-            this.supportsUserCodeChecksum = options.supportsUserCodeChecksum;
-            this.supportsMultipleUserCodeReport =
-                options.supportsMultipleUserCodeReport;
-            this.supportsMultipleUserCodeSet =
-                options.supportsMultipleUserCodeSet;
-            this.supportedUserIDStatuses = options.supportedUserIDStatuses;
-            this.supportedKeypadModes = options.supportedKeypadModes;
-            this.supportedASCIIChars = options.supportedASCIIChars;
-        }
+let UserCodeCCCapabilitiesReport = UserCodeCCCapabilitiesReport_1 = class UserCodeCCCapabilitiesReport extends UserCodeCC {
+    constructor(options) {
+        super(options);
+        this.supportsAdminCode = options.supportsAdminCode;
+        this.supportsAdminCodeDeactivation =
+            options.supportsAdminCodeDeactivation;
+        this.supportsUserCodeChecksum = options.supportsUserCodeChecksum;
+        this.supportsMultipleUserCodeReport =
+            options.supportsMultipleUserCodeReport;
+        this.supportsMultipleUserCodeSet = options.supportsMultipleUserCodeSet;
+        this.supportedUserIDStatuses = options.supportedUserIDStatuses;
+        this.supportedKeypadModes = options.supportedKeypadModes;
+        this.supportedASCIIChars = options.supportedASCIIChars;
+    }
+    static from(raw, ctx) {
+        let offset = 0;
+        (0, safe_1.validatePayload)(raw.payload.length >= offset + 1);
+        const supportsAdminCode = !!(raw.payload[offset] & 0b100_00000);
+        const supportsAdminCodeDeactivation = !!(raw.payload[offset] & 0b010_00000);
+        const statusBitMaskLength = raw.payload[offset] & 0b000_11111;
+        offset += 1;
+        (0, safe_1.validatePayload)(raw.payload.length >= offset + statusBitMaskLength + 1);
+        const supportedUserIDStatuses = (0, safe_1.parseBitMask)(raw.payload.subarray(offset, offset + statusBitMaskLength), _Types_1.UserIDStatus.Available);
+        offset += statusBitMaskLength;
+        const supportsUserCodeChecksum = !!(raw.payload[offset] & 0b100_00000);
+        const supportsMultipleUserCodeReport = !!(raw.payload[offset] & 0b010_00000);
+        const supportsMultipleUserCodeSet = !!(raw.payload[offset] & 0b001_00000);
+        const keypadModesBitMaskLength = raw.payload[offset] & 0b000_11111;
+        offset += 1;
+        (0, safe_1.validatePayload)(raw.payload.length >= offset + keypadModesBitMaskLength + 1);
+        const supportedKeypadModes = (0, safe_1.parseBitMask)(raw.payload.subarray(offset, offset + keypadModesBitMaskLength), _Types_1.KeypadMode.Normal);
+        offset += keypadModesBitMaskLength;
+        const keysBitMaskLength = raw.payload[offset] & 0b000_11111;
+        offset += 1;
+        (0, safe_1.validatePayload)(raw.payload.length >= offset + keysBitMaskLength);
+        const supportedASCIIChars = Buffer.from((0, safe_1.parseBitMask)(raw.payload.subarray(offset, offset + keysBitMaskLength), 0)).toString("ascii");
+        return new UserCodeCCCapabilitiesReport_1({
+            nodeId: ctx.sourceNodeId,
+            supportsAdminCode,
+            supportsAdminCodeDeactivation,
+            supportedUserIDStatuses,
+            supportsUserCodeChecksum,
+            supportsMultipleUserCodeReport,
+            supportsMultipleUserCodeSet,
+            supportedKeypadModes,
+            supportedASCIIChars,
+        });
     }
     supportsAdminCode;
     supportsAdminCodeDeactivation;
@@ -1244,7 +1270,7 @@ let UserCodeCCCapabilitiesReport = class UserCodeCCCapabilitiesReport extends Us
     supportedUserIDStatuses;
     supportedKeypadModes;
     supportedASCIIChars;
-    serialize() {
+    serialize(ctx) {
         const supportedStatusesBitmask = (0, safe_1.encodeBitMask)(this.supportedUserIDStatuses, undefined, _Types_1.UserIDStatus.Available);
         const controlByte1 = (this.supportsAdminCode ? 0b100_00000 : 0)
             | (this.supportsAdminCodeDeactivation ? 0b010_00000 : 0)
@@ -1265,11 +1291,11 @@ let UserCodeCCCapabilitiesReport = class UserCodeCCCapabilitiesReport extends Us
             Buffer.from([controlByte3]),
             supportedKeysBitmask,
         ]);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: {
                 "supports admin code": this.supportsAdminCode,
                 "supports admin code deactivation": this.supportsAdminCodeDeactivation,
@@ -1312,7 +1338,7 @@ __decorate([
 __decorate([
     (0, CommandClassDecorators_1.ccValue)(exports.UserCodeCCValues.supportedASCIIChars)
 ], UserCodeCCCapabilitiesReport.prototype, "supportedASCIIChars", void 0);
-exports.UserCodeCCCapabilitiesReport = UserCodeCCCapabilitiesReport = __decorate([
+exports.UserCodeCCCapabilitiesReport = UserCodeCCCapabilitiesReport = UserCodeCCCapabilitiesReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.UserCodeCommand.CapabilitiesReport)
 ], UserCodeCCCapabilitiesReport);
 let UserCodeCCCapabilitiesGet = class UserCodeCCCapabilitiesGet extends UserCodeCC {
@@ -1322,65 +1348,69 @@ exports.UserCodeCCCapabilitiesGet = UserCodeCCCapabilitiesGet = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.UserCodeCommand.CapabilitiesGet),
     (0, CommandClassDecorators_1.expectedCCResponse)(UserCodeCCCapabilitiesReport)
 ], UserCodeCCCapabilitiesGet);
-let UserCodeCCKeypadModeSet = class UserCodeCCKeypadModeSet extends UserCodeCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 1);
-            this.keypadMode = this.payload[0];
-        }
-        else {
-            this.keypadMode = options.keypadMode;
-        }
+let UserCodeCCKeypadModeSet = UserCodeCCKeypadModeSet_1 = class UserCodeCCKeypadModeSet extends UserCodeCC {
+    constructor(options) {
+        super(options);
+        this.keypadMode = options.keypadMode;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 1);
+        const keypadMode = raw.payload[0];
+        return new UserCodeCCKeypadModeSet_1({
+            nodeId: ctx.sourceNodeId,
+            keypadMode,
+        });
     }
     keypadMode;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.from([this.keypadMode]);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: { mode: (0, safe_2.getEnumMemberName)(_Types_1.KeypadMode, this.keypadMode) },
         };
     }
 };
 exports.UserCodeCCKeypadModeSet = UserCodeCCKeypadModeSet;
-exports.UserCodeCCKeypadModeSet = UserCodeCCKeypadModeSet = __decorate([
+exports.UserCodeCCKeypadModeSet = UserCodeCCKeypadModeSet = UserCodeCCKeypadModeSet_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.UserCodeCommand.KeypadModeSet),
     (0, CommandClassDecorators_1.useSupervision)()
 ], UserCodeCCKeypadModeSet);
-let UserCodeCCKeypadModeReport = class UserCodeCCKeypadModeReport extends UserCodeCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 1);
-            this.keypadMode = this.payload[0];
-        }
-        else {
-            this.keypadMode = options.keypadMode;
-        }
+let UserCodeCCKeypadModeReport = UserCodeCCKeypadModeReport_1 = class UserCodeCCKeypadModeReport extends UserCodeCC {
+    constructor(options) {
+        super(options);
+        this.keypadMode = options.keypadMode;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 1);
+        const keypadMode = raw.payload[0];
+        return new UserCodeCCKeypadModeReport_1({
+            nodeId: ctx.sourceNodeId,
+            keypadMode,
+        });
     }
-    persistValues(applHost) {
-        if (!super.persistValues(applHost))
+    persistValues(ctx) {
+        if (!super.persistValues(ctx))
             return false;
         // Update the keypad modes metadata
-        const supportedKeypadModes = this.getValue(applHost, exports.UserCodeCCValues.supportedKeypadModes) ?? [this.keypadMode];
+        const supportedKeypadModes = this.getValue(ctx, exports.UserCodeCCValues.supportedKeypadModes) ?? [this.keypadMode];
         const keypadModeValue = exports.UserCodeCCValues.keypadMode;
-        this.setMetadata(applHost, keypadModeValue, {
+        this.setMetadata(ctx, keypadModeValue, {
             ...keypadModeValue.meta,
             states: (0, safe_1.enumValuesToMetadataStates)(_Types_1.KeypadMode, supportedKeypadModes),
         });
         return true;
     }
     keypadMode;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.from([this.keypadMode]);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: {
                 keypadMode: (0, safe_2.getEnumMemberName)(_Types_1.KeypadMode, this.keypadMode),
             },
@@ -1391,7 +1421,7 @@ exports.UserCodeCCKeypadModeReport = UserCodeCCKeypadModeReport;
 __decorate([
     (0, CommandClassDecorators_1.ccValue)(exports.UserCodeCCValues.keypadMode)
 ], UserCodeCCKeypadModeReport.prototype, "keypadMode", void 0);
-exports.UserCodeCCKeypadModeReport = UserCodeCCKeypadModeReport = __decorate([
+exports.UserCodeCCKeypadModeReport = UserCodeCCKeypadModeReport = UserCodeCCKeypadModeReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.UserCodeCommand.KeypadModeReport)
 ], UserCodeCCKeypadModeReport);
 let UserCodeCCKeypadModeGet = class UserCodeCCKeypadModeGet extends UserCodeCC {
@@ -1401,67 +1431,71 @@ exports.UserCodeCCKeypadModeGet = UserCodeCCKeypadModeGet = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.UserCodeCommand.KeypadModeGet),
     (0, CommandClassDecorators_1.expectedCCResponse)(UserCodeCCKeypadModeReport)
 ], UserCodeCCKeypadModeGet);
-let UserCodeCCAdminCodeSet = class UserCodeCCAdminCodeSet extends UserCodeCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 1);
-            const codeLength = this.payload[0] & 0b1111;
-            (0, safe_1.validatePayload)(this.payload.length >= 1 + codeLength);
-            this.adminCode = this.payload
-                .subarray(1, 1 + codeLength)
-                .toString("ascii");
-        }
-        else {
-            this.adminCode = options.adminCode;
-        }
+let UserCodeCCAdminCodeSet = UserCodeCCAdminCodeSet_1 = class UserCodeCCAdminCodeSet extends UserCodeCC {
+    constructor(options) {
+        super(options);
+        this.adminCode = options.adminCode;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 1);
+        const codeLength = raw.payload[0] & 0b1111;
+        (0, safe_1.validatePayload)(raw.payload.length >= 1 + codeLength);
+        const adminCode = raw.payload
+            .subarray(1, 1 + codeLength)
+            .toString("ascii");
+        return new UserCodeCCAdminCodeSet_1({
+            nodeId: ctx.sourceNodeId,
+            adminCode,
+        });
     }
     adminCode;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.concat([
             Buffer.from([this.adminCode.length & 0b1111]),
             Buffer.from(this.adminCode, "ascii"),
         ]);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: { "admin code": userCodeToLogString(this.adminCode) },
         };
     }
 };
 exports.UserCodeCCAdminCodeSet = UserCodeCCAdminCodeSet;
-exports.UserCodeCCAdminCodeSet = UserCodeCCAdminCodeSet = __decorate([
+exports.UserCodeCCAdminCodeSet = UserCodeCCAdminCodeSet = UserCodeCCAdminCodeSet_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.UserCodeCommand.AdminCodeSet),
     (0, CommandClassDecorators_1.useSupervision)()
 ], UserCodeCCAdminCodeSet);
-let UserCodeCCAdminCodeReport = class UserCodeCCAdminCodeReport extends UserCodeCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 1);
-            const codeLength = this.payload[0] & 0b1111;
-            (0, safe_1.validatePayload)(this.payload.length >= 1 + codeLength);
-            this.adminCode = this.payload
-                .subarray(1, 1 + codeLength)
-                .toString("ascii");
-        }
-        else {
-            this.adminCode = options.adminCode;
-        }
+let UserCodeCCAdminCodeReport = UserCodeCCAdminCodeReport_1 = class UserCodeCCAdminCodeReport extends UserCodeCC {
+    constructor(options) {
+        super(options);
+        this.adminCode = options.adminCode;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 1);
+        const codeLength = raw.payload[0] & 0b1111;
+        (0, safe_1.validatePayload)(raw.payload.length >= 1 + codeLength);
+        const adminCode = raw.payload
+            .subarray(1, 1 + codeLength)
+            .toString("ascii");
+        return new UserCodeCCAdminCodeReport_1({
+            nodeId: ctx.sourceNodeId,
+            adminCode,
+        });
     }
     adminCode;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.concat([
             Buffer.from([this.adminCode.length & 0b1111]),
             Buffer.from(this.adminCode, "ascii"),
         ]);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: { "admin code": userCodeToLogString(this.adminCode) },
         };
     }
@@ -1470,7 +1504,7 @@ exports.UserCodeCCAdminCodeReport = UserCodeCCAdminCodeReport;
 __decorate([
     (0, CommandClassDecorators_1.ccValue)(exports.UserCodeCCValues.adminCode)
 ], UserCodeCCAdminCodeReport.prototype, "adminCode", void 0);
-exports.UserCodeCCAdminCodeReport = UserCodeCCAdminCodeReport = __decorate([
+exports.UserCodeCCAdminCodeReport = UserCodeCCAdminCodeReport = UserCodeCCAdminCodeReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.UserCodeCommand.AdminCodeReport)
 ], UserCodeCCAdminCodeReport);
 let UserCodeCCAdminCodeGet = class UserCodeCCAdminCodeGet extends UserCodeCC {
@@ -1480,26 +1514,28 @@ exports.UserCodeCCAdminCodeGet = UserCodeCCAdminCodeGet = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.UserCodeCommand.AdminCodeGet),
     (0, CommandClassDecorators_1.expectedCCResponse)(UserCodeCCAdminCodeReport)
 ], UserCodeCCAdminCodeGet);
-let UserCodeCCUserCodeChecksumReport = class UserCodeCCUserCodeChecksumReport extends UserCodeCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 2);
-            this.userCodeChecksum = this.payload.readUInt16BE(0);
-        }
-        else {
-            this.userCodeChecksum = options.userCodeChecksum;
-        }
+let UserCodeCCUserCodeChecksumReport = UserCodeCCUserCodeChecksumReport_1 = class UserCodeCCUserCodeChecksumReport extends UserCodeCC {
+    constructor(options) {
+        super(options);
+        this.userCodeChecksum = options.userCodeChecksum;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 2);
+        const userCodeChecksum = raw.payload.readUInt16BE(0);
+        return new UserCodeCCUserCodeChecksumReport_1({
+            nodeId: ctx.sourceNodeId,
+            userCodeChecksum,
+        });
     }
     userCodeChecksum;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.allocUnsafe(2);
         this.payload.writeUInt16BE(this.userCodeChecksum, 0);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: { "user code checksum": (0, safe_2.num2hex)(this.userCodeChecksum) },
         };
     }
@@ -1508,7 +1544,7 @@ exports.UserCodeCCUserCodeChecksumReport = UserCodeCCUserCodeChecksumReport;
 __decorate([
     (0, CommandClassDecorators_1.ccValue)(exports.UserCodeCCValues.userCodeChecksum)
 ], UserCodeCCUserCodeChecksumReport.prototype, "userCodeChecksum", void 0);
-exports.UserCodeCCUserCodeChecksumReport = UserCodeCCUserCodeChecksumReport = __decorate([
+exports.UserCodeCCUserCodeChecksumReport = UserCodeCCUserCodeChecksumReport = UserCodeCCUserCodeChecksumReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.UserCodeCommand.UserCodeChecksumReport)
 ], UserCodeCCUserCodeChecksumReport);
 let UserCodeCCUserCodeChecksumGet = class UserCodeCCUserCodeChecksumGet extends UserCodeCC {
@@ -1519,18 +1555,19 @@ exports.UserCodeCCUserCodeChecksumGet = UserCodeCCUserCodeChecksumGet = __decora
     (0, CommandClassDecorators_1.expectedCCResponse)(UserCodeCCUserCodeChecksumReport)
 ], UserCodeCCUserCodeChecksumGet);
 let UserCodeCCExtendedUserCodeSet = class UserCodeCCExtendedUserCodeSet extends UserCodeCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            // TODO: Deserialize payload
-            throw new safe_1.ZWaveError(`${this.constructor.name}: deserialization not implemented`, safe_1.ZWaveErrorCodes.Deserialization_NotImplemented);
-        }
-        else {
-            this.userCodes = options.userCodes;
-        }
+    constructor(options) {
+        super(options);
+        this.userCodes = options.userCodes;
+    }
+    static from(_raw, _ctx) {
+        // TODO: Deserialize payload
+        throw new safe_1.ZWaveError(`${this.name}: deserialization not implemented`, safe_1.ZWaveErrorCodes.Deserialization_NotImplemented);
+        // return new UserCodeCCExtendedUserCodeSet({
+        // 	nodeId: ctx.sourceNodeId,
+        // });
     }
     userCodes;
-    serialize() {
+    serialize(ctx) {
         const userCodeBuffers = this.userCodes.map((code) => {
             const ret = Buffer.concat([
                 Buffer.from([
@@ -1550,15 +1587,15 @@ let UserCodeCCExtendedUserCodeSet = class UserCodeCCExtendedUserCodeSet extends
             Buffer.from([this.userCodes.length]),
             ...userCodeBuffers,
         ]);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         const message = {};
         for (const { userId, userIdStatus, userCode } of this.userCodes) {
             message[`code #${userId}`] = `${userCodeToLogString(userCode ?? "")} (status: ${(0, safe_2.getEnumMemberName)(_Types_1.UserIDStatus, userIdStatus)})`;
         }
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message,
         };
     }
@@ -1568,71 +1605,81 @@ exports.UserCodeCCExtendedUserCodeSet = UserCodeCCExtendedUserCodeSet = __decora
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.UserCodeCommand.ExtendedUserCodeSet),
     (0, CommandClassDecorators_1.useSupervision)()
 ], UserCodeCCExtendedUserCodeSet);
-let UserCodeCCExtendedUserCodeReport = class UserCodeCCExtendedUserCodeReport extends UserCodeCC {
-    constructor(host, options) {
-        super(host, options);
-        (0, safe_1.validatePayload)(this.payload.length >= 1);
-        const numCodes = this.payload[0];
+let UserCodeCCExtendedUserCodeReport = UserCodeCCExtendedUserCodeReport_1 = class UserCodeCCExtendedUserCodeReport extends UserCodeCC {
+    constructor(options) {
+        super(options);
+        // TODO: Check implementation:
+        this.userCodes = options.userCodes;
+        this.nextUserId = options.nextUserId;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 1);
+        const numCodes = raw.payload[0];
         let offset = 1;
         const userCodes = [];
         // parse each user code
         for (let i = 0; i < numCodes; i++) {
-            const { code, bytesRead } = parseExtendedUserCode(this.payload.subarray(offset));
+            const { code, bytesRead } = parseExtendedUserCode(raw.payload.subarray(offset));
             userCodes.push(code);
             offset += bytesRead;
         }
-        this.userCodes = userCodes;
-        (0, safe_1.validatePayload)(this.payload.length >= offset + 2);
-        this.nextUserId = this.payload.readUInt16BE(offset);
+        (0, safe_1.validatePayload)(raw.payload.length >= offset + 2);
+        const nextUserId = raw.payload.readUInt16BE(offset);
+        return new UserCodeCCExtendedUserCodeReport_1({
+            nodeId: ctx.sourceNodeId,
+            userCodes,
+            nextUserId,
+        });
     }
-    persistValues(applHost) {
-        if (!super.persistValues(applHost))
+    persistValues(ctx) {
+        if (!super.persistValues(ctx))
             return false;
         for (const { userId, userIdStatus, userCode } of this.userCodes) {
-            persistUserCode.call(this, applHost, userId, userIdStatus, userCode);
+            persistUserCode.call(this, ctx, userId, userIdStatus, userCode);
         }
         return true;
     }
     userCodes;
     nextUserId;
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         const message = {};
         for (const { userId, userIdStatus, userCode } of this.userCodes) {
             message[`code #${userId}`] = `${userCodeToLogString(userCode)} (status: ${(0, safe_2.getEnumMemberName)(_Types_1.UserIDStatus, userIdStatus)})`;
         }
         message["next user id"] = this.nextUserId;
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message,
         };
     }
 };
 exports.UserCodeCCExtendedUserCodeReport = UserCodeCCExtendedUserCodeReport;
-exports.UserCodeCCExtendedUserCodeReport = UserCodeCCExtendedUserCodeReport = __decorate([
+exports.UserCodeCCExtendedUserCodeReport = UserCodeCCExtendedUserCodeReport = UserCodeCCExtendedUserCodeReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.UserCodeCommand.ExtendedUserCodeReport)
 ], UserCodeCCExtendedUserCodeReport);
 let UserCodeCCExtendedUserCodeGet = class UserCodeCCExtendedUserCodeGet extends UserCodeCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            // TODO: Deserialize payload
-            throw new safe_1.ZWaveError(`${this.constructor.name}: deserialization not implemented`, safe_1.ZWaveErrorCodes.Deserialization_NotImplemented);
-        }
-        else {
-            this.userId = options.userId;
-            this.reportMore = !!options.reportMore;
-        }
+    constructor(options) {
+        super(options);
+        this.userId = options.userId;
+        this.reportMore = !!options.reportMore;
+    }
+    static from(_raw, _ctx) {
+        // TODO: Deserialize payload
+        throw new safe_1.ZWaveError(`${this.name}: deserialization not implemented`, safe_1.ZWaveErrorCodes.Deserialization_NotImplemented);
+        // return new UserCodeCCExtendedUserCodeGet({
+        // 	nodeId: ctx.sourceNodeId,
+        // });
     }
     userId;
     reportMore;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.from([0, 0, this.reportMore ? 1 : 0]);
         this.payload.writeUInt16BE(this.userId, 0);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: {
                 "user id": this.userId,
                 "report more": this.reportMore,