Major refactor to adapt new ffmpeg-core.js

Author: jeromewu

package-lock.json

@@ -14,13 +14,13 @@
     "wait": "rimraf dist && wait-on http://localhost:3000/dist/ffmpeg.dev.js",
     "test": "npm-run-all -p -r start test:all",
     "test:all": "npm-run-all wait test:browser:ffmpeg test:node:all",
-    "test:node": "NODE_OPTIONS=--experimental-worker nyc mocha --exit --bail --require ./scripts/test-helper.js",
+    "test:node": "node --experimental-wasm-threads --experimental-wasm-bulk-memory node_modules/.bin/_mocha --exit --bail --require ./scripts/test-helper.js",
     "test:node:all": "npm run test:node -- ./tests/*.test.js",
-    "test:browser": "mocha-headless-chrome -a incognito -a no-sandbox -a disable-setuid-sandbox -a disable-logging -t 300000",
+    "test:browser": "mocha-headless-chrome -a allow-file-access-from-files -a incognito -a no-sandbox -a disable-setuid-sandbox -a disable-logging -t 300000",
     "test:browser:ffmpeg": "npm run test:browser -- -f ./tests/ffmpeg.test.html"
   },
   "browser": {
-    "./src/worker/node/index.js": "./src/worker/browser/index.js"
+    "./src/node/index.js": "./src/browser/index.js"
   },
   "repository": {
     "type": "git",
@@ -37,11 +37,11 @@
     "url": "https://github.com/ffmpegjs/ffmpeg.js/issues"
   },
   "engines": {
-    "node": ">=10.5.0"
+    "node": ">=12.16.1"
   },
   "homepage": "https://github.com/ffmpegjs/ffmpeg.js#readme",
   "dependencies": {
-    "@ffmpeg/core": "^0.6.0",
+    "@ffmpeg/core": "^0.7.0",
     "idb": "^4.0.5",
     "is-electron": "^2.2.0",
     "is-url": "^1.2.4",

package.json

@@ -32,8 +32,4 @@ module.exports = [
     library: 'FFmpeg',
     libraryTarget: 'umd',
   }),
-  genConfig({
-    entry: path.resolve(__dirname, '..', 'src', 'worker-script', 'browser', 'index.js'),
-    filename: 'worker.dev.js',
-  }),
 ];

scripts/webpack.config.dev.js

@@ -23,8 +23,4 @@ module.exports = [
     library: 'FFmpeg',
     libraryTarget: 'umd',
   }),
-  genConfig({
-    entry: path.resolve(__dirname, '..', 'src', 'worker-script', 'browser', 'index.js'),
-    filename: 'worker.min.js',
-  }),
 ];

scripts/webpack.config.prod.js

@@ -0,0 +1,13 @@
+const resolveURL = require('resolve-url');
+const { dependencies } = require('../../package.json');
+const defaultOptions = require('../constants/defaultOptions');
+
+/*
+ * Default options for browser worker
+ */
+module.exports = {
+  ...defaultOptions,
+  corePath: (typeof process !== 'undefined' && process.env.FFMPEG_ENV === 'development')
+    ? resolveURL('/node_modules/@ffmpeg/core/ffmpeg-core.js')
+    : `https://unpkg.com/@ffmpeg/core@v${dependencies['@ffmpeg/core'].substring(1)}/ffmpeg-core.js`,
+};

src/browser/defaultOptions.js

@@ -0,0 +1,23 @@
+const { log } = require('../utils/log');
+
+module.exports = ({ corePath }) => new Promise((resolve) => {
+  if (typeof window.Module === 'undefined') {
+    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);
+      };
+    };
+    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);
+  }
+});

src/worker/browser/fetchFile.js renamed to src/browser/fetchFile.js

@@ -1,11 +1,9 @@
 const defaultOptions = require('./defaultOptions');
-const spawnWorker = require('./spawnWorker');
-const onMessage = require('./onMessage');
+const getModule = require('./getModule');
 const fetchFile = require('./fetchFile');
 
 module.exports = {
   defaultOptions,
-  spawnWorker,
-  onMessage,
+  getModule,
   fetchFile,
 };

src/browser/getModule.js

@@ -1,4 +1,5 @@
 module.exports = [
   './ffmpeg', // args[0] is always binary path
   '-nostdin', // Disable interaction mode
+  '-hide_banner', // Not to output banner
 ];

src/worker/node/index.js renamed to src/browser/index.js

@@ -1,4 +1,5 @@
 module.exports = {
+  log: false,
   logger: () => {},
   progress: () => {},
 };