fix: backgroundTasksFinished ensure all tasks finished (#115)

eggjs · Jan 17, 2020 · 51ef091 · 51ef091
1 parent 98fd7e4
commit 51ef091
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 1 deletion.
diff --git a/app/extend/application.js b/app/extend/application.js
@@ -390,6 +390,10 @@ module.exports = {
     this._backgroundTasks = [];
     return Promise.all(tasks).then(() => {
       debug('finished %d background tasks', tasks.length);
+      if (this._backgroundTasks.length) {
+        debug('new background tasks created: %s', this._backgroundTasks.length);
+        return this.backgroundTasksFinished();
+      }
     });
   },
 

diff --git a/test/bootstrap.test.js b/test/bootstrap.test.js
@@ -64,11 +64,34 @@ describe('test/bootstrap.test.js', () => {
         .expect({ counter: 0 });
     });
 
-    it('should all reset', function* () {
+    it('should wait for background task 4 finished', function* () {
       yield app.httpRequest()
         .get('/counter')
         .expect(200)
         .expect({ counter: 10 });
+      yield app.httpRequest()
+        .get('/counter/plusplus')
+        .expect(200)
+        .expect({ counter: 10 });
+    });
+
+    it('should wait for background task 5 finished', function* () {
+      yield app.httpRequest()
+        .get('/counter')
+        .expect(200)
+        .expect({ counter: 12 });
+      app.mockContext({ superMan: true });
+      yield app.httpRequest()
+        .get('/counter/plusplus')
+        .expect(200)
+        .expect({ counter: 12 });
+    });
+
+    it('should all reset', function* () {
+      yield app.httpRequest()
+        .get('/counter')
+        .expect(200)
+        .expect({ counter: 32 });
     });
 
     it('should always return promise instance', () => {

diff --git a/test/fixtures/app/app/router.js b/test/fixtures/app/app/router.js
@@ -45,4 +45,26 @@ module.exports = app => {
     });
     this.body = { counter };
   });
+
+  app.get('/counter/plusplus', function* () {
+    this.runInBackground(function* (ctx) {
+      // mock io delay
+      yield sleep(10);
+      if (ctx.superMan) {
+        counter += 10;
+      } else {
+        counter++;
+      }
+      ctx.runInBackground(function* (ctx) {
+        // mock io delay
+        yield sleep(10);
+        if (ctx.superMan) {
+          counter += 10;
+        } else {
+          counter++;
+        }
+      });
+    });
+    this.body = { counter };
+  });
 };