@dxos/cli-util 0.11.1 → 0.12.0-next-73daef452f1464b62efdbca75fb0067c1066f264

package/dist/lib/callback.mjs

@@ -0,0 +1,2 @@
+import { n as startLocalCallbackServer, t as CALLBACK_TIMEOUT_MS } from "./chunk-server.mjs";
+export { CALLBACK_TIMEOUT_MS, startLocalCallbackServer };

package/dist/lib/chunk-command-config.mjs

@@ -1,8 +1,8 @@
 import * as Effect from "effect/Effect";
-import * as Layer from "effect/Layer";
 import * as Context from "effect/Context";
+import * as Layer from "effect/Layer";
 //#region src/services/command-config.ts
-var CommandConfig = class CommandConfig extends Context.Tag("CommandConfig")() {
+var CommandConfig = class CommandConfig extends Context.Service()("CommandConfig") {
 	static isJson = CommandConfig.pipe(Effect.map((config) => config.json));
 	static isVerbose = CommandConfig.pipe(Effect.map((config) => config.verbose));
 	static layerTest = Layer.succeed(CommandConfig, {

package/dist/lib/chunk-command-config.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"chunk-command-config.mjs","names":[],"sources":["../../src/services/command-config.ts"],"sourcesContent":["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Context from 'effect/Context';\nimport * as Effect from 'effect/Effect';\nimport * as Layer from 'effect/Layer';\n\nexport class CommandConfig extends Context.Tag('CommandConfig')<\n  CommandConfig,\n  {\n    json: boolean;\n    verbose: boolean;\n    profile: string;\n    logLevel: string;\n  }\n>() {\n  static isJson: Effect.Effect<boolean, never, CommandConfig> = CommandConfig.pipe(Effect.map((config) => config.json));\n  static isVerbose: Effect.Effect<boolean, never, CommandConfig> = CommandConfig.pipe(\n    Effect.map((config) => config.verbose),\n  );\n\n  static layerTest = Layer.succeed(CommandConfig, {\n    json: true,\n    verbose: false,\n    profile: 'default',\n    logLevel: 'info',\n  });\n}\n"],"mappings":";;;;AAQA,IAAa,gBAAb,MAAa,sBAAsB,QAAQ,IAAI,eAAe,CAAC,CAQ7D,CAAC,CAAC;CACF,OAAO,SAAuD,cAAc,KAAK,OAAO,KAAK,WAAW,OAAO,IAAI,CAAC;CACpH,OAAO,YAA0D,cAAc,KAC7E,OAAO,KAAK,WAAW,OAAO,OAAO,CACvC;CAEA,OAAO,YAAY,MAAM,QAAQ,eAAe;EAC9C,MAAM;EACN,SAAS;EACT,SAAS;EACT,UAAU;CACZ,CAAC;AACH"}
+{"version":3,"file":"chunk-command-config.mjs","names":[],"sources":["../../src/services/command-config.ts"],"sourcesContent":["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Context from 'effect/Context';\nimport * as Effect from 'effect/Effect';\nimport * as Layer from 'effect/Layer';\n\nexport class CommandConfig extends Context.Service<\n  CommandConfig,\n  {\n    json: boolean;\n    verbose: boolean;\n    profile: string;\n    logLevel: string;\n  }\n>()('CommandConfig') {\n  static isJson: Effect.Effect<boolean, never, CommandConfig> = CommandConfig.pipe(Effect.map((config) => config.json));\n  static isVerbose: Effect.Effect<boolean, never, CommandConfig> = CommandConfig.pipe(\n    Effect.map((config) => config.verbose),\n  );\n\n  static layerTest = Layer.succeed(CommandConfig, {\n    json: true,\n    verbose: false,\n    profile: 'default',\n    logLevel: 'info',\n  });\n}\n"],"mappings":";;;;AAQA,IAAa,gBAAb,MAAa,sBAAsB,QAAQ,QAQzC,CAAC,CAAC,eAAe,CAAC,CAAC;CACnB,OAAO,SAAuD,cAAc,KAAK,OAAO,KAAK,WAAW,OAAO,IAAI,CAAC;CACpH,OAAO,YAA0D,cAAc,KAC7E,OAAO,KAAK,WAAW,OAAO,OAAO,CACvC;CAEA,OAAO,YAAY,MAAM,QAAQ,eAAe;EAC9C,MAAM;EACN,SAAS;EACT,SAAS;EACT,UAAU;CACZ,CAAC;AACH"}

package/dist/lib/chunk-server.mjs

@@ -0,0 +1,112 @@
+import { t as CommandConfig } from "./chunk-command-config.mjs";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import { openBrowser } from "#platform";
+import * as Option from "effect/Option";
+import * as BunHttpServer from "@effect/platform-bun/BunHttpServer";
+import * as Exit from "effect/Exit";
+import * as Ref from "effect/Ref";
+import * as Scope from "effect/Scope";
+import * as HttpRouter from "effect/unstable/http/HttpRouter";
+import * as HttpServerRequest from "effect/unstable/http/HttpServerRequest";
+import * as HttpServerResponse from "effect/unstable/http/HttpServerResponse";
+import { getPort } from "get-port-please";
+//#region src/callback/server.ts
+/** Default timeout for a full browser round-trip. */
+var CALLBACK_TIMEOUT_MS = 3e5;
+/**
+* Relay page that performs a top-level redirect to Edge's `authUrl`. Edge finalizes the flow
+* by redirecting the browser back to this server's callback path (bsky.social nullifies
+* `window.opener`, so a popup + postMessage relay can't be used).
+*/
+var getRelayPageHtml = (authUrl) => `
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="UTF-8">
+  <script>
+    window.location.href = '${authUrl.replace(/'/g, "\\'")}';
+  <\/script>
+</head>
+<body></body>
+</html>
+`;
+/**
+* Starts a local Bun HTTP server that captures a browser redirect back to `callbackPath`. Generic
+* over the callback shape: all query params are captured and returned; an `error` query param
+* fails the wait. `open` additionally relays the browser to a remote auth URL, for flows that
+* start from the CLI rather than from a link the user clicks.
+*
+* Used by the integration-connect flow (`/redirect/oauth`), the identity-recovery login flow
+* (`/redirect/oauth-recovery`), and the email login link, which lands on `/` after the hub's
+* activation route redirects.
+*/
+var startLocalCallbackServer = (callbackPath, { successMessage = "Authentication successful! You can close this window." } = {}) => Effect.gen(function* () {
+	const port = yield* Effect.promise(() => getPort({ random: true }));
+	const origin = `http://localhost:${port}`;
+	const received = yield* Ref.make(false);
+	const outcome = yield* Ref.make(Option.none());
+	const parseUrl = (rawUrl) => new URL(rawUrl.startsWith("http") ? rawUrl : `http://localhost${rawUrl}`);
+	const routes = HttpRouter.addAll([HttpRouter.route("GET", "/oauth-relay", Effect.gen(function* () {
+		const request = yield* HttpServerRequest.HttpServerRequest;
+		const authUrl = parseUrl(request.url).searchParams.get("authUrl");
+		if (!authUrl) return HttpServerResponse.text("Missing authUrl parameter", { status: 400 });
+		return HttpServerResponse.text(getRelayPageHtml(authUrl), { headers: { "Content-Type": "text/html" } });
+	})), HttpRouter.route("GET", callbackPath, Effect.gen(function* () {
+		if (Option.isSome(yield* Ref.get(outcome))) return HttpServerResponse.text("Already received.", { status: 400 });
+		const request = yield* HttpServerRequest.HttpServerRequest;
+		const params = parseUrl(request.url).searchParams;
+		const error = params.get("error");
+		if (error) {
+			yield* Ref.set(outcome, Option.some({
+				success: false,
+				reason: error
+			}));
+			yield* Ref.set(received, true);
+			return HttpServerResponse.text(`<html><body><h1>Authentication failed</h1><p>${error}</p></body></html>`, {
+				status: 400,
+				headers: { "Content-Type": "text/html" }
+			});
+		}
+		const captured = {};
+		for (const [key, value] of params.entries()) captured[key] = value;
+		yield* Ref.set(outcome, Option.some({
+			success: true,
+			params: captured
+		}));
+		yield* Ref.set(received, true);
+		return HttpServerResponse.text(`<html><body><h1>${successMessage}</h1></body></html>`, { headers: { "Content-Type": "text/html" } });
+	}))]);
+	const verbose = yield* Effect.serviceOption(CommandConfig).pipe(Effect.map(Option.match({
+		onNone: () => false,
+		onSome: (config) => config.verbose
+	})));
+	const serverLayer = HttpRouter.serve(routes, {
+		disableLogger: !verbose,
+		disableListenLog: !verbose
+	}).pipe(Layer.provide(BunHttpServer.layer({ port })));
+	const scope = yield* Scope.make();
+	yield* Layer.build(serverLayer).pipe(Scope.provide(scope));
+	const waitForResult = (timeoutMs = CALLBACK_TIMEOUT_MS) => Effect.race(Effect.gen(function* () {
+		while (true) {
+			if (yield* Ref.get(received)) break;
+			yield* Effect.sleep("500 millis");
+		}
+		const result = yield* Ref.get(outcome);
+		return yield* Option.match(result, {
+			onNone: () => Effect.fail(/* @__PURE__ */ new Error("Callback received but no result.")),
+			onSome: (value) => value.success ? Effect.succeed(value.params) : Effect.fail(/* @__PURE__ */ new Error(`Callback reported a failure: ${value.reason}`))
+		});
+	}), Effect.sleep(`${timeoutMs} millis`).pipe(Effect.flatMap(() => Effect.fail(/* @__PURE__ */ new Error("Timed out waiting for the browser callback.")))));
+	return {
+		port,
+		origin,
+		open: (authUrl) => openBrowser(`${origin}/oauth-relay?authUrl=${encodeURIComponent(authUrl)}`),
+		waitForResult,
+		stop: () => Scope.close(scope, Exit.void).pipe(Effect.catch(() => Effect.void))
+	};
+});
+//#endregion
+export { startLocalCallbackServer as n, CALLBACK_TIMEOUT_MS as t };
+
+//# sourceMappingURL=chunk-server.mjs.map

package/dist/lib/chunk-server.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"chunk-server.mjs","names":[],"sources":["../../src/callback/server.ts"],"sourcesContent":["//\n// Copyright 2026 DXOS.org\n//\n\nimport * as BunHttpServer from '@effect/platform-bun/BunHttpServer';\nimport * as Effect from 'effect/Effect';\nimport * as Exit from 'effect/Exit';\nimport * as Layer from 'effect/Layer';\nimport * as Option from 'effect/Option';\nimport * as Ref from 'effect/Ref';\nimport * as Scope from 'effect/Scope';\nimport * as HttpRouter from 'effect/unstable/http/HttpRouter';\nimport * as HttpServerRequest from 'effect/unstable/http/HttpServerRequest';\nimport * as HttpServerResponse from 'effect/unstable/http/HttpServerResponse';\nimport { getPort } from 'get-port-please';\n\nimport { openBrowser } from '#platform';\n\nimport { CommandConfig } from '../services';\n\n/** Default timeout for a full browser round-trip. */\nexport const CALLBACK_TIMEOUT_MS = 5 * 60 * 1000;\n\n/**\n * Relay page that performs a top-level redirect to Edge's `authUrl`. Edge finalizes the flow\n * by redirecting the browser back to this server's callback path (bsky.social nullifies\n * `window.opener`, so a popup + postMessage relay can't be used).\n */\nconst getRelayPageHtml = (authUrl: string) => `\n<!DOCTYPE html>\n<html>\n<head>\n  <meta charset=\"UTF-8\">\n  <script>\n    window.location.href = '${authUrl.replace(/'/g, \"\\\\'\")}';\n  </script>\n</head>\n<body></body>\n</html>\n`;\n\ntype CallbackOutcome = { success: true; params: Record<string, string> } | { success: false; reason: string };\n\n/**\n * A running local callback server.\n */\nexport type LocalCallbackServer = {\n  /** Port the server is listening on. */\n  readonly port: number;\n  /** Origin (e.g. `http://localhost:1234`) to advertise as the redirect target. */\n  readonly origin: string;\n  /** Opens `authUrl` in the browser via the local relay page. */\n  readonly open: (authUrl: string) => Effect.Effect<void, Error>;\n  /** Resolves with the captured callback query params, or fails on an `error` param / timeout. */\n  readonly waitForResult: (timeoutMs?: number) => Effect.Effect<Record<string, string>, Error>;\n  /** Stops the server. */\n  readonly stop: () => Effect.Effect<void>;\n};\n\nexport type LocalCallbackServerOptions = {\n  /** Heading shown on the page the browser lands on. Defaults to an authentication wording. */\n  readonly successMessage?: string;\n};\n\n/**\n * Starts a local Bun HTTP server that captures a browser redirect back to `callbackPath`. Generic\n * over the callback shape: all query params are captured and returned; an `error` query param\n * fails the wait. `open` additionally relays the browser to a remote auth URL, for flows that\n * start from the CLI rather than from a link the user clicks.\n *\n * Used by the integration-connect flow (`/redirect/oauth`), the identity-recovery login flow\n * (`/redirect/oauth-recovery`), and the email login link, which lands on `/` after the hub's\n * activation route redirects.\n */\nexport const startLocalCallbackServer = (\n  callbackPath: `/${string}`,\n  { successMessage = 'Authentication successful! You can close this window.' }: LocalCallbackServerOptions = {},\n): Effect.Effect<LocalCallbackServer, Error> =>\n  Effect.gen(function* () {\n    const port = yield* Effect.promise(() => getPort({ random: true }));\n    const origin = `http://localhost:${port}`;\n    const received = yield* Ref.make(false);\n    const outcome = yield* Ref.make<Option.Option<CallbackOutcome>>(Option.none());\n\n    // req.url is only the path + query, so reconstruct a full URL to parse the query string.\n    const parseUrl = (rawUrl: string) => new URL(rawUrl.startsWith('http') ? rawUrl : `http://localhost${rawUrl}`);\n\n    // v4's router is a service: routes are declared as `Route` values and installed by a layer,\n    // rather than folded into an immutable router value.\n    const routes = HttpRouter.addAll([\n      HttpRouter.route(\n        'GET',\n        '/oauth-relay',\n        Effect.gen(function* () {\n          const request = yield* HttpServerRequest.HttpServerRequest;\n          const authUrl = parseUrl(request.url).searchParams.get('authUrl');\n          if (!authUrl) {\n            return HttpServerResponse.text('Missing authUrl parameter', { status: 400 });\n          }\n          return HttpServerResponse.text(getRelayPageHtml(authUrl), {\n            headers: { 'Content-Type': 'text/html' },\n          });\n        }),\n      ),\n      HttpRouter.route(\n        'GET',\n        callbackPath,\n        Effect.gen(function* () {\n          if (Option.isSome(yield* Ref.get(outcome))) {\n            return HttpServerResponse.text('Already received.', { status: 400 });\n          }\n\n          const request = yield* HttpServerRequest.HttpServerRequest;\n          const params = parseUrl(request.url).searchParams;\n          const error = params.get('error');\n          if (error) {\n            yield* Ref.set(outcome, Option.some({ success: false, reason: error }));\n            yield* Ref.set(received, true);\n            return HttpServerResponse.text(`<html><body><h1>Authentication failed</h1><p>${error}</p></body></html>`, {\n              status: 400,\n              headers: { 'Content-Type': 'text/html' },\n            });\n          }\n\n          const captured: Record<string, string> = {};\n          for (const [key, value] of params.entries()) {\n            captured[key] = value;\n          }\n          yield* Ref.set(outcome, Option.some({ success: true, params: captured }));\n          yield* Ref.set(received, true);\n          return HttpServerResponse.text(`<html><body><h1>${successMessage}</h1></body></html>`, {\n            headers: { 'Content-Type': 'text/html' },\n          });\n        }),\n      ),\n    ]);\n\n    // The flow is interactive, so the router's per-request log lines (and the listen banner) are\n    // noise between the user's command and its result; keep them behind `--verbose`.\n    const verbose = yield* Effect.serviceOption(CommandConfig).pipe(\n      Effect.map(Option.match({ onNone: () => false, onSome: (config) => config.verbose })),\n    );\n    const serverLayer = HttpRouter.serve(routes, {\n      disableLogger: !verbose,\n      disableListenLog: !verbose,\n    }).pipe(Layer.provide(BunHttpServer.layer({ port })));\n    const scope = yield* Scope.make();\n    yield* Layer.build(serverLayer).pipe(Scope.provide(scope));\n\n    const waitForResult = (timeoutMs: number = CALLBACK_TIMEOUT_MS) =>\n      Effect.race(\n        Effect.gen(function* () {\n          while (true) {\n            if (yield* Ref.get(received)) {\n              break;\n            }\n            yield* Effect.sleep('500 millis');\n          }\n          const result = yield* Ref.get(outcome);\n          return yield* Option.match(result, {\n            onNone: () => Effect.fail(new Error('Callback received but no result.')),\n            onSome: (value) =>\n              value.success\n                ? Effect.succeed(value.params)\n                : Effect.fail(new Error(`Callback reported a failure: ${value.reason}`)),\n          });\n        }),\n        Effect.sleep(`${timeoutMs} millis`).pipe(\n          Effect.flatMap(() => Effect.fail(new Error('Timed out waiting for the browser callback.'))),\n        ),\n      );\n\n    return {\n      port,\n      origin,\n      open: (authUrl: string) => openBrowser(`${origin}/oauth-relay?authUrl=${encodeURIComponent(authUrl)}`),\n      waitForResult,\n      stop: () => Scope.close(scope, Exit.void).pipe(Effect.catch(() => Effect.void)),\n    } satisfies LocalCallbackServer;\n  });\n"],"mappings":"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"}