@hydranium/protocol 1.0.0-next.117 → 1.0.0-next.123

package/lib/client/data-connection.d.ts

@@ -10,10 +10,10 @@ import { type DataClientProtocol, type DataServerProtocol, type DiagnosticOf, ty
 import type { TransferElement } from '../transfer-element';
 import { DataEvents } from './data-events';
 import type { DataPort } from './data-port';
-import { DataSession } from './data-session';
+import { DataSession, type DataSessionFactory } from './data-session';
 import { RpcConnection, type RpcConnectionLifecycle } from './rpc-connection';
 /** Options for {@link DataConnection}. */
-export interface DataConnectionOptions extends RpcConnectionLifecycle {
+export interface DataConnectionOptions<TTransfer extends TransferElement = TransferElement, TServer extends DataServerProtocol<TTransfer, DiagnosticOf<TServer>> = DataServerProtocol<TTransfer>> extends RpcConnectionLifecycle {
     /**
      * Wire namespace the server is addressed under. Defaults to the
      * framework's {@link DATA_SERVER_WIRE_PREFIX}, which is what an unmodified
@@ -22,9 +22,11 @@ export interface DataConnectionOptions extends RpcConnectionLifecycle {
      * "Unhandled method" rather than failing at wire-up.
      */
     readonly methodNamespace?: string;
+    /** Builds the sessions `createSession` hands out. Defaults to a plain {@link DataSession}. */
+    readonly sessionFactory?: DataSessionFactory<TTransfer, TServer>;
 }
 /** {@link DataConnectionOptions} for a client that does not speak {@link DataClientProtocol}. */
-export interface DataConnectionOptionsWithMethods<TClient extends object> extends DataConnectionOptions {
+export interface DataConnectionOptionsWithMethods<TClient extends object, TTransfer extends TransferElement = TransferElement, TServer extends DataServerProtocol<TTransfer, DiagnosticOf<TServer>> = DataServerProtocol<TTransfer>> extends DataConnectionOptions<TTransfer, TServer> {
     /**
      * Method names of the client to bind as inbound handlers. Declare it
      * `as const satisfies ReadonlyArray<keyof YourClient & string>` so the list
@@ -40,14 +42,14 @@ export interface DataConnectionOptionsWithMethods<TClient extends object> extend
  * request/response-only client binding the default list fails at wire-up. The
  * conditional turns that into a compile error.
  */
-export type DataConnectionArgs<TTransfer extends TransferElement, TClient extends object> = TClient extends DataClientProtocol<TTransfer> ? [options?: DataConnectionOptions & Partial<DataConnectionOptionsWithMethods<TClient>>] : [options: DataConnectionOptionsWithMethods<TClient>];
+export type DataConnectionArgs<TTransfer extends TransferElement, TClient extends object, TServer extends DataServerProtocol<TTransfer, DiagnosticOf<TServer>> = DataServerProtocol<TTransfer>> = TClient extends DataClientProtocol<TTransfer> ? [options?: DataConnectionOptions<TTransfer, TServer> & Partial<DataConnectionOptionsWithMethods<TClient, TTransfer, TServer>>] : [options: DataConnectionOptionsWithMethods<TClient, TTransfer, TServer>];
 /**
  * A {@link RpcConnection} to the data head, carrying as many participants as
  * the host has interested parties.
  *
  * Document operations live on the participants rather than here: they carry a
  * `clientId`, which identifies a participant rather than a wire, and the server
- * keys its holds and watches per `(uri, clientId)`. Two parties sharing one
+ * keys its opens and watches per `(uri, clientId)`. Two parties sharing one
  * identity cannot tell each other's writes from their own echoes.
  *
  * Generic over the transfer root so this file names no grammar. An adopter
@@ -56,74 +58,34 @@ export type DataConnectionArgs<TTransfer extends TransferElement, TClient extend
  */
 export declare class DataConnection<TTransfer extends TransferElement, TServer extends DataServerProtocol<TTransfer, DiagnosticOf<TServer>> = DataServerProtocol<TTransfer>, TClient extends object = DataClientProtocol<TTransfer>> extends RpcConnection<TServer, TClient> {
     protected readonly sessions: Set<DataSession<TTransfer, TServer>>;
+    protected readonly sessionFactory: DataSessionFactory<TTransfer, TServer>;
+    constructor(port: DataPort, client: TClient, ...rest: DataConnectionArgs<TTransfer, TClient, TServer>);
     /**
-     * Holds a disposed session could not release, keyed `clientId` + `uri` so a
-     * repeated handover does not queue the same close twice.
-     *
-     * Retried on this connection's own activity rather than on a timer: every
-     * session operation asks for the proxy, so a shared connection with anything
-     * else going on supplies the occasions, and one with nothing going on has
-     * nobody whose documents the stale hold could affect.
-     */
-    protected readonly orphanedHolds: Map<string, {
-        readonly uri: string;
-        readonly clientId: string;
-    }>;
-    /** Guards {@link releaseOrphanedHolds} against re-entering through its own proxy lookup. */
-    protected releasingOrphans: boolean;
-    constructor(port: DataPort, client: TClient, ...rest: DataConnectionArgs<TTransfer, TClient>);
-    /**
-     * Mint a participant on this connection under `clientId`.
-     *
-     * `clientId` must be distinct per participant and stable for its lifetime:
-     * it keys the server's per-`(uri, clientId)` hold and watch, and it is the
-     * echo key an inbound `onDocumentUpdated` is matched against.
+     * Start a participant on this connection, registered with the server under a
+     * fresh id, `label` plus `#` plus a random UUID, or under `clientId` when
+     * given. Synchronous: the registration is sent at once, and the session's
+     * calls wait for it. The server refuses an id live anywhere in its process,
+     * and every call of that session then rejects with a
+     * `DuplicateClientIdError` code.
      *
      * Throws for an id in {@link FRAMEWORK_CLIENT_IDS} — those are authors the
      * SERVER emits rather than participants, so a session holding one would read
-     * the framework's own broadcasts as its own echoes and drop them. Nothing
-     * about that fails on its own: the document simply stops following, which
-     * looks like a dead connection.
-     *
-     * Throws, too, for an id a LIVE session on this connection already holds.
-     * Per-document membership is a set of client ids, so two participants
-     * sharing one collapse to a single hold and the first close releases it
-     * under the survivor, which then stops receiving updates for a document it
-     * is still showing. A constant bound once per participant KIND — one per
-     * widget class rather than per instance — satisfies the type and violates
-     * this.
-     *
-     * And throws for an id whose previous session left a hold this connection is
-     * still trying to release. That release closes `(uri, clientId)`, so an id
-     * reissued while it is outstanding can have the new participant's hold closed
-     * out from under it. The id frees itself as soon as the release lands.
-     *
-     * The checks span this connection only, so a head several connections reach
-     * can still be addressed twice under one id.
+     * the framework's own broadcasts as its own echoes and drop them — and for
+     * an id a live session on this connection already holds.
      */
-    createSession(clientId: string): DataSession<TTransfer, TServer>;
+    createSession(label?: string, clientId?: string): DataSession<TTransfer, TServer>;
     /**
-     * Take over a `(uri, clientId)` hold a disposed session could not release.
-     *
-     * One attempt is made straight away, since whatever refused the session's
-     * close may already be over; a refusal leaves the entry for the next
-     * operation on this connection to retry.
-     */
-    protected orphanHold(uri: string, clientId: string): void;
-    /**
-     * Try to close every hold handed over by a disposed session, keeping the ones
-     * the server still refuses.
-     *
-     * Errors are swallowed per entry: this runs off another participant's
-     * operation, which has no interest in an unrelated release and no caller to
-     * surface it to. A hold that survives every attempt is released by the
-     * server's connection-close cleanup.
+     * After the transport dropped, reconnect on the next macrotask for the
+     * sessions with documents open, so they re-watch and follow their documents
+     * again without waiting for a call of their own; a session with nothing
+     * open restores on its next call. Nothing is scheduled once this connection
+     * is disposed, which drops its generation too.
      */
-    protected releaseOrphanedHolds(): Promise<void>;
+    protected dropGeneration(): void;
     /**
-     * Sessions are detached rather than disposed: the server releases every hold
-     * on a connection it sees close, so closing each document first sends
-     * requests over a connection this call is about to dispose.
+     * Sessions are detached rather than disposed: the server ends every session
+     * on a connection it sees close, so ending each one first sends requests
+     * over a connection this call is about to dispose.
      */
     dispose(): void;
 }
@@ -145,7 +107,7 @@ export declare class DataConnection<TTransfer extends TransferElement, TServer e
 export declare class DataConnectionWithEvents<TTransfer extends TransferElement, TServer extends DataServerProtocol<TTransfer, DiagnosticOf<TServer>> = DataServerProtocol<TTransfer>> extends DataConnection<TTransfer, TServer, DataEvents<TTransfer, DiagnosticOf<TServer>, ProjectOf<TServer>>> {
     /** Server pushes, fanned out to as many local listeners as the host has. */
     readonly events: DataEvents<TTransfer, DiagnosticOf<TServer>, ProjectOf<TServer>>;
-    constructor(port: DataPort, options?: DataConnectionOptions);
+    constructor(port: DataPort, options?: DataConnectionOptions<TTransfer, TServer>);
     /** Disposes the fan-out it created, which no caller else holds. */
     dispose(): void;
 }

package/lib/client/data-connection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-connection.d.ts","sourceRoot":"","sources":["../../src/client/data-connection.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAGlF,OAAO,EAGJ,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,YAAY,EACjB,KAAK,SAAS,EAChB,MAAM,SAAS,CAAC;AACjB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,KAAK,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE9E,0CAA0C;AAC1C,MAAM,WAAW,qBAAsB,SAAQ,sBAAsB;IAClE;;;;;;OAMG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;CACpC;AAED,iGAAiG;AACjG,MAAM,WAAW,gCAAgC,CAAC,OAAO,SAAS,MAAM,CAAE,SAAQ,qBAAqB;IACpG;;;;OAIG;IACH,QAAQ,CAAC,aAAa,EAAE,SAAS,CAAC,MAAM,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC;CAC9D;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,kBAAkB,CAAC,SAAS,SAAS,eAAe,EAAE,OAAO,SAAS,MAAM,IACrF,OAAO,SAAS,kBAAkB,CAAC,SAAS,CAAC,GACxC,CAAC,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,gCAAgC,CAAC,OAAO,CAAC,CAAC,CAAC,GACtF,CAAC,OAAO,EAAE,gCAAgC,CAAC,OAAO,CAAC,CAAC,CAAC;AAE7D;;;;;;;;;;;;GAYG;AACH,qBAAa,cAAc,CACxB,SAAS,SAAS,eAAe,EACjC,OAAO,SAAS,kBAAkB,CAAC,SAAS,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,kBAAkB,CAAC,SAAS,CAAC,EACpG,OAAO,SAAS,MAAM,GAAG,kBAAkB,CAAC,SAAS,CAAC,CACvD,SAAQ,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC;IACtC,SAAS,CAAC,QAAQ,CAAC,QAAQ,uCAA8C;IACzE;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,aAAa;sBAAmC,MAAM;2BAAqB,MAAM;OAAM;IAC1G,4FAA4F;IAC5F,SAAS,CAAC,gBAAgB,UAAS;gBAEvB,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC;IAY5F;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC;IAqChE;;;;;;OAMG;IACH,SAAS,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAKzD;;;;;;;;OAQG;cACa,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBrD;;;;OAIG;IACM,OAAO,IAAI,IAAI;CAW1B;AAED;;;;;;;;;;;;;;GAcG;AACH,qBAAa,wBAAwB,CAClC,SAAS,SAAS,eAAe,EACjC,OAAO,SAAS,kBAAkB,CAAC,SAAS,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,kBAAkB,CAAC,SAAS,CAAC,CACrG,SAAQ,cAAc,CAAC,SAAS,EAAE,OAAO,EAAE,UAAU,CAAC,SAAS,EAAE,YAAY,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3G,4EAA4E;IAC5E,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,EAAE,YAAY,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;gBAEtE,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAQ3D,mEAAmE;IAC1D,OAAO,IAAI,IAAI;CAI1B"}
+{"version":3,"file":"data-connection.d.ts","sourceRoot":"","sources":["../../src/client/data-connection.ts"],"names":[],"mappings":"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"}

package/lib/client/data-connection.js

@@ -20,7 +20,7 @@ const rpc_connection_1 = require("./rpc-connection");
  *
  * Document operations live on the participants rather than here: they carry a
  * `clientId`, which identifies a participant rather than a wire, and the server
- * keys its holds and watches per `(uri, clientId)`. Two parties sharing one
+ * keys its opens and watches per `(uri, clientId)`. Two parties sharing one
  * identity cannot tell each other's writes from their own echoes.
  *
  * Generic over the transfer root so this file names no grammar. An adopter
@@ -29,18 +29,7 @@ const rpc_connection_1 = require("./rpc-connection");
  */
 class DataConnection extends rpc_connection_1.RpcConnection {
     sessions = new Set();
-    /**
-     * Holds a disposed session could not release, keyed `clientId` + `uri` so a
-     * repeated handover does not queue the same close twice.
-     *
-     * Retried on this connection's own activity rather than on a timer: every
-     * session operation asks for the proxy, so a shared connection with anything
-     * else going on supplies the occasions, and one with nothing going on has
-     * nobody whose documents the stale hold could affect.
-     */
-    orphanedHolds = new Map();
-    /** Guards {@link releaseOrphanedHolds} against re-entering through its own proxy lookup. */
-    releasingOrphans = false;
+    sessionFactory;
     constructor(port, client, ...rest) {
         const [options = {}] = rest;
         super(port, client, {
@@ -51,130 +40,70 @@ class DataConnection extends rpc_connection_1.RpcConnection {
             clientMethods: options.clientMethods ?? data_1.DATA_CLIENT_PROTOCOL_METHODS,
             lifecycle: options
         });
+        this.sessionFactory =
+            options.sessionFactory ?? ((clientId, host, label) => new data_session_1.DataSession(clientId, host, label));
     }
     /**
-     * Mint a participant on this connection under `clientId`.
-     *
-     * `clientId` must be distinct per participant and stable for its lifetime:
-     * it keys the server's per-`(uri, clientId)` hold and watch, and it is the
-     * echo key an inbound `onDocumentUpdated` is matched against.
+     * Start a participant on this connection, registered with the server under a
+     * fresh id, `label` plus `#` plus a random UUID, or under `clientId` when
+     * given. Synchronous: the registration is sent at once, and the session's
+     * calls wait for it. The server refuses an id live anywhere in its process,
+     * and every call of that session then rejects with a
+     * `DuplicateClientIdError` code.
      *
      * Throws for an id in {@link FRAMEWORK_CLIENT_IDS} — those are authors the
      * SERVER emits rather than participants, so a session holding one would read
-     * the framework's own broadcasts as its own echoes and drop them. Nothing
-     * about that fails on its own: the document simply stops following, which
-     * looks like a dead connection.
-     *
-     * Throws, too, for an id a LIVE session on this connection already holds.
-     * Per-document membership is a set of client ids, so two participants
-     * sharing one collapse to a single hold and the first close releases it
-     * under the survivor, which then stops receiving updates for a document it
-     * is still showing. A constant bound once per participant KIND — one per
-     * widget class rather than per instance — satisfies the type and violates
-     * this.
-     *
-     * And throws for an id whose previous session left a hold this connection is
-     * still trying to release. That release closes `(uri, clientId)`, so an id
-     * reissued while it is outstanding can have the new participant's hold closed
-     * out from under it. The id frees itself as soon as the release lands.
-     *
-     * The checks span this connection only, so a head several connections reach
-     * can still be addressed twice under one id.
+     * the framework's own broadcasts as its own echoes and drop them — and for
+     * an id a live session on this connection already holds.
      */
-    createSession(clientId) {
+    createSession(label = 'session', clientId) {
         this.assertLive();
-        if (client_ids_1.FRAMEWORK_CLIENT_IDS.includes(clientId)) {
-            throw new Error(`clientId '${clientId}' is reserved by the framework and cannot identify a participant`);
+        const id = clientId ?? `${label}#${globalThis.crypto.randomUUID()}`;
+        if (client_ids_1.FRAMEWORK_CLIENT_IDS.includes(id)) {
+            throw new Error(`clientId '${id}' is reserved by the framework and cannot identify a participant`);
         }
-        if ([...this.sessions].some(session => session.clientId === clientId)) {
-            throw new Error(`clientId '${clientId}' already identifies a live participant on this connection`);
+        if ([...this.sessions].some(session => session.clientId === id)) {
+            throw new Error(`clientId '${id}' already identifies a live participant on this connection`);
         }
-        if ([...this.orphanedHolds.values()].some(hold => hold.clientId === clientId)) {
-            // A retry is still outstanding for this id, and it closes
-            // `(uri, clientId)` — which the server keys one hold per. Handing the
-            // id over now lets that close land on the NEW participant's hold
-            // instead, taking a document away from a session that opened it
-            // successfully. Nothing about that fails on its own: the document
-            // simply stops following, and the close that did it was issued for a
-            // participant already gone.
-            //
-            // Attempted first, so an id whose release has become possible is free
-            // by the next call rather than waiting for other traffic.
-            void this.releaseOrphanedHolds();
-            throw new Error(`clientId '${clientId}' has an unreleased hold on this connection and cannot identify a new participant yet`);
-        }
-        const session = new data_session_1.DataSession(clientId, {
-            connected: async () => {
-                const server = await this.connected();
-                // Unawaited: a session's own operation must not wait on, or fail
-                // for, the release of a hold another participant abandoned.
-                void this.releaseOrphanedHolds();
-                return server;
-            },
+        const session = this.sessionFactory(id, {
+            connected: () => this.connected(),
             releaseSession: released => this.sessions.delete(released),
-            orphanHold: (uri, holder) => this.orphanHold(uri, holder)
-        });
+            reportError: (error, reported) => this.reportError(error, reported)
+        }, label);
         this.sessions.add(session);
+        // A failure reaches the session's own calls, which wait for the same
+        // registration; caught here only so it is not also reported unhandled.
+        session.connected().catch(() => undefined);
         return session;
     }
     /**
-     * Take over a `(uri, clientId)` hold a disposed session could not release.
-     *
-     * One attempt is made straight away, since whatever refused the session's
-     * close may already be over; a refusal leaves the entry for the next
-     * operation on this connection to retry.
-     */
-    orphanHold(uri, clientId) {
-        this.orphanedHolds.set(`${clientId}\u0000${uri}`, { uri, clientId });
-        void this.releaseOrphanedHolds();
-    }
-    /**
-     * Try to close every hold handed over by a disposed session, keeping the ones
-     * the server still refuses.
-     *
-     * Errors are swallowed per entry: this runs off another participant's
-     * operation, which has no interest in an unrelated release and no caller to
-     * surface it to. A hold that survives every attempt is released by the
-     * server's connection-close cleanup.
+     * After the transport dropped, reconnect on the next macrotask for the
+     * sessions with documents open, so they re-watch and follow their documents
+     * again without waiting for a call of their own; a session with nothing
+     * open restores on its next call. Nothing is scheduled once this connection
+     * is disposed, which drops its generation too.
      */
-    async releaseOrphanedHolds() {
-        if (this.releasingOrphans || this.orphanedHolds.size === 0 || this.disposed) {
-            return;
-        }
-        this.releasingOrphans = true;
-        try {
-            const server = await this.connected();
-            for (const [key, hold] of [...this.orphanedHolds]) {
-                try {
-                    await server.closeModelDocument({ uri: hold.uri, clientId: hold.clientId });
-                    this.orphanedHolds.delete(key);
-                }
-                catch {
-                    // Kept for the next occasion.
+    dropGeneration() {
+        const dropped = this.generation !== undefined;
+        super.dropGeneration();
+        if (dropped && !this.disposed) {
+            setTimeout(() => {
+                if (!this.disposed) {
+                    this.sessions.forEach(session => session.reconnect());
                 }
-            }
-        }
-        catch {
-            // No proxy to release through; the entries wait for one.
-        }
-        finally {
-            this.releasingOrphans = false;
+            }, 0);
         }
     }
     /**
-     * Sessions are detached rather than disposed: the server releases every hold
-     * on a connection it sees close, so closing each document first sends
-     * requests over a connection this call is about to dispose.
+     * Sessions are detached rather than disposed: the server ends every session
+     * on a connection it sees close, so ending each one first sends requests
+     * over a connection this call is about to dispose.
      */
     dispose() {
         for (const session of [...this.sessions]) {
             session.detach();
         }
         this.sessions.clear();
-        // Dropped rather than closed, for the same reason the sessions detach: the
-        // server releases every hold on a connection it sees close, and the close
-        // would travel over the connection being disposed.
-        this.orphanedHolds.clear();
         super.dispose();
     }
 }

package/lib/client/data-connection.js.map

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