@uboness/homebridge-mqtt 0.2.9 → 0.3.0

package/dist/service/Outlet.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Outlet = void 0;
-const index_js_1 = require("./characteristic/index.js");
-const until_js_1 = require("./until.js");
-var Outlet;
+import { on, outletInUse } from './characteristic/index.js';
+import { defineService } from './until.js';
+export var Outlet;
 (function (Outlet) {
     Outlet.TYPE = 'outlet';
     Outlet.create = async (platform, mqtt, accessory, serviceConfig, primary) => {
@@ -11,13 +8,13 @@ var Outlet;
             throw new Error(`Outlet factory expects an '${Outlet.TYPE}' config`);
         }
         const config = serviceConfig;
-        const { service, cleanup, online, ctx } = await (0, until_js_1.defineService)(platform, mqtt, accessory, platform.Service.Outlet, serviceConfig, primary);
+        const { service, cleanup, online, ctx } = await defineService(platform, mqtt, accessory, platform.Service.Outlet, serviceConfig, primary);
         if (!config.topics.on) {
             throw new Error(`Could not create Outlet service [${config.name}] for device [${accessory.context.deviceId}]. Missing 'on' topics`);
         }
-        cleanup.push(await (0, index_js_1.on)(platform, mqtt, accessory, service, config.topics.on, ctx));
+        cleanup.push(await on(platform, mqtt, accessory, service, config.topics.on, ctx));
         if (config.topics.outletInUse) {
-            cleanup.push(await (0, index_js_1.outletInUse)(platform, mqtt, accessory, service, config.topics.on, ctx));
+            cleanup.push(await outletInUse(platform, mqtt, accessory, service, config.topics.on, ctx));
         }
         else {
             service.getCharacteristic(platform.Characteristic.OutletInUse).setValue(true);
@@ -29,5 +26,5 @@ var Outlet;
             setConnected: value => online.setValue(value)
         };
     };
-})(Outlet || (exports.Outlet = Outlet = {}));
+})(Outlet || (Outlet = {}));
 //# sourceMappingURL=Outlet.js.map

package/dist/service/Outlet.js.map

@@ -1 +1 @@
-{"version":3,"file":"Outlet.js","sourceRoot":"","sources":["../../src/service/Outlet.ts"],"names":[],"mappings":";;;AAAA,wDAA6E;AAE7E,yCAA2C;AAE3C,IAAiB,MAAM,CAyCtB;AAzCD,WAAiB,MAAM;IAEN,WAAI,GAAG,QAAiB,CAAC;IAazB,aAAM,GAAwB,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE;QACnG,IAAI,aAAa,CAAC,IAAI,KAAK,OAAA,IAAI,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,8BAA8B,OAAA,IAAI,UAAU,CAAC,CAAC;QAClE,CAAC;QACD,MAAM,MAAM,GAAG,aAA8B,CAAC;QAC9C,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,wBAAa,EAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QAE1I,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,oCAAoC,MAAM,CAAC,IAAI,iBAAiB,SAAS,CAAC,OAAO,CAAC,QAAQ,wBAAwB,CAAC,CAAA;QACvI,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,MAAM,IAAA,aAAE,EAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;QAElF,IAAI,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;YAC5B,OAAO,CAAC,IAAI,CAAC,MAAM,IAAA,sBAAW,EAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;QAC/F,CAAC;aAAM,CAAC;YACJ,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QACjF,CAAC;QAED,OAAO;YACH,MAAM;YACN,GAAG,EAAE,OAAO;YACZ,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE;YAC/B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;SAChD,CAAA;IACL,CAAC,CAAA;AAEL,CAAC,EAzCgB,MAAM,sBAAN,MAAM,QAyCtB"}
+{"version":3,"file":"Outlet.js","sourceRoot":"","sources":["../../src/service/Outlet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAM,WAAW,EAAe,MAAM,2BAA2B,CAAC;AAE7E,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,MAAM,KAAW,MAAM,CAyCtB;AAzCD,WAAiB,MAAM;IAEN,WAAI,GAAG,QAAiB,CAAC;IAazB,aAAM,GAAwB,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE;QACnG,IAAI,aAAa,CAAC,IAAI,KAAK,OAAA,IAAI,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,8BAA8B,OAAA,IAAI,UAAU,CAAC,CAAC;QAClE,CAAC;QACD,MAAM,MAAM,GAAG,aAA8B,CAAC;QAC9C,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QAE1I,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,oCAAoC,MAAM,CAAC,IAAI,iBAAiB,SAAS,CAAC,OAAO,CAAC,QAAQ,wBAAwB,CAAC,CAAA;QACvI,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;QAElF,IAAI,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;YAC5B,OAAO,CAAC,IAAI,CAAC,MAAM,WAAW,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;QAC/F,CAAC;aAAM,CAAC;YACJ,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QACjF,CAAC;QAED,OAAO;YACH,MAAM;YACN,GAAG,EAAE,OAAO;YACZ,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE;YAC/B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;SAChD,CAAA;IACL,CAAC,CAAA;AAEL,CAAC,EAzCgB,MAAM,KAAN,MAAM,QAyCtB"}

package/dist/service/SecuritySystem.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SecuritySystem = void 0;
-const index_js_1 = require("./characteristic/index.js");
-const until_js_1 = require("./until.js");
-var SecuritySystem;
+import { securitySystemAlarmType, securitySystemCurrentState, securitySystemTargetState, statusTampered } from './characteristic/index.js';
+import { defineService } from './until.js';
+export var SecuritySystem;
 (function (SecuritySystem) {
     SecuritySystem.TYPE = 'security-system';
     SecuritySystem.create = async (platform, mqtt, accessory, serviceConfig, primary) => {
@@ -11,30 +8,30 @@ var SecuritySystem;
             throw new Error(`SecuritySystem factory expects a '${SecuritySystem.TYPE}' config`);
         }
         const config = serviceConfig;
-        const { service, cleanup, online, ctx } = await (0, until_js_1.defineService)(platform, mqtt, accessory, platform.Service.SecuritySystem, serviceConfig, primary);
+        const { service, cleanup, online, ctx } = await defineService(platform, mqtt, accessory, platform.Service.SecuritySystem, serviceConfig, primary);
         if (config.topics.securitySystemCurrentState) {
-            cleanup.push(await (0, index_js_1.securitySystemCurrentState)(platform, mqtt, accessory, service, config.topics.securitySystemCurrentState, ctx));
+            cleanup.push(await securitySystemCurrentState(platform, mqtt, accessory, service, config.topics.securitySystemCurrentState, ctx));
         }
         else if (config.topics.currentState) {
-            cleanup.push(await (0, index_js_1.securitySystemCurrentState)(platform, mqtt, accessory, service, config.topics.currentState, ctx));
+            cleanup.push(await securitySystemCurrentState(platform, mqtt, accessory, service, config.topics.currentState, ctx));
         }
         else {
             throw new Error(`Could not create SecuritySystem service [${config.name}] for device [${accessory.context.deviceId}]. missing 'securitySystemCurrentState' (or 'currentState') topics`);
         }
         if (config.topics.securitySystemTargetState) {
-            cleanup.push(await (0, index_js_1.securitySystemTargetState)(platform, mqtt, accessory, service, config.topics.securitySystemTargetState, ctx));
+            cleanup.push(await securitySystemTargetState(platform, mqtt, accessory, service, config.topics.securitySystemTargetState, ctx));
         }
         else if (config.topics.targetState) {
-            cleanup.push(await (0, index_js_1.securitySystemTargetState)(platform, mqtt, accessory, service, config.topics.targetState, ctx));
+            cleanup.push(await securitySystemTargetState(platform, mqtt, accessory, service, config.topics.targetState, ctx));
         }
         else {
             throw new Error(`Could not create SecuritySystem service [${config.name}] for device [${accessory.context.deviceId}]. missing 'securitySystemTargetState' (or 'targetState') topics`);
         }
         if (config.topics.alarmType) {
-            cleanup.push(await (0, index_js_1.securitySystemAlarmType)(platform, mqtt, accessory, service, config.topics.alarmType, ctx));
+            cleanup.push(await securitySystemAlarmType(platform, mqtt, accessory, service, config.topics.alarmType, ctx));
         }
         if (config.topics.statusTampered) {
-            cleanup.push(await (0, index_js_1.statusTampered)(platform, mqtt, accessory, service, config.topics.statusTampered, ctx));
+            cleanup.push(await statusTampered(platform, mqtt, accessory, service, config.topics.statusTampered, ctx));
         }
         return {
             config,
@@ -43,5 +40,5 @@ var SecuritySystem;
             setConnected: value => online.setValue(value)
         };
     };
-})(SecuritySystem || (exports.SecuritySystem = SecuritySystem = {}));
+})(SecuritySystem || (SecuritySystem = {}));
 //# sourceMappingURL=SecuritySystem.js.map

package/dist/service/SecuritySystem.js.map

@@ -1 +1 @@
-{"version":3,"file":"SecuritySystem.js","sourceRoot":"","sources":["../../src/service/SecuritySystem.ts"],"names":[],"mappings":";;;AAAA,wDASmC;AAEnC,yCAA2C;AAE3C,IAAiB,cAAc,CA6D9B;AA7DD,WAAiB,cAAc;IAEd,mBAAI,GAAG,iBAA0B,CAAC;IAoBlC,qBAAM,GAAwB,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE;QACnG,IAAI,aAAa,CAAC,IAAI,KAAK,eAAA,IAAI,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,qCAAqC,eAAA,IAAI,UAAU,CAAC,CAAC;QACzE,CAAC;QACD,MAAM,MAAM,GAAG,aAAuB,CAAC;QAEvC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,wBAAa,EAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,cAAc,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QAElJ,IAAI,MAAM,CAAC,MAAM,CAAC,0BAA0B,EAAE,CAAC;YAC3C,OAAO,CAAC,IAAI,CAAC,MAAM,IAAA,qCAA0B,EAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,0BAA0B,EAAE,GAAG,CAAC,CAAC,CAAC;QACtI,CAAC;aAAM,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;YACpC,OAAO,CAAC,IAAI,CAAC,MAAM,IAAA,qCAA0B,EAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC,CAAC;QACxH,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,KAAK,CAAC,4CAA4C,MAAM,CAAC,IAAI,iBAAiB,SAAS,CAAC,OAAO,CAAC,QAAQ,oEAAoE,CAAC,CAAA;QAC3L,CAAC;QAED,IAAI,MAAM,CAAC,MAAM,CAAC,yBAAyB,EAAE,CAAC;YAC1C,OAAO,CAAC,IAAI,CAAC,MAAM,IAAA,oCAAyB,EAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,yBAAyB,EAAE,GAAG,CAAC,CAAC,CAAC;QACpI,CAAC;aAAM,IAAI,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;YACnC,OAAO,CAAC,IAAI,CAAC,MAAM,IAAA,oCAAyB,EAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC;QACtH,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,KAAK,CAAC,4CAA4C,MAAM,CAAC,IAAI,iBAAiB,SAAS,CAAC,OAAO,CAAC,QAAQ,kEAAkE,CAAC,CAAA;QACzL,CAAC;QAGD,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YAC1B,OAAO,CAAC,IAAI,CAAC,MAAM,IAAA,kCAAuB,EAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC;QAClH,CAAC;QACD,IAAI,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;YAC/B,OAAO,CAAC,IAAI,CAAC,MAAM,IAAA,yBAAc,EAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC,CAAC;QAC9G,CAAC;QAED,OAAO;YACH,MAAM;YACN,GAAG,EAAE,OAAO;YACZ,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE;YAC/B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;SAChD,CAAA;IACL,CAAC,CAAA;AACL,CAAC,EA7DgB,cAAc,8BAAd,cAAc,QA6D9B"}
+{"version":3,"file":"SecuritySystem.js","sourceRoot":"","sources":["../../src/service/SecuritySystem.ts"],"names":[],"mappings":"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"}

package/dist/service/SmokeSensor.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SmokeSensor = void 0;
-const index_js_1 = require("./characteristic/index.js");
-const until_js_1 = require("./until.js");
-var SmokeSensor;
+import { smokeDetected } from './characteristic/index.js';
+import { defineService, initStandardSensorCharacteristics } from './until.js';
+export var SmokeSensor;
 (function (SmokeSensor) {
     SmokeSensor.TYPE = 'smoke-sensor';
     SmokeSensor.create = async (platform, mqtt, accessory, serviceConfig, primary) => {
@@ -11,12 +8,12 @@ var SmokeSensor;
             throw new Error(`SmokeSensor factory expects a '${SmokeSensor.TYPE}' config`);
         }
         const config = serviceConfig;
-        const { service, cleanup, online, ctx } = await (0, until_js_1.defineService)(platform, mqtt, accessory, platform.Service.SmokeSensor, serviceConfig, primary);
+        const { service, cleanup, online, ctx } = await defineService(platform, mqtt, accessory, platform.Service.SmokeSensor, serviceConfig, primary);
         if (!config.topics.smokeDetected) {
             throw new Error(`Could not create SmokeSensor service [${config.name}] for device [${accessory.context.deviceId}]. missing 'smokeDetected' topics`);
         }
-        cleanup.push(await (0, index_js_1.smokeDetected)(platform, mqtt, accessory, service, config.topics.smokeDetected, ctx));
-        cleanup.push(await (0, until_js_1.initStandardSensorCharacteristics)(platform, mqtt, accessory, service, config, ctx));
+        cleanup.push(await smokeDetected(platform, mqtt, accessory, service, config.topics.smokeDetected, ctx));
+        cleanup.push(await initStandardSensorCharacteristics(platform, mqtt, accessory, service, config, ctx));
         return {
             config,
             hap: service,
@@ -24,5 +21,5 @@ var SmokeSensor;
             setConnected: value => online.setValue(value)
         };
     };
-})(SmokeSensor || (exports.SmokeSensor = SmokeSensor = {}));
+})(SmokeSensor || (SmokeSensor = {}));
 //# sourceMappingURL=SmokeSensor.js.map

package/dist/service/SmokeSensor.js.map

@@ -1 +1 @@
-{"version":3,"file":"SmokeSensor.js","sourceRoot":"","sources":["../../src/service/SmokeSensor.ts"],"names":[],"mappings":";;;AAAA,wDAAyE;AAEzE,yCAA8E;AAE9E,IAAiB,WAAW,CAkC3B;AAlCD,WAAiB,WAAW;IAEX,gBAAI,GAAG,cAAuB,CAAC;IAU/B,kBAAM,GAAwB,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE;QACnG,IAAI,aAAa,CAAC,IAAI,KAAK,YAAA,IAAI,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,kCAAkC,YAAA,IAAI,UAAU,CAAC,CAAC;QACtE,CAAC;QACD,MAAM,MAAM,GAAG,aAAuB,CAAC;QAEvC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,wBAAa,EAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QAE/I,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,yCAAyC,MAAM,CAAC,IAAI,iBAAiB,SAAS,CAAC,OAAO,CAAC,QAAQ,mCAAmC,CAAC,CAAA;QACvJ,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,MAAM,IAAA,wBAAa,EAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC,CAAC;QAExG,OAAO,CAAC,IAAI,CAAC,MAAM,IAAA,4CAAiC,EAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;QAEvG,OAAO;YACH,MAAM;YACN,GAAG,EAAE,OAAO;YACZ,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE;YAC/B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;SAChD,CAAA;IACL,CAAC,CAAA;AACL,CAAC,EAlCgB,WAAW,2BAAX,WAAW,QAkC3B"}
+{"version":3,"file":"SmokeSensor.js","sourceRoot":"","sources":["../../src/service/SmokeSensor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAiB,MAAM,2BAA2B,CAAC;AAEzE,OAAO,EAAE,aAAa,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAE9E,MAAM,KAAW,WAAW,CAkC3B;AAlCD,WAAiB,WAAW;IAEX,gBAAI,GAAG,cAAuB,CAAC;IAU/B,kBAAM,GAAwB,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE;QACnG,IAAI,aAAa,CAAC,IAAI,KAAK,YAAA,IAAI,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,kCAAkC,YAAA,IAAI,UAAU,CAAC,CAAC;QACtE,CAAC;QACD,MAAM,MAAM,GAAG,aAAuB,CAAC;QAEvC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QAE/I,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,yCAAyC,MAAM,CAAC,IAAI,iBAAiB,SAAS,CAAC,OAAO,CAAC,QAAQ,mCAAmC,CAAC,CAAA;QACvJ,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,MAAM,aAAa,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC,CAAC;QAExG,OAAO,CAAC,IAAI,CAAC,MAAM,iCAAiC,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;QAEvG,OAAO;YACH,MAAM;YACN,GAAG,EAAE,OAAO;YACZ,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE;YAC/B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;SAChD,CAAA;IACL,CAAC,CAAA;AACL,CAAC,EAlCgB,WAAW,KAAX,WAAW,QAkC3B"}

package/dist/service/Speaker.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Speaker = void 0;
-const index_js_1 = require("./characteristic/index.js");
-const until_js_1 = require("./until.js");
-var Speaker;
+import { mute, volume } from './characteristic/index.js';
+import { defineService } from './until.js';
+export var Speaker;
 (function (Speaker) {
     Speaker.TYPE = 'speaker';
     Speaker.create = async (platform, mqtt, accessory, serviceConfig, primary) => {
@@ -11,13 +8,13 @@ var Speaker;
             throw new Error(`Speaker factory expects a '${Speaker.TYPE}' config`);
         }
         const config = serviceConfig;
-        const { service, cleanup, online, ctx } = await (0, until_js_1.defineService)(platform, mqtt, accessory, platform.Service.Speaker, serviceConfig, primary);
+        const { service, cleanup, online, ctx } = await defineService(platform, mqtt, accessory, platform.Service.Speaker, serviceConfig, primary);
         if (!config.topics.mute) {
             throw new Error(`Could not create Speaker service [${config.name}] for device [${accessory.context.deviceId}]. missing 'mute' topics`);
         }
-        cleanup.push(await (0, index_js_1.mute)(platform, mqtt, accessory, service, config.topics.mute, ctx));
+        cleanup.push(await mute(platform, mqtt, accessory, service, config.topics.mute, ctx));
         if (config.topics.volume) {
-            cleanup.push(await (0, index_js_1.volume)(platform, mqtt, accessory, service, config.topics.volume, ctx));
+            cleanup.push(await volume(platform, mqtt, accessory, service, config.topics.volume, ctx));
         }
         return {
             config,
@@ -26,5 +23,5 @@ var Speaker;
             setConnected: value => online.setValue(value)
         };
     };
-})(Speaker || (exports.Speaker = Speaker = {}));
+})(Speaker || (Speaker = {}));
 //# sourceMappingURL=Speaker.js.map

package/dist/service/Speaker.js.map

@@ -1 +1 @@
-{"version":3,"file":"Speaker.js","sourceRoot":"","sources":["../../src/service/Speaker.ts"],"names":[],"mappings":";;;AAAA,wDAAuE;AAEvE,yCAA2C;AAE3C,IAAiB,OAAO,CAqCvB;AArCD,WAAiB,OAAO;IAEP,YAAI,GAAG,SAAkB,CAAC;IAW1B,cAAM,GAAwB,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE;QACnG,IAAI,aAAa,CAAC,IAAI,KAAK,QAAA,IAAI,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,8BAA8B,QAAA,IAAI,UAAU,CAAC,CAAC;QAClE,CAAC;QACD,MAAM,MAAM,GAAG,aAAuB,CAAC;QAEvC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,wBAAa,EAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QAE3I,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,qCAAqC,MAAM,CAAC,IAAI,iBAAiB,SAAS,CAAC,OAAO,CAAC,QAAQ,0BAA0B,CAAC,CAAA;QAC1I,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,MAAM,IAAA,eAAI,EAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;QAEtF,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACvB,OAAO,CAAC,IAAI,CAAC,MAAM,IAAA,iBAAM,EAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;QAC9F,CAAC;QAED,OAAO;YACH,MAAM;YACN,GAAG,EAAE,OAAO;YACZ,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE;YAC/B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;SAChD,CAAA;IACL,CAAC,CAAA;AACL,CAAC,EArCgB,OAAO,uBAAP,OAAO,QAqCvB"}
+{"version":3,"file":"Speaker.js","sourceRoot":"","sources":["../../src/service/Speaker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAQ,MAAM,EAAU,MAAM,2BAA2B,CAAC;AAEvE,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,MAAM,KAAW,OAAO,CAqCvB;AArCD,WAAiB,OAAO;IAEP,YAAI,GAAG,SAAkB,CAAC;IAW1B,cAAM,GAAwB,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE;QACnG,IAAI,aAAa,CAAC,IAAI,KAAK,QAAA,IAAI,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,8BAA8B,QAAA,IAAI,UAAU,CAAC,CAAC;QAClE,CAAC;QACD,MAAM,MAAM,GAAG,aAAuB,CAAC;QAEvC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QAE3I,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,qCAAqC,MAAM,CAAC,IAAI,iBAAiB,SAAS,CAAC,OAAO,CAAC,QAAQ,0BAA0B,CAAC,CAAA;QAC1I,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;QAEtF,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACvB,OAAO,CAAC,IAAI,CAAC,MAAM,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;QAC9F,CAAC;QAED,OAAO;YACH,MAAM;YACN,GAAG,EAAE,OAAO;YACZ,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE;YAC/B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;SAChD,CAAA;IACL,CAAC,CAAA;AACL,CAAC,EArCgB,OAAO,KAAP,OAAO,QAqCvB"}

package/dist/service/StatefulScene.d.ts

@@ -1,4 +1,4 @@
-import { StickyOn } from './characteristic';
+import { StickyOn } from './characteristic/index.js';
 import { MqttService } from './MqttService.js';
 export declare namespace StatefulScene {
     const TYPE: "stateful-scene";

package/dist/service/StatefulScene.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StatefulScene.d.ts","sourceRoot":"","sources":["../../src/service/StatefulScene.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,yBAAiB,aAAa,CAAC;IAEpB,MAAM,IAAI,EAAG,gBAAyB,CAAC;IAE9C,KAAY,MAAM,GAAG,WAAW,CAAC,MAAM,GAAG;QACtC,IAAI,EAAE,OAAO,IAAI,CAAC;QAClB,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,QAAQ,GAAG,WAAW,CAAC,cAAc,CAAA;KAChD,CAAC;IAEK,MAAM,MAAM,EAAE,WAAW,CAAC,OAmBhC,CAAC;CACL"}
+{"version":3,"file":"StatefulScene.d.ts","sourceRoot":"","sources":["../../src/service/StatefulScene.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,yBAAiB,aAAa,CAAC;IAEpB,MAAM,IAAI,EAAG,gBAAyB,CAAC;IAE9C,KAAY,MAAM,GAAG,WAAW,CAAC,MAAM,GAAG;QACtC,IAAI,EAAE,OAAO,IAAI,CAAC;QAClB,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,QAAQ,GAAG,WAAW,CAAC,cAAc,CAAA;KAChD,CAAC;IAEK,MAAM,MAAM,EAAE,WAAW,CAAC,OAmBhC,CAAC;CACL"}

package/dist/service/StatefulScene.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.StatefulScene = void 0;
-const characteristic_1 = require("./characteristic");
-const until_js_1 = require("./until.js");
-var StatefulScene;
+import { stickyOn } from './characteristic/index.js';
+import { defineService } from './until.js';
+export var StatefulScene;
 (function (StatefulScene) {
     StatefulScene.TYPE = 'stateful-scene';
     StatefulScene.create = async (platform, mqtt, accessory, serviceConfig, primary) => {
@@ -11,11 +8,11 @@ var StatefulScene;
             throw new Error(`StatelessScene factory expects a '${StatefulScene.TYPE}' config`);
         }
         const config = serviceConfig;
-        const { service, cleanup, online, ctx } = await (0, until_js_1.defineService)(platform, mqtt, accessory, platform.Service.Switch, serviceConfig, primary);
+        const { service, cleanup, online, ctx } = await defineService(platform, mqtt, accessory, platform.Service.Switch, serviceConfig, primary);
         if (!config.topics.stickyOn) {
             throw new Error(`Could not create Button service [${config.name}] for device [${accessory.context.deviceId}]. Missing 'stickyOn' topics`);
         }
-        cleanup.push(await (0, characteristic_1.stickyOn)(platform, mqtt, accessory, service, config.topics.stickyOn, ctx));
+        cleanup.push(await stickyOn(platform, mqtt, accessory, service, config.topics.stickyOn, ctx));
         return {
             config,
             hap: service,
@@ -23,5 +20,5 @@ var StatefulScene;
             setConnected: value => online.setValue(value)
         };
     };
-})(StatefulScene || (exports.StatefulScene = StatefulScene = {}));
+})(StatefulScene || (StatefulScene = {}));
 //# sourceMappingURL=StatefulScene.js.map

package/dist/service/StatefulScene.js.map

@@ -1 +1 @@
-{"version":3,"file":"StatefulScene.js","sourceRoot":"","sources":["../../src/service/StatefulScene.ts"],"names":[],"mappings":";;;AAAA,qDAAsD;AAEtD,yCAA2C;AAE3C,IAAiB,aAAa,CA8B7B;AA9BD,WAAiB,aAAa;IAEb,kBAAI,GAAG,gBAAyB,CAAC;IAQjC,oBAAM,GAAwB,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE;QACnG,IAAI,aAAa,CAAC,IAAI,KAAK,cAAA,IAAI,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,qCAAqC,cAAA,IAAI,UAAU,CAAC,CAAC;QACzE,CAAC;QACD,MAAM,MAAM,GAAG,aAAuB,CAAC;QAEvC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,wBAAa,EAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QAE1I,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,oCAAoC,MAAM,CAAC,IAAI,iBAAiB,SAAS,CAAC,OAAO,CAAC,QAAQ,8BAA8B,CAAC,CAAC;QAC9I,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,MAAM,IAAA,yBAAQ,EAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;QAE9F,OAAO;YACH,MAAM;YACN,GAAG,EAAE,OAAO;YACZ,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE;YAC/B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;SAChD,CAAC;IACN,CAAC,CAAC;AACN,CAAC,EA9BgB,aAAa,6BAAb,aAAa,QA8B7B"}
+{"version":3,"file":"StatefulScene.js","sourceRoot":"","sources":["../../src/service/StatefulScene.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAY,MAAM,2BAA2B,CAAC;AAE/D,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,MAAM,KAAW,aAAa,CA8B7B;AA9BD,WAAiB,aAAa;IAEb,kBAAI,GAAG,gBAAyB,CAAC;IAQjC,oBAAM,GAAwB,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE;QACnG,IAAI,aAAa,CAAC,IAAI,KAAK,cAAA,IAAI,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,qCAAqC,cAAA,IAAI,UAAU,CAAC,CAAC;QACzE,CAAC;QACD,MAAM,MAAM,GAAG,aAAuB,CAAC;QAEvC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QAE1I,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,oCAAoC,MAAM,CAAC,IAAI,iBAAiB,SAAS,CAAC,OAAO,CAAC,QAAQ,8BAA8B,CAAC,CAAC;QAC9I,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,MAAM,QAAQ,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;QAE9F,OAAO;YACH,MAAM;YACN,GAAG,EAAE,OAAO;YACZ,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE;YAC/B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;SAChD,CAAC;IACN,CAAC,CAAC;AACN,CAAC,EA9BgB,aAAa,KAAb,aAAa,QA8B7B"}

package/dist/service/StatelessScene.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.StatelessScene = void 0;
-const index_js_1 = require("./characteristic/index.js");
-const until_js_1 = require("./until.js");
-var StatelessScene;
+import { momentaryOn } from './characteristic/index.js';
+import { defineService } from './until.js';
+export var StatelessScene;
 (function (StatelessScene) {
     StatelessScene.TYPE = 'stateless-scene';
     StatelessScene.create = async (platform, mqtt, accessory, serviceConfig, primary) => {
@@ -11,11 +8,11 @@ var StatelessScene;
             throw new Error(`StatelessScene factory expects a '${StatelessScene.TYPE}' config`);
         }
         const config = serviceConfig;
-        const { service, cleanup, online, ctx } = await (0, until_js_1.defineService)(platform, mqtt, accessory, platform.Service.Switch, serviceConfig, primary);
+        const { service, cleanup, online, ctx } = await defineService(platform, mqtt, accessory, platform.Service.Switch, serviceConfig, primary);
         if (!config.topics.momentaryOn) {
             throw new Error(`Could not create Button service [${config.name}] for device [${accessory.context.deviceId}]. Missing 'momentaryOn' topics`);
         }
-        cleanup.push(await (0, index_js_1.momentaryOn)(platform, mqtt, accessory, service, config.topics.momentaryOn, ctx));
+        cleanup.push(await momentaryOn(platform, mqtt, accessory, service, config.topics.momentaryOn, ctx));
         return {
             config,
             hap: service,
@@ -23,5 +20,5 @@ var StatelessScene;
             setConnected: value => online.setValue(value)
         };
     };
-})(StatelessScene || (exports.StatelessScene = StatelessScene = {}));
+})(StatelessScene || (StatelessScene = {}));
 //# sourceMappingURL=StatelessScene.js.map

package/dist/service/StatelessScene.js.map

@@ -1 +1 @@
-{"version":3,"file":"StatelessScene.js","sourceRoot":"","sources":["../../src/service/StatelessScene.ts"],"names":[],"mappings":";;;AAAA,wDAAqE;AAErE,yCAA2C;AAE3C,IAAiB,cAAc,CAgC9B;AAhCD,WAAiB,cAAc;IAEd,mBAAI,GAAG,iBAA0B,CAAC;IAUlC,qBAAM,GAAwB,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE;QACnG,IAAI,aAAa,CAAC,IAAI,KAAK,eAAA,IAAI,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,qCAAqC,eAAA,IAAI,UAAU,CAAC,CAAC;QACzE,CAAC;QACD,MAAM,MAAM,GAAG,aAAuB,CAAC;QAEvC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,wBAAa,EAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QAE1I,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,oCAAoC,MAAM,CAAC,IAAI,iBAAiB,SAAS,CAAC,OAAO,CAAC,QAAQ,iCAAiC,CAAC,CAAC;QACjJ,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,MAAM,IAAA,sBAAW,EAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC;QAEpG,OAAO;YACH,MAAM;YACN,GAAG,EAAE,OAAO;YACZ,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE;YAC/B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;SAChD,CAAC;IACN,CAAC,CAAC;AACN,CAAC,EAhCgB,cAAc,8BAAd,cAAc,QAgC9B"}
+{"version":3,"file":"StatelessScene.js","sourceRoot":"","sources":["../../src/service/StatelessScene.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAe,MAAM,2BAA2B,CAAC;AAErE,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,MAAM,KAAW,cAAc,CAgC9B;AAhCD,WAAiB,cAAc;IAEd,mBAAI,GAAG,iBAA0B,CAAC;IAUlC,qBAAM,GAAwB,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE;QACnG,IAAI,aAAa,CAAC,IAAI,KAAK,eAAA,IAAI,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,qCAAqC,eAAA,IAAI,UAAU,CAAC,CAAC;QACzE,CAAC;QACD,MAAM,MAAM,GAAG,aAAuB,CAAC;QAEvC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QAE1I,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,oCAAoC,MAAM,CAAC,IAAI,iBAAiB,SAAS,CAAC,OAAO,CAAC,QAAQ,iCAAiC,CAAC,CAAC;QACjJ,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,MAAM,WAAW,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC;QAEpG,OAAO;YACH,MAAM;YACN,GAAG,EAAE,OAAO;YACZ,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE;YAC/B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;SAChD,CAAC;IACN,CAAC,CAAC;AACN,CAAC,EAhCgB,cAAc,KAAd,cAAc,QAgC9B"}

package/dist/service/Switch.d.ts

@@ -1,5 +1,5 @@
-import { On } from './characteristic/index';
-import { MqttService } from './MqttService';
+import { On } from './characteristic/index.js';
+import { MqttService } from './MqttService.js';
 export declare namespace Switch {
     const TYPE: "switch";
     type Config = MqttService.Config & {

package/dist/service/Switch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Switch.d.ts","sourceRoot":"","sources":["../../src/service/Switch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,yBAAiB,MAAM,CAAC;IAEb,MAAM,IAAI,EAAG,QAAiB,CAAC;IAEtC,KAAY,MAAM,GAAG,WAAW,CAAC,MAAM,GAAG;QACtC,IAAI,EAAE,OAAO,IAAI,CAAC;QAClB,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EACF,EAAE,GACF,WAAW,CAAC,cAAc,CAAA;KACjC,CAAC;IAEK,MAAM,MAAM,EAAE,WAAW,CAAC,OAmBhC,CAAA;CACJ"}
+{"version":3,"file":"Switch.d.ts","sourceRoot":"","sources":["../../src/service/Switch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,EAAE,EAAE,MAAM,2BAA2B,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,yBAAiB,MAAM,CAAC;IAEb,MAAM,IAAI,EAAG,QAAiB,CAAC;IAEtC,KAAY,MAAM,GAAG,WAAW,CAAC,MAAM,GAAG;QACtC,IAAI,EAAE,OAAO,IAAI,CAAC;QAClB,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EACF,EAAE,GACF,WAAW,CAAC,cAAc,CAAA;KACjC,CAAC;IAEK,MAAM,MAAM,EAAE,WAAW,CAAC,OAmBhC,CAAA;CACJ"}

package/dist/service/Switch.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Switch = void 0;
-const index_1 = require("./characteristic/index");
-const until_1 = require("./until");
-var Switch;
+import { on } from './characteristic/index.js';
+import { defineService } from './until.js';
+export var Switch;
 (function (Switch) {
     Switch.TYPE = 'switch';
     Switch.create = async (platform, mqtt, accessory, serviceConfig, primary) => {
@@ -11,11 +8,11 @@ var Switch;
             throw new Error(`Switch factory expects a '${Switch.TYPE}' config`);
         }
         const config = serviceConfig;
-        const { service, cleanup, online, ctx } = await (0, until_1.defineService)(platform, mqtt, accessory, platform.Service.Switch, serviceConfig, primary);
+        const { service, cleanup, online, ctx } = await defineService(platform, mqtt, accessory, platform.Service.Switch, serviceConfig, primary);
         if (!config.topics.on) {
             throw new Error(`Could not create Switch service [${config.name}] for device [${accessory.context.deviceId}]. Missing 'on' topics`);
         }
-        cleanup.push(await (0, index_1.on)(platform, mqtt, accessory, service, config.topics.on, ctx));
+        cleanup.push(await on(platform, mqtt, accessory, service, config.topics.on, ctx));
         return {
             config,
             hap: service,
@@ -23,5 +20,5 @@ var Switch;
             setConnected: value => online.setValue(value)
         };
     };
-})(Switch || (exports.Switch = Switch = {}));
+})(Switch || (Switch = {}));
 //# sourceMappingURL=Switch.js.map

package/dist/service/Switch.js.map

@@ -1 +1 @@
-{"version":3,"file":"Switch.js","sourceRoot":"","sources":["../../src/service/Switch.ts"],"names":[],"mappings":";;;AAAA,kDAAgD;AAEhD,mCAAwC;AAExC,IAAiB,MAAM,CAgCtB;AAhCD,WAAiB,MAAM;IAEN,WAAI,GAAG,QAAiB,CAAC;IAUzB,aAAM,GAAwB,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE;QACnG,IAAI,aAAa,CAAC,IAAI,KAAK,OAAA,IAAI,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,6BAA6B,OAAA,IAAI,UAAU,CAAC,CAAC;QACjE,CAAC;QACD,MAAM,MAAM,GAAG,aAA8B,CAAC;QAE9C,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,qBAAa,EAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QAE1I,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,oCAAoC,MAAM,CAAC,IAAI,iBAAiB,SAAS,CAAC,OAAO,CAAC,QAAQ,wBAAwB,CAAC,CAAA;QACvI,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,MAAM,IAAA,UAAE,EAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;QAElF,OAAO;YACH,MAAM;YACN,GAAG,EAAE,OAAO;YACZ,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE;YAC/B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;SAChD,CAAA;IACL,CAAC,CAAA;AACL,CAAC,EAhCgB,MAAM,sBAAN,MAAM,QAgCtB"}
+{"version":3,"file":"Switch.js","sourceRoot":"","sources":["../../src/service/Switch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAM,MAAM,2BAA2B,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,MAAM,KAAW,MAAM,CAgCtB;AAhCD,WAAiB,MAAM;IAEN,WAAI,GAAG,QAAiB,CAAC;IAUzB,aAAM,GAAwB,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE;QACnG,IAAI,aAAa,CAAC,IAAI,KAAK,OAAA,IAAI,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,6BAA6B,OAAA,IAAI,UAAU,CAAC,CAAC;QACjE,CAAC;QACD,MAAM,MAAM,GAAG,aAA8B,CAAC;QAE9C,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QAE1I,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,oCAAoC,MAAM,CAAC,IAAI,iBAAiB,SAAS,CAAC,OAAO,CAAC,QAAQ,wBAAwB,CAAC,CAAA;QACvI,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;QAElF,OAAO;YACH,MAAM;YACN,GAAG,EAAE,OAAO;YACZ,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE;YAC/B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;SAChD,CAAA;IACL,CAAC,CAAA;AACL,CAAC,EAhCgB,MAAM,KAAN,MAAM,QAgCtB"}

package/dist/service/TemperatureSensor.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TemperatureSensor = void 0;
-const index_js_1 = require("./characteristic/index.js");
-const until_js_1 = require("./until.js");
-var TemperatureSensor;
+import { currentTemperature } from './characteristic/index.js';
+import { defineService, initStandardSensorCharacteristics } from './until.js';
+export var TemperatureSensor;
 (function (TemperatureSensor) {
     TemperatureSensor.TYPE = 'temperature-sensor';
     TemperatureSensor.create = async (platform, mqtt, accessory, serviceConfig, primary) => {
@@ -11,12 +8,12 @@ var TemperatureSensor;
             throw new Error(`TemperatureSensor factory expects a '${TemperatureSensor.TYPE}' config`);
         }
         const config = serviceConfig;
-        const { service, cleanup, online, ctx } = await (0, until_js_1.defineService)(platform, mqtt, accessory, platform.Service.TemperatureSensor, serviceConfig, primary);
+        const { service, cleanup, online, ctx } = await defineService(platform, mqtt, accessory, platform.Service.TemperatureSensor, serviceConfig, primary);
         if (!config.topics.currentTemperature) {
             throw new Error(`Could not create ${TemperatureSensor.TYPE} service [${config.name}] for device [${accessory.context.deviceId}]. missing 'currentTemperature' topics`);
         }
-        cleanup.push(await (0, index_js_1.currentTemperature)(platform, mqtt, accessory, service, config.topics.currentTemperature, ctx));
-        cleanup.push(await (0, until_js_1.initStandardSensorCharacteristics)(platform, mqtt, accessory, service, config, ctx));
+        cleanup.push(await currentTemperature(platform, mqtt, accessory, service, config.topics.currentTemperature, ctx));
+        cleanup.push(await initStandardSensorCharacteristics(platform, mqtt, accessory, service, config, ctx));
         return {
             config,
             hap: service,
@@ -24,5 +21,5 @@ var TemperatureSensor;
             setConnected: value => online.setValue(value)
         };
     };
-})(TemperatureSensor || (exports.TemperatureSensor = TemperatureSensor = {}));
+})(TemperatureSensor || (TemperatureSensor = {}));
 //# sourceMappingURL=TemperatureSensor.js.map

package/dist/service/TemperatureSensor.js.map

@@ -1 +1 @@
-{"version":3,"file":"TemperatureSensor.js","sourceRoot":"","sources":["../../src/service/TemperatureSensor.ts"],"names":[],"mappings":";;;AAAA,wDAAmF;AAEnF,yCAA8E;AAE9E,IAAiB,iBAAiB,CAkCjC;AAlCD,WAAiB,iBAAiB;IAEjB,sBAAI,GAAG,oBAA6B,CAAC;IAUrC,wBAAM,GAAwB,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE;QACnG,IAAI,aAAa,CAAC,IAAI,KAAK,kBAAA,IAAI,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,wCAAwC,kBAAA,IAAI,UAAU,CAAC,CAAC;QAC5E,CAAC;QACD,MAAM,MAAM,GAAG,aAAuB,CAAC;QAEvC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,wBAAa,EAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,iBAAiB,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QAErJ,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,oBAAoB,kBAAA,IAAI,aAAa,MAAM,CAAC,IAAI,iBAAiB,SAAS,CAAC,OAAO,CAAC,QAAQ,wCAAwC,CAAC,CAAC;QACzJ,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,MAAM,IAAA,6BAAkB,EAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC,CAAC;QAElH,OAAO,CAAC,IAAI,CAAC,MAAM,IAAA,4CAAiC,EAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;QAEvG,OAAO;YACH,MAAM;YACN,GAAG,EAAE,OAAO;YACZ,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE;YAC/B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;SAChD,CAAA;IACL,CAAC,CAAA;AACL,CAAC,EAlCgB,iBAAiB,iCAAjB,iBAAiB,QAkCjC"}
+{"version":3,"file":"TemperatureSensor.js","sourceRoot":"","sources":["../../src/service/TemperatureSensor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAsB,MAAM,2BAA2B,CAAC;AAEnF,OAAO,EAAE,aAAa,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAE9E,MAAM,KAAW,iBAAiB,CAkCjC;AAlCD,WAAiB,iBAAiB;IAEjB,sBAAI,GAAG,oBAA6B,CAAC;IAUrC,wBAAM,GAAwB,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE;QACnG,IAAI,aAAa,CAAC,IAAI,KAAK,kBAAA,IAAI,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,wCAAwC,kBAAA,IAAI,UAAU,CAAC,CAAC;QAC5E,CAAC;QACD,MAAM,MAAM,GAAG,aAAuB,CAAC;QAEvC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,iBAAiB,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QAErJ,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,oBAAoB,kBAAA,IAAI,aAAa,MAAM,CAAC,IAAI,iBAAiB,SAAS,CAAC,OAAO,CAAC,QAAQ,wCAAwC,CAAC,CAAC;QACzJ,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,MAAM,kBAAkB,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC,CAAC;QAElH,OAAO,CAAC,IAAI,CAAC,MAAM,iCAAiC,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;QAEvG,OAAO;YACH,MAAM;YACN,GAAG,EAAE,OAAO;YACZ,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE;YAC/B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;SAChD,CAAA;IACL,CAAC,CAAA;AACL,CAAC,EAlCgB,iBAAiB,KAAjB,iBAAiB,QAkCjC"}

package/dist/service/Thermostat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Thermostat.d.ts","sourceRoot":"","sources":["../../src/service/Thermostat.ts"],"names":[],"mappings":"AAIA,OAAO,EAEH,2BAA2B,EAE3B,0BAA0B,EAE1B,uBAAuB,EAEvB,kBAAkB,EAElB,2BAA2B,EAE3B,yBAAyB,EAEzB,sBAAsB,EAEtB,iBAAiB,EAEjB,uBAAuB,EAC1B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,yBAAiB,UAAU,CAAC;IAEjB,MAAM,IAAI,EAAG,YAAqB,CAAC;IAE1C,KAAY,MAAM,GAAG;QACjB,IAAI,EAAE,OAAO,IAAI,CAAC;QAClB,IAAI,EAAE,MAAM,CAAC;QAMb,QAAQ,CAAC,EAAE,WAAW,GAAG,WAAW,GAAG,WAAW,CAAC;QAOnD,cAAc,CAAC,EAAE,MAAM,CAAC;QAExB,MAAM,EACF,kBAAkB,GAClB,iBAAiB,GACjB,OAAO,CAAC,0BAA0B,CAAC,GAAG;YAAE,YAAY,CAAC,EAAE,0BAA0B,CAAC,4BAA4B,CAAC,CAAA;SAAE,GACjH,OAAO,CAAC,yBAAyB,CAAC,GAAG;YAAE,WAAW,CAAC,EAAE,yBAAyB,CAAC,2BAA2B,CAAC,CAAA;SAAE,GAC7G,OAAO,CAAC,uBAAuB,CAAC,GAChC,OAAO,CAAC,2BAA2B,CAAC,GACpC,OAAO,CAAC,2BAA2B,CAAC,GACpC,OAAO,CAAC,uBAAuB,CAAC,GAChC,OAAO,CAAC,sBAAsB,CAAC,GAC/B,WAAW,CAAC,cAAc,CAAA;KACjC,CAAA;IAEM,MAAM,MAAM,EAAE,WAAW,CAAC,OA8DhC,CAAA;CACJ"}
+{"version":3,"file":"Thermostat.d.ts","sourceRoot":"","sources":["../../src/service/Thermostat.ts"],"names":[],"mappings":"AAGA,OAAO,EAEH,2BAA2B,EAE3B,0BAA0B,EAE1B,uBAAuB,EAEvB,kBAAkB,EAElB,2BAA2B,EAE3B,yBAAyB,EAEzB,sBAAsB,EAEtB,iBAAiB,EAEjB,uBAAuB,EAC1B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,yBAAiB,UAAU,CAAC;IAEjB,MAAM,IAAI,EAAG,YAAqB,CAAC;IAE1C,KAAY,MAAM,GAAG;QACjB,IAAI,EAAE,OAAO,IAAI,CAAC;QAClB,IAAI,EAAE,MAAM,CAAC;QAMb,QAAQ,CAAC,EAAE,WAAW,GAAG,WAAW,GAAG,WAAW,CAAC;QAOnD,cAAc,CAAC,EAAE,MAAM,CAAC;QAExB,MAAM,EACF,kBAAkB,GAClB,iBAAiB,GACjB,OAAO,CAAC,0BAA0B,CAAC,GAAG;YAAE,YAAY,CAAC,EAAE,0BAA0B,CAAC,4BAA4B,CAAC,CAAA;SAAE,GACjH,OAAO,CAAC,yBAAyB,CAAC,GAAG;YAAE,WAAW,CAAC,EAAE,yBAAyB,CAAC,2BAA2B,CAAC,CAAA;SAAE,GAC7G,OAAO,CAAC,uBAAuB,CAAC,GAChC,OAAO,CAAC,2BAA2B,CAAC,GACpC,OAAO,CAAC,2BAA2B,CAAC,GACpC,OAAO,CAAC,uBAAuB,CAAC,GAChC,OAAO,CAAC,sBAAsB,CAAC,GAC/B,WAAW,CAAC,cAAc,CAAA;KACjC,CAAA;IAEM,MAAM,MAAM,EAAE,WAAW,CAAC,OA8DhC,CAAA;CACJ"}

package/dist/service/Thermostat.js

@@ -1,61 +1,57 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Thermostat = void 0;
-const common_1 = require("../common");
-const index_js_1 = require("./characteristic/index.js");
-const until_1 = require("./until");
-var Thermostat;
+import { nextTick } from '../common.js';
+import { coolingThresholdTemperature, currentHeatingCoolingState, currentRelativeHumidity, currentTemperature, heatingThresholdTemperature, targetHeatingCoolingState, targetRelativeHumidity, targetTemperature, temperatureDisplayUnits } from './characteristic/index.js';
+import { defineService } from './until.js';
+export var Thermostat;
 (function (Thermostat) {
     Thermostat.TYPE = 'thermostat';
     Thermostat.create = async (platform, mqtt, accessory, serviceConfig, primary) => {
-        var _a, _b, _c;
         if (serviceConfig.type !== Thermostat.TYPE) {
             throw new Error(`Thermostat factory expects a '${Thermostat.TYPE}' config`);
         }
         const config = serviceConfig;
-        const { service, cleanup, online, ctx } = await (0, until_1.defineService)(platform, mqtt, accessory, platform.Service.Thermostat, serviceConfig, primary);
+        const { service, cleanup, online, ctx } = await defineService(platform, mqtt, accessory, platform.Service.Thermostat, serviceConfig, primary);
         // required characteristics
         if (!config.topics.currentTemperature) {
             throw new Error(`Could not create '${Thermostat.TYPE}' service [${config.name}] for device [${accessory.context.deviceId}]. missing 'currentTemperature' topics`);
         }
-        cleanup.push(await (0, index_js_1.currentTemperature)(platform, mqtt, accessory, service, config.topics.currentTemperature, ctx));
+        cleanup.push(await currentTemperature(platform, mqtt, accessory, service, config.topics.currentTemperature, ctx));
         if (!config.topics.targetTemperature) {
             throw new Error(`Could not create '${Thermostat.TYPE}' service [${config.name}] for device [${accessory.context.deviceId}]. missing 'targetTemperature' topics`);
         }
-        cleanup.push(await (0, index_js_1.targetTemperature)(platform, mqtt, accessory, service, config.topics.targetTemperature, ctx));
+        cleanup.push(await targetTemperature(platform, mqtt, accessory, service, config.topics.targetTemperature, ctx));
         // optional characteristics
         if (config.topics.currentHeatingCoolingState || config.topics.currentState) {
-            const charConfig = (_a = config.topics.currentHeatingCoolingState) !== null && _a !== void 0 ? _a : config.topics.currentState;
-            cleanup.push(await (0, index_js_1.currentHeatingCoolingState)(platform, mqtt, accessory, service, charConfig, ctx));
+            const charConfig = config.topics.currentHeatingCoolingState ?? config.topics.currentState;
+            cleanup.push(await currentHeatingCoolingState(platform, mqtt, accessory, service, charConfig, ctx));
         }
         else {
             setDefaultCurrentHeatingCoolingState(platform, accessory, service, config);
         }
         if (config.topics.targetHeatingCoolingState || config.topics.targetState) {
-            const charConfig = (_b = config.topics.targetHeatingCoolingState) !== null && _b !== void 0 ? _b : config.topics.targetState;
-            cleanup.push(await (0, index_js_1.targetHeatingCoolingState)(platform, mqtt, accessory, service, charConfig, ctx));
+            const charConfig = config.topics.targetHeatingCoolingState ?? config.topics.targetState;
+            cleanup.push(await targetHeatingCoolingState(platform, mqtt, accessory, service, charConfig, ctx));
         }
         else {
-            ((_c = service.getCharacteristic(platform.Characteristic.TargetHeatingCoolingState)) !== null && _c !== void 0 ? _c : service.addCharacteristic(platform.Characteristic.TargetHeatingCoolingState))
+            (service.getCharacteristic(platform.Characteristic.TargetHeatingCoolingState) ?? service.addCharacteristic(platform.Characteristic.TargetHeatingCoolingState))
                 .setValue(platform.Characteristic.TargetHeatingCoolingState.AUTO)
                 .setProps({
                 validValues: [platform.Characteristic.TargetHeatingCoolingState.AUTO]
             });
         }
         if (config.topics.temperatureDisplayUnits) {
-            cleanup.push(await (0, index_js_1.temperatureDisplayUnits)(platform, mqtt, accessory, service, config.topics.temperatureDisplayUnits, ctx));
+            cleanup.push(await temperatureDisplayUnits(platform, mqtt, accessory, service, config.topics.temperatureDisplayUnits, ctx));
         }
         if (config.topics.coolingThreshold) {
-            cleanup.push(await (0, index_js_1.coolingThresholdTemperature)(platform, mqtt, accessory, service, config.topics.coolingThreshold, ctx));
+            cleanup.push(await coolingThresholdTemperature(platform, mqtt, accessory, service, config.topics.coolingThreshold, ctx));
         }
         if (config.topics.heatingThreshold) {
-            cleanup.push(await (0, index_js_1.heatingThresholdTemperature)(platform, mqtt, accessory, service, config.topics.heatingThreshold, ctx));
+            cleanup.push(await heatingThresholdTemperature(platform, mqtt, accessory, service, config.topics.heatingThreshold, ctx));
         }
         if (config.topics.currentRelativeHumidity) {
-            cleanup.push(await (0, index_js_1.currentRelativeHumidity)(platform, mqtt, accessory, service, config.topics.currentRelativeHumidity, ctx));
+            cleanup.push(await currentRelativeHumidity(platform, mqtt, accessory, service, config.topics.currentRelativeHumidity, ctx));
         }
         if (config.topics.targetRelativeHumidity) {
-            cleanup.push(await (0, index_js_1.targetRelativeHumidity)(platform, mqtt, accessory, service, config.topics.targetRelativeHumidity, ctx));
+            cleanup.push(await targetRelativeHumidity(platform, mqtt, accessory, service, config.topics.targetRelativeHumidity, ctx));
         }
         return {
             config,
@@ -64,12 +60,11 @@ var Thermostat;
             setConnected: value => online.setValue(value)
         };
     };
-})(Thermostat || (exports.Thermostat = Thermostat = {}));
+})(Thermostat || (Thermostat = {}));
 const setDefaultCurrentHeatingCoolingState = (platform, accessory, service, config) => {
-    var _a, _b, _c;
-    const threshold = (_a = config.stateThreshold) !== null && _a !== void 0 ? _a : 0.5;
-    const hvacType = (_b = config.hvacType) !== null && _b !== void 0 ? _b : 'heat-cool';
-    const state = (_c = service.getCharacteristic(platform.Characteristic.CurrentHeatingCoolingState)) !== null && _c !== void 0 ? _c : service.addCharacteristic(platform.Characteristic.CurrentHeatingCoolingState);
+    const threshold = config.stateThreshold ?? 0.5;
+    const hvacType = config.hvacType ?? 'heat-cool';
+    const state = service.getCharacteristic(platform.Characteristic.CurrentHeatingCoolingState) ?? service.addCharacteristic(platform.Characteristic.CurrentHeatingCoolingState);
     const adjustState = (current, target) => {
         if (current < target - threshold) {
             switch (hvacType) {
@@ -90,16 +85,16 @@ const setDefaultCurrentHeatingCoolingState = (platform, accessory, service, conf
             }
         }
         else {
-            (0, common_1.nextTick)(() => state.setValue(platform.Characteristic.CurrentHeatingCoolingState.OFF));
+            nextTick(() => state.setValue(platform.Characteristic.CurrentHeatingCoolingState.OFF));
         }
     };
     const currentTemp = service.getCharacteristic(platform.Characteristic.CurrentTemperature)
         .onSet(value => {
-        (0, common_1.nextTick)(() => adjustState(value, targetTemp.value));
+        nextTick(() => adjustState(value, targetTemp.value));
     });
     const targetTemp = service.getCharacteristic(platform.Characteristic.TargetTemperature)
         .onSet(value => {
-        (0, common_1.nextTick)(() => adjustState(currentTemp.value, value));
+        nextTick(() => adjustState(currentTemp.value, value));
     });
 };
 //# sourceMappingURL=Thermostat.js.map

package/dist/service/Thermostat.js.map

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