u1s1-cli 1.3.0 → 1.3.2

package/dist/api.d.ts

@@ -1,4 +1,10 @@
 import { type ApiThinkingCapabilities, type CliConfig } from "./config.js";
+/** Preserve caller cancellation while always enforcing the operation deadline. */
+export declare function signalWithTimeout(signal: AbortSignal | undefined, timeoutMs: number): AbortSignal;
+/** Read a complete response without allowing a custom or faulty server to exhaust CLI memory. */
+export declare function readResponseTextCapped(resp: Response, maxBytes?: number): Promise<string>;
+/** Parse JSON only after the complete response has passed the shared byte cap. */
+export declare function readJsonResponseCapped<T = unknown>(resp: Response, maxBytes?: number): Promise<T>;
 export interface MeResponse {
     email: string | null;
     signup_credit_usd?: number;
@@ -66,6 +72,8 @@ export interface ModelsResponse {
     announcement?: ApiAnnouncement | null;
     /** Opaque, device-bound canary echoed only by the official signing proxy. */
     clientAttestation?: string;
+    /** Remaining lifetime of the canary, so the proxy can refresh it before it expires. */
+    clientAttestationExpiresInSeconds?: number;
 }
 /** 401:凭证失效(设备被移除/换过钥匙),调用方应引导重新登录而不是继续硬跑。 */
 export declare class AuthError extends Error {

package/dist/api.js

@@ -1,12 +1,67 @@
 import { apiEndpointToCustom, loadEndpointsCache, saveEndpointsCache, setCustomEndpoints, VERSION, } from "./config.js";
 import { authorizedFetch } from "./device-auth.js";
+const MAX_API_RESPONSE_BYTES = 8 * 1024 * 1024;
+const MAX_API_ERROR_BYTES = 64 * 1024;
+const MAX_IMAGE_RESULT_BYTES = 64 * 1024;
+function jsonRecord(value) {
+    return value !== null && typeof value === "object" && !Array.isArray(value)
+        ? value
+        : null;
+}
+/** Preserve caller cancellation while always enforcing the operation deadline. */
+export function signalWithTimeout(signal, timeoutMs) {
+    const timeout = AbortSignal.timeout(timeoutMs);
+    return signal ? AbortSignal.any([signal, timeout]) : timeout;
+}
+/** Read a complete response without allowing a custom or faulty server to exhaust CLI memory. */
+export async function readResponseTextCapped(resp, maxBytes = MAX_API_RESPONSE_BYTES) {
+    const limit = Math.max(1, Math.floor(maxBytes));
+    const declaredLength = Number(resp.headers.get("content-length"));
+    if (Number.isFinite(declaredLength) && declaredLength > limit) {
+        void resp.body?.cancel("API response body limit reached").catch(() => { });
+        throw new Error(`API response body exceeds ${limit} bytes`);
+    }
+    if (!resp.body)
+        throw new Error("API response body is missing");
+    const reader = resp.body.getReader();
+    const decoder = new TextDecoder();
+    let bytes = 0;
+    let text = "";
+    try {
+        for (;;) {
+            const { done, value } = await reader.read();
+            if (done) {
+                text += decoder.decode();
+                break;
+            }
+            if (bytes + value.byteLength > limit) {
+                void reader.cancel("API response body limit reached").catch(() => { });
+                throw new Error(`API response body exceeds ${limit} bytes`);
+            }
+            bytes += value.byteLength;
+            text += decoder.decode(value, { stream: true });
+        }
+    }
+    finally {
+        try {
+            reader.releaseLock();
+        }
+        catch { }
+    }
+    return text;
+}
+/** Parse JSON only after the complete response has passed the shared byte cap. */
+export async function readJsonResponseCapped(resp, maxBytes = MAX_API_RESPONSE_BYTES) {
+    return JSON.parse(await readResponseTextCapped(resp, maxBytes));
+}
 /** 401:凭证失效(设备被移除/换过钥匙),调用方应引导重新登录而不是继续硬跑。 */
 export class AuthError extends Error {
 }
 /** 网关错误壳统一是 { error: { message } };解析不出来时回退到状态码提示。 */
 async function errorMessageFromResponse(resp, fallback) {
-    const body = (await resp.json().catch(() => null));
-    return body?.error?.message ?? fallback;
+    const body = jsonRecord(await readJsonResponseCapped(resp, MAX_API_ERROR_BYTES).catch(() => null));
+    const error = jsonRecord(body?.error);
+    return typeof error?.message === "string" ? error.message.slice(0, 2_000) : fallback;
 }
 export async function fetchModels(cfg) {
     let resp;
@@ -23,13 +78,17 @@ export async function fetchModels(cfg) {
         throw new AuthError("登录已失效,请重新运行 u1s1 login");
     if (!resp.ok)
         throw new Error(await errorMessageFromResponse(resp, `服务端返回 ${resp.status},稍后再试`));
-    const body = (await resp.json());
+    const body = await readJsonResponseCapped(resp);
+    if (!body || !Array.isArray(body.data))
+        throw new Error("服务端模型列表格式不正确");
     const token = body.client_attestation?.token;
+    const expiresIn = body.client_attestation?.expires_in;
     return {
         models: body.data,
         features: body.features ?? {},
         announcement: body.announcement,
         clientAttestation: typeof token === "string" && token.length <= 1024 ? token : undefined,
+        clientAttestationExpiresInSeconds: typeof expiresIn === "number" && Number.isFinite(expiresIn) && expiresIn > 0 ? expiresIn : undefined,
     };
 }
 /**
@@ -49,8 +108,8 @@ export async function fetchUserEndpoints(cfg) {
     }
     if (!resp.ok)
         throw new Error(await errorMessageFromResponse(resp, `服务端返回 ${resp.status}`));
-    const body = (await resp.json());
-    return Array.isArray(body.endpoints) ? body.endpoints : [];
+    const body = jsonRecord(await readJsonResponseCapped(resp));
+    return Array.isArray(body?.endpoints) ? body.endpoints : [];
 }
 /**
  * 拉取云端配置的自定义端点并装载进 CUSTOM_ENDPOINTS;失败(离线/老网关)回退
@@ -79,17 +138,37 @@ export async function searchWeb(cfg, input) {
                 "content-type": "application/json",
             },
             body: JSON.stringify({ query: input.query, max_results: input.maxResults }),
-            signal: input.signal ?? AbortSignal.timeout(60_000),
+            signal: signalWithTimeout(input.signal, 60_000),
         });
     }
-    catch {
-        throw new Error(`连不上 ${cfg.baseUrl},检查一下网络?`);
+    catch (error) {
+        if (input.signal?.aborted)
+            throw error;
+        throw new Error(`连不上 ${cfg.baseUrl},检查一下网络?`, { cause: error });
     }
     if (resp.status === 401)
         throw new Error("登录已失效,请重新运行 u1s1 login");
     if (!resp.ok)
         throw new Error(await errorMessageFromResponse(resp, `搜索服务返回 ${resp.status},稍后再试`));
-    return (await resp.json());
+    const body = jsonRecord(await readJsonResponseCapped(resp));
+    if (!body || !Array.isArray(body.results))
+        throw new Error("搜索服务返回格式不正确");
+    const results = [];
+    for (const value of body.results.slice(0, 10)) {
+        const result = jsonRecord(value);
+        if (!result
+            || typeof result.title !== "string"
+            || typeof result.url !== "string"
+            || typeof result.snippet !== "string") {
+            continue;
+        }
+        results.push({ title: result.title, url: result.url, snippet: result.snippet });
+    }
+    return {
+        query: typeof body.query === "string" ? body.query : input.query,
+        answer: typeof body.answer === "string" ? body.answer : null,
+        results,
+    };
 }
 /** web_fetch 直连失败时的回退:网关用 Cloudflare Browser Rendering 渲染后转 markdown。 */
 export async function renderPage(cfg, url, signal) {
@@ -104,31 +183,40 @@ export async function renderPage(cfg, url, signal) {
                 "content-type": "application/json",
             },
             body: JSON.stringify({ url }),
-            signal: signal ?? AbortSignal.timeout(90_000),
+            signal: signalWithTimeout(signal, 90_000),
         });
     }
-    catch {
-        throw new Error(`连不上 ${cfg.baseUrl}`);
+    catch (error) {
+        if (signal?.aborted)
+            throw error;
+        throw new Error(`连不上 ${cfg.baseUrl}`, { cause: error });
     }
     if (resp.status === 401)
         throw new Error("登录已失效,请重新运行 u1s1 login");
     if (!resp.ok)
         throw new Error(await errorMessageFromResponse(resp, `渲染服务返回 ${resp.status}`));
-    return (await resp.json());
+    const body = jsonRecord(await readJsonResponseCapped(resp));
+    if (!body || typeof body.url !== "string" || typeof body.markdown !== "string") {
+        throw new Error("渲染服务返回格式不正确");
+    }
+    return { url: body.url, markdown: body.markdown };
 }
 const IMAGE_URL_HEADER = "x-u1s1-image-url";
 const IMAGE_SIZE_HEADER = "x-u1s1-image-size";
 function imageResultFromHeaders(resp) {
     const encodedUrl = resp.headers.get(IMAGE_URL_HEADER);
-    if (!encodedUrl)
+    if (!encodedUrl || encodedUrl.length > 8_000)
         return null;
     try {
         const url = decodeURIComponent(encodedUrl);
+        if (/[\u0000-\u001f\u007f]/.test(url))
+            return null;
         const parsed = new URL(url);
         if (parsed.protocol !== "http:" && parsed.protocol !== "https:")
             return null;
         const encodedSize = resp.headers.get(IMAGE_SIZE_HEADER);
-        return { url, size: encodedSize ? decodeURIComponent(encodedSize) : null };
+        const size = encodedSize ? decodeURIComponent(encodedSize) : null;
+        return { url, size: size && size.length <= 100 ? size : null };
     }
     catch {
         return null;
@@ -147,15 +235,28 @@ function responseErrorDetail(error) {
 export async function readGeneratedImageResponse(resp) {
     const headerResult = imageResultFromHeaders(resp);
     if (headerResult) {
-        await resp.body?.cancel().catch(() => undefined);
+        void resp.body?.cancel("image result recovered from response headers").catch(() => undefined);
         return headerResult;
     }
     try {
-        const body = (await resp.json());
-        if (typeof body.url !== "string" || !/^https?:\/\//.test(body.url)) {
+        const body = jsonRecord(await readJsonResponseCapped(resp, MAX_IMAGE_RESULT_BYTES));
+        if (typeof body?.url !== "string") {
+            throw new Error("服务端没有返回图片下载地址");
+        }
+        let parsed;
+        try {
+            parsed = new URL(body.url);
+        }
+        catch {
+            throw new Error("服务端没有返回图片下载地址");
+        }
+        if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
             throw new Error("服务端没有返回图片下载地址");
         }
-        return { url: body.url, size: typeof body.size === "string" ? body.size : null };
+        return {
+            url: body.url,
+            size: typeof body.size === "string" && body.size.length <= 100 ? body.size : null,
+        };
     }
     catch (error) {
         throw new Error(`图片可能已经生成,但客户端下载结果响应失败: ${responseErrorDetail(error)}。` +
@@ -175,7 +276,7 @@ export async function generateImage(cfg, req, signal) {
                 "content-type": "application/json",
             },
             body: JSON.stringify(req),
-            signal: signal ?? AbortSignal.timeout(180_000),
+            signal: signalWithTimeout(signal, 180_000),
         });
     }
     catch (error) {
@@ -206,5 +307,8 @@ export async function fetchMe(cfg) {
         throw new Error("登录已失效,请重新运行 u1s1 login");
     if (!resp.ok)
         throw new Error(await errorMessageFromResponse(resp, `服务端返回 ${resp.status},稍后再试`));
-    return (await resp.json());
+    const body = await readJsonResponseCapped(resp);
+    if (!body || typeof body !== "object")
+        throw new Error("服务端账户响应格式不正确");
+    return body;
 }

package/dist/bench.js

@@ -3,7 +3,7 @@ import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import { homedir } from "node:os";
 import { CUSTOM_ENDPOINTS, loadConfig, MODELS, PROVIDER_ID, } from "./config.js";
-import { loadCustomEndpoints } from "./api.js";
+import { loadCustomEndpoints, readJsonResponseCapped, readResponseTextCapped } from "./api.js";
 import { authorizedFetch, hasDeviceCredential } from "./device-auth.js";
 import { costStr, errorRate, formatDuration, generateReport, renderTable, scoreBar, scoreRate, sortByScore, summarizeByModel, tokPerSec, } from "./bench-report.js";
 import { scoreResponse } from "./bench-scoring.js";
@@ -108,15 +108,32 @@ async function callModel(input) {
             : await fetch(`${baseUrl}/chat/completions`, request);
         const latencyMs = Math.round(performance.now() - start);
         if (!res.ok) {
-            const errBody = await res.text().catch(() => "未知错误");
+            const errBody = await readResponseTextCapped(res, 64 * 1024).catch(() => "未知错误");
             return { response: "", latencyMs, tokensIn: 0, tokensOut: 0, error: `HTTP ${res.status}: ${errBody.slice(0, 200)}` };
         }
-        const data = (await res.json());
+        const value = await readJsonResponseCapped(res);
+        const data = value && typeof value === "object" && !Array.isArray(value)
+            ? value
+            : null;
+        const choices = Array.isArray(data?.choices) ? data.choices : [];
+        const firstChoice = choices[0] && typeof choices[0] === "object" && !Array.isArray(choices[0])
+            ? choices[0]
+            : null;
+        const message = firstChoice?.message && typeof firstChoice.message === "object" && !Array.isArray(firstChoice.message)
+            ? firstChoice.message
+            : null;
+        const usage = data?.usage && typeof data.usage === "object" && !Array.isArray(data.usage)
+            ? data.usage
+            : null;
         return {
-            response: data.choices?.[0]?.message?.content ?? "",
+            response: typeof message?.content === "string" ? message.content : "",
             latencyMs,
-            tokensIn: data.usage?.prompt_tokens ?? 0,
-            tokensOut: data.usage?.completion_tokens ?? 0,
+            tokensIn: typeof usage?.prompt_tokens === "number" && Number.isFinite(usage.prompt_tokens)
+                ? Math.max(0, usage.prompt_tokens)
+                : 0,
+            tokensOut: typeof usage?.completion_tokens === "number" && Number.isFinite(usage.completion_tokens)
+                ? Math.max(0, usage.completion_tokens)
+                : 0,
         };
     }
     catch (e) {

package/dist/deploy.d.ts

@@ -1,4 +1,10 @@
 import { type CliConfig } from "./config.js";
+interface SiteFile {
+    path: string;
+    abs: string;
+    bytes: number;
+}
+export declare function collectFiles(root: string): SiteFile[];
 type SiteVisibility = "public" | "private";
 interface DeployArgs {
     name?: string;

package/dist/deploy.js

@@ -1,8 +1,9 @@
-import { existsSync, mkdirSync, readdirSync, readFileSync, statSync, writeFileSync } from "node:fs";
+import { existsSync, lstatSync, mkdirSync, readdirSync, readFileSync, statSync, writeFileSync } from "node:fs";
 import { basename, join, relative, resolve, sep } from "node:path";
 import { createInterface } from "node:readline/promises";
 import { VERSION, u1s1Dir } from "./config.js";
 import { authorizedFetch } from "./device-auth.js";
+import { readJsonResponseCapped } from "./api.js";
 /**
  * u1s1 deploy publishes a static site to <project>.<account-code>.u1s1.app.
  * Detect the site root, ask for a project slug, and remember it in ~/.u1s1/deploys.json.
@@ -12,6 +13,8 @@ const deploysFile = join(u1s1Dir, "deploys.json");
 /** 构建产物目录优先:Vite/Next 等项目根的 index.html 是源码,不是能直接上线的产物。 */
 const BUILD_DIRS = ["dist", "build", "out", "_site", "public"];
 const SKIP_DIRS = new Set(["node_modules", "__pycache__"]);
+const MAX_DEPLOY_API_RESPONSE_BYTES = 256 * 1024;
+const MAX_DEPLOY_ERROR_RESPONSE_BYTES = 64 * 1024;
 function readDeploys() {
     try {
         return JSON.parse(readFileSync(deploysFile, "utf8"));
@@ -56,14 +59,18 @@ function resolveSiteDir(explicit) {
         "  在网站目录里运行 u1s1 deploy,或指定目录:u1s1 deploy <目录>\n" +
         "  如果项目需要构建(如 Vite/Next),先跑构建再部署 dist/ 等产物目录");
 }
-function collectFiles(root) {
+export function collectFiles(root) {
     const files = [];
     const walk = (dir) => {
         for (const name of readdirSync(dir)) {
             if (name.startsWith(".") || SKIP_DIRS.has(name))
                 continue;
             const abs = join(dir, name);
-            const st = statSync(abs);
+            const st = lstatSync(abs);
+            // Never upload or recurse through links: a project-controlled link could
+            // escape the selected root, expose credentials, or create a directory cycle.
+            if (st.isSymbolicLink())
+                continue;
             if (st.isDirectory())
                 walk(abs);
             else if (st.isFile()) {
@@ -136,12 +143,25 @@ async function api(cfg, request) {
     catch {
         throw new Error(`连不上 ${cfg.baseUrl},检查一下网络?`);
     }
-    const data = (await resp.json().catch(() => null));
+    const value = await readJsonResponseCapped(resp, MAX_DEPLOY_API_RESPONSE_BYTES).catch(() => null);
+    const data = value && typeof value === "object" && !Array.isArray(value)
+        ? value
+        : null;
     if (!resp.ok) {
-        const e = new Error(data?.error?.message ?? `服务端返回 ${resp.status},稍后再试`);
-        e.code = data?.error?.code;
+        const detail = data?.error && typeof data.error === "object"
+            ? data.error
+            : undefined;
+        const message = typeof detail?.message === "string"
+            ? detail.message.slice(0, 2_000)
+            : `服务端返回 ${resp.status},稍后再试`;
+        const e = new Error(message);
+        if (typeof detail?.code === "string" && detail.code.length <= 100) {
+            e.code = detail.code;
+        }
         throw e;
     }
+    if (!data)
+        throw new Error("服务端部署响应格式不正确");
     return data;
 }
 /** 逐个上传,失败重试一次;并发数保守取 6。 */
@@ -157,12 +177,24 @@ async function uploadAll(cfg, start, files) {
             signal: AbortSignal.timeout(120_000),
         });
         let resp = await put().catch(() => null);
-        if (!resp?.ok)
+        if (resp && !resp.ok) {
+            void resp.body?.cancel("retrying rejected deploy upload").catch(() => { });
             resp = await put().catch(() => null);
+        }
+        else if (!resp) {
+            resp = await put().catch(() => null);
+        }
         if (!resp?.ok) {
-            const body = resp ? (await resp.json().catch(() => null)) : null;
-            throw new Error(`上传 ${f.path} 失败:${body?.error?.message ?? "网络错误"}`);
+            const value = resp
+                ? await readJsonResponseCapped(resp, MAX_DEPLOY_ERROR_RESPONSE_BYTES).catch(() => null)
+                : null;
+            const body = value && typeof value === "object" && !Array.isArray(value) ? value : null;
+            const message = body?.error && typeof body.error === "object" && typeof body.error.message === "string"
+                ? body.error.message.slice(0, 2_000)
+                : "网络错误";
+            throw new Error(`上传 ${f.path} 失败:${message}`);
         }
+        void resp.body?.cancel("deploy upload completed").catch(() => { });
         done++;
         process.stdout.write(`\r  上传中 ${done}/${files.length}  ${f.path.slice(0, 48).padEnd(48)}`);
     };

package/dist/device-auth.d.ts

@@ -1,4 +1,5 @@
 import { webcrypto } from "node:crypto";
+import { type IncomingMessage } from "node:http";
 import { type CliConfig } from "./config.js";
 export declare function hasDeviceCredential(cfg: CliConfig): boolean;
 export declare function generateDeviceKeyPair(): Promise<{
@@ -8,17 +9,46 @@ export declare function generateDeviceKeyPair(): Promise<{
 export declare function dpopHeaders(cfg: CliConfig, method: string, url: string): Promise<Record<string, string>>;
 /** Fetch a gateway route with a fresh proof; generic keys remain a read-only compatibility fallback. */
 export declare function authorizedFetch(cfg: CliConfig, input: string | URL, init?: RequestInit): Promise<Response>;
+/** Buffer a loopback request only up to the same JSON limit enforced by Gateway. */
+export declare function readSigningProxyRequestBody(request: IncomingMessage, maxBytes?: number): Promise<Buffer | undefined>;
+/**
+ * How the proxy obtains and refreshes the device attestation canary. The token
+ * is device-bound and expires (7 days server-side); the proxy keeps it fresh so
+ * a healthy Gateway always sees a valid attestation instead of falling back to
+ * the weaker "legacy official" verdict when a transient /v1/models fetch missed.
+ */
+export interface ClientAttestationSource {
+    token?: string;
+    expiresInSeconds?: number;
+    /** Fetch a fresh token (e.g. via GET /v1/models). Single-flighted by the proxy. */
+    refresh?: () => Promise<{
+        token?: string;
+        expiresInSeconds?: number;
+    }>;
+}
+interface AttestationHolder {
+    token?: string;
+    expiresAtMs?: number;
+    refresh?: () => Promise<{
+        token?: string;
+        expiresInSeconds?: number;
+    }>;
+    refreshing?: Promise<void>;
+    lastFailureMs?: number;
+}
 interface SigningProxy {
     baseUrl: string;
     localKey: string;
     token: string;
     client: ClientSurface;
-    clientAttestation?: string;
+    attestation: AttestationHolder;
 }
+/** Attach a fresh (self-healing) attestation header to an outbound proxy request. */
+export declare function attachAttestationHeader(holder: AttestationHolder, headers: Headers): Promise<void>;
 export type ClientSurface = "terminal" | "web" | "desktop" | "cloud";
 /**
  * pi accepts static provider headers only. Keep it behind a loopback proxy that
  * replaces the local bearer credential with a fresh DPoP proof per request.
  */
-export declare function ensureSigningProxy(cfg: CliConfig, fallbackClient?: ClientSurface, clientAttestation?: string): Promise<SigningProxy>;
+export declare function ensureSigningProxy(cfg: CliConfig, fallbackClient?: ClientSurface, attestationSource?: ClientAttestationSource): Promise<SigningProxy>;
 export {};