Cancel Operations with a {cancel} callback

smashwilson · smashwilson · commit 5389eabeb97e · 2017-05-04T11:01:56.000-04:00
diff --git a/lib/worker-manager.js b/lib/worker-manager.js
@@ -41,7 +41,10 @@ export default class WorkerManager {
       return this.activeWorker.executeOperation(operation);
     });
     operation.setPromise(requestPromise);
-    return requestPromise;
+    return {
+      cancel: () => this.activeWorker.cancelOperation(operation),
+      promise: requestPromise,
+    };
   }
 
   createNewWorker({operationCountLimit} = {operationCountLimit: 10}) {
@@ -154,6 +157,10 @@ export class Worker {
     return this.rendererProcess.executeOperation(operation);
   }
 
+  cancelOperation(operation) {
+    return this.rendererProcess.cancelOperation(operation);
+  }
+
   @autobind
   handleDataReceived({id, results}) {
     const operation = this.operationsById.get(id);
@@ -324,6 +331,16 @@ export class RendererProcess {
     });
   }
 
+  cancelOperation(operation) {
+    return operation.cancel(payload => {
+      if (this.destroyed) { return null; }
+      return this.webContents.send(Worker.channelName, {
+        type: 'git-cancel',
+        data: payload,
+      });
+    });
+  }
+
   getPid() {
     return this.pid;
   }
@@ -406,4 +423,8 @@ export class Operation {
     this.startTime = performance.now();
     return execFn({...this.data, id: this.id});
   }
+
+  cancel(execFn) {
+    return execFn({id: this.id});
+  }
 }
