@livestore/utils-dev 0.4.0-dev.2 → 0.4.0-dev.5

package/dist/node-vitest/Vitest.js.map

@@ -1 +1 @@
-{"version":3,"file":"Vitest.js","sourceRoot":"","sources":["../../src/node-vitest/Vitest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAE3C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAc,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAA+B,MAAM,yBAAyB,CAAA;AACpH,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7C,cAAc,gBAAgB,CAAA;AAE9B,MAAM,CAAC,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,SAAS,CAAC,GAAG,EAAE,KAAK,SAAS,CAAC,CAAA;AAEpG,MAAM,CAAC,MAAM,eAAe,GAC1B,CAAyB,SAAoC,EAAE,EAAE,CACjE,CAAC,WAA+B,EAAE,EAAE,CAClC,WAAW,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;AASvC,MAAM,CAAC,MAAM,WAAW,GACtB,CACE,WAA+B,EAC/B,EACE,MAAM,EACN,SAAS,EACT,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EACjC,SAAS,GAAG,KAAK,MAMf,EAAE,EACN,EAAE,CACJ,CACE,IAAmE,EACH,EAAE;IAClE,MAAM,QAAQ,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;IACxG,MAAM,KAAK,GAAG,SAAS,EAAE,CAAC,WAAW,CAAC,CAAA;IAEtC,MAAM,SAAS,GACb,eAAe,IAAI,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,aAAa,CAAA;IAElH,OAAO,IAAI,CAAC,IAAI,CACd,eAAe;QACb,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,MAAM,CAAC,wBAAwB,CAAC;YAC9B,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,GAAG;YAC1C,KAAK,EAAE,GAAG,QAAQ,kCAAkC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG;SAChF,CAAC,EACN,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EACpD,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EACzB,MAAM,CAAC,OAAO,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,EACpC,MAAM,CAAC,MAAM,EAAE,qFAAqF;IACpG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,EACzB,MAAM,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC,CACzB,CAAA;AACV,CAAC,CAAA"}
+{"version":3,"file":"Vitest.js","sourceRoot":"","sources":["../../src/node-vitest/Vitest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAE3C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAc,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAA+B,MAAM,yBAAyB,CAAA;AACpH,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7C,cAAc,gBAAgB,CAAA;AAE9B,MAAM,CAAC,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,SAAS,CAAC,GAAG,EAAE,KAAK,SAAS,CAAC,CAAA;AAEpG,MAAM,CAAC,MAAM,eAAe,GAC1B,CAAyB,SAAoC,EAAE,EAAE,CACjE,CAAC,WAA+B,EAAE,EAAE,CAClC,WAAW,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;AASvC,MAAM,CAAC,MAAM,WAAW,GACtB,CACE,WAA+B,EAC/B,EACE,MAAM,EACN,SAAS,EACT,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EACjC,SAAS,GAAG,KAAK,MAMf,EAAE,EACN,EAAE,CACJ,CACE,IAAmE,EACH,EAAE;IAClE,MAAM,QAAQ,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;IACxG,MAAM,KAAK,GAAG,SAAS,EAAE,CAAC,WAAW,CAAC,CAAA;IAEtC,MAAM,SAAS,GACb,eAAe,IAAI,SAAS;QAC1B,CAAC,CAAC,YAAY,CAAC,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;QAC3F,CAAC,CAAC,aAAa,CAAA;IAEnB,MAAM,aAAa,GAAG,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAA;IAEhF,OAAO,IAAI,CAAC,IAAI,CACd,eAAe;QACb,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,MAAM,CAAC,wBAAwB,CAAC;YAC9B,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,GAAG;YAC1C,KAAK,EAAE,GAAG,QAAQ,kCAAkC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG;SAChF,CAAC,EACN,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EACpD,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,EAC7B,MAAM,CAAC,MAAM,EAAE,qFAAqF;IACpG,MAAM,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC,CACzB,CAAA;AACV,CAAC,CAAA"}

package/package.json

@@ -1,24 +1,24 @@
 {
   "name": "@livestore/utils-dev",
-  "version": "0.4.0-dev.2",
+  "version": "0.4.0-dev.5",
   "type": "module",
   "sideEffects": [
-    "./src/node-vitest/polyfill.ts"
+    "./src/node-vitest/global.ts"
   ],
   "exports": {
     "./node": "./dist/node/mod.js",
     "./node-vitest": "./dist/node-vitest/mod.js"
   },
   "dependencies": {
-    "@effect/opentelemetry": "0.56.1",
-    "@effect/vitest": "0.25.0",
+    "@effect/opentelemetry": "0.56.4",
+    "@effect/vitest": "0.25.1",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/exporter-metrics-otlp-http": "0.203.0",
     "@opentelemetry/exporter-trace-otlp-http": "0.203.0",
     "@opentelemetry/sdk-metrics": "2.0.1",
     "@opentelemetry/sdk-trace-base": "2.0.1",
     "@opentelemetry/sdk-trace-node": "2.0.1",
-    "@livestore/utils": "0.4.0-dev.2"
+    "@livestore/utils": "0.4.0-dev.5"
   },
   "devDependencies": {},
   "files": [
@@ -31,7 +31,7 @@
   "publishConfig": {
     "access": "public",
     "sideEffects": [
-      "./dist/node-vitest/polyfill.js"
+      "./dist/node-vitest/global.js"
     ]
   },
   "scripts": {

package/src/node/cmd.ts

@@ -0,0 +1,99 @@
+import { isNotUndefined, shouldNeverHappen } from '@livestore/utils'
+import { Command, type CommandExecutor, Effect, identity, type PlatformError, Schema } from '@livestore/utils/effect'
+
+export const cmd: (
+  commandInput: string | (string | undefined)[],
+  options?:
+    | {
+        cwd?: string
+        stderr?: 'inherit' | 'pipe'
+        stdout?: 'inherit' | 'pipe'
+        shell?: boolean
+        env?: Record<string, string | undefined>
+      }
+    | undefined,
+) => Effect.Effect<CommandExecutor.ExitCode, PlatformError.PlatformError | CmdError, CommandExecutor.CommandExecutor> =
+  Effect.fn('cmd')(function* (commandInput, options) {
+    const cwd = options?.cwd ?? process.env.WORKSPACE_ROOT ?? shouldNeverHappen('WORKSPACE_ROOT is not set')
+    const [command, ...args] = Array.isArray(commandInput)
+      ? commandInput.filter(isNotUndefined)
+      : commandInput.split(' ')
+
+    const debugEnvStr = Object.entries(options?.env ?? {})
+      .map(([key, value]) => `${key}='${value}' `)
+      .join('')
+    const subshellStr = options?.shell ? ' (in subshell)' : ''
+    const commandDebugStr = debugEnvStr + [command, ...args].join(' ')
+
+    yield* Effect.logDebug(`Running '${commandDebugStr}' in '${cwd}'${subshellStr}`)
+    yield* Effect.annotateCurrentSpan({ 'span.label': commandDebugStr, cwd, command, args })
+
+    return yield* Command.make(command!, ...args).pipe(
+      // TODO don't forward abort signal to the command
+      Command.stdin('inherit'), // Forward stdin to the command
+      // inherit = Stream stdout to process.stdout, pipe = Stream stdout to process.stderr
+      Command.stdout(options?.stdout ?? 'inherit'),
+      // inherit = Stream stderr to process.stderr, pipe = Stream stderr to process.stdout
+      Command.stderr(options?.stderr ?? 'inherit'),
+      Command.workingDirectory(cwd),
+      options?.shell ? Command.runInShell(true) : identity,
+      Command.env(options?.env ?? {}),
+      Command.exitCode,
+      Effect.tap((exitCode) =>
+        exitCode === 0
+          ? Effect.void
+          : Effect.fail(
+              CmdError.make({
+                command: command!,
+                args,
+                cwd,
+                env: options?.env ?? {},
+                stderr: options?.stderr ?? 'inherit',
+              }),
+            ),
+      ),
+    )
+  })
+
+export const cmdText: (
+  commandInput: string | (string | undefined)[],
+  options?: {
+    cwd?: string
+    stderr?: 'inherit' | 'pipe'
+    runInShell?: boolean
+    env?: Record<string, string | undefined>
+  },
+) => Effect.Effect<string, PlatformError.PlatformError, CommandExecutor.CommandExecutor> = Effect.fn('cmdText')(
+  function* (commandInput, options) {
+    const cwd = options?.cwd ?? process.env.WORKSPACE_ROOT ?? shouldNeverHappen('WORKSPACE_ROOT is not set')
+    const [command, ...args] = Array.isArray(commandInput)
+      ? commandInput.filter(isNotUndefined)
+      : commandInput.split(' ')
+    const debugEnvStr = Object.entries(options?.env ?? {})
+      .map(([key, value]) => `${key}='${value}' `)
+      .join('')
+
+    const commandDebugStr = debugEnvStr + [command, ...args].join(' ')
+    const subshellStr = options?.runInShell ? ' (in subshell)' : ''
+
+    yield* Effect.logDebug(`Running '${commandDebugStr}' in '${cwd}'${subshellStr}`)
+    yield* Effect.annotateCurrentSpan({ 'span.label': commandDebugStr, command, cwd })
+
+    return yield* Command.make(command!, ...args).pipe(
+      // inherit = Stream stderr to process.stderr, pipe = Stream stderr to process.stdout
+      Command.stderr(options?.stderr ?? 'inherit'),
+      Command.workingDirectory(cwd),
+      options?.runInShell ? Command.runInShell(true) : identity,
+      Command.env(options?.env ?? {}),
+      Command.string,
+    )
+  },
+)
+
+export class CmdError extends Schema.TaggedError<CmdError>()('CmdError', {
+  command: Schema.String,
+  args: Schema.Array(Schema.String),
+  cwd: Schema.String,
+  env: Schema.Record({ key: Schema.String, value: Schema.String.pipe(Schema.UndefinedOr) }),
+  stderr: Schema.Literal('inherit', 'pipe'),
+}) {}

package/src/node/mod.ts

@@ -1,19 +1,9 @@
 import { performance } from 'node:perf_hooks'
 
 import * as OtelNodeSdk from '@effect/opentelemetry/NodeSdk'
-import { IS_BUN, isNonEmptyString, isNotUndefined, shouldNeverHappen } from '@livestore/utils'
-import type { CommandExecutor, PlatformError, Tracer } from '@livestore/utils/effect'
-import {
-  Command,
-  Config,
-  Effect,
-  FiberRef,
-  identity,
-  Layer,
-  LogLevel,
-  OtelTracer,
-  Schema,
-} from '@livestore/utils/effect'
+import { IS_BUN, isNonEmptyString } from '@livestore/utils'
+import type { Tracer } from '@livestore/utils/effect'
+import { Config, Effect, FiberRef, Layer, LogLevel, OtelTracer } from '@livestore/utils/effect'
 import { OtelLiveDummy } from '@livestore/utils/node'
 import * as otel from '@opentelemetry/api'
 import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http'
@@ -23,8 +13,10 @@ import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base'
 
 export { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http'
 export { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http'
-
+export * from './cmd.ts'
 export * as FileLogger from './FileLogger.ts'
+export * from './vitest-docker-compose-setup.ts'
+export * from './vitest-wrangler-setup.ts'
 
 export const OtelLiveHttp = ({
   serviceName,
@@ -169,100 +161,3 @@ export const getTracingBackendUrl = (span: otel.Span) =>
     // TODO make dynamic via env var
     return `${grafanaEndpoint}/explore?${searchParams.toString()}`
   })
-
-export const cmd: (
-  commandInput: string | (string | undefined)[],
-  options?:
-    | {
-        cwd?: string
-        stderr?: 'inherit' | 'pipe'
-        stdout?: 'inherit' | 'pipe'
-        shell?: boolean
-        env?: Record<string, string | undefined>
-      }
-    | undefined,
-) => Effect.Effect<CommandExecutor.ExitCode, PlatformError.PlatformError | CmdError, CommandExecutor.CommandExecutor> =
-  Effect.fn('cmd')(function* (commandInput, options) {
-    const cwd = options?.cwd ?? process.env.WORKSPACE_ROOT ?? shouldNeverHappen('WORKSPACE_ROOT is not set')
-    const [command, ...args] = Array.isArray(commandInput)
-      ? commandInput.filter(isNotUndefined)
-      : commandInput.split(' ')
-
-    const debugEnvStr = Object.entries(options?.env ?? {})
-      .map(([key, value]) => `${key}='${value}' `)
-      .join('')
-    const subshellStr = options?.shell ? ' (in subshell)' : ''
-    const commandDebugStr = debugEnvStr + [command, ...args].join(' ')
-
-    yield* Effect.logDebug(`Running '${commandDebugStr}' in '${cwd}'${subshellStr}`)
-    yield* Effect.annotateCurrentSpan({ 'span.label': commandDebugStr, cwd, command, args })
-
-    return yield* Command.make(command!, ...args).pipe(
-      // TODO don't forward abort signal to the command
-      Command.stdin('inherit'), // Forward stdin to the command
-      // inherit = Stream stdout to process.stdout, pipe = Stream stdout to process.stderr
-      Command.stdout(options?.stdout ?? 'inherit'),
-      // inherit = Stream stderr to process.stderr, pipe = Stream stderr to process.stdout
-      Command.stderr(options?.stderr ?? 'inherit'),
-      Command.workingDirectory(cwd),
-      options?.shell ? Command.runInShell(true) : identity,
-      Command.env(options?.env ?? {}),
-      Command.exitCode,
-      Effect.tap((exitCode) =>
-        exitCode === 0
-          ? Effect.void
-          : Effect.fail(
-              CmdError.make({
-                command: command!,
-                args,
-                cwd,
-                env: options?.env ?? {},
-                stderr: options?.stderr ?? 'inherit',
-              }),
-            ),
-      ),
-    )
-  })
-
-export const cmdText: (
-  commandInput: string | (string | undefined)[],
-  options?: {
-    cwd?: string
-    stderr?: 'inherit' | 'pipe'
-    runInShell?: boolean
-    env?: Record<string, string | undefined>
-  },
-) => Effect.Effect<string, PlatformError.PlatformError, CommandExecutor.CommandExecutor> = Effect.fn('cmdText')(
-  function* (commandInput, options) {
-    const cwd = options?.cwd ?? process.env.WORKSPACE_ROOT ?? shouldNeverHappen('WORKSPACE_ROOT is not set')
-    const [command, ...args] = Array.isArray(commandInput)
-      ? commandInput.filter(isNotUndefined)
-      : commandInput.split(' ')
-    const debugEnvStr = Object.entries(options?.env ?? {})
-      .map(([key, value]) => `${key}='${value}' `)
-      .join('')
-
-    const commandDebugStr = debugEnvStr + [command, ...args].join(' ')
-    const subshellStr = options?.runInShell ? ' (in subshell)' : ''
-
-    yield* Effect.logDebug(`Running '${commandDebugStr}' in '${cwd}'${subshellStr}`)
-    yield* Effect.annotateCurrentSpan({ 'span.label': commandDebugStr, command, cwd })
-
-    return yield* Command.make(command!, ...args).pipe(
-      // inherit = Stream stderr to process.stderr, pipe = Stream stderr to process.stdout
-      Command.stderr(options?.stderr ?? 'inherit'),
-      Command.workingDirectory(cwd),
-      options?.runInShell ? Command.runInShell(true) : identity,
-      Command.env(options?.env ?? {}),
-      Command.string,
-    )
-  },
-)
-
-export class CmdError extends Schema.TaggedError<CmdError>()('CmdError', {
-  command: Schema.String,
-  args: Schema.Array(Schema.String),
-  cwd: Schema.String,
-  env: Schema.Record({ key: Schema.String, value: Schema.String.pipe(Schema.UndefinedOr) }),
-  stderr: Schema.Literal('inherit', 'pipe'),
-}) {}

package/src/node/vitest-docker-compose-setup.ts

@@ -0,0 +1,182 @@
+import { spawn } from 'node:child_process'
+import path from 'node:path'
+import { Effect, UnknownError } from '@livestore/utils/effect'
+import { cmd } from './cmd.ts'
+
+export const startDockerComposeServices = (args: StartDockerComposeServicesArgs) =>
+  Effect.tryPromise({
+    try: () => startDockerComposeServicesPromise(args),
+    catch: (error) => UnknownError.make({ cause: new Error(`Failed to start Docker Compose: ${error}`) }),
+  }).pipe(Effect.withSpan('startDockerComposeServices'))
+
+type StartDockerComposeServicesArgs = {
+  composeFilePath?: string
+  cwd: string
+  serviceName?: string
+  waitForLog?: string
+  env?: Record<string, string>
+  healthCheck?: {
+    url: string // URL template with ${port} placeholder
+    expectedStatus?: number // default 200
+    maxAttempts?: number // default 30
+    delayMs?: number // default 1000
+  }
+  /** @default false */
+  forwardLogs?: boolean
+}
+
+export const pullDockerComposeImages = ({
+  cwd,
+  composeFilePath,
+}: Pick<StartDockerComposeServicesArgs, 'composeFilePath' | 'cwd'>) =>
+  Effect.gen(function* () {
+    const resolvedComposeFilePath = path.resolve(composeFilePath ?? path.join(cwd, 'docker-compose.yml'))
+    yield* cmd(['docker', 'compose', '-f', resolvedComposeFilePath, 'pull'], { cwd })
+  }).pipe(Effect.withSpan('pullDockerComposeImages'))
+
+/**
+ * Starts Docker Compose services for testing with automatic cleanup.
+ * Automatically allocates a free port and passes it as EXPOSED_PORT environment variable.
+ *
+ * @param composeFilePath - Path to docker-compose.yml file (defaults to `${cwd}/docker-compose.yml`)
+ * @param cwd - Working directory for Docker Compose commands
+ * @param env - Environment variables to pass to the Docker Compose commands (useful for passing ports)
+ * @param serviceName - Optional specific service to start (omit to start all)
+ * @param waitForLog - Log pattern to wait for before considering services ready
+ * @param healthCheck - Health check configuration for waiting until service is ready
+ */
+// TODO refactor implementation with Effect
+// TODO add test for this
+export const startDockerComposeServicesPromise = async ({
+  composeFilePath,
+  cwd,
+  serviceName,
+  waitForLog,
+  healthCheck,
+  env,
+  forwardLogs = false,
+}: StartDockerComposeServicesArgs) => {
+  let dockerComposeProcess: ReturnType<typeof spawn> | undefined
+
+  const setup = async () => {
+    const resolvedComposeFilePath = path.resolve(composeFilePath ?? path.join(cwd, 'docker-compose.yml'))
+
+    // Build the docker compose command arguments
+    const composeArgs = ['compose', '-f', resolvedComposeFilePath, 'up']
+
+    // Add service name if specified
+    if (serviceName) {
+      composeArgs.push(serviceName)
+    }
+
+    dockerComposeProcess = spawn('docker', composeArgs, {
+      stdio: ['ignore', 'pipe', 'pipe'],
+      cwd,
+      env: { ...process.env, ...env },
+    })
+
+    dockerComposeProcess.stdout?.setEncoding('utf8')
+    dockerComposeProcess.stderr?.setEncoding('utf8')
+
+    if (forwardLogs) {
+      dockerComposeProcess.stdout?.on('data', (data: string) => {
+        console.log(data)
+      })
+
+      dockerComposeProcess.stderr?.on('data', (data: string) => {
+        console.error(data)
+      })
+    }
+
+    // Wait for the service to be ready
+    if (healthCheck) {
+      // Use health check approach
+      const maxAttempts = healthCheck.maxAttempts ?? 30
+      const delayMs = healthCheck.delayMs ?? 1000
+      const expectedStatus = healthCheck.expectedStatus ?? 200
+      const healthUrl = healthCheck.url
+
+      console.log(`Waiting for health check at ${healthUrl}...`)
+
+      for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+        try {
+          const response = await fetch(healthUrl)
+          if (response.status === expectedStatus) {
+            console.log(`Health check passed after ${attempt} attempts`)
+            break
+          }
+          console.log(`Health check attempt ${attempt}/${maxAttempts}: status ${response.status}`)
+        } catch (error) {
+          console.log(
+            `Health check attempt ${attempt}/${maxAttempts}: ${error instanceof Error ? error.message : 'failed'}`,
+          )
+        }
+
+        if (attempt === maxAttempts) {
+          throw new Error(`Health check failed after ${maxAttempts} attempts at ${healthUrl}`)
+        }
+
+        await new Promise((resolve) => setTimeout(resolve, delayMs))
+      }
+    } else if (waitForLog) {
+      // Fallback to log-based waiting
+      await new Promise<void>((resolve) => {
+        const onData = (data: string) => {
+          if (data.includes(waitForLog)) {
+            dockerComposeProcess?.stdout?.off('data', onData)
+            resolve()
+          }
+        }
+        dockerComposeProcess?.stdout?.on('data', onData)
+        dockerComposeProcess?.stderr?.on('data', onData)
+      })
+    } else {
+      // No wait condition, just give it a moment to start
+      await new Promise((resolve) => setTimeout(resolve, 2000))
+    }
+
+    console.log(`Docker Compose services ready${serviceName ? ` (${serviceName})` : ''}`)
+  }
+
+  const stopDockerComposeServices = async () => {
+    if (dockerComposeProcess) {
+      console.log('Stopping Docker Compose services...')
+
+      const resolvedComposeFilePath = path.resolve(composeFilePath ?? path.join(cwd, 'docker-compose.yml'))
+
+      // Use docker compose down to properly stop and clean up
+      const downProcess = spawn('docker', ['compose', '-f', resolvedComposeFilePath, 'down'], {
+        stdio: 'inherit',
+        cwd,
+      })
+
+      await new Promise<void>((resolve) => {
+        downProcess.on('close', () => {
+          resolve()
+        })
+      })
+
+      dockerComposeProcess.kill('SIGTERM')
+      dockerComposeProcess = undefined
+    }
+  }
+
+  process.on('exit', () => {
+    stopDockerComposeServices()
+  })
+  process.on('SIGINT', () => {
+    stopDockerComposeServices()
+  })
+  process.on('SIGTERM', () => {
+    stopDockerComposeServices()
+  })
+
+  // try {
+  //   const { afterAll } = await import('vitest')
+  //   afterAll(async () => {
+  //     await stopDockerComposeServices()
+  //   })
+  // } catch {}
+
+  await setup()
+}

package/src/node/vitest-wrangler-setup.ts

@@ -0,0 +1,132 @@
+import { spawn } from 'node:child_process'
+import net from 'node:net'
+import path from 'node:path'
+import { Effect, UnknownError } from '@livestore/utils/effect'
+
+export type StartWranglerDevServerArgs = {
+  wranglerConfigPath?: string
+  cwd: string
+  port?: number
+}
+
+export const startWranglerDevServer = (args: StartWranglerDevServerArgs) =>
+  Effect.tryPromise({
+    try: (abortSignal) => startWranglerDevServerPromise({ ...args, abortSignal }),
+    catch: (error) => UnknownError.make({ cause: new Error(`Failed to start Wrangler: ${error}`) }),
+  }).pipe(Effect.withSpan('startWranglerDevServer'))
+
+// TODO refactor implementation with Effect
+// TODO add test for this
+// TODO allow for config to be passed in via code instead of `wrangler.toml` file
+// TODO fix zombie workerd processes causing high CPU usage - see https://github.com/livestorejs/livestore/issues/568
+/**
+ * Starts a Wrangler dev server for testing with automatic cleanup.
+ *
+ * @param wranglerConfigPath - Path to wrangler.toml file (defaults to `${cwd}/wrangler.toml`)
+ * @param cwd - Working directory for Wrangler commands
+ * @returns Object with allocated port for the dev server
+ */
+export const startWranglerDevServerPromise = async ({
+  wranglerConfigPath,
+  abortSignal,
+  cwd,
+  port: inputPort,
+}: {
+  wranglerConfigPath?: string
+  abortSignal?: AbortSignal
+  cwd: string
+  port?: number
+}) => {
+  let wranglerProcess: ReturnType<typeof spawn> | undefined
+
+  const getFreePort = (): Promise<number> => {
+    return new Promise((resolve, reject) => {
+      const server = net.createServer()
+      server.listen(0, () => {
+        const port = (server.address() as net.AddressInfo)?.port
+        server.close(() => {
+          if (port) {
+            resolve(port)
+          } else {
+            reject(new Error('Could not get port'))
+          }
+        })
+      })
+      server.on('error', reject)
+    })
+  }
+
+  const setup = async () => {
+    const syncPort = inputPort ?? (await getFreePort())
+
+    const resolvedWranglerConfigPath = path.resolve(wranglerConfigPath ?? path.join(cwd, 'wrangler.toml'))
+
+    wranglerProcess = spawn(
+      'bunx',
+      ['wrangler', 'dev', '--port', syncPort.toString(), '--config', resolvedWranglerConfigPath],
+      {
+        stdio: ['ignore', 'pipe', 'pipe'],
+        cwd,
+        env: {
+          ...process.env,
+          // NODE_OPTIONS: '--inspect --inspect-port=9233',
+        },
+        signal: abortSignal,
+      },
+    )
+
+    wranglerProcess.stdout?.setEncoding('utf8')
+    wranglerProcess.stderr?.setEncoding('utf8')
+
+    wranglerProcess.stdout?.on('data', (data: string) => {
+      // console.log(`[wrangler] ${data}`)
+      console.log(data)
+    })
+
+    wranglerProcess.stderr?.on('data', (data: string) => {
+      // console.error(`[wrangler] ${data}`)
+      console.error(data)
+    })
+
+    await new Promise<void>((resolve) => {
+      const onData = (data: string) => {
+        if (data.includes('Ready on')) {
+          wranglerProcess?.stdout?.off('data', onData)
+          resolve()
+        }
+      }
+      wranglerProcess?.stdout?.on('data', onData)
+    })
+
+    console.log(`Wrangler dev server ready on port ${syncPort}`)
+
+    // Wait longer for the Cloudflare Workers runtime to fully initialize
+    // console.log('Waiting for Cloudflare Workers runtime to fully initialize...')
+    // await new Promise(resolve => setTimeout(resolve, 10000))
+
+    return { port: syncPort }
+  }
+
+  const killWranglerProcess = () => {
+    if (wranglerProcess) {
+      console.log('Killing wrangler process...')
+      wranglerProcess.kill('SIGTERM')
+      wranglerProcess = undefined
+    }
+  }
+
+  process.on('exit', killWranglerProcess)
+  process.on('SIGINT', killWranglerProcess)
+  process.on('SIGTERM', killWranglerProcess)
+
+  try {
+    const { afterAll } = await import('vitest')
+    afterAll(() => {
+      killWranglerProcess()
+    })
+  } catch {}
+
+  const { port } = await setup()
+
+  return { port, kill: killWranglerProcess }
+}

package/src/node-vitest/Vitest.ts

@@ -43,7 +43,11 @@ export const withTestCtx =
     const layer = makeLayer?.(testContext)
 
     const otelLayer =
-      DEBUGGER_ACTIVE || forceOtel ? OtelLiveHttp({ serviceName: 'vitest-runner', skipLogUrl: false }) : OtelLiveDummy
+      DEBUGGER_ACTIVE || forceOtel
+        ? OtelLiveHttp({ rootSpanName: spanName, serviceName: 'vitest-runner', skipLogUrl: false })
+        : OtelLiveDummy
+
+    const combinedLayer = (layer ?? Layer.empty).pipe(Layer.provideMerge(otelLayer))
 
     return self.pipe(
       DEBUGGER_ACTIVE
@@ -53,10 +57,8 @@ export const withTestCtx =
             label: `${spanName} approaching timeout (timeout: ${Duration.format(timeout)})`,
           }),
       DEBUGGER_ACTIVE ? identity : Effect.timeout(timeout),
-      Effect.provide(otelLayer),
-      Effect.provide(layer ?? Layer.empty),
+      Effect.provide(combinedLayer),
       Effect.scoped, // We need to scope the effect manually here because otherwise the span is not closed
-      Effect.withSpan(spanName),
       Effect.annotateLogs({ suffix }),
     ) as any
   }