@owlmeans/client-planning 0.1.18-rc.8 → 0.1.18

package/build/client.d.ts

@@ -6,7 +6,7 @@ import type { Config, Context, PlanningClientOptions, PlanningClientService, Wit
  * What only a server can do is refused rather than faked: a client runs no middleware and folds
  * nothing, so `store()`, `committed()` and a plugin carrying hooks or a store answer
  * `PlanningUnsupported`. A plugin carrying only schemas is accepted — it layers over the server's
- * bundle.
+ * bundle (its `schemas.app` merged over the served declarations, in plugin order).
  */
 export declare const makePlanningClientService: <C extends Config, T extends Context<C>>(context: T, options: PlanningClientOptions) => PlanningClientService;
 /**

package/build/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACV,MAAM,EAAE,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,kBAAkB,EAClF,MAAM,YAAY,CAAA;AAEnB;;;;;;;;GAQG;AACH,eAAO,MAAM,yBAAyB,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,OAAO,CAAC,CAAC,CAAC,WACrE,CAAC,WAAW,qBAAqB,KACzC,qBAoFF,CAAA;AAED;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,oBAAoB,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,OAAO,CAAC,CAAC,CAAC,WAChE,CAAC,WAAW,qBAAqB,KACzC,CAAC,GAAG,kBA0BN,CAAA"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EACV,MAAM,EAAE,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,kBAAkB,EAClF,MAAM,YAAY,CAAA;AAEnB;;;;;;;;GAQG;AACH,eAAO,MAAM,yBAAyB,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,OAAO,CAAC,CAAC,CAAC,WACrE,CAAC,WAAW,qBAAqB,KACzC,qBA6HF,CAAA;AAED;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,oBAAoB,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,OAAO,CAAC,CAAC,CAAC,WAChE,CAAC,WAAW,qBAAqB,KACzC,CAAC,GAAG,kBA0BN,CAAA"}

package/build/client.js

@@ -1,9 +1,11 @@
 import { bindAll } from '@owlmeans/client-entrypoint';
 import { createLazyService, MiddlewareStage, MiddlewareType } from '@owlmeans/context';
-import { DEFAULT_PLUGIN_ORDER, makeSchemaRegistry, PLANNING_SERVICE, PlanningUnsupported, } from '@owlmeans/planning';
+import { appSchemaHelper, DEFAULT_PLUGIN_ORDER, makeSchemaRegistry, PLANNING_SERVICE, PlanningUnsupported, } from '@owlmeans/planning';
 import { makeRemoteCommitSource } from './commits.js';
+import { makeRemoteDefinitions } from './definitions.js';
 import { makeRemoteFacade } from './facade.js';
-import { planningStoresOf } from './stores.js';
+import { planningContextOf } from './helper.js';
+import { makePlanningClientLifecycle } from './lifecycle.js';
 /**
  * The client planning service: a remote facade factory under the SAME alias the server registers
  * its service under, so `context.planning().for(scope)` is one call on both sides.
@@ -11,33 +13,60 @@ import { planningStoresOf } from './stores.js';
  * What only a server can do is refused rather than faked: a client runs no middleware and folds
  * nothing, so `store()`, `committed()` and a plugin carrying hooks or a store answer
  * `PlanningUnsupported`. A plugin carrying only schemas is accepted — it layers over the server's
- * bundle.
+ * bundle (its `schemas.app` merged over the served declarations, in plugin order).
  */
 export const makePlanningClientService = (context, options) => {
+    const feeds = new Set();
     const registry = makeSchemaRegistry();
     const plugins = [];
-    const stores = () => planningStoresOf(context);
+    const stores = () => planningContextOf(context).stores();
+    const lifecycle = makePlanningClientLifecycle({ scopeKey: options.scopeKey, clear: async () => {
+            const mirrors = stores();
+            if (mirrors != null)
+                for (const resource of Object.values(mirrors)) {
+                    const rows = await resource.list({}, { size: 0 });
+                    for (const row of rows.items)
+                        await resource.delete(row.id);
+                }
+        } });
+    const scopeKey = lifecycle.key;
     const commits = makeRemoteCommitSource(context, options.protocols, {
-        socket: options.socket, poll: options.poll, timeout: options.timeout, stores,
-    });
-    const layerPlugins = () => plugins.forEach(plugin => {
-        plugin.schemas?.flows?.forEach(registry.registerFlow);
-        plugin.schemas?.types?.forEach(registry.registerType);
+        socket: options.socket, poll: options.poll, timeout: options.timeout, stores, lifecycle,
     });
+    // The application's declarations the server served — what every client plugin's `app` merges over.
+    let served;
+    const layerPlugins = () => {
+        registry.registerApp(appSchemaHelper.merge([served, ...plugins.map(plugin => plugin.schemas?.app)]));
+        plugins.forEach(plugin => {
+            plugin.schemas?.assigneeTypes?.forEach(registry.registerAssigneeType);
+            plugin.schemas?.flows?.forEach(registry.registerFlow);
+            plugin.schemas?.types?.forEach(registry.registerType);
+        });
+    };
+    let loadedKey = scopeKey();
     let loaded = false;
     let loading = null;
     const loadSchemas = async (opts) => {
+        const key = scopeKey();
+        if (loadedKey !== key) {
+            loaded = false;
+            loading = null;
+            definitions?.invalidate();
+            loadedKey = key;
+        }
         if (loaded && opts?.force !== true) {
             return registry;
         }
         if (loading == null || opts?.force === true) {
-            const attempt = (async () => {
-                const bundle = await context.entrypoint(options.protocols.schema.list).call({ timeout: options.timeout });
+            const attempt = lifecycle.run(async (operation) => {
+                const bundle = await operation.wait(context.entrypoint(options.protocols.schema.list).call({ timeout: options.timeout, signal: operation.signal }));
+                operation.check();
                 registry.load(bundle);
+                served = registry.app();
                 layerPlugins();
                 loaded = true;
                 return registry;
-            })();
+            });
             loading = attempt;
             // A failed load is forgotten, so the next caller asks again instead of inheriting the error.
             attempt.catch(() => {
@@ -48,19 +77,41 @@ export const makePlanningClientService = (context, options) => {
         }
         return await loading;
     };
+    // A write of data-defined schemas moves the organization's bundle too: the next `model()` reloads it.
+    const definitions = options.protocols.schema.define == null
+        ? undefined
+        : makeRemoteDefinitions(context, options.protocols, { lifecycle, timeout: options.timeout, onWrite: () => { loaded = false; loading = null; } });
     const facadeFor = (scope) => makeRemoteFacade(context, options.protocols, { ...options.scope, ...scope }, {
-        commits, schemas: registry, loadSchemas, timeout: options.timeout, stores,
+        commits, schemas: registry, loadSchemas, scopeKey, lifecycle, timeout: options.timeout, stores,
+        ...(definitions != null ? { definitions } : {}),
     });
     let fallback = null;
+    lifecycle.onInvalidate(async () => {
+        const stopping = [...feeds];
+        feeds.clear();
+        loaded = false;
+        loading = null;
+        definitions?.invalidate();
+        registry.load({ version: 1, types: [], flows: [] });
+        served = undefined;
+        layerPlugins();
+        await Promise.all(stopping.map(async (feed) => await feed.stop()));
+    });
     // Lazy, like the server's host: `context.planning()` answers before the context initializes.
     return createLazyService(PLANNING_SERVICE, {
         schemas: registry,
+        lifecycle,
+        scopeKey,
+        registerFeed: feed => { feeds.add(feed); return () => { feeds.delete(feed); }; },
         commits,
         loadSchemas,
         use: plugin => {
             if (plugin.before != null || plugin.after != null || plugin.store != null || plugin.mintCode != null) {
                 throw new PlanningUnsupported(`client:plugin:${plugin.name}`);
             }
+            if (plugin.schemas?.app != null) {
+                appSchemaHelper.assertDeclarations(plugin.schemas.app);
+            }
             const existing = plugins.findIndex(candidate => candidate.name === plugin.name);
             if (existing >= 0) {
                 plugins.splice(existing, 1);
@@ -77,7 +128,8 @@ export const makePlanningClientService = (context, options) => {
         committed: async () => {
             throw new PlanningUnsupported('client:committed');
         },
-        close: async () => await commits.close(),
+        close: lifecycle.close,
+        ...(definitions != null ? { definitions } : {}),
     });
 };
 /**

package/build/client.js.map

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

package/build/commits.d.ts

@@ -1,17 +1,6 @@
 import type { BasicConfig, BasicContext } from '@owlmeans/context';
-import type { PlanningProtocols } from '@owlmeans/planning';
+import { type PlanningProtocols } from '@owlmeans/planning';
 import type { RemoteCommitSource, RemoteCommitSourceOptions } from './types.js';
-/**
- * The commit source of a remote facade: the `commit.get` long poll and, when the host injects a
- * socket opener, the `commit.events` feed.
- *
- * `wait` SUBSCRIBES FIRST and only then reads the status — a commit landing between a read and a
- * subscription would otherwise be missed until the deadline. It then long-polls in holds of
- * `min(poll, remaining)` seconds, so a client with no socket (a Node connector) still learns of a
- * commit within one round trip of it landing, and a client with one learns from whichever arrives
- * first. The deadline is a {@link CommitTimeout}; the transition stays pending — nothing is undone.
- *
- * ONE socket serves every subscription of the source; releasing a subscription never closes it.
- */
+/** Subscribe before reading, then race the shared socket against bounded HTTP holds. */
 export declare const makeRemoteCommitSource: <C extends BasicConfig, T extends BasicContext<C>>(context: T, protocols: PlanningProtocols, opts?: RemoteCommitSourceOptions) => RemoteCommitSource;
 //# sourceMappingURL=commits.d.ts.map

package/build/commits.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commits.d.ts","sourceRoot":"","sources":["../src/commits.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAKlE,OAAO,KAAK,EAC+B,iBAAiB,EAC3D,MAAM,oBAAoB,CAAA;AAG3B,OAAO,KAAK,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAA;AAuB/E;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,sBAAsB,GAAI,CAAC,SAAS,WAAW,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,WAC5E,CAAC,aAAa,iBAAiB,SAAS,yBAAyB,KACzE,kBAuMF,CAAA"}
+{"version":3,"file":"commits.d.ts","sourceRoot":"","sources":["../src/commits.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAElE,OAAO,EAA2O,KAAK,iBAAiB,EAAmC,MAAM,oBAAoB,CAAA;AAKrU,OAAO,KAAK,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAA;AAM/E,wFAAwF;AACxF,eAAO,MAAM,sBAAsB,GAAI,CAAC,SAAS,WAAW,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,WAC5E,CAAC,aAAa,iBAAiB,SAAS,yBAAyB,KACzE,kBAsMF,CAAA"}

package/build/commits.js

@@ -1,205 +1,263 @@
-import { CommitFailed, CommitState, CommitTimeout, DEFAULT_COMMIT_POLL, DEFAULT_COMMIT_TIMEOUT, MAX_COMMIT_POLL, PLANNING_COMMIT_EVENT, PlanningError, WorkcardKind, } from '@owlmeans/planning';
+import { logger } from '@owlmeans/log';
+import { planningReplyHelper, CommitFailed, CommitState, CommitTimeout, DEFAULT_COMMIT_POLL, DEFAULT_COMMIT_TIMEOUT, MAX_COMMIT_POLL, PLANNING_COMMIT_EVENT, PlanningError, WorkcardKind } from '@owlmeans/planning';
 import { EARLY_POLL_LADDER, EARLY_POLL_MS, LONG_POLL_GRACE } from './consts.js';
-import { dropCard, putCard, putCommit } from './utils/record.js';
-const matches = (filter, event) => filter == null || ((filter.entityId == null || filter.entityId === event.entityId)
-    && (filter.project == null || filter.project === event.project)
-    && (filter.card == null || filter.card === event.card)
-    && (filter.kind == null || filter.kind === event.kind));
-const delay = (ms) => {
-    let handle;
-    const promise = new Promise(resolve => { handle = setTimeout(resolve, Math.max(0, ms)); });
-    return { promise, cancel: () => clearTimeout(handle) };
-};
-/**
- * The commit source of a remote facade: the `commit.get` long poll and, when the host injects a
- * socket opener, the `commit.events` feed.
- *
- * `wait` SUBSCRIBES FIRST and only then reads the status — a commit landing between a read and a
- * subscription would otherwise be missed until the deadline. It then long-polls in holds of
- * `min(poll, remaining)` seconds, so a client with no socket (a Node connector) still learns of a
- * commit within one round trip of it landing, and a client with one learns from whichever arrives
- * first. The deadline is a {@link CommitTimeout}; the transition stays pending — nothing is undone.
- *
- * ONE socket serves every subscription of the source; releasing a subscription never closes it.
- */
+import { makePlanningClientLifecycle } from './lifecycle.js';
+import { recordUtils } from './utils/record.js';
+const log = logger('client-planning');
+/** Subscribe before reading, then race the shared socket against bounded HTTP holds. */
 export const makeRemoteCommitSource = (context, protocols, opts) => {
+    const lifecycle = opts?.lifecycle ?? makePlanningClientLifecycle({ scopeKey: opts?.scopeKey });
     const poll = Math.max(0, Math.min(MAX_COMMIT_POLL, opts?.poll ?? DEFAULT_COMMIT_POLL));
     const subscriptions = new Set();
+    const operations = new Set();
     let opening = null;
+    const openingOf = () => opening;
     let open = null;
     let detach = null;
+    const capture = () => {
+        const captured = lifecycle.capture();
+        const operation = { ...captured, release: () => {
+                operations.delete(operation);
+                captured.release();
+            } };
+        operations.add(operation);
+        return operation;
+    };
+    const matches = (filter, event) => filter == null || ((filter.entityId == null || filter.entityId === event.entityId)
+        && (filter.project == null || filter.project === event.project)
+        && (filter.card == null || filter.card === event.card)
+        && (filter.kind == null || filter.kind === event.kind));
+    const delay = (ms) => {
+        let handle;
+        const promise = new Promise(resolve => { handle = setTimeout(resolve, Math.max(0, ms)); });
+        return { promise, cancel: () => clearTimeout(handle) };
+    };
     const dispatch = async (event) => {
         for (const subscription of [...subscriptions]) {
-            if (!matches(subscription.filter, event)) {
+            if (!subscriptions.has(subscription) || !subscription.operation.active() || !matches(subscription.filter, event))
                 continue;
-            }
             try {
-                await subscription.listener(event);
+                await subscription.operation.wait(Promise.resolve(subscription.listener(event)));
             }
-            catch (e) {
-                console.error('Planning commit listener error:', e);
+            catch (error) {
+                if (subscription.operation.active())
+                    log.error('Planning commit listener failed', error);
             }
         }
     };
     const socket = async () => {
         const opener = opts?.socket;
-        if (opener == null) {
+        if (opener == null)
             return null;
-        }
-        opening ??= (async () => {
+        lifecycle.key(); // Observe an identity change before reusing an open carrier.
+        if (open != null)
+            return open;
+        if (opening != null)
+            return await opening.promise;
+        const operation = capture();
+        const pending = (async () => {
             try {
-                const connection = await opener(protocols.commit.events, { query: {} });
-                if (connection == null) {
-                    // No socket right now (not signed in yet, say) — the next subscription asks again.
-                    opening = null;
-                    return null;
-                }
-                open = connection;
-                detach = connection.observe(PLANNING_COMMIT_EVENT, async (message) => {
-                    await dispatch(message.payload);
+                const carrier = Promise.resolve().then(async () => {
+                    operation.check();
+                    return await opener(protocols.commit.events, { query: {}, signal: operation.signal });
+                }).then(async (connection) => {
+                    if (connection == null)
+                        return null;
+                    if (!operation.active()) {
+                        await connection.close();
+                        return null;
+                    }
+                    open = connection;
+                    detach = connection.observe(PLANNING_COMMIT_EVENT, async (message) => {
+                        if (operation.active())
+                            await dispatch(planningReplyHelper.hydrate(message.payload));
+                    });
+                    return connection;
                 });
-                return connection;
+                return await operation.wait(carrier);
             }
-            catch (e) {
-                opening = null;
-                console.error('Planning commit socket error:', e);
+            catch (error) {
+                if (operation.active())
+                    log.warn('Planning commit socket failed to open', error);
                 return null;
             }
+            finally {
+                if (openingOf()?.operation === operation)
+                    opening = null;
+                // Keep an open carrier's operation cancellable until close; it guards received frames.
+                if (open == null || !operation.active())
+                    operation.release();
+            }
         })();
-        return await opening;
+        opening = { operation, promise: pending };
+        return await pending;
     };
     const endpoint = () => context.entrypoint(protocols.commit.get);
-    const status = async (transition) => await endpoint().call({
-        params: { transition }, query: { wait: 0 }, timeout: opts?.timeout,
-    });
-    const hold = async (transition, wait, signal) => {
+    const status = async (transition, operation) => {
+        operation.check();
+        return planningReplyHelper.hydrate(await operation.wait(endpoint().call({
+            params: { transition }, query: { wait: 0 }, timeout: opts?.timeout, signal: operation.signal,
+        })));
+    };
+    const hold = async (transition, wait, signal, operation) => {
+        operation.check();
         try {
-            return await endpoint().call({
+            return planningReplyHelper.hydrate(await operation.wait(endpoint().call({
                 params: { transition }, query: { wait }, timeout: wait * 1000 + LONG_POLL_GRACE, signal,
-            });
+            })));
         }
-        catch (e) {
-            if (signal.aborted || e instanceof PlanningError) {
-                throw e;
-            }
-            // A dropped hold (a proxy closing an idle response) is not an answer about the commit: one
-            // non-holding read replaces it, and a failure of THAT is reported.
-            return await status(transition);
+        catch (error) {
+            operation.check();
+            if (signal.aborted || error instanceof PlanningError)
+                throw error;
+            // A dropped hold says nothing about the commit. Never retry it under another scope.
+            return await status(transition, operation);
         }
     };
-    /** Fold a settled status into the mirror, when the host registered one. */
-    const fold = async (transition, settled) => {
+    const answer = async (transition, settled, operation) => {
         const stores = opts?.stores?.();
-        if (stores == null) {
-            return;
-        }
-        const known = await stores.commits.load(transition);
-        await putCommit(stores.commits, {
-            id: transition, state: settled.state, at: settled.at, error: settled.error,
-        });
-        if (settled.state !== CommitState.Committed) {
-            return;
-        }
-        if (settled.card != null) {
-            await putCard(stores.cards, settled.card);
-        }
-        else if (settled.card === null && known?.card != null) {
-            await dropCard(stores, known.card, known.kind === WorkcardKind.Project);
-        }
-    };
-    const answer = async (transition, settled) => {
-        await fold(transition, settled);
-        if (settled.state === CommitState.Failed) {
+        if (stores != null)
+            await lifecycle.mutate(operation, async () => {
+                const known = await stores.commits.load(transition);
+                await recordUtils.putCommit(stores.commits, {
+                    id: transition, state: settled.state, at: settled.at, error: settled.error,
+                });
+                if (settled.state === CommitState.Committed) {
+                    if (settled.card != null)
+                        await recordUtils.putCard(stores.cards, settled.card);
+                    else if (settled.card === null && known?.card != null)
+                        await recordUtils.dropCard(stores, known.card, known.kind === WorkcardKind.Project);
+                }
+            });
+        operation.check();
+        if (settled.state === CommitState.Failed)
             throw new CommitFailed(settled.error ?? transition);
-        }
         return settled.card ?? null;
     };
-    const subscribe = async (listener, filter) => {
-        const subscription = { listener, filter };
+    const subscribe = async (listener, filter, signal) => {
+        const operation = capture();
+        const subscription = { listener, filter, operation };
         subscriptions.add(subscription);
-        await socket();
-        return () => { subscriptions.delete(subscription); };
+        const stop = () => {
+            subscriptions.delete(subscription);
+            operation.cancel();
+            operation.release();
+            signal?.removeEventListener('abort', stop);
+        };
+        signal?.addEventListener('abort', stop, { once: true });
+        if (signal?.aborted)
+            stop();
+        try {
+            await operation.wait(socket());
+            return stop;
+        }
+        catch (error) {
+            stop();
+            throw error;
+        }
+    };
+    const close = async () => {
+        for (const operation of operations) {
+            operation.cancel();
+            operation.release();
+        }
+        subscriptions.clear();
+        detach?.();
+        detach = null;
+        const connection = open;
+        open = null;
+        opening = null;
+        await Promise.all([connection?.close(), lifecycle.drain()]);
     };
-    const source = {
-        status,
+    lifecycle.onInvalidate(close);
+    return {
+        status: async (transition) => {
+            const operation = capture();
+            try {
+                return await status(transition, operation);
+            }
+            finally {
+                operation.release();
+            }
+        },
         subscribe,
         wait: async (transition, waitOpts) => {
-            const deadline = Date.now() + (waitOpts?.timeout ?? DEFAULT_COMMIT_TIMEOUT);
-            // Held in an object: a frame writes it from a callback, which flow analysis cannot see.
+            const operation = capture();
+            const duration = waitOpts?.timeout ?? DEFAULT_COMMIT_TIMEOUT;
+            const deadline = Date.now() + duration;
+            const deadlineTimer = setTimeout(() => operation.cancel(new CommitTimeout(transition)), Math.max(0, duration));
             const frame = { landed: null };
             let wake = () => { };
-            const unsubscribe = await subscribe(event => {
-                if (event.transition === transition && event.state !== CommitState.Pending) {
-                    frame.landed = event;
-                    wake();
-                }
-            });
-            /** A frame says it settled; the status read carries the card when the frame does not. */
-            const fromFrame = async (event) => event.record !== undefined
-                ? await answer(transition, {
-                    transition, state: event.state, at: event.at, error: event.error, card: event.record,
-                })
-                : await answer(transition, await status(transition));
+            let unsubscribe;
             try {
-                let current = await status(transition);
+                const subscribing = subscribe(event => {
+                    if (operation.active() && event.transition === transition && event.state !== CommitState.Pending) {
+                        frame.landed = event;
+                        wake();
+                    }
+                }, undefined, operation.signal);
+                // A cancelled waiter must also release a subscription whose opener completes later.
+                void subscribing.then(stop => { if (!operation.active())
+                    stop(); }, () => { });
+                unsubscribe = await operation.wait(subscribing);
+                const fromFrame = async (event) => await answer(transition, event.record !== undefined
+                    ? { transition, state: event.state, at: event.at, error: event.error, card: event.record }
+                    : await status(transition, operation), operation);
+                let current = await status(transition, operation);
                 let early = 0;
                 while (current.state === CommitState.Pending) {
-                    if (frame.landed != null) {
+                    operation.check();
+                    if (frame.landed != null)
                         return await fromFrame(frame.landed);
-                    }
                     const remaining = deadline - Date.now();
-                    if (remaining <= 0) {
+                    if (remaining <= 0)
                         throw new CommitTimeout(transition);
-                    }
                     const wait = Math.min(poll, Math.ceil(remaining / 1000));
                     const abort = new AbortController();
+                    const cancel = () => abort.abort(operation.signal.reason);
+                    operation.signal.addEventListener('abort', cancel, { once: true });
                     const timer = delay(remaining);
                     const framed = new Promise(resolve => { wake = () => resolve('frame'); });
                     const started = Date.now();
                     try {
-                        const outcome = await Promise.race([
-                            hold(transition, wait, abort.signal),
-                            framed,
-                            timer.promise.then(() => 'deadline'),
-                        ]);
-                        if (outcome === 'frame' || outcome === 'deadline') {
+                        const outcome = await operation.wait(Promise.race([
+                            hold(transition, wait, abort.signal, operation), framed, timer.promise.then(() => 'deadline'),
+                        ]));
+                        if (outcome === 'frame' || outcome === 'deadline')
                             continue;
-                        }
                         current = outcome;
                     }
                     finally {
                         abort.abort();
                         timer.cancel();
                         wake = () => { };
+                        operation.signal.removeEventListener('abort', cancel);
                     }
                     if (current.state === CommitState.Pending && Date.now() - started < EARLY_POLL_MS) {
-                        // The server did not hold — pause on a ladder rather than spin until the deadline.
                         const pause = delay(Math.min(EARLY_POLL_LADDER[Math.min(early, EARLY_POLL_LADDER.length - 1)], deadline - Date.now()));
-                        early += 1;
-                        await Promise.race([pause.promise, new Promise(resolve => { wake = resolve; })]);
-                        pause.cancel();
-                        wake = () => { };
+                        early++;
+                        try {
+                            await operation.wait(Promise.race([pause.promise, new Promise(resolve => { wake = resolve; })]));
+                        }
+                        finally {
+                            pause.cancel();
+                            wake = () => { };
+                        }
                     }
-                    else {
+                    else
                         early = 0;
-                    }
                 }
-                return await answer(transition, current);
+                return await answer(transition, current, operation);
             }
             finally {
-                unsubscribe();
+                clearTimeout(deadlineTimer);
+                unsubscribe?.();
+                operation.cancel();
+                operation.release();
             }
         },
-        connected: () => open != null,
-        close: async () => {
-            detach?.();
-            detach = null;
-            const connection = open;
-            open = null;
-            opening = null;
-            await connection?.close();
-        },
+        connected: () => { lifecycle.key(); return open != null; },
+        close,
     };
-    return source;
 };
 //# sourceMappingURL=commits.js.map