@homebridge-plugins/homebridge-eufy-security 5.0.0-beta.4 → 5.0.0-beta.40

package/dist/homekit/adapters/security-system.js

@@ -1,4 +1,24 @@
-import { ArmingMode, CapabilityNotSupportedError } from '@mega-yfue/eufy-sdk';
+import { ArmingMode } from '@mega-yfue/eufy-sdk';
+/**
+ * What each HomeKit security state means where the user assigned nothing.
+ *
+ * `night` is absent: no vendor mode is a night posture, so HomeKit offers the state only once a user says what
+ * it stands for on that station.
+ */
+const DEFAULT_ARMING_MODES = {
+    home: ArmingMode.home,
+    away: ArmingMode.away,
+    off: ArmingMode.disarmed,
+};
+/**
+ * The HomeKit states a station's guard mode is read against, in the order a mode is looked up in.
+ *
+ * Two states may name one mode — HomeKit's night standing for the same posture as home, say — so the order
+ * decides which one a station reporting that mode reads as, and the first assignment wins.
+ */
+const SLOT_ORDER = ['home', 'away', 'night', 'off'];
+import { ownService, } from '../adapter.js';
+import { PersistentMemberWrites } from '../device-control.js';
 export const SECURITY_SYSTEM_ADAPTER_KEY = 'arming.security-system';
 const SECURITY_SYSTEM_STATES = new WeakMap();
 const ARMING_MODE_READ = {
@@ -19,204 +39,6 @@ const ARMING_ALARM_EVENT = {
     id: 'arming.alarm.event',
     kind: 'event',
 };
-const OPERATION_DEADLINE_MS = 8_000;
-const RECONCILIATION_WINDOW_MS = 60_000;
-/** Serializes arming writes while exposing only a bounded target projection. */
-class SecurityModeWrites {
-    issue;
-    communicationFailure;
-    operationFailure;
-    isNonRetryable;
-    diagnose;
-    restore;
-    active;
-    queued;
-    reconciliation;
-    projection;
-    blockedError;
-    detached = false;
-    constructor(issue, communicationFailure, operationFailure, isNonRetryable, diagnose, restore) {
-        this.issue = issue;
-        this.communicationFailure = communicationFailure;
-        this.operationFailure = operationFailure;
-        this.isNonRetryable = isNonRetryable;
-        this.diagnose = diagnose;
-        this.restore = restore;
-    }
-    read() {
-        return this.projection;
-    }
-    request(value) {
-        if (this.blockedError) {
-            return Promise.reject(this.blockedError);
-        }
-        this.projection = value;
-        return new Promise((resolve, reject) => {
-            const request = {
-                value,
-                settled: false,
-                deadline: undefined,
-                resolve,
-                reject,
-            };
-            request.deadline = setTimeout(() => this.timeout(request), OPERATION_DEADLINE_MS);
-            if (!this.active) {
-                this.start({ value, requests: [request], reconciled: false, abandoned: false });
-            }
-            else if (this.queued) {
-                this.queued.value = value;
-                this.queued.reconciled = false;
-                this.queued.requests.push(request);
-            }
-            else {
-                this.queued = { value, requests: [request], reconciled: false, abandoned: false };
-            }
-        });
-    }
-    observe() {
-        if (this.active) {
-            this.active.reconciled = true;
-        }
-        if (this.queued) {
-            this.queued.reconciled = true;
-        }
-        this.projection = undefined;
-        if (this.reconciliation) {
-            clearTimeout(this.reconciliation);
-            this.reconciliation = undefined;
-        }
-        if (!this.blockedError) {
-            this.diagnose('operation', false, 'recovered');
-        }
-        this.diagnose('reconciliation', false, 'recovered');
-    }
-    detach() {
-        this.detached = true;
-        if (this.reconciliation) {
-            clearTimeout(this.reconciliation);
-        }
-        for (const request of [...(this.active?.requests ?? []), ...(this.queued?.requests ?? [])]) {
-            this.settle(request, 'reject', this.communicationFailure());
-        }
-        this.active = undefined;
-        this.queued = undefined;
-        this.projection = undefined;
-        this.reconciliation = undefined;
-    }
-    start(batch) {
-        if (this.detached) {
-            return;
-        }
-        if (this.reconciliation) {
-            clearTimeout(this.reconciliation);
-            this.reconciliation = undefined;
-        }
-        this.active = batch;
-        Promise.resolve()
-            .then(() => this.issue(batch.value))
-            .then(() => this.complete(batch), (error) => this.fail(batch, error));
-    }
-    complete(batch) {
-        if (this.active !== batch) {
-            return;
-        }
-        if (batch.abandoned) {
-            this.active = undefined;
-            this.startQueued();
-            return;
-        }
-        for (const request of batch.requests) {
-            this.settle(request, 'resolve');
-        }
-        this.diagnose('operation', false, 'recovered');
-        if (!batch.reconciled) {
-            this.reconciliation = setTimeout(() => {
-                this.reconciliation = undefined;
-                this.projection = undefined;
-                this.restore();
-                this.diagnose('reconciliation', true, 'expired');
-            }, RECONCILIATION_WINDOW_MS);
-        }
-        this.active = undefined;
-        this.startQueued();
-    }
-    fail(batch, cause) {
-        if (this.active !== batch) {
-            return;
-        }
-        const error = this.operationFailure(cause);
-        for (const request of batch.requests) {
-            this.settle(request, 'reject', error);
-        }
-        const nonRetryable = this.isNonRetryable(cause);
-        if (nonRetryable) {
-            this.blockedError = error;
-            for (const request of this.queued?.requests ?? []) {
-                this.settle(request, 'reject', error);
-            }
-            this.queued = undefined;
-        }
-        this.projection = this.queued?.value;
-        this.restore();
-        if (batch.abandoned && !nonRetryable) {
-            this.active = undefined;
-            this.startQueued();
-            return;
-        }
-        this.diagnose('operation', true, nonRetryable ? 'capability-not-supported' : 'operation-failure');
-        this.active = undefined;
-        this.startQueued();
-    }
-    timeout(request) {
-        if (request.settled) {
-            return;
-        }
-        this.settle(request, 'reject', this.communicationFailure());
-        this.diagnose('operation', true, 'timeout');
-        if (this.active?.requests.every(({ settled }) => settled)) {
-            this.active.abandoned = true;
-            this.projection = this.queued?.value;
-            this.restore();
-            return;
-        }
-        if (this.queued) {
-            this.queued.requests = this.queued.requests.filter(({ settled }) => !settled);
-            if (this.queued.requests.length === 0) {
-                this.queued = undefined;
-                this.projection = this.active?.value;
-            }
-            else {
-                this.queued.value = this.queued.requests.at(-1).value;
-            }
-        }
-    }
-    startQueued() {
-        const queued = this.queued;
-        this.queued = undefined;
-        if (!queued) {
-            return;
-        }
-        queued.requests = queued.requests.filter(({ settled }) => !settled);
-        if (queued.requests.length > 0) {
-            queued.value = queued.requests.at(-1).value;
-            this.projection = queued.reconciled ? undefined : queued.value;
-            this.start(queued);
-        }
-    }
-    settle(request, result, error) {
-        if (request.settled) {
-            return;
-        }
-        request.settled = true;
-        clearTimeout(request.deadline);
-        if (result === 'resolve') {
-            request.resolve();
-        }
-        else {
-            request.reject(error);
-        }
-    }
-}
 const COVERAGE = [ARMING_MODE_READ, ARMING_MODE_WRITE, ARMING_MODE_EVENT, ARMING_ALARM_EVENT].map(({ id }) => id);
 /** Complete HomeKit policy for evidenced arming modes and alarm events. */
 export const SECURITY_SYSTEM_ADAPTER = {
@@ -226,9 +48,36 @@ export const SECURITY_SYSTEM_ADAPTER = {
     coverage: COVERAGE,
     attach: attachSecuritySystem,
 };
-/** Attaches authoritative arming state to one official Security System service. */
+/**
+ * Attaches authoritative arming state to one official Security System service.
+ *
+ * A station reports nine guard modes and HomeKit names four states. `away` and `home` are exact, `off` and
+ * `disarmed` both read as disarmed because HomeKit has one unarmed state, and `schedule`, `custom1` to
+ * `custom3` and `geo` read as night: they are armed postures HomeKit cannot name, and night is the one state
+ * left to carry them. An approximated mode holds `StatusFault`, which is the only place a state HomeKit shows
+ * inexactly says so.
+ *
+ * A read never fails. A characteristic whose read errors takes the whole accessory to "No Response" in
+ * HomeKit, which names the bridge rather than the mode and leaves the station indistinguishable from one that
+ * is unreachable — so a mode that cannot be read at all answers with the last state read exactly, disarmed
+ * where there is none, and faults.
+ *
+ * Only an exact mode reaches the target state, whose valid values are the three modes this adapter can write.
+ * Night is a state the station reports and nothing here sets, so the target keeps the last mode written or
+ * read exactly, and HomeKit offers no control that would have to be refused.
+ *
+ * A device whose owner turned the security system off gets no service, and loses the one a cached accessory
+ * still carries.
+ */
 function attachSecuritySystem(context) {
     const { accessory, hap } = context;
+    if (context.securitySystemEnabled === false) {
+        const cached = accessory.getServiceById(hap.Service.SecuritySystem, SECURITY_SYSTEM_ADAPTER_KEY);
+        if (cached) {
+            accessory.removeService(cached);
+        }
+        return undefined;
+    }
     const device = context.device;
     let arming;
     try {
@@ -262,8 +111,7 @@ function attachSecuritySystem(context) {
         reason: 'recovered',
     });
     context.observed('arming-capability-unavailable');
-    const service = accessory.getServiceById(hap.Service.SecuritySystem, SECURITY_SYSTEM_ADAPTER_KEY) ??
-        accessory.addService(hap.Service.SecuritySystem, accessory.displayName, SECURITY_SYSTEM_ADAPTER_KEY);
+    const service = ownService(accessory, hap.Service.SecuritySystem, accessory.displayName, SECURITY_SYSTEM_ADAPTER_KEY);
     const previousState = SECURITY_SYSTEM_STATES.get(service);
     const owner = Symbol('security-system-owner');
     const state = previousState ?? {
@@ -282,36 +130,39 @@ function attachSecuritySystem(context) {
     const statusFault = service.getCharacteristic(hap.Characteristic.StatusFault);
     service.addOptionalCharacteristic(hap.Characteristic.SecuritySystemAlarmType);
     const alarmType = service.getCharacteristic(hap.Characteristic.SecuritySystemAlarmType);
+    const assigned = {
+        ...DEFAULT_ARMING_MODES,
+        ...context.armingModes,
+    };
+    const slotState = {
+        home: hap.Characteristic.SecuritySystemCurrentState.STAY_ARM,
+        away: hap.Characteristic.SecuritySystemCurrentState.AWAY_ARM,
+        night: hap.Characteristic.SecuritySystemCurrentState.NIGHT_ARM,
+        off: hap.Characteristic.SecuritySystemCurrentState.DISARMED,
+    };
+    const modeNames = context.evidence.get(ARMING_MODE_READ.id)?.labels;
     target.setProps({
-        validValues: [
-            hap.Characteristic.SecuritySystemTargetState.STAY_ARM,
-            hap.Characteristic.SecuritySystemTargetState.AWAY_ARM,
-            hap.Characteristic.SecuritySystemTargetState.DISARM,
-        ],
+        validValues: SLOT_ORDER.filter((slot) => assigned[slot] !== undefined).map((slot) => slotState[slot]),
     });
     const homeKitMode = (value) => {
-        if (value === 1) {
-            return hap.Characteristic.SecuritySystemCurrentState.STAY_ARM;
+        const name = modeNames?.[String(value)];
+        if (name === undefined) {
+            return undefined;
         }
-        if (value === 0) {
-            return hap.Characteristic.SecuritySystemCurrentState.AWAY_ARM;
+        const slot = SLOT_ORDER.find((candidate) => assigned[candidate] === name);
+        if (slot !== undefined) {
+            return { state: slotState[slot], exact: true };
         }
-        if (value === 63) {
-            return hap.Characteristic.SecuritySystemCurrentState.DISARMED;
-        }
-        return undefined;
+        return name === ArmingMode.disarmed || name === ArmingMode.off
+            ? { state: hap.Characteristic.SecuritySystemCurrentState.DISARMED, exact: true }
+            : { state: hap.Characteristic.SecuritySystemCurrentState.NIGHT_ARM, exact: false };
     };
     const sdkMode = (value) => {
-        if (value === hap.Characteristic.SecuritySystemTargetState.STAY_ARM) {
-            return ArmingMode.home;
+        const mode = SLOT_ORDER.filter((slot) => slotState[slot] === value).map((slot) => assigned[slot])[0];
+        if (mode === undefined) {
+            throw new hap.HapStatusError(-70410 /* hap.HAPStatus.INVALID_VALUE_IN_REQUEST */);
         }
-        if (value === hap.Characteristic.SecuritySystemTargetState.AWAY_ARM) {
-            return ArmingMode.away;
-        }
-        if (value === hap.Characteristic.SecuritySystemTargetState.DISARM) {
-            return ArmingMode.disarmed;
-        }
-        throw new hap.HapStatusError(hap.HAPStatus.INVALID_VALUE_IN_REQUEST);
+        return mode;
     };
     const updateStatusFault = () => {
         statusFault.updateValue(state.unsupportedFault || state.operationFault || state.reconciliationFault
@@ -339,33 +190,33 @@ function attachSecuritySystem(context) {
         }
         catch {
             diagnoseMode(true, 'sdk-fault');
-            throw new hap.HapStatusError(hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE);
+            return { state: state.lastExact ?? hap.Characteristic.SecuritySystemCurrentState.DISARMED, exact: false };
         }
         const mapped = homeKitMode(value);
         if (mapped === undefined) {
-            diagnoseMode(true, value === undefined ? 'missing' : typeof value === 'number' ? 'unsupported' : 'malformed');
-            throw new hap.HapStatusError(hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE);
+            diagnoseMode(true, modeNames === undefined || value === undefined ? 'missing' : 'malformed');
+            return { state: state.lastExact ?? hap.Characteristic.SecuritySystemCurrentState.DISARMED, exact: false };
+        }
+        if (!mapped.exact) {
+            diagnoseMode(true, 'unsupported');
+            return mapped;
         }
         diagnoseMode(false, 'recovered');
+        state.lastExact = mapped.state;
         return mapped;
     };
     const observeMode = () => {
-        try {
-            const value = readMode();
-            state.alarmTriggered = false;
-            state.writes?.observe();
-            current.updateValue(value);
-            target.updateValue(value);
-            alarmType.updateValue(hap.Characteristic.SecuritySystemAlarmType.NO_ALARM);
-            return { event: 'arming-mode-changed', observation: 'valid' };
-        }
-        catch {
-            return { event: 'arming-mode-changed', observation: 'malformed' };
-        }
+        const mode = readMode();
+        state.alarmTriggered = false;
+        state.writes?.observe();
+        current.updateValue(mode.state);
+        if (mode.exact) {
+            target.updateValue(mode.state);
+        }
+        alarmType.updateValue(hap.Characteristic.SecuritySystemAlarmType.NO_ALARM);
+        return { event: 'arming-mode-changed', observation: mode.exact ? 'valid' : 'malformed' };
     };
-    state.writes ??= new SecurityModeWrites((value) => state.arming.setMode(sdkMode(value)), () => new hap.HapStatusError(hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE), (error) => new hap.HapStatusError(error instanceof CapabilityNotSupportedError
-        ? hap.HAPStatus.NOT_ALLOWED_IN_CURRENT_STATE
-        : hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE), (error) => error instanceof CapabilityNotSupportedError, (condition, active, reason) => {
+    state.writes ??= new PersistentMemberWrites(hap, (value) => state.arming.setMode(sdkMode(value)), (condition, active, reason) => {
         const code = condition === 'operation' ? 'arming-operation-failed' : 'arming-reconciliation-expired';
         if (condition === 'operation') {
             state.operationFault = active;
@@ -378,18 +229,23 @@ function attachSecuritySystem(context) {
         if (!active) {
             context.observed(code);
         }
-    }, () => {
-        try {
-            target.updateValue(readMode());
+    }, (cause) => {
+        if (cause === 'completed') {
+            return;
         }
-        catch { }
-    });
+        const mode = readMode();
+        const value = state.writes.read() ?? (mode.exact ? mode.state : undefined);
+        if (value !== undefined) {
+            target.updateValue(value);
+        }
+    }, { holdAbandoned: true });
     updateStatusFault();
     observeMode();
-    current.onGet(() => state.alarmTriggered ? hap.Characteristic.SecuritySystemCurrentState.ALARM_TRIGGERED : readMode());
+    current.onGet(() => state.alarmTriggered ? hap.Characteristic.SecuritySystemCurrentState.ALARM_TRIGGERED : readMode().state);
     target.onGet(() => {
-        const observed = readMode();
-        return state.writes.read() ?? observed;
+        const mode = readMode();
+        return (state.writes.read() ??
+            (mode.exact ? mode.state : (state.lastExact ?? hap.Characteristic.SecuritySystemTargetState.DISARM)));
     });
     target.onSet((value) => {
         sdkMode(value);

package/dist/homekit/adapters/security-system.js.map

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

package/dist/homekit/adapters/siren.js

@@ -1,3 +1,5 @@
+import { ownService, } from '../adapter.js';
+import { observationReader } from '../device-control.js';
 export const SIREN_ADAPTER_KEY = 'siren.test';
 const SIREN_ACTIVE_REQUIREMENT = {
     id: 'siren.active.read',
@@ -60,43 +62,13 @@ function attachSiren(context) {
             reason: 'recovered',
         });
     }
-    const service = accessory.getServiceById(hap.Service.Switch, SIREN_ADAPTER_KEY) ??
-        accessory.addService(hap.Service.Switch, accessory.displayName, SIREN_ADAPTER_KEY);
+    const service = ownService(accessory, hap.Service.Switch, accessory.displayName, SIREN_ADAPTER_KEY);
     const state = { owner: Symbol('siren-owner') };
     SIREN_STATES.set(service, state);
     const on = service.getCharacteristic(hap.Characteristic.On);
+    const readBoolean = observationReader(context, 'boolean', 'invalid-siren-active-observation');
     const readActive = () => {
-        let active;
-        try {
-            active = siren.active;
-        }
-        catch {
-            context.diagnose({
-                code: 'invalid-siren-active-observation',
-                capability: 'siren',
-                member: 'active',
-                active: true,
-                reason: 'sdk-fault',
-            });
-            throw new hap.HapStatusError(hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE);
-        }
-        if (typeof active !== 'boolean') {
-            context.diagnose({
-                code: 'invalid-siren-active-observation',
-                capability: 'siren',
-                member: 'active',
-                active: true,
-                reason: active === undefined ? 'missing' : 'malformed',
-            });
-            throw new hap.HapStatusError(hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE);
-        }
-        context.diagnose({
-            code: 'invalid-siren-active-observation',
-            capability: 'siren',
-            member: 'active',
-            active: false,
-            reason: 'recovered',
-        });
+        const active = readBoolean('siren', 'active', () => siren.active);
         context.observed('invalid-siren-active-observation');
         return active;
     };

package/dist/homekit/adapters/siren.js.map

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