homebridge-tydom 0.23.3 → 0.23.5

package/README.md

@@ -139,6 +139,38 @@ You can optionnaly rename zones (default is `Zone 1`, `Zone 2`, etc.),
 }
 ```
 
+#### GarageDoorOpener
+
+You can customize the default GarageDoorOpener `delay` (defaults to 20 seconds)
+
+Value is in milliseconds:
+
+```json
+{
+  "platforms": [
+    {
+      "settings": {
+        "1529094720": {"delay": 10000} // 10 seconds
+      }
+    }
+  ]
+}
+```
+
+You can also configure an `autoCloseDelay`
+
+```json
+{
+  "platforms": [
+    {
+      "settings": {
+        "1529094720": {"autoCloseDelay": 300000} // 5 minutes
+      }
+    }
+  ]
+}
+```
+
 #### Webhooks
 
 You can specify webhooks in your `config.json` to receive non homekit-dependent notifications.

package/lib/accessories/contactSensor.d.ts

@@ -1,4 +1,5 @@
 import type { PlatformAccessory } from 'homebridge';
 import TydomController from '../controller';
-export declare const setupContactSensor: (accessory: PlatformAccessory, controller: TydomController) => void;
-export declare const updateContactSensor: (accessory: PlatformAccessory, _controller: TydomController, updates: Record<string, unknown>[]) => void;
+import { TydomAccessoryContext } from '../typings';
+export declare const setupContactSensor: (accessory: PlatformAccessory<TydomAccessoryContext>, controller: TydomController) => void;
+export declare const updateContactSensor: (accessory: PlatformAccessory<TydomAccessoryContext>, _controller: TydomController, updates: Record<string, unknown>[]) => void;

package/lib/accessories/fan.d.ts

@@ -1,4 +1,5 @@
 import type { PlatformAccessory } from 'homebridge';
 import TydomController from '../controller';
-export declare const setupFan: (accessory: PlatformAccessory, controller: TydomController) => void;
-export declare const updateFan: (accessory: PlatformAccessory, controller: TydomController, updates: Record<string, unknown>[]) => void;
+import type { TydomAccessoryContext } from '../typings';
+export declare const setupFan: (accessory: PlatformAccessory<TydomAccessoryContext>, controller: TydomController) => void;
+export declare const updateFan: (accessory: PlatformAccessory<TydomAccessoryContext>, controller: TydomController, updates: Record<string, unknown>[]) => void;

package/lib/accessories/garageDoorOpener.d.ts

@@ -1,5 +1,18 @@
-import type { PlatformAccessory } from 'homebridge';
+import { PlatformAccessory } from 'homebridge';
 import TydomController from '../controller';
-import { TydomAccessoryUpdateType } from '../helpers/accessory';
-export declare const setupGarageDoorOpener: (accessory: PlatformAccessory, controller: TydomController) => void;
-export declare const updateGarageDoorOpener: (accessory: PlatformAccessory, _controller: TydomController, updates: Record<string, unknown>[], type: TydomAccessoryUpdateType) => void;
+import { TydomAccessoryUpdateType } from '../helpers';
+import { TydomAccessoryContext } from '../typings';
+type GarageDoorOpenerSettings = {
+    delay?: number;
+    autoCloseDelay?: number;
+};
+type GarageDoorOpenerState = {
+    currentDoorState: number;
+    targetDoorState: number;
+    lastUpdatedAt: number;
+    computedPosition: number;
+};
+type GarageDoorOpenerContext = TydomAccessoryContext<GarageDoorOpenerSettings, GarageDoorOpenerState>;
+export declare const setupGarageDoorOpener: (accessory: PlatformAccessory<GarageDoorOpenerContext>, controller: TydomController) => void;
+export declare const updateGarageDoorOpener: (accessory: PlatformAccessory<GarageDoorOpenerContext>, _controller: TydomController, updates: Record<string, unknown>[], type: TydomAccessoryUpdateType) => void;
+export {};

package/lib/accessories/garageDoorOpener.js

@@ -1,21 +1,40 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateGarageDoorOpener = exports.setupGarageDoorOpener = void 0;
+const debug_1 = __importDefault(require("debug"));
+const helpers_1 = require("../helpers");
+const utils_1 = require("../utils");
 const hap_1 = require("../config/hap");
-const accessory_1 = require("../helpers/accessory");
-const basic_1 = require("../utils/basic");
-const chalk_1 = require("../utils/chalk");
-const debug_1 = require("../utils/debug");
+const DEFAULT_GARAGE_DOOR_DELAY = 20 * 1000;
 const setupGarageDoorOpener = (accessory, controller) => {
     const { context } = accessory;
     const { client } = controller;
     const { CurrentDoorState, TargetDoorState } = hap_1.Characteristic;
-    const GARAGE_DOOR_DELAY = 15 * 1000;
-    const { deviceId, endpointId, state } = context;
+    const { deviceId, endpointId, state, settings } = context;
+    const { delay: garageDoorDelay = DEFAULT_GARAGE_DOOR_DELAY, autoCloseDelay } = settings;
     const assignState = (update) => {
         Object.assign(state, update);
     };
+    const getDoorStateLabel = (currentDoorState) => {
+        switch (currentDoorState) {
+            case CurrentDoorState.OPEN:
+                return 'OPEN';
+            case CurrentDoorState.CLOSED:
+                return 'CLOSED';
+            case CurrentDoorState.OPENING:
+                return 'OPENING';
+            case CurrentDoorState.CLOSING:
+                return 'CLOSING';
+            case CurrentDoorState.STOPPED:
+                return 'STOPPED';
+        }
+        return 'UNKNOWN';
+    };
     const assignCurrentDoorState = (currentDoorState) => {
+        (0, debug_1.default)(`assignCurrentDoorState=${(0, utils_1.chalkString)(getDoorStateLabel(currentDoorState))}`);
         Object.assign(state, { currentDoorState });
         service.updateCharacteristic(CurrentDoorState, currentDoorState);
     };
@@ -25,20 +44,20 @@ const setupGarageDoorOpener = (accessory, controller) => {
             value: 'TOGGLE'
         }
     ]);
-    (0, accessory_1.setupAccessoryInformationService)(accessory, controller);
-    (0, accessory_1.setupAccessoryIdentifyHandler)(accessory, controller);
+    (0, helpers_1.setupAccessoryInformationService)(accessory, controller);
+    (0, helpers_1.setupAccessoryIdentifyHandler)(accessory, controller);
     assignState({
         currentDoorState: CurrentDoorState.CLOSED,
         targetDoorState: TargetDoorState.CLOSED,
         lastUpdatedAt: 0,
-        computedPosition: 0 // 0 <-> GARAGE_DOOR_DELAY
+        computedPosition: 0 // 0 <-> 100%
     });
     const getNextCurrentDoorState = (targetDoorState) => {
         switch (state.currentDoorState) {
             case CurrentDoorState.OPEN: {
                 switch (targetDoorState) {
                     case TargetDoorState.CLOSED:
-                        return CurrentDoorState.OPENING;
+                        return CurrentDoorState.CLOSING;
                     case TargetDoorState.OPEN:
                         return CurrentDoorState.OPEN;
                 }
@@ -49,7 +68,7 @@ const setupGarageDoorOpener = (accessory, controller) => {
                     case TargetDoorState.CLOSED:
                         return CurrentDoorState.CLOSED;
                     case TargetDoorState.OPEN:
-                        return CurrentDoorState.CLOSING;
+                        return CurrentDoorState.OPENING;
                 }
                 break;
             }
@@ -71,7 +90,7 @@ const setupGarageDoorOpener = (accessory, controller) => {
     };
     const computeCurrentPosition = () => {
         const { lastUpdatedAt, computedPosition: lastComputedPosition, currentDoorState } = state;
-        const elapsed = lastUpdatedAt - Date.now();
+        const elapsed = Date.now() - lastUpdatedAt;
         switch (currentDoorState) {
             case CurrentDoorState.STOPPED: {
                 return lastComputedPosition;
@@ -83,10 +102,10 @@ const setupGarageDoorOpener = (accessory, controller) => {
                 return 0;
             }
             case CurrentDoorState.OPENING: {
-                return Math.min(100, lastComputedPosition + elapsed / GARAGE_DOOR_DELAY);
+                return Math.min(100, lastComputedPosition + 100 * (elapsed / garageDoorDelay));
             }
             case CurrentDoorState.CLOSING: {
-                return Math.max(0, lastComputedPosition - elapsed / GARAGE_DOOR_DELAY);
+                return Math.max(0, lastComputedPosition - 100 * (elapsed / garageDoorDelay));
             }
         }
         return 0;
@@ -96,14 +115,14 @@ const setupGarageDoorOpener = (accessory, controller) => {
     if (legacyService) {
         accessory.removeService(legacyService);
     }
-    const service = (0, accessory_1.addAccessoryService)(accessory, hap_1.Service.GarageDoorOpener, `${accessory.displayName}`, true);
+    const service = (0, helpers_1.addAccessoryService)(accessory, hap_1.Service.GarageDoorOpener, `${accessory.displayName}`, true);
     service
         .getCharacteristic(CurrentDoorState)
         .on("get" /* CharacteristicEventTypes.GET */, async (callback) => {
-        (0, debug_1.debugGet)(CurrentDoorState, service);
+        (0, utils_1.debugGet)(CurrentDoorState, service);
         try {
             const nextValue = state.currentDoorState;
-            (0, debug_1.debugGetResult)(CurrentDoorState, service, nextValue);
+            (0, utils_1.debugGetResult)(CurrentDoorState, service, nextValue);
             callback(null, nextValue);
         }
         catch (err) {
@@ -114,10 +133,10 @@ const setupGarageDoorOpener = (accessory, controller) => {
     service
         .getCharacteristic(TargetDoorState)
         .on("get" /* CharacteristicEventTypes.GET */, async (callback) => {
-        (0, debug_1.debugGet)(TargetDoorState, service);
+        (0, utils_1.debugGet)(TargetDoorState, service);
         try {
             const nextValue = state.targetDoorState;
-            (0, debug_1.debugGetResult)(TargetDoorState, service, nextValue);
+            (0, utils_1.debugGetResult)(TargetDoorState, service, nextValue);
             callback(null, nextValue);
         }
         catch (err) {
@@ -125,47 +144,71 @@ const setupGarageDoorOpener = (accessory, controller) => {
         }
     })
         .on("set" /* CharacteristicEventTypes.SET */, async (value, callback) => {
-        (0, debug_1.debugSet)(TargetDoorState, service, value);
+        (0, utils_1.debugSet)(TargetDoorState, service, value);
         try {
-            (0, debug_1.debugSetResult)(TargetDoorState, service, value);
-            const targetDoorState = (0, basic_1.asNumber)(value);
+            (0, utils_1.debugSetResult)(TargetDoorState, service, value);
+            const targetDoorState = (0, utils_1.asNumber)(value);
             assignState({
                 targetDoorState: targetDoorState,
                 lastUpdatedAt: Date.now(),
                 computedPosition: computeCurrentPosition()
             });
+            // debug(`computedPosition=${chalkNumber(state.computedPosition)}`);
             let nextCurrentDoorState = getNextCurrentDoorState(targetDoorState);
+            // debug(`nextCurrentDoorState=${chalkString(getDoorStateLabel(nextCurrentDoorState))}`);
             if (nextCurrentDoorState === state.currentDoorState) {
-                (0, debug_1.debug)(`nextCurrentDoorState=${(0, chalk_1.chalkNumber)(nextCurrentDoorState)} === state.currentDoorState`);
+                (0, debug_1.default)(`nextCurrentDoorState=${(0, utils_1.chalkNumber)(nextCurrentDoorState)} === state.currentDoorState`);
                 callback();
                 return;
             }
             await toggleGarageDoor();
             assignCurrentDoorState(nextCurrentDoorState);
-            callback();
             // Handle Stopped state, if we are stopped, wait one second and trigger again to reverse course
             // eg. Stopped -> Closing if target is Closed
             if (nextCurrentDoorState === CurrentDoorState.STOPPED) {
-                await (0, basic_1.waitFor)(1000);
+                await (0, utils_1.waitFor)('stopping', 1000);
                 assignState({
                     targetDoorState: targetDoorState,
                     lastUpdatedAt: Date.now(),
                     computedPosition: computeCurrentPosition()
                 });
+                // debug(`computedPosition=${chalkNumber(state.computedPosition)}`);
                 nextCurrentDoorState = getNextCurrentDoorState(targetDoorState);
+                // debug(`nextCurrentDoorState=${chalkString(getDoorStateLabel(nextCurrentDoorState))}`);
                 await toggleGarageDoor();
                 assignCurrentDoorState(nextCurrentDoorState);
             }
+            callback();
             // Finally update pending states
             switch (nextCurrentDoorState) {
-                case CurrentDoorState.OPENING:
-                    await (0, basic_1.waitFor)((100 - state.computedPosition) * GARAGE_DOOR_DELAY);
-                    assignCurrentDoorState(CurrentDoorState.OPEN);
+                case CurrentDoorState.OPENING: {
+                    const delay = ((100 - state.computedPosition) * garageDoorDelay) / 100;
+                    // debug(`delay=${chalkNumber(delay)}`);
+                    try {
+                        await (0, utils_1.waitFor)(`${deviceId}.pending`, delay);
+                        assignCurrentDoorState(CurrentDoorState.OPEN);
+                        if (autoCloseDelay) {
+                            await (0, utils_1.waitFor)(`${deviceId}.pending`, autoCloseDelay);
+                            assignCurrentDoorState(CurrentDoorState.CLOSED);
+                        }
+                    }
+                    catch (err) {
+                        // debug(`Aborted OPEN update with delay=${chalkNumber(delay)}`);
+                    }
                     break;
-                case CurrentDoorState.CLOSING:
-                    await (0, basic_1.waitFor)(state.computedPosition * GARAGE_DOOR_DELAY);
-                    assignCurrentDoorState(CurrentDoorState.CLOSED);
+                }
+                case CurrentDoorState.CLOSING: {
+                    const delay = (state.computedPosition * garageDoorDelay) / 100;
+                    // debug(`delay=${chalkNumber(delay)}`);
+                    try {
+                        await (0, utils_1.waitFor)(`${deviceId}.pending`, delay);
+                        assignCurrentDoorState(CurrentDoorState.CLOSED);
+                    }
+                    catch (err) {
+                        // debug(`Aborted CLOSED update with delay=${chalkNumber(delay)}`);
+                    }
                     break;
+                }
             }
         }
         catch (err) {
@@ -173,6 +216,29 @@ const setupGarageDoorOpener = (accessory, controller) => {
         }
     })
         .getValue();
+    // const switchService = addAccessoryService(accessory, Service.Switch, `${accessory.displayName} Switch`, true);
+    // debugAddSubService(switchService, accessory);
+    // service.addLinkedService(switchService);
+    // switchService
+    //   .getCharacteristic(Characteristic.On)
+    //   .on(CharacteristicEventTypes.SET, async (value: CharacteristicValue, callback: CharacteristicSetCallback) => {
+    //     debugSet(Characteristic.On, service, value);
+    //     if (!value) {
+    //       callback();
+    //       return;
+    //     }
+    //     try {
+    //       await toggleGarageDoor();
+    //       debugSetResult(Characteristic.On, service, value);
+    //       callback();
+    //       setTimeout(() => {
+    //         service.updateCharacteristic(Characteristic.On, false);
+    //       }, 1000);
+    //     } catch (err) {
+    //       callback(err as Error);
+    //     }
+    //   })
+    //   .updateValue(false);
 };
 exports.setupGarageDoorOpener = setupGarageDoorOpener;
 const updateGarageDoorOpener = (accessory, _controller, updates, type) => {
@@ -183,7 +249,7 @@ const updateGarageDoorOpener = (accessory, _controller, updates, type) => {
         updates.forEach((update) => {
             const { values } = update;
             const { event } = values;
-            (0, debug_1.debug)(`New ${(0, chalk_1.chalkKeyword)('GarageDoorOpener')} event=${(0, chalk_1.chalkJson)(event)}`);
+            (0, debug_1.default)(`New ${(0, utils_1.chalkKeyword)('GarageDoorOpener')} event=${(0, utils_1.chalkJson)(event)}`);
         });
         return;
     }

package/lib/accessories/lightbulb.d.ts

@@ -1,4 +1,13 @@
 import type { PlatformAccessory } from 'homebridge';
 import TydomController from '../controller';
-export declare const setupLightbulb: (accessory: PlatformAccessory, controller: TydomController) => void;
-export declare const updateLightbulb: (accessory: PlatformAccessory, controller: TydomController, updates: Record<string, unknown>[]) => void;
+import { TydomAccessoryContext } from '../typings/tydom';
+type LightbulbSettings = Record<string, never>;
+type LightbulbState = {
+    latestBrightness: number;
+    pendingUpdatedValues: number[];
+    lastUpdatedAt: number;
+};
+type LightbulbContext = TydomAccessoryContext<LightbulbSettings, LightbulbState>;
+export declare const setupLightbulb: (accessory: PlatformAccessory<LightbulbContext>, controller: TydomController) => void;
+export declare const updateLightbulb: (accessory: PlatformAccessory<LightbulbContext>, controller: TydomController, updates: Record<string, unknown>[]) => void;
+export {};

package/lib/accessories/outlet.d.ts

@@ -1,4 +1,5 @@
 import type { PlatformAccessory } from 'homebridge';
+import { TydomAccessoryContext } from '../typings';
 import TydomController from '../controller';
-export declare const setupOutlet: (accessory: PlatformAccessory, controller: TydomController) => void;
-export declare const updateOutlet: (accessory: PlatformAccessory, controller: TydomController, updates: Record<string, unknown>[]) => void;
+export declare const setupOutlet: (accessory: PlatformAccessory<TydomAccessoryContext>, controller: TydomController) => void;
+export declare const updateOutlet: (accessory: PlatformAccessory<TydomAccessoryContext>, controller: TydomController, updates: Record<string, unknown>[]) => void;

package/lib/accessories/securitySystem.d.ts

@@ -1,5 +1,17 @@
 import type { PlatformAccessory } from 'homebridge';
 import TydomController from '../controller';
 import { TydomAccessoryUpdateType } from '../helpers/accessory';
-export declare const setupSecuritySystem: (accessory: PlatformAccessory, controller: TydomController) => Promise<void>;
-export declare const updateSecuritySystem: (accessory: PlatformAccessory, controller: TydomController, updates: Record<string, unknown>[], type: TydomAccessoryUpdateType) => void;
+import type { TydomAccessoryContext } from '../typings/tydom';
+type ZoneAliases = {
+    stay?: number[];
+    night?: number[];
+};
+type SecuritySystemSettings = {
+    aliases?: ZoneAliases;
+    sensors?: boolean;
+    pin?: string;
+};
+type SecuritySystemContext = TydomAccessoryContext<SecuritySystemSettings>;
+export declare const setupSecuritySystem: (accessory: PlatformAccessory<SecuritySystemContext>, controller: TydomController) => Promise<void>;
+export declare const updateSecuritySystem: (accessory: PlatformAccessory<SecuritySystemContext>, controller: TydomController, updates: Record<string, unknown>[], type: TydomAccessoryUpdateType) => void;
+export {};

package/lib/accessories/securitySystem.js

@@ -52,7 +52,7 @@ const setupSecuritySystem = async (accessory, controller) => {
     const { deviceId, endpointId, settings } = context;
     (0, accessory_1.setupAccessoryInformationService)(accessory, controller);
     (0, accessory_1.setupAccessoryIdentifyHandler)(accessory, controller);
-    const aliases = (settings.aliases || {});
+    const { aliases = {}, pin: settingsPin } = settings;
     // Create separate dedicated sensor extra accessory;
     if (settings.sensors !== false) {
         const { accessoryId } = context;
@@ -68,7 +68,7 @@ const setupSecuritySystem = async (accessory, controller) => {
     const labelResults = await client.command(`/devices/${deviceId}/endpoints/${endpointId}/cdata?name=label`);
     const { zones } = labelResults[0];
     // Pin code check
-    const pin = env_1.HOMEBRIDGE_TYDOM_PIN ? (0, utils_1.decode)(env_1.HOMEBRIDGE_TYDOM_PIN) : settings.pin;
+    const pin = env_1.HOMEBRIDGE_TYDOM_PIN ? (0, utils_1.decode)(env_1.HOMEBRIDGE_TYDOM_PIN) : settingsPin;
     if (!pin) {
         controller.log.warn(`Missing pin for device securitySystem, add either {"settings": {"${deviceId}": {"pin": "123456"}}} or HOMEBRIDGE_TYDOM_PIN env var (base64 encoded)`);
     }
@@ -258,7 +258,7 @@ exports.setupSecuritySystem = setupSecuritySystem;
 const updateSecuritySystem = (accessory, controller, updates, type) => {
     // Relay to separate dedicated sensor extra accessory;
     const { deviceId, endpointId, accessoryId, settings } = accessory.context;
-    const aliases = (settings.aliases || {});
+    const { aliases = {} } = settings;
     const { SecuritySystemCurrentState, ContactSensorState, On } = hap_1.Characteristic;
     if (settings.sensors !== false) {
         const extraUpdateContext = {

package/lib/accessories/securitySystemSensors.d.ts

@@ -1,5 +1,6 @@
 import type { PlatformAccessory } from 'homebridge';
 import TydomController from '../controller';
 import { TydomAccessoryUpdateType } from '../helpers/accessory';
-export declare const setupSecuritySystemSensors: (accessory: PlatformAccessory, controller: TydomController) => Promise<void>;
-export declare const updateSecuritySystemSensors: (accessory: PlatformAccessory, controller: TydomController, updates: Record<string, unknown>[], type: TydomAccessoryUpdateType) => void;
+import type { TydomAccessoryContext } from '../typings/tydom';
+export declare const setupSecuritySystemSensors: (accessory: PlatformAccessory<TydomAccessoryContext>, controller: TydomController) => Promise<void>;
+export declare const updateSecuritySystemSensors: (accessory: PlatformAccessory<TydomAccessoryContext>, controller: TydomController, updates: Record<string, unknown>[], type: TydomAccessoryUpdateType) => void;

package/lib/accessories/services/switchableService.d.ts

@@ -1,5 +1,6 @@
 import type { PlatformAccessory, Service } from 'homebridge';
 import TydomController from '../../controller';
 import { ServiceClass } from '../../helpers/accessory';
-export declare const addAccessorySwitchableService: (accessory: PlatformAccessory, controller: TydomController, serviceClass: ServiceClass) => Service;
-export declare const updateAccessorySwitchableService: (accessory: PlatformAccessory, _controller: TydomController, updates: Record<string, unknown>[], ServiceClass: ServiceClass) => void;
+import type { TydomAccessoryContext } from '../../typings/tydom';
+export declare const addAccessorySwitchableService: (accessory: PlatformAccessory<TydomAccessoryContext>, controller: TydomController, serviceClass: ServiceClass) => Service;
+export declare const updateAccessorySwitchableService: (accessory: PlatformAccessory<TydomAccessoryContext>, _controller: TydomController, updates: Record<string, unknown>[], ServiceClass: ServiceClass) => void;

package/lib/accessories/switch.d.ts

@@ -1,4 +1,5 @@
 import type { PlatformAccessory } from 'homebridge';
 import TydomController from '../controller';
-export declare const setupSwitch: (accessory: PlatformAccessory, controller: TydomController) => void;
-export declare const updateSwitch: (accessory: PlatformAccessory, controller: TydomController, updates: Record<string, unknown>[]) => void;
+import { TydomAccessoryContext } from '../typings';
+export declare const setupSwitch: (accessory: PlatformAccessory<TydomAccessoryContext>, controller: TydomController) => void;
+export declare const updateSwitch: (accessory: PlatformAccessory<TydomAccessoryContext>, controller: TydomController, updates: Record<string, unknown>[]) => void;

package/lib/accessories/switch.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateSwitch = exports.setupSwitch = void 0;
 const hap_1 = require("../config/hap");
-const accessory_1 = require("../helpers/accessory");
+const helpers_1 = require("../helpers");
 const switchableService_1 = require("./services/switchableService");
 const setupSwitch = (accessory, controller) => {
-    (0, accessory_1.setupAccessoryInformationService)(accessory, controller);
-    (0, accessory_1.setupAccessoryIdentifyHandler)(accessory, controller);
+    (0, helpers_1.setupAccessoryInformationService)(accessory, controller);
+    (0, helpers_1.setupAccessoryIdentifyHandler)(accessory, controller);
     // Add the actual accessory Service
     (0, switchableService_1.addAccessorySwitchableService)(accessory, controller, hap_1.Service.Switch);
 };

package/lib/accessories/temperatureSensor.d.ts

@@ -1,4 +1,5 @@
 import type { PlatformAccessory } from 'homebridge';
 import TydomController from '../controller';
-export declare const setupTemperatureSensor: (accessory: PlatformAccessory, controller: TydomController) => void;
-export declare const updateTemperatureSensor: (accessory: PlatformAccessory, _controller: TydomController, updates: Record<string, unknown>[]) => void;
+import type { TydomAccessoryContext } from '../typings/tydom';
+export declare const setupTemperatureSensor: (accessory: PlatformAccessory<TydomAccessoryContext>, controller: TydomController) => void;
+export declare const updateTemperatureSensor: (accessory: PlatformAccessory<TydomAccessoryContext>, _controller: TydomController, updates: Record<string, unknown>[]) => void;

package/lib/accessories/thermostat.d.ts

@@ -1,4 +1,5 @@
 import type { PlatformAccessory } from 'homebridge';
 import TydomController from '../controller';
-export declare const setupThermostat: (accessory: PlatformAccessory, controller: TydomController) => void;
-export declare const updateThermostat: (accessory: PlatformAccessory, _controller: TydomController, updates: Record<string, unknown>[]) => void;
+import type { TydomAccessoryContext } from '../typings/tydom';
+export declare const setupThermostat: (accessory: PlatformAccessory<TydomAccessoryContext>, controller: TydomController) => void;
+export declare const updateThermostat: (accessory: PlatformAccessory<TydomAccessoryContext>, _controller: TydomController, updates: Record<string, unknown>[]) => void;

package/lib/accessories/triggerSwitch.d.ts

@@ -0,0 +1,10 @@
+import type { PlatformAccessory } from 'homebridge';
+import TydomController from '../controller';
+import type { TydomAccessoryContext } from '../typings/tydom';
+type TriggerSwitchSettings = {
+    delay?: number;
+};
+type TriggerSwitchContext = TydomAccessoryContext<TriggerSwitchSettings>;
+export declare const setupTriggerSwitch: (accessory: PlatformAccessory<TriggerSwitchContext>, controller: TydomController) => void;
+export declare const updateTriggerSwitch: (accessory: PlatformAccessory<TriggerSwitchContext>, controller: TydomController, updates: Record<string, unknown>[]) => void;
+export {};

package/lib/accessories/{basicGarageDoorOpener.js → triggerSwitch.js}

@@ -1,26 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupBasicGarageDoorOpener = void 0;
+exports.updateTriggerSwitch = exports.setupTriggerSwitch = void 0;
 const hap_1 = require("../config/hap");
 const accessory_1 = require("../helpers/accessory");
 const debug_1 = require("../utils/debug");
-const setupBasicGarageDoorOpener = (accessory, controller) => {
+const TRIGGER_SWITCH_DEFAULT_DELAY = 1000;
+const setupTriggerSwitch = (accessory, controller) => {
     const { context } = accessory;
     const { client } = controller;
-    const { deviceId, endpointId } = context;
+    const { deviceId, endpointId, settings } = context;
+    const { delay = TRIGGER_SWITCH_DEFAULT_DELAY } = settings;
     (0, accessory_1.setupAccessoryInformationService)(accessory, controller);
     (0, accessory_1.setupAccessoryIdentifyHandler)(accessory, controller);
     // Add the actual accessory Service
     const service = (0, accessory_1.addAccessoryService)(accessory, hap_1.Service.Switch, `${accessory.displayName}`, true);
-    // State
-    // const state = {
-    //   isOn: false
-    // };
     service
         .getCharacteristic(hap_1.Characteristic.On)
-        // .on(CharacteristicEventTypes.GET, async (callback: NodeCallback<CharacteristicValue>) => {
-        //   callback(null, state.isOn);
-        // })
         .on("set" /* CharacteristicEventTypes.SET */, async (value, callback) => {
         (0, debug_1.debugSet)(hap_1.Characteristic.On, service, value);
         if (!value) {
@@ -38,7 +33,7 @@ const setupBasicGarageDoorOpener = (accessory, controller) => {
             callback();
             setTimeout(() => {
                 service.updateCharacteristic(hap_1.Characteristic.On, false);
-            }, 1000);
+            }, delay);
         }
         catch (err) {
             callback(err);
@@ -46,4 +41,8 @@ const setupBasicGarageDoorOpener = (accessory, controller) => {
     })
         .updateValue(false);
 };
-exports.setupBasicGarageDoorOpener = setupBasicGarageDoorOpener;
+exports.setupTriggerSwitch = setupTriggerSwitch;
+const updateTriggerSwitch = (accessory, controller, updates) => {
+    // no-op
+};
+exports.updateTriggerSwitch = updateTriggerSwitch;

package/lib/accessories/windowCovering.d.ts

@@ -1,5 +1,16 @@
 import type { PlatformAccessory } from 'homebridge';
 import TydomController from '../controller';
 import { TydomAccessoryUpdateType } from '../helpers/accessory';
-export declare const setupWindowCovering: (accessory: PlatformAccessory, controller: TydomController) => void;
-export declare const updateWindowCovering: (accessory: PlatformAccessory, _controller: TydomController, updates: Record<string, unknown>[], type: TydomAccessoryUpdateType) => void;
+import type { TydomAccessoryContext } from '../typings/tydom';
+type WindowCoveringSettings = {
+    invertDirection?: boolean;
+};
+type WindowCoveringState = {
+    latestPosition: number;
+    pendingUpdatedValues: number[];
+    lastUpdatedAt: number;
+};
+type WindowCoveringContext = TydomAccessoryContext<WindowCoveringSettings, WindowCoveringState>;
+export declare const setupWindowCovering: (accessory: PlatformAccessory<WindowCoveringContext>, controller: TydomController) => void;
+export declare const updateWindowCovering: (accessory: PlatformAccessory<WindowCoveringContext>, _controller: TydomController, updates: Record<string, unknown>[], type: TydomAccessoryUpdateType) => void;
+export {};

package/lib/controller.js

@@ -110,7 +110,7 @@ class TydomController extends events_1.EventEmitter {
             }
             const category = categoryFromSettings || (0, tydom_1.resolveEndpointCategory)({ firstUsage, metadata });
             if (!category) {
-                this.log.warn(`Unsupported firstUsage="${firstUsage}" for endpoint with id="${endpointId}"`);
+                this.log.warn(`Unsupported firstUsage="${firstUsage}" for endpoint with deviceId="${deviceId}"`);
                 (0, utils_1.debug)({ endpoint });
                 return;
             }

package/lib/helpers/accessory.d.ts

@@ -7,12 +7,24 @@ export declare const getAccessoryService: (accessory: PlatformAccessory, Service
 export declare const getAccessoryServiceWithSubtype: (accessory: PlatformAccessory, ServiceClass: ServiceClass, subtype: string) => Service;
 export declare const addAccessoryService: (accessory: PlatformAccessory, service: ServiceClass, name: string, removeExisting?: boolean) => Service;
 export declare const addAccessoryServiceWithSubtype: (accessory: PlatformAccessory, service: ServiceClass, name: string, subtype: string, removeExisting?: boolean) => Service;
-type TydomAccessorySetup = (accessory: PlatformAccessory, controller: TydomController) => void | Promise<void>;
-export declare const getTydomAccessorySetup: (accessory: PlatformAccessory) => TydomAccessorySetup;
+type TydomAccessorySetup<T extends TydomAccessoryContext> = (accessory: PlatformAccessory<T>, controller: TydomController) => void | Promise<void>;
+export declare const getTydomAccessorySetup: <T extends TydomAccessoryContext<any, any> = TydomAccessoryContext<{
+    [x: string]: unknown;
+}, {
+    [x: string]: unknown;
+}>>(accessory: PlatformAccessory<T>, context: T) => TydomAccessorySetup<T>;
 export type TydomAccessoryUpdateType = 'data' | 'cdata';
-type TydomAccessoryUpdate = (accessory: PlatformAccessory, controller: TydomController, updates: Record<string, unknown>[], type: TydomAccessoryUpdateType) => void | Promise<void>;
-export declare const getTydomAccessoryDataUpdate: (accessory: PlatformAccessory) => TydomAccessoryUpdate;
+type TydomAccessoryUpdate<T extends TydomAccessoryContext> = (accessory: PlatformAccessory<T>, controller: TydomController, updates: Record<string, unknown>[], type: TydomAccessoryUpdateType) => void | Promise<void>;
+export declare const getTydomAccessoryDataUpdate: <T extends TydomAccessoryContext<any, any> = TydomAccessoryContext<{
+    [x: string]: unknown;
+}, {
+    [x: string]: unknown;
+}>>(accessory: PlatformAccessory<T>, context: T) => TydomAccessoryUpdate<T>;
 export declare const setupAccessoryInformationService: (accessory: PlatformAccessory, _controller: TydomController) => void;
 export declare const setupAccessoryIdentifyHandler: (accessory: PlatformAccessory, _controller: TydomController) => void;
-export declare const assignTydomContext: (prev: PlatformAccessory['context'], next: TydomAccessoryContext) => prev is TydomAccessoryContext<Record<string, unknown>>;
+export declare const assignTydomContext: (prev: PlatformAccessory['context'], next: TydomAccessoryContext) => prev is TydomAccessoryContext<{
+    [x: string]: unknown;
+}, {
+    [x: string]: unknown;
+}>;
 export {};

package/lib/helpers/accessory.js

@@ -1,18 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assignTydomContext = exports.setupAccessoryIdentifyHandler = exports.setupAccessoryInformationService = exports.getTydomAccessoryDataUpdate = exports.getTydomAccessorySetup = exports.addAccessoryServiceWithSubtype = exports.addAccessoryService = exports.getAccessoryServiceWithSubtype = exports.getAccessoryService = exports.SECURITY_SYSTEM_SENSORS = void 0;
+const switch_1 = require("../accessories/switch");
+const triggerSwitch_1 = require("../accessories/triggerSwitch");
 const contactSensor_1 = require("../accessories/contactSensor");
 const fan_1 = require("../accessories/fan");
 const garageDoorOpener_1 = require("../accessories/garageDoorOpener");
 const lightbulb_1 = require("../accessories/lightbulb");
+const outlet_1 = require("../accessories/outlet");
 const securitySystem_1 = require("../accessories/securitySystem");
 const securitySystemSensors_1 = require("../accessories/securitySystemSensors");
 const temperatureSensor_1 = require("../accessories/temperatureSensor");
 const thermostat_1 = require("../accessories/thermostat");
 const windowCovering_1 = require("../accessories/windowCovering");
-const utils_1 = require("../utils");
 const hap_1 = require("../config/hap");
-const outlet_1 = require("../accessories/outlet");
+const utils_1 = require("../utils");
 exports.SECURITY_SYSTEM_SENSORS = parseInt(`${11 /* Categories.SECURITY_SYSTEM */}0`);
 const getAccessoryService = (accessory, ServiceClass) => {
     const service = accessory.getService(ServiceClass);
@@ -48,7 +50,8 @@ const addAccessoryServiceWithSubtype = (accessory, service, name, subtype, remov
     return accessory.addService(service, name, subtype);
 };
 exports.addAccessoryServiceWithSubtype = addAccessoryServiceWithSubtype;
-const getTydomAccessorySetup = (accessory) => {
+const getTydomAccessorySetup = (accessory, context) => {
+    var _a;
     const { category } = accessory;
     switch (category) {
         case 5 /* Categories.LIGHTBULB */:
@@ -61,6 +64,8 @@ const getTydomAccessorySetup = (accessory) => {
             return fan_1.setupFan;
         case 4 /* Categories.GARAGE_DOOR_OPENER */:
             return garageDoorOpener_1.setupGarageDoorOpener;
+        case 8 /* Categories.SWITCH */:
+            return ((_a = context.settings) === null || _a === void 0 ? void 0 : _a.trigger) ? switch_1.setupSwitch : triggerSwitch_1.setupTriggerSwitch;
         case 14 /* Categories.WINDOW_COVERING */:
             return windowCovering_1.setupWindowCovering;
         case 11 /* Categories.SECURITY_SYSTEM */:
@@ -77,7 +82,8 @@ const getTydomAccessorySetup = (accessory) => {
     }
 };
 exports.getTydomAccessorySetup = getTydomAccessorySetup;
-const getTydomAccessoryDataUpdate = (accessory) => {
+const getTydomAccessoryDataUpdate = (accessory, context) => {
+    var _a;
     const { category } = accessory;
     switch (category) {
         case 5 /* Categories.LIGHTBULB */:
@@ -90,6 +96,8 @@ const getTydomAccessoryDataUpdate = (accessory) => {
             return fan_1.updateFan;
         case 4 /* Categories.GARAGE_DOOR_OPENER */:
             return garageDoorOpener_1.updateGarageDoorOpener;
+        case 8 /* Categories.SWITCH */:
+            return ((_a = context.settings) === null || _a === void 0 ? void 0 : _a.trigger) ? switch_1.updateSwitch : triggerSwitch_1.updateTriggerSwitch;
         case 14 /* Categories.WINDOW_COVERING */:
             return windowCovering_1.updateWindowCovering;
         case 11 /* Categories.SECURITY_SYSTEM */:

package/lib/platform.d.ts

@@ -21,7 +21,7 @@ export type TydomPlatformConfig = PlatformConfig & {
 };
 export default class TydomPlatform implements DynamicPlatformPlugin {
     cleanupAccessoriesIds: Set<string>;
-    accessories: Map<string, PlatformAccessory>;
+    accessories: Map<string, PlatformAccessory<TydomAccessoryContext>>;
     controller?: TydomController;
     api: Homebridge;
     config: TydomPlatformConfig;
@@ -32,7 +32,7 @@ export default class TydomPlatform implements DynamicPlatformPlugin {
     handleControllerDevice(context: ControllerDevicePayload): Promise<void>;
     handleControllerDataUpdate({ type, updates, context }: ControllerUpdatePayload): void;
     handleControllerNotification({ level, message }: ControllerNotificationPayload): void;
-    createAccessory(name: string, id: string, category: Categories, context: TydomAccessoryContext): Promise<PlatformAccessory>;
-    updateAccessory(accessory: PlatformAccessory, context: TydomAccessoryContext): Promise<void>;
-    configureAccessory(accessory: PlatformAccessory): void;
+    createAccessory(name: string, id: string, category: Categories, context: TydomAccessoryContext): Promise<PlatformAccessory<TydomAccessoryContext>>;
+    updateAccessory(accessory: PlatformAccessory<TydomAccessoryContext>, context: TydomAccessoryContext): Promise<void>;
+    configureAccessory(accessory: PlatformAccessory<TydomAccessoryContext>): void;
 }

package/lib/platform.js

@@ -70,7 +70,7 @@ class TydomPlatform {
         }
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const accessory = this.accessories.get(id);
-        const tydomAccessoryUpdate = (0, accessory_1.getTydomAccessoryDataUpdate)(accessory);
+        const tydomAccessoryUpdate = (0, accessory_1.getTydomAccessoryDataUpdate)(accessory, context);
         if (tydomAccessoryUpdate) {
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             tydomAccessoryUpdate(accessory, this.controller, updates, type);
@@ -94,7 +94,7 @@ class TydomPlatform {
         const { platformAccessory: PlatformAccessory } = this.api;
         const { group } = context;
         const accessoryName = category === 13 /* Categories.WINDOW */ && group ? group.name || name : name;
-        this.log.info(`Creating accessory named="${accessoryName}" with id="${id}"`);
+        this.log.info(`Creating accessory named="${accessoryName}" with id="${id}", deviceId="${context.deviceId}"`);
         const accessory = new PlatformAccessory(accessoryName, id, category);
         Object.assign(accessory.context, context);
         await this.updateAccessory(accessory, context);
@@ -102,9 +102,9 @@ class TydomPlatform {
     }
     async updateAccessory(accessory, context) {
         const { displayName: name, UUID: id } = accessory;
-        this.log.info(`Updating accessory named="${name}" with id="${id}"`);
+        this.log.info(`Updating accessory named="${name}" with id="${id}", deviceId="${context.deviceId}"`);
         Object.assign(accessory.context, context);
-        const tydomAccessorySetup = (0, accessory_1.getTydomAccessorySetup)(accessory);
+        const tydomAccessorySetup = (0, accessory_1.getTydomAccessorySetup)(accessory, context);
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         await tydomAccessorySetup(accessory, this.controller);
         this.api.updatePlatformAccessories([accessory]);

package/lib/typings/tydom.d.ts

@@ -1,17 +1,18 @@
 import { Categories } from '../config/hap';
-export type TydomAccessoryContext<T extends Record<string, unknown> = Record<string, unknown>> = {
-    name: string;
+type UnknownObject = Record<string, unknown>;
+export type TydomAccessoryContext<T extends UnknownObject = UnknownObject, U extends UnknownObject = UnknownObject> = {
+    accessoryId: string;
     category: Categories;
-    metadata: TydomMetaElement[];
-    settings: Record<string, unknown>;
     deviceId: number;
     endpointId: number;
-    accessoryId: string;
+    group?: TydomConfigGroup;
     manufacturer?: string;
-    serialNumber?: string;
+    metadata: TydomMetaElement[];
     model?: string;
-    group?: TydomConfigGroup;
-    state: T;
+    name: string;
+    serialNumber?: string;
+    settings: T;
+    state: U;
 };
 export type TydomAccessoryUpdateContext = Pick<TydomAccessoryContext, 'category' | 'deviceId' | 'endpointId' | 'accessoryId'>;
 export type TydomConfigEndpoint = {
@@ -184,3 +185,4 @@ export type SecuritySystemAlarmEvent = {
     }>;
     product?: SecuritySystemProduct;
 };
+export {};

package/lib/utils/basic.d.ts

@@ -1,4 +1,4 @@
 export declare const stringIncludes: (array: unknown[], value: string | number) => boolean;
 export declare const sameArrays: (source: unknown[], array: unknown[]) => boolean;
 export declare const asNumber: (maybeNumber: unknown) => number;
-export declare const waitFor: (ms: number) => Promise<void>;
+export declare const waitFor: (key: string, ms: number) => Promise<void>;

package/lib/utils/basic.js

@@ -8,5 +8,18 @@ const sameArrays = (source, array) => source.length === array.length && (0, loda
 exports.sameArrays = sameArrays;
 const asNumber = (maybeNumber) => parseInt(`${maybeNumber}`, 10);
 exports.asNumber = asNumber;
-const waitFor = async (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+const timeouts = new Map();
+const waitFor = async (key, ms) => {
+    if (timeouts.has(key)) {
+        const { timeout, reject } = timeouts.get(key);
+        clearTimeout(timeout);
+        timeouts.delete(key);
+        reject();
+    }
+    await new Promise((resolve, reject) => {
+        const timeout = setTimeout(resolve, ms);
+        timeouts.set(key, { timeout, reject });
+    });
+    timeouts.delete(key);
+};
 exports.waitFor = waitFor;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-tydom",
-  "version": "0.23.3",
+  "version": "0.23.5",
   "description": "Homebridge plugin to manage Tydom devices by Delta Dore",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -22,7 +22,7 @@
     "start:node": "NODE_TLS_REJECT_UNAUTHORIZED=0 NODE_PATH=src/ ts-node .",
     "start:watch": "nodemon --ext \"ts,tsx\" --watch \"lib/\" --exec \"yarn start\"",
     "start:prod": "yarn spec:watch",
-    "build": "tsc --build",
+    "build": "tsc --build  && tsc-alias --project tsconfig.json",
     "clean": "rm -rf .homebridge/persist/* .homebridge/accessories/*",
     "lint": "eslint src/",
     "prettycheck": "prettier --check src/",
@@ -56,6 +56,7 @@
     "nock": "^13.2.9",
     "prettier": "^2.8.0",
     "ts-node": "^10.9.1",
+    "tsc-alias": "^1.7.1",
     "typescript": "^4.9.3"
   }
 }

package/lib/accessories/basicGarageDoorOpener.d.ts

@@ -1,3 +0,0 @@
-import type { PlatformAccessory } from 'homebridge';
-import TydomController from '../controller';
-export declare const setupBasicGarageDoorOpener: (accessory: PlatformAccessory, controller: TydomController) => void;

package/lib/utils/accessory.d.ts

@@ -1,19 +0,0 @@
-import type { PlatformAccessory, Service, WithUUID } from 'homebridge';
-import TydomController from '../controller';
-import { TydomAccessoryContext } from '../typings/tydom';
-export declare const SECURITY_SYSTEM_SENSORS: number;
-export declare const asNumber: (maybeNumber: unknown) => number;
-export declare type ServiceClass = WithUUID<typeof Service>;
-export declare const getAccessoryService: (accessory: PlatformAccessory, ServiceClass: ServiceClass) => Service;
-export declare const getAccessoryServiceWithSubtype: (accessory: PlatformAccessory, ServiceClass: ServiceClass, subtype: string) => Service;
-export declare const addAccessoryService: (accessory: PlatformAccessory, service: ServiceClass, name: string, removeExisting?: boolean) => Service;
-export declare const addAccessoryServiceWithSubtype: (accessory: PlatformAccessory, service: ServiceClass, name: string, subtype: string, removeExisting?: boolean) => Service;
-declare type TydomAccessorySetup = (accessory: PlatformAccessory, controller: TydomController) => void | Promise<void>;
-export declare const getTydomAccessorySetup: (accessory: PlatformAccessory) => TydomAccessorySetup;
-export declare type TydomAccessoryUpdateType = 'data' | 'cdata';
-declare type TydomAccessoryUpdate = (accessory: PlatformAccessory, controller: TydomController, updates: Record<string, unknown>[], type: TydomAccessoryUpdateType) => void | Promise<void>;
-export declare const getTydomAccessoryDataUpdate: (accessory: PlatformAccessory) => TydomAccessoryUpdate;
-export declare const setupAccessoryInformationService: (accessory: PlatformAccessory, _controller: TydomController) => void;
-export declare const setupAccessoryIdentifyHandler: (accessory: PlatformAccessory, _controller: TydomController) => void;
-export declare const assignTydomContext: (prev: PlatformAccessory['context'], next: TydomAccessoryContext) => prev is TydomAccessoryContext<Record<string, any>>;
-export {};

package/lib/utils/accessory.js

@@ -1,139 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.assignTydomContext = exports.setupAccessoryIdentifyHandler = exports.setupAccessoryInformationService = exports.getTydomAccessoryDataUpdate = exports.getTydomAccessorySetup = exports.addAccessoryServiceWithSubtype = exports.addAccessoryService = exports.getAccessoryServiceWithSubtype = exports.getAccessoryService = exports.asNumber = exports.SECURITY_SYSTEM_SENSORS = void 0;
-const contactSensor_1 = require("../accessories/contactSensor");
-const fan_1 = require("../accessories/fan");
-const garageDoorOpener_1 = require("../accessories/garageDoorOpener");
-const lightbulb_1 = require("../accessories/lightbulb");
-const securitySystem_1 = require("../accessories/securitySystem");
-const securitySystemSensors_1 = require("../accessories/securitySystemSensors");
-const temperatureSensor_1 = require("../accessories/temperatureSensor");
-const thermostat_1 = require("../accessories/thermostat");
-const windowCovering_1 = require("../accessories/windowCovering");
-const assert_1 = __importDefault(require("../utils/assert"));
-const debug_1 = __importDefault(require("../utils/debug"));
-const hap_1 = require("../utils/hap");
-exports.SECURITY_SYSTEM_SENSORS = parseInt(`${11 /* SECURITY_SYSTEM */}0`);
-const asNumber = (maybeNumber) => parseInt(`${maybeNumber}`, 10);
-exports.asNumber = asNumber;
-const getAccessoryService = (accessory, ServiceClass) => {
-    const service = accessory.getService(ServiceClass);
-    assert_1.default(service, `Unexpected missing service "${ServiceClass.name}" in accessory`);
-    return service;
-};
-exports.getAccessoryService = getAccessoryService;
-const getAccessoryServiceWithSubtype = (accessory, ServiceClass, subtype) => {
-    const service = accessory.getServiceByUUIDAndSubType(ServiceClass, subtype);
-    assert_1.default(service, `Unexpected missing service "${ServiceClass.name}" with subtype="${subtype}" in accessory`);
-    return service;
-};
-exports.getAccessoryServiceWithSubtype = getAccessoryServiceWithSubtype;
-const addAccessoryService = (accessory, service, name, removeExisting = false) => {
-    const existingService = accessory.getService(service);
-    if (existingService) {
-        if (!removeExisting) {
-            return existingService;
-        }
-        accessory.removeService(existingService);
-    }
-    return accessory.addService(service, name);
-};
-exports.addAccessoryService = addAccessoryService;
-const addAccessoryServiceWithSubtype = (accessory, service, name, subtype, removeExisting = false) => {
-    const existingService = accessory.getServiceById(service, subtype);
-    if (existingService) {
-        if (!removeExisting) {
-            return existingService;
-        }
-        accessory.removeService(existingService);
-    }
-    return accessory.addService(service, name, subtype);
-};
-exports.addAccessoryServiceWithSubtype = addAccessoryServiceWithSubtype;
-const getTydomAccessorySetup = (accessory) => {
-    const { category } = accessory;
-    switch (category) {
-        case 5 /* LIGHTBULB */:
-            return lightbulb_1.setupLightbulb;
-        case 9 /* THERMOSTAT */:
-            return thermostat_1.setupThermostat;
-        case 3 /* FAN */:
-            return fan_1.setupFan;
-        case 4 /* GARAGE_DOOR_OPENER */:
-            return garageDoorOpener_1.setupGarageDoorOpener;
-        case 14 /* WINDOW_COVERING */:
-            return windowCovering_1.setupWindowCovering;
-        case 11 /* SECURITY_SYSTEM */:
-            return securitySystem_1.setupSecuritySystem;
-        case 10 /* SENSOR */:
-            return temperatureSensor_1.setupTemperatureSensor;
-        case 13 /* WINDOW */:
-        case 12 /* DOOR */:
-            return contactSensor_1.setupContactSensor;
-        case exports.SECURITY_SYSTEM_SENSORS:
-            return securitySystemSensors_1.setupSecuritySystemSensors;
-        default:
-            throw new Error(`Unsupported accessory category=${category}`);
-    }
-};
-exports.getTydomAccessorySetup = getTydomAccessorySetup;
-const getTydomAccessoryDataUpdate = (accessory) => {
-    const { category } = accessory;
-    switch (category) {
-        case 5 /* LIGHTBULB */:
-            return lightbulb_1.updateLightbulb;
-        case 9 /* THERMOSTAT */:
-            return thermostat_1.updateThermostat;
-        case 3 /* FAN */:
-            return fan_1.updateFan;
-        case 4 /* GARAGE_DOOR_OPENER */:
-            return () => {
-                // no-op
-            };
-        case 14 /* WINDOW_COVERING */:
-            return windowCovering_1.updateWindowCovering;
-        case 11 /* SECURITY_SYSTEM */:
-            return securitySystem_1.updateSecuritySystem;
-        case 10 /* SENSOR */:
-            return temperatureSensor_1.updateTemperatureSensor;
-        case 13 /* WINDOW */:
-        case 12 /* DOOR */:
-            return contactSensor_1.updateContactSensor;
-        case exports.SECURITY_SYSTEM_SENSORS:
-            return securitySystemSensors_1.updateSecuritySystemSensors;
-        default:
-            throw new Error(`Unsupported accessory category=${category}`);
-    }
-};
-exports.getTydomAccessoryDataUpdate = getTydomAccessoryDataUpdate;
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const setupAccessoryInformationService = (accessory, _controller) => {
-    const { context } = accessory;
-    const { manufacturer = 'Delta Dore', serialNumber = 'N/A', model = 'N/A' } = context;
-    const informationService = accessory.getService(hap_1.Service.AccessoryInformation);
-    assert_1.default(informationService, `Did not found AccessoryInformation service`);
-    informationService
-        .setCharacteristic(hap_1.Characteristic.Manufacturer, manufacturer)
-        .setCharacteristic(hap_1.Characteristic.SerialNumber, serialNumber)
-        .setCharacteristic(hap_1.Characteristic.Model, model);
-};
-exports.setupAccessoryInformationService = setupAccessoryInformationService;
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const setupAccessoryIdentifyHandler = (accessory, _controller) => {
-    const { displayName: name, UUID: id } = accessory;
-    // listen for the "identify" event for this Accessory
-    accessory.on("identify" /* IDENTIFY */, ( /* paired: boolean, callback: VoidCallback */) => {
-        // debug({id, type: 'AccessoryEventTypes.IDENTIFY', paired});
-        debug_1.default(`New identify request for device named="${name}" with id="${id}"`);
-        // callback();
-    });
-};
-exports.setupAccessoryIdentifyHandler = setupAccessoryIdentifyHandler;
-const assignTydomContext = (prev, next) => {
-    Object.assign(prev, next);
-    return true;
-};
-exports.assignTydomContext = assignTydomContext;

package/lib/utils/array.d.ts

@@ -1,2 +0,0 @@
-export declare const stringIncludes: (array: unknown[], value: string | number) => boolean;
-export declare const sameArrays: (source: unknown[], array: unknown[]) => boolean;

package/lib/utils/array.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sameArrays = exports.stringIncludes = void 0;
-const lodash_1 = require("lodash");
-const stringIncludes = (array, value) => array.includes(value) || array.includes(`${value}`);
-exports.stringIncludes = stringIncludes;
-const sameArrays = (source, array) => source.length === array.length && lodash_1.xor(source, array).length === 0;
-exports.sameArrays = sameArrays;

package/lib/utils/hap.d.ts

@@ -1,6 +0,0 @@
-import type { API as Homebridge, HAP } from 'homebridge';
-export { AccessoryEventTypes, Categories, CharacteristicEventTypes } from 'homebridge';
-export type { CharacteristicProps, CharacteristicSetCallback, CharacteristicValue, NodeCallback, VoidCallback } from 'homebridge';
-export declare let Characteristic: HAP['Characteristic'];
-export declare let Service: HAP['Service'];
-export declare const defineHAPGlobals: (homebridge: Homebridge) => void;

package/lib/utils/hap.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineHAPGlobals = exports.Service = exports.Characteristic = void 0;
-const defineHAPGlobals = (homebridge) => {
-    exports.Characteristic = homebridge.hap.Characteristic;
-    exports.Service = homebridge.hap.Service;
-};
-exports.defineHAPGlobals = defineHAPGlobals;

package/lib/utils/tydom.d.ts

@@ -1,27 +0,0 @@
-import { Categories } from '../utils/hap';
-import { TydomConfigEndpoint, TydomEndpointData, TydomMetaElement, TydomMetaResponse, AnyTydomDataValue, TydomGroupsResponse, TydomMetaEndpoint } from '../typings/tydom';
-import TydomClient from 'tydom-client';
-import type { PlatformAccessory } from 'homebridge';
-export declare type GetTydomDeviceDataOptions = {
-    deviceId: number;
-    endpointId: number;
-    accessory?: PlatformAccessory;
-};
-export declare const getTydomDeviceData: <T extends TydomEndpointData = TydomEndpointData>(client: TydomClient, { deviceId, endpointId }: GetTydomDeviceDataOptions) => Promise<T>;
-export declare type RunTydomDeviceCommandOptions = {
-    deviceId: number;
-    endpointId: number;
-    searchParams?: Record<string, string>;
-};
-export declare const runTydomDeviceCommand: <T extends Record<string, unknown> = Record<string, unknown>>(client: TydomClient, name: string, { deviceId, endpointId, searchParams }: RunTydomDeviceCommandOptions) => Promise<T[]>;
-export declare const getTydomDataPropValue: <V extends AnyTydomDataValue = AnyTydomDataValue, T extends TydomEndpointData = TydomEndpointData>(data: T, name: string) => V;
-export declare const getEndpointDetailsFromMeta: ({ id_endpoint: endpointId, id_device: deviceId }: TydomConfigEndpoint, meta: TydomMetaResponse) => TydomMetaEndpoint;
-export declare const getEndpointGroupIdFromGroups: ({ id_endpoint: endpointId, id_device: deviceId }: TydomConfigEndpoint, groups: TydomGroupsResponse) => number | null;
-export declare const getEndpointSignatureFromMetadata: (metadata: TydomMetaElement[]) => string;
-declare type ResolveEndpointCategoryOptions = {
-    firstUsage: string;
-    metadata: TydomMetaElement[];
-};
-export declare const resolveEndpointCategory: ({ firstUsage, metadata }: ResolveEndpointCategoryOptions) => Categories | null;
-export declare const asyncWait: (ms: number) => Promise<void>;
-export {};

package/lib/utils/tydom.js

@@ -1,126 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.asyncWait = exports.resolveEndpointCategory = exports.getEndpointSignatureFromMetadata = exports.getEndpointGroupIdFromGroups = exports.getEndpointDetailsFromMeta = exports.getTydomDataPropValue = exports.runTydomDeviceCommand = exports.getTydomDeviceData = void 0;
-const lodash_1 = require("lodash");
-const assert_1 = __importDefault(require("../utils/assert"));
-const debug_1 = __importDefault(require("./debug"));
-const hash_1 = require("./hash");
-const url_1 = require("url");
-const chalk_1 = require("./chalk");
-const cacheMap = new Map();
-const DEBOUNCE_TIME = 1 * 1e3;
-const getTydomDeviceData = async (client, { deviceId, endpointId }) => {
-    const now = Date.now();
-    const uri = `/devices/${deviceId}/endpoints/${endpointId}/data`;
-    if (cacheMap.has(uri)) {
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        const { time, promise } = cacheMap.get(uri);
-        if (now < time + DEBOUNCE_TIME) {
-            return promise;
-        }
-    }
-    const promise = client.get(uri).then((res) => {
-        if (res.error > 0) {
-            debug_1.default(`Received non-zero error=${chalk_1.chalkNumber(res.error)} while querying uri=${chalk_1.chalkString(uri)}`);
-            if (res.error > 10) {
-                debug_1.default(`Accessory with uri=${chalk_1.chalkString(uri)} seems unreacheable (error=${chalk_1.chalkNumber(res.error)}).`);
-                throw new Error('UnreacheableAccessory');
-            }
-            else {
-                debug_1.default(`Accessory with uri=${chalk_1.chalkString(uri)} is reporting unknown issues (error=${chalk_1.chalkNumber(res.error)}).`);
-            }
-        }
-        return res.data ? res.data : res;
-    });
-    cacheMap.set(uri, { time: now, promise });
-    return promise;
-};
-exports.getTydomDeviceData = getTydomDeviceData;
-const runTydomDeviceCommand = async (client, name, { deviceId, endpointId, searchParams }) => {
-    const now = Date.now();
-    const uri = `/devices/${deviceId}/endpoints/${endpointId}/cdata?name=${name}${searchParams ? `&${new url_1.URLSearchParams(searchParams)}` : ''}`;
-    if (cacheMap.has(uri)) {
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        const { time, promise } = cacheMap.get(uri);
-        if (now < time + DEBOUNCE_TIME) {
-            return promise;
-        }
-    }
-    const promise = client.command(uri);
-    cacheMap.set(uri, { time: now, promise });
-    return promise;
-};
-exports.runTydomDeviceCommand = runTydomDeviceCommand;
-const getTydomDataPropValue = (data, name) => {
-    const item = data.find((prop) => prop.name === name);
-    assert_1.default(item, `Missing property with name="${name}" in endpoint data`);
-    return item.value;
-};
-exports.getTydomDataPropValue = getTydomDataPropValue;
-const getEndpointDetailsFromMeta = ({ id_endpoint: endpointId, id_device: deviceId }, meta) => {
-    const device = lodash_1.find(meta, { id: deviceId });
-    assert_1.default(device, `Device with id="${deviceId}" not found in Tydom meta`);
-    const details = lodash_1.find(device.endpoints, { id: endpointId });
-    assert_1.default(details, `Endpoint with id="${endpointId}" not found in device with id="${deviceId}" meta`);
-    return details;
-};
-exports.getEndpointDetailsFromMeta = getEndpointDetailsFromMeta;
-const getEndpointGroupIdFromGroups = ({ id_endpoint: endpointId, id_device: deviceId }, groups) => {
-    const group = groups.groups.find(({ devices }) => devices.some(({ id, endpoints }) => id === deviceId && endpoints.some(({ id }) => id === endpointId)));
-    return group ? group.id : null;
-};
-exports.getEndpointGroupIdFromGroups = getEndpointGroupIdFromGroups;
-const getEndpointSignatureFromMetadata = (metadata) => metadata
-    .map((value) => value.name)
-    .sort()
-    .join('|');
-exports.getEndpointSignatureFromMetadata = getEndpointSignatureFromMetadata;
-const LEGACY_SUPPORTED_CATEGORIES_MAP = {
-    alarm: 11 /* SECURITY_SYSTEM */,
-    awning: 14 /* WINDOW_COVERING */,
-    belmDoor: 12 /* DOOR */,
-    gate: 4 /* GARAGE_DOOR_OPENER */,
-    garage_door: 4 /* GARAGE_DOOR_OPENER */,
-    hvac: 9 /* THERMOSTAT */,
-    light: 5 /* LIGHTBULB */,
-    shutter: 14 /* WINDOW_COVERING */,
-    window: 13 /* WINDOW */
-};
-const ENDPOINTS_SIGNATURES_CATEGORIES = {
-    'alarm:0c6e1d33808fa50a0a921502f80d36430dfaeda5abfed2467f9f2b07821e4842': 11 /* SECURITY_SYSTEM */,
-    'alarm:aad768ee0367013a974276117fd5ed4834cc26e4d31acc88d35134731331b0e7': 11 /* SECURITY_SYSTEM */,
-    'alarm:6e33f7ee5e62b58f4e888c91a13fd9b9d868f3751cead5ea1252578ba86523a5': 11 /* SECURITY_SYSTEM */,
-    'awning:48f43ebab20eba438fa9cc2b6ce44311d3cfb01c5be84bf17599d9c152c348d3': 14 /* WINDOW_COVERING */,
-    'belmDoor:fb935867933d89b3058f09384f76fd63f3defb18cfb3172f60fa9f4f237f748b': 12 /* DOOR */,
-    'conso:16804a9994bce28275150db329a9c0b931ef7f20608c1a3d2ff248f58569f0d3': 10 /* SENSOR */,
-    'gate:83b0912c6fe14622219522922ea0347dcbf86bf9cfd3346a2eca8eac70ca8260': 4 /* GARAGE_DOOR_OPENER */,
-    'garage_door:83b0912c6fe14622219522922ea0347dcbf86bf9cfd3346a2eca8eac70ca8260': 4 /* GARAGE_DOOR_OPENER */,
-    'hvac:1bab47d1dd7e898b5dc2e9867b14dfb8bc9272c4cb0b5d1221da962d43a6ffb4': 9 /* THERMOSTAT */,
-    'light:449e2a60377094cde10224cee91d378fb0ae373ae6ceea0ac2cbc1ed011bffa7': 5 /* LIGHTBULB */,
-    'light:fce45085835f4f2790ea3b17d208b5ace34935444d2535e75ba3f0a2ce86de5f': 5 /* LIGHTBULB */,
-    'shutter:c3fe8e2afa864e1a7a5c6676b4287a7b2f2a886a466baec3df8a1ec4f898ad6c': 14 /* WINDOW_COVERING */,
-    'window:fb935867933d89b3058f09384f76fd63f3defb18cfb3172f60fa9f4f237f748b': 13 /* WINDOW */ // @mgcrea (MDO)
-};
-const resolveEndpointCategory = ({ firstUsage, metadata }) => {
-    // Compute device signature
-    const metaSignature = exports.getEndpointSignatureFromMetadata(metadata);
-    const hash = `${firstUsage}:${hash_1.sha256Sync(metaSignature)}`;
-    // dir({metaSignature, hash});
-    if (ENDPOINTS_SIGNATURES_CATEGORIES[hash]) {
-        return ENDPOINTS_SIGNATURES_CATEGORIES[hash];
-    }
-    debug_1.default(`Unknown hash=${hash} with firstUsage="${firstUsage}"`);
-    // Fallback on legacy resolution
-    if (LEGACY_SUPPORTED_CATEGORIES_MAP[firstUsage]) {
-        return LEGACY_SUPPORTED_CATEGORIES_MAP[firstUsage];
-    }
-    return null;
-};
-exports.resolveEndpointCategory = resolveEndpointCategory;
-const asyncWait = (ms) => new Promise((resolve) => {
-    setTimeout(resolve, ms);
-});
-exports.asyncWait = asyncWait;

package/lib/utils/webhook.d.ts

@@ -1,19 +0,0 @@
-export declare type Webhook = {
-    url: string;
-    type: string;
-};
-export declare type WebhookPayload = {
-    message: string;
-    level?: string;
-};
-declare type DiscordPayload = {
-    content: string;
-    username?: string;
-    avatar_url?: string;
-    tts?: boolean;
-    payload_json?: string;
-    allowed_mentions?: boolean;
-};
-export declare const asDiscordPayload: ({ level, message }: WebhookPayload) => DiscordPayload;
-export declare const triggerWebhook: (webhook: Webhook, { message, level }: WebhookPayload) => Promise<void>;
-export {};

package/lib/utils/webhook.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.triggerWebhook = exports.asDiscordPayload = void 0;
-const request_1 = require("./request");
-const asDiscordPayload = ({ level, message }) => {
-    let prefix = '';
-    switch (level) {
-        case 'warn':
-            prefix = ':warning: ';
-            break;
-        default:
-            prefix = ':question: ';
-            break;
-    }
-    return {
-        content: `${prefix}${message}`
-    };
-};
-exports.asDiscordPayload = asDiscordPayload;
-const triggerWebhook = async (webhook, { message, level = 'info' }) => {
-    const { url, type } = webhook;
-    switch (type) {
-        case 'discord':
-            const res = await request_1.postJson({ url, json: exports.asDiscordPayload({ message, level }) });
-            console.dir({ res });
-            break;
-        default:
-            break;
-    }
-};
-exports.triggerWebhook = triggerWebhook;