@homebridge-plugins/homebridge-eufy-security 5.0.0-beta.35 → 5.0.0-beta.36

package/dist/homekit/adapters/doorbell.js

@@ -1,3 +1,4 @@
+import { ownService, } from '../adapter.js';
 export const DOORBELL_ADAPTER_KEY = 'doorbell.press';
 const DOORBELL_OWNERS = new WeakMap();
 const DOORBELL_PRESS_REQUIREMENT = {
@@ -10,19 +11,6 @@ export const DOORBELL_PRESS_EVENT = 'doorbellPress';
 export function hasAdmittedDoorbellPress(evidence) {
     return evidence.has(DOORBELL_PRESS_REQUIREMENT.id);
 }
-/**
- * This accessory's one doorbell service, created on first use under the stable key this adapter owns.
- *
- * A camera bundle configuring HomeKit Secure Video has to hand the same service to its controller, because
- * a press is only a recording trigger when the controller that advertises it owns the service carrying it.
- * Both callers resolve it here so one accessory can only ever carry one doorbell service, whichever
- * attaches first.
- */
-export function doorbellPressService(context) {
-    const { accessory, hap } = context;
-    return (accessory.getServiceById(hap.Service.Doorbell, DOORBELL_ADAPTER_KEY) ??
-        accessory.addService(hap.Service.Doorbell, accessory.displayName, DOORBELL_ADAPTER_KEY));
-}
 /** Complete HomeKit policy for admitted physical doorbell presses. */
 export const DOORBELL_ADAPTER = {
     key: DOORBELL_ADAPTER_KEY,
@@ -34,13 +22,13 @@ export const DOORBELL_ADAPTER = {
 /** Attaches verified SDK press events to one official HomeKit Doorbell service. */
 function attachDoorbell(context) {
     const { accessory, hap } = context;
-    const service = doorbellPressService(context);
+    const service = ownService(accessory, hap.Service.Doorbell, accessory.displayName, DOORBELL_ADAPTER_KEY);
     const owner = Symbol('doorbell-owner');
     DOORBELL_OWNERS.set(service, owner);
     const characteristic = service.getCharacteristic(hap.Characteristic.ProgrammableSwitchEvent);
     return {
         event(event) {
-            if (event.eventName !== 'doorbellPress') {
+            if (event.eventName !== DOORBELL_PRESS_EVENT) {
                 return undefined;
             }
             characteristic.sendEventNotification(hap.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS);

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

@@ -1 +1 @@
-{"version":3,"file":"doorbell.js","sourceRoot":"","sources":["../../../src/homekit/adapters/doorbell.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,MAAM,oBAAoB,GAAG,gBAAgB,CAAC;AACrD,MAAM,eAAe,GAAG,IAAI,OAAO,EAAkB,CAAC;AAEtD,MAAM,0BAA0B,GAAG;IACjC,EAAE,EAAE,8BAA8B;IAClC,IAAI,EAAE,OAAO;CACL,CAAC;AAEX,0FAA0F;AAC1F,MAAM,CAAC,MAAM,oBAAoB,GAAG,eAAe,CAAC;AAEpD,6EAA6E;AAC7E,MAAM,UAAU,wBAAwB,CAAC,QAA8C;IACrF,OAAO,QAAQ,CAAC,GAAG,CAAC,0BAA0B,CAAC,EAAE,CAAC,CAAC;AACrD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,oBAAoB,CAAC,OAA4D;IAC/F,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IACnC,OAAO,CACL,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,oBAAoB,CAAC;QACpE,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,WAAW,EAAE,oBAAoB,CAAC,CACxF,CAAC;AACJ,CAAC;AAED,sEAAsE;AACtE,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,GAAG,EAAE,oBAAoB;IACzB,IAAI,EAAE,iBAAiB;IACvB,QAAQ,EAAE,CAAC,0BAA0B,CAAC;IACtC,QAAQ,EAAE,CAAC,0BAA0B,CAAC,EAAE,CAAC;IACzC,MAAM,EAAE,cAAc;CACW,CAAC;AAEpC,mFAAmF;AACnF,SAAS,cAAc,CAAC,OAAiC;IACvD,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IACnC,MAAM,OAAO,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,KAAK,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACvC,eAAe,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACpC,MAAM,cAAc,GAAG,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,uBAAuB,CAAC,CAAC;IAE7F,OAAO;QACL,KAAK,CAAC,KAAqB;YACzB,IAAI,KAAK,CAAC,SAAS,KAAK,eAAe,EAAE,CAAC;gBACxC,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,cAAc,CAAC,qBAAqB,CAAC,GAAG,CAAC,cAAc,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAC;YAC9F,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;QAC3D,CAAC;QACD,MAAM;YACJ,IAAI,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,KAAK,EAAE,CAAC;gBAC3C,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAChC,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"doorbell.js","sourceRoot":"","sources":["../../../src/homekit/adapters/doorbell.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,UAAU,GAKX,MAAM,eAAe,CAAC;AAEvB,MAAM,CAAC,MAAM,oBAAoB,GAAG,gBAAgB,CAAC;AACrD,MAAM,eAAe,GAAG,IAAI,OAAO,EAAkB,CAAC;AAEtD,MAAM,0BAA0B,GAAG;IACjC,EAAE,EAAE,8BAA8B;IAClC,IAAI,EAAE,OAAO;CACL,CAAC;AAEX,0FAA0F;AAC1F,MAAM,CAAC,MAAM,oBAAoB,GAAG,eAAe,CAAC;AAEpD,6EAA6E;AAC7E,MAAM,UAAU,wBAAwB,CAAC,QAA8C;IACrF,OAAO,QAAQ,CAAC,GAAG,CAAC,0BAA0B,CAAC,EAAE,CAAC,CAAC;AACrD,CAAC;AAED,sEAAsE;AACtE,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,GAAG,EAAE,oBAAoB;IACzB,IAAI,EAAE,iBAAiB;IACvB,QAAQ,EAAE,CAAC,0BAA0B,CAAC;IACtC,QAAQ,EAAE,CAAC,0BAA0B,CAAC,EAAE,CAAC;IACzC,MAAM,EAAE,cAAc;CACW,CAAC;AAEpC,mFAAmF;AACnF,SAAS,cAAc,CAAC,OAAiC;IACvD,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IACnC,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;IACzG,MAAM,KAAK,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACvC,eAAe,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACpC,MAAM,cAAc,GAAG,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,uBAAuB,CAAC,CAAC;IAE7F,OAAO;QACL,KAAK,CAAC,KAAqB;YACzB,IAAI,KAAK,CAAC,SAAS,KAAK,oBAAoB,EAAE,CAAC;gBAC7C,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,cAAc,CAAC,qBAAqB,CAAC,GAAG,CAAC,cAAc,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAC;YAC9F,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;QAC3D,CAAC;QACD,MAAM;YACJ,IAAI,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,KAAK,EAAE,CAAC;gBAC3C,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAChC,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/homekit/adapters/lock.js

@@ -1,4 +1,6 @@
-import { CapabilityNotSupportedError, LockPushEvent } from '@mega-yfue/eufy-sdk';
+import { LockPushEvent } from '@mega-yfue/eufy-sdk';
+import { ownService, } from '../adapter.js';
+import { PersistentMemberWrites } from '../device-control.js';
 export const LOCK_ADAPTER_KEY = 'lock.mechanism';
 /** The announcement this adapter presents what the bolt did from, as it happens. */
 export const LOCK_STATE_EVENT_ROW = 'lock.lockState.event';
@@ -18,8 +20,6 @@ const UNLOCK_ACTION = {
     id: 'lock.unlock.momentary-action',
     kind: 'momentary-action',
 };
-const OPERATION_DEADLINE_MS = 8_000;
-const RECONCILIATION_WINDOW_MS = 60_000;
 /**
  * The HomeKit meaning of each lock push code the SDK names, and only those.
  *
@@ -86,203 +86,6 @@ export const CLASSIFIED_LOCK_CODES = new Set([
 /** The identity-free trace one lock announcement records. */
 const LOCK_STATE_TRACE = 'lock-state';
 const LOCK_STATES = new WeakMap();
-/** Serializes physical lock actions while retaining only the newest bounded target projection. */
-class LockTargetWrites {
-    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;
-    }
-    /**
-     * Settles the window a write opened, because the device has since said what it actually did.
-     *
-     * A successful command acknowledges delivery and nothing more, so this projection exists only to answer
-     * HomeKit until the lock reports. Once it has, the projection is not merely confirmed but superseded — the
-     * announcement is authoritative even when it contradicts what was asked for, which is what happens when
-     * someone turns the key the other way — and there is nothing left unreconciled to warn about.
-     */
-    observed() {
-        if (this.reconciliation) {
-            clearTimeout(this.reconciliation);
-            this.reconciliation = undefined;
-        }
-        this.projection = undefined;
-    }
-    request(value) {
-        if (this.blockedError) {
-            return Promise.reject(this.blockedError);
-        }
-        this.projection = value;
-        return new Promise((resolve, reject) => {
-            const request = {
-                value,
-                settled: false,
-                resolve,
-                reject,
-            };
-            if (!this.active) {
-                this.start({ value, requests: [request], abandoned: false });
-            }
-            else if (this.queued) {
-                this.queued.value = value;
-                this.queued.requests.push(request);
-            }
-            else {
-                this.queued = { value, requests: [request], abandoned: false };
-            }
-        });
-    }
-    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;
-        for (const request of batch.requests) {
-            request.deadline = setTimeout(() => this.timeout(request), OPERATION_DEADLINE_MS);
-        }
-        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.queued?.requests.some(({ settled }) => !settled)) {
-            this.active = undefined;
-            this.startQueued();
-            return;
-        }
-        for (const request of batch.requests) {
-            this.settle(request, 'resolve');
-        }
-        if (batch.abandoned) {
-            this.projection = batch.value;
-            this.restore();
-        }
-        this.diagnose('lock-operation-failed', false, 'recovered');
-        if (this.projection !== undefined) {
-            this.reconciliation = setTimeout(() => {
-                this.reconciliation = undefined;
-                this.projection = undefined;
-                this.diagnose('lock-reconciliation-expired', 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;
-        if (batch.abandoned && !nonRetryable) {
-            this.active = undefined;
-            this.startQueued();
-            return;
-        }
-        this.diagnose('lock-operation-failed', 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('lock-operation-failed', true, 'timeout');
-        if (this.active?.requests.every(({ settled }) => settled)) {
-            this.active.abandoned = true;
-            this.projection = this.queued?.value;
-            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.value;
-            this.start(queued);
-        }
-    }
-    settle(request, result, error) {
-        if (request.settled) {
-            return;
-        }
-        request.settled = true;
-        if (request.deadline) {
-            clearTimeout(request.deadline);
-        }
-        if (result === 'resolve') {
-            request.resolve();
-        }
-        else {
-            request.reject(error);
-        }
-    }
-}
 const COVERAGE = [LOCK_ACTION.id, UNLOCK_ACTION.id, LOCK_STATE_EVENT_ROW, LOCKED_READ_ROW, LOCKED_WRITE_ROW];
 /**
  * Complete HomeKit policy for the evidenced lock-control boundary, one model at a time.
@@ -343,17 +146,17 @@ function attachLock(context) {
         reason: 'recovered',
     });
     context.observed('lock-capability-unavailable');
-    const service = accessory.getServiceById(hap.Service.LockMechanism, LOCK_ADAPTER_KEY) ??
-        accessory.addService(hap.Service.LockMechanism, accessory.displayName, LOCK_ADAPTER_KEY);
+    const service = ownService(accessory, hap.Service.LockMechanism, accessory.displayName, LOCK_ADAPTER_KEY);
     const previousState = LOCK_STATES.get(service);
     const owner = Symbol('lock-owner');
+    const admitted = actions;
     const state = previousState ?? {
         owner,
-        actions,
+        actions: admitted,
         diagnose: () => undefined,
     };
     state.owner = owner;
-    state.actions = actions;
+    state.actions = admitted;
     LOCK_STATES.set(service, state);
     const current = service.getCharacteristic(hap.Characteristic.LockCurrentState);
     const target = service.getCharacteristic(hap.Characteristic.LockTargetState);
@@ -413,10 +216,8 @@ function attachLock(context) {
             context.observed(code);
         }
     };
-    const communicationFailure = () => new hap.HapStatusError(hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE);
-    state.writes ??= new LockTargetWrites((value) => (value === hap.Characteristic.LockTargetState.SECURED ? state.actions.lock() : state.actions.unlock()), communicationFailure, (error) => new hap.HapStatusError(error instanceof CapabilityNotSupportedError
-        ? hap.HAPStatus.NOT_ALLOWED_IN_CURRENT_STATE
-        : hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE), (error) => error instanceof CapabilityNotSupportedError, (code, active, reason) => state.diagnose(code, active, reason), () => target.updateValue(state.writes.read()));
+    const communicationFailure = () => new hap.HapStatusError(-70402 /* hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */);
+    state.writes ??= new PersistentMemberWrites(hap, (value) => (value === hap.Characteristic.LockTargetState.SECURED ? state.actions.lock() : state.actions.unlock()), (condition, active, reason) => state.diagnose(condition === 'operation' ? 'lock-operation-failed' : 'lock-reconciliation-expired', active, reason), (cause) => cause === 'late-completed' && target.updateValue(state.writes.read()), { holdAbandoned: true, supersedeOnly: true });
     current.onGet(currentValue);
     /**
      * Answers the target from the newest thing that established one: a write still in flight, else the last
@@ -436,7 +237,7 @@ function attachLock(context) {
     target.onSet((value) => {
         if (value !== hap.Characteristic.LockTargetState.SECURED &&
             value !== hap.Characteristic.LockTargetState.UNSECURED) {
-            throw new hap.HapStatusError(hap.HAPStatus.INVALID_VALUE_IN_REQUEST);
+            throw new hap.HapStatusError(-70410 /* hap.HAPStatus.INVALID_VALUE_IN_REQUEST */);
         }
         return state.writes.request(value);
     });
@@ -453,7 +254,7 @@ function attachLock(context) {
         if (announced !== 'jammed') {
             state.announcedTarget = announced;
         }
-        state.writes?.observed();
+        state.writes?.observe();
         const nextCurrent = currentValue();
         if (current.value !== nextCurrent) {
             current.updateValue(nextCurrent);
@@ -487,8 +288,8 @@ function attachLock(context) {
          * announcement will carry, and a lock is the wrong accessory on which to trust a shape.
          *
          * A code this build has read and deliberately presents nothing for — a battery warning, a tamper, a
-         * firmware update — is not this member reporting at all, so it records no trace and leaves the state
-         * alone. Anything else in the range is unread: the state is withdrawn rather than kept, because the
+         * firmware update — is not this member reporting at all, so it leaves the state alone and records only
+         * its code. Anything else in the range is unread: the state is withdrawn rather than kept, because the
          * announcement was about this lock and this build cannot say what it meant.
          *
          * The SDK's property announcement of the reported state is presented the same way, recorded as `poll`: it
@@ -515,12 +316,12 @@ function attachLock(context) {
                 return { event: LOCK_STATE_TRACE, observation: 'missing' };
             }
             if (typeof code === 'number' && NON_STATE_LOCK_CODES.has(code)) {
-                return undefined;
+                return { event: LOCK_STATE_TRACE, observation: 'ignored', code };
             }
             const announced = typeof code === 'number' ? ANNOUNCED_LOCK_STATES.get(code) : undefined;
             if (announced === undefined) {
                 withdraw('malformed');
-                return { event: LOCK_STATE_TRACE, observation: 'malformed' };
+                return { event: LOCK_STATE_TRACE, observation: 'malformed', ...(typeof code === 'number' ? { code } : {}) };
             }
             present(announced);
             diagnoseState(false, 'recovered');

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

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

package/dist/homekit/adapters/motion.js

@@ -1,3 +1,4 @@
+import { ownService, } from '../adapter.js';
 export const MOTION_ADAPTER_KEY = 'motion.sensor';
 const MOTION_HOLD_MS = 10_000;
 const MOTION_HOLDS = new WeakMap();
@@ -30,8 +31,7 @@ export function hasAdmittedMotionEvents(evidence) {
  */
 export function motionSensorService(context) {
     const { accessory, hap } = context;
-    return (accessory.getServiceById(hap.Service.MotionSensor, MOTION_ADAPTER_KEY) ??
-        accessory.addService(hap.Service.MotionSensor, accessory.displayName, MOTION_ADAPTER_KEY));
+    return ownService(accessory, hap.Service.MotionSensor, accessory.displayName, MOTION_ADAPTER_KEY);
 }
 /** Complete HomeKit policy for admitted detection pulses. */
 export const MOTION_ADAPTER = {

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

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

package/dist/homekit/adapters/package-sensor.js

@@ -1,3 +1,4 @@
+import { ownService, } from '../adapter.js';
 export const PACKAGE_SENSOR_ADAPTER_KEY = 'doorbell.package';
 const PACKAGE_PRESENCE = new WeakMap();
 const PACKAGE_DELIVERED_REQUIREMENT = { id: 'doorbell.packageDelivered.event', kind: 'event' };
@@ -30,8 +31,7 @@ export const PACKAGE_SENSOR_ADAPTER = {
  */
 function attachPackageSensor(context) {
     const { accessory, hap } = context;
-    const service = accessory.getServiceById(hap.Service.OccupancySensor, PACKAGE_SENSOR_ADAPTER_KEY) ??
-        accessory.addService(hap.Service.OccupancySensor, 'Package', PACKAGE_SENSOR_ADAPTER_KEY);
+    const service = ownService(accessory, hap.Service.OccupancySensor, 'Package', PACKAGE_SENSOR_ADAPTER_KEY);
     const presence = PACKAGE_PRESENCE.get(service) ?? { detected: false };
     PACKAGE_PRESENCE.set(service, presence);
     const owner = Symbol('package-sensor-owner');

package/dist/homekit/adapters/package-sensor.js.map

@@ -1 +1 @@
-{"version":3,"file":"package-sensor.js","sourceRoot":"","sources":["../../../src/homekit/adapters/package-sensor.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,0BAA0B,GAAG,kBAAkB,CAAC;AAM7D,MAAM,gBAAgB,GAAG,IAAI,OAAO,EAA2B,CAAC;AAEhE,MAAM,6BAA6B,GAAG,EAAE,EAAE,EAAE,iCAAiC,EAAE,IAAI,EAAE,OAAO,EAAW,CAAC;AACxG,MAAM,yBAAyB,GAAG,EAAE,EAAE,EAAE,6BAA6B,EAAE,IAAI,EAAE,OAAO,EAAW,CAAC;AAEhG,oEAAoE;AACpE,MAAM,cAAc,GAAoE;IACtF,gBAAgB,EAAE,IAAI;IACtB,eAAe,EAAE,IAAI;IACrB,YAAY,EAAE,KAAK;CACpB,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACpC,GAAG,EAAE,0BAA0B;IAC/B,IAAI,EAAE,cAAc;IACpB,QAAQ,EAAE,CAAC,6BAA6B,EAAE,yBAAyB,CAAC;IACpE,QAAQ,EAAE,CAAC,6BAA6B,CAAC,EAAE,EAAE,yBAAyB,CAAC,EAAE,EAAE,gCAAgC,CAAC;IAC5G,MAAM,EAAE,mBAAmB;CACM,CAAC;AAEpC;;;;;;GAMG;AACH,SAAS,mBAAmB,CAAC,OAAiC;IAC5D,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IACnC,MAAM,OAAO,GACX,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,0BAA0B,CAAC;QACjF,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,SAAS,EAAE,0BAA0B,CAAC,CAAC;IAC3F,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IACtE,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACxC,MAAM,KAAK,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;IAC7C,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,MAAM,MAAM,GAAG,GAAS,EAAE;QACxB,OAAO,CAAC,oBAAoB,CAC1B,GAAG,CAAC,cAAc,CAAC,iBAAiB,EACpC,QAAQ,CAAC,QAAQ;YACf,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,iBAAiB,CAAC,kBAAkB;YACzD,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,iBAAiB,CAAC,sBAAsB,CAChE,CAAC;IACJ,CAAC,CAAC;IACF,MAAM,EAAE,CAAC;IAET,OAAO;QACL,KAAK,CAAC,KAAqB;YACzB,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACjD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC3B,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAC7B,MAAM,EAAE,CAAC;YACT,OAAO,EAAE,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;QAC7D,CAAC;QACD,MAAM;YACJ,IAAI,QAAQ,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;gBAC7B,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC;gBAC3B,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"package-sensor.js","sourceRoot":"","sources":["../../../src/homekit/adapters/package-sensor.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,UAAU,GAKX,MAAM,eAAe,CAAC;AAEvB,MAAM,CAAC,MAAM,0BAA0B,GAAG,kBAAkB,CAAC;AAM7D,MAAM,gBAAgB,GAAG,IAAI,OAAO,EAA2B,CAAC;AAEhE,MAAM,6BAA6B,GAAG,EAAE,EAAE,EAAE,iCAAiC,EAAE,IAAI,EAAE,OAAO,EAAW,CAAC;AACxG,MAAM,yBAAyB,GAAG,EAAE,EAAE,EAAE,6BAA6B,EAAE,IAAI,EAAE,OAAO,EAAW,CAAC;AAEhG,oEAAoE;AACpE,MAAM,cAAc,GAAoE;IACtF,gBAAgB,EAAE,IAAI;IACtB,eAAe,EAAE,IAAI;IACrB,YAAY,EAAE,KAAK;CACpB,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACpC,GAAG,EAAE,0BAA0B;IAC/B,IAAI,EAAE,cAAc;IACpB,QAAQ,EAAE,CAAC,6BAA6B,EAAE,yBAAyB,CAAC;IACpE,QAAQ,EAAE,CAAC,6BAA6B,CAAC,EAAE,EAAE,yBAAyB,CAAC,EAAE,EAAE,gCAAgC,CAAC;IAC5G,MAAM,EAAE,mBAAmB;CACM,CAAC;AAEpC;;;;;;GAMG;AACH,SAAS,mBAAmB,CAAC,OAAiC;IAC5D,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IACnC,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,SAAS,EAAE,0BAA0B,CAAC,CAAC;IAC1G,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IACtE,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACxC,MAAM,KAAK,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;IAC7C,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,MAAM,MAAM,GAAG,GAAS,EAAE;QACxB,OAAO,CAAC,oBAAoB,CAC1B,GAAG,CAAC,cAAc,CAAC,iBAAiB,EACpC,QAAQ,CAAC,QAAQ;YACf,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,iBAAiB,CAAC,kBAAkB;YACzD,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,iBAAiB,CAAC,sBAAsB,CAChE,CAAC;IACJ,CAAC,CAAC;IACF,MAAM,EAAE,CAAC;IAET,OAAO;QACL,KAAK,CAAC,KAAqB;YACzB,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACjD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC3B,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAC7B,MAAM,EAAE,CAAC;YACT,OAAO,EAAE,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;QAC7D,CAAC;QACD,MAAM;YACJ,IAAI,QAAQ,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;gBAC7B,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC;gBAC3B,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}