Ensure browser supports workers-in-workers (GoogleChromeLabs#1325)

Fixes GoogleChromeLabs#1324
senliontec · Jan 9, 2023 · 5831176 · 5831176
1 parent 13a185d
commit 5831176
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 16 deletions.
diff --git a/client-tsconfig.json b/client-tsconfig.json
@@ -14,6 +14,7 @@
     // for comlink
     "src/features/**/worker/**/*",
     "src/features-worker/**/*",
-    "src/features/worker-utils/**/*"
+    "src/features/worker-utils/**/*",
+    "src/worker-shared/**/*"
   ]
 }
diff --git a/generic-tsconfig.json b/generic-tsconfig.json
@@ -17,7 +17,8 @@
       "static-build/*": ["src/static-build/*"],
       "client/*": ["src/client/*"],
       "shared/*": ["src/shared/*"],
-      "features/*": ["src/features/*"]
+      "features/*": ["src/features/*"],
+      "worker-shared/*": ["src/worker-shared/*"]
     }
   }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -46,14 +46,12 @@
     "rollup-plugin-terser": "^7.0.2",
     "serve": "^11.3.2",
     "typescript": "^4.4.4",
-    "which": "^2.0.2"
+    "which": "^2.0.2",
+    "wasm-feature-detect": "^1.2.11"
   },
   "lint-staged": {
     "*.{js,css,json,md,ts,tsx}": "prettier --write",
     "*.{c,h,cpp,hpp}": "clang-format -i",
     "*.rs": "rustfmt"
-  },
-  "dependencies": {
-    "wasm-feature-detect": "^1.2.11"
   }
 }
diff --git a/rollup.config.js b/rollup.config.js
@@ -86,6 +86,7 @@ export default async function ({ watch }) {
       'src/features-worker',
       'src/features-worker-worker-bridge',
       'src/sw',
+      'src/worker-shared',
       'codecs',
     ]),
     urlPlugin(),

diff --git a/src/features/encoders/avif/worker/avifEncode.ts b/src/features/encoders/avif/worker/avifEncode.ts
@@ -13,12 +13,12 @@
 import type { AVIFModule } from 'codecs/avif/enc/avif_enc';
 import type { EncodeOptions } from '../shared/meta';
 import { initEmscriptenModule } from 'features/worker-utils';
-import { threads } from 'wasm-feature-detect';
+import checkThreadsSupport from 'worker-shared/supports-wasm-threads';
 
 let emscriptenModule: Promise<AVIFModule>;
 
 async function init() {
-  if (await threads()) {
+  if (await checkThreadsSupport()) {
     const avifEncoder = await import('codecs/avif/enc/avif_enc_mt');
     return initEmscriptenModule<AVIFModule>(avifEncoder.default);
   }

diff --git a/src/features/encoders/jxl/worker/jxlEncode.ts b/src/features/encoders/jxl/worker/jxlEncode.ts
@@ -14,12 +14,13 @@ import type { JXLModule } from 'codecs/jxl/enc/jxl_enc';
 import type { EncodeOptions } from '../shared/meta';
 
 import { initEmscriptenModule } from 'features/worker-utils';
-import { threads, simd } from 'wasm-feature-detect';
+import { simd } from 'wasm-feature-detect';
+import checkThreadsSupport from 'worker-shared/supports-wasm-threads';
 
 let emscriptenModule: Promise<JXLModule>;
 
 async function init() {
-  if (await threads()) {
+  if (await checkThreadsSupport()) {
     if (await simd()) {
       const jxlEncoder = await import('codecs/jxl/enc/jxl_enc_mt_simd');
       return initEmscriptenModule(jxlEncoder.default);

diff --git a/src/features/encoders/oxiPNG/worker/oxipngEncode.ts b/src/features/encoders/oxiPNG/worker/oxipngEncode.ts
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 import { EncodeOptions } from '../shared/meta';
-import { threads } from 'wasm-feature-detect';
+import checkThreadsSupport from 'worker-shared/supports-wasm-threads';
 
 async function initMT() {
   const {
@@ -39,7 +39,7 @@ export default async function encode(
   options: EncodeOptions,
 ): Promise<ArrayBuffer> {
   if (!wasmReady) {
-    wasmReady = threads().then((hasThreads: boolean) =>
+    wasmReady = checkThreadsSupport().then((hasThreads: boolean) =>
       hasThreads ? initMT() : initST(),
     );
   }

diff --git a/src/features/encoders/wp2/worker/wp2Encode.ts b/src/features/encoders/wp2/worker/wp2Encode.ts
@@ -14,12 +14,13 @@ import type { WP2Module } from 'codecs/wp2/enc/wp2_enc';
 import type { EncodeOptions } from '../shared/meta';
 
 import { initEmscriptenModule } from 'features/worker-utils';
-import { threads, simd } from 'wasm-feature-detect';
+import { simd } from 'wasm-feature-detect';
+import checkThreadsSupport from 'worker-shared/supports-wasm-threads';
 
 let emscriptenModule: Promise<WP2Module>;
 
 async function init() {
-  if (await threads()) {
+  if (await checkThreadsSupport()) {
     if (await simd()) {
       const wp2Encoder = await import('codecs/wp2/enc/wp2_enc_mt_simd');
       return initEmscriptenModule(wp2Encoder.default);

diff --git a/src/sw/to-cache.ts b/src/sw/to-cache.ts
@@ -1,6 +1,7 @@
-import { threads, simd } from 'wasm-feature-detect';
+import { simd } from 'wasm-feature-detect';
 import webpDataUrl from 'data-url:./tiny.webp';
 import avifDataUrl from 'data-url:./tiny.avif';
+import checkThreadsSupport from 'worker-shared/supports-wasm-threads';
 
 // Give TypeScript the correct global.
 declare var self: ServiceWorkerGlobalScope;
@@ -84,7 +85,7 @@ export const initial = ['/', ...initialJs];
 export const theRest = (async () => {
   const [supportsThreads, supportsSimd, supportsWebP, supportsAvif] =
     await Promise.all([
-      threads(),
+      checkThreadsSupport(),
       simd(),
       ...[webpDataUrl, avifDataUrl].map(async (dataUrl) => {
         if (!self.createImageBitmap) return false;

diff --git a/src/worker-shared/supports-wasm-threads.ts b/src/worker-shared/supports-wasm-threads.ts
@@ -0,0 +1,17 @@
+import { threads } from 'wasm-feature-detect';
+
+export default async function checkThreadsSupport() {
+  const supportsWasmThreads = await threads();
+  if (!supportsWasmThreads) return false;
+
+  // Safari 16 shipped with WASM threads support, but it didn't ship with nested workers support.
+  // This meant Squoosh failed in Safari 16, since we call our wasm from inside a worker to begin with.
+
+  // Right now, this check is only run from a worker.
+  // More implementation is needed to run it from a page.
+  if (!('importScripts' in self)) {
+    throw Error('Not implemented');
+  }
+
+  return 'Worker' in self;
+}
diff --git a/worker-tsconfig.json b/worker-tsconfig.json
@@ -8,6 +8,7 @@
     "src/features/**/shared/**/*",
     "src/features/worker-utils/**/*",
     "src/features-worker/**/*",
+    "src/worker-shared/**/*",
     "src/sw/**/*"
   ]
 }