[test-dist-esm-node-import] Force testing the module import.

cubing · Jul 16, 2022 · b6a03bf · b6a03bf
1 parent 756beba
commit b6a03bf
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/script/test/dist/esm/node-import/test.mjs b/script/test/dist/esm/node-import/test.mjs
@@ -10,6 +10,9 @@ import "cubing/search";
 import "cubing/stream";
 import "cubing/twisty";
 
+import { setDebug } from "cubing/search";
+setDebug({ disableStringWorker: true });
+
 import { randomScrambleForEvent } from "cubing/scramble";
 
 (async () => {

diff --git a/src/cubing/search/instantiator.ts b/src/cubing/search/instantiator.ts
@@ -8,6 +8,10 @@ let forceStringWorker: boolean = false;
 export function setForceStringWorker(force: boolean): void {
   forceStringWorker = force;
 }
+let disableStringWorker: boolean = false;
+export function setDisableStringWorker(disable: boolean): void {
+  disableStringWorker = disable;
+}
 
 export async function instantiateModuleWorker(): Promise<WorkerInsideAPI> {
   // eslint-disable-next-line no-async-promise-executor
@@ -100,10 +104,16 @@ export async function instantiateWorker(): Promise<WorkerInsideAPI> {
     // `await` is important for `catch` to work.
     return await instantiateModuleWorker();
   } catch (e) {
-    console.warn(
-      "Could not instantiate module worker (this may happen in Firefox, with `bundle-global`, or when using Parcel). Falling back to string worker.",
-      e,
-    );
+    const commonErrorPrefix =
+      "Could not instantiate module worker (this may happen in Firefox, with `bundle-global`, or when using Parcel).";
+    if (disableStringWorker) {
+      console.error(
+        `${commonErrorPrefix} Fallback to string worker is disabled.`,
+        e,
+      );
+      throw new Error(`Module worker instantiation failed.`);
+    }
+    console.warn(`${commonErrorPrefix} Falling back to string worker.`, e);
     return instantiateClassicWorker();
   }
 }
diff --git a/src/cubing/search/outside.ts b/src/cubing/search/outside.ts
@@ -2,7 +2,11 @@ import { Alg } from "../alg";
 // import { preInitialize222 } from "../implementations/2x2x2";
 import { randomClockScrambleString } from "./inside/solve/puzzles/clock"; // TODO: don't reach into `inside` code.
 import { randomMegaminxScrambleString } from "./inside/solve/puzzles/wca-minx"; // TODO: don't reach into `inside` code.
-import { instantiateWorker, setForceStringWorker } from "./instantiator";
+import {
+  instantiateWorker,
+  setDisableStringWorker,
+  setForceStringWorker,
+} from "./instantiator";
 import type { PrefetchLevel, WorkerInsideAPI } from "./inside/api";
 import type { KState } from "../kpuzzle/KState";
 
@@ -106,6 +110,7 @@ export function setDebug(options: {
   logPerf?: boolean;
   scramblePrefetchLevel?: `${PrefetchLevel}`;
   forceStringWorker?: boolean;
+  disableStringWorker?: boolean;
 }): void {
   const { logPerf, scramblePrefetchLevel } = options;
   if (typeof logPerf !== "undefined") {
@@ -119,4 +124,7 @@ export function setDebug(options: {
   if ("forceStringWorker" in options) {
     setForceStringWorker(!!options.forceStringWorker);
   }
+  if ("disableStringWorker" in options) {
+    setDisableStringWorker(!!options.disableStringWorker);
+  }
 }