homebridge-orro 1.0.19 → 1.0.21

package/dist/orroConnection.d.ts

@@ -0,0 +1,111 @@
+import { Logger } from 'homebridge';
+export declare type OrroCommand = {
+    command: 'on' | 'off';
+} | {
+    command: 'dimmer_set';
+    value: number;
+};
+export interface LightingChange {
+    onOff: boolean;
+    dimmerLevel: number;
+    /** False when the switch changed on its own, for example adapting to its surroundings. */
+    wasUserInitiated?: boolean;
+}
+export interface OrroTiming {
+    handshakeTimeoutMs: number;
+    heartbeatIntervalMs: number;
+    /** With a switch known to answer pings, silence this long means the socket is dead. */
+    heartbeatStaleMs: number;
+    /** A heartbeat count with no pong after which we stop expecting pongs and say so. */
+    pongGraceBeats: number;
+    reconnectMinMs: number;
+    reconnectMaxMs: number;
+    /** Retry delay ceiling while a command is waiting on the connection. */
+    commandReconnectMs: number;
+    /** A connection that stayed up this long resets the retry backoff. */
+    stableAfterMs: number;
+    confirmationTimeoutMs: number;
+    /** How long to keep waiting for the exact level after a non-matching event arrives. */
+    confirmationSettleMs: number;
+    /** Total time a command may take. Homebridge gives up on a handler at 10 seconds. */
+    commandDeadlineMs: number;
+}
+export declare const DEFAULT_TIMING: OrroTiming;
+export interface OrroConnectionOptions {
+    name: string;
+    ipAddress: string;
+    port?: number;
+    homeId: string;
+    switchId: string;
+    accessToken: string;
+    log: Pick<Logger, 'debug' | 'info' | 'warn' | 'error'>;
+    onLightingChange: (change: LightingChange) => void;
+    timing?: Partial<OrroTiming>;
+}
+export declare class OrroCommandError extends Error {
+}
+/**
+ * One long-lived WebSocket to one switch, per the Orro LAN WebSocket API.
+ *
+ * The API has no command acknowledgement and does not define a keepalive, so delivery
+ * is verified with what it does provide: every state change produces an
+ * OrroLightingChange event. A command that should change the light and produces no
+ * event is treated as lost, and is resent once on a fresh socket.
+ */
+export declare class OrroConnection {
+    private readonly options;
+    private readonly timing;
+    private readonly clientId;
+    private socket?;
+    private stopped;
+    private reconnectTimer?;
+    private heartbeatTimer?;
+    private reconnectAttempts;
+    private reconnectImmediately;
+    private openedAt;
+    private lastActivityAt;
+    private beatsWithoutPong;
+    private readonly openWaiters;
+    private pending?;
+    private queue;
+    private pongSeen;
+    private confirmationSeen;
+    constructor(options: OrroConnectionOptions);
+    start(): void;
+    stop(): void;
+    /**
+     * Sends a command, one at a time per switch so that a resend cannot reorder commands.
+     * Resolves once delivered. Rejects with OrroCommandError if it could not be delivered.
+     *
+     * @param expectChange whether the command should alter the light. Commands that
+     * would not change anything produce no event, so they cannot be confirmed.
+     */
+    execute(command: OrroCommand, expectChange: boolean): Promise<void>;
+    private deliver;
+    private write;
+    private expectConfirmation;
+    /**
+     * A late event from an earlier command must not confirm this one, so a non-matching
+     * event only starts a short wait for the exact value. If that value never comes
+     * (mid-fade levels, or a switch that rounds), the event still proves the socket works.
+     * The switch's own adaptive changes say nothing about a command, so they are ignored here.
+     */
+    private observeForConfirmation;
+    private settlePending;
+    private waitUntilOpen;
+    private settleOpenWaiters;
+    private isOpen;
+    private connect;
+    private handleOpen;
+    private heartbeat;
+    private handlePong;
+    private handleMessage;
+    private handleErrorFrame;
+    private handleClose;
+    private scheduleReconnect;
+    private reconnectNow;
+    private clearReconnectTimer;
+    private clearHeartbeat;
+    private log;
+}
+//# sourceMappingURL=orroConnection.d.ts.map

package/dist/orroConnection.d.ts.map

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

package/dist/orroConnection.js

@@ -0,0 +1,381 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OrroConnection = exports.OrroCommandError = exports.DEFAULT_TIMING = void 0;
+const crypto_1 = require("crypto");
+const ws_1 = __importDefault(require("ws"));
+exports.DEFAULT_TIMING = {
+    handshakeTimeoutMs: 5000,
+    heartbeatIntervalMs: 15000,
+    heartbeatStaleMs: 40000,
+    pongGraceBeats: 3,
+    reconnectMinMs: 1000,
+    reconnectMaxMs: 30000,
+    commandReconnectMs: 500,
+    stableAfterMs: 60000,
+    confirmationTimeoutMs: 3000,
+    confirmationSettleMs: 300,
+    commandDeadlineMs: 8000,
+};
+class OrroCommandError extends Error {
+}
+exports.OrroCommandError = OrroCommandError;
+function matcherFor(command) {
+    switch (command.command) {
+        case 'on':
+            return change => change.onOff;
+        case 'off':
+            return change => !change.onOff;
+        case 'dimmer_set':
+            return change => change.dimmerLevel === command.value;
+    }
+}
+const MAX_SEND_ATTEMPTS = 2;
+/**
+ * One long-lived WebSocket to one switch, per the Orro LAN WebSocket API.
+ *
+ * The API has no command acknowledgement and does not define a keepalive, so delivery
+ * is verified with what it does provide: every state change produces an
+ * OrroLightingChange event. A command that should change the light and produces no
+ * event is treated as lost, and is resent once on a fresh socket.
+ */
+class OrroConnection {
+    constructor(options) {
+        this.options = options;
+        // the docs ask for a unique id per client; Error frames echo it back
+        this.clientId = `homebridge-orro-${crypto_1.randomBytes(4).toString('hex')}`;
+        this.stopped = false;
+        this.reconnectAttempts = 0;
+        this.reconnectImmediately = false;
+        this.openedAt = 0;
+        this.lastActivityAt = 0;
+        this.beatsWithoutPong = 0;
+        this.openWaiters = new Set();
+        this.queue = Promise.resolve();
+        // Neither of these is documented behaviour, so both are learned from the switch
+        // rather than assumed. Until seen, their absence is never treated as a failure.
+        this.pongSeen = false;
+        this.confirmationSeen = false;
+        this.timing = { ...exports.DEFAULT_TIMING, ...options.timing };
+    }
+    start() {
+        this.stopped = false;
+        this.connect();
+    }
+    stop() {
+        this.stopped = true;
+        this.clearReconnectTimer();
+        this.clearHeartbeat();
+        this.settlePending({ kind: 'closed' });
+        this.settleOpenWaiters(false);
+        if (this.socket) {
+            this.socket.terminate();
+            this.socket = undefined;
+        }
+    }
+    /**
+     * Sends a command, one at a time per switch so that a resend cannot reorder commands.
+     * Resolves once delivered. Rejects with OrroCommandError if it could not be delivered.
+     *
+     * @param expectChange whether the command should alter the light. Commands that
+     * would not change anything produce no event, so they cannot be confirmed.
+     */
+    execute(command, expectChange) {
+        const result = this.queue.then(() => this.deliver(command, expectChange));
+        this.queue = result.catch(() => undefined);
+        return result;
+    }
+    async deliver(command, expectChange) {
+        const { name } = this.options;
+        const deadline = Date.now() + this.timing.commandDeadlineMs;
+        let failure = 'no connection';
+        let wentUnconfirmed = false;
+        for (let attempt = 1; attempt <= MAX_SEND_ATTEMPTS; attempt++) {
+            if (!await this.waitUntilOpen(deadline - Date.now())) {
+                failure = 'no connection';
+                wentUnconfirmed = false;
+                break;
+            }
+            const timestamp = Date.now();
+            const confirmation = expectChange
+                ? this.expectConfirmation(timestamp, Math.min(this.timing.confirmationTimeoutMs, deadline - timestamp), matcherFor(command))
+                : undefined;
+            try {
+                await this.write(command, timestamp);
+            }
+            catch (e) {
+                this.settlePending({ kind: 'closed' });
+                failure = `send failed: ${e.message}`;
+                wentUnconfirmed = false;
+                this.log('warn', `${name}: ${failure} (attempt ${attempt})`);
+                this.reconnectNow();
+                continue;
+            }
+            if (!confirmation) {
+                return;
+            }
+            const outcome = await confirmation;
+            if (outcome.kind === 'confirmed') {
+                this.confirmationSeen = true;
+                return;
+            }
+            if (outcome.kind === 'rejected') {
+                throw new OrroCommandError(`${name} rejected "${command.command}": ${outcome.error}`);
+            }
+            if (outcome.kind === 'unconfirmed') {
+                failure = 'no confirmation from switch';
+                wentUnconfirmed = true;
+                this.log('warn', `${name}: no confirmation for "${command.command}" (attempt ${attempt}), reconnecting`);
+                this.reconnectNow();
+            }
+            else {
+                failure = 'connection closed before confirmation';
+                wentUnconfirmed = false;
+            }
+        }
+        // Guards against a firmware that doesn't echo events to the sending client,
+        // where treating silence as failure would break every command.
+        if (wentUnconfirmed && !this.confirmationSeen) {
+            this.log('warn', `${name}: "${command.command}" was sent but this switch has not confirmed any command yet`);
+            return;
+        }
+        throw new OrroCommandError(`${name}: "${command.command}" not delivered (${failure})`);
+    }
+    write(command, timestamp) {
+        const payload = JSON.stringify({
+            targetId: this.options.switchId,
+            clientId: this.clientId,
+            type: 'RemoteCommand',
+            timestamp,
+            data: command,
+        });
+        return new Promise((resolve, reject) => {
+            if (!this.socket) {
+                reject(new Error('socket gone'));
+                return;
+            }
+            // ws drops sends on a closing socket silently unless a callback is given
+            this.socket.send(payload, (error) => error ? reject(error) : resolve());
+        });
+    }
+    expectConfirmation(timestamp, timeoutMs, matches) {
+        return new Promise(resolve => {
+            const timer = setTimeout(() => this.settlePending({ kind: 'unconfirmed' }), timeoutMs);
+            this.pending = { timestamp, timer, settle: resolve, matches, settling: false };
+        });
+    }
+    /**
+     * A late event from an earlier command must not confirm this one, so a non-matching
+     * event only starts a short wait for the exact value. If that value never comes
+     * (mid-fade levels, or a switch that rounds), the event still proves the socket works.
+     * The switch's own adaptive changes say nothing about a command, so they are ignored here.
+     */
+    observeForConfirmation(change) {
+        const pending = this.pending;
+        if (!pending) {
+            return;
+        }
+        if (pending.matches(change)) {
+            this.settlePending({ kind: 'confirmed' });
+        }
+        else if (!pending.settling && change.wasUserInitiated !== false) {
+            pending.settling = true;
+            clearTimeout(pending.timer);
+            pending.timer = setTimeout(() => this.settlePending({ kind: 'confirmed' }), this.timing.confirmationSettleMs);
+        }
+    }
+    settlePending(outcome) {
+        if (this.pending) {
+            const { timer, settle } = this.pending;
+            clearTimeout(timer);
+            this.pending = undefined;
+            settle(outcome);
+        }
+    }
+    waitUntilOpen(timeoutMs) {
+        if (this.isOpen()) {
+            return Promise.resolve(true);
+        }
+        if (this.stopped || timeoutMs <= 0) {
+            return Promise.resolve(false);
+        }
+        // someone is waiting, so don't sit out the rest of a long backoff
+        if (this.reconnectTimer) {
+            this.clearReconnectTimer();
+            this.connect();
+        }
+        return new Promise(resolve => {
+            const waiter = {
+                timer: setTimeout(() => {
+                    this.openWaiters.delete(waiter);
+                    resolve(false);
+                }, timeoutMs),
+                settle: resolve,
+            };
+            this.openWaiters.add(waiter);
+        });
+    }
+    settleOpenWaiters(open) {
+        for (const waiter of this.openWaiters) {
+            clearTimeout(waiter.timer);
+            waiter.settle(open);
+        }
+        this.openWaiters.clear();
+    }
+    isOpen() {
+        return this.socket !== undefined && this.socket.readyState === ws_1.default.OPEN;
+    }
+    connect() {
+        if (this.stopped || this.socket) {
+            return;
+        }
+        const { ipAddress, port = 8080, homeId, accessToken } = this.options;
+        const socket = new ws_1.default(`ws://${ipAddress}:${port}/edison/${homeId}`, {
+            headers: { 'offline-access-token': accessToken },
+            handshakeTimeout: this.timing.handshakeTimeoutMs,
+        });
+        this.socket = socket;
+        socket.on('open', () => this.handleOpen());
+        socket.on('message', (data) => this.handleMessage(data));
+        socket.on('pong', () => this.handlePong());
+        socket.on('close', (code, reason) => this.handleClose(socket, code, reason));
+        socket.on('error', (error) => {
+            // a retry loop against an offline switch shouldn't flood the log
+            this.log(this.reconnectAttempts === 0 ? 'warn' : 'debug', `${this.options.name}: ${error.message}`);
+        });
+    }
+    handleOpen() {
+        this.openedAt = Date.now();
+        this.lastActivityAt = this.openedAt;
+        this.beatsWithoutPong = 0;
+        this.log('info', `Connected to ${this.options.name}`);
+        this.settleOpenWaiters(true);
+        this.clearHeartbeat();
+        this.heartbeatTimer = setInterval(() => this.heartbeat(), this.timing.heartbeatIntervalMs);
+    }
+    heartbeat() {
+        if (!this.socket || !this.isOpen()) {
+            return;
+        }
+        const silentFor = Date.now() - this.lastActivityAt;
+        if (this.pongSeen && silentFor >= this.timing.heartbeatStaleMs) {
+            this.log('warn', `${this.options.name}: no response for ${Math.round(silentFor / 1000)}s, reconnecting`);
+            this.reconnectNow();
+            return;
+        }
+        if (!this.pongSeen && ++this.beatsWithoutPong === this.timing.pongGraceBeats) {
+            this.log('info', `${this.options.name} does not answer pings, relying on command confirmation`);
+        }
+        // Writing also surfaces a switch that rebooted: its TCP reset closes this socket.
+        this.socket.ping(undefined, undefined, () => undefined);
+    }
+    handlePong() {
+        this.lastActivityAt = Date.now();
+        if (!this.pongSeen) {
+            this.pongSeen = true;
+            this.log('debug', `${this.options.name} answers pings`);
+        }
+    }
+    handleMessage(raw) {
+        var _a;
+        this.lastActivityAt = Date.now();
+        let message;
+        try {
+            message = JSON.parse(raw.toString());
+        }
+        catch (e) {
+            this.log('debug', `${this.options.name}: unparseable message: ${e.message}`);
+            return;
+        }
+        const { type, targetId, clientId, data } = message || {};
+        if (type === 'Error') {
+            this.handleErrorFrame(clientId, data);
+            return;
+        }
+        // Identified by shape rather than `type`, so a firmware that names the event
+        // differently from the 2021 docs can't make every command look unconfirmed.
+        if (!data || typeof data.onOff !== 'boolean' || typeof data.dimmerLevel !== 'number') {
+            return;
+        }
+        // Events are home-wide, and targetId may name a group or room. The docs
+        // guarantee switchTargetId is the switch that actually changed.
+        if (((_a = data.switchTargetId) !== null && _a !== void 0 ? _a : targetId) !== this.options.switchId) {
+            return;
+        }
+        const change = { onOff: data.onOff, dimmerLevel: data.dimmerLevel, wasUserInitiated: data.wasUserInitiated };
+        this.observeForConfirmation(change);
+        this.options.onLightingChange(change);
+    }
+    handleErrorFrame(clientId, data) {
+        var _a;
+        if (clientId && clientId !== this.clientId) {
+            return;
+        }
+        const error = (_a = data === null || data === void 0 ? void 0 : data.error) !== null && _a !== void 0 ? _a : 'unknown error';
+        this.log('error', `${this.options.name} reported an error: ${error}`);
+        if (this.pending && ((data === null || data === void 0 ? void 0 : data.messageTimestamp) === undefined || data.messageTimestamp === this.pending.timestamp)) {
+            this.settlePending({ kind: 'rejected', error });
+        }
+    }
+    handleClose(socket, code, reason) {
+        if (socket !== this.socket) {
+            return;
+        }
+        this.socket = undefined;
+        this.clearHeartbeat();
+        this.settlePending({ kind: 'closed' });
+        if (this.stopped) {
+            return;
+        }
+        if (this.openedAt && Date.now() - this.openedAt >= this.timing.stableAfterMs) {
+            this.reconnectAttempts = 0;
+        }
+        const detail = reason && reason.length ? `, ${reason.toString()}` : '';
+        this.log(this.reconnectAttempts === 0 ? 'warn' : 'debug', `Disconnected from ${this.options.name} (code ${code}${detail})`);
+        this.openedAt = 0;
+        this.scheduleReconnect();
+    }
+    scheduleReconnect() {
+        const { reconnectMinMs, reconnectMaxMs, commandReconnectMs } = this.timing;
+        const backoff = Math.min(reconnectMaxMs, reconnectMinMs * 2 ** this.reconnectAttempts);
+        // jitter keeps every switch from retrying in lockstep after a network blip
+        let delay = backoff / 2 + Math.random() * (backoff / 2);
+        if (this.openWaiters.size > 0) {
+            delay = Math.min(delay, commandReconnectMs);
+        }
+        if (this.reconnectImmediately) {
+            delay = 0;
+            this.reconnectImmediately = false;
+        }
+        this.reconnectAttempts++;
+        this.reconnectTimer = setTimeout(() => {
+            this.reconnectTimer = undefined;
+            this.connect();
+        }, delay);
+    }
+    reconnectNow() {
+        if (this.socket) {
+            this.reconnectImmediately = true;
+            this.socket.terminate();
+        }
+    }
+    clearReconnectTimer() {
+        if (this.reconnectTimer) {
+            clearTimeout(this.reconnectTimer);
+            this.reconnectTimer = undefined;
+        }
+    }
+    clearHeartbeat() {
+        if (this.heartbeatTimer) {
+            clearInterval(this.heartbeatTimer);
+            this.heartbeatTimer = undefined;
+        }
+    }
+    log(level, message) {
+        this.options.log[level](message);
+    }
+}
+exports.OrroConnection = OrroConnection;
+//# sourceMappingURL=orroConnection.js.map

package/dist/orroConnection.js.map

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

package/dist/platform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,qBAAqB,EAAE,MAAM,EAAE,iBAAiB,EAAE,cAAc,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAK5H;;;;EAIE;AACF,qBAAa,YAAa,YAAW,qBAAqB;aAQlC,GAAG,EAAE,MAAM;aACX,MAAM,EAAE,cAAc;aACtB,GAAG,EAAE,GAAG;IAT5B,SAAgB,OAAO,EAAE,OAAO,OAAO,CAAwB;IAC/D,SAAgB,cAAc,EAAE,OAAO,cAAc,CAA+B;IAGpF,SAAgB,WAAW,EAAE,iBAAiB,EAAE,CAAM;gBAGlC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,GAAG;IAe5B;;;MAGE;IACF,kBAAkB,CAAC,SAAS,EAAE,iBAAiB;IAO/C;;;;MAIE;IACF,eAAe;CAiDlB"}
+{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,qBAAqB,EAAE,MAAM,EAAE,iBAAiB,EAAE,cAAc,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAK5H;;;;EAIE;AACF,qBAAa,YAAa,YAAW,qBAAqB;aAQlC,GAAG,EAAE,MAAM;aACX,MAAM,EAAE,cAAc;aACtB,GAAG,EAAE,GAAG;IAT5B,SAAgB,OAAO,EAAE,OAAO,OAAO,CAAwB;IAC/D,SAAgB,cAAc,EAAE,OAAO,cAAc,CAA+B;IAGpF,SAAgB,WAAW,EAAE,iBAAiB,EAAE,CAAM;gBAGlC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,GAAG;IAe5B;;;MAGE;IACF,kBAAkB,CAAC,SAAS,EAAE,iBAAiB;IAO/C;;;;MAIE;IACF,eAAe;CAsDlB"}

package/dist/platform.js

@@ -43,6 +43,10 @@ class OrroPlatform {
     * must not be registered again to prevent "duplicate UUID" errors.
     */
     discoverDevices() {
+        if (!Array.isArray(this.config.switches) || !this.config.homeID || !this.config.accessToken) {
+            this.log.error('Config needs homeID, accessToken and a switches list. Not loading any switches.');
+            return;
+        }
         // loop over the discovered devices and register each one if it has not already been registered
         for (const device of this.config.switches) {
             // generate a unique id for the accessory this should be generated from
@@ -55,9 +59,9 @@ class OrroPlatform {
             if (existingAccessory) {
                 // the accessory already exists
                 this.log.info('Restoring existing accessory from cache:', existingAccessory.displayName);
-                // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                // existingAccessory.context.device = device;
-                // this.api.updatePlatformAccessories([existingAccessory]);
+                // always use the current config, otherwise an edited IP address is ignored
+                existingAccessory.context.device = device;
+                this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
                 new platformAccessory_1.Switch(this, existingAccessory);

package/dist/platform.js.map

@@ -1 +1 @@
-{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":";;;AAEA,yCAAwD;AACxD,2DAA6C;AAE7C;;;;EAIE;AACF,MAAa,YAAY;IAOrB,YACoB,GAAW,EACX,MAAsB,EACtB,GAAQ;QAFR,QAAG,GAAH,GAAG,CAAQ;QACX,WAAM,GAAN,MAAM,CAAgB;QACtB,QAAG,GAAH,GAAG,CAAK;QATZ,YAAO,GAAmB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;QAC/C,mBAAc,GAA0B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC;QAEpF,oDAAoD;QACpC,gBAAW,GAAwB,EAAE,CAAC;QAOlD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iCAAiC,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAExE,8FAA8F;QAC9F,4FAA4F;QAC5F,2FAA2F;QAC3F,yCAAyC;QACzC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;YACnC,GAAG,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;YAClD,oEAAoE;YACpE,IAAI,CAAC,eAAe,EAAE,CAAC;QAC3B,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;MAGE;IACF,kBAAkB,CAAC,SAA4B;QAC3C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,+BAA+B,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;QAEtE,wGAAwG;QACxG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACrC,CAAC;IAED;;;;MAIE;IACF,eAAe;QAEX,+FAA+F;QAC/F,KAAI,MAAM,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YAEtC,uEAAuE;YACvE,0EAA0E;YAC1E,wBAAwB;YACxB,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAE7D,uFAAuF;YACvF,wEAAwE;YACxE,MAAM,iBAAiB,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;YACtF,IAAG,iBAAiB,EAAE;gBAClB,+BAA+B;gBAC/B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,0CAA0C,EAAE,iBAAiB,CAAC,WAAW,CAAC,CAAC;gBAEzF,wGAAwG;gBACxG,6CAA6C;gBAC7C,2DAA2D;gBAE3D,0DAA0D;gBAC1D,+CAA+C;gBAC/C,IAAI,0BAAM,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;gBAEpC,4GAA4G;gBAC5G,qDAAqD;gBACrD,2FAA2F;gBAC3F,2FAA2F;aAC9F;iBAAM;gBACH,4DAA4D;gBAC5D,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;gBAEpD,yBAAyB;gBACzB,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAEpE,+DAA+D;gBAC/D,wFAAwF;gBACxF,SAAS,CAAC,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;gBAElC,8DAA8D;gBAC9D,+CAA+C;gBAC/C,IAAI,0BAAM,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;gBAE5B,sCAAsC;gBACtC,IAAI,CAAC,GAAG,CAAC,2BAA2B,CAAC,sBAAW,EAAE,wBAAa,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;aACjF;SACJ;IACL,CAAC;CACJ;AA1FD,oCA0FC"}
+{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":";;;AAEA,yCAAwD;AACxD,2DAA6C;AAE7C;;;;EAIE;AACF,MAAa,YAAY;IAOrB,YACoB,GAAW,EACX,MAAsB,EACtB,GAAQ;QAFR,QAAG,GAAH,GAAG,CAAQ;QACX,WAAM,GAAN,MAAM,CAAgB;QACtB,QAAG,GAAH,GAAG,CAAK;QATZ,YAAO,GAAmB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;QAC/C,mBAAc,GAA0B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC;QAEpF,oDAAoD;QACpC,gBAAW,GAAwB,EAAE,CAAC;QAOlD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iCAAiC,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAExE,8FAA8F;QAC9F,4FAA4F;QAC5F,2FAA2F;QAC3F,yCAAyC;QACzC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;YACnC,GAAG,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;YAClD,oEAAoE;YACpE,IAAI,CAAC,eAAe,EAAE,CAAC;QAC3B,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;MAGE;IACF,kBAAkB,CAAC,SAA4B;QAC3C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,+BAA+B,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;QAEtE,wGAAwG;QACxG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACrC,CAAC;IAED;;;;MAIE;IACF,eAAe;QAEX,IAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YACxF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iFAAiF,CAAC,CAAC;YAClG,OAAO;SACV;QAED,+FAA+F;QAC/F,KAAI,MAAM,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YAEtC,uEAAuE;YACvE,0EAA0E;YAC1E,wBAAwB;YACxB,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAE7D,uFAAuF;YACvF,wEAAwE;YACxE,MAAM,iBAAiB,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;YACtF,IAAG,iBAAiB,EAAE;gBAClB,+BAA+B;gBAC/B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,0CAA0C,EAAE,iBAAiB,CAAC,WAAW,CAAC,CAAC;gBAEzF,2EAA2E;gBAC3E,iBAAiB,CAAC,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;gBAC1C,IAAI,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC;gBAExD,0DAA0D;gBAC1D,+CAA+C;gBAC/C,IAAI,0BAAM,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;gBAEpC,4GAA4G;gBAC5G,qDAAqD;gBACrD,2FAA2F;gBAC3F,2FAA2F;aAC9F;iBAAM;gBACH,4DAA4D;gBAC5D,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;gBAEpD,yBAAyB;gBACzB,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAEpE,+DAA+D;gBAC/D,wFAAwF;gBACxF,SAAS,CAAC,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;gBAElC,8DAA8D;gBAC9D,+CAA+C;gBAC/C,IAAI,0BAAM,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;gBAE5B,sCAAsC;gBACtC,IAAI,CAAC,GAAG,CAAC,2BAA2B,CAAC,sBAAW,EAAE,wBAAa,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;aACjF;SACJ;IACL,CAAC;CACJ;AA/FD,oCA+FC"}

package/dist/platformAccessory.d.ts

@@ -1,45 +1,30 @@
 import { CharacteristicValue, PlatformAccessory } from 'homebridge';
 import { OrroPlatform } from './platform';
-/**
-* Platform Accessory
-* An instance of this class is created for each accessory your platform registers
-* Each accessory may expose multiple services of different service types.
-*/
 export declare class Switch {
     private readonly platform;
     private readonly accessory;
-    private service;
-    /**
-    * These are just used to create a working example
-    * You should implement your own code to track the state of your accessory
-    */
-    private state;
-    private connection;
+    private readonly service;
+    private readonly connection;
+    private readonly state;
+    private pendingBrightness;
+    private brightnessTimer?;
+    private brightnessWaiters;
+    private brightnessSending;
+    private holdTimer?;
+    private heldChange?;
     constructor(platform: OrroPlatform, accessory: PlatformAccessory);
-    connect: () => Promise<void>;
-    /**
-    * Handle "SET" requests from HomeKit
-    * These are sent when the user changes the state of an accessory, for example, turning on a Light bulb.
-    */
+    private handleLightingChange;
     setOn(value: CharacteristicValue): Promise<void>;
-    /**
-    * Handle the "GET" requests from HomeKit
-    * These are sent when HomeKit wants to know the current state of the accessory, for example, checking if a Light bulb is on.
-    *
-    * GET requests should return as fast as possbile. A long delay here will result in
-    * HomeKit being unresponsive and a bad user experience in general.
-    *
-    * If your device takes time to respond you should update the status of your device
-    * asynchronously instead using the `updateCharacteristic` method instead.
-
-    * @example
-    * this.service.updateCharacteristic(this.platform.Characteristic.On, true)
-    */
-    getOn(): Promise<CharacteristicValue>;
-    /**
-    * Handle "SET" requests from HomeKit
-    * These are sent when the user changes the state of an accessory, for example, changing the Brightness
-    */
     setBrightness(value: CharacteristicValue): Promise<void>;
+    /**
+     * Only one brightness command is ever outstanding. Values that arrive meanwhile
+     * replace each other, so the switch goes straight to the newest one.
+     */
+    private flushBrightness;
+    /** Holds back switch reports, then applies the most recent one so the real level wins. */
+    private holdSwitchReports;
+    /** Throws a HomeKit error on failure, so a lost command is never reported as a success. */
+    private send;
+    private saveState;
 }
 //# sourceMappingURL=platformAccessory.d.ts.map

package/dist/platformAccessory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"platformAccessory.d.ts","sourceRoot":"","sources":["../src/platformAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAW,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG1C;;;;EAIE;AACF,qBAAa,MAAM;IAeX,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAf9B,OAAO,CAAC,OAAO,CAAU;IAEzB;;;MAGE;IACF,OAAO,CAAC,KAAK,CAGX;IAEF,OAAO,CAAC,UAAU,CAAY;gBAGT,QAAQ,EAAE,YAAY,EACtB,SAAS,EAAE,iBAAiB;IAgCjD,OAAO,sBA+DN;IAED;;;MAGE;IACI,KAAK,CAAC,KAAK,EAAE,mBAAmB;IA6BtC;;;;;;;;;;;;MAYE;IACI,KAAK,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAM3C;;;MAGE;IACI,aAAa,CAAC,KAAK,EAAE,mBAAmB;CA4CjD"}
+{"version":3,"file":"platformAccessory.d.ts","sourceRoot":"","sources":["../src/platformAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAW,MAAM,YAAY,CAAC;AAE7E,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAc1C,qBAAa,MAAM;IAaX,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAb9B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiB;IAC5C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAsC;IAE5D,OAAO,CAAC,iBAAiB,CAAK;IAC9B,OAAO,CAAC,eAAe,CAAC,CAAiB;IACzC,OAAO,CAAC,iBAAiB,CAA0B;IACnD,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,SAAS,CAAC,CAAiB;IACnC,OAAO,CAAC,UAAU,CAAC,CAAiB;gBAGf,QAAQ,EAAE,YAAY,EACtB,SAAS,EAAE,iBAAiB;IA2CjD,OAAO,CAAC,oBAAoB;IA2BtB,KAAK,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtD,aAAa,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAaxD;;;OAGG;YACW,eAAe;IA0B7B,0FAA0F;IAC1F,OAAO,CAAC,iBAAiB;IAezB,2FAA2F;YAC7E,IAAI;IAWlB,OAAO,CAAC,SAAS;CAGpB"}

package/dist/platformAccessory.js

@@ -1,199 +1,147 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Switch = void 0;
-const ws_1 = __importDefault(require("ws"));
-/**
-* Platform Accessory
-* An instance of this class is created for each accessory your platform registers
-* Each accessory may expose multiple services of different service types.
-*/
+const orroConnection_1 = require("./orroConnection");
+// HomeKit sends a stream of values while a slider is dragged; only the last one matters
+const BRIGHTNESS_DEBOUNCE_MS = 120;
+// How long after a brightness request the switch's own reports are held back, since
+// events from earlier values and fades keep arriving after the newest value is sent
+const BRIGHTNESS_HOLD_MS = 2000;
 class Switch {
     constructor(platform, accessory) {
         this.platform = platform;
         this.accessory = accessory;
-        /**
-        * These are just used to create a working example
-        * You should implement your own code to track the state of your accessory
-        */
+        this.pendingBrightness = 0;
+        this.brightnessWaiters = [];
+        this.brightnessSending = false;
+        const { device, lastState } = accessory.context;
+        // The API has no way to read a switch's light state, so the last known
+        // state is kept across restarts instead of reporting everything as off.
         this.state = {
-            On: false,
-            Brightness: 0
+            On: (lastState === null || lastState === void 0 ? void 0 : lastState.On) === true,
+            Brightness: typeof (lastState === null || lastState === void 0 ? void 0 : lastState.Brightness) === 'number' ? lastState.Brightness : 0,
         };
-        this.connect = async () => {
-            const url = `ws://${this.accessory.context.device.ipAddress}:8080/edison/${this.platform.config.homeID}`;
-            this.platform.log.info('Connecting to:', url);
-            const connection = new ws_1.default(url, { headers: { 'offline-access-token': this.platform.config.accessToken } });
-            connection.on('open', () => {
-                this.platform.log.info(`Connected to ${this.accessory.context.device.name}`);
-                // listen for system events
-                this.connection.on('message', response => {
-                    try {
-                        // prevent moving forward if event is not for this switch
-                        const { data, targetId } = JSON.parse(response.toString());
-                        if (targetId !== this.accessory.context.device.switchID) {
-                            return;
-                        }
-                        // update on/off state if changed externally
-                        const { dimmerLevel, onOff } = data || {};
-                        if (typeof (onOff) === 'boolean' && onOff !== this.state.On) {
-                            this.platform.log.info(`Updated "on" to ${onOff ? 'true' : 'false'} from system event`);
-                            this.state.On = onOff;
-                            this.service.updateCharacteristic(this.platform.Characteristic.On, onOff);
-                        }
-                        // turn light off if dimmer level is zero
-                        if (dimmerLevel === 0 && this.state.On !== false) {
-                            this.platform.log.info(`Updated "on" to false to match zero dimmer level from system event`);
-                            this.state.On = false;
-                            this.service.updateCharacteristic(this.platform.Characteristic.On, false);
-                        }
-                        // prevent moving forward if a manuanl  hange triggered this event
-                        if (this.accessory.context.device.action) {
-                            const { type, value } = this.accessory.context.device.action;
-                            if (type === 'brightness' && value === dimmerLevel) {
-                                this.accessory.context.device.action = null;
-                                this.platform.log.info(`Brightness system event blocked by manual value change`);
-                                return;
-                            }
-                        }
-                        // update dimmer level if changed externally
-                        if (dimmerLevel >= 0 && dimmerLevel !== this.state.Brightness) {
-                            this.platform.log.info(`Updated "brightness" to ${dimmerLevel} from system event`);
-                            this.state.Brightness = dimmerLevel;
-                            this.service.updateCharacteristic(this.platform.Characteristic.Brightness, dimmerLevel);
-                        }
-                    }
-                    catch (e) {
-                        this.platform.log.error('Websocket api response error:', e.message);
-                    }
-                });
-            });
-            connection.on('close', () => {
-                this.platform.log.error(`Disconnected from ${this.accessory.context.device.name}, attempting reconnection in 30 seconds...`);
-                setTimeout(this.connect, 30000);
-            });
-            connection.on('error', error => {
-                this.platform.log.error(`${this.accessory.context.device.name} error: ${error.message}`);
-            });
-            this.connection = connection;
-        };
-        // set accessory information
         this.accessory.getService(this.platform.Service.AccessoryInformation)
             .setCharacteristic(this.platform.Characteristic.Manufacturer, 'Orro')
             .setCharacteristic(this.platform.Characteristic.Model, 'Switch')
-            .setCharacteristic(this.platform.Characteristic.SerialNumber, accessory.context.device.serialNumber);
-        // get the LightBulb service if it exists, otherwise create a new LightBulb service
-        // you can create multiple services for each accessory
-        this.service = this.accessory.getService(this.platform.Service.Lightbulb) || this.accessory.addService(this.platform.Service.Lightbulb);
-        // set the service name, this is what is displayed as the default name on the Home app
-        // in this example we are using the name we stored in the `accessory.context` in the `discoverDevices` method.
-        this.service.setCharacteristic(this.platform.Characteristic.Name, accessory.context.device.name);
-        // each service must implement at-minimum the "required characteristics" for the given service type
-        // see https://developers.homebridge.io/#/service/Lightbulb
-        // register handlers for the On/Off Characteristic
+            .setCharacteristic(this.platform.Characteristic.SerialNumber, device.serialNumber);
+        this.service = this.accessory.getService(this.platform.Service.Lightbulb)
+            || this.accessory.addService(this.platform.Service.Lightbulb);
+        this.service.setCharacteristic(this.platform.Characteristic.Name, device.name);
         this.service.getCharacteristic(this.platform.Characteristic.On)
-            .onSet(this.setOn.bind(this)) // SET - bind to the `setOn` method below
-            .onGet(this.getOn.bind(this)); // GET - bind to the `getOn` method below
-        // register handlers for the Brightness Characteristic
+            .onSet(this.setOn.bind(this))
+            .onGet(() => this.state.On);
         this.service.getCharacteristic(this.platform.Characteristic.Brightness)
-            .onSet(this.setBrightness.bind(this)); // SET - bind to the 'setBrightness` method below
-        this.connect();
+            .onSet(this.setBrightness.bind(this))
+            .onGet(() => this.state.Brightness);
+        this.connection = new orroConnection_1.OrroConnection({
+            name: device.name,
+            ipAddress: device.ipAddress,
+            homeId: this.platform.config.homeID,
+            switchId: device.switchID,
+            accessToken: this.platform.config.accessToken,
+            log: this.platform.log,
+            onLightingChange: change => this.handleLightingChange(change),
+        });
+        this.connection.start();
+        this.platform.api.on('shutdown', () => this.connection.stop());
     }
-    /**
-    * Handle "SET" requests from HomeKit
-    * These are sent when the user changes the state of an accessory, for example, turning on a Light bulb.
-    */
-    async setOn(value) {
-        try {
-            this.platform.log.info('Set On');
-            const payload = JSON.stringify({
-                targetId: this.accessory.context.device.switchID,
-                clientId: 'homebridge-orro',
-                type: 'RemoteCommand',
-                timestamp: Date.now(),
-                data: {
-                    command: value ? 'on' : 'off'
-                }
-            });
-            this.connection.send(payload);
-            this.state.On = value;
-            this.platform.log.info('Set Characteristic On ->', {
-                targetId: this.accessory.context.device.switchID,
-                clientId: 'homebridge-orro',
-                type: 'RemoteCommand',
-                timestamp: Date.now(),
-                data: {
-                    command: value ? 'on' : 'off'
-                }
-            });
+    handleLightingChange(change) {
+        if (this.holdTimer) {
+            this.heldChange = change;
+            return;
         }
-        catch (e) {
-            this.platform.log.error('Set Characteristic On Error -> ', e.message);
+        const { onOff, dimmerLevel, wasUserInitiated } = change;
+        const source = wasUserInitiated === false ? 'adaptive' : 'from switch';
+        // HomeKit has no "on at zero" state, so level 0 is shown as off
+        const on = onOff && dimmerLevel !== 0;
+        if (on !== this.state.On) {
+            this.platform.log.info(`${this.accessory.displayName}: on -> ${on} (${source})`);
+            this.state.On = on;
+            this.service.updateCharacteristic(this.platform.Characteristic.On, on);
+        }
+        // level 0 is skipped so turning back on restores the previous brightness
+        if (dimmerLevel > 0 && dimmerLevel !== this.state.Brightness) {
+            this.platform.log.info(`${this.accessory.displayName}: brightness -> ${dimmerLevel} (${source})`);
+            this.state.Brightness = dimmerLevel;
+            this.service.updateCharacteristic(this.platform.Characteristic.Brightness, dimmerLevel);
         }
+        this.saveState();
     }
-    /**
-    * Handle the "GET" requests from HomeKit
-    * These are sent when HomeKit wants to know the current state of the accessory, for example, checking if a Light bulb is on.
-    *
-    * GET requests should return as fast as possbile. A long delay here will result in
-    * HomeKit being unresponsive and a bad user experience in general.
-    *
-    * If your device takes time to respond you should update the status of your device
-    * asynchronously instead using the `updateCharacteristic` method instead.
-
-    * @example
-    * this.service.updateCharacteristic(this.platform.Characteristic.On, true)
-    */
-    async getOn() {
-        const isOn = this.state.On;
-        this.platform.log.info('Get Characteristic On ->', isOn);
-        return isOn;
+    async setOn(value) {
+        const on = value;
+        await this.send({ command: on ? 'on' : 'off' }, on !== this.state.On);
+        this.state.On = on;
+        this.saveState();
+    }
+    setBrightness(value) {
+        this.pendingBrightness = value;
+        this.holdSwitchReports();
+        return new Promise((resolve, reject) => {
+            this.brightnessWaiters.push({ resolve, reject });
+            if (this.brightnessTimer) {
+                clearTimeout(this.brightnessTimer);
+            }
+            this.brightnessTimer = setTimeout(() => this.flushBrightness(), BRIGHTNESS_DEBOUNCE_MS);
+        });
     }
     /**
-    * Handle "SET" requests from HomeKit
-    * These are sent when the user changes the state of an accessory, for example, changing the Brightness
-    */
-    async setBrightness(value) {
+     * Only one brightness command is ever outstanding. Values that arrive meanwhile
+     * replace each other, so the switch goes straight to the newest one.
+     */
+    async flushBrightness() {
+        this.brightnessTimer = undefined;
+        if (this.brightnessSending) {
+            return; // the loop below picks up the newest value when its send finishes
+        }
+        this.brightnessSending = true;
+        // a running debounce timer means the user is still dragging, and it will flush again
+        while (this.brightnessWaiters.length > 0 && !this.brightnessTimer) {
+            const waiters = this.brightnessWaiters;
+            this.brightnessWaiters = [];
+            const value = this.pendingBrightness;
+            try {
+                await this.send({ command: 'dimmer_set', value }, value !== this.state.Brightness);
+                this.state.Brightness = value;
+                this.saveState();
+                waiters.forEach(waiter => waiter.resolve());
+            }
+            catch (e) {
+                waiters.forEach(waiter => waiter.reject(e));
+            }
+            this.holdSwitchReports();
+        }
+        this.brightnessSending = false;
+    }
+    /** Holds back switch reports, then applies the most recent one so the real level wins. */
+    holdSwitchReports() {
+        if (this.holdTimer) {
+            clearTimeout(this.holdTimer);
+        }
+        this.holdTimer = setTimeout(() => {
+            this.holdTimer = undefined;
+            const change = this.heldChange;
+            this.heldChange = undefined;
+            if (change) {
+                this.handleLightingChange(change);
+            }
+        }, BRIGHTNESS_HOLD_MS);
+    }
+    /** Throws a HomeKit error on failure, so a lost command is never reported as a success. */
+    async send(command, expectChange) {
         try {
-            // prepare payload for api request
-            const payload = JSON.stringify({
-                targetId: this.accessory.context.device.switchID,
-                clientId: 'homebridge-orro',
-                type: 'RemoteCommand',
-                timestamp: Date.now(),
-                data: {
-                    command: 'dimmer_set',
-                    value: value
-                }
-            });
-            // submit api request
-            this.connection.send(payload);
-            // update local state for brightness
-            this.state.Brightness = value;
-            this.service.updateCharacteristic(this.platform.Characteristic.Brightness, this.state.Brightness);
-            // set object for manual change
-            this.accessory.context.device.action = {
-                type: 'brightness',
-                value: this.state.Brightness
-            };
-            // log payload to console
-            this.platform.log.info('Set Characteristic Brightness -> ', {
-                targetId: this.accessory.context.device.switchID,
-                clientId: 'homebridge-orro',
-                type: 'RemoteCommand',
-                timestamp: Date.now(),
-                data: {
-                    command: 'dimmer_set',
-                    value: value
-                }
-            });
+            await this.connection.execute(command, expectChange);
+            this.platform.log.debug(`${this.accessory.displayName}: delivered`, command);
         }
         catch (e) {
-            this.platform.log.error('Set Characteristic Brightness Error -> ', e.message);
+            this.platform.log.error(e.message);
+            const { HapStatusError, HAPStatus } = this.platform.api.hap;
+            throw new HapStatusError(-70402 /* SERVICE_COMMUNICATION_FAILURE */);
         }
     }
+    saveState() {
+        this.accessory.context.lastState = { ...this.state };
+    }
 }
 exports.Switch = Switch;
 //# sourceMappingURL=platformAccessory.js.map

package/dist/platformAccessory.js.map

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Homebridge Orro",
   "name": "homebridge-orro",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "description": "Homebridge support for Orro lan switches.",
   "license": "Apache-2.0",
   "repository": {
@@ -16,7 +16,13 @@
     "homebridge": ">=1.3.0"
   },
   "main": "dist/index.js",
+  "files": [
+    "dist",
+    "config.schema.json",
+    "LICENSE"
+  ],
   "scripts": {
+    "test": "npm run build && node --test \"test/*.test.js\"",
     "lint": "eslint src/**.ts --max-warnings=0",
     "watch": "npm run build && npm link && nodemon",
     "build": "rimraf ./dist && tsc",
@@ -37,8 +43,6 @@
     "typescript": "^4.2.2"
   },
   "dependencies": {
-    "moment": "^2.30.1",
-    "websocket": "^1.0.34",
-    "ws": "^8.4.0"
+    "ws": "^8.22.2"
   }
 }

package/orro-lan/index.js

@@ -1,41 +0,0 @@
-const net = require('net');
-const WebSocketClient = require('websocket').client;
-
-let switch_ip = '192.168.7.125';
-let switch_id = 'de1bc286-51f7-480e-b702-7957b9952618';
-let home_id = '3debeb6b-023d-4dba-8e70-92663b6d2610';
-
-const setOn = (connection, val) => {
-    let payload = JSON.stringify({
-        targetId: switch_id,
-        clientId: 'homebridge-orro',
-        type: 'RemoteCommand',
-        timestamp: Date.now(),
-        data: {
-            command: val ? 'on' : 'off'
-        }
-    });
-    connection.sendUTF(payload);
-}
-
-let client = new WebSocketClient();
-client.connect(`ws://${switch_ip}:8080/edison/${home_id}`, null, null, [{ 'offline-access-token': 'YxqRX78eQU_gyzdftPmOG_7n261njz2NFF3hgckXEyQjZGi7qS1RBGdeGhjIb0gYKRKA_wMqeu8RdG9Aybaz1Q' }]);
-client.on('connect', connection => {
-
-    // post on/off change
-    setOn(connection, true);
-    setTimeout(setOn.bind(this, connection, false), 5000);
-
-    // listen for system events
-    connection.on('message', data => {
-        try {
-            let json = JSON.parse(data.utf8Data);
-            console.log(json);
-        } catch(e) {
-            console.log(e.message);
-        }
-    })
-})
-client.on('error', error => {
-    console.log(error.message);
-})