effect-start 0.10.0 → 0.11.0

package/src/bun/BunHttpServer.test.ts

@@ -0,0 +1,74 @@
+import * as t from "bun:test"
+import * as Effect from "effect/Effect"
+import * as BunHttpServer from "./BunHttpServer.ts"
+
+t.describe("BunHttpServer smart port selection", () => {
+  // Skip when running in TTY because the random port logic requires !isTTY && CLAUDECODE,
+  // and process.stdout.isTTY cannot be mocked
+  t.test.skipIf(process.stdout.isTTY)(
+    "uses random port when PORT not set, isTTY=false, CLAUDECODE set",
+    async () => {
+      const originalPort = process.env.PORT
+      const originalClaudeCode = process.env.CLAUDECODE
+
+      try {
+        delete process.env.PORT
+        process.env.CLAUDECODE = "1"
+
+        const port = await Effect.runPromise(
+          Effect.scoped(
+            Effect.gen(function*() {
+              const bunServer = yield* BunHttpServer.make({})
+              return bunServer.server.port
+            }),
+          ),
+        )
+
+        t.expect(port).not.toBe(3000)
+      } finally {
+        if (originalPort !== undefined) {
+          process.env.PORT = originalPort
+        } else {
+          delete process.env.PORT
+        }
+        if (originalClaudeCode !== undefined) {
+          process.env.CLAUDECODE = originalClaudeCode
+        } else {
+          delete process.env.CLAUDECODE
+        }
+      }
+    },
+  )
+
+  t.test("uses explicit PORT even when CLAUDECODE is set", async () => {
+    const originalPort = process.env.PORT
+    const originalClaudeCode = process.env.CLAUDECODE
+
+    try {
+      process.env.PORT = "5678"
+      process.env.CLAUDECODE = "1"
+
+      const port = await Effect.runPromise(
+        Effect.scoped(
+          Effect.gen(function*() {
+            const bunServer = yield* BunHttpServer.make({})
+            return bunServer.server.port
+          }),
+        ),
+      )
+
+      t.expect(port).toBe(5678)
+    } finally {
+      if (originalPort !== undefined) {
+        process.env.PORT = originalPort
+      } else {
+        delete process.env.PORT
+      }
+      if (originalClaudeCode !== undefined) {
+        process.env.CLAUDECODE = originalClaudeCode
+      } else {
+        delete process.env.CLAUDECODE
+      }
+    }
+  })
+})

package/src/bun/BunHttpServer.ts

@@ -63,7 +63,17 @@ export const make = (
 > =>
   Effect.gen(function*() {
     const port = yield* Config.number("PORT").pipe(
-      Effect.catchTag("ConfigError", () => Effect.succeed(3000)),
+      Effect.catchTag("ConfigError", () => {
+        if (
+          typeof process !== "undefined"
+          && !process.stdout.isTTY
+          && process.env.CLAUDECODE
+        ) {
+          return Effect.succeed(0)
+        }
+
+        return Effect.succeed(3000)
+      }),
     )
     const hostname = yield* Config.string("HOSTNAME").pipe(
       Effect.catchTag("ConfigError", () => Effect.succeed(undefined)),
@@ -226,15 +236,18 @@ export const layerServer = (
   )
 
 export function layerRoutes() {
-  return Layer.effectDiscard(Effect.gen(function*() {
-    const bunServer = yield* BunServer
-    const router = yield* Effect.serviceOption(Router.Router)
+  return Layer.effectDiscard(
+    Effect.gen(function*() {
+      const bunServer = yield* BunServer
+      const routerContext = yield* Effect.serviceOption(Router.Router)
 
-    if (Option.isSome(router)) {
-      const bunRoutes = yield* BunRoute.routesFromRouter(router.value)
-      bunServer.addRoutes(bunRoutes)
-    }
-  }))
+      if (Option.isSome(routerContext)) {
+        const router = yield* Router.fromManifest(routerContext.value)
+        const bunRoutes = yield* BunRoute.routesFromRouter(router)
+        bunServer.addRoutes(bunRoutes)
+      }
+    }),
+  )
 }
 
 const removeHost = (url: string) => {