@design.estate/dees-comms 2.0.0 → 2.1.0

package/dist_bundle/bundle.js.third-party-notices.json

@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "@api.global/typedrequest",
-      "version": "9.0.2",
+      "version": "9.1.2",
       "license": "MIT",
       "files": [
         {

package/dist_bundle/bundle.js.third-party-notices.txt

@@ -6,7 +6,7 @@ the license and notice files the package ships, or the license text the project
 or a bundled package supplied for it.
 
 ================================================================================
-@api.global/typedrequest@9.0.2
+@api.global/typedrequest@9.1.2
 License: MIT
 
 --- license.md ---

package/dist_ts/00_commitinfo_data.js

@@ -3,7 +3,7 @@
  */
 export const commitinfo = {
     name: '@design.estate/dees-comms',
-    version: '2.0.0',
+    version: '2.1.0',
     description: 'A communications module for enabling DOM-based messaging and synchronization across browser tabs and workers.'
 };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSwyQkFBMkI7SUFDakMsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLCtHQUErRztDQUM3SCxDQUFBIn0=

package/dist_ts/dees-comms.classes.deescomms.d.ts

@@ -7,6 +7,34 @@ export interface IDeesCommsOptions {
      * used before names existed.
      */
     channelName?: string;
+    /**
+     * How long a typed request this instance fires waits for its answer, in
+     * milliseconds. Defaults to 30 seconds. A request fired with its own
+     * `timeoutMs` ends at the earlier of the two.
+     */
+    responseTimeoutMs?: number;
+}
+/**
+ * What a typed request fired on a DeesComms instance throws when a handler
+ * refuses it, and what a handler throws to refuse one. These are the classes
+ * of the `@api.global/typedrequest` the instance routes with, so `instanceof`
+ * holds whichever version the application itself depends on.
+ */
+export type TypedResponseError = plugins.typedrequest.TypedResponseError;
+export declare const TypedResponseError: typeof plugins.typedrequest.TypedResponseError;
+/**
+ * What a typed request fired with `timeoutMs` throws when no answer came in
+ * time.
+ */
+export type TypedRequestTimeoutError = plugins.typedrequest.TypedRequestTimeoutError;
+export declare const TypedRequestTimeoutError: typeof plugins.typedrequest.TypedRequestTimeoutError;
+export interface IDeesCommsTypedHandler {
+    /**
+     * Stops answering. A request that arrives from then on is left to the
+     * other instances, as if this one never had the handler; one it is
+     * answering right now still gets its answer. Calling it again does nothing.
+     */
+    remove(): void;
 }
 /**
  * Receives the payload of one typed event, and the event itself.
@@ -32,7 +60,7 @@ export declare class DeesComms {
     readonly channelName: string;
     private readonly channel;
     private readonly eventHandlers;
-    private hasTypedHandlers;
+    private typedHandlerCount;
     private closed;
     private closing;
     typedrouter: plugins.typedrequest.TypedRouter<plugins.typedrequestInterfaces.ITypedRequest>;
@@ -47,9 +75,13 @@ export declare class DeesComms {
      */
     postMessage<T = plugins.typedrequestInterfaces.ITypedRequest>(messageArg: T): Promise<void>;
     /**
-     * subscribe to messages
+     * Answers the typed requests of a method that other instances on this
+     * channel fire. The handler answers with what it returns; one that throws a
+     * `TypedResponseError` refuses the request, and its caller gets that error
+     * at once instead of waiting for its timeout. An instance has at most one
+     * handler per method.
      */
-    createTypedHandler<T extends plugins.typedrequestInterfaces.ITypedRequest>(methodArg: T['method'], handlerFunction: plugins.typedrequest.THandlerFunction<T>): Promise<void>;
+    createTypedHandler<T extends plugins.typedrequestInterfaces.ITypedRequest>(methodArg: T['method'], handlerFunction: plugins.typedrequest.THandlerFunction<T>): Promise<IDeesCommsTypedHandler>;
     /**
      * Sends a typed event to every other instance on this channel and expects
      * no answer. The instance that sends it does not receive it; any other

package/dist_ts/dees-comms.classes.deescomms.js

@@ -1,4 +1,6 @@
 import * as plugins from './dees-comms.plugins.js';
+export const TypedResponseError = plugins.typedrequest.TypedResponseError;
+export const TypedRequestTimeoutError = plugins.typedrequest.TypedRequestTimeoutError;
 const isProcessHolding = (channelArg) => 'ref' in channelArg &&
     typeof channelArg.ref === 'function' &&
     'unref' in channelArg &&
@@ -83,18 +85,22 @@ export class DeesComms {
     // receiving messages
     constructor(optionsArg = {}) {
         this.eventHandlers = new Map();
-        this.hasTypedHandlers = false;
+        this.typedHandlerCount = 0;
         this.closed = false;
         this.closing = null;
         // sending messages
         this.typedrouter = new plugins.typedrequest.TypedRouter();
+        this.channelName = optionsArg.channelName ?? DeesComms.defaultChannelName;
         this.typedtarget = new plugins.typedrequest.TypedTarget({
+            // posting is done once it returns, so a request aborted later has no
+            // transport work left to release; the target stops its wait
             postMethodWithTypedRouter: async (messageArg) => {
                 await this.postMessage(messageArg);
             },
             typedRouterRef: this.typedrouter,
+            supportsAbortSignal: true,
+            responseTimeoutMs: optionsArg.responseTimeoutMs,
         });
-        this.channelName = optionsArg.channelName ?? DeesComms.defaultChannelName;
         this.channel = openChannel(this.channelName, (messageArg) => {
             void this.receive(messageArg);
         });
@@ -114,12 +120,32 @@ export class DeesComms {
         await this.channel.post(messageArg);
     }
     /**
-     * subscribe to messages
+     * Answers the typed requests of a method that other instances on this
+     * channel fire. The handler answers with what it returns; one that throws a
+     * `TypedResponseError` refuses the request, and its caller gets that error
+     * at once instead of waiting for its timeout. An instance has at most one
+     * handler per method.
      */
     async createTypedHandler(methodArg, handlerFunction) {
-        this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler(methodArg, handlerFunction));
-        this.hasTypedHandlers = true;
+        // each handler sits in a router of its own, so that removing it detaches
+        // that router from the instance's
+        const handlerRouter = new plugins.typedrequest.TypedRouter();
+        handlerRouter.addTypedHandler(new plugins.typedrequest.TypedHandler(methodArg, handlerFunction));
+        const detach = this.typedrouter.addTypedRouter(handlerRouter);
+        this.typedHandlerCount++;
         this.holdProcessWhileListened();
+        let removed = false;
+        return {
+            remove: () => {
+                if (removed) {
+                    return;
+                }
+                removed = true;
+                detach();
+                this.typedHandlerCount--;
+                this.holdProcessWhileListened();
+            },
+        };
     }
     /**
      * Sends a typed event to every other instance on this channel and expects
@@ -191,7 +217,7 @@ export class DeesComms {
         if (this.closed) {
             return;
         }
-        this.channel.holdProcess(this.hasTypedHandlers || this.eventHandlers.size > 0);
+        this.channel.holdProcess(this.typedHandlerCount > 0 || this.eventHandlers.size > 0);
     }
     assertOpen() {
         if (this.closed) {
@@ -211,11 +237,21 @@ export class DeesComms {
             this.dispatch(event);
             return;
         }
+        // Every instance on the channel hears a request; only one with a handler
+        // for its method answers it, so the others do not refuse it in its place.
+        if (isObject(messageArg) &&
+            isObject(messageArg.correlation) &&
+            messageArg.correlation.phase === 'request' &&
+            typeof messageArg.method === 'string' &&
+            !this.typedrouter.checkForTypedHandler(messageArg.method)) {
+            return;
+        }
         // Skip hooks for broadcast-received messages to prevent infinite loops
         // when traffic logging hooks are set up globally. The router validates
         // the shape of what it is given.
         const response = await this.typedrouter.routeAndAddResponse(messageArg, { skipHooks: true });
-        if (response && !response.error && !this.closed) {
+        // a refusal travels like an answer
+        if (response && !this.closed) {
             await this.postMessage(response);
         }
     }
@@ -240,4 +276,4 @@ export class DeesComms {
         }
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dees-comms.classes.deescomms.js","sourceRoot":"","sources":["../ts/dees-comms.classes.deescomms.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dees-comms.classes.deescomms.js","sourceRoot":"","sources":["../ts/dees-comms.classes.deescomms.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@design.estate/dees-comms",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "private": false,
   "description": "A communications module for enabling DOM-based messaging and synchronization across browser tabs and workers.",
   "main": "dist_ts/index.js",
@@ -9,14 +9,14 @@
   "author": "Lossless GmbH",
   "license": "MIT",
   "devDependencies": {
-    "@git.zone/tsbuild": "^5.1.2",
-    "@git.zone/tsbundle": "^3.1.3",
-    "@git.zone/tsrun": "^3.0.2",
-    "@git.zone/tstest": "^7.0.0",
-    "@types/node": "^26.6.3"
+    "@git.zone/tsbuild": "^6.0.2",
+    "@git.zone/tsbundle": "^3.2.1",
+    "@git.zone/tsrun": "^3.0.3",
+    "@git.zone/tstest": "^7.2.1",
+    "@types/node": "^26.6.4"
   },
   "dependencies": {
-    "@api.global/typedrequest": "^9.0.2",
+    "@api.global/typedrequest": "^9.1.2",
     "@api.global/typedrequest-interfaces": "^7.1.0",
     "broadcast-channel": "^7.2.0"
   },

package/readme.md

@@ -67,6 +67,81 @@ console.log(response.reply); // 'Hello Alice, nice to meet you!'
 
 `postMessage()` posts a typed request object as it is; `typedrouter` and `typedtarget` are the `@api.global/typedrequest` 9 router and target the instance routes with. A handler answers with what it returns, `false`, `0` and `''` included; a handler that returns nothing answers `response: null`.
 
+- Every other instance on the channel hears a request, but only one with a handler for its method answers it; the others stay silent. When several instances have a handler for it, the first answer to arrive is the response and the later ones are dropped.
+- An instance has at most one handler per method: `createTypedHandler()` rejects a second one.
+- The instance that fires a request does not answer it itself, even when it has a handler for its method.
+
+#### Waiting for the answer
+
+A request waits 30 seconds for its answer by default. `responseTimeoutMs` sets that limit for every request an instance fires; it must be a whole number of milliseconds from 1 to 2147483647, or the constructor throws a `RangeError`. A request that reaches the limit rejects with an `Error` (`TypedTarget response timed out after …ms`).
+
+A single request can wait less with `timeoutMs`, and its caller can cancel it with an `AbortSignal`:
+
+```typescript
+import { DeesComms, TypedRequestTimeoutError } from '@design.estate/dees-comms';
+
+const asking = new DeesComms({ channelName: 'my-app', responseTimeoutMs: 10_000 });
+const greet = asking.createTypedRequest<IGreetRequest>('greet');
+
+try {
+  await greet.fire({ name: 'Alice' }, { timeoutMs: 1_000 });
+} catch (error) {
+  if (error instanceof TypedRequestTimeoutError) {
+    console.log(`nobody answered within ${error.timeoutMs} ms`);
+  }
+}
+
+const controller = new AbortController();
+const pending = greet.fire({ name: 'Bob' }, { abortSignal: controller.signal });
+controller.abort(new Error('the tab is closing'));
+await pending.catch((reason) => console.log(reason.message)); // 'the tab is closing'
+```
+
+- A request with its own `timeoutMs` ends at the earlier of its own deadline and the instance's `responseTimeoutMs`, and rejects with a `TypedRequestTimeoutError` (carrying `timeoutMs`) when its own deadline comes first.
+- An aborted request rejects with the signal's reason at once. A request fired with a signal that is already aborted is never sent. A handler that is already working on an aborted request still finishes; its answer is dropped.
+
+#### Refusing a request
+
+A handler refuses a request by throwing a `TypedResponseError`. Its caller rejects with that error at once, with its `errorText` and `errorData`, instead of waiting for its timeout:
+
+```typescript
+import { DeesComms, TypedResponseError } from '@design.estate/dees-comms';
+
+answering.createTypedHandler<IGreetRequest>('greet', async (request) => {
+  if (request.name === '') {
+    throw new TypedResponseError('name-required', { field: 'name' });
+  }
+  return { reply: `Hello ${request.name}, nice to meet you!` };
+});
+
+try {
+  await asking.createTypedRequest<IGreetRequest>('greet').fire({ name: '' });
+} catch (error) {
+  if (error instanceof TypedResponseError) {
+    console.log(error.errorText, error.errorData); // 'name-required' { field: 'name' }
+  }
+}
+```
+
+- A handler that throws any other error answers with a `TypedResponseError` whose `errorText` is `Internal server error`; the error itself does not travel.
+- A refusal is an answer: when several instances have a handler for the method, the first answer wins, whether it is a response or a refusal. An instance that cannot help but wants to leave the request to the others removes its handler instead of refusing.
+- `TypedResponseError` and `TypedRequestTimeoutError` are exported by `@design.estate/dees-comms` and are the classes of the `@api.global/typedrequest` it routes with. Use these exports for `instanceof`: an application that depends on another version of `@api.global/typedrequest` has classes of its own that the errors are not instances of.
+
+#### Removing a handler
+
+`createTypedHandler()` resolves with a handle whose `remove()` stops the handler:
+
+```typescript
+const handler = await answering.createTypedHandler<IGreetRequest>('greet', async (request) => {
+  return { reply: `Hello ${request.name}!` };
+});
+
+// later: the requests are left to the other instances
+handler.remove();
+```
+
+A request that arrives after `remove()` is left to the other instances, as if this one never had the handler; one the handler is working on still gets its answer. The method can be handled again with a new `createTypedHandler()`. Calling `remove()` again does nothing.
+
 ### Typed events
 
 A typed event is sent to every other instance on the channel and expects no answer. It is declared as an `ITypedEvent` of `@api.global/typedrequest-interfaces`: its `name` is the contract, its `payload` is what travels.
@@ -109,9 +184,9 @@ subscription.unsubscribe();
 await comms.close();
 ```
 
-A closed instance receives nothing: its subscriptions end and its typed handlers are no longer asked. `postMessage()`, `broadcast()` and the typed requests it fires reject, and `subscribe()` throws. A typed request that is still waiting for its response when the channel closes cannot receive it and ends with its own timeout. Closing again does nothing.
+A closed instance receives nothing: its subscriptions end and its typed handlers are no longer asked. `postMessage()`, `broadcast()` and the typed requests it fires reject, and `subscribe()` throws. A typed request that is still waiting for its response when the channel closes cannot receive it and ends at its timeout; abort it with its `AbortSignal` to end it at once. Closing again does nothing.
 
-In Node.js an instance keeps the process alive only while something listens on it, as a `MessagePort` with a message listener does: while it has a subscription, or once it has created a typed handler. An instance nobody listens on, such as the one `@design.estate/dees-domtools` opens on import, lets the process end. An unsubscribed or closed instance lets it end too, so close every instance with a typed handler that a test or a script opens. In browsers and workers nothing changes.
+In Node.js an instance keeps the process alive only while something listens on it, as a `MessagePort` with a message listener does: while it has a subscription or a typed handler. An instance nobody listens on, such as the one `@design.estate/dees-domtools` opens on import, lets the process end. An instance whose subscriptions ended and whose handlers were removed lets it end too, as a closed one does, so remove every typed handler or close every instance with one that a test or a script opens. In browsers and workers nothing changes.
 
 ### What travels
 

package/ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@design.estate/dees-comms',
-  version: '2.0.0',
+  version: '2.1.0',
   description: 'A communications module for enabling DOM-based messaging and synchronization across browser tabs and workers.'
 }

package/ts/dees-comms.classes.deescomms.ts

@@ -8,6 +8,37 @@ export interface IDeesCommsOptions {
    * used before names existed.
    */
   channelName?: string;
+  /**
+   * How long a typed request this instance fires waits for its answer, in
+   * milliseconds. Defaults to 30 seconds. A request fired with its own
+   * `timeoutMs` ends at the earlier of the two.
+   */
+  responseTimeoutMs?: number;
+}
+
+/**
+ * What a typed request fired on a DeesComms instance throws when a handler
+ * refuses it, and what a handler throws to refuse one. These are the classes
+ * of the `@api.global/typedrequest` the instance routes with, so `instanceof`
+ * holds whichever version the application itself depends on.
+ */
+export type TypedResponseError = plugins.typedrequest.TypedResponseError;
+export const TypedResponseError = plugins.typedrequest.TypedResponseError;
+
+/**
+ * What a typed request fired with `timeoutMs` throws when no answer came in
+ * time.
+ */
+export type TypedRequestTimeoutError = plugins.typedrequest.TypedRequestTimeoutError;
+export const TypedRequestTimeoutError = plugins.typedrequest.TypedRequestTimeoutError;
+
+export interface IDeesCommsTypedHandler {
+  /**
+   * Stops answering. A request that arrives from then on is left to the
+   * other instances, as if this one never had the handler; one it is
+   * answering right now still gets its answer. Calling it again does nothing.
+   */
+  remove(): void;
 }
 
 /**
@@ -162,22 +193,27 @@ export class DeesComms {
   public readonly channelName: string;
   private readonly channel: IDeesCommsChannel;
   private readonly eventHandlers = new Map<string, Set<TStoredEventHandler>>();
-  private hasTypedHandlers = false;
+  private typedHandlerCount = 0;
   private closed = false;
   private closing: Promise<void> | null = null;
 
   // sending messages
   public typedrouter = new plugins.typedrequest.TypedRouter();
-  public typedtarget = new plugins.typedrequest.TypedTarget({
-    postMethodWithTypedRouter: async (messageArg) => {
-      await this.postMessage(messageArg);
-    },
-    typedRouterRef: this.typedrouter,
-  });
+  public typedtarget: plugins.typedrequest.TypedTarget;
 
   // receiving messages
   constructor(optionsArg: IDeesCommsOptions = {}) {
     this.channelName = optionsArg.channelName ?? DeesComms.defaultChannelName;
+    this.typedtarget = new plugins.typedrequest.TypedTarget({
+      // posting is done once it returns, so a request aborted later has no
+      // transport work left to release; the target stops its wait
+      postMethodWithTypedRouter: async (messageArg) => {
+        await this.postMessage(messageArg);
+      },
+      typedRouterRef: this.typedrouter,
+      supportsAbortSignal: true,
+      responseTimeoutMs: optionsArg.responseTimeoutMs,
+    });
     this.channel = openChannel(this.channelName, (messageArg) => {
       void this.receive(messageArg);
     });
@@ -204,17 +240,37 @@ export class DeesComms {
   }
 
   /**
-   * subscribe to messages
+   * Answers the typed requests of a method that other instances on this
+   * channel fire. The handler answers with what it returns; one that throws a
+   * `TypedResponseError` refuses the request, and its caller gets that error
+   * at once instead of waiting for its timeout. An instance has at most one
+   * handler per method.
    */
   public async createTypedHandler<T extends plugins.typedrequestInterfaces.ITypedRequest>(
     methodArg: T['method'],
     handlerFunction: plugins.typedrequest.THandlerFunction<T>
-  ) {
-    this.typedrouter.addTypedHandler(
+  ): Promise<IDeesCommsTypedHandler> {
+    // each handler sits in a router of its own, so that removing it detaches
+    // that router from the instance's
+    const handlerRouter = new plugins.typedrequest.TypedRouter();
+    handlerRouter.addTypedHandler(
       new plugins.typedrequest.TypedHandler<T>(methodArg, handlerFunction)
     );
-    this.hasTypedHandlers = true;
+    const detach = this.typedrouter.addTypedRouter(handlerRouter);
+    this.typedHandlerCount++;
     this.holdProcessWhileListened();
+    let removed = false;
+    return {
+      remove: () => {
+        if (removed) {
+          return;
+        }
+        removed = true;
+        detach();
+        this.typedHandlerCount--;
+        this.holdProcessWhileListened();
+      },
+    };
   }
 
   /**
@@ -297,7 +353,7 @@ export class DeesComms {
     if (this.closed) {
       return;
     }
-    this.channel.holdProcess(this.hasTypedHandlers || this.eventHandlers.size > 0);
+    this.channel.holdProcess(this.typedHandlerCount > 0 || this.eventHandlers.size > 0);
   }
 
   private assertOpen(): void {
@@ -319,6 +375,17 @@ export class DeesComms {
       this.dispatch(event);
       return;
     }
+    // Every instance on the channel hears a request; only one with a handler
+    // for its method answers it, so the others do not refuse it in its place.
+    if (
+      isObject(messageArg) &&
+      isObject(messageArg.correlation) &&
+      messageArg.correlation.phase === 'request' &&
+      typeof messageArg.method === 'string' &&
+      !this.typedrouter.checkForTypedHandler(messageArg.method)
+    ) {
+      return;
+    }
     // Skip hooks for broadcast-received messages to prevent infinite loops
     // when traffic logging hooks are set up globally. The router validates
     // the shape of what it is given.
@@ -326,7 +393,8 @@ export class DeesComms {
       messageArg as plugins.typedrequestInterfaces.ITypedRequest,
       { skipHooks: true }
     );
-    if (response && !response.error && !this.closed) {
+    // a refusal travels like an answer
+    if (response && !this.closed) {
       await this.postMessage(response);
     }
   }