From 4cf2fe2395037cb1d865ad73f5454ade617c78fa Mon Sep 17 00:00:00 2001
From: Jerome Wu <jeromewus@gmail.com>
Date: Wed, 29 Apr 2020 09:27:21 +0800
Subject: [PATCH] Fix worker script origin issue

---
 README.md                |  2 +-
 src/browser/getModule.js | 39 ++++++++++++++++++++++-----------------
 tests/constants.js       |  2 +-
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 6131937..8012fb8 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ $ node --experimental-wasm-threads --experimental-wasm-bulk-memory transcode.js
 Or, using a script tag in the browser (only works in Chrome):
 
 ```html
-<script src="https://unpkg.com/@ffmpeg/ffmpeg@0.8.0/dist/ffmpeg.min.js"></script>
+<script src="https://unpkg.com/@ffmpeg/ffmpeg@0.8.1/dist/ffmpeg.min.js"></script>
 <script>
   const { createFFmpeg } = FFmpeg;
   ...
diff --git a/src/browser/getModule.js b/src/browser/getModule.js
index 7a87c6c..896e3a9 100644
--- a/src/browser/getModule.js
+++ b/src/browser/getModule.js
@@ -1,23 +1,28 @@
 const { log } = require('../utils/log');
 
-module.exports = ({ corePath }) => new Promise((resolve) => {
+module.exports = async ({ corePath }) => {
   if (typeof window.Module === 'undefined') {
+    log('info', 'fetch ffmpeg-core.worker.js script');
+    const workerBlob = await (await fetch(corePath.replace('ffmpeg-core.js', 'ffmpeg-core.worker.js'))).blob();
+    window.FFMPEG_CORE_WORKER_SCRIPT = URL.createObjectURL(workerBlob);
+    log('info', `worker object URL=${window.FFMPEG_CORE_WORKER_SCRIPT}`);
     log('info', `download ffmpeg-core script (~25 MB) from ${corePath}`);
-    const script = document.createElement('script');
-    const eventHandler = () => {
-      script.removeEventListener('load', eventHandler);
-      log('info', 'initialize ffmpeg-core');
-      window.Module.onRuntimeInitialized = () => {
-        log('info', 'ffmpeg-core initialized');
-        resolve(window.Module);
+    return new Promise((resolve) => {
+      const script = document.createElement('script');
+      const eventHandler = () => {
+        script.removeEventListener('load', eventHandler);
+        log('info', 'initialize ffmpeg-core');
+        window.Module.onRuntimeInitialized = () => {
+          log('info', 'ffmpeg-core initialized');
+          resolve(window.Module);
+        };
       };
-    };
-    script.src = corePath;
-    script.type = 'text/javascript';
-    script.addEventListener('load', eventHandler);
-    document.getElementsByTagName('head')[0].appendChild(script);
-  } else {
-    log('info', 'ffmpeg-core is loaded already');
-    resolve(window.Module);
+      script.src = corePath;
+      script.type = 'text/javascript';
+      script.addEventListener('load', eventHandler);
+      document.getElementsByTagName('head')[0].appendChild(script);
+    });
   }
-});
+  log('info', 'ffmpeg-core is loaded already');
+  return Promise.resolve(window.Module);
+};
diff --git a/tests/constants.js b/tests/constants.js
index 0e7a163..5e8898c 100644
--- a/tests/constants.js
+++ b/tests/constants.js
@@ -2,7 +2,7 @@ const TIMEOUT = 60000;
 const BASE_URL = 'http://localhost:3000/tests/assets';
 const IS_BROWSER = typeof window !== 'undefined' && typeof window.document !== 'undefined';
 const OPTIONS = {
-  corePath: '../node_modules/@ffmpeg/core/ffmpeg-core.js',
+  corePath: 'http://localhost:3000/node_modules/@ffmpeg/core/ffmpeg-core.js',
 };
 
 if (typeof module !== 'undefined') {