safely call timeout.unref() in Node.js environments only (#179)

sourcegraph · Jul 31, 2024 · f82692a · f82692a
1 parent 47ada61
commit f82692a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/client/vscode-lib/src/util/cache.ts b/client/vscode-lib/src/util/cache.ts
@@ -16,7 +16,7 @@ export class Cache<T> {
 
         this.cache.set(key, { value })
         const timeout = setTimeout(() => this.cache.delete(key), this.ttlMs)
-        timeout.unref()
+        if (typeof timeout !== 'number' && 'unref' in timeout) timeout.unref()
 
         return value
     }
@@ -33,7 +33,7 @@ export async function bestEffort<T>(
     let id: ReturnType<typeof setTimeout> | undefined
     const timeout = new Promise<T>((resolve, _) => {
         id = setTimeout(resolve, opts.delay, opts.defaultValue)
-        id.unref()
+        if (typeof id !== 'number' && 'unref' in id) id.unref()
     })
     try {
         return await Promise.race([promise, timeout])

diff --git a/client/vscode-lib/src/util/errorWaiter.ts b/client/vscode-lib/src/util/errorWaiter.ts
@@ -50,11 +50,10 @@ export function createErrorWaiter(delay: number, errorCountThreshold: number): E
             if (!timeoutHandle) {
                 return
             }
-            if ('unref' in timeoutHandle) {
+            if (typeof timeoutHandle !== 'number' && 'unref' in timeoutHandle) {
                 timeoutHandle.unref()
-            } else if (typeof timeoutHandle === 'number') {
-                clearTimeout(timeoutHandle)
             }
+            clearTimeout(timeoutHandle)
         },
     }
 }
diff --git a/provider/devdocs/cache.ts b/provider/devdocs/cache.ts
@@ -16,7 +16,7 @@ export class Cache<T> {
 
         this.cache.set(key, { value })
         const timeout = setTimeout(() => this.cache.delete(key), this.timeoutMS)
-        timeout.unref()
+        if (typeof timeout !== 'number' && 'unref' in timeout) timeout.unref()
 
         return value
     }