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

package/build/cc/SoundSwitchCC.js

@@ -5,6 +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 SoundSwitchCCTonesNumberReport_1, SoundSwitchCCToneInfoReport_1, SoundSwitchCCToneInfoGet_1, SoundSwitchCCConfigurationSet_1, SoundSwitchCCConfigurationReport_1, SoundSwitchCCTonePlaySet_1, SoundSwitchCCTonePlayReport_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SoundSwitchCCTonePlayGet = exports.SoundSwitchCCTonePlayReport = exports.SoundSwitchCCTonePlaySet = exports.SoundSwitchCCConfigurationGet = exports.SoundSwitchCCConfigurationReport = exports.SoundSwitchCCConfigurationSet = exports.SoundSwitchCCToneInfoGet = exports.SoundSwitchCCToneInfoReport = exports.SoundSwitchCCTonesNumberGet = exports.SoundSwitchCCTonesNumberReport = exports.SoundSwitchCC = exports.SoundSwitchCCAPI = exports.SoundSwitchCCValues = void 0;
 function __assertType(argName, typeName, boundHasError) {
@@ -90,22 +91,22 @@ let SoundSwitchCCAPI = class SoundSwitchCCAPI extends API_1.CCAPI {
     }
     async getToneCount() {
         this.assertSupportsCommand(_Types_1.SoundSwitchCommand, _Types_1.SoundSwitchCommand.TonesNumberGet);
-        const cc = new SoundSwitchCCTonesNumberGet(this.applHost, {
+        const cc = new SoundSwitchCCTonesNumberGet({
             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?.toneCount;
     }
     async getToneInfo(toneId) {
         __assertType("toneId", "number", __assertType__number.bind(void 0, toneId));
         this.assertSupportsCommand(_Types_1.SoundSwitchCommand, _Types_1.SoundSwitchCommand.ToneInfoGet);
-        const cc = new SoundSwitchCCToneInfoGet(this.applHost, {
+        const cc = new SoundSwitchCCToneInfoGet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             toneId,
         });
-        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, ["duration", "name"]);
     }
@@ -113,22 +114,22 @@ let SoundSwitchCCAPI = class SoundSwitchCCAPI extends API_1.CCAPI {
         __assertType("defaultToneId", "number", __assertType__number.bind(void 0, defaultToneId));
         __assertType("defaultVolume", "number", __assertType__number.bind(void 0, defaultVolume));
         this.assertSupportsCommand(_Types_1.SoundSwitchCommand, _Types_1.SoundSwitchCommand.ConfigurationSet);
-        const cc = new SoundSwitchCCConfigurationSet(this.applHost, {
+        const cc = new SoundSwitchCCConfigurationSet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             defaultToneId,
             defaultVolume,
         });
-        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 getConfiguration() {
         this.assertSupportsCommand(_Types_1.SoundSwitchCommand, _Types_1.SoundSwitchCommand.ConfigurationGet);
-        const cc = new SoundSwitchCCConfigurationGet(this.applHost, {
+        const cc = new SoundSwitchCCConfigurationGet({
             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, ["defaultToneId", "defaultVolume"]);
         }
@@ -140,32 +141,32 @@ let SoundSwitchCCAPI = class SoundSwitchCCAPI extends API_1.CCAPI {
         if (toneId === 0) {
             throw new safe_1.ZWaveError(`Tone ID must be > 0. Use stopPlaying to stop the tone.`, safe_1.ZWaveErrorCodes.Argument_Invalid);
         }
-        const cc = new SoundSwitchCCTonePlaySet(this.applHost, {
+        const cc = new SoundSwitchCCTonePlaySet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             toneId,
             volume,
         });
-        return this.applHost.sendCommand(cc, this.commandOptions);
+        return this.host.sendCommand(cc, this.commandOptions);
     }
     async stopPlaying() {
         this.assertSupportsCommand(_Types_1.SoundSwitchCommand, _Types_1.SoundSwitchCommand.TonePlaySet);
-        const cc = new SoundSwitchCCTonePlaySet(this.applHost, {
+        const cc = new SoundSwitchCCTonePlaySet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             toneId: 0x00,
             volume: 0x00,
         });
-        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 getPlaying() {
         this.assertSupportsCommand(_Types_1.SoundSwitchCommand, _Types_1.SoundSwitchCommand.TonePlayGet);
-        const cc = new SoundSwitchCCTonePlayGet(this.applHost, {
+        const cc = new SoundSwitchCCTonePlayGet({
             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, ["toneId", "volume"]);
         }
@@ -240,38 +241,38 @@ exports.SoundSwitchCCAPI = SoundSwitchCCAPI = __decorate([
     (0, CommandClassDecorators_1.API)(safe_1.CommandClasses["Sound Switch"])
 ], SoundSwitchCCAPI);
 let SoundSwitchCC = class SoundSwitchCC 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["Sound Switch"], 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["Sound Switch"], 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",
         });
-        applHost.controllerLog.logNode(node.id, {
+        ctx.logNode(node.id, {
             message: "requesting tone count...",
             direction: "outbound",
         });
         const toneCount = await api.getToneCount();
         if (toneCount != undefined) {
             const logMessage = `supports ${toneCount} tones`;
-            applHost.controllerLog.logNode(node.id, {
+            ctx.logNode(node.id, {
                 message: logMessage,
                 direction: "inbound",
             });
         }
         else {
-            applHost.controllerLog.logNode(node.id, {
+            ctx.logNode(node.id, {
                 endpoint: this.endpointIndex,
                 message: "Querying tone count timed out, skipping interview...",
                 level: "warn",
             });
             return;
         }
-        applHost.controllerLog.logNode(node.id, {
+        ctx.logNode(node.id, {
             message: "requesting current sound configuration...",
             direction: "outbound",
         });
@@ -280,14 +281,14 @@ let SoundSwitchCC = class SoundSwitchCC extends CommandClass_1.CommandClass {
             const logMessage = `received current sound configuration:
 default tone ID: ${config.defaultToneId}
 default volume: ${config.defaultVolume}`;
-            applHost.controllerLog.logNode(node.id, {
+            ctx.logNode(node.id, {
                 message: logMessage,
                 direction: "inbound",
             });
         }
         const metadataStates = {};
         for (let toneId = 1; toneId <= toneCount; toneId++) {
-            applHost.controllerLog.logNode(node.id, {
+            ctx.logNode(node.id, {
                 message: `requesting info for tone #${toneId}`,
                 direction: "outbound",
             });
@@ -297,21 +298,21 @@ default volume: ${config.defaultVolume}`;
             const logMessage = `received info for tone #${toneId}:
 name:     ${info.name}
 duration: ${info.duration} seconds`;
-            applHost.controllerLog.logNode(node.id, {
+            ctx.logNode(node.id, {
                 message: logMessage,
                 direction: "inbound",
             });
             metadataStates[toneId] = `${info.name} (${info.duration} sec)`;
         }
         // Remember tone count and info on the default tone ID metadata
-        this.setMetadata(applHost, exports.SoundSwitchCCValues.defaultToneId, {
+        this.setMetadata(ctx, exports.SoundSwitchCCValues.defaultToneId, {
             ...exports.SoundSwitchCCValues.defaultToneId.meta,
             min: 1,
             max: toneCount,
             states: metadataStates,
         });
         // Remember tone count and info on the tone ID metadata
-        this.setMetadata(applHost, exports.SoundSwitchCCValues.toneId, {
+        this.setMetadata(ctx, exports.SoundSwitchCCValues.toneId, {
             ...exports.SoundSwitchCCValues.toneId.meta,
             min: 0,
             max: toneCount,
@@ -322,7 +323,7 @@ duration: ${info.duration} seconds`;
             },
         });
         // Remember that the interview is complete
-        this.setInterviewComplete(applHost, true);
+        this.setInterviewComplete(ctx, true);
     }
 };
 exports.SoundSwitchCC = SoundSwitchCC;
@@ -331,31 +332,33 @@ exports.SoundSwitchCC = SoundSwitchCC = __decorate([
     (0, CommandClassDecorators_1.implementedVersion)(2),
     (0, CommandClassDecorators_1.ccValues)(exports.SoundSwitchCCValues)
 ], SoundSwitchCC);
-let SoundSwitchCCTonesNumberReport = class SoundSwitchCCTonesNumberReport extends SoundSwitchCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 1);
-            this.toneCount = this.payload[0];
-        }
-        else {
-            this.toneCount = options.toneCount;
-        }
+let SoundSwitchCCTonesNumberReport = SoundSwitchCCTonesNumberReport_1 = class SoundSwitchCCTonesNumberReport extends SoundSwitchCC {
+    constructor(options) {
+        super(options);
+        this.toneCount = options.toneCount;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 1);
+        const toneCount = raw.payload[0];
+        return new SoundSwitchCCTonesNumberReport_1({
+            nodeId: ctx.sourceNodeId,
+            toneCount,
+        });
     }
     toneCount;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.from([this.toneCount]);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: { "# of tones": this.toneCount },
         };
     }
 };
 exports.SoundSwitchCCTonesNumberReport = SoundSwitchCCTonesNumberReport;
-exports.SoundSwitchCCTonesNumberReport = SoundSwitchCCTonesNumberReport = __decorate([
+exports.SoundSwitchCCTonesNumberReport = SoundSwitchCCTonesNumberReport = SoundSwitchCCTonesNumberReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.SoundSwitchCommand.TonesNumberReport)
 ], SoundSwitchCCTonesNumberReport);
 let SoundSwitchCCTonesNumberGet = class SoundSwitchCCTonesNumberGet extends SoundSwitchCC {
@@ -365,37 +368,41 @@ exports.SoundSwitchCCTonesNumberGet = SoundSwitchCCTonesNumberGet = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.SoundSwitchCommand.TonesNumberGet),
     (0, CommandClassDecorators_1.expectedCCResponse)(SoundSwitchCCTonesNumberReport)
 ], SoundSwitchCCTonesNumberGet);
-let SoundSwitchCCToneInfoReport = class SoundSwitchCCToneInfoReport extends SoundSwitchCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 4);
-            this.toneId = this.payload[0];
-            this.duration = this.payload.readUInt16BE(1);
-            const nameLength = this.payload[3];
-            (0, safe_1.validatePayload)(this.payload.length >= 4 + nameLength);
-            this.name = this.payload.subarray(4, 4 + nameLength).toString("utf8");
-        }
-        else {
-            this.toneId = options.toneId;
-            this.duration = options.duration;
-            this.name = options.name;
-        }
+let SoundSwitchCCToneInfoReport = SoundSwitchCCToneInfoReport_1 = class SoundSwitchCCToneInfoReport extends SoundSwitchCC {
+    constructor(options) {
+        super(options);
+        this.toneId = options.toneId;
+        this.duration = options.duration;
+        this.name = options.name;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 4);
+        const toneId = raw.payload[0];
+        const duration = raw.payload.readUInt16BE(1);
+        const nameLength = raw.payload[3];
+        (0, safe_1.validatePayload)(raw.payload.length >= 4 + nameLength);
+        const name = raw.payload.subarray(4, 4 + nameLength).toString("utf8");
+        return new SoundSwitchCCToneInfoReport_1({
+            nodeId: ctx.sourceNodeId,
+            toneId,
+            duration,
+            name,
+        });
     }
     toneId;
     duration;
     name;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.concat([
             Buffer.from([this.toneId, 0, 0, this.name.length]),
             Buffer.from(this.name, "utf8"),
         ]);
         this.payload.writeUInt16BE(this.duration, 1);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: {
                 "tone id": this.toneId,
                 duration: `${this.duration} seconds`,
@@ -405,62 +412,67 @@ let SoundSwitchCCToneInfoReport = class SoundSwitchCCToneInfoReport extends Soun
     }
 };
 exports.SoundSwitchCCToneInfoReport = SoundSwitchCCToneInfoReport;
-exports.SoundSwitchCCToneInfoReport = SoundSwitchCCToneInfoReport = __decorate([
+exports.SoundSwitchCCToneInfoReport = SoundSwitchCCToneInfoReport = SoundSwitchCCToneInfoReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.SoundSwitchCommand.ToneInfoReport)
 ], SoundSwitchCCToneInfoReport);
 const testResponseForSoundSwitchToneInfoGet = (sent, received) => {
     return received.toneId === sent.toneId;
 };
-let SoundSwitchCCToneInfoGet = class SoundSwitchCCToneInfoGet extends SoundSwitchCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 1);
-            this.toneId = this.payload[0];
-        }
-        else {
-            this.toneId = options.toneId;
-        }
+let SoundSwitchCCToneInfoGet = SoundSwitchCCToneInfoGet_1 = class SoundSwitchCCToneInfoGet extends SoundSwitchCC {
+    constructor(options) {
+        super(options);
+        this.toneId = options.toneId;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 1);
+        const toneId = raw.payload[0];
+        return new SoundSwitchCCToneInfoGet_1({
+            nodeId: ctx.sourceNodeId,
+            toneId,
+        });
     }
     toneId;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.from([this.toneId]);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: { "tone id": this.toneId },
         };
     }
 };
 exports.SoundSwitchCCToneInfoGet = SoundSwitchCCToneInfoGet;
-exports.SoundSwitchCCToneInfoGet = SoundSwitchCCToneInfoGet = __decorate([
+exports.SoundSwitchCCToneInfoGet = SoundSwitchCCToneInfoGet = SoundSwitchCCToneInfoGet_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.SoundSwitchCommand.ToneInfoGet),
     (0, CommandClassDecorators_1.expectedCCResponse)(SoundSwitchCCToneInfoReport, testResponseForSoundSwitchToneInfoGet)
 ], SoundSwitchCCToneInfoGet);
-let SoundSwitchCCConfigurationSet = class SoundSwitchCCConfigurationSet extends SoundSwitchCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 2);
-            this.defaultVolume = this.payload[0];
-            this.defaultToneId = this.payload[1];
-        }
-        else {
-            this.defaultVolume = options.defaultVolume;
-            this.defaultToneId = options.defaultToneId;
-        }
+let SoundSwitchCCConfigurationSet = SoundSwitchCCConfigurationSet_1 = class SoundSwitchCCConfigurationSet extends SoundSwitchCC {
+    constructor(options) {
+        super(options);
+        this.defaultVolume = options.defaultVolume;
+        this.defaultToneId = options.defaultToneId;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 2);
+        const defaultVolume = raw.payload[0];
+        const defaultToneId = raw.payload[1];
+        return new SoundSwitchCCConfigurationSet_1({
+            nodeId: ctx.sourceNodeId,
+            defaultVolume,
+            defaultToneId,
+        });
     }
     defaultVolume;
     defaultToneId;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.from([this.defaultVolume, this.defaultToneId]);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: {
                 "default volume": `${this.defaultVolume} %`,
                 "default tone id": this.defaultToneId,
@@ -469,32 +481,35 @@ let SoundSwitchCCConfigurationSet = class SoundSwitchCCConfigurationSet extends
     }
 };
 exports.SoundSwitchCCConfigurationSet = SoundSwitchCCConfigurationSet;
-exports.SoundSwitchCCConfigurationSet = SoundSwitchCCConfigurationSet = __decorate([
+exports.SoundSwitchCCConfigurationSet = SoundSwitchCCConfigurationSet = SoundSwitchCCConfigurationSet_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.SoundSwitchCommand.ConfigurationSet),
     (0, CommandClassDecorators_1.useSupervision)()
 ], SoundSwitchCCConfigurationSet);
-let SoundSwitchCCConfigurationReport = class SoundSwitchCCConfigurationReport extends SoundSwitchCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 2);
-            this.defaultVolume = (0, math_1.clamp)(this.payload[0], 0, 100);
-            this.defaultToneId = this.payload[1];
-        }
-        else {
-            this.defaultVolume = options.defaultVolume;
-            this.defaultToneId = options.defaultToneId;
-        }
+let SoundSwitchCCConfigurationReport = SoundSwitchCCConfigurationReport_1 = class SoundSwitchCCConfigurationReport extends SoundSwitchCC {
+    constructor(options) {
+        super(options);
+        this.defaultVolume = options.defaultVolume;
+        this.defaultToneId = options.defaultToneId;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 2);
+        const defaultVolume = (0, math_1.clamp)(raw.payload[0], 0, 100);
+        const defaultToneId = raw.payload[1];
+        return new SoundSwitchCCConfigurationReport_1({
+            nodeId: ctx.sourceNodeId,
+            defaultVolume,
+            defaultToneId,
+        });
     }
     defaultVolume;
     defaultToneId;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.from([this.defaultVolume, this.defaultToneId]);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: {
                 "default volume": `${this.defaultVolume} %`,
                 "default tone id": this.defaultToneId,
@@ -509,7 +524,7 @@ __decorate([
 __decorate([
     (0, CommandClassDecorators_1.ccValue)(exports.SoundSwitchCCValues.defaultToneId)
 ], SoundSwitchCCConfigurationReport.prototype, "defaultToneId", void 0);
-exports.SoundSwitchCCConfigurationReport = SoundSwitchCCConfigurationReport = __decorate([
+exports.SoundSwitchCCConfigurationReport = SoundSwitchCCConfigurationReport = SoundSwitchCCConfigurationReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.SoundSwitchCommand.ConfigurationReport)
 ], SoundSwitchCCConfigurationReport);
 let SoundSwitchCCConfigurationGet = class SoundSwitchCCConfigurationGet extends SoundSwitchCC {
@@ -519,28 +534,32 @@ exports.SoundSwitchCCConfigurationGet = SoundSwitchCCConfigurationGet = __decora
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.SoundSwitchCommand.ConfigurationGet),
     (0, CommandClassDecorators_1.expectedCCResponse)(SoundSwitchCCConfigurationReport)
 ], SoundSwitchCCConfigurationGet);
-let SoundSwitchCCTonePlaySet = class SoundSwitchCCTonePlaySet extends SoundSwitchCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 1);
-            this.toneId = this.payload[0];
-            if (this.toneId !== 0 && this.payload.length >= 2) {
-                this.volume = this.payload[1];
-            }
-        }
-        else {
-            this.toneId = options.toneId;
-            this.volume = options.volume;
+let SoundSwitchCCTonePlaySet = SoundSwitchCCTonePlaySet_1 = class SoundSwitchCCTonePlaySet extends SoundSwitchCC {
+    constructor(options) {
+        super(options);
+        this.toneId = options.toneId;
+        this.volume = options.volume;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 1);
+        const toneId = raw.payload[0];
+        let volume;
+        if (toneId !== 0 && raw.payload.length >= 2) {
+            volume = raw.payload[1];
         }
+        return new SoundSwitchCCTonePlaySet_1({
+            nodeId: ctx.sourceNodeId,
+            toneId,
+            volume,
+        });
     }
     toneId;
     volume;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.from([this.toneId, this.volume ?? 0]);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         const message = {
             "tone id": this.toneId,
         };
@@ -548,38 +567,42 @@ let SoundSwitchCCTonePlaySet = class SoundSwitchCCTonePlaySet extends SoundSwitc
             message.volume = this.volume === 0 ? "default" : `${this.volume} %`;
         }
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message,
         };
     }
 };
 exports.SoundSwitchCCTonePlaySet = SoundSwitchCCTonePlaySet;
-exports.SoundSwitchCCTonePlaySet = SoundSwitchCCTonePlaySet = __decorate([
+exports.SoundSwitchCCTonePlaySet = SoundSwitchCCTonePlaySet = SoundSwitchCCTonePlaySet_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.SoundSwitchCommand.TonePlaySet),
     (0, CommandClassDecorators_1.useSupervision)()
 ], SoundSwitchCCTonePlaySet);
-let SoundSwitchCCTonePlayReport = class SoundSwitchCCTonePlayReport extends SoundSwitchCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 1);
-            this.toneId = this.payload[0];
-            if (this.toneId !== 0 && this.payload.length >= 2) {
-                this.volume = this.payload[1];
-            }
-        }
-        else {
-            this.toneId = options.toneId;
-            this.volume = options.volume;
+let SoundSwitchCCTonePlayReport = SoundSwitchCCTonePlayReport_1 = class SoundSwitchCCTonePlayReport extends SoundSwitchCC {
+    constructor(options) {
+        super(options);
+        this.toneId = options.toneId;
+        this.volume = options.volume;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 1);
+        const toneId = raw.payload[0];
+        let volume;
+        if (toneId !== 0 && raw.payload.length >= 2) {
+            volume = raw.payload[1];
         }
+        return new SoundSwitchCCTonePlayReport_1({
+            nodeId: ctx.sourceNodeId,
+            toneId,
+            volume,
+        });
     }
     toneId;
     volume;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.from([this.toneId, this.volume ?? 0]);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         const message = {
             "tone id": this.toneId,
         };
@@ -587,7 +610,7 @@ let SoundSwitchCCTonePlayReport = class SoundSwitchCCTonePlayReport extends Soun
             message.volume = this.volume === 0 ? "default" : `${this.volume} %`;
         }
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message,
         };
     }
@@ -599,7 +622,7 @@ __decorate([
 __decorate([
     (0, CommandClassDecorators_1.ccValue)(exports.SoundSwitchCCValues.volume)
 ], SoundSwitchCCTonePlayReport.prototype, "volume", void 0);
-exports.SoundSwitchCCTonePlayReport = SoundSwitchCCTonePlayReport = __decorate([
+exports.SoundSwitchCCTonePlayReport = SoundSwitchCCTonePlayReport = SoundSwitchCCTonePlayReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.SoundSwitchCommand.TonePlayReport)
 ], SoundSwitchCCTonePlayReport);
 let SoundSwitchCCTonePlayGet = class SoundSwitchCCTonePlayGet extends SoundSwitchCC {