Merge pull request #296 from pikax/cancel_run_if_exited

fix: Cancel run promise if the exit() is called

src/createFFmpeg.js

@@ -21,12 +21,14 @@ module.exports = (_options = {}) => {
   let Core = null;
   let ffmpeg = null;
   let runResolve = null;
+  let runReject = null;
   let running = false;
   let progress = optProgress;
   const detectCompletion = (message) => {
     if (message === 'FFMPEG_END' && runResolve !== null) {
       runResolve();
       runResolve = null;
+      runReject = null;
       running = false;
     }
   };
@@ -126,9 +128,10 @@ module.exports = (_options = {}) => {
       throw Error('ffmpeg.wasm can only run one command at a time');
     } else {
       running = true;
-      return new Promise((resolve) => {
+      return new Promise((resolve, reject) => {
         const args = [...defaultArgs, ..._args].filter((s) => s.length !== 0);
         runResolve = resolve;
+        runReject = reject
         ffmpeg(...parseArgs(Core, args));
       });
     }
@@ -177,6 +180,10 @@ 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);

tests/ffmpeg.test.js

@@ -48,6 +48,16 @@ describe('run()', () => {
       }
     }, 500);
   }).timeout(TIMEOUT);
+
+  it('should terminate the run if exit is called', async () => {
+    const ffmpeg = createFFmpeg(OPTIONS);
+    await ffmpeg.load();
+
+    ffmpeg.run('-h').catch(e=> {
+      expect(e).to.be.equal('ffmpeg has exited')
+    });
+    expect(ffmpeg.exit()).to.throw();
+  }).timeout(TIMEOUT);
 });
 
 describe('FS()', () => {