effect-start 0.23.0 → 0.25.0

package/dist/x/tailscale/TailscaleTunnel.js

@@ -1,68 +1,94 @@
-import * as BunServer from "../../bun/BunServer.js";
-import * as PlatformError from "../../PlatformError.js";
-import * as System from "../../System.js";
-import * as Deferred from "effect/Deferred";
-import * as Effect from "effect/Effect";
-import * as Fiber from "effect/Fiber";
-import * as Layer from "effect/Layer";
-import * as LogLevel from "effect/LogLevel";
-import * as Stream from "effect/Stream";
-import * as Function from "effect/Function";
-const getStatus = (command) => Effect.gen(function* () {
-    const proc = yield* System.spawn(command, ["status", "--json"]);
-    const exitCode = yield* proc.exitCode;
+import * as PlatformError from "../../PlatformError.js"
+import * as StartApp from "../../StartApp.js"
+import * as System from "../../System.js"
+import * as Deferred from "effect/Deferred"
+import * as Effect from "effect/Effect"
+import * as Layer from "effect/Layer"
+import * as LogLevel from "effect/LogLevel"
+import * as Stream from "effect/Stream"
+import * as Function from "effect/Function"
+
+const getStatus = (command) =>
+  Effect.gen(function* () {
+    const proc = yield* System.spawn(command, ["status", "--json"])
+    const exitCode = yield* proc.exitCode
+
     if (exitCode !== 0) {
-        const stderr = yield* proc.stderr.pipe(Stream.decodeText("utf-8"), Stream.mkString);
-        return yield* new PlatformError.SystemError({
-            reason: "Unknown",
-            module: "TailscaleTunnel",
-            method: "getStatus",
-            description: `tailscale status exited with code ${exitCode}: ${stderr}`,
-        });
+      const stderr = yield* proc.stderr.pipe(Stream.decodeText("utf-8"), Stream.mkString)
+      return yield* new PlatformError.SystemError({
+        reason: "Unknown",
+        module: "TailscaleTunnel",
+        method: "getStatus",
+        description: `tailscale status exited with code ${exitCode}: ${stderr}`,
+      })
     }
-    const stdout = yield* proc.stdout.pipe(Stream.decodeText("utf-8"), Stream.mkString);
-    const json = JSON.parse(stdout);
+
+    const stdout = yield* proc.stdout.pipe(Stream.decodeText("utf-8"), Stream.mkString)
+    const json = JSON.parse(stdout)
+
     if (json.BackendState !== "Running") {
-        return yield* new PlatformError.SystemError({
-            reason: "Unknown",
-            module: "TailscaleTunnel",
-            method: "getStatus",
-            description: `tailscale is in state "${json.BackendState}", expected "Running"`,
-        });
+      return yield* new PlatformError.SystemError({
+        reason: "Unknown",
+        module: "TailscaleTunnel",
+        method: "getStatus",
+        description: `tailscale is in state "${json.BackendState}", expected "Running"`,
+      })
     }
-    return json;
-});
-const serve = (opts) => Effect.gen(function* () {
-    const logPrefix = opts.logPrefix ?? "TailscaleTunnel: ";
-    const args = [opts.public ? "funnel" : "serve", String(opts.port)];
-    const proc = yield* System.spawn(opts.command, args);
-    yield* Function.pipe(Stream.merge(proc.stdout, proc.stderr), Stream.decodeText("utf-8"), Stream.splitLines, logPrefix ? Stream.map((v) => logPrefix + v) : (s) => s, Stream.runForEach((v) => Effect.logWithLevel(opts.logLevel ?? LogLevel.Debug, v)));
-});
-export const start = (opts) => Effect.gen(function* () {
-    const command = opts.command ?? "tailscale";
-    yield* System.which(command);
-    const status = yield* getStatus(command);
-    const dnsName = status.Self?.DNSName?.replace(/\.$/, "");
-    yield* serve({ ...opts, command, dnsName });
-});
-export const layer = (opts) => Layer.scopedDiscard(Effect.gen(function* () {
-    const { server } = yield* BunServer.BunServer;
-    const port = server.port;
-    const command = "tailscale";
-    const ready = yield* Deferred.make();
-    const fiber = yield* Effect.forkScoped(Effect.gen(function* () {
-        yield* System.which(command);
-        const status = yield* getStatus(command);
-        const dnsName = status.Self?.DNSName?.replace(/\.$/, "");
-        const serveUrl = dnsName ? `https://${dnsName}` : undefined;
-        yield* Effect.logInfo(`Tailscale ${opts?.public ? "funnel" : "serve"}${serveUrl ? ` url=${serveUrl}` : ""}`);
-        yield* Deferred.succeed(ready, void 0);
-        yield* serve({
+
+    return json
+  })
+
+const serve = (opts) =>
+  Effect.gen(function* () {
+    const logPrefix = opts.logPrefix ?? "TailscaleTunnel: "
+    const args = [opts.public ? "funnel" : "serve", String(opts.port)]
+
+    const proc = yield* System.spawn(opts.command, args)
+
+    yield* Function.pipe(
+      Stream.merge(proc.stdout, proc.stderr),
+      Stream.decodeText("utf-8"),
+      Stream.splitLines,
+      logPrefix ? Stream.map((v) => logPrefix + v) : (s) => s,
+      Stream.runForEach((v) => Effect.logWithLevel(opts.logLevel ?? LogLevel.Debug, v)),
+    )
+  })
+
+export const start = (opts) =>
+  Effect.gen(function* () {
+    const command = opts.command ?? "tailscale"
+    yield* System.which(command)
+    const status = yield* getStatus(command)
+    const dnsName = status.Self?.DNSName?.replace(/\.$/, "")
+    yield* serve({ ...opts, command, dnsName })
+  })
+
+export const layer = (opts) =>
+  Layer.scopedDiscard(
+    Effect.gen(function* () {
+      yield* Effect.forkScoped(
+        Effect.gen(function* () {
+          const app = yield* StartApp.StartApp
+          const { server } = yield* Deferred.await(app.server)
+          const port = server.port
+          const command = "tailscale"
+
+          yield* System.which(command)
+          const status = yield* getStatus(command)
+          const dnsName = status.Self?.DNSName?.replace(/\.$/, "")
+
+          const serveUrl = dnsName ? `https://${dnsName}` : undefined
+          yield* Effect.logInfo(
+            `Tailscale ${opts?.public ? "funnel" : "serve"}${serveUrl ? ` url=${serveUrl}` : ""}`,
+          )
+
+          yield* serve({
             command,
             port,
             dnsName,
             public: opts?.public,
-        });
-    }).pipe(Effect.orDie));
-    yield* Fiber.join(fiber).pipe(Effect.raceFirst(Deferred.await(ready)));
-}));
+          })
+        }).pipe(Effect.tapError((e) => Effect.logError(`Tailscale: ${e.description}`))),
+      )
+    }),
+  )

package/dist/x/tailscale/index.js

@@ -1 +1 @@
-export * as TailscaleTunnel from "./TailscaleTunnel.js";
+export * as TailscaleTunnel from "./TailscaleTunnel.js"