fix the unhandled promise rejection bug

Author: sirtimid

packages/ocap-kernel/src/remotes/RemoteHandle.ts

@@ -447,14 +447,16 @@ export class RemoteHandle implements EndpointHandle {
 
     // Set up timeout handling with AbortSignal
     const timeoutSignal = AbortSignal.timeout(30_000);
+    let abortHandler: (() => void) | undefined;
     const timeoutPromise = new Promise<never>((_resolve, _reject) => {
-      timeoutSignal.addEventListener('abort', () => {
+      abortHandler = () => {
         // Clean up from pending redemptions map
         if (this.#pendingRedemptions.has(replyKey)) {
           this.#pendingRedemptions.delete(replyKey);
         }
         _reject(new Error('URL redemption timed out after 30 seconds'));
-      });
+      };
+      timeoutSignal.addEventListener('abort', abortHandler);
     });
 
     try {
@@ -470,6 +472,12 @@ export class RemoteHandle implements EndpointHandle {
         this.#pendingRedemptions.delete(replyKey);
       }
       throw error;
+    } finally {
+      // Clean up event listener to prevent unhandled rejection if operation
+      // completes before timeout
+      if (abortHandler) {
+        timeoutSignal.removeEventListener('abort', abortHandler);
+      }
     }
   }
 

packages/ocap-kernel/src/remotes/network.ts

@@ -131,14 +131,26 @@ export async function initNetwork(
     timeoutMs = 10_000,
   ): Promise<void> {
     const timeoutSignal = AbortSignal.timeout(timeoutMs);
-    return Promise.race([
-      channel.msgStream.write(message),
-      new Promise<never>((_resolve, reject) => {
-        timeoutSignal.addEventListener('abort', () => {
-          reject(new Error(`Message send timed out after ${timeoutMs}ms`));
-        });
-      }),
-    ]);
+    let abortHandler: (() => void) | undefined;
+    const timeoutPromise = new Promise<never>((_resolve, reject) => {
+      abortHandler = () => {
+        reject(new Error(`Message send timed out after ${timeoutMs}ms`));
+      };
+      timeoutSignal.addEventListener('abort', abortHandler);
+    });
+
+    try {
+      return await Promise.race([
+        channel.msgStream.write(message),
+        timeoutPromise,
+      ]);
+    } finally {
+      // Clean up event listener to prevent unhandled rejection if operation
+      // completes before timeout
+      if (abortHandler) {
+        timeoutSignal.removeEventListener('abort', abortHandler);
+      }
+    }
   }
 
   /**

vitest.config.ts

@@ -130,7 +130,7 @@ export default defineConfig({
         'packages/kernel-ui/**': {
           statements: 97.57,
           functions: 97.29,
-          branches: 93.25,
+          branches: 93.26,
           lines: 97.57,
         },
         'packages/kernel-utils/**': {
@@ -158,10 +158,10 @@ export default defineConfig({
           lines: 22.22,
         },
         'packages/ocap-kernel/**': {
-          statements: 96.61,
-          functions: 98.53,
-          branches: 97.74,
-          lines: 96.61,
+          statements: 96.62,
+          functions: 98.54,
+          branches: 97.66,
+          lines: 96.62,
         },
         'packages/omnium-gatherum/**': {
           statements: 5.67,