@zwave-js/cc 15.23.1 → 15.23.3

package/build/esm/cc/UserCredentialCC.js

@@ -12,6 +12,18 @@ function credentialToLogString(credential) {
         return "(empty)";
     return "*".repeat(credential.length);
 }
+/**
+ * Returns the canonical form of a credential for storage and reporting:
+ * text credentials (PIN codes, passwords) are returned as strings, binary
+ * credentials (biometric data, BLE/NFC/RFID identifiers, ...) as raw bytes.
+ */
+export function normalizeCredentialData(credentialType, credentialData) {
+    if (credentialType === UserCredentialType.PINCode
+        || credentialType === UserCredentialType.Password) {
+        return credentialData.toString("utf8");
+    }
+    return credentialData;
+}
 import { UserCredentialCCValues } from "./_CCValues.generated.js";
 export { UserCredentialCCValues };
 // API class
@@ -196,6 +208,10 @@ let UserCredentialCCAPI = (() => {
             return response?.keyLockerCapabilities;
         }
         // User Management
+        /**
+         * Applications should not use this method directly. Prefer the
+         * `endpoint.accessControl` API for managing users.
+         */
         async setUser(options) {
             this.assertSupportsCommand(UserCredentialCommand, UserCredentialCommand.UserSet);
             const cc = new UserCredentialCCUserSet({
@@ -205,6 +221,10 @@ let UserCredentialCCAPI = (() => {
             });
             return this.host.sendCommand(cc, this.commandOptions);
         }
+        /**
+         * Applications should not use this method directly. Prefer the
+         * `endpoint.accessControl` API for querying users.
+         */
         async getUser(userId) {
             this.assertSupportsCommand(UserCredentialCommand, UserCredentialCommand.UserGet);
             const cc = new UserCredentialCCUserGet({
@@ -212,23 +232,13 @@ let UserCredentialCCAPI = (() => {
                 endpointIndex: this.endpoint.index,
                 userId,
             });
-            const response = await this.host.sendCommand(cc, this.commandOptions);
-            if (response) {
-                return pick(response, [
-                    "nextUserId",
-                    "modifierType",
-                    "modifierNodeId",
-                    "userId",
-                    "userType",
-                    "active",
-                    "credentialRule",
-                    "expiringTimeoutMinutes",
-                    "nameEncoding",
-                    "userName",
-                ]);
-            }
+            return this.host.sendCommand(cc, this.commandOptions);
         }
         // Credential Management
+        /**
+         * Applications should not use this method directly. Prefer the
+         * `endpoint.accessControl` API for managing credentials.
+         */
         async setCredential(options) {
             this.assertSupportsCommand(UserCredentialCommand, UserCredentialCommand.CredentialSet);
             const cc = new UserCredentialCCCredentialSet({
@@ -238,6 +248,10 @@ let UserCredentialCCAPI = (() => {
             });
             return this.host.sendCommand(cc, this.commandOptions);
         }
+        /**
+         * Applications should not use this method directly. Prefer the
+         * `endpoint.accessControl` API for querying credentials.
+         */
         async getCredential(userId, credentialType, credentialSlot) {
             this.assertSupportsCommand(UserCredentialCommand, UserCredentialCommand.CredentialGet);
             const cc = new UserCredentialCCCredentialGet({
@@ -247,24 +261,7 @@ let UserCredentialCCAPI = (() => {
                 credentialType,
                 credentialSlot,
             });
-            const response = await this.host.sendCommand(cc, this.commandOptions);
-            if (response) {
-                return pick(response, [
-                    // UserId, credential type and slot can be zero in the
-                    // request to return the first credential, so we cannot
-                    // simply omit them here
-                    "userId",
-                    "credentialType",
-                    "credentialSlot",
-                    "credentialReadBack",
-                    "credentialLength",
-                    "credentialData",
-                    "modifierType",
-                    "modifierNodeId",
-                    "nextCredentialType",
-                    "nextCredentialSlot",
-                ]);
-            }
+            return this.host.sendCommand(cc, this.commandOptions);
         }
         async startCredentialLearn(options) {
             this.assertSupportsCommand(UserCredentialCommand, UserCredentialCommand.CredentialLearnStart);
@@ -289,9 +286,13 @@ let UserCredentialCCAPI = (() => {
             });
             return this.host.sendCommand(cc, this.commandOptions);
         }
+        /**
+         * Applications should not use this method directly. Prefer the
+         * `endpoint.accessControl` API for reassigning credentials between users.
+         */
         async setUserCredentialAssociation(options) {
             this.assertSupportsCommand(UserCredentialCommand, UserCredentialCommand.UserCredentialAssociationSet);
-            const cc = new UserCredentialCCUserCredentialAssociationSet({
+            const cc = new UserCredentialCCAssociationSet({
                 nodeId: this.endpoint.nodeId,
                 endpointIndex: this.endpoint.index,
                 ...options,
@@ -437,7 +438,7 @@ let UserCredentialCCAPI = (() => {
         }
         async sendUserCredentialAssociationReport(options) {
             this.assertSupportsCommand(UserCredentialCommand, UserCredentialCommand.UserCredentialAssociationReport);
-            const cc = new UserCredentialCCUserCredentialAssociationReport({
+            const cc = new UserCredentialCCAssociationReport({
                 nodeId: this.endpoint.nodeId,
                 endpointIndex: this.endpoint.index,
                 ...options,
@@ -629,7 +630,7 @@ let UserCredentialCC = (() => {
                         }
                     }
                     previousUserId = currentUserId;
-                    nextUserId = user.nextUserId;
+                    nextUserId = user.nextUserId ?? 0;
                 } while (nextUserId > 0);
             }
             // After querying all users, save the checksum for the next refresh.
@@ -674,18 +675,18 @@ let UserCredentialCC = (() => {
             this.removeValue(ctx, UserCredentialCCValues.userChecksum(userId));
             // Remove all credential values for this user
             const valueDB = this.getValueDB(ctx);
-            const credentialValues = valueDB.findValues((vid) => (UserCredentialCCValues.credential.is(vid)
-                || UserCredentialCCValues.credentialModifierType.is(vid)
-                || UserCredentialCCValues.credentialModifierNodeId.is(vid))
-                // The property key is constructed as (userId << 24) | (type << 16) | slot, so we can filter by userId
-                && (vid.propertyKey >> 24) === userId);
-            for (const { commandClass, endpoint, property, propertyKey } of credentialValues) {
-                valueDB.removeValue({
-                    commandClass,
-                    endpoint,
-                    property,
-                    propertyKey,
-                });
+            const credentialOwners = valueDB.findValues((vid) => UserCredentialCCValues.credentialOwner.is(vid)
+                && vid.endpoint === this.endpointIndex);
+            for (const { endpoint, propertyKey, value } of credentialOwners) {
+                if (value !== userId)
+                    continue;
+                const key = propertyKey;
+                const credentialType = key >>> 16;
+                const credentialSlot = key & 0xffff;
+                valueDB.removeValue(UserCredentialCCValues.credential(credentialType, credentialSlot).endpoint(endpoint));
+                valueDB.removeValue(UserCredentialCCValues.credentialOwner(credentialType, credentialSlot).endpoint(endpoint));
+                valueDB.removeValue(UserCredentialCCValues.credentialModifierType(credentialType, credentialSlot).endpoint(endpoint));
+                valueDB.removeValue(UserCredentialCCValues.credentialModifierNodeId(credentialType, credentialSlot).endpoint(endpoint));
             }
         }
         async queryCredentialsForUser(ctx, api, nodeId, userId) {
@@ -701,8 +702,8 @@ let UserCredentialCC = (() => {
                 const cred = await api.getCredential(userId, nextCredType, nextCredSlot);
                 if (!cred?.credentialSlot)
                     break; // No credential found, stop iterating
-                nextCredType = cred.nextCredentialType;
-                nextCredSlot = cred.nextCredentialSlot;
+                nextCredType = cred.nextCredentialType ?? UserCredentialType.None;
+                nextCredSlot = cred.nextCredentialSlot ?? 0;
             } while (nextCredType !== UserCredentialType.None || nextCredSlot !== 0);
         }
         static getSupportedUsersCached(ctx, endpoint) {
@@ -1139,8 +1140,17 @@ let UserCredentialCCKeyLockerCapabilitiesGet = (() => {
     return UserCredentialCCKeyLockerCapabilitiesGet = _classThis;
 })();
 export { UserCredentialCCKeyLockerCapabilitiesGet };
+function testResponseForUserCredentialUserSet(sent, received) {
+    // CC:0083.01.05.11.010, CC:0083.01.05.11.011, CC:0083.01.05.11.012,
+    // CC:0083.01.05.11.013: UserSet MUST be answered by a UserReport.
+    // Match any report type other than ResponseToGet. For Add/Modify/Delete
+    // the report echoes the requested userId; for DeleteAll (userId 0) the
+    // report contains userId 0.
+    return (received.reportType !== UserCredentialUserReportType.ResponseToGet
+        && received.userId === sent.userId);
+}
 let UserCredentialCCUserSet = (() => {
-    let _classDecorators = [CCCommand(UserCredentialCommand.UserSet), useSupervision()];
+    let _classDecorators = [CCCommand(UserCredentialCommand.UserSet), expectedCCResponse(() => UserCredentialCCUserReport, testResponseForUserCredentialUserSet)];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
@@ -1335,7 +1345,9 @@ let UserCredentialCCUserReport = (() => {
         constructor(options) {
             super(options);
             this.reportType = options.reportType;
-            this.nextUserId = options.nextUserId;
+            if (options.reportType === UserCredentialUserReportType.ResponseToGet) {
+                this.nextUserId = options.nextUserId;
+            }
             this.modifierType = options.modifierType;
             this.modifierNodeId = options.modifierNodeId;
             this.userId = options.userId;
@@ -1371,10 +1383,8 @@ let UserCredentialCCUserReport = (() => {
                     .subarray(15, 15 + nameLength)
                     .toString("ascii");
             }
-            return new this({
+            const common = {
                 nodeId: ctx.sourceNodeId,
-                reportType,
-                nextUserId,
                 modifierType,
                 modifierNodeId,
                 userId,
@@ -1384,7 +1394,11 @@ let UserCredentialCCUserReport = (() => {
                 expiringTimeoutMinutes,
                 nameEncoding,
                 userName,
-            });
+            };
+            if (reportType === UserCredentialUserReportType.ResponseToGet) {
+                return new this({ ...common, reportType, nextUserId });
+            }
+            return new this({ ...common, reportType });
         }
         reportType;
         nextUserId;
@@ -1407,7 +1421,7 @@ let UserCredentialCCUserReport = (() => {
             }
             this.payload = Bytes.alloc(15 + nameBuffer.length);
             this.payload[0] = this.reportType;
-            this.payload.writeUInt16BE(this.nextUserId, 1);
+            this.payload.writeUInt16BE(this.nextUserId ?? 0, 1);
             this.payload[3] = this.modifierType;
             this.payload.writeUInt16BE(this.modifierNodeId, 4);
             this.payload.writeUInt16BE(this.userId, 6);
@@ -1427,9 +1441,12 @@ let UserCredentialCCUserReport = (() => {
                 return false;
             if (this.userId === 0)
                 return true;
-            // Only persist data for successful responses
+            // A UserModifyRejectedLocationEmpty report means we have a stale cache
+            // entry for a user that no longer exists on the device.
             if (this.reportType
-                === UserCredentialUserReportType.UserDeleted) {
+                === UserCredentialUserReportType.UserDeleted
+                || this.reportType
+                    === UserCredentialUserReportType.UserModifyRejectedLocationEmpty) {
                 // Remove all values for this user
                 const userId = this.userId;
                 this.removeValue(ctx, UserCredentialCCValues.userType(userId));
@@ -1441,12 +1458,16 @@ let UserCredentialCCUserReport = (() => {
                 this.removeValue(ctx, UserCredentialCCValues.userModifierNodeId(userId));
                 return true;
             }
+            // A UserAddRejectedLocationOccupied report contains the data for the
+            // existing user, so we can update our cache with the actual state.
             if (this.reportType
                 !== UserCredentialUserReportType.ResponseToGet
                 && this.reportType
                     !== UserCredentialUserReportType.UserAdded
                 && this.reportType
-                    !== UserCredentialUserReportType.UserModified) {
+                    !== UserCredentialUserReportType.UserModified
+                && this.reportType
+                    !== UserCredentialUserReportType.UserAddRejectedLocationOccupied) {
                 return true;
             }
             const userId = this.userId;
@@ -1465,22 +1486,22 @@ let UserCredentialCCUserReport = (() => {
             return true;
         }
         toLogEntry(ctx) {
-            return {
-                ...super.toLogEntry(ctx),
-                message: {
-                    "report type": getEnumMemberName(UserCredentialUserReportType, this.reportType),
-                    "next user ID": this.nextUserId,
-                    "modifier type": getEnumMemberName(UserCredentialModifierType, this.modifierType),
-                    "modifier node id": this.modifierNodeId,
-                    "user ID": this.userId,
-                    "user type": getEnumMemberName(UserCredentialUserType, this.userType),
-                    active: this.active,
-                    "credential rule": getEnumMemberName(UserCredentialRule, this.credentialRule),
-                    "expiring timeout (minutes)": this.expiringTimeoutMinutes,
-                    "name encoding": getEnumMemberName(UserCredentialNameEncoding, this.nameEncoding),
-                    "user name": this.userName,
-                },
+            const message = {
+                "report type": getEnumMemberName(UserCredentialUserReportType, this.reportType),
             };
+            if (this.nextUserId != undefined) {
+                message["next user ID"] = this.nextUserId;
+            }
+            message["modifier type"] = getEnumMemberName(UserCredentialModifierType, this.modifierType);
+            message["modifier node id"] = this.modifierNodeId;
+            message["user ID"] = this.userId;
+            message["user type"] = getEnumMemberName(UserCredentialUserType, this.userType);
+            message.active = this.active;
+            message["credential rule"] = getEnumMemberName(UserCredentialRule, this.credentialRule);
+            message["expiring timeout (minutes)"] = this.expiringTimeoutMinutes;
+            message["name encoding"] = getEnumMemberName(UserCredentialNameEncoding, this.nameEncoding);
+            message["user name"] = this.userName;
+            return { ...super.toLogEntry(ctx), message };
         }
     };
     return UserCredentialCCUserReport = _classThis;
@@ -1535,8 +1556,20 @@ let UserCredentialCCUserGet = (() => {
     return UserCredentialCCUserGet = _classThis;
 })();
 export { UserCredentialCCUserGet };
+function testResponseForUserCredentialCredentialSet(sent, received) {
+    // CC:0083.01.0A.11.010, CC:0083.01.0A.11.011, CC:0083.01.0A.11.012,
+    // CC:0083.01.0A.11.013: CredentialSet MUST be answered by a
+    // CredentialReport. We correlate responses on the targeted (type, slot)
+    // but not on userId, because rejection reports like DuplicateCredential
+    // or WrongUserUniqueIdentifier may legitimately reference a different
+    // user at the same credential location.
+    return (received.reportType
+        !== UserCredentialCredentialReportType.ResponseToGet
+        && received.credentialType === sent.credentialType
+        && received.credentialSlot === sent.credentialSlot);
+}
 let UserCredentialCCCredentialSet = (() => {
-    let _classDecorators = [CCCommand(UserCredentialCommand.CredentialSet), useSupervision()];
+    let _classDecorators = [CCCommand(UserCredentialCommand.CredentialSet), expectedCCResponse(() => UserCredentialCCCredentialReport, testResponseForUserCredentialCredentialSet)];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
@@ -1658,12 +1691,16 @@ let UserCredentialCCCredentialReport = (() => {
             this.credentialType = options.credentialType;
             this.credentialSlot = options.credentialSlot;
             this.credentialReadBack = options.credentialReadBack;
-            this.credentialLength = options.credentialLength;
-            this.credentialData = options.credentialData;
+            if (options.credentialReadBack) {
+                this.credentialData = options.credentialData;
+            }
             this.modifierType = options.modifierType;
             this.modifierNodeId = options.modifierNodeId;
-            this.nextCredentialType = options.nextCredentialType;
-            this.nextCredentialSlot = options.nextCredentialSlot;
+            if (options.reportType
+                === UserCredentialCredentialReportType.ResponseToGet) {
+                this.nextCredentialType = options.nextCredentialType;
+                this.nextCredentialSlot = options.nextCredentialSlot;
+            }
         }
         static from(raw, ctx) {
             validatePayload(raw.payload.length >= 8);
@@ -1674,25 +1711,36 @@ let UserCredentialCCCredentialReport = (() => {
             const credentialReadBack = !!(raw.payload[6] & 128);
             const credentialLength = raw.payload[7];
             validatePayload(raw.payload.length >= 8 + credentialLength + 6);
-            const credentialData = Bytes.from(raw.payload.subarray(8, 8 + credentialLength));
-            let offset = 8 + credentialLength;
+            const offset = 8 + credentialLength;
             const modifierType = raw.payload[offset];
             const modifierNodeId = raw.payload.readUInt16BE(offset + 1);
-            const nextCredentialType = raw.payload[offset + 3];
-            const nextCredentialSlot = raw.payload.readUInt16BE(offset + 4);
-            return new this({
+            const common = {
                 nodeId: ctx.sourceNodeId,
-                reportType,
                 userId,
                 credentialType,
                 credentialSlot,
-                credentialReadBack,
-                credentialLength,
-                credentialData,
                 modifierType,
                 modifierNodeId,
-                nextCredentialType,
-                nextCredentialSlot,
+            };
+            const dataOptions = credentialReadBack
+                ? {
+                    credentialReadBack: true,
+                    credentialData: Bytes.from(raw.payload.subarray(8, 8 + credentialLength)),
+                }
+                : { credentialReadBack: false };
+            if (reportType === UserCredentialCredentialReportType.ResponseToGet) {
+                return new this({
+                    ...common,
+                    ...dataOptions,
+                    reportType,
+                    nextCredentialType: raw.payload[offset + 3],
+                    nextCredentialSlot: raw.payload.readUInt16BE(offset + 4),
+                });
+            }
+            return new this({
+                ...common,
+                ...dataOptions,
+                reportType,
             });
         }
         reportType;
@@ -1700,28 +1748,29 @@ let UserCredentialCCCredentialReport = (() => {
         credentialType;
         credentialSlot;
         credentialReadBack;
-        credentialLength;
         credentialData;
         modifierType;
         modifierNodeId;
         nextCredentialType;
         nextCredentialSlot;
         serialize(ctx) {
-            this.payload = Bytes.alloc(14 + this.credentialData.length);
+            const credentialData = this.credentialData ?? new Bytes();
+            this.payload = Bytes.alloc(14 + credentialData.length);
             this.payload[0] = this.reportType;
             this.payload.writeUInt16BE(this.userId, 1);
             this.payload[3] = this.credentialType;
             this.payload.writeUInt16BE(this.credentialSlot, 4);
             this.payload[6] = this.credentialReadBack ? 0x80 : 0x00;
-            this.payload[7] = this.credentialData.length;
-            if (this.credentialData.length > 0) {
-                this.payload.set(this.credentialData, 8);
+            this.payload[7] = credentialData.length;
+            if (credentialData.length > 0) {
+                this.payload.set(credentialData, 8);
             }
-            let offset = 8 + this.credentialData.length;
+            const offset = 8 + credentialData.length;
             this.payload[offset] = this.modifierType;
             this.payload.writeUInt16BE(this.modifierNodeId, offset + 1);
-            this.payload[offset + 3] = this.nextCredentialType;
-            this.payload.writeUInt16BE(this.nextCredentialSlot, offset + 4);
+            this.payload[offset + 3] = this.nextCredentialType
+                ?? UserCredentialType.None;
+            this.payload.writeUInt16BE(this.nextCredentialSlot ?? 0, offset + 4);
             return super.serialize(ctx);
         }
         persistValues(ctx) {
@@ -1731,43 +1780,64 @@ let UserCredentialCCCredentialReport = (() => {
                 || this.credentialSlot === 0) {
                 return true;
             }
+            // A CredentialModifyRejectedLocationEmpty report means we have a stale
+            // cache entry for a credential that no longer exists on the device.
             if (this.reportType
-                === UserCredentialCredentialReportType.CredentialDeleted) {
-                this.removeValue(ctx, UserCredentialCCValues.credential(this.userId, this.credentialType, this.credentialSlot));
-                this.removeValue(ctx, UserCredentialCCValues.credentialModifierType(this.userId, this.credentialType, this.credentialSlot));
-                this.removeValue(ctx, UserCredentialCCValues.credentialModifierNodeId(this.userId, this.credentialType, this.credentialSlot));
+                === UserCredentialCredentialReportType.CredentialDeleted
+                || this.reportType
+                    === UserCredentialCredentialReportType
+                        .CredentialModifyRejectedLocationEmpty) {
+                this.removeValue(ctx, UserCredentialCCValues.credential(this.credentialType, this.credentialSlot));
+                this.removeValue(ctx, UserCredentialCCValues.credentialOwner(this.credentialType, this.credentialSlot));
+                this.removeValue(ctx, UserCredentialCCValues.credentialModifierType(this.credentialType, this.credentialSlot));
+                this.removeValue(ctx, UserCredentialCCValues.credentialModifierNodeId(this.credentialType, this.credentialSlot));
                 return true;
             }
+            // A CredentialAddRejectedLocationOccupied report includes the actual
+            // credential data in the read-back field when the device chooses to
+            // reveal it, so we can update our cache with the real state.
+            const isRejectionWithReadback = this.reportType
+                === UserCredentialCredentialReportType
+                    .CredentialAddRejectedLocationOccupied
+                && this.credentialReadBack;
             if (this.reportType
                 !== UserCredentialCredentialReportType.ResponseToGet
                 && this.reportType
                     !== UserCredentialCredentialReportType.CredentialAdded
                 && this.reportType
-                    !== UserCredentialCredentialReportType.CredentialModified) {
+                    !== UserCredentialCredentialReportType.CredentialModified
+                && !isRejectionWithReadback) {
                 return true;
             }
-            this.ensureMetadata(ctx, UserCredentialCCValues.credential(this.userId, this.credentialType, this.credentialSlot));
-            this.setValue(ctx, UserCredentialCCValues.credential(this.userId, this.credentialType, this.credentialSlot), this.credentialData);
-            this.setValue(ctx, UserCredentialCCValues.credentialModifierType(this.userId, this.credentialType, this.credentialSlot), this.modifierType);
-            this.setValue(ctx, UserCredentialCCValues.credentialModifierNodeId(this.userId, this.credentialType, this.credentialSlot), this.modifierNodeId);
+            if (this.credentialData != undefined) {
+                this.ensureMetadata(ctx, UserCredentialCCValues.credential(this.credentialType, this.credentialSlot));
+                this.setValue(ctx, UserCredentialCCValues.credential(this.credentialType, this.credentialSlot), normalizeCredentialData(this.credentialType, this.credentialData));
+            }
+            this.setValue(ctx, UserCredentialCCValues.credentialOwner(this.credentialType, this.credentialSlot), this.userId);
+            this.setValue(ctx, UserCredentialCCValues.credentialModifierType(this.credentialType, this.credentialSlot), this.modifierType);
+            this.setValue(ctx, UserCredentialCCValues.credentialModifierNodeId(this.credentialType, this.credentialSlot), this.modifierNodeId);
             return true;
         }
         toLogEntry(ctx) {
-            return {
-                ...super.toLogEntry(ctx),
-                message: {
-                    "report type": getEnumMemberName(UserCredentialCredentialReportType, this.reportType),
-                    "user ID": this.userId,
-                    "credential type": getEnumMemberName(UserCredentialType, this.credentialType),
-                    "credential slot": this.credentialSlot,
-                    "credential read-back": this.credentialReadBack,
-                    "credential data": credentialToLogString(this.credentialData),
-                    "modifier type": getEnumMemberName(UserCredentialModifierType, this.modifierType),
-                    "modifier node id": this.modifierNodeId,
-                    "next credential type": getEnumMemberName(UserCredentialType, this.nextCredentialType),
-                    "next credential slot": this.nextCredentialSlot,
-                },
+            const message = {
+                "report type": getEnumMemberName(UserCredentialCredentialReportType, this.reportType),
+                "user ID": this.userId,
+                "credential type": getEnumMemberName(UserCredentialType, this.credentialType),
+                "credential slot": this.credentialSlot,
+                "credential read-back": this.credentialReadBack,
             };
+            if (this.credentialData != undefined) {
+                message["credential data"] = credentialToLogString(this.credentialData);
+            }
+            message["modifier type"] = getEnumMemberName(UserCredentialModifierType, this.modifierType);
+            message["modifier node id"] = this.modifierNodeId;
+            if (this.nextCredentialType != undefined) {
+                message["next credential type"] = getEnumMemberName(UserCredentialType, this.nextCredentialType);
+            }
+            if (this.nextCredentialSlot != undefined) {
+                message["next credential slot"] = this.nextCredentialSlot;
+            }
+            return { ...super.toLogEntry(ctx), message };
         }
     };
     return UserCredentialCCCredentialReport = _classThis;
@@ -1992,18 +2062,18 @@ let UserCredentialCCCredentialLearnReport = (() => {
     return UserCredentialCCCredentialLearnReport = _classThis;
 })();
 export { UserCredentialCCCredentialLearnReport };
-let UserCredentialCCUserCredentialAssociationSet = (() => {
-    let _classDecorators = [CCCommand(UserCredentialCommand.UserCredentialAssociationSet), useSupervision()];
+let UserCredentialCCAssociationReport = (() => {
+    let _classDecorators = [CCCommand(UserCredentialCommand.UserCredentialAssociationReport)];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
     let _classSuper = UserCredentialCC;
-    var UserCredentialCCUserCredentialAssociationSet = class extends _classSuper {
+    var UserCredentialCCAssociationReport = class extends _classSuper {
         static { _classThis = this; }
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
-            UserCredentialCCUserCredentialAssociationSet = _classThis = _classDescriptor.value;
+            UserCredentialCCAssociationReport = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
             __runInitializers(_classThis, _classExtraInitializers);
         }
@@ -2012,29 +2082,45 @@ let UserCredentialCCUserCredentialAssociationSet = (() => {
             this.credentialType = options.credentialType;
             this.credentialSlot = options.credentialSlot;
             this.destinationUserId = options.destinationUserId;
+            this.status = options.status;
         }
-        credentialType;
-        credentialSlot;
-        destinationUserId;
         static from(raw, ctx) {
-            validatePayload(raw.payload.length >= 5);
+            validatePayload(raw.payload.length >= 6);
             const credentialType = raw.payload[0];
             const credentialSlot = raw.payload.readUInt16BE(1);
             const destinationUserId = raw.payload.readUInt16BE(3);
+            const status = raw.payload[5];
             return new this({
                 nodeId: ctx.sourceNodeId,
                 credentialType,
                 credentialSlot,
-                destinationUserId,
+                destinationUserId: destinationUserId,
+                status,
             });
         }
+        credentialType;
+        credentialSlot;
+        destinationUserId;
+        status;
         serialize(ctx) {
-            this.payload = Bytes.alloc(5);
+            this.payload = Bytes.alloc(6);
             this.payload[0] = this.credentialType;
             this.payload.writeUInt16BE(this.credentialSlot, 1);
             this.payload.writeUInt16BE(this.destinationUserId, 3);
+            this.payload[5] = this.status;
             return super.serialize(ctx);
         }
+        persistValues(ctx) {
+            if (!super.persistValues(ctx))
+                return false;
+            if (this.status !== 0
+                || this.credentialType === UserCredentialType.None
+                || this.credentialSlot === 0) {
+                return true;
+            }
+            this.setValue(ctx, UserCredentialCCValues.credentialOwner(this.credentialType, this.credentialSlot), this.destinationUserId);
+            return true;
+        }
         toLogEntry(ctx) {
             return {
                 ...super.toLogEntry(ctx),
@@ -2042,25 +2128,30 @@ let UserCredentialCCUserCredentialAssociationSet = (() => {
                     "credential type": getEnumMemberName(UserCredentialType, this.credentialType),
                     "credential slot": this.credentialSlot,
                     "destination user ID": this.destinationUserId,
+                    status: this.status,
                 },
             };
         }
     };
-    return UserCredentialCCUserCredentialAssociationSet = _classThis;
+    return UserCredentialCCAssociationReport = _classThis;
 })();
-export { UserCredentialCCUserCredentialAssociationSet };
-let UserCredentialCCUserCredentialAssociationReport = (() => {
-    let _classDecorators = [CCCommand(UserCredentialCommand.UserCredentialAssociationReport)];
+export { UserCredentialCCAssociationReport };
+function testResponseForUserCredentialAssociationSet(sent, received) {
+    return (sent.credentialType === received.credentialType
+        && sent.credentialSlot === received.credentialSlot);
+}
+let UserCredentialCCAssociationSet = (() => {
+    let _classDecorators = [CCCommand(UserCredentialCommand.UserCredentialAssociationSet), expectedCCResponse(UserCredentialCCAssociationReport, testResponseForUserCredentialAssociationSet)];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
     let _classSuper = UserCredentialCC;
-    var UserCredentialCCUserCredentialAssociationReport = class extends _classSuper {
+    var UserCredentialCCAssociationSet = class extends _classSuper {
         static { _classThis = this; }
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
-            UserCredentialCCUserCredentialAssociationReport = _classThis = _classDescriptor.value;
+            UserCredentialCCAssociationSet = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
             __runInitializers(_classThis, _classExtraInitializers);
         }
@@ -2069,32 +2160,27 @@ let UserCredentialCCUserCredentialAssociationReport = (() => {
             this.credentialType = options.credentialType;
             this.credentialSlot = options.credentialSlot;
             this.destinationUserId = options.destinationUserId;
-            this.status = options.status;
         }
+        credentialType;
+        credentialSlot;
+        destinationUserId;
         static from(raw, ctx) {
-            validatePayload(raw.payload.length >= 6);
+            validatePayload(raw.payload.length >= 5);
             const credentialType = raw.payload[0];
             const credentialSlot = raw.payload.readUInt16BE(1);
             const destinationUserId = raw.payload.readUInt16BE(3);
-            const status = raw.payload[5];
             return new this({
                 nodeId: ctx.sourceNodeId,
                 credentialType,
                 credentialSlot,
-                destinationUserId: destinationUserId,
-                status,
+                destinationUserId,
             });
         }
-        credentialType;
-        credentialSlot;
-        destinationUserId;
-        status;
         serialize(ctx) {
-            this.payload = Bytes.alloc(6);
+            this.payload = Bytes.alloc(5);
             this.payload[0] = this.credentialType;
             this.payload.writeUInt16BE(this.credentialSlot, 1);
             this.payload.writeUInt16BE(this.destinationUserId, 3);
-            this.payload[5] = this.status;
             return super.serialize(ctx);
         }
         toLogEntry(ctx) {
@@ -2104,14 +2190,13 @@ let UserCredentialCCUserCredentialAssociationReport = (() => {
                     "credential type": getEnumMemberName(UserCredentialType, this.credentialType),
                     "credential slot": this.credentialSlot,
                     "destination user ID": this.destinationUserId,
-                    status: this.status,
                 },
             };
         }
     };
-    return UserCredentialCCUserCredentialAssociationReport = _classThis;
+    return UserCredentialCCAssociationSet = _classThis;
 })();
-export { UserCredentialCCUserCredentialAssociationReport };
+export { UserCredentialCCAssociationSet };
 let UserCredentialCCAllUsersChecksumReport = (() => {
     let _classDecorators = [CCCommand(UserCredentialCommand.AllUsersChecksumReport)];
     let _classDescriptor;