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

package/dist/runtime/tracker.js

@@ -1,9 +1,10 @@
-import { chmodSync, closeSync, mkdirSync, openSync, readSync, renameSync, rmSync, writeFileSync } from 'node:fs';
-import { randomUUID } from 'node:crypto';
 import { dirname } from 'node:path';
-import { reapAbandonedTemporaryFiles } from '../account/persistence.js';
+import { reapAbandonedTemporaryFiles } from '../account/ownership.js';
+import { readJsonBounded, writeJsonAtomically } from '../account/persistence.js';
 import { parseCompleteDeviceSnapshot } from '../device/snapshot.js';
 const MAX_TRACKER_BYTES = 1024 * 1024;
+/** How long a published active record stands as evidence of a live runtime. */
+const FRESH_RUNTIME_MS = 90_000;
 const ACTIVE_RUNTIME_STATES = new Set([
     'acquiring-ownership',
     'starting',
@@ -50,14 +51,12 @@ export function runtimeStatusFor(state) {
 /** Reads advisory runtime liveness without granting or overriding SDK ownership. */
 export class RuntimeTracker {
     path;
-    freshThresholdMs;
     now;
     onError;
     heartbeat;
     current;
-    constructor(path, freshThresholdMs = 90_000, now = Date.now, onError = () => undefined) {
+    constructor(path, now = Date.now, onError = () => undefined) {
         this.path = path;
-        this.freshThresholdMs = freshThresholdMs;
         this.now = now;
         this.onError = onError;
     }
@@ -76,7 +75,7 @@ export class RuntimeTracker {
             }
             const updatedAt = Date.parse(value.updatedAt);
             const age = this.now() - updatedAt;
-            if (!Number.isFinite(updatedAt) || age < -5_000 || age > this.freshThresholdMs) {
+            if (!Number.isFinite(updatedAt) || age < -5_000 || age > FRESH_RUNTIME_MS) {
                 return null;
             }
             return { state: value.state, updatedAt: value.updatedAt };
@@ -163,21 +162,7 @@ export class RuntimeTracker {
         this.update('stopped');
     }
     readValue() {
-        let descriptor;
-        try {
-            descriptor = openSync(this.path, 'r');
-            const buffer = Buffer.allocUnsafe(MAX_TRACKER_BYTES + 1);
-            const bytesRead = readSync(descriptor, buffer, 0, buffer.length, 0);
-            if (bytesRead > MAX_TRACKER_BYTES) {
-                return null;
-            }
-            return JSON.parse(buffer.toString('utf8', 0, bytesRead));
-        }
-        finally {
-            if (descriptor !== undefined) {
-                closeSync(descriptor);
-            }
-        }
+        return readJsonBounded(this.path, MAX_TRACKER_BYTES);
     }
     publishSafely(record) {
         try {
@@ -190,22 +175,7 @@ export class RuntimeTracker {
         }
     }
     publish(record) {
-        const directory = dirname(this.path);
-        mkdirSync(directory, { mode: 0o700, recursive: true });
-        chmodSync(directory, 0o700);
-        const temporaryPath = `${this.path}.${process.pid}.${randomUUID()}.tmp`;
-        try {
-            const serialized = JSON.stringify({ ...record, updatedAt: new Date(this.now()).toISOString() });
-            if (Buffer.byteLength(serialized) > MAX_TRACKER_BYTES) {
-                throw new Error(`runtime tracker exceeds ${MAX_TRACKER_BYTES} bytes`);
-            }
-            writeFileSync(temporaryPath, serialized, { encoding: 'utf8', flag: 'wx', mode: 0o600 });
-            renameSync(temporaryPath, this.path);
-        }
-        catch (error) {
-            rmSync(temporaryPath, { force: true });
-            throw error;
-        }
+        writeJsonAtomically(this.path, { ...record, updatedAt: new Date(this.now()).toISOString() }, 'runtime tracker', MAX_TRACKER_BYTES);
     }
 }
 //# sourceMappingURL=tracker.js.map

package/dist/runtime/tracker.js.map

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

package/dist/storage.js

@@ -1,7 +1,7 @@
 import { existsSync, readFileSync, readdirSync, renameSync } from 'node:fs';
 import { join } from 'node:path';
 import { isOwnerProcessAlive } from './account/ownership.js';
-export const STORAGE_DIRECTORY = 'homebridge-eufy';
+const STORAGE_DIRECTORY = 'homebridge-eufy';
 const LEGACY_V5_STORAGE_DIRECTORY = 'eufy-security';
 function hasLiveOwner(root) {
     const ownershipRoot = join(root, 'ownership');

package/dist/storage.js.map

@@ -1 +1 @@
-{"version":3,"file":"storage.js","sourceRoot":"","sources":["../src/storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC5E,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,MAAM,CAAC,MAAM,iBAAiB,GAAG,iBAAiB,CAAC;AACnD,MAAM,2BAA2B,GAAG,eAAe,CAAC;AAEpD,SAAS,YAAY,CAAC,IAAY;IAChC,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAC9C,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QAC/B,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,CAAC;QACH,OAAO,WAAW,CAAC,aAAa,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;aACvD,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;aACtC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;YACd,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC,IAAI,EAAE,YAAY,CAAC,EAAE,MAAM,CAAC,CAG5F,CAAC;gBACF,IACE,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC;oBAC5B,MAAM,CAAC,GAAc,IAAI,CAAC;oBAC3B,CAAC,MAAM,CAAC,eAAe,KAAK,SAAS,IAAI,OAAO,MAAM,CAAC,eAAe,KAAK,QAAQ,CAAC,EACpF,CAAC;oBACD,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,OAAO,mBAAmB,CAAC;oBACzB,GAAG,EAAE,MAAM,CAAC,GAAa;oBACzB,eAAe,EAAE,MAAM,CAAC,eAAqC;iBAC9D,CAAC,CAAC;YACL,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC,CAAC,CAAC;IACP,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,uFAAuF;AACvF,MAAM,UAAU,kBAAkB,CAAC,qBAA6B;IAC9D,MAAM,IAAI,GAAG,IAAI,CAAC,qBAAqB,EAAE,iBAAiB,CAAC,CAAC;IAC5D,MAAM,UAAU,GAAG,IAAI,CAAC,qBAAqB,EAAE,2BAA2B,CAAC,CAAC;IAC5E,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,QAAQ,iBAAiB,QAAQ,2BAA2B,4BAA4B,CAAC,CAAC;IAC5G,CAAC;IACD,IAAI,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC;QAC7B,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,IAAI,CAAC;QACH,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5E,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"storage.js","sourceRoot":"","sources":["../src/storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC5E,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,MAAM,iBAAiB,GAAG,iBAAiB,CAAC;AAC5C,MAAM,2BAA2B,GAAG,eAAe,CAAC;AAEpD,SAAS,YAAY,CAAC,IAAY;IAChC,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAC9C,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QAC/B,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,CAAC;QACH,OAAO,WAAW,CAAC,aAAa,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;aACvD,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;aACtC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;YACd,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC,IAAI,EAAE,YAAY,CAAC,EAAE,MAAM,CAAC,CAG5F,CAAC;gBACF,IACE,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC;oBAC5B,MAAM,CAAC,GAAc,IAAI,CAAC;oBAC3B,CAAC,MAAM,CAAC,eAAe,KAAK,SAAS,IAAI,OAAO,MAAM,CAAC,eAAe,KAAK,QAAQ,CAAC,EACpF,CAAC;oBACD,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,OAAO,mBAAmB,CAAC;oBACzB,GAAG,EAAE,MAAM,CAAC,GAAa;oBACzB,eAAe,EAAE,MAAM,CAAC,eAAqC;iBAC9D,CAAC,CAAC;YACL,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC,CAAC,CAAC;IACP,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,uFAAuF;AACvF,MAAM,UAAU,kBAAkB,CAAC,qBAA6B;IAC9D,MAAM,IAAI,GAAG,IAAI,CAAC,qBAAqB,EAAE,iBAAiB,CAAC,CAAC;IAC5D,MAAM,UAAU,GAAG,IAAI,CAAC,qBAAqB,EAAE,2BAA2B,CAAC,CAAC;IAC5E,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,QAAQ,iBAAiB,QAAQ,2BAA2B,4BAA4B,CAAC,CAAC;IAC5G,CAAC;IACD,IAAI,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC;QAC7B,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,IAAI,CAAC;QACH,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5E,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/ui/runtime-channel-client.js

@@ -1,5 +1,5 @@
 import { createConnection } from 'node:net';
-import { answeredDevice, answeredDeviceSetting, answeredStatus, areRuntimeChannelDevices, areRuntimeChannelDeviceSettings, FrameReader, isRuntimeChannelStatus, ownedSocket, RUNTIME_CHANNEL_CONNECT_TIMEOUT_MS, RUNTIME_CHANNEL_PROTOCOL, RUNTIME_CHANNEL_RESPONSE_TIMEOUT_MS, RUNTIME_CHANNEL_STAND_DOWN_TIMEOUT_MS, RUNTIME_CHANNEL_WRITE_TIMEOUT_MS, RUNTIME_DEVICE_LIVE_PATH, RUNTIME_DEVICE_SETTING_WRITE_PATH, RUNTIME_DEVICE_SETTINGS_PATH, RUNTIME_DEVICES_PATH, RUNTIME_DIAGNOSTICS_PATH, RUNTIME_RESTART_PATH, RUNTIME_STAND_DOWN_PATH, RUNTIME_STATUS_PATH, } from '../runtime/channel.js';
+import { answeredDevice, answeredDeviceSetting, answeredStatus, areRuntimeChannelDevices, areRuntimeChannelDeviceSettings, FrameReader, isRuntimeChannelStatus, LIVE_UNPLAYABLE, ownedSocket, RUNTIME_CHANNEL_CONNECT_TIMEOUT_MS, RUNTIME_CHANNEL_PROTOCOL, RUNTIME_DEVICE_LIVE_ADAPT_PATH, RUNTIME_CHANNEL_RESPONSE_TIMEOUT_MS, RUNTIME_CHANNEL_STAND_DOWN_TIMEOUT_MS, RUNTIME_CHANNEL_WRITE_TIMEOUT_MS, RUNTIME_DEVICE_LIVE_PATH, RUNTIME_DEVICE_SETTING_WRITE_PATH, RUNTIME_DEVICE_SETTINGS_PATH, RUNTIME_DEVICES_PATH, RUNTIME_DIAGNOSTICS_PATH, RUNTIME_RESTART_PATH, RUNTIME_STAND_DOWN_PATH, RUNTIME_STATUS_PATH, } from '../runtime/channel.js';
 const STATUS_REQUEST = 1;
 const DEVICES_REQUEST = 2;
 const DIAGNOSTICS_REQUEST = 3;
@@ -30,20 +30,95 @@ export class RuntimeChannelClient {
         this.standDownTimeoutMs = options.standDownTimeoutMs ?? RUNTIME_CHANNEL_STAND_DOWN_TIMEOUT_MS;
         this.writeTimeoutMs = options.writeTimeoutMs ?? RUNTIME_CHANNEL_WRITE_TIMEOUT_MS;
     }
+    /** A device's eufy settings, or undefined where no runtime answers them. */
     async readDeviceSettings(serial) {
-        return this.over(undefined, (connection) => this.requested(connection, RUNTIME_DEVICE_SETTINGS_PATH, { serial }, this.responseTimeoutMs, (response) => response.ok && areRuntimeChannelDeviceSettings(response.data)
-            ? response.data.map(answeredDeviceSetting)
-            : undefined));
+        return this.over(undefined, (connection) => this.converse(connection, () => frame(SETTINGS_REQUEST, RUNTIME_DEVICE_SETTINGS_PATH, { serial }), (response, conclude) => {
+            if (response?.id !== SETTINGS_REQUEST)
+                return;
+            conclude(response.ok && areRuntimeChannelDeviceSettings(response.data)
+                ? response.data.map(answeredDeviceSetting)
+                : undefined);
+        }, () => undefined, this.responseTimeoutMs));
     }
+    /**
+     * Writes one device setting, true where the runtime delivered it. Delivery is not the device changing: the next
+     * read is what states that. An absent runtime refuses every write.
+     */
     async writeDeviceSetting(write) {
-        const accepted = await this.over(undefined, (connection) => this.requested(connection, RUNTIME_DEVICE_SETTING_WRITE_PATH, write, this.writeTimeoutMs, (response) => response.ok ? true : undefined));
-        return accepted === true;
+        return this.over(false, (connection) => this.converse(connection, () => frame(SETTINGS_REQUEST, RUNTIME_DEVICE_SETTING_WRITE_PATH, write), answered, () => false, this.writeTimeoutMs));
+    }
+    /**
+     * Streams one camera's live preview as base64 JPEG pictures, each with its side and the live encoder and rate
+     * of the HomeKit side, until it ends, the runtime is gone, or `signal` aborts. Settles once it has stopped, true
+     * where the last HomeKit run yielded no picture; a runtime without the path, or with no preview to give, settles
+     * at once.
+     */
+    async liveDevice(query, onPicture, signal) {
+        return this.over(false, (connection) => {
+            if (signal.aborted)
+                connection.destroy();
+            else
+                signal.addEventListener('abort', () => connection.destroy(), { once: true });
+            return this.converse(connection, () => frame(SETTINGS_REQUEST, RUNTIME_DEVICE_LIVE_PATH, query), (response, conclude) => {
+                if (response?.id !== SETTINGS_REQUEST)
+                    return;
+                if (!response.ok)
+                    return conclude(response.data === LIVE_UNPLAYABLE);
+                const { side, encoder, kbps } = response.coding ?? {};
+                if (typeof response.data !== 'string' || typeof encoder !== 'string')
+                    return conclude(false);
+                if (side !== 'raw' && side !== 'homekit')
+                    return conclude(false);
+                onPicture(response.data, typeof kbps === 'number' ? { side, encoder, kbps } : { side, encoder });
+            }, () => false);
+        });
     }
-    async liveDevice(serial, onPicture, signal) {
-        await this.over(undefined, (connection) => this.streamed(connection, serial, onPicture, signal));
+    /** Restarts the HomeKit side of the camera's running preview with other settings; false where none runs. */
+    async adaptLive(query) {
+        return this.over(false, (connection) => this.converse(connection, () => frame(SETTINGS_REQUEST, RUNTIME_DEVICE_LIVE_ADAPT_PATH, query), answered, () => false, this.responseTimeoutMs));
     }
+    /**
+     * Reads the greeting, the status, and the observations.
+     *
+     * The status is one answer and the observations are another, so a runtime that answers the first and then says
+     * nothing, closes, or overruns the frame bound concludes with the status alone. Only a read with no status at
+     * all, an unreadable frame, or an answer this client cannot use is absence.
+     */
     async read() {
-        return this.over(undefined, (connection) => this.exchange(connection));
+        let greeting;
+        let status;
+        let devices;
+        let devicesSettled = false;
+        const reading = () => status && {
+            ready: greeting.ready,
+            status,
+            ...(devices === undefined ? {} : { devices }),
+            ...(greeting.version === undefined ? {} : { version: greeting.version }),
+            ...(greeting.build === undefined ? {} : { build: greeting.build }),
+            ...(greeting.restartable === undefined ? {} : { restartable: greeting.restartable }),
+        };
+        return this.over(undefined, (connection) => this.converse(connection, (opened) => {
+            if (typeof opened.ready !== 'boolean')
+                return undefined;
+            greeting = opened;
+            return frame(STATUS_REQUEST, RUNTIME_STATUS_PATH) + frame(DEVICES_REQUEST, RUNTIME_DEVICES_PATH);
+        }, (response, conclude) => {
+            if (response?.id === STATUS_REQUEST) {
+                if (!response.ok || !isRuntimeChannelStatus(response.data))
+                    return conclude(undefined);
+                status = answeredStatus(response.data);
+            }
+            else if (response?.id === DEVICES_REQUEST) {
+                devicesSettled = true;
+                if (response.ok) {
+                    if (!areRuntimeChannelDevices(response.data))
+                        return conclude(undefined);
+                    devices = response.data.map(answeredDevice);
+                }
+            }
+            if (status && devicesSettled)
+                conclude(reading());
+        }, (ending) => (ending === 'fault' ? undefined : reading()), this.responseTimeoutMs));
     }
     /**
      * Tells the runtime which authorized evidence window was written, so it reads the file now.
@@ -52,7 +127,10 @@ export class RuntimeChannelClient {
      * way: the file the runtime reads is the authority, and it decided before this was sent.
      */
     async notifyAuthorization(supportCaseId) {
-        return this.over(undefined, (connection) => this.notified(connection, supportCaseId));
+        return this.over(undefined, (connection) => this.converse(connection, () => frame(DIAGNOSTICS_REQUEST, RUNTIME_DIAGNOSTICS_PATH, { supportCaseId }), (response, conclude) => {
+            if (response?.id === DIAGNOSTICS_REQUEST)
+                conclude();
+        }, () => undefined, this.responseTimeoutMs));
     }
     /**
      * Asks the runtime to release the account session, reporting whether it stood down.
@@ -64,16 +142,30 @@ export class RuntimeChannelClient {
      * answer, which is that the session was not freed.
      */
     async requestStandDown() {
-        return this.over(false, (connection) => this.accepted(connection, RUNTIME_STAND_DOWN_PATH));
+        return this.over(false, (connection) => this.departed(connection, RUNTIME_STAND_DOWN_PATH));
     }
     /**
      * Asks the runtime to end itself so Homebridge brings up the installed build, reporting whether it accepted.
      *
      * A runtime that does not serve the path, or refuses because ending it would not replace it, is a false rather
-     * than a failure, so a caller never has to tell an old runtime apart from an unwilling one.
+     * than a failure, so a caller never has to tell an old runtime apart from an unwilling one. Whether the
+     * replacement came up is read from the next greeting.
      */
     async requestRestart() {
-        return this.over(false, (connection) => this.accepted(connection, RUNTIME_RESTART_PATH));
+        return this.over(false, (connection) => this.departed(connection, RUNTIME_RESTART_PATH));
+    }
+    /**
+     * Sends one departure request and reports whether the endpoint then closed without refusing it.
+     *
+     * A runtime that releases its session or ends for replacement closes its endpoint at the end of its own bounded
+     * shutdown, so the closing is the completion this waits for and an explicit refusal is the one answer that ends
+     * it early. Acceptance is not waited for, because a runtime that closes the connection may not have flushed it.
+     */
+    departed(connection, path) {
+        return this.converse(connection, () => frame(DEPARTURE_REQUEST, path), (response, conclude) => {
+            if (response?.id === DEPARTURE_REQUEST && !response.ok)
+                conclude(false);
+        }, (ending) => ending === 'closed', this.standDownTimeoutMs);
     }
     /**
      * Runs one operation over its own connection, answering `absent` wherever the endpoint could not be used.
@@ -117,297 +209,68 @@ export class RuntimeChannelClient {
         });
     }
     /**
-     * Sends one notification after the greeting and concludes when it is answered.
+     * Holds one conversation: writes what `request` makes of the greeting, then hands each response to `onResponse`
+     * until it concludes, and answers every other ending with `unanswered`.
      *
-     * Concludes rather than fails on every other outcome. A protocol this client does not speak concludes without
-     * sending, so a runtime running older code is never handed a frame it would read as something else.
+     * Everything before the request is written is a `fault`: a greeting naming another protocol or one `request`
+     * refuses is never sent the request, so a runtime running older code is never handed a frame it would read as
+     * something else. An unreadable frame is a `fault` too. After the request, the endpoint closing is `closed`, and
+     * `timeoutMs` passing or a frame beyond the frame bound is `lapsed`.
      */
-    notified(connection, supportCaseId) {
+    converse(connection, request, onResponse, unanswered, timeoutMs) {
         return new Promise((resolve) => {
-            const settle = setTimeout(resolve, this.responseTimeoutMs);
-            settle.unref();
-            const conclude = () => {
-                clearTimeout(settle);
-                resolve();
-            };
-            const reader = new FrameReader();
-            let greeted = false;
-            connection.once('error', conclude);
-            connection.once('close', conclude);
-            connection.on('data', (chunk) => {
-                const frames = reader.accept(chunk);
-                if (!frames) {
-                    conclude();
-                    return;
-                }
-                for (const frame of frames) {
-                    let parsed;
-                    try {
-                        parsed = JSON.parse(frame);
-                    }
-                    catch {
-                        conclude();
-                        return;
-                    }
-                    if (greeted) {
-                        if (parsed?.id === DIAGNOSTICS_REQUEST) {
-                            conclude();
-                            return;
-                        }
-                        continue;
-                    }
-                    if (parsed?.protocol !== RUNTIME_CHANNEL_PROTOCOL) {
-                        conclude();
-                        return;
-                    }
-                    greeted = true;
-                    connection.write(`${JSON.stringify({
-                        v: RUNTIME_CHANNEL_PROTOCOL,
-                        id: DIAGNOSTICS_REQUEST,
-                        path: RUNTIME_DIAGNOSTICS_PATH,
-                        body: { supportCaseId },
-                    })}\n`);
-                }
-            });
-        });
-    }
-    /**
-     * Sends one departure request after the greeting and reports what became of it.
-     *
-     * A runtime that releases its session or ends for replacement closes its endpoint at the end of its own bounded
-     * shutdown, so the closing is the completion this waits for and an explicit refusal is the one answer that ends
-     * it early. Acceptance is not waited for, because a runtime that closes the connection may not have flushed it.
-     * A protocol this client does not speak is never sent the request, so a frame an older runtime reads as
-     * something else cannot take a session down that nothing asked for.
-     */
-    accepted(connection, path) {
-        return new Promise((resolve) => {
-            const settle = setTimeout(() => resolve(false), this.standDownTimeoutMs);
-            settle.unref();
-            const conclude = (accepted) => {
-                clearTimeout(settle);
-                resolve(accepted);
-            };
-            const reader = new FrameReader();
             let requested = false;
-            connection.once('error', () => conclude(requested));
-            connection.once('close', () => conclude(requested));
-            connection.on('data', (chunk) => {
-                const frames = reader.accept(chunk);
-                if (!frames) {
-                    conclude(false);
-                    return;
-                }
-                for (const frame of frames) {
-                    let parsed;
-                    try {
-                        parsed = JSON.parse(frame);
-                    }
-                    catch {
-                        conclude(false);
-                        return;
-                    }
-                    if (!requested) {
-                        if (parsed?.protocol !== RUNTIME_CHANNEL_PROTOCOL) {
-                            conclude(false);
-                            return;
-                        }
-                        requested = true;
-                        connection.write(`${JSON.stringify({ v: RUNTIME_CHANNEL_PROTOCOL, id: DEPARTURE_REQUEST, path })}\n`);
-                        continue;
-                    }
-                    const response = parsed;
-                    if (response?.id === DEPARTURE_REQUEST && !response.ok) {
-                        conclude(false);
-                        return;
-                    }
-                }
-            });
-        });
-    }
-    /**
-     * Sends one request after the greeting and answers what `accept` makes of its response.
-     *
-     * Undefined is every other outcome: a protocol this client does not speak, which is never sent the request, a
-     * refusal, an answer `accept` does not take, and no answer within `timeoutMs`.
-     */
-    requested(connection, path, body, timeoutMs, accept) {
-        return new Promise((resolve) => {
-            const settle = setTimeout(() => resolve(undefined), timeoutMs);
-            settle.unref();
+            let done = false;
             const conclude = (value) => {
+                done = true;
                 clearTimeout(settle);
                 resolve(value);
             };
+            const end = (ending) => {
+                if (!done)
+                    conclude(unanswered(requested ? ending : 'fault'));
+            };
+            const settle = timeoutMs === undefined ? undefined : setTimeout(() => end('lapsed'), timeoutMs);
+            settle?.unref();
             const reader = new FrameReader();
-            let requested = false;
-            connection.once('error', () => conclude(undefined));
-            connection.once('close', () => conclude(undefined));
-            connection.on('data', (chunk) => {
-                const frames = reader.accept(chunk);
-                if (!frames) {
-                    conclude(undefined);
-                    return;
-                }
-                for (const frame of frames) {
-                    let parsed;
-                    try {
-                        parsed = JSON.parse(frame);
-                    }
-                    catch {
-                        conclude(undefined);
-                        return;
-                    }
-                    if (!requested) {
-                        if (parsed?.protocol !== RUNTIME_CHANNEL_PROTOCOL) {
-                            conclude(undefined);
-                            return;
-                        }
-                        requested = true;
-                        connection.write(`${JSON.stringify({ v: RUNTIME_CHANNEL_PROTOCOL, id: SETTINGS_REQUEST, path, body })}\n`);
-                        continue;
-                    }
-                    const response = parsed;
-                    if (response?.id === SETTINGS_REQUEST) {
-                        conclude(accept(response));
-                        return;
-                    }
-                }
-            });
-        });
-    }
-    /** Sends one live request after the greeting and hands on each picture, settling once the stream ends. */
-    streamed(connection, serial, onPicture, signal) {
-        return new Promise((resolve) => {
-            const conclude = () => resolve(undefined);
-            if (signal.aborted)
-                return conclude();
-            signal.addEventListener('abort', conclude, { once: true });
-            const reader = new FrameReader();
-            let requested = false;
-            connection.once('error', conclude);
-            connection.once('close', conclude);
+            connection.once('error', () => end('closed'));
+            connection.once('close', () => end('closed'));
             connection.on('data', (chunk) => {
                 const frames = reader.accept(chunk);
                 if (!frames)
-                    return conclude();
-                for (const frame of frames) {
-                    let parsed;
-                    try {
-                        parsed = JSON.parse(frame);
-                    }
-                    catch {
-                        return conclude();
-                    }
-                    if (!requested) {
-                        if (parsed?.protocol !== RUNTIME_CHANNEL_PROTOCOL)
-                            return conclude();
-                        requested = true;
-                        const request = { v: RUNTIME_CHANNEL_PROTOCOL, id: SETTINGS_REQUEST, path: RUNTIME_DEVICE_LIVE_PATH };
-                        connection.write(`${JSON.stringify({ ...request, body: { serial } })}\n`);
-                        continue;
-                    }
-                    const response = parsed;
-                    if (response?.id !== SETTINGS_REQUEST)
-                        continue;
-                    if (!response.ok || typeof response.data !== 'string')
-                        return conclude();
-                    onPicture(response.data);
-                }
-            });
-        });
-    }
-    exchange(connection) {
-        return new Promise((resolve, reject) => {
-            const settle = setTimeout(() => concludeOrFail('runtime channel response timed out'), this.responseTimeoutMs);
-            settle.unref();
-            const reader = new FrameReader();
-            let greeting;
-            const fail = (message) => {
-                clearTimeout(settle);
-                reject(new Error(message));
-            };
-            /**
-             * Concludes with the status alone where the observations never settled.
-             *
-             * The status is one answer and the observations are another, so a runtime that answers the first and
-             * then says nothing must not cost both. Only a read with no status at all is a failure.
-             */
-            const concludeOrFail = (message) => {
-                if (greeting && answeredStatusValue) {
-                    devicesSettled = true;
-                    settleIfComplete();
-                    return;
-                }
-                fail(message);
-            };
-            connection.once('error', () => concludeOrFail('runtime channel faulted'));
-            connection.once('close', () => concludeOrFail('runtime channel closed before answering'));
-            let answeredStatusValue;
-            let answeredDevices;
-            let devicesSettled = false;
-            const settleIfComplete = () => {
-                if (!greeting || !answeredStatusValue || !devicesSettled) {
-                    return;
-                }
-                clearTimeout(settle);
-                resolve({
-                    ready: greeting.ready,
-                    status: answeredStatusValue,
-                    ...(answeredDevices === undefined ? {} : { devices: answeredDevices }),
-                    ...(greeting.version === undefined ? {} : { version: greeting.version }),
-                    ...(greeting.build === undefined ? {} : { build: greeting.build }),
-                    ...(greeting.restartable === undefined ? {} : { restartable: greeting.restartable }),
-                });
-            };
-            connection.on('data', (chunk) => {
-                const frames = reader.accept(chunk);
-                if (!frames) {
-                    connection.destroy();
-                    return;
-                }
-                for (const frame of frames) {
+                    return end('lapsed');
+                for (const text of frames) {
+                    if (done)
+                        return;
                     let parsed;
                     try {
-                        parsed = JSON.parse(frame);
+                        parsed = JSON.parse(text);
                     }
                     catch {
-                        fail('runtime channel sent an unreadable frame');
-                        return;
+                        return end('fault');
                     }
-                    if (!greeting) {
-                        const opened = parsed;
-                        if (opened?.protocol !== RUNTIME_CHANNEL_PROTOCOL || typeof opened.ready !== 'boolean') {
-                            fail('runtime channel speaks another protocol');
-                            return;
-                        }
-                        greeting = opened;
-                        connection.write(`${JSON.stringify({ v: RUNTIME_CHANNEL_PROTOCOL, id: STATUS_REQUEST, path: RUNTIME_STATUS_PATH })}\n` +
-                            `${JSON.stringify({ v: RUNTIME_CHANNEL_PROTOCOL, id: DEVICES_REQUEST, path: RUNTIME_DEVICES_PATH })}\n`);
+                    if (requested) {
+                        onResponse(parsed, conclude);
                         continue;
                     }
-                    const response = parsed;
-                    if (response?.id === STATUS_REQUEST) {
-                        if (!response.ok || !isRuntimeChannelStatus(response.data)) {
-                            fail('runtime channel answered no status this client can use');
-                            return;
-                        }
-                        answeredStatusValue = answeredStatus(response.data);
-                    }
-                    else if (response?.id === DEVICES_REQUEST) {
-                        devicesSettled = true;
-                        if (response.ok) {
-                            if (!areRuntimeChannelDevices(response.data)) {
-                                fail('runtime channel answered no observations this client can use');
-                                return;
-                            }
-                            answeredDevices = response.data.map(answeredDevice);
-                        }
-                    }
-                    settleIfComplete();
+                    const greeting = parsed;
+                    const written = greeting?.protocol === RUNTIME_CHANNEL_PROTOCOL ? request(greeting) : undefined;
+                    if (written === undefined)
+                        return end('fault');
+                    requested = true;
+                    connection.write(written);
                 }
             });
         });
     }
 }
+/** One request frame of this protocol. */
+function frame(id, path, body) {
+    return `${JSON.stringify({ v: RUNTIME_CHANNEL_PROTOCOL, id, path, ...(body === undefined ? {} : { body }) })}\n`;
+}
+/** Concludes on the settings request's answer: true where accepted, false where refused. */
+function answered(response, conclude) {
+    if (response?.id === SETTINGS_REQUEST)
+        conclude(!!response.ok);
+}
 //# sourceMappingURL=runtime-channel-client.js.map