@leaven-graphql/ws 0.2.1 → 0.2.2

package/README.md

@@ -283,6 +283,11 @@ interface WebSocketHandlerConfig<TContext = unknown> {
   keepAliveInterval?: number;
   /** Forwarded to the SubscriptionManager (minus `schema`) */
   subscriptionManager?: Omit<SubscriptionManagerConfig, 'schema'>;
+  /**
+   * Destination for diagnostics such as failing hooks (default `console`).
+   * Passed on to the SubscriptionManager unless it sets its own.
+   */
+  logger?: WebSocketLogger;
   /** Return false to reject the connection with 4403 */
   onConnect?: (
     socket: ServerWebSocket<WebSocketContext>,
@@ -313,7 +318,22 @@ interface WebSocketContext {
 Close codes follow the protocol: `4400` invalid message, `4401` unauthorized
 (operation before `connection_init`), `4403` rejected by `onConnect`, `4408`
 init timeout, `4409` duplicate subscription id, `4429` repeated
-`connection_init`.
+`connection_init` (including a second one sent while `onConnect` for the
+first is still running).
+
+An operation is tracked from the moment its `subscribe` frame arrives. A
+client `complete` for an operation that is still setting up cancels it, and
+an operation still setting up when the socket closes is abandoned: in both
+cases nothing is registered and any source stream it obtained is returned.
+Operations still setting up count toward `maxSubscriptionsPerConnection`.
+
+```typescript
+interface WebSocketLogger {
+  error(...args: unknown[]): void;
+  /** Optional; warnings go to `error` without it */
+  warn?(...args: unknown[]): void;
+}
+```
 
 ### SubscriptionManager
 
@@ -334,6 +354,9 @@ class SubscriptionManager {
     onError: (errors: readonly { message: string }[]) => void
   ): Promise<Subscription>;
 
+  /** Parse with the executor's limits (maxTokens, maxDepth) */
+  parse(query: string): Promise<DocumentNode>;
+
   /** Run a query or mutation on the same executor */
   execute<TContext = unknown>(
     request: GraphQLRequest,
@@ -348,6 +371,8 @@ class SubscriptionManager {
 
   readonly subscriptionCount: number;
   readonly connectionCount: number;
+  /** maxSubscriptionsPerConnection */
+  readonly subscriptionLimit: number;
 }
 
 function createSubscriptionManager(config: SubscriptionManagerConfig): SubscriptionManager;
@@ -365,6 +390,8 @@ interface SubscriptionManagerConfig {
    * `introspection: false`, `maxDepth` or `maxComplexity`.
    */
   executor?: LeavenExecutor | Omit<ExecutorConfig, 'schema'>;
+  /** Destination for timeout and callback diagnostics (default `console`) */
+  logger?: WebSocketLogger;
 }
 
 interface Subscription {
@@ -380,7 +407,9 @@ interface Subscription {
 
 Subscription ids are scoped to a connection: `graphql-ws` clients number their
 operations per connection (starting at `"1"`), so every lookup and teardown
-takes **both** the connection id and the subscription id.
+takes **both** the connection id and the subscription id. `subscribe` throws
+when the id is already registered on that connection rather than overwriting
+it.
 
 ### PubSub
 
@@ -409,6 +438,8 @@ interface PubSubConfig {
    * events instead of an unbounded queue. Unlimited by default.
    */
   maxQueueSize?: number;
+  /** Destination for subscriber callback errors (default `console`) */
+  logger?: WebSocketLogger;
 }
 ```
 

package/dist/handler.d.ts

@@ -8,6 +8,7 @@ import { type GraphQLSchema } from 'graphql';
 import type { ServerWebSocket } from 'bun';
 import type { GraphQLRequest } from '@leaven-graphql/core';
 import { type SubscriptionManagerConfig } from './manager';
+import type { WebSocketLogger } from './logger';
 /**
  * WebSocket context data
  */
@@ -39,6 +40,12 @@ export interface WebSocketHandlerConfig<TContext = unknown> {
     keepAliveInterval?: number;
     /** Subscription manager config */
     subscriptionManager?: Omit<SubscriptionManagerConfig, 'schema'>;
+    /**
+     * Where diagnostics (failing hooks and callbacks) are logged. Defaults to
+     * `console`. Also passed to the subscription manager unless
+     * `subscriptionManager.logger` is set.
+     */
+    logger?: WebSocketLogger;
     /** Called when a connection is initialized */
     onConnect?: (socket: ServerWebSocket<WebSocketContext>, params?: Record<string, unknown>) => boolean | Promise<boolean>;
     /** Called when a connection is closed */
@@ -61,9 +68,19 @@ export declare class WebSocketHandler<TContext = unknown> {
     private readonly onDisconnect?;
     private readonly onSubscribe?;
     private readonly onComplete?;
+    private readonly logger;
     private readonly initTimeouts;
     private readonly keepAliveTimers;
+    private readonly states;
     constructor(config: WebSocketHandlerConfig<TContext>);
+    /**
+     * Lifecycle state for a socket, created on first use.
+     */
+    private stateOf;
+    /**
+     * Stop and forget a connection's keep-alive timer, if it has one.
+     */
+    private clearKeepAlive;
     /**
      * Generate a unique connection ID
      */
@@ -104,7 +121,11 @@ export declare class WebSocketHandler<TContext = unknown> {
      * A document graphql-js cannot resolve to a single operation (no operations
      * at all, or several with no `operationName`) is reported as a subscription
      * so the executor produces the precise error rather than this method
-     * guessing at one.
+     * guessing at one. The same goes for a document that fails to parse.
+     *
+     * Parsing goes through the executor, so the configured `maxTokens` and
+     * depth limits apply here too; a plain `parse()` would lex an arbitrarily
+     * large document before the executor's limits ever ran.
      */
     private isSubscriptionOperation;
     /**

package/dist/handler.d.ts.map

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

package/dist/index.d.ts

@@ -9,6 +9,7 @@ export type { WebSocketHandlerConfig, WebSocketContext } from './handler';
 export { SubscriptionManager, createSubscriptionManager } from './manager';
 export type { SubscriptionManagerConfig, Subscription, SubscriptionStatus } from './manager';
 export { PubSub, createPubSub } from './pubsub';
+export type { WebSocketLogger } from './logger';
 export type { PubSubConfig, PubSubEngine, SubscribeFn, PublishFn } from './pubsub';
 export { MessageType, parseMessage, formatMessage, createConnectionAck, createNextMessage, createErrorMessage, createCompleteMessage, createPongMessage, type ConnectionInitMessage, type ConnectionAckMessage, type SubscribeMessage, type NextMessage, type ErrorMessage, type CompleteMessage, type PingMessage, type PongMessage, type ParseMessageOptions, } from './protocol';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AACrE,YAAY,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE1E,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAC;AAC3E,YAAY,EAAE,yBAAyB,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAE7F,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAChD,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAEnF,OAAO,EACL,WAAW,EACX,YAAY,EACZ,aAAa,EACb,mBAAmB,EACnB,iBAAiB,EACjB,kBAAkB,EAClB,qBAAqB,EACrB,iBAAiB,EACjB,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EACzB,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,eAAe,EACpB,KAAK,WAAW,EAChB,KAAK,WAAW,EAChB,KAAK,mBAAmB,GACzB,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AACrE,YAAY,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE1E,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAC;AAC3E,YAAY,EAAE,yBAAyB,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAE7F,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAChD,YAAY,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAChD,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAEnF,OAAO,EACL,WAAW,EACX,YAAY,EACZ,aAAa,EACb,mBAAmB,EACnB,iBAAiB,EACjB,kBAAkB,EAClB,qBAAqB,EACrB,iBAAiB,EACjB,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EACzB,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,eAAe,EACpB,KAAK,WAAW,EAChB,KAAK,WAAW,EAChB,KAAK,mBAAmB,GACzB,MAAM,YAAY,CAAC"}

package/dist/index.js

@@ -1,22 +1,40 @@
 // @bun
 // src/handler.ts
-import { OperationTypeNode, getOperationAST, parse } from "graphql";
+import { OperationTypeNode, getOperationAST } from "graphql";
 
 // src/manager.ts
 import {
   LeavenExecutor
 } from "@leaven-graphql/core";
 
+// src/logger.ts
+function logWarning(logger, ...args) {
+  if (logger.warn) {
+    logger.warn(...args);
+  } else {
+    logger.error(...args);
+  }
+}
+
+// src/manager.ts
 class SubscriptionManager {
   executor;
   connections;
   maxSubscriptionsPerConnection;
   subscriptionTimeout;
+  logger;
   constructor(config) {
     this.executor = config.executor instanceof LeavenExecutor ? config.executor : new LeavenExecutor({ ...config.executor, schema: config.schema });
     this.connections = new Map;
     this.maxSubscriptionsPerConnection = config.maxSubscriptionsPerConnection ?? 100;
     this.subscriptionTimeout = config.subscriptionTimeout ?? 0;
+    this.logger = config.logger ?? console;
+  }
+  get subscriptionLimit() {
+    return this.maxSubscriptionsPerConnection;
+  }
+  parse(query) {
+    return this.executor.parse(query);
   }
   async execute(request, context) {
     const { response } = await this.executor.execute(request, context);
@@ -27,6 +45,9 @@ class SubscriptionManager {
     if (existing && existing.size >= this.maxSubscriptionsPerConnection) {
       throw new Error("Maximum subscriptions per connection reached");
     }
+    if (existing?.has(subscriptionId)) {
+      throw new Error(`Subscription ${subscriptionId} already exists`);
+    }
     const subscription = {
       id: subscriptionId,
       connectionId,
@@ -42,6 +63,13 @@ class SubscriptionManager {
     connectionSubs.set(subscriptionId, subscription);
     try {
       const result = await this.executor.subscribe(request, context);
+      if (!this.isCurrent(subscription)) {
+        subscription.status = "completed";
+        if (Symbol.asyncIterator in Object(result)) {
+          result.return?.()?.catch(() => {});
+        }
+        return subscription;
+      }
       if (!(Symbol.asyncIterator in Object(result))) {
         subscription.status = "error";
         const errors = result.errors ?? [{ message: "Subscription failed" }];
@@ -57,15 +85,17 @@ class SubscriptionManager {
         timeoutId = setTimeout(() => {
           try {
             const timedOut = this.getSubscription(connectionId, subscriptionId);
-            if (timedOut && timedOut.status === "active") {
+            if (timedOut === subscription && timedOut.status === "active") {
               timedOut.status = "completed";
-              console.warn(`Subscription ${subscriptionId} timed out after ${this.subscriptionTimeout}ms`);
+              logWarning(this.logger, `Subscription ${subscriptionId} timed out after ${this.subscriptionTimeout}ms`);
               onComplete();
             }
           } catch (error) {
-            console.error(`Error completing timed-out subscription ${subscriptionId}:`, error);
+            this.logger.error(`Error completing timed-out subscription ${subscriptionId}:`, error);
           } finally {
-            this.unsubscribe(connectionId, subscriptionId);
+            if (this.isCurrent(subscription)) {
+              this.unsubscribe(connectionId, subscriptionId);
+            }
           }
         }, this.subscriptionTimeout);
       }
@@ -74,9 +104,13 @@ class SubscriptionManager {
           clearTimeout(timeoutId);
         }
       };
-      this.consumeIterator(connectionId, subscriptionId, iterator, onNext, onComplete, onError);
+      this.consumeIterator(subscription, iterator, onNext, onComplete, onError);
       return subscription;
     } catch (error) {
+      if (!this.isCurrent(subscription)) {
+        subscription.status = "completed";
+        return subscription;
+      }
       subscription.status = "error";
       const message = error instanceof Error ? error.message : "Subscription failed";
       onError([{ message }]);
@@ -84,24 +118,25 @@ class SubscriptionManager {
       return subscription;
     }
   }
-  async consumeIterator(connectionId, subscriptionId, iterator, onNext, onComplete, onError) {
+  isCurrent(subscription) {
+    return this.getSubscription(subscription.connectionId, subscription.id) === subscription;
+  }
+  async consumeIterator(subscription, iterator, onNext, onComplete, onError) {
+    const { connectionId, id: subscriptionId } = subscription;
     try {
       for await (const result of iterator) {
-        const subscription = this.getSubscription(connectionId, subscriptionId);
-        if (!subscription || subscription.status !== "active") {
+        if (!this.isCurrent(subscription) || subscription.status !== "active") {
           break;
         }
         onNext(result);
       }
-      const subscription = this.getSubscription(connectionId, subscriptionId);
-      if (subscription) {
+      if (this.isCurrent(subscription)) {
         subscription.status = "completed";
         onComplete();
         this.unsubscribe(connectionId, subscriptionId);
       }
     } catch (error) {
-      const subscription = this.getSubscription(connectionId, subscriptionId);
-      if (subscription) {
+      if (this.isCurrent(subscription)) {
         subscription.status = "error";
         const message = error instanceof Error ? error.message : "Subscription error";
         onError([{ message }]);
@@ -260,15 +295,19 @@ class WebSocketHandler {
   onDisconnect;
   onSubscribe;
   onComplete;
+  logger;
   initTimeouts;
   keepAliveTimers;
+  states;
   constructor(config) {
     this.schema = config.schema;
     this.contextFactory = config.context;
     this.connectionInitTimeout = config.connectionInitTimeout ?? 3000;
     this.keepAliveInterval = config.keepAliveInterval ?? 12000;
+    this.logger = config.logger ?? console;
     this.subscriptionManager = new SubscriptionManager({
       schema: config.schema,
+      logger: this.logger,
       ...config.subscriptionManager
     });
     this.onConnect = config.onConnect;
@@ -277,6 +316,22 @@ class WebSocketHandler {
     this.onComplete = config.onComplete;
     this.initTimeouts = new Map;
     this.keepAliveTimers = new Map;
+    this.states = new WeakMap;
+  }
+  stateOf(socket) {
+    let state = this.states.get(socket);
+    if (!state) {
+      state = { initializing: false, closed: false, pending: new Map };
+      this.states.set(socket, state);
+    }
+    return state;
+  }
+  clearKeepAlive(connectionId) {
+    const timer = this.keepAliveTimers.get(connectionId);
+    if (timer) {
+      clearInterval(timer);
+      this.keepAliveTimers.delete(connectionId);
+    }
   }
   generateConnectionId() {
     return crypto.randomUUID();
@@ -286,11 +341,11 @@ class WebSocketHandler {
       const result = invoke();
       if (result instanceof Promise) {
         result.catch((error) => {
-          console.error(`${name} failed:`, error);
+          this.logger.error(`${name} failed:`, error);
         });
       }
     } catch (error) {
-      console.error(`${name} failed:`, error);
+      this.logger.error(`${name} failed:`, error);
     }
   }
   handleOpen(socket) {
@@ -300,6 +355,7 @@ class WebSocketHandler {
       initialized: false,
       subscriptions: new Set
     };
+    this.states.set(socket, { initializing: false, closed: false, pending: new Map });
     const timeout = setTimeout(() => {
       if (!socket.data.initialized) {
         socket.close(4408, "Connection initialization timeout");
@@ -344,10 +400,12 @@ class WebSocketHandler {
     }
   }
   async handleConnectionInit(socket, params) {
-    if (socket.data.initialized) {
+    const state = this.stateOf(socket);
+    if (state.initializing || socket.data.initialized) {
       socket.close(4429, "Too many initialisation requests");
       return;
     }
+    state.initializing = true;
     const timeout = this.initTimeouts.get(socket.data.connectionId);
     if (timeout) {
       clearTimeout(timeout);
@@ -355,6 +413,9 @@ class WebSocketHandler {
     }
     if (this.onConnect) {
       const allowed = await this.onConnect(socket, params);
+      if (state.closed) {
+        return;
+      }
       if (!allowed) {
         socket.close(4403, "Forbidden");
         return;
@@ -364,6 +425,7 @@ class WebSocketHandler {
     socket.data.initialized = true;
     socket.send(formatMessage(createConnectionAck()));
     if (this.keepAliveInterval > 0) {
+      this.clearKeepAlive(socket.data.connectionId);
       const timer = setInterval(() => {
         socket.send(formatMessage({ type: "ping" /* Ping */ }));
       }, this.keepAliveInterval);
@@ -372,31 +434,54 @@ class WebSocketHandler {
   }
   async handleSubscribe(socket, message) {
     const { id, payload } = message;
+    const state = this.stateOf(socket);
     if (socket.data.subscriptions.has(id)) {
       socket.close(4409, `Subscriber for ${id} already exists`);
       return;
     }
+    if (socket.data.subscriptions.size >= this.subscriptionManager.subscriptionLimit) {
+      socket.send(formatMessage(createErrorMessage(id, [{ message: "Maximum subscriptions per connection reached" }])));
+      return;
+    }
     socket.data.subscriptions.add(id);
+    const token = { cancelled: false };
+    state.pending.set(id, token);
+    const settle = () => {
+      if (state.pending.get(id) === token) {
+        state.pending.delete(id);
+      }
+    };
     const request = {
       query: payload.query,
       operationName: payload.operationName,
       variables: payload.variables,
       extensions: payload.extensions
     };
+    const abandoned = () => state.closed || token.cancelled;
     try {
       await this.onSubscribe?.(socket, id, request);
+      if (abandoned())
+        return;
       let context;
       if (this.contextFactory) {
         context = await this.contextFactory(socket, request);
+        if (abandoned())
+          return;
       }
-      if (!this.isSubscriptionOperation(request)) {
+      const isSubscription = await this.isSubscriptionOperation(request);
+      if (abandoned())
+        return;
+      if (!isSubscription) {
         const response = await this.subscriptionManager.execute(request, context);
+        if (abandoned())
+          return;
         if (response.data === undefined && response.errors && response.errors.length > 0) {
           socket.send(formatMessage(createErrorMessage(id, response.errors)));
         } else {
           socket.send(formatMessage(createNextMessage(id, response.data, response.errors)));
           socket.send(formatMessage(createCompleteMessage(id)));
         }
+        settle();
         socket.data.subscriptions.delete(id);
         this.invokeHook("onComplete hook", () => this.onComplete?.(socket, id));
         return;
@@ -412,35 +497,52 @@ class WebSocketHandler {
         socket.data.subscriptions.delete(id);
         this.invokeHook("onComplete hook", () => this.onComplete?.(socket, id));
       });
+      settle();
     } catch (error) {
+      if (abandoned())
+        return;
+      settle();
       const errorText = error instanceof Error ? error.message : "Subscription failed";
       socket.send(formatMessage(createErrorMessage(id, [{ message: errorText }])));
       socket.data.subscriptions.delete(id);
       this.invokeHook("onComplete hook", () => this.onComplete?.(socket, id));
     }
   }
-  isSubscriptionOperation(request) {
-    const document = parse(request.query);
+  async isSubscriptionOperation(request) {
+    let document;
+    try {
+      document = await this.subscriptionManager.parse(request.query);
+    } catch {
+      return true;
+    }
     const operation = getOperationAST(document, request.operationName ?? null);
     return !operation || operation.operation === OperationTypeNode.SUBSCRIPTION;
   }
   handleComplete(socket, subscriptionId) {
+    const state = this.stateOf(socket);
+    const pending = state.pending.get(subscriptionId);
+    if (pending) {
+      pending.cancelled = true;
+      state.pending.delete(subscriptionId);
+    }
     socket.data.subscriptions.delete(subscriptionId);
     this.subscriptionManager.unsubscribe(socket.data.connectionId, subscriptionId);
     this.invokeHook("onComplete hook", () => this.onComplete?.(socket, subscriptionId));
   }
   async handleClose(socket) {
     const { connectionId } = socket.data;
+    const state = this.stateOf(socket);
+    state.closed = true;
+    for (const pending of state.pending.values()) {
+      pending.cancelled = true;
+    }
+    state.pending.clear();
     const initTimeout = this.initTimeouts.get(connectionId);
     if (initTimeout) {
       clearTimeout(initTimeout);
       this.initTimeouts.delete(connectionId);
     }
-    const keepAliveTimer = this.keepAliveTimers.get(connectionId);
-    if (keepAliveTimer) {
-      clearInterval(keepAliveTimer);
-      this.keepAliveTimers.delete(connectionId);
-    }
+    this.clearKeepAlive(connectionId);
     this.subscriptionManager.unsubscribeConnection(connectionId);
     socket.data.subscriptions.clear();
     await this.onDisconnect?.(socket);
@@ -450,12 +552,12 @@ class WebSocketHandler {
       open: (socket) => this.handleOpen(socket),
       message: (socket, message) => {
         this.handleMessage(socket, message).catch((error) => {
-          console.error("WebSocket message handling failed:", error);
+          this.logger.error("WebSocket message handling failed:", error);
         });
       },
       close: (socket) => {
         this.handleClose(socket).catch((error) => {
-          console.error("onDisconnect failed:", error);
+          this.logger.error("onDisconnect failed:", error);
         });
       }
     };
@@ -471,6 +573,7 @@ class PubSub {
   maxSubscribersPerTopic;
   wildcards;
   maxQueueSize;
+  logger;
   nextId;
   constructor(config = {}) {
     this.subscribers = new Map;
@@ -478,6 +581,7 @@ class PubSub {
     this.maxSubscribersPerTopic = config.maxSubscribersPerTopic ?? 1e4;
     this.wildcards = config.wildcards ?? false;
     this.maxQueueSize = config.maxQueueSize ?? Infinity;
+    this.logger = config.logger ?? console;
     this.nextId = 0;
   }
   subscribe(topic, callback) {
@@ -519,7 +623,7 @@ class PubSub {
         try {
           subscriber.callback(payload);
         } catch (error) {
-          console.error("Error in subscriber callback:", error);
+          this.logger.error("Error in subscriber callback:", error);
         }
       }
     }
@@ -542,7 +646,7 @@ class PubSub {
           try {
             subscriber.callback(payload);
           } catch (error) {
-            console.error("Error in wildcard subscriber callback:", error);
+            this.logger.error("Error in wildcard subscriber callback:", error);
           }
         }
       }

package/dist/logger.d.ts

@@ -0,0 +1,20 @@
+/**
+ * @leaven-graphql/ws - Logger interface
+ *
+ * Copyright 2026 Joseph Quinn
+ * Licensed under the Apache License, Version 2.0
+ */
+/**
+ * Destination for the diagnostics the WebSocket transport emits: failing
+ * hooks, subscriber callbacks and subscription timeouts. Defaults to
+ * `console`. `warn` is optional; without it, warnings go to `error`.
+ */
+export interface WebSocketLogger {
+    error(...args: unknown[]): void;
+    warn?(...args: unknown[]): void;
+}
+/**
+ * Emit a warning, falling back to `error` when the logger has no `warn`.
+ */
+export declare function logWarning(logger: WebSocketLogger, ...args: unknown[]): void;
+//# sourceMappingURL=logger.d.ts.map

package/dist/logger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAChC,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;CACjC;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAM5E"}

package/dist/manager.d.ts

@@ -4,8 +4,9 @@
  * Copyright 2026 Joseph Quinn
  * Licensed under the Apache License, Version 2.0
  */
-import type { GraphQLSchema } from 'graphql';
+import type { DocumentNode, GraphQLSchema } from 'graphql';
 import { LeavenExecutor, type ExecutorConfig, type GraphQLRequest, type GraphQLResponse } from '@leaven-graphql/core';
+import { type WebSocketLogger } from './logger';
 /**
  * Subscription status
  */
@@ -54,6 +55,11 @@ export interface SubscriptionManagerConfig {
      * Defaults to a new executor configured with `schema` alone.
      */
     executor?: LeavenExecutor | Omit<ExecutorConfig, 'schema'>;
+    /**
+     * Where diagnostics (subscription timeouts, failing completion callbacks)
+     * are logged. Defaults to `console`.
+     */
+    logger?: WebSocketLogger;
 }
 /**
  * Manages GraphQL subscriptions
@@ -73,7 +79,18 @@ export declare class SubscriptionManager {
     private readonly connections;
     private readonly maxSubscriptionsPerConnection;
     private readonly subscriptionTimeout;
+    private readonly logger;
     constructor(config: SubscriptionManagerConfig);
+    /**
+     * Maximum number of subscriptions (pending or active) one connection may
+     * hold.
+     */
+    get subscriptionLimit(): number;
+    /**
+     * Parse a query under the managed executor's parser limits.
+     * See {@link LeavenExecutor.parse}.
+     */
+    parse(query: string): Promise<DocumentNode>;
     /**
      * Execute a single-result operation (query or mutation) on the same
      * executor that serves subscriptions, so both transports honour the same
@@ -86,6 +103,12 @@ export declare class SubscriptionManager {
     subscribe<TContext = unknown>(connectionId: string, subscriptionId: string, request: GraphQLRequest, context: TContext, onNext: (result: GraphQLResponse) => void, onComplete: () => void, onError: (errors: readonly {
         message: string;
     }[]) => void): Promise<Subscription>;
+    /**
+     * Whether this exact subscription object is still the one registered under
+     * its connection and id. An id lookup alone is not enough: after a
+     * teardown the id can be registered again by a NEWER subscription.
+     */
+    private isCurrent;
     /**
      * Consume an async iterator and call callbacks
      */

package/dist/manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../src/manager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EACL,cAAc,EACd,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,eAAe,EACrB,MAAM,sBAAsB,CAAC;AAE9B;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,QAAQ,GAAG,WAAW,GAAG,OAAO,CAAC;AAE9E;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,6BAA6B;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,oBAAoB;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,2BAA2B;IAC3B,OAAO,EAAE,cAAc,CAAC;IACxB,0BAA0B;IAC1B,MAAM,EAAE,kBAAkB,CAAC;IAC3B,wCAAwC;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,qBAAqB;IACrB,QAAQ,CAAC,EAAE,qBAAqB,CAAC,eAAe,CAAC,CAAC;IAClD,uBAAuB;IACvB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC,qBAAqB;IACrB,MAAM,EAAE,aAAa,CAAC;IACtB,2CAA2C;IAC3C,6BAA6B,CAAC,EAAE,MAAM,CAAC;IACvC,2CAA2C;IAC3C,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;;;;;;;;;;;;OAaG;IACH,QAAQ,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;CAC5D;AAED;;GAEG;AACH,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAiB;IAC1C;;;;;;;;;OASG;IACH,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyC;IACrE,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAAS;IACvD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAS;gBAEjC,MAAM,EAAE,yBAAyB;IAU7C;;;;OAIG;IACU,OAAO,CAAC,QAAQ,GAAG,OAAO,EACrC,OAAO,EAAE,cAAc,EACvB,OAAO,CAAC,EAAE,QAAQ,GACjB,OAAO,CAAC,eAAe,CAAC;IAK3B;;OAEG;IACU,SAAS,CAAC,QAAQ,GAAG,OAAO,EACvC,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,EACzC,UAAU,EAAE,MAAM,IAAI,EACtB,OAAO,EAAE,CAAC,MAAM,EAAE,SAAS;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,KAAK,IAAI,GACxD,OAAO,CAAC,YAAY,CAAC;IAsGxB;;OAEG;YACW,eAAe;IAmC7B;;;;;;OAMG;IACI,WAAW,CAAC,YAAY,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO;IAwBzE;;OAEG;IACI,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAiB1D;;OAEG;IACI,eAAe,CACpB,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,GACrB,YAAY,GAAG,SAAS;IAI3B;;OAEG;IACI,0BAA0B,CAAC,YAAY,EAAE,MAAM,GAAG,YAAY,EAAE;IAKvE;;;OAGG;IACH,IAAW,iBAAiB,IAAI,MAAM,CAMrC;IAED;;OAEG;IACH,IAAW,eAAe,IAAI,MAAM,CAEnC;IAED;;OAEG;IACI,KAAK,IAAI,IAAI;CAMrB;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,yBAAyB,GAChC,mBAAmB,CAErB"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../src/manager.ts"],"names":[],"mappings":"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"}

package/dist/pubsub.d.ts

@@ -4,6 +4,7 @@
  * Copyright 2026 Joseph Quinn
  * Licensed under the Apache License, Version 2.0
  */
+import type { WebSocketLogger } from './logger';
 /**
  * Subscribe function type
  */
@@ -35,6 +36,8 @@ export interface PubSubConfig {
      * without bound. Unlimited by default.
      */
     maxQueueSize?: number;
+    /** Where subscriber callback errors are logged. Defaults to `console`. */
+    logger?: WebSocketLogger;
 }
 /**
  * In-memory PubSub implementation
@@ -46,6 +49,7 @@ export declare class PubSub implements PubSubEngine {
     private readonly maxSubscribersPerTopic;
     private readonly wildcards;
     private readonly maxQueueSize;
+    private readonly logger;
     private nextId;
     constructor(config?: PubSubConfig);
     /**

package/dist/pubsub.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pubsub.d.ts","sourceRoot":"","sources":["../src/pubsub.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;GAEG;AACH,MAAM,MAAM,WAAW,CAAC,CAAC,GAAG,OAAO,IAAI,CACrC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,IAAI,KAC3B,MAAM,IAAI,CAAC;AAEhB;;GAEG;AACH,MAAM,MAAM,SAAS,CAAC,CAAC,GAAG,OAAO,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,KAAK,IAAI,CAAC;AAEzE;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,WAAW,CAAC;IACvB,OAAO,EAAE,SAAS,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,oCAAoC;IACpC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,6BAA6B;IAC7B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAUD;;GAEG;AACH,qBAAa,MAAO,YAAW,YAAY;IACzC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA+B;IAC3D,wEAAwE;IACxE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAwB;IACzD,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAS;IAChD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAU;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,GAAE,YAAiB;IASrC;;OAEG;IACI,SAAS,CAAC,CAAC,GAAG,OAAO,EAC1B,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,IAAI,GAC7B,MAAM,IAAI;IA+Cb;;OAEG;IACI,OAAO,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI;IAmB5D;;OAEG;IACH,OAAO,CAAC,kBAAkB;IA2B1B;;OAEG;IACH,OAAO,CAAC,eAAe;IAwBvB;;OAEG;IACI,aAAa,CAAC,CAAC,GAAG,OAAO,EAC9B,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GACvB,qBAAqB,CAAC,CAAC,CAAC;IAmF3B;;OAEG;IACI,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAIhD;;OAEG;IACI,SAAS,IAAI,MAAM,EAAE;IAI5B;;OAEG;IACI,KAAK,IAAI,IAAI;CAIrB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,MAAM,CAE1D"}
+{"version":3,"file":"pubsub.d.ts","sourceRoot":"","sources":["../src/pubsub.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAEhD;;GAEG;AACH,MAAM,MAAM,WAAW,CAAC,CAAC,GAAG,OAAO,IAAI,CACrC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,IAAI,KAC3B,MAAM,IAAI,CAAC;AAEhB;;GAEG;AACH,MAAM,MAAM,SAAS,CAAC,CAAC,GAAG,OAAO,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,KAAK,IAAI,CAAC;AAEzE;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,WAAW,CAAC;IACvB,OAAO,EAAE,SAAS,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,oCAAoC;IACpC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,6BAA6B;IAC7B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,0EAA0E;IAC1E,MAAM,CAAC,EAAE,eAAe,CAAC;CAC1B;AAUD;;GAEG;AACH,qBAAa,MAAO,YAAW,YAAY;IACzC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA+B;IAC3D,wEAAwE;IACxE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAwB;IACzD,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAS;IAChD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAU;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,GAAE,YAAiB;IAUrC;;OAEG;IACI,SAAS,CAAC,CAAC,GAAG,OAAO,EAC1B,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,IAAI,GAC7B,MAAM,IAAI;IA+Cb;;OAEG;IACI,OAAO,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI;IAmB5D;;OAEG;IACH,OAAO,CAAC,kBAAkB;IA2B1B;;OAEG;IACH,OAAO,CAAC,eAAe;IAwBvB;;OAEG;IACI,aAAa,CAAC,CAAC,GAAG,OAAO,EAC9B,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GACvB,qBAAqB,CAAC,CAAC,CAAC;IAmF3B;;OAEG;IACI,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAIhD;;OAEG;IACI,SAAS,IAAI,MAAM,EAAE;IAI5B;;OAEG;IACI,KAAK,IAAI,IAAI;CAIrB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,MAAM,CAE1D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leaven-graphql/ws",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "WebSocket subscriptions support for Leaven GraphQL",
   "type": "module",
   "main": "./dist/index.js",
@@ -32,9 +32,9 @@
     "directory": "packages/ws"
   },
   "dependencies": {
+    "@leaven-graphql/core": "0.2.2",
     "@leaven-graphql/context": "0.2.1",
-    "@leaven-graphql/errors": "0.2.1",
-    "@leaven-graphql/core": "0.2.1"
+    "@leaven-graphql/errors": "0.2.1"
   },
   "devDependencies": {
     "@types/bun": "^1.3.14",