@graphql-box/worker-client 5.4.0 → 5.4.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@graphql-box/worker-client",
   "description": "The GraphQL Box web worker client module.",
-  "version": "5.4.0",
+  "version": "5.4.2",
   "author": "Dylan Aubrey",
   "license": "MIT",
   "homepage": "https://github.com/badbatch/graphql-box",
@@ -41,8 +41,8 @@
     "iterall": "^1.3.0",
     "lodash-es": "^4.17.21",
     "uuid": "^11.0.3",
-    "@graphql-box/core": "5.4.0",
-    "@graphql-box/helpers": "5.4.0"
+    "@graphql-box/helpers": "5.4.0",
+    "@graphql-box/core": "5.4.0"
   },
   "peerDependencies": {
     "graphql": "<17",

package/src/main.ts

@@ -26,6 +26,7 @@ import { logRequest } from './debug/logRequest.ts';
 import { logSubscription } from './debug/logSubscription.ts';
 import {
   type MessageContext,
+  type MessageRequestPayload,
   type MessageResponsePayload,
   type PendingResolver,
   type PendingTracker,
@@ -99,8 +100,10 @@ export class WorkerClient {
   private _debugManager: DebugManagerDef | null;
   private _eventEmitter: EventEmitter;
   private _experimentalDeferStreamSupport: boolean;
+  private _messageQueue: MessageRequestPayload[] = [];
   private _pending: PendingTracker = new Map();
-  private _worker: Worker;
+
+  private _worker: Worker | undefined;
 
   constructor(options: UserOptions) {
     const errors: ArgsError[] = [];
@@ -125,8 +128,22 @@ export class WorkerClient {
     this._debugManager = options.debugManager ?? null;
     this._eventEmitter = new EventEmitter();
     this._experimentalDeferStreamSupport = options.experimentalDeferStreamSupport ?? false;
-    this._worker = options.worker;
-    this._addEventListener();
+
+    if (typeof options.worker === 'function') {
+      options
+        .worker()
+        .then(worker => {
+          this._worker = worker;
+          this._addEventListener();
+          this._releaseMessageQueue();
+        })
+        .catch((error: unknown) => {
+          throw error;
+        });
+    } else {
+      this._worker = options.worker;
+      this._addEventListener();
+    }
   }
 
   get cache(): CoreWorker {
@@ -150,6 +167,10 @@ export class WorkerClient {
   }
 
   private _addEventListener(): void {
+    if (!this._worker) {
+      throw new Error('A worker is required for the WorkerClient to work correctly.');
+    }
+
     this._worker.addEventListener(MESSAGE, this._onMessage);
   }
 
@@ -176,6 +197,16 @@ export class WorkerClient {
     };
   }
 
+  private _releaseMessageQueue(): void {
+    if (!this._worker) {
+      throw new Error('A worker is required for the WorkerClient to work correctly.');
+    }
+
+    for (const message of this._messageQueue) {
+      this._worker.postMessage(message);
+    }
+  }
+
   @logRequest()
   private async _request(
     request: string,
@@ -184,13 +215,23 @@ export class WorkerClient {
   ): Promise<PartialRequestResult | AsyncIterableIterator<PartialRequestResult | undefined>> {
     try {
       return await new Promise((resolve: PendingResolver) => {
-        this._worker.postMessage({
-          context: WorkerClient._getMessageContext(context),
-          method: REQUEST,
-          options,
-          request,
-          type: GRAPHQL_BOX,
-        });
+        if (this._worker) {
+          this._worker.postMessage({
+            context: WorkerClient._getMessageContext(context),
+            method: REQUEST,
+            options,
+            request,
+            type: GRAPHQL_BOX,
+          });
+        } else {
+          this._messageQueue.push({
+            context: WorkerClient._getMessageContext(context),
+            method: REQUEST,
+            options,
+            request,
+            type: GRAPHQL_BOX,
+          });
+        }
 
         this._pending.set(context.requestID, { resolve });
       });
@@ -210,13 +251,23 @@ export class WorkerClient {
     context: RequestContext,
   ): Promise<PartialRequestResult | AsyncIterableIterator<PartialRequestResult | undefined>> {
     try {
-      this._worker.postMessage({
-        context: WorkerClient._getMessageContext(context),
-        method: SUBSCRIBE,
-        options,
-        request,
-        type: GRAPHQL_BOX,
-      });
+      if (this._worker) {
+        this._worker.postMessage({
+          context: WorkerClient._getMessageContext(context),
+          method: SUBSCRIBE,
+          options,
+          request,
+          type: GRAPHQL_BOX,
+        });
+      } else {
+        this._messageQueue.push({
+          context: WorkerClient._getMessageContext(context),
+          method: SUBSCRIBE,
+          options,
+          request,
+          type: GRAPHQL_BOX,
+        });
+      }
 
       const eventAsyncIterator = new EventAsyncIterator<PartialRequestResult>(this._eventEmitter, context.requestID);
       return Promise.resolve(eventAsyncIterator.getIterator());

package/src/registerWorker.ts

@@ -96,7 +96,7 @@ export const registerWorker = ({ client }: RegisterWorkerOptions): void => {
   const onMessage = ({ data }: MessageEvent<MessageRequestPayload | CachemapMessageRequestPayload>): void => {
     if (isGraphqlBoxMessageRequestPayload(data)) {
       handleMessage(data, client);
-    } else {
+    } else if (client.cache) {
       void handleCachemapMessage(data, client.cache);
     }
   };

package/src/types.ts

@@ -27,7 +27,7 @@ export interface UserOptions {
   /**
    * The web worker instance.
    */
-  worker: Worker;
+  worker: Worker | (() => Promise<Worker>);
 }
 
 export type MethodNames = 'request' | 'subscribe';