fix(cancel): fix cancel handling

suguru03 · Oct 22, 2017 · 104a927 · 104a927
1 parent 3043af2
commit 104a927
Show file tree

Hide file tree

Showing 4 changed files with 371 additions and 450 deletions.
diff --git a/lib/aigle.js b/lib/aigle.js
@@ -157,7 +157,7 @@ class Aigle extends AigleCore {
    * });
    */
   cancel() {
-    if (this._execute === execute) {
+    if (this._execute === execute || this._resolved !== 0) {
       return;
     }
     const { _onCancelQueue } = this;
@@ -169,7 +169,11 @@ class Aigle extends AigleCore {
         array[i]();
       }
     }
-    this._reject(new CancellationError('late cancellation observer'));
+    this._resolved = 2;
+    this._value = new CancellationError('late cancellation observer');
+    if (this._parent) {
+      this._parent.cancel();
+    }
   }
 
   suppressUnhandledRejections() {
@@ -3639,6 +3643,9 @@ function executeWithCancel(executor) {
       if (executor === undefined) {
         return;
       }
+      if (value instanceof Aigle && value._resolved === 0) {
+        this._parent = value;
+      }
       executor = undefined;
       callReceiver(this, value);
     }, reason => {
@@ -3651,7 +3658,7 @@ function executeWithCancel(executor) {
       if (typeof handler !== 'function') {
         throw new TypeError('onCancel must be function');
       }
-      if (executor === undefined) {
+      if (this._resolved !== 0) {
         return;
       }
       if (this._onCancelQueue === undefined) {