t3code-cli 0.1.3 → 0.3.0

package/src/auth/transport.ts

@@ -2,6 +2,7 @@ import * as Effect from "effect/Effect";
 import { HttpClient, HttpClientError, HttpClientRequest } from "effect/unstable/http";
 
 import type { ResolvedConfig } from "../config/service.ts";
+import { toHttpEndpointUrl } from "../config/url.ts";
 import { AuthTransportError } from "./error.ts";
 import {
   decodeAuthBearerBootstrapResult,
@@ -16,8 +17,8 @@ export const makeAuthTransport = Effect.fn("makeAuthTransport")(function* () {
     readonly baseUrl: string;
     readonly credential: string;
   }) {
-    const request = HttpClientRequest.post(input.baseUrl).pipe(
-      HttpClientRequest.appendUrl("/api/auth/bootstrap/bearer"),
+    const url = yield* makeHttpEndpointUrl(input.baseUrl, "/api/auth/bootstrap/bearer");
+    const request = HttpClientRequest.post(url).pipe(
       HttpClientRequest.acceptJson,
       HttpClientRequest.bodyJsonUnsafe({ credential: input.credential }),
     );
@@ -51,7 +52,7 @@ export const makeAuthTransport = Effect.fn("makeAuthTransport")(function* () {
   });
 
   const getSession = Effect.fn("AuthTransport.getSession")(function* (config: ResolvedConfig) {
-    const request = authenticatedRequest(config, "/api/auth/session", "get");
+    const request = yield* authenticatedRequest(config, "/api/auth/session", "get");
     const response = yield* client.execute(request).pipe(
       Effect.catchTags({
         HttpClientError: (error) =>
@@ -84,7 +85,7 @@ export const makeAuthTransport = Effect.fn("makeAuthTransport")(function* () {
   const issueWebSocketToken = Effect.fn("AuthTransport.issueWebSocketToken")(function* (
     config: ResolvedConfig,
   ) {
-    const request = authenticatedRequest(config, "/api/auth/ws-token", "post");
+    const request = yield* authenticatedRequest(config, "/api/auth/ws-token", "post");
     const response = yield* client.execute(request).pipe(
       Effect.catchTags({
         HttpClientError: (error) =>
@@ -122,11 +123,21 @@ export const makeAuthTransport = Effect.fn("makeAuthTransport")(function* () {
 });
 
 function authenticatedRequest(config: ResolvedConfig, path: string, method: "get" | "post") {
-  const request =
-    method === "get" ? HttpClientRequest.get(config.url) : HttpClientRequest.post(config.url);
-  return request.pipe(
-    HttpClientRequest.appendUrl(path),
-    HttpClientRequest.acceptJson,
-    HttpClientRequest.bearerToken(config.token),
+  return makeHttpEndpointUrl(config.url, path).pipe(
+    Effect.map((url) =>
+      method === "get" ? HttpClientRequest.get(url) : HttpClientRequest.post(url),
+    ),
+    Effect.map((request) =>
+      request.pipe(HttpClientRequest.acceptJson, HttpClientRequest.bearerToken(config.token)),
+    ),
+  );
+}
+
+function makeHttpEndpointUrl(baseUrl: string, path: string) {
+  return toHttpEndpointUrl(baseUrl, path).pipe(
+    Effect.catchTags({
+      UrlError: (error) =>
+        Effect.fail(new AuthTransportError({ message: "auth request failed", cause: error })),
+    }),
   );
 }

package/src/cli/model-format.ts

@@ -1,4 +1,4 @@
-import type { ServerProvider } from "@t3tools/contracts";
+import type { ServerProvider } from "#t3tools/contracts";
 
 export function formatModelsHuman(providers: ReadonlyArray<ServerProvider>) {
   if (providers.length === 0) {

package/src/cli/project-format.ts

@@ -1,4 +1,4 @@
-import type { OrchestrationProjectShell } from "@t3tools/contracts";
+import type { OrchestrationProjectShell } from "#t3tools/contracts";
 
 export function formatProjectsHuman(projects: ReadonlyArray<OrchestrationProjectShell>) {
   return projects

package/src/cli/thread-format.ts

@@ -1,5 +1,5 @@
 import type { WaitEvent } from "../application/service.ts";
-import type { OrchestrationThread, OrchestrationThreadShell } from "@t3tools/contracts";
+import type { OrchestrationThread, OrchestrationThreadShell } from "#t3tools/contracts";
 import { latestAssistantMessage, threadStatus } from "../domain/thread-lifecycle.ts";
 
 export function formatThreadsHuman(threads: ReadonlyArray<OrchestrationThreadShell>) {

package/src/config/url.ts

@@ -26,6 +26,31 @@ export function toWebSocketBaseUrl(httpBaseUrl: string) {
   );
 }
 
+export function toHttpEndpointUrl(httpBaseUrl: string, pathname: string) {
+  return parseUrl(httpBaseUrl).pipe(
+    Effect.flatMap((url) => Effect.succeed(withPathname(url, pathname).toString())),
+  );
+}
+
+export function toWebSocketEndpointUrl(httpBaseUrl: string, pathname: string) {
+  return parseUrl(httpBaseUrl).pipe(
+    Effect.flatMap((url) => {
+      if (url.protocol === "http:") {
+        return Effect.succeed(withPathname(url, pathname, "ws:").toString());
+      }
+      if (url.protocol === "https:") {
+        return Effect.succeed(withPathname(url, pathname, "wss:").toString());
+      }
+      return Effect.fail(
+        new UrlError({
+          message: `unsupported server url protocol: ${url.protocol}`,
+          protocol: url.protocol,
+        }),
+      );
+    }),
+  );
+}
+
 function parseUrl(value: string): Effect.Effect<URL, UrlError> {
   return Effect.fromResult(Url.fromString(value)).pipe(
     Effect.catchTags({
@@ -39,7 +64,7 @@ function normalizeBaseUrl(url: URL) {
   return Url.mutate(url, (current) => {
     current.hash = "";
     current.search = "";
-    current.pathname = "";
+    current.pathname = normalizePathname(current.pathname);
   })
     .toString()
     .replace(/\/$/, "");
@@ -48,8 +73,27 @@ function normalizeBaseUrl(url: URL) {
 function makeWebSocketUrl(url: URL, protocol: "ws:" | "wss:") {
   return Url.mutate(url, (current) => {
     current.protocol = protocol;
-    current.pathname = "/ws";
+    current.pathname = appendPathname(current.pathname, "/ws");
     current.search = "";
     current.hash = "";
   }).toString();
 }
+
+function withPathname(url: URL, pathname: string, protocol?: "ws:" | "wss:") {
+  return Url.mutate(url, (current) => {
+    if (protocol !== undefined) {
+      current.protocol = protocol;
+    }
+    current.pathname = appendPathname(current.pathname, pathname);
+    current.search = "";
+    current.hash = "";
+  });
+}
+
+function normalizePathname(pathname: string) {
+  return pathname === "/" ? "" : pathname.replace(/\/+$/u, "");
+}
+
+function appendPathname(basePathname: string, pathname: string) {
+  return `${normalizePathname(basePathname)}${pathname.startsWith("/") ? pathname : `/${pathname}`}`;
+}

package/src/domain/helpers.ts

@@ -1,5 +1,5 @@
 import type * as Path from "effect/Path";
-import type { OrchestrationProjectShell, OrchestrationShellSnapshot } from "@t3tools/contracts";
+import type { OrchestrationProjectShell, OrchestrationShellSnapshot } from "#t3tools/contracts";
 
 import { ProjectLookupError } from "./error.ts";
 

package/src/domain/model-config.ts

@@ -1,4 +1,4 @@
-import type { ServerProvider } from "@t3tools/contracts";
+import type { ServerProvider } from "#t3tools/contracts";
 
 export function isSelectableProvider(provider: ServerProvider) {
   return provider.status === "ready" && provider.models.length > 0;

package/src/domain/thread-lifecycle.ts

@@ -4,7 +4,7 @@ import {
   type OrchestrationMessage as OrchestrationMessageType,
   type OrchestrationThread,
   type OrchestrationThreadShell,
-} from "@t3tools/contracts";
+} from "#t3tools/contracts";
 import * as Schema from "effect/Schema";
 
 export function isThreadActive(thread: OrchestrationThreadShell | OrchestrationThread) {

package/src/index.ts

@@ -6,6 +6,8 @@ export type {
   WaitEvent,
 } from "./application/service.ts";
 export type { ApplicationError } from "./application/error.ts";
+export { NodeEnvironmentLive } from "./environment/layer.ts";
+export { AppLayer, AuthAppLayer } from "./runtime.ts";
 export type {
   OrchestrationMessage,
   OrchestrationProjectShell,
@@ -13,6 +15,4 @@ export type {
   OrchestrationThread,
   OrchestrationThreadShell,
   ServerProvider,
-} from "@t3tools/contracts";
-export { NodeEnvironmentLive } from "./environment/layer.ts";
-export { AppLayer, AuthAppLayer } from "./runtime.ts";
+} from "#t3tools/contracts";

package/src/orchestration/layer.ts

@@ -11,7 +11,7 @@ import {
   type ClientOrchestrationCommand,
   type OrchestrationShellStreamItem,
   type OrchestrationThreadStreamItem,
-} from "@t3tools/contracts";
+} from "#t3tools/contracts";
 import { RpcClientError } from "effect/unstable/rpc";
 
 import { RpcError } from "../rpc/error.ts";

package/src/orchestration/service.ts

@@ -10,7 +10,7 @@ import type {
   OrchestrationThread,
   OrchestrationThreadStreamItem,
   ServerProviders,
-} from "@t3tools/contracts";
+} from "#t3tools/contracts";
 
 import type { RpcError } from "../rpc/error.ts";
 

package/src/rpc/error.ts

@@ -5,7 +5,7 @@ import {
   OrchestrationDispatchCommandError,
   OrchestrationGetSnapshotError,
   ServerSettingsError,
-} from "@t3tools/contracts";
+} from "#t3tools/contracts";
 import { HttpClientError } from "effect/unstable/http";
 import { RpcClientError } from "effect/unstable/rpc";
 

package/src/rpc/layer.ts

@@ -13,7 +13,7 @@ import * as Socket from "effect/unstable/socket/Socket";
 
 import { T3Auth } from "../auth/service.ts";
 import { T3Config } from "../config/service.ts";
-import { toWebSocketBaseUrl } from "../config/url.ts";
+import { toWebSocketEndpointUrl } from "../config/url.ts";
 import { CliWsRpcGroup } from "./ws-group.ts";
 import { RpcError } from "./error.ts";
 import { T3Rpc, type WsClient } from "./service.ts";
@@ -77,7 +77,7 @@ const makeWsUrl = Effect.fn("makeWsUrl")(function* (input: {
 }) {
   const resolved = yield* input.config.resolve();
   const wsToken = yield* input.auth.issueWebSocketToken();
-  const wsUrl = yield* toWebSocketBaseUrl(resolved.url);
+  const wsUrl = yield* toWebSocketEndpointUrl(resolved.url, "/ws");
   const request = HttpClientRequest.get(wsUrl).pipe(
     HttpClientRequest.setUrlParam("wsToken", wsToken.token),
   );

package/src/rpc/ws-group.ts

@@ -10,7 +10,7 @@ import {
   WsOrchestrationDispatchCommandRpc,
   WsOrchestrationSubscribeShellRpc,
   WsOrchestrationSubscribeThreadRpc,
-} from "@t3tools/contracts";
+} from "#t3tools/contracts";
 import * as Schema from "effect/Schema";
 import { Rpc, RpcGroup } from "effect/unstable/rpc";