fix: Clear timeout in activity Context sleep if cancelled

bergundy · bergundy · commit 3a7b3b81306c · 2021-08-08T15:04:33.000+03:00
diff --git a/packages/activity/src/index.ts b/packages/activity/src/index.ts
@@ -190,7 +190,10 @@ export class Context {
    * @returns a Promise that either resolves when deadline is reached or rejects when the Context is cancelled
    */
   public sleep(ms: number): Promise<void> {
-    const timer = new Promise<void>((resolve) => setTimeout(resolve, ms));
-    return Promise.race([this.cancelled, timer]);
+    let handle: NodeJS.Timeout;
+    const timer = new Promise<void>((resolve) => {
+      handle = setTimeout(resolve, ms);
+    });
+    return Promise.race([this.cancelled.finally(() => clearTimeout(handle)), timer]);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,10 @@ export class Context {`
`190`	`190`	`* @returns a Promise that either resolves when deadline is reached or rejects when the Context is cancelled`
`191`	`191`	`*/`
`192`	`192`	`public sleep(ms: number): Promise<void> {`
`193`		`- const timer = new Promise<void>((resolve) => setTimeout(resolve, ms));`
`194`		`- return Promise.race([this.cancelled, timer]);`
	`193`	`+ let handle: NodeJS.Timeout;`
	`194`	`+ const timer = new Promise<void>((resolve) => {`
	`195`	`+ handle = setTimeout(resolve, ms);`
	`196`	`+ });`
	`197`	`+ return Promise.race([this.cancelled.finally(() => clearTimeout(handle)), timer]);`
`195`	`198`	`}`
`196`	`199`	`}`