homebridge-virtual-accessories 3.14.22 → 3.15.1

package/config.schema.json

@@ -913,20 +913,18 @@
               "properties": {
                 "type": {
                   "title": "Type *",
-                  "description": "Sensor type (Critical sensor notifications bypass 'Do Not Disturb' focus mode)",
+                  "description": "Measurement sensor type",
                   "type": "string",
                   "oneOf": [
                     { "title": "Humidity", "enum": ["humidity"] },
                     { "title": "Temperature", "enum": ["temperature"] }
                   ]
                 },
-                "temperatureUnits": {
-                  "title": "Temperature Units *",
-                  "type": "string",
-                  "oneOf": [
-                    { "title": "Celsius (ºC)", "enum": ["celsius"] },
-                    { "title": "Fahrenheit (ºF)", "enum": ["fahrenheit"] }
-                  ],
+                "": {
+                  "title": " ",
+                  "description": "Note: Temperature units are set in Homebridge UI under Settings - Display (default: Celsius).",
+                  "type": "object",
+                  "properties": {},
                   "condition": {
                     "functionBody": "return model.devices[arrayIndices].measurement && model.devices[arrayIndices].measurement.type === 'temperature';"
                   }
@@ -934,20 +932,7 @@
               },
               "condition": {
                 "functionBody": "return model.devices[arrayIndices].accessoryType === 'measurement';"
-              },
-              "allOf": [
-                {
-                  "if": {
-                    "properties": {
-                      "type": { "const": "temperature" }
-                    },
-                    "required": [ "type" ]
-                  },
-                  "then": {
-                    "required": [ "temperatureUnits" ]
-                  }
-                }
-              ]
+              }
             },
             "resetTimer": {
               "title": "Reset Timer",

package/dist/accessories/accessory.d.ts

@@ -1,29 +1,31 @@
-import type { PlatformAccessory, Service } from 'homebridge';
+import { PlatformAccessory, Service, WithUUID } from 'homebridge';
 import { VirtualAccessoriesPlatform } from '../platform.js';
 import { AccessoryConfiguration } from '../configuration/configurationAccessory.js';
 import { VirtualLogger } from '../utils/virtualLogger.js';
+import { CharacteristicUtils } from '../characteristicsUtils.js';
 /**
  * Abstract Accessory
  */
-export declare abstract class Accessory {
-    service?: Service;
+export declare abstract class Accessory extends CharacteristicUtils {
     readonly platform: VirtualAccessoriesPlatform;
     readonly accessory: PlatformAccessory;
     readonly accessoryConfiguration: AccessoryConfiguration;
     readonly log: VirtualLogger;
+    protected serviceType: WithUUID<typeof Service>;
     protected accessoryName: string;
-    protected defaultState: any;
+    protected defaultState: number | boolean;
     protected storagePath: string;
     protected accessoryInformationService?: Service;
-    constructor(platform: VirtualAccessoriesPlatform, accessory: PlatformAccessory, accessoryConfiguration: AccessoryConfiguration);
+    constructor(platform: VirtualAccessoriesPlatform, accessory: PlatformAccessory, accessoryConfiguration: AccessoryConfiguration, serviceType: WithUUID<typeof Service>, createService?: boolean);
     isExternalAccessory(): boolean;
-    updateConfiguredName(): void;
+    updateInformationServiceConfiguredName(): void;
     private readonly EMPTY_ACCESSORY_STATE;
     protected isEmptyAccessoryState(json: any): boolean;
     protected loadAccessoryState(storagePath: string): any;
     private saveAccessoryState;
-    protected deleteAccessoryState(storagePath: string): void;
-    protected storeState(): void;
-    protected abstract getAccessoryTypeName(): string;
+    protected deleteState(storagePath: string): void;
+    protected saveState(): void;
+    getServiceType(): WithUUID<typeof Service>;
+    getServiceTypeName(serviceType: WithUUID<typeof Service>): string;
     protected abstract getJsonState(): string;
 }

package/dist/accessories/accessory.js

@@ -1,22 +1,26 @@
-/* eslint-disable max-len */
 /* eslint-disable @typescript-eslint/no-explicit-any */
+import { CharacteristicType, ServiceType } from '../platform.js';
+import { CharacteristicUtils } from '../characteristicsUtils.js';
 import fs from 'fs';
 /**
  * Abstract Accessory
  */
-export class Accessory {
-    service;
+export class Accessory extends CharacteristicUtils {
+    //service!: Service;
     platform;
     accessory;
     accessoryConfiguration;
     log;
+    serviceType;
     accessoryName = '';
     defaultState;
     storagePath;
     accessoryInformationService;
-    constructor(platform, accessory, accessoryConfiguration) {
+    constructor(platform, accessory, accessoryConfiguration, serviceType, createService = true) {
+        super();
         this.accessory = accessory;
         this.platform = platform;
+        this.serviceType = serviceType;
         // The accessory configuration is stored in the context in VirtualAccessoryPlatform.discoverDevices()
         this.accessoryConfiguration = accessoryConfiguration;
         this.accessoryName = this.accessoryConfiguration.accessoryName;
@@ -24,22 +28,27 @@ export class Accessory {
         this.log.debug(`[${this.accessoryName}] Accessory context: ${JSON.stringify(accessory.context)}`);
         this.storagePath = accessory.context.storagePath;
         if (!this.accessoryConfiguration.accessoryIsStateful) {
-            this.deleteAccessoryState(this.storagePath);
+            this.deleteState(this.storagePath);
         }
-        // set accessory information
-        this.accessoryInformationService = this.accessory.getService(this.platform.Service.AccessoryInformation) || this.accessory.addService(this.platform.Service.AccessoryInformation);
+        // Set accessory information
+        this.accessoryInformationService = this.accessory.getService(ServiceType.AccessoryInformation);
         this.accessoryInformationService
-            .setCharacteristic(this.platform.Characteristic.Manufacturer, 'Virtual Accessories for Homebridge')
-            .setCharacteristic(this.platform.Characteristic.Model, `Virtual Accessory - ${this.getAccessoryTypeName()}`)
-            .setCharacteristic(this.platform.Characteristic.SerialNumber, this.accessory.UUID)
-            .setCharacteristic(this.platform.Characteristic.Name, this.accessoryConfiguration.accessoryName)
-            .setCharacteristic(this.platform.Characteristic.FirmwareRevision, this.accessory.context.firmwareVersion);
+            .setCharacteristic(CharacteristicType.Manufacturer, 'Virtual Accessories for Homebridge')
+            .setCharacteristic(CharacteristicType.Model, `Virtual Accessory - ${this.getServiceTypeName(serviceType)}`)
+            .setCharacteristic(CharacteristicType.SerialNumber, this.accessory.UUID)
+            .setCharacteristic(CharacteristicType.Name, this.accessoryName)
+            .setCharacteristic(CharacteristicType.FirmwareRevision, this.accessory.context.firmwareVersion);
+        // Set accessory service info
+        if (createService) {
+            this.service = this.accessory.getService(serviceType) || this.accessory.addService(serviceType);
+            this.updateName(this.accessoryName);
+        }
     }
     isExternalAccessory() {
         return [26 /* Categories.SPEAKER */, 31 /* Categories.TELEVISION */].includes(this.accessory.category);
     }
-    updateConfiguredName() {
-        const configuredName = this.accessoryInformationService.getCharacteristic(this.platform.Characteristic.ConfiguredName);
+    updateInformationServiceConfiguredName() {
+        const configuredName = this.accessoryInformationService.getCharacteristic(CharacteristicType.ConfiguredName);
         if (configuredName !== undefined) {
             this.accessoryInformationService.removeCharacteristic(configuredName);
         }
@@ -68,7 +77,7 @@ export class Accessory {
             this.log.error(`[${this.accessoryName}] Error saving state: ${error}`);
         }
     }
-    deleteAccessoryState(storagePath) {
+    deleteState(storagePath) {
         this.log.debug(`[${this.accessoryName}] Deleting state file ${storagePath}`);
         if (fs.existsSync(storagePath)) {
             try {
@@ -80,10 +89,106 @@ export class Accessory {
         }
     }
     // Store device state if stateful
-    storeState() {
+    saveState() {
         if (this.accessoryConfiguration.accessoryIsStateful) {
             this.saveAccessoryState(this.storagePath, this.getJsonState());
         }
     }
+    getServiceType() {
+        return this.serviceType;
+    }
+    getServiceTypeName(serviceType) {
+        let accessoryTypeName;
+        switch (serviceType) {
+            case ServiceType.AirPurifier: {
+                accessoryTypeName = 'AirPurifier';
+                break;
+            }
+            case ServiceType.Battery: {
+                accessoryTypeName = 'Battery';
+                break;
+            }
+            case ServiceType.Door: {
+                accessoryTypeName = 'Door';
+                break;
+            }
+            case ServiceType.Doorbell: {
+                accessoryTypeName = 'Doorbell';
+                break;
+            }
+            case ServiceType.Fan: {
+                accessoryTypeName = 'Fan';
+                break;
+            }
+            case ServiceType.FilterMaintenance: {
+                accessoryTypeName = 'Filter';
+                break;
+            }
+            case ServiceType.GarageDoorOpener: {
+                accessoryTypeName = 'GarageDoor';
+                break;
+            }
+            case ServiceType.HeaterCooler: {
+                accessoryTypeName = 'HeaterCooler';
+                break;
+            }
+            case ServiceType.HumidifierDehumidifier: {
+                accessoryTypeName = 'HumidifierDehumidifier';
+                break;
+            }
+            case ServiceType.InputSource: {
+                accessoryTypeName = 'InputSource';
+                break;
+            }
+            case ServiceType.Lightbulb: {
+                accessoryTypeName = 'Lightbulb';
+                break;
+            }
+            case ServiceType.LockMechanism: {
+                accessoryTypeName = 'Lock';
+                break;
+            }
+            case ServiceType.Microphone: {
+                accessoryTypeName = 'Microphone';
+                break;
+            }
+            case ServiceType.SecuritySystem: {
+                accessoryTypeName = 'SecuritySystem';
+                break;
+            }
+            case ServiceType.SmartSpeaker: {
+                accessoryTypeName = 'SmartSpeaker';
+                break;
+            }
+            case ServiceType.Speaker: {
+                accessoryTypeName = 'Speaker';
+                break;
+            }
+            case ServiceType.Switch: {
+                accessoryTypeName = 'Switch';
+                break;
+            }
+            case ServiceType.Television: {
+                accessoryTypeName = 'Television';
+                break;
+            }
+            case ServiceType.Valve: {
+                accessoryTypeName = 'Valve';
+                break;
+            }
+            case ServiceType.Window: {
+                accessoryTypeName = 'Window';
+                break;
+            }
+            case ServiceType.WindowCovering: {
+                accessoryTypeName = 'WindowCovering';
+                break;
+            }
+            default: {
+                accessoryTypeName = 'unknown';
+            }
+        }
+        return accessoryTypeName;
+    }
 }
 //# sourceMappingURL=accessory.js.map

package/dist/accessories/accessory.js.map

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

package/dist/accessories/companions/companionSwitch.d.ts

@@ -11,6 +11,6 @@ export declare class CompanionSwitch extends Switch {
     private companionName;
     private partnerAccessory;
     constructor(platform: VirtualAccessoriesPlatform, accessory: PlatformAccessory, accessoryConfiguration: AccessoryConfiguration, companionName: string, partnerAccessory: TriggerableEventAccessory);
-    setOn(value: CharacteristicValue): Promise<void>;
-    getOn(): Promise<CharacteristicValue>;
+    getOnHandler(): Promise<CharacteristicValue>;
+    setOnHandler(value: CharacteristicValue): Promise<void>;
 }

package/dist/accessories/companions/companionSwitch.js

@@ -24,23 +24,23 @@ export class CompanionSwitch extends Switch {
         // Replace the Name Characteristic
         this.service.setCharacteristic(this.platform.Characteristic.Name, this.companionName);
         // Update the initial state of the accessory
-        this.log.debug(`[${this.accessoryConfiguration.accessoryName}] Setting Companion Switch Current State: ${Switch.getStateName(this.states.SwitchState)}`);
-        this.service.updateCharacteristic(this.platform.Characteristic.On, (this.states.SwitchState));
+        this.log.debug(`[${this.accessoryConfiguration.accessoryName}] Setting Companion Switch Current State: ${Switch.getOnName(this.getOn())}`);
+        this.updateOn(this.getOn());
         // register handlers
         this.service.getCharacteristic(this.platform.Characteristic.On)
-            .onSet(this.setOn.bind(this))
-            .onGet(this.getOn.bind(this));
+            .onSet(this.setOnHandler.bind(this))
+            .onGet(this.getOnHandler.bind(this));
     }
-    async setOn(value) {
-        this.log.info(`[${this.accessoryConfiguration.accessoryName}] Calling super.On()`, this.muteLogging);
-        super.setOn(value);
-        this.log.info(`[${this.accessoryConfiguration.accessoryName}] Calling super.On()`, this.muteLogging);
-        if (this.states.SwitchState === CompanionSwitch.ON) {
+    async getOnHandler() {
+        return super.getOn();
+    }
+    async setOnHandler(value) {
+        this.log.info(`[${this.accessoryName}] Calling super.On()`, this.muteLogging);
+        super.setOnHandler(value);
+        this.log.info(`[${this.accessoryName}] Calling super.On()`, this.muteLogging);
+        if (this.getOn() === CompanionSwitch.ON) {
             this.partnerAccessory.triggerEvent(this);
         }
     }
-    async getOn() {
-        return super.getOn();
-    }
 }
 //# sourceMappingURL=companionSwitch.js.map

package/dist/accessories/companions/companionSwitch.js.map

@@ -1 +1 @@
-{"version":3,"file":"companionSwitch.js","sourceRoot":"","sources":["../../../src/accessories/companions/companionSwitch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"companionSwitch.js","sourceRoot":"","sources":["../../../src/accessories/companions/companionSwitch.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAGtD;;GAEG;AACH,MAAM,OAAO,eAAgB,SAAQ,MAAM;IAExB,OAAO,GAAW,SAAS,CAAC;IAErC,aAAa,CAAS;IACtB,gBAAgB,CAA4B;IAEpD,YACE,QAAoC,EACpC,SAA4B,EAC5B,sBAA8C,EAC9C,aAAqB,EACrB,gBAA2C;QAE3C,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,sBAAsB,CAAC,CAAC;QAEnD,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QAEzC,2BAA2B;QAC3B,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC;QAC/B,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC;QACjC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QAEzB,6BAA6B;QAC7B,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC9E,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YAChC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;QAC9C,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC;YAC3C,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;QAE5H,kCAAkC;QAClC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,aAAc,CAAC,CAAC;QAEvF,4CAA4C;QAC5C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,sBAAsB,CAAC,aAAa,6CAA6C,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QAC3I,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QAE5B,oBAAoB;QAEpB,IAAI,CAAC,OAAQ,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;aAC7D,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACnC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,OAAO,KAAK,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAA0B;QAC3C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,aAAa,sBAAsB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAC9E,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAC1B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,aAAa,sBAAsB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAE9E,IAAI,IAAI,CAAC,KAAK,EAAE,KAAK,eAAe,CAAC,EAAE,EAAE,CAAC;YACxC,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;CACF"}

package/dist/accessories/externalAccessory.d.ts

@@ -1,4 +1,4 @@
-import { PlatformAccessory } from 'homebridge';
+import { PlatformAccessory, Service, WithUUID } from 'homebridge';
 import { VirtualAccessoriesPlatform } from '../platform.js';
 import { AccessoryConfiguration } from '../configuration/configurationAccessory.js';
 import { Accessory } from './accessory.js';
@@ -6,6 +6,6 @@ import { Accessory } from './accessory.js';
  * ExternalAccessory - Abstract accessory
  */
 export declare abstract class ExternalAccessory extends Accessory {
-    constructor(platform: VirtualAccessoriesPlatform, accessory: PlatformAccessory, accessoryConfiguration: AccessoryConfiguration);
+    constructor(platform: VirtualAccessoriesPlatform, accessory: PlatformAccessory, accessoryConfiguration: AccessoryConfiguration, serviceType: WithUUID<typeof Service>);
     getExternalAccessoryCategory(): number;
 }

package/dist/accessories/externalAccessory.js

@@ -3,8 +3,8 @@ import { Accessory } from './accessory.js';
  * ExternalAccessory - Abstract accessory
  */
 export class ExternalAccessory extends Accessory {
-    constructor(platform, accessory, accessoryConfiguration) {
-        super(platform, accessory, accessoryConfiguration);
+    constructor(platform, accessory, accessoryConfiguration, serviceType) {
+        super(platform, accessory, accessoryConfiguration, serviceType);
     }
     getExternalAccessoryCategory() {
         return this.accessory.category;

package/dist/accessories/externalAccessory.js.map

@@ -1 +1 @@
-{"version":3,"file":"externalAccessory.js","sourceRoot":"","sources":["../../src/accessories/externalAccessory.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C;;GAEG;AACH,MAAM,OAAgB,iBAAkB,SAAQ,SAAS;IAEvD,YACE,QAAoC,EACpC,SAA4B,EAC5B,sBAA8C;QAE9C,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,sBAAsB,CAAC,CAAC;IACrD,CAAC;IAED,4BAA4B;QAC1B,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;IACjC,CAAC;CACF"}
+{"version":3,"file":"externalAccessory.js","sourceRoot":"","sources":["../../src/accessories/externalAccessory.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C;;GAEG;AACH,MAAM,OAAgB,iBAAkB,SAAQ,SAAS;IAEvD,YACE,QAAoC,EACpC,SAA4B,EAC5B,sBAA8C,EAC9C,WAAqC;QAErC,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,sBAAsB,EAAE,WAAW,CAAC,CAAC;IAClE,CAAC;IAED,4BAA4B;QAC1B,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;IACjC,CAAC;CACF"}

package/dist/accessories/positionAccessory.d.ts

@@ -0,0 +1,30 @@
+import { CharacteristicValue, PlatformAccessory, Service, WithUUID } from 'homebridge';
+import { VirtualAccessoriesPlatform } from '../platform.js';
+import { AccessoryConfiguration } from '../configuration/configurationAccessory.js';
+import { Accessory } from './accessory.js';
+import { OpenableAccessoryConfiguration } from '../configuration/configurationOpenableAccesory.js';
+/**
+ * PositionAccessory - Abstract accessory
+ */
+export declare abstract class PositionAccessory extends Accessory {
+    private static readonly MIN_TIMEOUT_SECS;
+    private static readonly DEFAULT_TIMEOUT_SECS;
+    private readonly stateStorageKey;
+    private transitionTimer;
+    private transitionSteps;
+    private openableAccessoryConfiguration;
+    constructor(platform: VirtualAccessoriesPlatform, accessory: PlatformAccessory, accessoryConfiguration: AccessoryConfiguration, serviceType: WithUUID<typeof Service>);
+    getCurrentPositionHandler(): Promise<CharacteristicValue>;
+    getTargetPositionHandler(): Promise<CharacteristicValue>;
+    setTargetPositionHandler(value: CharacteristicValue): Promise<void>;
+    getPositionStateHandler(): Promise<CharacteristicValue>;
+    protected getJsonState(): string;
+    protected abstract getOpenableAccessoryConfiguration(): OpenableAccessoryConfiguration;
+    static get CLOSED(): number;
+    static get OPEN(): number;
+    static get DECREASING(): number;
+    static get INCREASING(): number;
+    static get STOPPED(): number;
+    static getPositionName(position: number): string;
+    static getPositionStateName(state: number): string;
+}

package/dist/accessories/positionAccessory.js

@@ -0,0 +1,170 @@
+import { CharacteristicType } from '../platform.js';
+import { Accessory } from './accessory.js';
+import { Timer } from '../utils/timer.js';
+/**
+ * PositionAccessory - Abstract accessory
+ */
+export class PositionAccessory extends Accessory {
+    static MIN_TIMEOUT_SECS = 1;
+    static DEFAULT_TIMEOUT_SECS = 3;
+    stateStorageKey = 'Position';
+    transitionTimer;
+    transitionSteps = 0;
+    openableAccessoryConfiguration;
+    constructor(platform, accessory, accessoryConfiguration, serviceType) {
+        super(platform, accessory, accessoryConfiguration, serviceType);
+        // Default state
+        let CurrentPosition = PositionAccessory.CLOSED;
+        let TargetPosition = PositionAccessory.CLOSED;
+        const PositionState = PositionAccessory.STOPPED;
+        // First configure the device based on the accessory details
+        this.openableAccessoryConfiguration = this.getOpenableAccessoryConfiguration();
+        this.defaultState = this.openableAccessoryConfiguration.defaultState === 'open' ? PositionAccessory.OPEN : PositionAccessory.CLOSED;
+        CurrentPosition = this.defaultState;
+        // If the accessory is stateful retrieve stored state
+        if (this.accessoryConfiguration.accessoryIsStateful) {
+            const accessoryState = this.loadAccessoryState(this.storagePath);
+            const cachedState = accessoryState[this.stateStorageKey];
+            if (cachedState !== undefined) {
+                CurrentPosition = cachedState;
+            }
+        }
+        TargetPosition = CurrentPosition;
+        const timerIsResettable = true;
+        this.transitionTimer = new Timer(this.accessoryConfiguration.accessoryName, this.log, timerIsResettable);
+        // Update the initial state of the accessory
+        this.setCurrentPosition(CurrentPosition);
+        this.setTargetPosition(TargetPosition);
+        this.setPositionState(PositionState);
+        // Last register handlers
+        this.service.getCharacteristic(CharacteristicType.CurrentPosition)
+            .onGet(this.getCurrentPositionHandler.bind(this));
+        this.service.getCharacteristic(CharacteristicType.TargetPosition)
+            .onSet(this.setTargetPositionHandler.bind(this))
+            .onGet(this.getTargetPositionHandler.bind(this));
+        this.service.getCharacteristic(CharacteristicType.PositionState)
+            .onGet(this.getPositionStateHandler.bind(this));
+    }
+    //
+    // ****************************** Handlers ******************************
+    //
+    // CurrentPosition
+    async getCurrentPositionHandler() {
+        // If timer is running, then blinds are moving, so calculate the interim position
+        if (this.transitionTimer.isTimerRunning()) {
+            const runtimeMillis = this.transitionTimer.getRuntime() * 1000;
+            const remainingSteps = Math.ceil(this.transitionTimer.getRemainingDurationMillis() / runtimeMillis * this.transitionSteps);
+            const TargetPosition = this.getTargetPosition();
+            this.updateCurrentPosition(TargetPosition - remainingSteps);
+        }
+        const currentPosition = this.getCurrentPosition();
+        this.log.debug(`[${this.accessoryName}] Getting Current Position: ${PositionAccessory.getPositionName(currentPosition)}`);
+        return currentPosition;
+    }
+    // TargetPosition
+    async getTargetPositionHandler() {
+        const targetPosition = this.getCharacteristicValue(CharacteristicType.TargetPosition);
+        this.log.debug(`[${this.accessoryName}] Getting Target Position: ${PositionAccessory.getPositionName(targetPosition)}`);
+        return targetPosition;
+    }
+    async setTargetPositionHandler(value) {
+        let TargetPosition = value;
+        TargetPosition = this.updateTargetPosition(TargetPosition);
+        this.log.info(`[${this.accessoryName}] Setting Target Position: ${PositionAccessory.getPositionName(TargetPosition)}`);
+        const CurrentPosition = this.getCurrentPosition();
+        let PositionState = (TargetPosition > CurrentPosition) ? PositionAccessory.INCREASING : PositionAccessory.DECREASING;
+        PositionState = this.updatePositionState(PositionState);
+        this.log.info(`[${this.accessoryName}] Setting Position State: ${PositionAccessory.getPositionStateName(PositionState)}`);
+        const transitionDuration = this.openableAccessoryConfiguration.transitionDuration;
+        const transitionDelay = (transitionDuration ? transitionDuration : PositionAccessory.DEFAULT_TIMEOUT_SECS);
+        this.transitionSteps = TargetPosition - CurrentPosition;
+        this.log.debug(`[${this.accessoryName}] Transition Steps: ${this.transitionSteps}`);
+        const proportionalTransitionDelay = Math.max(
+        // Round up to the nearest second
+        Math.ceil(transitionDelay / 100 * Math.abs(this.transitionSteps)), PositionAccessory.MIN_TIMEOUT_SECS);
+        this.log.debug(`[${this.accessoryName}] Proportional Delay: ${proportionalTransitionDelay}/(${transitionDelay})`);
+        const updateIntervalMillis = 100;
+        // Stop transition timer, if running
+        this.transitionTimer.stop();
+        this.transitionTimer.start(() => {
+            const PositionState = this.updatePositionState(PositionAccessory.STOPPED);
+            this.log.info(`[${this.accessoryName}] Setting Position State: ${PositionAccessory.getPositionStateName(PositionState)}`);
+            const CurrentPosition = this.updateCurrentPosition(this.getTargetPosition());
+            this.log.info(`[${this.accessoryName}] Setting Current Position: ${PositionAccessory.getPositionName(CurrentPosition)}`);
+            this.transitionSteps = 0;
+            this.saveState();
+        }, proportionalTransitionDelay, updateIntervalMillis);
+    }
+    // PositionState
+    async getPositionStateHandler() {
+        const positionState = this.getPositionState();
+        this.log.debug(`[${this.accessoryName}] Getting Position State: ${PositionAccessory.getPositionStateName(positionState)}`);
+        return positionState;
+    }
+    //
+    getJsonState() {
+        const json = JSON.stringify({
+            [this.stateStorageKey]: this.getCurrentPosition(),
+        });
+        return json;
+    }
+    //
+    // ****************************** Characteristics ******************************
+    //
+    // Lazy static getters
+    static get CLOSED() { return 0; } // 0%
+    static get OPEN() { return 100; } // 100%
+    static get DECREASING() { return CharacteristicType.PositionState.DECREASING; } // -> CLOSING
+    static get INCREASING() { return CharacteristicType.PositionState.INCREASING; } // -> OPENING
+    static get STOPPED() { return CharacteristicType.PositionState.STOPPED; } // -> OPEN or CLOSED
+    static getPositionName(position) {
+        let name;
+        switch (position) {
+            case undefined: {
+                name = 'undefined';
+                break;
+            }
+            case PositionAccessory.CLOSED: {
+                name = 'CLOSED';
+                break;
+            }
+            case PositionAccessory.OPEN: {
+                name = 'OPEN';
+                break;
+            }
+            default: {
+                name = `POSITION: ${position.toString()}%`;
+            }
+        }
+        if (position > PositionAccessory.OPEN) {
+            name = `INVALID ${name}%`;
+        }
+        return name;
+    }
+    static getPositionStateName(state) {
+        let name;
+        switch (state) {
+            case undefined: {
+                name = 'undefined';
+                break;
+            }
+            case PositionAccessory.DECREASING: {
+                name = 'DECREASING';
+                break;
+            }
+            case PositionAccessory.INCREASING: {
+                name = 'INCREASING';
+                break;
+            }
+            case PositionAccessory.STOPPED: {
+                name = 'STOPPED';
+                break;
+            }
+            default: {
+                name = state.toString();
+            }
+        }
+        return name;
+    }
+}
+//# sourceMappingURL=positionAccessory.js.map

package/dist/accessories/positionAccessory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"positionAccessory.js","sourceRoot":"","sources":["../../src/accessories/positionAccessory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAA8B,MAAM,gBAAgB,CAAC;AAEhF,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG3C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C;;GAEG;AACH,MAAM,OAAgB,iBAAkB,SAAQ,SAAS;IAE/C,MAAM,CAAU,gBAAgB,GAAW,CAAC,CAAC;IAC7C,MAAM,CAAU,oBAAoB,GAAW,CAAC,CAAC;IAExC,eAAe,GAAW,UAAU,CAAC;IAE9C,eAAe,CAAQ;IACvB,eAAe,GAAW,CAAC,CAAC;IAE5B,8BAA8B,CAAiC;IAEvE,YACE,QAAoC,EACpC,SAA4B,EAC5B,sBAA8C,EAC9C,WAAqC;QAErC,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,sBAAsB,EAAE,WAAW,CAAC,CAAC;QAEhE,gBAAgB;QAChB,IAAI,eAAe,GAAW,iBAAiB,CAAC,MAAM,CAAC;QACvD,IAAI,cAAc,GAAW,iBAAiB,CAAC,MAAM,CAAC;QACtD,MAAM,aAAa,GAAW,iBAAiB,CAAC,OAAO,CAAC;QAExD,4DAA4D;QAC5D,IAAI,CAAC,8BAA8B,GAAG,IAAI,CAAC,iCAAiC,EAAE,CAAC;QAC/E,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,8BAA8B,CAAC,YAAY,KAAK,MAAM,CAAC,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC;QAEpI,eAAe,GAAG,IAAI,CAAC,YAAY,CAAC;QAEpC,qDAAqD;QACrD,IAAI,IAAI,CAAC,sBAAsB,CAAC,mBAAmB,EAAE,CAAC;YACpD,MAAM,cAAc,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACjE,MAAM,WAAW,GAAW,cAAc,CAAC,IAAI,CAAC,eAAe,CAAW,CAAC;YAE3E,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;gBAC9B,eAAe,GAAG,WAAW,CAAC;YAChC,CAAC;QACH,CAAC;QAED,cAAc,GAAG,eAAe,CAAC;QAEjC,MAAM,iBAAiB,GAAY,IAAI,CAAC;QACxC,IAAI,CAAC,eAAe,GAAG,IAAI,KAAK,CAC9B,IAAI,CAAC,sBAAsB,CAAC,aAAa,EACzC,IAAI,CAAC,GAAG,EACR,iBAAiB,CAElB,CAAC;QAEF,4CAA4C;QAE5C,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;QACzC,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;QACvC,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;QAErC,yBAAyB;QAEzB,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,eAAe,CAAC;aAC/D,KAAK,CAAC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAEpD,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,cAAc,CAAC;aAC9D,KAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC/C,KAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAEnD,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,aAAa,CAAC;aAC7D,KAAK,CAAC,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,EAAE;IACF,yEAAyE;IACzE,EAAE;IAEF,kBAAkB;IAElB,KAAK,CAAC,yBAAyB;QAC7B,iFAAiF;QACjF,IAAI,IAAI,CAAC,eAAe,CAAC,cAAc,EAAE,EAAE,CAAC;YAC1C,MAAM,aAAa,GAAW,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC;YACvE,MAAM,cAAc,GAAW,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,0BAA0B,EAAE,GAAG,aAAa,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC;YAEnI,MAAM,cAAc,GAAW,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACxD,IAAI,CAAC,qBAAqB,CAAC,cAAc,GAAG,cAAc,CAAC,CAAC;QAC9D,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAClD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,aAAa,+BAA+B,iBAAiB,CAAC,eAAe,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;QAE1H,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,iBAAiB;IAEjB,KAAK,CAAC,wBAAwB;QAC5B,MAAM,cAAc,GAAW,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,CAAC,cAAc,CAAW,CAAC;QACxG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,aAAa,8BAA8B,iBAAiB,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;QAExH,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,KAA0B;QACvD,IAAI,cAAc,GAAW,KAAe,CAAC;QAC7C,cAAc,GAAG,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;QAC3D,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,aAAa,8BAA8B,iBAAiB,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;QAEvH,MAAM,eAAe,GAAW,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1D,IAAI,aAAa,GAAW,CAAC,cAAc,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC,iBAAiB,CAAC,UAAU,CAAC;QAC7H,aAAa,GAAG,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC;QACxD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,aAAa,6BAA6B,iBAAiB,CAAC,oBAAoB,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QAE1H,MAAM,kBAAkB,GAAG,IAAI,CAAC,8BAA8B,CAAC,kBAAkB,CAAC;QAClF,MAAM,eAAe,GAAW,CAAC,kBAAkB,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,CAAC;QAEnH,IAAI,CAAC,eAAe,GAAG,cAAc,GAAG,eAAe,CAAC;QACxD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,aAAa,uBAAuB,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;QACpF,MAAM,2BAA2B,GAAW,IAAI,CAAC,GAAG;QAClD,iCAAiC;QACjC,IAAI,CAAC,IAAI,CAAC,eAAe,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,EACjE,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;QACtC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,aAAa,yBAAyB,2BAA2B,KAAK,eAAe,GAAG,CAAC,CAAC;QAElH,MAAM,oBAAoB,GAAG,GAAG,CAAC;QAEjC,oCAAoC;QACpC,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC;QAE5B,IAAI,CAAC,eAAe,CAAC,KAAK,CACxB,GAAG,EAAE;YACH,MAAM,aAAa,GAAW,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;YAClF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,aAAa,6BAA6B,iBAAiB,CAAC,oBAAoB,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YAE1H,MAAM,eAAe,GAAW,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;YACrF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,aAAa,+BAA+B,iBAAiB,CAAC,eAAe,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;YAEzH,IAAI,CAAC,eAAe,GAAG,CAAC,CAAC;YAEzB,IAAI,CAAC,SAAS,EAAE,CAAC;QACnB,CAAC,EACD,2BAA2B,EAC3B,oBAAoB,CACrB,CAAC;IACJ,CAAC;IAED,gBAAgB;IAEhB,KAAK,CAAC,uBAAuB;QAC3B,MAAM,aAAa,GAAW,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,aAAa,6BAA6B,iBAAiB,CAAC,oBAAoB,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QAE3H,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,EAAE;IAEQ,YAAY;QACpB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;YAC1B,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC,kBAAkB,EAAE;SAClD,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAQD,EAAE;IACF,gFAAgF;IAChF,EAAE;IAEF,sBAAsB;IAEtB,MAAM,KAAK,MAAM,KAAiB,OAAO,CAAC,CAAC,CAAC,CAAC,CAAG,KAAK;IACrD,MAAM,KAAK,IAAI,KAAmB,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO;IAEvD,MAAM,KAAK,UAAU,KAAa,OAAO,kBAAkB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,CAAE,aAAa;IACtG,MAAM,KAAK,UAAU,KAAa,OAAO,kBAAkB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,CAAE,aAAa;IACtG,MAAM,KAAK,OAAO,KAAgB,OAAO,kBAAkB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAK,oBAAoB;IAE7G,MAAM,CAAC,eAAe,CAAC,QAAgB;QACrC,IAAI,IAAY,CAAC;QAEjB,QAAQ,QAAQ,EAAE,CAAC;YACnB,KAAK,SAAS,CAAC,CAAC,CAAC;gBAAC,IAAI,GAAG,WAAW,CAAC;gBAAC,MAAM;YAAC,CAAC;YAC9C,KAAK,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;gBAAC,IAAI,GAAG,QAAQ,CAAC;gBAAC,MAAM;YAAC,CAAC;YAC1D,KAAK,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC;gBAAC,IAAI,GAAG,MAAM,CAAC;gBAAC,MAAM;YAAC,CAAC;YACtD,OAAO,CAAC,CAAC,CAAC;gBAAC,IAAI,GAAG,aAAa,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC;YAAC,CAAC;QACxD,CAAC;QAED,IAAI,QAAQ,GAAG,iBAAiB,CAAC,IAAI,EAAE,CAAC;YACtC,IAAI,GAAG,WAAW,IAAI,GAAG,CAAC;QAC5B,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,CAAC,oBAAoB,CAAC,KAAa;QACvC,IAAI,IAAY,CAAC;QAEjB,QAAQ,KAAK,EAAE,CAAC;YAChB,KAAK,SAAS,CAAC,CAAC,CAAC;gBAAC,IAAI,GAAG,WAAW,CAAC;gBAAC,MAAM;YAAC,CAAC;YAC9C,KAAK,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC;gBAAC,IAAI,GAAG,YAAY,CAAC;gBAAC,MAAM;YAAC,CAAC;YAClE,KAAK,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC;gBAAC,IAAI,GAAG,YAAY,CAAC;gBAAC,MAAM;YAAC,CAAC;YAClE,KAAK,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;gBAAC,IAAI,GAAG,SAAS,CAAC;gBAAC,MAAM;YAAC,CAAC;YAC5D,OAAO,CAAC,CAAC,CAAC;gBAAC,IAAI,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;YAAC,CAAC;QACrC,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC"}

package/dist/accessories/updatableChargingState.d.ts

@@ -1,6 +1,6 @@
 /**
  *
  */
-export interface UpdatableChargingState {
-    updateChargingState(charging: boolean, charge: number, accessoryId: string): void;
+export interface UpdatableChargingStatus {
+    updateChargingStatus(charging: boolean, charge: number, accessoryId: string): void;
 }