Inline worker error messages

r-wasm · Aug 5, 2024 · c240537 · c240537
1 parent e683d10
commit c240537
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/src/webR/chan/channel-postmessage.ts b/src/webR/chan/channel-postmessage.ts
@@ -21,7 +21,6 @@ export class PostMessageChannelMain extends ChannelMain {
   reject: (message: string | Error) => void;
   close: () => void = () => { return; };
   #worker?: Worker;
-  #workerErrorMessage = "An error occurred initialising the webR PostMessageChannel worker.";
 
   constructor(config: Required<WebROptions>) {
     super();
@@ -59,14 +58,18 @@ export class PostMessageChannelMain extends ChannelMain {
       });
       (worker as unknown as NodeWorker).on('error', (ev: Event) => {
         console.error(ev);
-        this.reject(new WebRWorkerError(this.#workerErrorMessage));
+        this.reject(new WebRWorkerError(
+          "An error occurred initialising the webR PostMessageChannel worker."
+        ));
       });
     } else {
       worker.onmessage = (ev: MessageEvent) =>
         this.#onMessageFromWorker(worker, ev.data as Message);
       worker.onerror = (ev) => {
         console.error(ev);
-        this.reject(new WebRWorkerError(this.#workerErrorMessage));
+        this.reject(new WebRWorkerError(
+          "An error occurred initialising the webR PostMessageChannel worker."
+        ));
       };
     }
   }

diff --git a/src/webR/chan/channel-service.ts b/src/webR/chan/channel-service.ts
@@ -28,7 +28,6 @@ export class ServiceWorkerChannelMain extends ChannelMain {
   reject: (message: string | Error) => void;
   close = () => { return; };
 
-  #workerErrorMessage = "An error occurred initialising the webR ServiceWorkerChannel worker.";
   #syncMessageCache = new Map<string, Message>();
   #registration?: ServiceWorkerRegistration;
   #interrupted = false;
@@ -158,14 +157,18 @@ export class ServiceWorkerChannelMain extends ChannelMain {
       });
       (worker as unknown as NodeWorker).on('error', (ev: Event) => {
         console.error(ev);
-        this.reject(new WebRWorkerError(this.#workerErrorMessage));
+        this.reject(new WebRWorkerError(
+          "An error occurred initialising the webR ServiceWorkerChannel worker."
+        ));
       });
     } else {
       worker.onmessage = (ev: MessageEvent) =>
         this.#onMessageFromWorker(worker, ev.data as Message);
       worker.onerror = (ev) => {
         console.error(ev);
-        this.reject(new WebRWorkerError(this.#workerErrorMessage));
+        this.reject(new WebRWorkerError(
+          "An error occurred initialising the webR ServiceWorkerChannel worker."
+        ));
       };
     }
   }

diff --git a/src/webR/chan/channel-shared.ts b/src/webR/chan/channel-shared.ts
@@ -17,7 +17,6 @@ if (IN_NODE) {
 
 export class SharedBufferChannelMain extends ChannelMain {
   #interruptBuffer?: Int32Array;
-  #workerErrorMessage = "An error occurred initialising the webR SharedBufferChannel worker.";
 
   initialised: Promise<unknown>;
   resolve: (_?: unknown) => void;
@@ -66,14 +65,18 @@ export class SharedBufferChannelMain extends ChannelMain {
       });
       (worker as unknown as NodeWorker).on('error', (ev: Event) => {
         console.error(ev);
-        this.reject(new WebRWorkerError(this.#workerErrorMessage));
+        this.reject(new WebRWorkerError(
+          "An error occurred initialising the webR SharedBufferChannel worker."
+        ));
       });
     } else {
       worker.onmessage = (ev: MessageEvent) =>
         this.#onMessageFromWorker(worker, ev.data as Message);
       worker.onerror = (ev) => {
         console.error(ev);
-        this.reject(new WebRWorkerError(this.#workerErrorMessage));
+        this.reject(new WebRWorkerError(
+          "An error occurred initialising the webR SharedBufferChannel worker."
+        ));
       };
     }
   }