u1s1-cli 0.9.3 → 0.10.0

package/dist/deploy.js

@@ -0,0 +1,235 @@
+import { existsSync, 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";
+/**
+ * u1s1 deploy:把静态网页一键发布到 <name>.u1s1.app。
+ * 检测项目里的静态站点根目录 → 首次询问子域名(记在 ~/.u1s1/deploys.json)
+ * → 并发上传 → 网关原子切换生效,输出可分享的网址。
+ */
+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__"]);
+function authHeaders(apiKey) {
+    return { authorization: `Bearer ${apiKey}`, "x-u1s1-version": VERSION };
+}
+function readDeploys() {
+    try {
+        return JSON.parse(readFileSync(deploysFile, "utf8"));
+    }
+    catch {
+        return {};
+    }
+}
+function rememberSite(dir, site) {
+    const all = readDeploys();
+    all[dir] = site;
+    writeFileSync(deploysFile, JSON.stringify(all, null, 2) + "\n");
+}
+/** 找要部署的目录:显式参数 > 含 index.html 的构建产物目录 > 当前目录本身。 */
+function resolveSiteDir(explicit) {
+    if (explicit) {
+        const dir = resolve(explicit);
+        if (!existsSync(dir) || !statSync(dir).isDirectory()) {
+            throw new Error(`目录不存在:${dir}`);
+        }
+        if (!existsSync(join(dir, "index.html"))) {
+            throw new Error(`${dir} 里没有 index.html,网站需要一个首页`);
+        }
+        return dir;
+    }
+    const cwd = process.cwd();
+    for (const sub of BUILD_DIRS) {
+        if (existsSync(join(cwd, sub, "index.html")))
+            return join(cwd, sub);
+    }
+    if (existsSync(join(cwd, "index.html")))
+        return cwd;
+    throw new Error("这里找不到能发布的网页(index.html)。\n" +
+        "  在网站目录里运行 u1s1 deploy,或指定目录:u1s1 deploy <目录>\n" +
+        "  如果项目需要构建(如 Vite/Next),先跑构建再部署 dist/ 等产物目录");
+}
+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);
+            if (st.isDirectory())
+                walk(abs);
+            else if (st.isFile()) {
+                files.push({ path: relative(root, abs).split(sep).join("/"), abs, bytes: st.size });
+            }
+        }
+    };
+    walk(root);
+    return files;
+}
+/** 从目录名生成默认子域名。 */
+function slugify(name) {
+    const slug = name
+        .toLowerCase()
+        .replace(/[^a-z0-9-]+/g, "-")
+        .replace(/-{2,}/g, "-")
+        .replace(/^-+|-+$/g, "")
+        .slice(0, 30)
+        .replace(/^-+|-+$/g, "");
+    return slug.length >= 3 ? slug : `site-${Math.random().toString(36).slice(2, 6)}`;
+}
+function fmtBytes(n) {
+    if (n >= 1024 * 1024)
+        return `${(n / 1024 / 1024).toFixed(1)}MB`;
+    if (n >= 1024)
+        return `${Math.round(n / 1024)}KB`;
+    return `${n}B`;
+}
+async function api(cfg, method, path, body) {
+    let resp;
+    try {
+        resp = await fetch(`${cfg.baseUrl}${path}`, {
+            method,
+            headers: { ...authHeaders(cfg.apiKey), "content-type": "application/json" },
+            body: body === undefined ? undefined : JSON.stringify(body),
+        });
+    }
+    catch {
+        throw new Error(`连不上 ${cfg.baseUrl},检查一下网络?`);
+    }
+    const data = (await resp.json().catch(() => null));
+    if (!resp.ok) {
+        const e = new Error(data?.error?.message ?? `服务端返回 ${resp.status},稍后再试`);
+        e.code = data?.error?.code;
+        throw e;
+    }
+    return data;
+}
+/** 逐个上传,失败重试一次;并发数保守取 6。 */
+async function uploadAll(cfg, start, files) {
+    let done = 0;
+    const queue = [...files];
+    const uploadOne = async (f) => {
+        const qs = new URLSearchParams({ site: start.site, deploy_id: start.deploy_id, path: f.path });
+        const put = async () => fetch(`${cfg.baseUrl}/deploy/file?${qs}`, {
+            method: "PUT",
+            headers: { ...authHeaders(cfg.apiKey), "content-type": "application/octet-stream" },
+            body: readFileSync(f.abs),
+        });
+        let resp = await put().catch(() => null);
+        if (!resp?.ok)
+            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 ?? "网络错误"}`);
+        }
+        done++;
+        process.stdout.write(`\r  上传中 ${done}/${files.length}  ${f.path.slice(0, 48).padEnd(48)}`);
+    };
+    const workers = Array.from({ length: Math.min(6, queue.length) }, async () => {
+        for (let f = queue.shift(); f; f = queue.shift())
+            await uploadOne(f);
+    });
+    await Promise.all(workers);
+    process.stdout.write("\r" + " ".repeat(70) + "\r");
+}
+async function promptSiteName(def) {
+    if (!process.stdin.isTTY)
+        return def;
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    try {
+        const answer = (await rl.question(`  站点子域名(回车用 ${def}):`)).trim().toLowerCase();
+        return answer || def;
+    }
+    finally {
+        rl.close();
+    }
+}
+export async function deployCommand(cfg, args) {
+    // 参数:[dir] [--name xxx];u1s1 deploy list 列出已有站点
+    if (args[0] === "list") {
+        const { sites } = await api(cfg, "GET", "/deploy/sites");
+        if (!sites.length) {
+            console.log("  还没有部署过站点。在网页目录里跑 u1s1 deploy 试试。");
+            return;
+        }
+        console.log("");
+        for (const s of sites) {
+            console.log(`  ${s.deployed ? "●" : "○"} ${s.url}  ${fmtBytes(s.total_bytes)} · ${s.updated_at} UTC`);
+        }
+        console.log("");
+        return;
+    }
+    let name;
+    let dirArg;
+    for (let i = 0; i < args.length; i++) {
+        const a = args[i];
+        if (a === "--name" || a === "-n")
+            name = args[++i]?.toLowerCase();
+        else if (a.startsWith("--name="))
+            name = a.slice(7).toLowerCase();
+        else if (!a.startsWith("-"))
+            dirArg = a;
+    }
+    const dir = resolveSiteDir(dirArg);
+    const files = collectFiles(dir);
+    if (!files.some((f) => f.path === "index.html")) {
+        throw new Error(`${dir} 里没有 index.html,网站需要一个首页`);
+    }
+    const totalBytes = files.reduce((s, f) => s + f.bytes, 0);
+    console.log("");
+    console.log(`  部署目录  ${dir}`);
+    console.log(`  文件      ${files.length} 个,共 ${fmtBytes(totalBytes)}`);
+    // 站点名:--name > 上次用过的 > 交互询问(默认目录名;dist 等产物目录用项目名)
+    const remembered = readDeploys()[dir];
+    if (!name && remembered)
+        name = remembered;
+    if (!name) {
+        const projectName = BUILD_DIRS.includes(basename(dir)) ? basename(resolve(dir, "..")) : basename(dir);
+        name = await promptSiteName(slugify(projectName));
+    }
+    let start;
+    for (let attempt = 0; !start; attempt++) {
+        try {
+            start = await api(cfg, "POST", "/deploy/start", { site: name });
+        }
+        catch (e) {
+            const code = e.code;
+            const retriable = code === "site_name_taken" || code === "invalid_site_name";
+            if (!retriable || attempt >= 3)
+                throw e;
+            console.log(`  ${e.message}`);
+            if (!process.stdin.isTTY) {
+                // 非交互环境自动加后缀重试一次
+                if (attempt > 0)
+                    throw e;
+                name = `${name.slice(0, 25)}-${Math.random().toString(36).slice(2, 6)}`;
+            }
+            else {
+                name = await promptSiteName(`${name.slice(0, 25)}-${Math.random().toString(36).slice(2, 6)}`);
+            }
+        }
+    }
+    const tooBig = files.filter((f) => f.bytes > start.limits.max_file_bytes);
+    if (tooBig.length) {
+        throw new Error(`这些文件超过单文件上限 ${fmtBytes(start.limits.max_file_bytes)}:\n` +
+            tooBig.map((f) => `    ${f.path}(${fmtBytes(f.bytes)})`).join("\n"));
+    }
+    if (files.length > start.limits.max_files || totalBytes > start.limits.max_total_bytes) {
+        throw new Error(`超出配额:最多 ${start.limits.max_files} 个文件 / ${fmtBytes(start.limits.max_total_bytes)}。` +
+            `当前 ${files.length} 个 / ${fmtBytes(totalBytes)}`);
+    }
+    await uploadAll(cfg, start, files);
+    const fin = await api(cfg, "POST", "/deploy/finish", {
+        site: start.site,
+        deploy_id: start.deploy_id,
+    });
+    rememberSite(dir, start.site);
+    console.log(`  ✅ 部署完成,${fin.file_count} 个文件已上线`);
+    console.log("");
+    console.log(`  🌐 ${fin.url}`);
+    console.log("");
+    console.log("  把网址发给朋友就能看。改完代码再跑一次 u1s1 deploy 即可更新。");
+    console.log("");
+}

package/dist/index.js

@@ -241,7 +241,7 @@ async function run() {
     }
     if (cmd === "--help" || cmd === "-h") {
         printConsoleBanner(VERSION);
-        console.log(" u1s1 命令:web(浏览器网页版)· web shortcut(桌面图标)· login / logout · model · usage · update · import");
+        console.log(" u1s1 命令:web(浏览器网页版)· web shortcut(桌面图标)· deploy(发布网页)· login / logout · model · usage · update · import");
         console.log("");
     }
     if (cmd === "web") {
@@ -257,6 +257,13 @@ async function run() {
         await webCommand(cfg, args.slice(1));
         return;
     }
+    if (cmd === "deploy") {
+        const { ensureAuth } = await import("./login.js");
+        const cfg = await ensureAuth();
+        const { deployCommand } = await import("./deploy.js");
+        await deployCommand(cfg, args.slice(1));
+        return;
+    }
     if (cmd === "login") {
         const { login } = await import("./login.js");
         await login(args[1]);

package/package.json

@@ -1,11 +1,18 @@
 {
   "name": "u1s1-cli",
-  "version": "0.9.3",
+  "version": "0.10.0",
   "description": "u1s1 — 有一说一,最省心的 AI 编程搭子。终端里用中文说需求,AI 帮你读文件、改代码、跑命令。",
   "type": "module",
   "bin": {
     "u1s1": "dist/index.js"
   },
+  "exports": {
+    "./embed": {
+      "types": "./dist/embed.d.ts",
+      "default": "./dist/embed.js"
+    },
+    "./package.json": "./package.json"
+  },
   "files": [
     "dist"
   ],