Fix the JS code to check the worker environment to cover SharedWorker as well (#22)

* Fix the JS code to check the worker environment to cover SharedWorker as well

* Add worker dev script

Author: whitphx

pyodide-e2e/src/main.ts

@@ -23,3 +23,4 @@ print("out", out)
 `);
 }
 main();
+const worker = new Worker(new URL('./worker.ts', import.meta.url), { type: "module" })

pyodide-e2e/src/worker.ts

@@ -0,0 +1,30 @@
+/// <reference lib="webworker" />
+
+console.log("WebWorker started");
+
+import type Pyodide from "pyodide"
+
+import wheelUrl from "transformers-js-py.whl";  // This is the alias from vite.config.ts
+
+import { loadPyodide } from "https://cdn.jsdelivr.net/pyodide/v0.23.4/full/pyodide.mjs";
+
+async function main() {
+  const pyodide: Pyodide.PyodideInterface = await loadPyodide();
+
+  await pyodide.loadPackage("micropip");
+  const micropip = pyodide.pyimport("micropip");
+  await micropip.install(wheelUrl);
+
+  await pyodide.runPythonAsync(`
+from transformers_js import import_transformers_js
+transformers = await import_transformers_js()
+
+pipeline = transformers.pipeline
+
+pipe = await pipeline('sentiment-analysis')
+out = await pipe('I love transformers!')
+print("out", out)
+`);
+}
+
+main();

transformers_js/__init__.py

@@ -75,7 +75,7 @@ async def import_transformers_js(version: str = "latest"):
         """
     async function loadTransformersJs(version) {
         const isBrowserMainThread = typeof window !== 'undefined';
-        const isWorker = typeof self !== 'undefined' && typeof self.postMessage === 'function' && typeof self.importScripts === 'function';
+        const isWorker = typeof WorkerGlobalScope !== 'undefined' && self instanceof WorkerGlobalScope;
         const isBrowser = isBrowserMainThread || isWorker;
         const transformers = await import(isBrowser ? 'https://cdn.jsdelivr.net/npm/@xenova/transformers@' + version : '@xenova/transformers');