Merge branch 'master' into master

src/createFFmpeg.js

@@ -1,6 +1,4 @@
 const { defaultArgs, baseOptions } = require('./config');
-const { setLogging, setCustomLogger, log } = require('./utils/log');
-const parseProgress = require('./utils/parseProgress');
 const parseArgs = require('./utils/parseArgs');
 const { defaultOptions, getCreateFFmpegCore } = require('./node');
 const { version } = require('../package.json');
@@ -23,14 +21,49 @@ module.exports = (_options = {}) => {
   let runResolve = null;
   let runReject = null;
   let running = false;
+  let customLogger = () => {};
   let progress = optProgress;
+  let duration = 0;
+  let ratio = 0;
+
   const detectCompletion = (message) => {
     if (message === 'FFMPEG_END' && runResolve !== null) {
       runResolve();
       runResolve = null;
+      runReject = null;
       running = false;
     }
   };
+  const log = (type, message) => {
+    customLogger({ type, message });
+    if (logging) {
+      console.log(`[${type}] ${message}`);
+    }
+  };
+  const ts2sec = (ts) => {
+    const [h, m, s] = ts.split(':');
+    return (parseFloat(h) * 60 * 60) + (parseFloat(m) * 60) + parseFloat(s);
+  };
+  const parseProgress = (message, progress) => {
+    if (typeof message === 'string') {
+      if (message.startsWith('  Duration')) {
+        const ts = message.split(', ')[0].split(': ')[1];
+        const d = ts2sec(ts);
+        progress({ duration: d, ratio });
+        if (duration === 0 || duration > d) {
+          duration = d;
+        }
+      } else if (message.startsWith('frame') || message.startsWith('size')) {
+        const ts = message.split('time=')[1].split(' ')[0];
+        const t = ts2sec(ts);
+        ratio = t / duration;
+        progress({ ratio, time: t });
+      } else if (message.startsWith('video:')) {
+        progress({ ratio: 1 });
+        duration = 0;
+      }
+    }
+  };
   const parseMessage = ({ type, message }) => {
     log(type, message);
     parseProgress(message, progress);
@@ -89,7 +122,7 @@ module.exports = (_options = {}) => {
           return prefix + path;
         },
       });
-      ffmpeg = Core.cwrap('proxy_main', 'number', ['number', 'number']);
+      ffmpeg = Core.cwrap(options.mainName || 'proxy_main', 'number', ['number', 'number']);
       log('info', 'ffmpeg-core loaded');
     } else {
       throw Error('ffmpeg.wasm was loaded, you should not load it again, use ffmpeg.isLoaded() to check next time.');
@@ -179,10 +212,15 @@ module.exports = (_options = {}) => {
     if (Core === null) {
       throw NO_LOAD;
     } else {
+      // if there's any pending runs, reject them
+      if(runReject) {
+        runReject('ffmpeg has exited')
+      }
       running = false;
       try {
         Core.exit(1);
       } catch (err) {
+        log(err.message);
         if (runReject) {
           runReject(err);
         }
@@ -200,11 +238,12 @@ module.exports = (_options = {}) => {
   };
 
   const setLogger = (_logger) => {
-    setCustomLogger(_logger);
+    customLogger = _logger;
   };
 
-  setLogging(logging);
-  setCustomLogger(logger);
+  const setLogging = (_logging) => {
+    logging = _logging;
+  };
 
   log('info', `use ffmpeg.wasm v${version}`);
 

src/index.d.ts

@@ -1,6 +1,7 @@
 export const FS: {
-    writeFile: (fileName: string, binaryData: Uint8Array) => void,
+    writeFile: (fileName: string, binaryData: Uint8Array | string) => void,
     readFile: (fileName: string) => Uint8Array,
+    readdir: (pathName: string) => string[],
     unlink: (fileName: string) => void,
 }