@xfey/tutti 0.1.29 → 0.1.30

package/node_modules/@tutti/relay-client/dist/host-control.js

@@ -20,6 +20,9 @@ function registrationUrl(relayUrl) {
 function joinTokenUrl(relayUrl) {
     return new URL("/host-control/v1/join-token", relayUrl);
 }
+function archiveProjectUrl(relayUrl) {
+    return new URL("/host-control/v1/projects/archive", relayUrl);
+}
 function uploadResolveUrl(relayUrl) {
     return new URL("/host-control/v1/uploads/resolve", relayUrl);
 }
@@ -82,6 +85,19 @@ function createRefreshJoinTokenPayload(options) {
     }
     return payload;
 }
+function createArchiveRelayProjectPayload(options) {
+    return {
+        project_identity: {
+            source: "git_config",
+            project_id: options.projectId,
+        },
+        relay_project_ref: options.relayProjectRef,
+        host_auth: {
+            kind: "host_registration_secret_v1",
+            secret: options.hostRegistrationSecret,
+        },
+    };
+}
 function createResolveRelayUploadPayload(options) {
     return {
         project_identity: {
@@ -116,7 +132,7 @@ function relayErrorCodeFromBody(value) {
     }
     return stringField(value.error, "code");
 }
-async function fetchWithTimeout(fetchImpl, url, init, timeoutMs) {
+async function fetchWithTimeout(fetchImpl, url, init, timeoutMs, externalSignal) {
     const controller = new AbortController();
     const timeout = setTimeout(() => {
         controller.abort();
@@ -124,7 +140,9 @@ async function fetchWithTimeout(fetchImpl, url, init, timeoutMs) {
     try {
         return await fetchImpl(url, {
             ...init,
-            signal: controller.signal,
+            signal: externalSignal === undefined
+                ? controller.signal
+                : AbortSignal.any([controller.signal, externalSignal]),
         });
     }
     finally {
@@ -147,6 +165,21 @@ function assertRefreshJoinTokenResponse(value) {
     }
     return value;
 }
+function assertArchiveRelayProjectResponse(value) {
+    if (!isRecord(value) ||
+        stringField(value, "command_id") === undefined ||
+        !isRecord(value.disposition)) {
+        throw new RelayHostControlClientError("relay_registration_failed", "Relay project archive response is invalid", false);
+    }
+    const kind = stringField(value.disposition, "kind");
+    if (kind !== "archived" && kind !== "already_archived" && kind !== "interrupted") {
+        throw new RelayHostControlClientError("relay_registration_failed", "Relay project archive disposition is invalid", false);
+    }
+    if (kind === "interrupted" && value.disposition.retry_with_new_command_id !== true) {
+        throw new RelayHostControlClientError("relay_registration_failed", "Relay project archive disposition is invalid", false);
+    }
+    return value;
+}
 function assertResolveRelayUploadResponse(value) {
     if (!isRecord(value) || !isRecord(value.upload) || !isRecord(value.get)) {
         throw new RelayHostControlClientError("relay_registration_failed", "Relay upload resolve response is invalid", false);
@@ -176,7 +209,7 @@ export async function registerRelayHostConnection(options) {
                     issued_at: issuedAt.toISOString(),
                     payload: createRegisterPayload(options),
                 }),
-            }, options.timeoutMs ?? DEFAULT_TIMEOUT_MS);
+            }, options.timeoutMs ?? DEFAULT_TIMEOUT_MS, options.signal);
         }
         catch {
             throw new RelayHostControlClientError("relay_unavailable", `Cannot reach Relay at ${options.relayUrl}`, true);
@@ -223,6 +256,40 @@ export async function refreshRelayJoinToken(options) {
     }
     return assertRefreshJoinTokenResponse(await response.json());
 }
+export async function archiveRelayProject(options) {
+    const fetchImpl = options.fetch ?? fetch;
+    const commandId = options.commandId ?? createIdempotencyKey();
+    const issuedAt = options.issuedAt ?? new Date();
+    let response;
+    try {
+        response = await fetchWithTimeout(fetchImpl, archiveProjectUrl(options.relayUrl), {
+            method: "POST",
+            headers: {
+                accept: "application/json",
+                "content-type": "application/json",
+            },
+            body: JSON.stringify({
+                command_id: commandId,
+                issued_at: issuedAt.toISOString(),
+                payload: createArchiveRelayProjectPayload(options),
+            }),
+        }, options.timeoutMs ?? DEFAULT_TIMEOUT_MS);
+    }
+    catch {
+        throw new RelayHostControlClientError("relay_unavailable", `Cannot reach Relay at ${options.relayUrl}`, true);
+    }
+    if (!response.ok) {
+        let relayErrorCode;
+        try {
+            relayErrorCode = relayErrorCodeFromBody(await response.json());
+        }
+        catch {
+            relayErrorCode = undefined;
+        }
+        throw new RelayHostControlClientError(response.status >= 500 ? "relay_unavailable" : "relay_registration_failed", `Relay project archive failed with HTTP ${response.status}`, response.status >= 500, response.status, relayErrorCode);
+    }
+    return assertArchiveRelayProjectResponse(await response.json());
+}
 export async function resolveRelayUpload(options) {
     const fetchImpl = options.fetch ?? fetch;
     const response = await (async () => {

package/node_modules/@tutti/relay-client/dist/tunnel-types.d.ts

@@ -35,7 +35,7 @@ export type RelayHostTunnelStreamRequestHandler = (request: RelayHostTunnelReque
 export type RelayHostTunnelWebSocketLike = {
     on(event: "open", listener: () => void): void;
     on(event: "message", listener: (data: unknown) => void): void;
-    on(event: "close", listener: () => void): void;
+    on(event: "close", listener: (code?: number, reason?: unknown) => void): void;
     on(event: "error", listener: (error: unknown) => void): void;
     send(data: string, callback?: (error?: Error) => void): void;
     close(code?: number, reason?: string): void;
@@ -46,9 +46,13 @@ export type RelayHostTunnelConnector = (options: {
 }) => RelayHostTunnelWebSocketLike;
 export type RelayHostTunnelHandle = {
     connected: Promise<void>;
-    closed: Promise<void>;
+    closed: Promise<RelayHostTunnelCloseResult>;
     close: (code?: number, reason?: string) => void;
 };
+export type RelayHostTunnelCloseResult = {
+    code?: number;
+    reason?: string;
+};
 export type ConnectRelayHostTunnelOptions = {
     tunnelUrl: string;
     relayProjectRef: RelayProjectRef;

package/node_modules/@tutti/relay-client/dist/tunnel.js

@@ -1,4 +1,5 @@
 import { createRequire } from "node:module";
+import { redactAndTruncateText } from "@tutti/shared/utils";
 import { chunkToBase64, internalErrorResponse, parseHostRequestFrame, parseHostStreamCancelFrame, sendFrame, sendResponse, } from "./tunnel-frames.js";
 const loadNativeModule = createRequire(import.meta.url);
 function defaultConnector(options) {
@@ -123,7 +124,7 @@ export function connectRelayHostTunnel(options) {
             rejectConnected(error instanceof Error ? error : new Error("Relay host tunnel failed"));
         }
     });
-    socket.on("close", () => {
+    socket.on("close", (code, reason) => {
         for (const controller of streamControllers.values()) {
             controller.abort();
         }
@@ -131,7 +132,17 @@ export function connectRelayHostTunnel(options) {
         if (!connectedSettled) {
             rejectConnected(new Error("Relay host tunnel closed before it opened"));
         }
-        resolveClosed();
+        const normalizedReason = typeof reason === "string"
+            ? reason
+            : Buffer.isBuffer(reason)
+                ? reason.toString("utf8")
+                : undefined;
+        resolveClosed({
+            ...(code === undefined ? {} : { code }),
+            ...(normalizedReason === undefined || normalizedReason === ""
+                ? {}
+                : { reason: redactAndTruncateText(normalizedReason, 120) }),
+        });
     });
     return {
         connected,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfey/tutti",
-  "version": "0.1.29",
+  "version": "0.1.30",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",