zwave-js 9.2.1 → 9.3.0

package/build/lib/commandclass/LanguageCC.js

@@ -34,8 +34,8 @@ const __assertType__optional_string = $o => {
     return optional__string($o);
 };
 const core_1 = require("@zwave-js/core");
+const serial_1 = require("@zwave-js/serial");
 const shared_1 = require("@zwave-js/shared");
-const Constants_1 = require("../message/Constants");
 const API_1 = require("./API");
 const CommandClass_1 = require("./CommandClass");
 const _Types_1 = require("./_Types");
@@ -80,24 +80,24 @@ LanguageCCAPI = __decorate([
 ], LanguageCCAPI);
 exports.LanguageCCAPI = LanguageCCAPI;
 let LanguageCC = class LanguageCC extends CommandClass_1.CommandClass {
-    async interview() {
-        const node = this.getNode();
-        this.driver.controllerLog.logNode(node.id, {
+    async interview(driver) {
+        const node = this.getNode(driver);
+        driver.controllerLog.logNode(node.id, {
             endpoint: this.endpointIndex,
             message: `Interviewing ${this.ccName}...`,
             direction: "none",
         });
-        await this.refreshValues();
+        await this.refreshValues(driver);
         // Remember that the interview is complete
         this.interviewComplete = true;
     }
-    async refreshValues() {
-        const node = this.getNode();
-        const endpoint = this.getEndpoint();
+    async refreshValues(driver) {
+        const node = this.getNode(driver);
+        const endpoint = this.getEndpoint(driver);
         const api = endpoint.commandClasses.Language.withOptions({
-            priority: Constants_1.MessagePriority.NodeQuery,
+            priority: serial_1.MessagePriority.NodeQuery,
         });
-        this.driver.controllerLog.logNode(node.id, {
+        driver.controllerLog.logNode(node.id, {
             message: "requesting language setting...",
             direction: "outbound",
         });
@@ -105,7 +105,7 @@ let LanguageCC = class LanguageCC extends CommandClass_1.CommandClass {
         if (resp) {
             const { language, country } = resp;
             const logMessage = `received current language setting: ${language}${country != undefined ? `-${country}` : ""}`;
-            this.driver.controllerLog.logNode(node.id, {
+            driver.controllerLog.logNode(node.id, {
                 message: logMessage,
                 direction: "inbound",
             });
@@ -118,8 +118,8 @@ LanguageCC = __decorate([
 ], LanguageCC);
 exports.LanguageCC = LanguageCC;
 let LanguageCCSet = class LanguageCCSet extends LanguageCC {
-    constructor(driver, options) {
-        super(driver, options);
+    constructor(host, options) {
+        super(host, options);
         if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
             // TODO: Deserialize payload
             throw new core_1.ZWaveError(`${this.constructor.name}: deserialization not implemented`, core_1.ZWaveErrorCodes.Deserialization_NotImplemented);
@@ -172,8 +172,8 @@ LanguageCCSet = __decorate([
 ], LanguageCCSet);
 exports.LanguageCCSet = LanguageCCSet;
 let LanguageCCReport = class LanguageCCReport extends LanguageCC {
-    constructor(driver, options) {
-        super(driver, options);
+    constructor(host, options) {
+        super(host, options);
         // if (gotDeserializationOptions(options)) {
         (0, core_1.validatePayload)(this.payload.length >= 3);
         this.language = this.payload.toString("ascii", 0, 3);

package/build/lib/commandclass/LanguageCC.js.map

@@ -1 +1 @@
-{"version":3,"file":"LanguageCC.js","sourceRoot":"","sources":["../../../src/lib/commandclass/LanguageCC.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,yCAMwB;AACxB,6CAAwC;AAGxC,oDAAuD;AACvD,+BAA8B;AAC9B,iDAYwB;AACxB,qCAA2C;AAE3C,uCAAuC;AAGvC,IAAa,aAAa,GAA1B,MAAa,aAAc,SAAQ,WAAK;IAChC,eAAe,CAAC,GAAoB;QAC1C,QAAQ,GAAG,EAAE;YACZ,KAAK,wBAAe,CAAC,GAAG;gBACvB,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC;YAC5B,KAAK,wBAAe,CAAC,GAAG;gBACvB,OAAO,IAAI,CAAC,CAAC,oBAAoB;SAClC;QACD,OAAO,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IAED,6EAA6E;IACtE,KAAK,CAAC,GAAG;QACf,IAAI,CAAC,qBAAqB,CAAC,wBAAe,EAAE,wBAAe,CAAC,GAAG,CAAC,CAAC;QAEjE,MAAM,EAAE,GAAG,IAAI,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE;YACzC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;YAC5B,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK;SAC7B,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAC7C,EAAE,EACF,IAAI,CAAC,cAAc,CACnB,CAAC;QACF,IAAI,QAAQ,EAAE;YACb,OAAO,IAAA,aAAI,EAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC;SAC/C;IACF,CAAC;IAGM,KAAK,CAAC,GAAG,CAAC,QAAgB,EAAE,OAAgB;;;QAClD,IAAI,CAAC,qBAAqB,CAAC,wBAAe,EAAE,wBAAe,CAAC,GAAG,CAAC,CAAC;QAEjE,MAAM,EAAE,GAAG,IAAI,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE;YACzC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;YAC5B,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK;YAC7B,QAAQ;YACR,OAAO;SACP,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;KACvD;CACD,CAAA;AAxCY,aAAa;IADzB,IAAA,kBAAG,EAAC,qBAAc,CAAC,QAAQ,CAAC;GAChB,aAAa,CAwCzB;AAxCY,sCAAa;AA4C1B,IAAa,UAAU,GAAvB,MAAa,UAAW,SAAQ,2BAAY;IAGpC,KAAK,CAAC,SAAS;QACrB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAG,CAAC;QAE7B,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE;YAC1C,QAAQ,EAAE,IAAI,CAAC,aAAa;YAC5B,OAAO,EAAE,gBAAgB,IAAI,CAAC,MAAM,KAAK;YACzC,SAAS,EAAE,MAAM;SACjB,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAE3B,0CAA0C;QAC1C,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAC/B,CAAC;IAEM,KAAK,CAAC,aAAa;QACzB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAG,CAAC;QAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAG,CAAC;QACrC,MAAM,GAAG,GAAG,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,WAAW,CAAC;YACxD,QAAQ,EAAE,2BAAe,CAAC,SAAS;SACnC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE;YAC1C,OAAO,EAAE,gCAAgC;YACzC,SAAS,EAAE,UAAU;SACrB,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,GAAG,EAAE,CAAC;QAC7B,IAAI,IAAI,EAAE;YACT,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;YACnC,MAAM,UAAU,GAAG,sCAAsC,QAAQ,GAChE,OAAO,IAAI,SAAS,CAAC,CAAC,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,EACxC,EAAE,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE;gBAC1C,OAAO,EAAE,UAAU;gBACnB,SAAS,EAAE,SAAS;aACpB,CAAC,CAAC;SACH;IACF,CAAC;CACD,CAAA;AAzCY,UAAU;IAFtB,IAAA,2BAAY,EAAC,qBAAc,CAAC,QAAQ,CAAC;IACrC,IAAA,iCAAkB,EAAC,CAAC,CAAC;GACT,UAAU,CAyCtB;AAzCY,gCAAU;AAiDvB,IAAa,aAAa,GAA1B,MAAa,aAAc,SAAQ,UAAU;IAC5C,YACC,MAAc,EACd,OAAkE;QAElE,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACvB,IAAI,IAAA,wCAAyB,EAAC,OAAO,CAAC,EAAE;YACvC,4BAA4B;YAC5B,MAAM,IAAI,iBAAU,CACnB,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,mCAAmC,EAC3D,sBAAe,CAAC,8BAA8B,CAC9C,CAAC;SACF;aAAM;YACN,0CAA0C;YAC1C,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC;YAClC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;SAChC;IACF,CAAC;IAGD,IAAW,QAAQ;QAClB,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;IACD,IAAW,QAAQ,CAAC,KAAa;QAChC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,WAAW,EAAE,KAAK,KAAK,EAAE;YACxD,MAAM,IAAI,iBAAU,CACnB,oEAAoE,EACpE,sBAAe,CAAC,gBAAgB,CAChC,CAAC;SACF;QACD,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;IACxB,CAAC;IAGD,IAAW,OAAO;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IACD,IAAW,OAAO,CAAC,KAAyB;QAC3C,IACC,OAAO,KAAK,KAAK,QAAQ;YACzB,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC,EACpD;YACD,MAAM,IAAI,iBAAU,CACnB,oEAAoE,EACpE,sBAAe,CAAC,gBAAgB,CAChC,CAAC;SACF;QACD,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;IACvB,CAAC;IAEM,SAAS;QACf,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3D,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ;YAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;QACnE,OAAO,KAAK,CAAC,SAAS,EAAE,CAAC;IAC1B,CAAC;IAEM,UAAU;QAChB,MAAM,OAAO,GAAkB,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC3D,IAAI,IAAI,CAAC,QAAQ,IAAI,SAAS,EAAE;YAC/B,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC;SAChC;QACD,OAAO;YACN,GAAG,KAAK,CAAC,UAAU,EAAE;YACrB,OAAO;SACP,CAAC;IACH,CAAC;CACD,CAAA;AAnEY,aAAa;IADzB,IAAA,wBAAS,EAAC,wBAAe,CAAC,GAAG,CAAC;GAClB,aAAa,CAmEzB;AAnEY,sCAAa;AAsE1B,IAAa,gBAAgB,GAA7B,MAAa,gBAAiB,SAAQ,UAAU;IAC/C,YACC,MAAc,EACd,OAA2C;QAE3C,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACvB,4CAA4C;QAC5C,IAAA,sBAAe,EAAC,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;QAC1C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACrD,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE;YAC7B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;SACpD;QACD,IAAI;QAEJ,IAAI,CAAC,aAAa,EAAE,CAAC;IACtB,CAAC;IAgBM,UAAU;QAChB,MAAM,OAAO,GAAkB,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC3D,IAAI,IAAI,CAAC,OAAO,IAAI,SAAS,EAAE;YAC9B,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;SAC/B;QACD,OAAO;YACN,GAAG,KAAK,CAAC,UAAU,EAAE;YACrB,OAAO;SACP,CAAC;IACH,CAAC;CACD,CAAA;AAnBA;IALC,IAAA,sBAAO,GAAE;IACT,IAAA,8BAAe,EAAC;QAChB,GAAG,oBAAa,CAAC,QAAQ;QACzB,KAAK,EAAE,eAAe;KACtB,CAAC;kDAC+B;AAOjC;IALC,IAAA,sBAAO,GAAE;IACT,IAAA,8BAAe,EAAC;QAChB,GAAG,oBAAa,CAAC,QAAQ;QACzB,KAAK,EAAE,cAAc;KACrB,CAAC;iDAC0C;AA7BhC,gBAAgB;IAD5B,IAAA,wBAAS,EAAC,wBAAe,CAAC,MAAM,CAAC;GACrB,gBAAgB,CAyC5B;AAzCY,4CAAgB;AA6C7B,IAAa,aAAa,GAA1B,MAAa,aAAc,SAAQ,UAAU;CAAG,CAAA;AAAnC,aAAa;IAFzB,IAAA,wBAAS,EAAC,wBAAe,CAAC,GAAG,CAAC;IAC9B,IAAA,iCAAkB,EAAC,gBAAgB,CAAC;GACxB,aAAa,CAAsB;AAAnC,sCAAa"}
+{"version":3,"file":"LanguageCC.js","sourceRoot":"","sources":["../../../src/lib/commandclass/LanguageCC.ts"],"names":[],"mappings":"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"}

package/build/lib/commandclass/LockCC.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 import type { Maybe, MessageOrCCLogEntry, ValueID } from "@zwave-js/core";
+import type { ZWaveHost } from "@zwave-js/host";
 import type { Driver } from "../driver/Driver";
 import { PhysicalCCAPI, PollValueImplementation, POLL_VALUE, SetValueImplementation, SET_VALUE } from "./API";
 import { CCCommandOptions, CommandClass, CommandClassDeserializationOptions } from "./CommandClass";
@@ -18,20 +19,20 @@ export declare class LockCCAPI extends PhysicalCCAPI {
 }
 export declare class LockCC extends CommandClass {
     ccCommand: LockCommand;
-    interview(): Promise<void>;
-    refreshValues(): Promise<void>;
+    interview(driver: Driver): Promise<void>;
+    refreshValues(driver: Driver): Promise<void>;
 }
 interface LockCCSetOptions extends CCCommandOptions {
     locked: boolean;
 }
 export declare class LockCCSet extends LockCC {
-    constructor(driver: Driver, options: CommandClassDeserializationOptions | LockCCSetOptions);
+    constructor(host: ZWaveHost, options: CommandClassDeserializationOptions | LockCCSetOptions);
     locked: boolean;
     serialize(): Buffer;
     toLogEntry(): MessageOrCCLogEntry;
 }
 export declare class LockCCReport extends LockCC {
-    constructor(driver: Driver, options: CommandClassDeserializationOptions);
+    constructor(host: ZWaveHost, options: CommandClassDeserializationOptions);
     readonly locked: boolean;
     toLogEntry(): MessageOrCCLogEntry;
 }

package/build/lib/commandclass/LockCC.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LockCC.d.ts","sourceRoot":"","sources":["../../../src/lib/commandclass/LockCC.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,mBAAmB,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAS1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EACN,aAAa,EACb,uBAAuB,EACvB,UAAU,EACV,sBAAsB,EACtB,SAAS,EAGT,MAAM,OAAO,CAAC;AACf,OAAO,EAGN,gBAAgB,EAGhB,YAAY,EAEZ,kCAAkC,EAIlC,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAM1D;AAED,qBACa,SAAU,SAAQ,aAAa;IACpC,eAAe,CAAC,GAAG,EAAE,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC;IAS3C,GAAG,IAAI,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IAchD;;;OAGG;IAEU,GAAG,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAWhD,SAAS,CAAC,CAAC,SAAS,CAAC,EAAE,sBAAsB,CAc3C;IAEF,SAAS,CAAC,CAAC,UAAU,CAAC,EAAE,uBAAuB,CAK7C;CACF;AAED,qBAEa,MAAO,SAAQ,YAAY;IAC/B,SAAS,EAAE,WAAW,CAAC;IAElB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAe1B,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;CAkB3C;AAED,UAAU,gBAAiB,SAAQ,gBAAgB;IAClD,MAAM,EAAE,OAAO,CAAC;CAChB;AAED,qBACa,SAAU,SAAQ,MAAM;gBAEnC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,kCAAkC,GAAG,gBAAgB;IAcxD,MAAM,EAAE,OAAO,CAAC;IAEhB,SAAS,IAAI,MAAM;IAKnB,UAAU,IAAI,mBAAmB;CAMxC;AAED,qBACa,YAAa,SAAQ,MAAM;gBAEtC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,kCAAkC;IAQ5C,SAMgB,MAAM,EAAE,OAAO,CAAC;IAEzB,UAAU,IAAI,mBAAmB;CAMxC;AAED,qBAEa,SAAU,SAAQ,MAAM;CAAG"}
+{"version":3,"file":"LockCC.d.ts","sourceRoot":"","sources":["../../../src/lib/commandclass/LockCC.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,mBAAmB,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAQ1E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAGhD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACN,aAAa,EACb,uBAAuB,EACvB,UAAU,EACV,sBAAsB,EACtB,SAAS,EAGT,MAAM,OAAO,CAAC;AACf,OAAO,EAGN,gBAAgB,EAGhB,YAAY,EAEZ,kCAAkC,EAIlC,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAM1D;AAED,qBACa,SAAU,SAAQ,aAAa;IACpC,eAAe,CAAC,GAAG,EAAE,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC;IAS3C,GAAG,IAAI,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IAchD;;;OAGG;IAEU,GAAG,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAWhD,SAAS,CAAC,CAAC,SAAS,CAAC,EAAE,sBAAsB,CAc3C;IAEF,SAAS,CAAC,CAAC,UAAU,CAAC,EAAE,uBAAuB,CAK7C;CACF;AAED,qBAEa,MAAO,SAAQ,YAAY;IAC/B,SAAS,EAAE,WAAW,CAAC;IAElB,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAexC,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAkBzD;AAED,UAAU,gBAAiB,SAAQ,gBAAgB;IAClD,MAAM,EAAE,OAAO,CAAC;CAChB;AAED,qBACa,SAAU,SAAQ,MAAM;gBAEnC,IAAI,EAAE,SAAS,EACf,OAAO,EAAE,kCAAkC,GAAG,gBAAgB;IAcxD,MAAM,EAAE,OAAO,CAAC;IAEhB,SAAS,IAAI,MAAM;IAKnB,UAAU,IAAI,mBAAmB;CAMxC;AAED,qBACa,YAAa,SAAQ,MAAM;gBAEtC,IAAI,EAAE,SAAS,EACf,OAAO,EAAE,kCAAkC;IAQ5C,SAMgB,MAAM,EAAE,OAAO,CAAC;IAEzB,UAAU,IAAI,mBAAmB;CAMxC;AAED,qBAEa,SAAU,SAAQ,MAAM;CAAG"}

package/build/lib/commandclass/LockCC.js

@@ -21,7 +21,7 @@ const __assertType__boolean = $o => {
     return _boolean($o);
 };
 const core_1 = require("@zwave-js/core");
-const Constants_1 = require("../message/Constants");
+const serial_1 = require("@zwave-js/serial");
 const API_1 = require("./API");
 const CommandClass_1 = require("./CommandClass");
 const _Types_1 = require("./_Types");
@@ -91,30 +91,30 @@ LockCCAPI = __decorate([
 ], LockCCAPI);
 exports.LockCCAPI = LockCCAPI;
 let LockCC = class LockCC extends CommandClass_1.CommandClass {
-    async interview() {
-        const node = this.getNode();
-        this.driver.controllerLog.logNode(node.id, {
+    async interview(driver) {
+        const node = this.getNode(driver);
+        driver.controllerLog.logNode(node.id, {
             endpoint: this.endpointIndex,
             message: `Interviewing ${this.ccName}...`,
             direction: "none",
         });
-        await this.refreshValues();
+        await this.refreshValues(driver);
         // Remember that the interview is complete
         this.interviewComplete = true;
     }
-    async refreshValues() {
-        const node = this.getNode();
-        const endpoint = this.getEndpoint();
+    async refreshValues(driver) {
+        const node = this.getNode(driver);
+        const endpoint = this.getEndpoint(driver);
         const api = endpoint.commandClasses.Lock.withOptions({
-            priority: Constants_1.MessagePriority.NodeQuery,
+            priority: serial_1.MessagePriority.NodeQuery,
         });
-        this.driver.controllerLog.logNode(node.id, {
+        driver.controllerLog.logNode(node.id, {
             message: "requesting current lock state...",
             direction: "outbound",
         });
         const locked = await api.get();
         const logMessage = `the lock is ${locked ? "locked" : "unlocked"}`;
-        this.driver.controllerLog.logNode(node.id, {
+        driver.controllerLog.logNode(node.id, {
             message: logMessage,
             direction: "inbound",
         });
@@ -126,8 +126,8 @@ LockCC = __decorate([
 ], LockCC);
 exports.LockCC = LockCC;
 let LockCCSet = class LockCCSet extends LockCC {
-    constructor(driver, options) {
-        super(driver, options);
+    constructor(host, options) {
+        super(host, options);
         if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
             // TODO: Deserialize payload
             throw new core_1.ZWaveError(`${this.constructor.name}: deserialization not implemented`, core_1.ZWaveErrorCodes.Deserialization_NotImplemented);
@@ -152,8 +152,8 @@ LockCCSet = __decorate([
 ], LockCCSet);
 exports.LockCCSet = LockCCSet;
 let LockCCReport = class LockCCReport extends LockCC {
-    constructor(driver, options) {
-        super(driver, options);
+    constructor(host, options) {
+        super(host, options);
         (0, core_1.validatePayload)(this.payload.length >= 1);
         this.locked = this.payload[0] === 1;
         this.persistValues();

package/build/lib/commandclass/LockCC.js.map

@@ -1 +1 @@
-{"version":3,"file":"LockCC.js","sourceRoot":"","sources":["../../../src/lib/commandclass/LockCC.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LockCC.js","sourceRoot":"","sources":["../../../src/lib/commandclass/LockCC.ts"],"names":[],"mappings":"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"}

package/build/lib/commandclass/ManufacturerProprietaryCC.d.ts

@@ -1,23 +1,31 @@
 /// <reference types="node" />
+import type { ZWaveHost } from "@zwave-js/host";
 import type { Driver } from "../driver/Driver";
 import { CCAPI, PollValueImplementation, POLL_VALUE, SetValueImplementation, SET_VALUE } from "./API";
 import { CCCommandOptions, CommandClass, CommandClassDeserializationOptions } from "./CommandClass";
 import type { FibaroVenetianBlindCCReport } from "./manufacturerProprietary/Fibaro";
 export declare class ManufacturerProprietaryCCAPI extends CCAPI {
     sendData(manufacturerId: number, data?: Buffer): Promise<void>;
+    sendAndReceiveData(manufacturerId: number, data?: Buffer): Promise<{
+        manufacturerId: number;
+        data: Buffer;
+    } | undefined>;
     fibaroVenetianBlindsGet(): Promise<Pick<FibaroVenetianBlindCCReport, "position" | "tilt"> | undefined>;
     fibaroVenetianBlindsSetPosition(value: number): Promise<void>;
     fibaroVenetianBlindsSetTilt(value: number): Promise<void>;
     protected [SET_VALUE]: SetValueImplementation;
     protected [POLL_VALUE]: PollValueImplementation;
 }
+export interface ManufacturerProprietaryCCOptions extends CCCommandOptions {
+    expectsResponse?: boolean;
+}
 export declare class ManufacturerProprietaryCC extends CommandClass {
     ccCommand: undefined;
-    constructor(driver: Driver, options: CommandClassDeserializationOptions | CCCommandOptions);
+    constructor(host: ZWaveHost, options: CommandClassDeserializationOptions | ManufacturerProprietaryCCOptions);
     manufacturerId: number;
     private assertManufacturerIdIsSet;
     serialize(): Buffer;
-    interview(): Promise<void>;
-    refreshValues(): Promise<void>;
+    interview(driver: Driver): Promise<void>;
+    refreshValues(driver: Driver): Promise<void>;
 }
 //# sourceMappingURL=ManufacturerProprietaryCC.d.ts.map

package/build/lib/commandclass/ManufacturerProprietaryCC.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ManufacturerProprietaryCC.d.ts","sourceRoot":"","sources":["../../../src/lib/commandclass/ManufacturerProprietaryCC.ts"],"names":[],"mappings":";AAUA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACN,KAAK,EACL,uBAAuB,EACvB,UAAU,EACV,sBAAsB,EACtB,SAAS,EAKT,MAAM,OAAO,CAAC;AACf,OAAO,EAEN,gBAAgB,EAChB,YAAY,EAEZ,kCAAkC,EAGlC,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAGpF,qBACa,4BAA6B,SAAQ,KAAK;IAEzC,QAAQ,CACpB,cAAc,EAAE,MAAM,EACtB,IAAI,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC;IAYH,uBAAuB;IAkBvB,+BAA+B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY7D,2BAA2B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWtE,SAAS,CAAC,CAAC,SAAS,CAAC,EAAE,sBAAsB,CAmC3C;IAEF,SAAS,CAAC,CAAC,UAAU,CAAC,EAAE,uBAAuB,CAkB7C;CACF;AAED,qBAGa,yBAA0B,SAAQ,YAAY;IAClD,SAAS,EAAE,SAAS,CAAC;gBAI5B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,kCAAkC,GAAG,gBAAgB;IAgCxD,cAAc,EAAG,MAAM,CAAC;IAE/B,OAAO,CAAC,yBAAyB;IAS1B,SAAS,IAAI,MAAM;IAgBb,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B1B,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;CA0B3C"}
+{"version":3,"file":"ManufacturerProprietaryCC.d.ts","sourceRoot":"","sources":["../../../src/lib/commandclass/ManufacturerProprietaryCC.ts"],"names":[],"mappings":";AAOA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAIhD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACN,KAAK,EACL,uBAAuB,EACvB,UAAU,EACV,sBAAsB,EACtB,SAAS,EAKT,MAAM,OAAO,CAAC;AACf,OAAO,EAEN,gBAAgB,EAChB,YAAY,EAEZ,kCAAkC,EAIlC,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAGpF,qBACa,4BAA6B,SAAQ,KAAK;IAEzC,QAAQ,CACpB,cAAc,EAAE,MAAM,EACtB,IAAI,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC;IAaH,kBAAkB,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;;;;IAuBxD,uBAAuB;IAkBvB,+BAA+B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY7D,2BAA2B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWtE,SAAS,CAAC,CAAC,SAAS,CAAC,EAAE,sBAAsB,CAmC3C;IAEF,SAAS,CAAC,CAAC,UAAU,CAAC,EAAE,uBAAuB,CAkB7C;CACF;AAED,MAAM,WAAW,gCAAiC,SAAQ,gBAAgB;IACzE,eAAe,CAAC,EAAE,OAAO,CAAC;CAC1B;AAcD,qBAMa,yBAA0B,SAAQ,YAAY;IAClD,SAAS,EAAE,SAAS,CAAC;gBAI5B,IAAI,EAAE,SAAS,EACf,OAAO,EACJ,kCAAkC,GAClC,gCAAgC;IAmC7B,cAAc,EAAG,MAAM,CAAC;IAK/B,OAAO,CAAC,yBAAyB;IAS1B,SAAS,IAAI,MAAM;IAgBb,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA8BxC,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CA0BzD"}

package/build/lib/commandclass/ManufacturerProprietaryCC.js

@@ -98,6 +98,24 @@ let ManufacturerProprietaryCCAPI = class ManufacturerProprietaryCCAPI extends AP
         cc.payload = data !== null && data !== void 0 ? data : Buffer.allocUnsafe(0);
         await this.driver.sendCommand(cc, this.commandOptions);
     }
+    async sendAndReceiveData(manufacturerId, data) {
+        __assertType("manufacturerId", "number", __assertType__number.bind(void 0, manufacturerId));
+        __assertType("data", "(optional) Buffer", __assertType__optional_Buffer.bind(void 0, data));
+        const cc = new ManufacturerProprietaryCC(this.driver, {
+            nodeId: this.endpoint.nodeId,
+            endpoint: this.endpoint.index,
+            expectsResponse: true,
+        });
+        cc.manufacturerId = manufacturerId;
+        cc.payload = data !== null && data !== void 0 ? data : Buffer.allocUnsafe(0);
+        const response = await this.driver.sendCommand(cc, this.commandOptions);
+        if (response) {
+            return {
+                manufacturerId: response.manufacturerId,
+                data: response.payload,
+            };
+        }
+    }
     // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
     async fibaroVenetianBlindsGet() {
         const { FibaroVenetianBlindCCGet } = require("./manufacturerProprietary/Fibaro");
@@ -136,28 +154,36 @@ ManufacturerProprietaryCCAPI = __decorate([
     (0, CommandClass_1.API)(core_1.CommandClasses["Manufacturer Proprietary"])
 ], ManufacturerProprietaryCCAPI);
 exports.ManufacturerProprietaryCCAPI = ManufacturerProprietaryCCAPI;
-let ManufacturerProprietaryCC = 
-// TODO: Add a way to specify the expected response
-class ManufacturerProprietaryCC extends CommandClass_1.CommandClass {
+function getReponseForManufacturerProprietary(cc) {
+    return cc.expectsResponse ? ManufacturerProprietaryCC : undefined;
+}
+function testResponseForManufacturerProprietaryRequest(sent, received) {
+    // We expect a Manufacturer Proprietary response that has the same manufacturer ID as the request
+    return sent.manufacturerId === received.manufacturerId;
+}
+let ManufacturerProprietaryCC = class ManufacturerProprietaryCC extends CommandClass_1.CommandClass {
     // @noCCValues
-    constructor(driver, options) {
-        super(driver, options);
+    constructor(host, options) {
+        super(host, options);
         if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
             (0, core_1.validatePayload)(this.payload.length >= 1);
             // ManufacturerProprietaryCC has no CC command, so the first byte is stored in ccCommand.
             this.manufacturerId =
                 (this.ccCommand << 8) + this.payload[0];
             this.payload = this.payload.slice(1);
+            // Incoming messages expect no response
+            this.expectsResponse = false;
             // Try to parse the proprietary command
             const PCConstructor = getProprietaryCCConstructor(this.manufacturerId);
             if (PCConstructor &&
                 new.target !== PCConstructor &&
                 !(0, shared_1.staticExtends)(new.target, PCConstructor)) {
-                return new PCConstructor(driver, options);
+                return new PCConstructor(host, options);
             }
         }
         else {
             this.manufacturerId = this.getValueDB().getValue((0, ManufacturerSpecificCC_1.getManufacturerIdValueId)());
+            this.expectsResponse = !!options.expectsResponse;
             // To use this CC, a manufacturer ID must exist in the value DB
             // If it doesn't, the interview procedure will throw.
         }
@@ -182,10 +208,10 @@ class ManufacturerProprietaryCC extends CommandClass_1.CommandClass {
         ]);
         return super.serialize();
     }
-    async interview() {
+    async interview(driver) {
         var _c;
         this.assertManufacturerIdIsSet();
-        const node = this.getNode();
+        const node = this.getNode(driver);
         // TODO: Can this be refactored?
         const proprietaryConfig = (_c = node.deviceConfig) === null || _c === void 0 ? void 0 : _c.proprietary;
         if (this.manufacturerId === 0x010f /* Fibaro */ &&
@@ -193,13 +219,13 @@ class ManufacturerProprietaryCC extends CommandClass_1.CommandClass {
             (0, typeguards_1.isArray)(proprietaryConfig.fibaroCCs) &&
             proprietaryConfig.fibaroCCs.includes(0x26 /* Venetian Blinds */)) {
             const FibaroVenetianBlindCC = require("./manufacturerProprietary/Fibaro").FibaroVenetianBlindCC;
-            await new FibaroVenetianBlindCC(this.driver, {
+            await new FibaroVenetianBlindCC(this.host, {
                 nodeId: this.nodeId,
                 endpoint: this.endpointIndex,
-            }).interview();
+            }).interview(driver);
         }
         else {
-            this.driver.controllerLog.logNode(node.id, {
+            driver.controllerLog.logNode(node.id, {
                 message: `${this.constructor.name}: skipping interview because none of the implemented proprietary CCs are supported...`,
                 direction: "none",
             });
@@ -207,10 +233,10 @@ class ManufacturerProprietaryCC extends CommandClass_1.CommandClass {
         // Remember that the interview is complete
         this.interviewComplete = true;
     }
-    async refreshValues() {
+    async refreshValues(driver) {
         var _c;
         this.assertManufacturerIdIsSet();
-        const node = this.getNode();
+        const node = this.getNode(driver);
         // TODO: Can this be refactored?
         const proprietaryConfig = (_c = node.deviceConfig) === null || _c === void 0 ? void 0 : _c.proprietary;
         if (this.manufacturerId === 0x010f /* Fibaro */ &&
@@ -218,13 +244,13 @@ class ManufacturerProprietaryCC extends CommandClass_1.CommandClass {
             (0, typeguards_1.isArray)(proprietaryConfig.fibaroCCs) &&
             proprietaryConfig.fibaroCCs.includes(0x26 /* Venetian Blinds */)) {
             const FibaroVenetianBlindCC = require("./manufacturerProprietary/Fibaro").FibaroVenetianBlindCC;
-            await new FibaroVenetianBlindCC(this.driver, {
+            await new FibaroVenetianBlindCC(this.host, {
                 nodeId: this.nodeId,
                 endpoint: this.endpointIndex,
-            }).refreshValues();
+            }).refreshValues(driver);
         }
         else {
-            this.driver.controllerLog.logNode(node.id, {
+            driver.controllerLog.logNode(node.id, {
                 message: `${this.constructor.name}: skipping interview because none of the implemented proprietary CCs are supported...`,
                 direction: "none",
             });
@@ -233,8 +259,8 @@ class ManufacturerProprietaryCC extends CommandClass_1.CommandClass {
 };
 ManufacturerProprietaryCC = __decorate([
     (0, CommandClass_1.commandClass)(core_1.CommandClasses["Manufacturer Proprietary"]),
-    (0, CommandClass_1.implementedVersion)(1)
-    // TODO: Add a way to specify the expected response
+    (0, CommandClass_1.implementedVersion)(1),
+    (0, CommandClass_1.expectedCCResponse)(getReponseForManufacturerProprietary, testResponseForManufacturerProprietaryRequest)
 ], ManufacturerProprietaryCC);
 exports.ManufacturerProprietaryCC = ManufacturerProprietaryCC;
 function getProprietaryCCConstructor(manufacturerId) {

package/build/lib/commandclass/ManufacturerProprietaryCC.js.map

@@ -1 +1 @@
-{"version":3,"file":"ManufacturerProprietaryCC.js","sourceRoot":"","sources":["../../../src/lib/commandclass/ManufacturerProprietaryCC.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ManufacturerProprietaryCC.js","sourceRoot":"","sources":["../../../src/lib/commandclass/ManufacturerProprietaryCC.ts"],"names":[],"mappings":"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"}

package/build/lib/commandclass/ManufacturerSpecificCC.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import type { Maybe, MessageOrCCLogEntry, ValueID } from "@zwave-js/core";
 import { CommandClasses, ValueMetadata } from "@zwave-js/core";
+import type { ZWaveHost } from "@zwave-js/host";
 import type { Driver } from "../driver/Driver";
 import { PhysicalCCAPI } from "./API";
 import { CCCommandOptions, CommandClass, CommandClassDeserializationOptions } from "./CommandClass";
@@ -19,10 +20,10 @@ export declare class ManufacturerSpecificCCAPI extends PhysicalCCAPI {
 export declare class ManufacturerSpecificCC extends CommandClass {
     ccCommand: ManufacturerSpecificCommand;
     determineRequiredCCInterviews(): readonly CommandClasses[];
-    interview(): Promise<void>;
+    interview(driver: Driver): Promise<void>;
 }
 export declare class ManufacturerSpecificCCReport extends ManufacturerSpecificCC {
-    constructor(driver: Driver, options: CommandClassDeserializationOptions);
+    constructor(host: ZWaveHost, options: CommandClassDeserializationOptions);
     private _manufacturerId;
     get manufacturerId(): number;
     private _productType;
@@ -34,7 +35,7 @@ export declare class ManufacturerSpecificCCReport extends ManufacturerSpecificCC
 export declare class ManufacturerSpecificCCGet extends ManufacturerSpecificCC {
 }
 export declare class ManufacturerSpecificCCDeviceSpecificReport extends ManufacturerSpecificCC {
-    constructor(driver: Driver, options: CommandClassDeserializationOptions);
+    constructor(host: ZWaveHost, options: CommandClassDeserializationOptions);
     persistValues(): boolean;
     readonly type: DeviceIdType;
     readonly deviceId: string;
@@ -44,7 +45,7 @@ interface ManufacturerSpecificCCDeviceSpecificGetOptions extends CCCommandOption
     deviceIdType: DeviceIdType;
 }
 export declare class ManufacturerSpecificCCDeviceSpecificGet extends ManufacturerSpecificCC {
-    constructor(driver: Driver, options: CommandClassDeserializationOptions | ManufacturerSpecificCCDeviceSpecificGetOptions);
+    constructor(host: ZWaveHost, options: CommandClassDeserializationOptions | ManufacturerSpecificCCDeviceSpecificGetOptions);
     deviceIdType: DeviceIdType;
     serialize(): Buffer;
     toLogEntry(): MessageOrCCLogEntry;

package/build/lib/commandclass/ManufacturerSpecificCC.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ManufacturerSpecificCC.d.ts","sourceRoot":"","sources":["../../../src/lib/commandclass/ManufacturerSpecificCC.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,mBAAmB,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC1E,OAAO,EACN,cAAc,EAEd,aAAa,EAGb,MAAM,gBAAgB,CAAC;AAGxB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EAGN,gBAAgB,EAGhB,YAAY,EAEZ,kCAAkC,EAIlC,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAErE,wBAAgB,wBAAwB,IAAI,OAAO,CAKlD;AAED,wBAAgB,qBAAqB,IAAI,OAAO,CAK/C;AAED,wBAAgB,mBAAmB,IAAI,OAAO,CAK7C;AAED,wBAAgB,8BAA8B,IAAI,aAAa,CAK9D;AAED,wBAAgB,2BAA2B,IAAI,aAAa,CAK3D;AAED,wBAAgB,yBAAyB,IAAI,aAAa,CAKzD;AAID,qBACa,yBAA0B,SAAQ,aAAa;IACpD,eAAe,CAAC,GAAG,EAAE,2BAA2B,GAAG,KAAK,CAAC,OAAO,CAAC;IAW3D,GAAG;IAyBH,iBAAiB,CAC7B,YAAY,EAAE,YAAY,GACxB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAkB9B;AAED,qBAEa,sBAAuB,SAAQ,YAAY;IAC/C,SAAS,EAAE,2BAA2B,CAAC;IAExC,6BAA6B,IAAI,SAAS,cAAc,EAAE;IAKpD,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAuCvC;AAED,qBACa,4BAA6B,SAAQ,sBAAsB;gBAEtE,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,kCAAkC;IAW5C,OAAO,CAAC,eAAe,CAAS;IAChC,IAEW,cAAc,IAAI,MAAM,CAElC;IAED,OAAO,CAAC,YAAY,CAAS;IAC7B,IAEW,WAAW,IAAI,MAAM,CAE/B;IAED,OAAO,CAAC,UAAU,CAAS;IAC3B,IAEW,SAAS,IAAI,MAAM,CAE7B;IAEM,UAAU,IAAI,mBAAmB;CAUxC;AAED,qBAEa,yBAA0B,SAAQ,sBAAsB;CAAG;AAExE,qBACa,0CAA2C,SAAQ,sBAAsB;gBAEpF,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,kCAAkC;IAkBrC,aAAa,IAAI,OAAO;IAe/B,SAAgB,IAAI,EAAE,YAAY,CAAC;IACnC,SAAgB,QAAQ,EAAE,MAAM,CAAC;IAE1B,UAAU,IAAI,mBAAmB;CASxC;AAED,UAAU,8CACT,SAAQ,gBAAgB;IACxB,YAAY,EAAE,YAAY,CAAC;CAC3B;AAED,qBAEa,uCAAwC,SAAQ,sBAAsB;gBAEjF,MAAM,EAAE,MAAM,EACd,OAAO,EACJ,kCAAkC,GAClC,8CAA8C;IAa3C,YAAY,EAAE,YAAY,CAAC;IAE3B,SAAS,IAAI,MAAM;IAKnB,UAAU,IAAI,mBAAmB;CAWxC"}
+{"version":3,"file":"ManufacturerSpecificCC.d.ts","sourceRoot":"","sources":["../../../src/lib/commandclass/ManufacturerSpecificCC.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,mBAAmB,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC1E,OAAO,EACN,cAAc,EAEd,aAAa,EAGb,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAIhD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EAGN,gBAAgB,EAGhB,YAAY,EAEZ,kCAAkC,EAIlC,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAErE,wBAAgB,wBAAwB,IAAI,OAAO,CAKlD;AAED,wBAAgB,qBAAqB,IAAI,OAAO,CAK/C;AAED,wBAAgB,mBAAmB,IAAI,OAAO,CAK7C;AAED,wBAAgB,8BAA8B,IAAI,aAAa,CAK9D;AAED,wBAAgB,2BAA2B,IAAI,aAAa,CAK3D;AAED,wBAAgB,yBAAyB,IAAI,aAAa,CAKzD;AAID,qBACa,yBAA0B,SAAQ,aAAa;IACpD,eAAe,CAAC,GAAG,EAAE,2BAA2B,GAAG,KAAK,CAAC,OAAO,CAAC;IAW3D,GAAG;IAyBH,iBAAiB,CAC7B,YAAY,EAAE,YAAY,GACxB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAkB9B;AAED,qBAEa,sBAAuB,SAAQ,YAAY;IAC/C,SAAS,EAAE,2BAA2B,CAAC;IAExC,6BAA6B,IAAI,SAAS,cAAc,EAAE;IAKpD,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAuCrD;AAED,qBACa,4BAA6B,SAAQ,sBAAsB;gBAEtE,IAAI,EAAE,SAAS,EACf,OAAO,EAAE,kCAAkC;IAW5C,OAAO,CAAC,eAAe,CAAS;IAChC,IAEW,cAAc,IAAI,MAAM,CAElC;IAED,OAAO,CAAC,YAAY,CAAS;IAC7B,IAEW,WAAW,IAAI,MAAM,CAE/B;IAED,OAAO,CAAC,UAAU,CAAS;IAC3B,IAEW,SAAS,IAAI,MAAM,CAE7B;IAEM,UAAU,IAAI,mBAAmB;CAUxC;AAED,qBAEa,yBAA0B,SAAQ,sBAAsB;CAAG;AAExE,qBACa,0CAA2C,SAAQ,sBAAsB;gBAEpF,IAAI,EAAE,SAAS,EACf,OAAO,EAAE,kCAAkC;IAkBrC,aAAa,IAAI,OAAO;IAe/B,SAAgB,IAAI,EAAE,YAAY,CAAC;IACnC,SAAgB,QAAQ,EAAE,MAAM,CAAC;IAE1B,UAAU,IAAI,mBAAmB;CASxC;AAED,UAAU,8CACT,SAAQ,gBAAgB;IACxB,YAAY,EAAE,YAAY,CAAC;CAC3B;AAED,qBAEa,uCAAwC,SAAQ,sBAAsB;gBAEjF,IAAI,EAAE,SAAS,EACf,OAAO,EACJ,kCAAkC,GAClC,8CAA8C;IAa3C,YAAY,EAAE,YAAY,CAAC;IAE3B,SAAS,IAAI,MAAM;IAKnB,UAAU,IAAI,mBAAmB;CAWxC"}

package/build/lib/commandclass/ManufacturerSpecificCC.js

@@ -20,8 +20,8 @@ const __assertType__number = $o => {
     return _number($o);
 };
 const core_1 = require("@zwave-js/core");
+const serial_1 = require("@zwave-js/serial");
 const shared_1 = require("@zwave-js/shared");
-const Constants_1 = require("../message/Constants");
 const API_1 = require("./API");
 const CommandClass_1 = require("./CommandClass");
 const _Types_1 = require("./_Types");
@@ -115,17 +115,17 @@ let ManufacturerSpecificCC = class ManufacturerSpecificCC extends CommandClass_1
         // The Manufacturer Specific CC MUST be interviewed first
         return [];
     }
-    async interview() {
-        const node = this.getNode();
-        const endpoint = this.getEndpoint();
-        const api = endpoint.commandClasses["Manufacturer Specific"].withOptions({ priority: Constants_1.MessagePriority.NodeQuery });
+    async interview(driver) {
+        const node = this.getNode(driver);
+        const endpoint = this.getEndpoint(driver);
+        const api = endpoint.commandClasses["Manufacturer Specific"].withOptions({ priority: serial_1.MessagePriority.NodeQuery });
         if (!node.isControllerNode) {
-            this.driver.controllerLog.logNode(node.id, {
+            driver.controllerLog.logNode(node.id, {
                 endpoint: this.endpointIndex,
                 message: `Interviewing ${this.ccName}...`,
                 direction: "none",
             });
-            this.driver.controllerLog.logNode(node.id, {
+            driver.controllerLog.logNode(node.id, {
                 endpoint: this.endpointIndex,
                 message: "querying manufacturer information...",
                 direction: "outbound",
@@ -133,11 +133,11 @@ let ManufacturerSpecificCC = class ManufacturerSpecificCC extends CommandClass_1
             const mfResp = await api.get();
             if (mfResp) {
                 const logMessage = `received response for manufacturer information:
-  manufacturer: ${this.driver.configManager.lookupManufacturer(mfResp.manufacturerId) ||
+  manufacturer: ${this.host.configManager.lookupManufacturer(mfResp.manufacturerId) ||
                     "unknown"} (${(0, shared_1.num2hex)(mfResp.manufacturerId)})
   product type: ${(0, shared_1.num2hex)(mfResp.productType)}
   product id:   ${(0, shared_1.num2hex)(mfResp.productId)}`;
-                this.driver.controllerLog.logNode(node.id, {
+                driver.controllerLog.logNode(node.id, {
                     endpoint: this.endpointIndex,
                     message: logMessage,
                     direction: "inbound",
@@ -154,8 +154,8 @@ ManufacturerSpecificCC = __decorate([
 ], ManufacturerSpecificCC);
 exports.ManufacturerSpecificCC = ManufacturerSpecificCC;
 let ManufacturerSpecificCCReport = class ManufacturerSpecificCCReport extends ManufacturerSpecificCC {
-    constructor(driver, options) {
-        super(driver, options);
+    constructor(host, options) {
+        super(host, options);
         (0, core_1.validatePayload)(this.payload.length >= 6);
         this._manufacturerId = this.payload.readUInt16BE(0);
         this._productType = this.payload.readUInt16BE(2);
@@ -206,8 +206,8 @@ ManufacturerSpecificCCGet = __decorate([
 ], ManufacturerSpecificCCGet);
 exports.ManufacturerSpecificCCGet = ManufacturerSpecificCCGet;
 let ManufacturerSpecificCCDeviceSpecificReport = class ManufacturerSpecificCCDeviceSpecificReport extends ManufacturerSpecificCC {
-    constructor(driver, options) {
-        super(driver, options);
+    constructor(host, options) {
+        super(host, options);
         (0, core_1.validatePayload)(this.payload.length >= 2);
         this.type = this.payload[0] & 0b111;
         const dataFormat = this.payload[1] >>> 5;
@@ -249,8 +249,8 @@ ManufacturerSpecificCCDeviceSpecificReport = __decorate([
 ], ManufacturerSpecificCCDeviceSpecificReport);
 exports.ManufacturerSpecificCCDeviceSpecificReport = ManufacturerSpecificCCDeviceSpecificReport;
 let ManufacturerSpecificCCDeviceSpecificGet = class ManufacturerSpecificCCDeviceSpecificGet extends ManufacturerSpecificCC {
-    constructor(driver, options) {
-        super(driver, options);
+    constructor(host, options) {
+        super(host, options);
         if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
             throw new core_1.ZWaveError(`${this.constructor.name}: deserialization not implemented`, core_1.ZWaveErrorCodes.Deserialization_NotImplemented);
         }