@smarthome.exchange/integrations 2.0.0 → 3.0.0

package/dist_ts/integrations/homeassistant/homeassistant.classes.integration.d.ts

@@ -1,9 +1,9 @@
 import { BaseIntegration } from '../../core/classes.baseintegration.js';
 import { DiscoveryDescriptor } from '../../core/classes.discoverydescriptor.js';
-import type { IIntegrationRuntime, IIntegrationSetupContext } from '../../core/types.js';
-import type { IHomeAssistantHomeassistantConfig, THomeAssistantWebSocketFactory } from './homeassistant.types.js';
+import type { IIntegrationSetupContext } from '../../core/types.js';
+import { HomeAssistantRuntime } from './homeassistant.classes.runtime.js';
+import type { IHomeAssistantHomeassistantConfig, IHomeAssistantIntegrationOptions, THomeAssistantWebSocketFactory } from './homeassistant.types.js';
 export declare class HomeAssistantHomeassistantIntegration extends BaseIntegration<IHomeAssistantHomeassistantConfig> {
-    private readonly webSocketFactory;
     readonly domain = "homeassistant";
     readonly displayName = "Home Assistant";
     readonly status: 'control-runtime';
@@ -16,7 +16,10 @@ export declare class HomeAssistantHomeassistantIntegration extends BaseIntegrati
         qualityScale: string;
         transport: string;
     };
-    constructor(webSocketFactory?: THomeAssistantWebSocketFactory);
-    setup(configArg: IHomeAssistantHomeassistantConfig, contextArg: IIntegrationSetupContext): Promise<IIntegrationRuntime>;
+    private readonly owner;
+    private readonly webSocketFactory;
+    constructor(optionsOrFactoryArg?: IHomeAssistantIntegrationOptions | THomeAssistantWebSocketFactory);
+    setup(configArg: IHomeAssistantHomeassistantConfig, contextArg: IIntegrationSetupContext): Promise<HomeAssistantRuntime>;
     destroy(): Promise<void>;
+    retryCleanup(): Promise<void>;
 }

package/dist_ts/integrations/homeassistant/homeassistant.classes.integration.js

@@ -1,10 +1,12 @@
 import * as plugins from '../../plugins.js';
+import { NativeIntegrationOwner } from '../../core/classes.nativeintegrationowner.js';
+import { normalizeHomeAssistantConfig } from './homeassistant.classes.client.js';
+import { homeAssistantRecord } from './homeassistant.validation.js';
 import { BaseIntegration } from '../../core/classes.baseintegration.js';
 import { DiscoveryDescriptor } from '../../core/classes.discoverydescriptor.js';
 import { HomeAssistantClient } from './homeassistant.classes.client.js';
 import { HomeAssistantRuntime } from './homeassistant.classes.runtime.js';
 export class HomeAssistantHomeassistantIntegration extends BaseIntegration {
-    webSocketFactory;
     domain = 'homeassistant';
     displayName = 'Home Assistant';
     status = 'control-runtime';
@@ -20,15 +22,39 @@ export class HomeAssistantHomeassistantIntegration extends BaseIntegration {
         qualityScale: 'internal',
         transport: 'websocket',
     };
-    constructor(webSocketFactory = (urlArg) => new globalThis.WebSocket(urlArg)) {
+    owner;
+    webSocketFactory;
+    constructor(optionsOrFactoryArg = {}) {
         super();
-        this.webSocketFactory = webSocketFactory;
+        const options = homeAssistantRecord(typeof optionsOrFactoryArg === 'function'
+            ? { webSocketFactory: optionsOrFactoryArg } : optionsOrFactoryArg);
+        if (Object.keys(options).some((key) => !['homeId', 'capacity', 'webSocketFactory'].includes(key)))
+            throw new TypeError('Home Assistant integration options contain unsupported fields.');
+        if (options.webSocketFactory !== undefined && typeof options.webSocketFactory !== 'function')
+            throw new TypeError('Home Assistant webSocketFactory must be a function.');
+        this.webSocketFactory = options.webSocketFactory ?? ((urlArg) => new globalThis.WebSocket(urlArg));
+        this.owner = new NativeIntegrationOwner(this.domain, { homeId: options.homeId, capacity: options.capacity });
     }
     async setup(configArg, contextArg) {
-        const client = new HomeAssistantClient(configArg, plugins.homeAssistantWebsocket, this.webSocketFactory);
-        await client.init(contextArg.abortSignal);
-        return new HomeAssistantRuntime(client);
+        // Validate/capture before deferred setup so later caller mutation cannot change scope.
+        normalizeHomeAssistantConfig(configArg);
+        const config = structuredClone(configArg);
+        return this.owner.runSetup(contextArg, config.homeId, async (leaseArg) => {
+            const client = new HomeAssistantClient(config, leaseArg.context, plugins.homeAssistantWebsocket, this.webSocketFactory, { owner: this.owner, lease: leaseArg });
+            let cleanupStarted = false;
+            leaseArg.own(() => {
+                const retry = cleanupStarted;
+                cleanupStarted = true;
+                return retry ? client.retryCleanup() : client.destroy();
+            });
+            await client.init(leaseArg.signal);
+            leaseArg.assertOpen();
+            const runtime = new HomeAssistantRuntime(client, leaseArg, this.owner);
+            leaseArg.promoteToRuntime();
+            return runtime;
+        });
     }
-    async destroy() { }
+    destroy() { return this.owner.close(); }
+    retryCleanup() { return this.owner.retryCleanup(); }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9tZWFzc2lzdGFudC5jbGFzc2VzLmludGVncmF0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vdHMvaW50ZWdyYXRpb25zL2hvbWVhc3Npc3RhbnQvaG9tZWFzc2lzdGFudC5jbGFzc2VzLmludGVncmF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sa0JBQWtCLENBQUM7QUFDNUMsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQ3hFLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBS2hGLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ3hFLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBTTFFLE1BQU0sT0FBTyxxQ0FBc0MsU0FBUSxlQUFrRDtJQWtCeEYsZ0JBQWdCO0lBakJuQixNQUFNLEdBQUcsZUFBZSxDQUFDO0lBQ3pCLFdBQVcsR0FBRyxnQkFBZ0IsQ0FBQztJQUMvQixNQUFNLEdBQUcsaUJBQTBCLENBQUM7SUFDcEMsbUJBQW1CLEdBQUcsSUFBSSxtQkFBbUIsQ0FBQztRQUM1RCxpQkFBaUIsRUFBRSxJQUFJLENBQUMsTUFBTTtRQUM5QixXQUFXLEVBQUUsSUFBSSxDQUFDLFdBQVc7S0FDOUIsQ0FBQyxDQUFDO0lBQ2EsUUFBUSxHQUFHO1FBQ3pCLE1BQU0sRUFBRSxxQkFBcUI7UUFDN0IsWUFBWSxFQUFFLHdDQUF3QztRQUN0RCxjQUFjLEVBQUUsZUFBZTtRQUMvQixlQUFlLEVBQUUsUUFBUTtRQUN6QixZQUFZLEVBQUUsVUFBVTtRQUN4QixTQUFTLEVBQUUsV0FBVztLQUN2QixDQUFDO0lBRUYsWUFDbUIsZ0JBQWdCLEdBQW1DLENBQ2xFLE1BQU0sRUFDTixFQUFFLENBQUMsSUFBSSxVQUFVLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQztRQUVyQyxLQUFLLEVBQUUsQ0FBQztnQ0FKUyxnQkFBZ0I7SUFLbkMsQ0FBQztJQUVNLEtBQUssQ0FBQyxLQUFLLENBQ2hCLFNBQTRDLEVBQzVDLFVBQW9DO1FBRXBDLE1BQU0sTUFBTSxHQUFHLElBQUksbUJBQW1CLENBQ3BDLFNBQVMsRUFDVCxPQUFPLENBQUMsc0JBQXNCLEVBQzlCLElBQUksQ0FBQyxnQkFBZ0IsQ0FDdEIsQ0FBQztRQUNGLE1BQU0sTUFBTSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDMUMsT0FBTyxJQUFJLG9CQUFvQixDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQzFDLENBQUM7SUFFTSxLQUFLLENBQUMsT0FBTyxLQUFtQixDQUFDO0NBQ3pDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9tZWFzc2lzdGFudC5jbGFzc2VzLmludGVncmF0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vdHMvaW50ZWdyYXRpb25zL2hvbWVhc3Npc3RhbnQvaG9tZWFzc2lzdGFudC5jbGFzc2VzLmludGVncmF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sa0JBQWtCLENBQUM7QUFDNUMsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sOENBQThDLENBQUM7QUFDdEYsT0FBTyxFQUFFLDRCQUE0QixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDakYsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDcEUsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQ3hFLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBSWhGLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ3hFLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBTzFFLE1BQU0sT0FBTyxxQ0FBc0MsU0FBUSxlQUFrRDtJQUMzRixNQUFNLEdBQUcsZUFBZSxDQUFDO0lBQ3pCLFdBQVcsR0FBRyxnQkFBZ0IsQ0FBQztJQUMvQixNQUFNLEdBQUcsaUJBQTBCLENBQUM7SUFDcEMsbUJBQW1CLEdBQUcsSUFBSSxtQkFBbUIsQ0FBQztRQUM1RCxpQkFBaUIsRUFBRSxJQUFJLENBQUMsTUFBTTtRQUM5QixXQUFXLEVBQUUsSUFBSSxDQUFDLFdBQVc7S0FDOUIsQ0FBQyxDQUFDO0lBQ2EsUUFBUSxHQUFHO1FBQ3pCLE1BQU0sRUFBRSxxQkFBcUI7UUFDN0IsWUFBWSxFQUFFLHdDQUF3QztRQUN0RCxjQUFjLEVBQUUsZUFBZTtRQUMvQixlQUFlLEVBQUUsUUFBUTtRQUN6QixZQUFZLEVBQUUsVUFBVTtRQUN4QixT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

package/dist_ts/integrations/homeassistant/homeassistant.classes.runtime.d.ts

@@ -1,21 +1,24 @@
+import type { INativeSetupLease, NativeIntegrationOwner } from '../../core/classes.nativeintegrationowner.js';
 import type * as shxInterfaces from '@smarthome.exchange/interfaces';
 import type { IDeviceFeatureWriteRequest, IIntegrationEntity, IIntegrationEvent, IIntegrationRuntime, IServiceCallResult } from '../../core/types.js';
 import type { IHomeAssistantClient } from './homeassistant.types.js';
 export declare class HomeAssistantRuntime implements IIntegrationRuntime {
     private readonly client;
+    private readonly lease?;
+    private readonly owner?;
     readonly domain = "homeassistant";
-    private readonly subscriptions;
     private destroyed;
-    private cleanupComplete;
     private destroyPromise?;
     private readonly targetScope;
-    constructor(client: IHomeAssistantClient);
+    constructor(client: IHomeAssistantClient, lease?: INativeSetupLease | undefined, owner?: NativeIntegrationOwner | undefined);
     isHealthy(): boolean;
     devices(abortSignalArg?: AbortSignal): Promise<shxInterfaces.data.IDeviceDefinition[]>;
     entities(): Promise<IIntegrationEntity[]>;
-    subscribe(handlerArg: (eventArg: IIntegrationEvent) => void, abortSignalArg?: AbortSignal): Promise<() => Promise<void>>;
+    subscribe(handlerArg: (eventArg: IIntegrationEvent) => void | Promise<void>, abortSignalArg?: AbortSignal): Promise<() => Promise<void>>;
     writeFeature(requestArg: IDeviceFeatureWriteRequest, abortSignalArg?: AbortSignal): Promise<IServiceCallResult>;
+    private writeAdmitted;
     private assertActive;
     destroy(): Promise<void>;
+    retryCleanup(): Promise<void>;
     private performDestroy;
 }

package/dist_ts/integrations/homeassistant/homeassistant.classes.runtime.js

@@ -7,66 +7,65 @@ const abortError = (abortSignalArg) => {
 };
 export class HomeAssistantRuntime {
     client;
+    lease;
+    owner;
     domain = 'homeassistant';
-    subscriptions = new Set();
     destroyed = false;
-    cleanupComplete = false;
     destroyPromise;
     targetScope;
-    constructor(client) {
+    constructor(client, lease, owner) {
         this.client = client;
+        this.lease = lease;
+        this.owner = owner;
         this.targetScope = Object.freeze({ ...client.getTargetScope() });
     }
     isHealthy() {
-        return !this.destroyed && this.client.connected;
+        return !this.destroyed && !this.lease?.signal.aborted && this.client.connected;
     }
     async devices(abortSignalArg) {
         this.assertActive();
-        if (abortSignalArg?.aborted) {
-            throw abortError(abortSignalArg);
-        }
-        return HomeAssistantMapper.toDevices(this.client.getSnapshot(), this.client.connected, this.client.getEntityPlatforms(), this.client.getServices(), this.targetScope);
+        return this.client.withOperation(async () => {
+            this.assertActive();
+            return HomeAssistantMapper.toDevices(this.client.getSnapshot(), this.client.connected, this.client.getEntityPlatforms(), this.client.getServices(), this.targetScope);
+        }, abortSignalArg);
     }
     async entities() {
         this.assertActive();
-        return HomeAssistantMapper.toEntities(this.client.getSnapshot(), this.client.connected, this.targetScope);
+        return this.client.withOperation(async () => {
+            this.assertActive();
+            return HomeAssistantMapper.toEntities(this.client.getSnapshot(), this.client.connected, this.targetScope);
+        });
     }
     async subscribe(handlerArg, abortSignalArg) {
         this.assertActive();
         if (abortSignalArg?.aborted) {
             throw abortError(abortSignalArg);
         }
-        let subscribed = true;
-        const unsubscribeClient = this.client.subscribe(() => {
-            handlerArg({
+        if (typeof handlerArg !== 'function')
+            throw new TypeError('Home Assistant subscriber must be a function.');
+        return this.client.subscribe(() => {
+            return handlerArg({
                 type: 'state_changed',
                 integrationDomain: this.domain,
                 timestamp: Date.now(),
             });
-        });
-        const unsubscribe = () => {
-            if (!subscribed) {
-                return;
-            }
-            subscribed = false;
-            this.subscriptions.delete(unsubscribe);
-            abortSignalArg?.removeEventListener('abort', unsubscribe);
-            unsubscribeClient();
-        };
-        this.subscriptions.add(unsubscribe);
-        abortSignalArg?.addEventListener('abort', unsubscribe, { once: true });
-        if (abortSignalArg?.aborted) {
-            unsubscribe();
-        }
-        return async () => {
-            unsubscribe();
-        };
+        }, abortSignalArg);
     }
     async writeFeature(requestArg, abortSignalArg) {
         this.assertActive();
         if (abortSignalArg?.aborted) {
             throw abortError(abortSignalArg);
         }
+        homeAssistantRecord(requestArg);
+        homeAssistantRecord(requestArg.device);
+        homeAssistantRecord(requestArg.feature);
+        if (requestArg.device.metadata !== undefined)
+            homeAssistantRecord(requestArg.device.metadata);
+        const request = structuredClone(requestArg);
+        return this.client.withOperation((sessionArg) => this.writeAdmitted(request, sessionArg), abortSignalArg);
+    }
+    async writeAdmitted(requestArg, sessionArg) {
+        this.assertActive();
         if (Object.keys(homeAssistantRecord(requestArg)).some((key) => !['device', 'feature', 'value'].includes(key))) {
             return { success: false, error: 'Home Assistant feature requests contain unsupported fields.' };
         }
@@ -106,10 +105,8 @@ export class HomeAssistantRuntime {
         if (!mappedCall.request) {
             return { success: false, error: mappedCall.error || 'Unsupported Home Assistant write.' };
         }
-        const data = await this.client.callService(mappedCall.request, abortSignalArg);
-        if (abortSignalArg?.aborted) {
-            throw abortError(abortSignalArg);
-        }
+        const data = await sessionArg.callService(mappedCall.request);
+        sessionArg.signal.throwIfAborted();
         return {
             success: true,
             data: {
@@ -119,34 +116,25 @@ export class HomeAssistantRuntime {
         };
     }
     assertActive() {
+        this.lease?.assertOpen();
         if (this.destroyed)
             throw new Error('Home Assistant runtime is destroyed.');
     }
     destroy() {
-        if (this.destroyPromise) {
-            return this.destroyPromise;
-        }
-        if (this.cleanupComplete) {
-            return Promise.resolve();
+        if (!this.destroyPromise) {
+            this.destroyed = true;
+            this.destroyPromise = Promise.resolve().then(() => this.performDestroy());
         }
-        this.destroyed = true;
-        const destroyPromise = this.performDestroy();
-        this.destroyPromise = destroyPromise;
-        void destroyPromise.then(() => {
-            this.cleanupComplete = true;
-        }).finally(() => {
-            if (this.destroyPromise === destroyPromise) {
-                this.destroyPromise = undefined;
-            }
-        }).catch(() => undefined);
-        return destroyPromise;
+        return this.destroyPromise;
+    }
+    retryCleanup() {
+        if (!this.destroyPromise)
+            return Promise.reject(new Error('Home Assistant cleanup retry requires destruction.'));
+        return this.owner ? this.owner.retryCleanup() : this.client.retryCleanup();
     }
     async performDestroy() {
-        for (const unsubscribe of [...this.subscriptions]) {
-            unsubscribe();
-        }
-        this.subscriptions.clear();
-        await this.client.destroy();
+        // The client closes transport before joining its owned subscriber continuations.
+        await (this.lease ? this.lease.close() : this.client.destroy());
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9tZWFzc2lzdGFudC5jbGFzc2VzLnJ1bnRpbWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9pbnRlZ3JhdGlvbnMvaG9tZWFzc2lzdGFudC9ob21lYXNzaXN0YW50LmNsYXNzZXMucnVudGltZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFRQSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNoRSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQU1wRSxNQUFNLFVBQVUsR0FBRyxDQUFDLGNBQTJCLEVBQVMsRUFBRTtJQUN4RCxPQUFPLGNBQWMsQ0FBQyxNQUFNLFlBQVksS0FBSztRQUMzQyxDQUFDLENBQUMsY0FBYyxDQUFDLE1BQU07UUFDdkIsQ0FBQyxDQUFDLElBQUksS0FBSyxDQUFDLHVDQUF1QyxDQUFDLENBQUM7QUFDekQsQ0FBQyxDQUFDO0FBRUYsTUFBTSxPQUFPLG9CQUFvQjtJQVFGLE1BQU07SUFQbkIsTUFBTSxHQUFHLGVBQWUsQ0FBQztJQUN4QixhQUFhLEdBQUcsSUFBSSxHQUFHLEVBQWMsQ0FBQztJQUMvQyxTQUFTLEdBQUcsS0FBSyxDQUFDO0lBQ2xCLGVBQWUsR0FBRyxLQUFLLENBQUM7SUFDeEIsY0FBYyxDQUFpQjtJQUN0QixXQUFXLENBQTRCO0lBRXhELFlBQTZCLE1BQTRCO3NCQUE1QixNQUFNO1FBQ2pDLElBQUksQ0FBQyxXQUFXLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxFQUFFLEdBQUcsTUFBTSxDQUFDLGNBQWMsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUNuRSxDQUFDO0lBRU0sU0FBUztRQUNkLE9BQU8sQ0FBQyxJQUFJLENBQUMsU0FBUyxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDO0lBQ2xELENBQUM7SUFFTSxLQUFLLENBQUMsT0FBTyxDQUNsQixjQUE0QjtRQUU1QixJQUFJLENBQUMsWUFBWSxFQUFFLENB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
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"homeassistant.classes.runtime.js","sourceRoot":"","sources":["../../../ts/integrations/homeassistant/homeassistant.classes.runtime.ts"],"names":[],"mappings":"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"}

package/dist_ts/integrations/homeassistant/homeassistant.types.d.ts

@@ -1,5 +1,9 @@
+import type { INativeIntegrationOwnerOptions } from '../../core/classes.nativeintegrationowner.js';
 import type * as homeAssistantWebsocket from 'home-assistant-js-websocket';
 export type THomeAssistantVacuumCommand = 'start' | 'pause' | 'stop' | 'return_to_base' | 'locate' | 'clean_spot';
+export interface IHomeAssistantIntegrationOptions extends INativeIntegrationOwnerOptions {
+    readonly webSocketFactory?: THomeAssistantWebSocketFactory;
+}
 export interface IHomeAssistantHomeassistantConfig {
     homeId: string;
     baseUrl: string;
@@ -57,9 +61,16 @@ export interface IHomeAssistantClient {
     getEntityPlatforms(): Record<string, string>;
     getServices(): ReadonlySet<string>;
     getTargetScope(): IHomeAssistantTargetScope;
-    subscribe(handlerArg: () => void): () => void;
+    subscribe(handlerArg: () => void | Promise<void>, abortSignalArg?: AbortSignal): () => Promise<void>;
+    withOperation<TResult>(workArg: (sessionArg: IHomeAssistantOperationSession) => Promise<TResult>, abortSignalArg?: AbortSignal): Promise<TResult>;
     callService(requestArg: IHomeAssistantServiceCall, abortSignalArg?: AbortSignal): Promise<unknown>;
     destroy(): Promise<void>;
+    retryCleanup(): Promise<void>;
+}
+/** A service session remains usable only inside its admitted continuation. */
+export interface IHomeAssistantOperationSession {
+    readonly signal: AbortSignal;
+    callService(requestArg: IHomeAssistantServiceCall): Promise<unknown>;
 }
 export interface IHomeAssistantTargetScope {
     readonly homeId: string;

package/dist_ts/integrations/hue/hue.classes.client.d.ts

@@ -5,11 +5,16 @@ export declare class HueClient {
     constructor(configArg: IHueConfig, setupSignal?: AbortSignal | undefined);
     isHealthy(): boolean;
     getResources(abortSignalArg?: AbortSignal): Promise<IHueResourceResponse>;
+    private readResources;
     setLightState(lightIdArg: string, stateArg: IHueLightStatePatch, abortSignalArg?: AbortSignal): Promise<void>;
-    subscribeToEvents(handlerArg: (eventArg: IHueEvent) => void, onErrorArg: (errorArg: Error) => void, abortSignalArg?: AbortSignal): Promise<() => Promise<void>>;
+    subscribeToEvents(handlerArg: (eventArg: IHueEvent) => unknown, onErrorArg: (errorArg: Error) => unknown, abortSignalArg?: AbortSignal): Promise<() => Promise<void>>;
+    private subscribe;
     destroy(): Promise<void>;
+    /** Retries only failed cleanup and acknowledges settled callback failures; never replays callbacks or HTTPS work. */
+    retryCleanup(): Promise<void>;
     private readonly abortSetup;
     private drain;
+    private run;
     private assertOpen;
     private requestOptions;
     private request;