@microblink/blinkid-core 7.2.1 → 7.3.0

package/dist/blinkid-core.js

@@ -323,6 +323,48 @@ function requestResponseMessage(ep, pendingListeners, msg, transfers) {
 function generateUUID() {
   return new Array(4).fill(0).map(() => Math.floor(Math.random() * Number.MAX_SAFE_INTEGER).toString(16)).join("-");
 }
+const type = "application/javascript";
+const getCrossOriginWorkerURL = (originalWorkerUrl, _options = {}) => {
+  const options = {
+    skipSameOrigin: true,
+    useBlob: true,
+    ..._options
+  };
+  if (options.skipSameOrigin && new URL(originalWorkerUrl).origin === self.location.origin) {
+    return Promise.resolve(originalWorkerUrl);
+  }
+  let signal;
+  try {
+    const controller = new AbortController();
+    signal = controller.signal;
+    const timeout = setTimeout(() => {
+      controller.abort();
+    }, 3e3);
+    const cleanup = () => {
+      clearTimeout(timeout);
+      controller.abort();
+    };
+    signal.addEventListener("abort", cleanup);
+  } catch (error) {
+  }
+  return new Promise(
+    (resolve, reject) => void fetch(originalWorkerUrl, {
+      // abort if the worker is not fetched in a reasonable time
+      signal
+    }).then((res) => res.text()).then((codeString) => {
+      let finalURL = "";
+      if (options.useBlob) {
+        const blob = new Blob([codeString], { type });
+        finalURL = URL.createObjectURL(blob);
+      } else {
+        finalURL = `data:${type},` + encodeURIComponent(codeString);
+      }
+      resolve(finalURL);
+    }).catch(() => {
+      reject(new Error(`Failed to fetch worker from ${originalWorkerUrl}`));
+    })
+  );
+};
 var _createClass = /* @__PURE__ */ function() {
   function defineProperties(target, props) {
     for (var i = 0; i < props.length; i++) {
@@ -596,60 +638,17 @@ new TemplateTag(inlineArrayTransformer({ separator: ",", conjunction: "and" }),
 new TemplateTag(inlineArrayTransformer, stripIndentTransformer, trimResultTransformer);
 new TemplateTag(inlineArrayTransformer, replaceResultTransformer(/(?:\s+)/g, " "), trimResultTransformer);
 new TemplateTag(stripIndentTransformer, trimResultTransformer);
-var stripIndents = new TemplateTag(stripIndentTransformer("all"), trimResultTransformer);
-const type = "application/javascript";
-const getCrossOriginWorkerURL = (originalWorkerUrl, _options = {}) => {
-  const options = {
-    skipSameOrigin: true,
-    useBlob: true,
-    ..._options
-  };
-  if (options.skipSameOrigin && new URL(originalWorkerUrl).origin === self.location.origin) {
-    return Promise.resolve(originalWorkerUrl);
-  }
-  let signal;
-  try {
-    const controller = new AbortController();
-    signal = controller.signal;
-    const timeout = setTimeout(() => {
-      controller.abort();
-    }, 3e3);
-    const cleanup = () => {
-      clearTimeout(timeout);
-      controller.abort();
-    };
-    signal.addEventListener("abort", cleanup);
-  } catch (error) {
-  }
-  return new Promise(
-    (resolve, reject) => void fetch(originalWorkerUrl, {
-      // abort if the worker is not fetched in a reasonable time
-      signal
-    }).then((res) => res.text()).then((codeString) => {
-      const workerPath = new URL(originalWorkerUrl).href.split("/");
-      workerPath.pop();
-      const importScriptsFix = stripIndents`
-            const _importScripts = importScripts;
-            const _fixImports = (url) => new URL(url, '${workerPath.join("/") + "/"}').href;
-            importScripts = (...urls) => _importScripts(...urls.map(_fixImports));
-          `;
-      let finalURL = "";
-      if (options.useBlob) {
-        const blob = new Blob([importScriptsFix + codeString], { type });
-        finalURL = URL.createObjectURL(blob);
-      } else {
-        finalURL = `data:${type},` + encodeURIComponent(importScriptsFix + codeString);
-      }
-      resolve(finalURL);
-    }).catch(() => {
-      reject(new Error(`Failed to fetch worker from ${originalWorkerUrl}`));
-    })
-  );
+new TemplateTag(stripIndentTransformer("all"), trimResultTransformer);
+const isDataUrl = (url) => {
+  return url.startsWith("data:");
 };
-const createProxyWorker = async (resourcesLocation = window.location.href) => {
-  const workerUrl = await getCrossOriginWorkerURL(
-    new URL("resources/blinkid-worker.js", resourcesLocation).toString()
-  );
+const isBlobUrl = (url) => {
+  return url.startsWith("blob:");
+};
+const needsHttpValidation = (url) => {
+  return !isDataUrl(url) && !isBlobUrl(url);
+};
+const validateHttpWorkerFile = async (workerUrl) => {
   const response = await fetch(workerUrl, { method: "HEAD" });
   const contentType = response.headers.get("content-type");
   const isJavascript = contentType?.includes("javascript");
@@ -669,6 +668,14 @@ const createProxyWorker = async (resourcesLocation = window.location.href) => {
       `Worker file not found or inaccessible: ${response.status} ${response.statusText}`
     );
   }
+};
+const createProxyWorker = async (resourcesLocation = window.location.href) => {
+  const workerUrl = await getCrossOriginWorkerURL(
+    new URL("resources/blinkid-worker.js", resourcesLocation).toString()
+  );
+  if (needsHttpValidation(workerUrl)) {
+    await validateHttpWorkerFile(workerUrl);
+  }
   const worker = new Worker(workerUrl, {
     type: "module"
   });