Debug and fix stuck test in PR

packages/typescript-client/test/stream.test.ts

@@ -1,6 +1,7 @@
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import { ShapeStream, isChangeMessage, Message, Row } from '../src'
 import { snakeCamelMapper } from '../src/column-mapper'
+import { resolveInMacrotask } from './support/test-helpers'
 
 describe(`ShapeStream`, () => {
   const shapeUrl = `https://example.com/v1/shape`
@@ -344,16 +345,22 @@ describe(`ShapeStream`, () => {
         value: { user_id: `123`, created_at: `2025-01-01` },
         headers: { operation: `insert` },
       },
+      {
+        headers: { control: `up-to-date` },
+      },
     ]
 
     const fetchWrapper = (): Promise<Response> => {
-      return Promise.resolve(
+      // Use resolveInMacrotask to prevent infinite microtask loops
+      return resolveInMacrotask(
         new Response(JSON.stringify(mockResponseData), {
           status: 200,
           headers: {
             'content-type': `application/json`,
             'electric-handle': `test-handle`,
             'electric-offset': `0_0`,
+            'electric-cursor': `1`,
+            'electric-up-to-date': `true`,
             'electric-schema': JSON.stringify({
               user_id: { type: `text` },
               created_at: { type: `text` },
@@ -363,7 +370,6 @@ describe(`ShapeStream`, () => {
       )
     }
 
-    const aborter = new AbortController()
     const stream = new ShapeStream({
       url: shapeUrl,
       params: {

packages/typescript-client/test/support/test-helpers.ts

@@ -20,6 +20,15 @@ export function makePgClient(overrides: ClientConfig = {}) {
   })
 }
 
+/**
+ * Like Promise.resolve() but resolves in a macrotask instead of a microtask.
+ * Use this in test mocks to prevent infinite microtask loops when mocking
+ * fetch responses that would normally have network latency.
+ */
+export function resolveInMacrotask<T>(value: T): Promise<T> {
+  return new Promise((resolve) => setTimeout(() => resolve(value), 0))
+}
+
 export function forEachMessage<T extends Row<unknown>>(
   stream: ShapeStreamInterface<T>,
   controller: AbortController,

packages/typescript-client/vitest.config.ts

@@ -6,6 +6,7 @@ export default defineConfig({
     setupFiles: [`vitest-localstorage-mock`],
     typecheck: { enabled: true },
     fileParallelism: false,
+    testTimeout: 30000, // 30s default timeout to catch hanging tests
     coverage: {
       provider: `istanbul`,
       reporter: [`text`, `json`, `html`, `lcov`],