feat(website): add upload command for single HTML files

docs/commands.md

@@ -75,7 +75,8 @@ use. Truthy values are `1`, `true`, `yes`, or `on` (case-insensitive).
   configuration (`oo connector login`) > the active account.
 - `OO_TEAM_ID`: Run team-aware commands (`oo connector run`, `oo connector
   proxy`, `oo connector apps`, `oo connector search` / `oo search`,
-  `oo variables list/get/create/delete`, and `oo file upload`) under the team
+  `oo variables list/get/create/delete`, `oo file upload`, and
+  `oo website upload`) under the team
   with this id. It takes precedence over `OO_TEAM_NAME` and the account's
   default team; the per-run `--team` flag still outranks it. Before execution the CLI
   validates the id and resolves its team name (one extra request per
@@ -593,11 +594,12 @@ Alias for `oo auth logout`.
 Team identity selects the team that team-aware commands act for: the connector
 commands (`oo connector run`, `oo connector proxy`, `oo connector apps`), the
 variables commands (`oo variables list/get/create/delete`), whose data is
-team-owned in the first place, and `oo file upload`, whose upload is billed and
-metered under the team. One ladder selects it: the per-run `--team <name>`
-first, then the `OO_TEAM_ID` / `OO_TEAM_NAME` environment overrides, then the
-default saved on the active account. When nothing selects a team the command
-sends no team selection and the server applies the account's default team.
+team-owned in the first place, and `oo file upload` and `oo website upload`,
+whose uploads are billed and metered under the team. One ladder selects it: the
+per-run `--team <name>` first, then the `OO_TEAM_ID` / `OO_TEAM_NAME`
+environment overrides, then the default saved on the active account. When
+nothing selects a team the command sends no team selection and the server
+applies the account's default team.
 These commands help discover which teams your account can use and manage that
 default.
 
@@ -2635,6 +2637,40 @@ Delete expired or stale file transfer records.
   not owned by an active download process.
 - Notes: the JSON response shape is `{ "deletedCount": number }`.
 
+## Website
+
+### `oo website upload <filePath>`
+
+Upload one HTML file to long-term website storage and print the public URL it
+is served from.
+
+- Arguments: `<filePath>` is the local HTML file to upload. Its name must end
+  with `.html` or `.htm` (case-insensitive); other files are rejected with
+  exit `2`.
+- Options: `--format <format>` returns structured output. Supported value:
+  `json`.
+- Options: `--json` is an alias for `--format=json`.
+- Options: `--team <team>` uploads the website under the given team, so the
+  upload is billed and metered under that team. When omitted, the team comes
+  from `OO_TEAM_ID` / `OO_TEAM_NAME` when set, otherwise the active account's
+  default team.
+- Notes: the command requires an OOMOL account. Without one it fails with exit
+  `1` and asks you to log in first.
+- Notes: websites are stored per team. When the account belongs to no team,
+  the command fails with exit `1` and asks you to create or join one.
+- Notes: the team selection is sent only to the website service request; the
+  file itself goes straight to storage without it.
+- Notes: files larger than `20 MiB` are rejected with exit `2`.
+- Notes: the file is served as `text/html` from `https://r2.inklycat.com`,
+  does not expire, and is readable by anyone who has the URL.
+- Notes: every upload gets a new URL of the form
+  `https://r2.inklycat.com/v1/<teamId>/<id>/index.html`. The local file name
+  is not part of it, and uploading again does not replace an earlier website.
+- Notes: the JSON response shape is
+  `{ "fileName": string, "fileSize": number, "url": string }`.
+- Notes: text output is the localized success line followed by the file size
+  and the URL.
+
 ## Variables
 
 Store and read named string variables in the OOMOL cloud. Aliases:

docs/commands.zh-CN.md

@@ -62,7 +62,8 @@ CLI 读取以下环境变量以支持内置和自动化场景。真值为 `1`、
   （`oo connector login`）> 当前激活账号。
 - `OO_TEAM_ID`：让团队相关命令（`oo connector run`、`oo connector proxy`、
   `oo connector apps`、`oo connector search` / `oo search`、
-  `oo variables list/get/create/delete`，以及 `oo file upload`）以该 id
+  `oo variables list/get/create/delete`、`oo file upload`，以及
+  `oo website upload`）以该 id
   对应的团队身份运行。优先级高于 `OO_TEAM_NAME` 和账号保存的默认团队；
   每次运行的 `--team` 标志仍然优先于它。执行前 CLI 会校验该 id 并解析出团队
   名称（每次调用多一个请求），因此请求会同时携带名称与 id；账号无法使用
@@ -487,7 +488,8 @@ oo flow
 团队身份决定团队相关命令以哪个团队运行：包括 connector 命令
 （`oo connector run`、`oo connector proxy`、`oo connector apps`）、variables
 命令（`oo variables list/get/create/delete`，其数据本身就归团队所有），以及
-`oo file upload`（上传按该团队计费与计量）。它由同一条优先级阶梯选出：先是每次
+`oo file upload` 与 `oo website upload`（上传按该团队计费与计量）。它由同一条
+优先级阶梯选出：先是每次
 运行的 `--team <name>`，其次是环境变量 `OO_TEAM_ID` / `OO_TEAM_NAME`，最后是
 保存在当前账号上的默认团队。没有任何一项选中团队时，命令不发送团队选择，由服务端
 套用该账号的默认团队。下列命令用于发现当前账号可用的团队并管理该默认值。
@@ -2200,6 +2202,33 @@ message，也不会出现在 `path` / `sourcePath` 字段之外的额外文件
 - 说明：超过 14 天且未被活跃下载进程占用的下载续传 session 会被删除。
 - 说明：JSON 输出结构为 `{ "deletedCount": number }`。
 
+## 网站
+
+### `oo website upload <filePath>`
+
+将单个 HTML 文件上传到长期网站存储，并输出其公开访问 URL。
+
+- 参数：`<filePath>` 为要上传的本地 HTML 文件。文件名必须以 `.html` 或 `.htm`
+  结尾(不区分大小写)，其他文件会被拒绝，退出码为 `2`。
+- 选项：`--format <format>` 返回结构化输出，目前仅支持 `json`。
+- 选项：`--json` 是 `--format=json` 的别名。
+- 选项：`--team <team>` 以指定团队上传该网站，上传按该团队计费与计量。
+  未传时，团队来自已设置的 `OO_TEAM_ID` / `OO_TEAM_NAME`，否则为当前账号
+  保存的默认团队。
+- 说明：该命令需要 OOMOL 账号。未登录时以退出码 `1` 结束，并提示先登录。
+- 说明：网站按团队存储。当前账号不属于任何团队时，命令以退出码 `1` 结束，
+  并提示先创建或加入团队。
+- 说明：团队选择只随网站服务请求发送；文件本身直接发往存储服务，不携带它。
+- 说明：文件大小超过 `20 MiB` 时会被拒绝，退出码为 `2`。
+- 说明：文件以 `text/html` 类型从 `https://r2.inklycat.com` 提供访问，
+  不会过期，任何拿到 URL 的人都可以访问。
+- 说明：每次上传都会得到一个新的 URL，形如
+  `https://r2.inklycat.com/v1/<teamId>/<id>/index.html`。本地文件名不会出现
+  在 URL 中，重复上传也不会覆盖之前的网站。
+- 说明：JSON 响应形状为
+  `{ "fileName": string, "fileSize": number, "url": string }`。
+- 说明：文本输出为本地化的成功提示行，随后是文件大小和 URL。
+
 ## Variables
 
 在 OOMOL 云端存取具名字符串变量。别名：`oo variable`、`oo var`、

src/application/bootstrap/__snapshots__/run-cli.test.ts.snap

@@ -63,6 +63,7 @@ Commands:
   update|upgrade [options]     Update the CLI
   variables|variable|var|vars  Manage cloud-stored variables
   version [options]            Print the CLI version
+  website                      Publish single-file websites
   help [command]               Show help for a command
 "
 ,
@@ -106,6 +107,7 @@ Commands:
   update|upgrade [options]     Update the CLI
   variables|variable|var|vars  Manage cloud-stored variables
   version [options]            Print the CLI version
+  website                      Publish single-file websites
   help [command]               Show help for a command
 "
 ,
@@ -152,6 +154,7 @@ Commands:
   update|upgrade [options]     Update the CLI
   variables|variable|var|vars  Manage cloud-stored variables
   version [options]            Print the CLI version
+  website                      Publish single-file websites
   help [command]               Show help for a command
 "
 ,
@@ -193,6 +196,7 @@ exports[`runCli bootstrap renders help in English and Chinese 1`] = `
   update|upgrade [options]     更新 CLI
   variables|variable|var|vars  管理云端变量
   version [options]            输出 CLI 版本
+  website                      发布单文件网站
   help [command]               显示命令帮助
 "
 ,
@@ -233,6 +237,7 @@ Commands:
   update|upgrade [options]     Update the CLI
   variables|variable|var|vars  Manage cloud-stored variables
   version [options]            Print the CLI version
+  website                      Publish single-file websites
   help [command]               Show help for a command
 "
 ,
@@ -277,6 +282,7 @@ Commands:
   update|upgrade [options]     Update the CLI
   variables|variable|var|vars  Manage cloud-stored variables
   version [options]            Print the CLI version
+  website                      Publish single-file websites
   help [command]               Show help for a command
 "
 ,

src/application/commands/catalog.ts

@@ -23,6 +23,7 @@ import { uninstallCommand } from "./uninstall.ts";
 import { updateCommand } from "./update.ts";
 import { variablesCommand } from "./variables/index.ts";
 import { versionCommand } from "./version.ts";
+import { websiteCommand } from "./website/index.ts";
 
 const globalOptions = [
     {
@@ -68,6 +69,7 @@ export function createCliCatalog(): CliCatalog {
             updateCommand,
             variablesCommand,
             versionCommand,
+            websiteCommand,
         ],
     };
 }

src/application/commands/config/__snapshots__/index.cli.test.ts.snap

@@ -49,6 +49,7 @@ Commands:
   update|upgrade [options]     Update the CLI
   variables|variable|var|vars  Manage cloud-stored variables
   version [options]            Print the CLI version
+  website                      Publish single-file websites
   help [command]               Show help for a command
 "
 ,
@@ -86,6 +87,7 @@ Commands:
   update|upgrade [options]     更新 CLI
   variables|variable|var|vars  管理云端变量
   version [options]            输出 CLI 版本
+  website                      发布单文件网站
   help [command]               显示命令帮助
 "
 ,

src/application/commands/file/text.ts

@@ -1,6 +1,7 @@
 import type { CliExecutionContext } from "../../contracts/cli.ts";
 
 import type { FileUploadRecordView } from "./shared.ts";
+import { formatFileSize } from "../shared/file-size.ts";
 
 type FileTextContext = Pick<CliExecutionContext, "translator">;
 
@@ -36,18 +37,3 @@ export function formatFileUploadListAsText(
         .map(record => formatFileUploadRecordAsText(record, context))
         .join("\n\n");
 }
-
-function formatFileSize(value: number): string {
-    const units = ["B", "KiB", "MiB", "GiB"] as const;
-    let unitIndex = 0;
-    let size = value;
-
-    while (size >= 1024 && unitIndex < units.length - 1) {
-        size /= 1024;
-        unitIndex += 1;
-    }
-
-    const decimalPlaces = unitIndex === 0 ? 0 : 2;
-
-    return `${size.toFixed(decimalPlaces)} ${units[unitIndex]}`;
-}

src/application/commands/file/upload.ts

@@ -1,15 +1,9 @@
-import type { Stats } from "node:fs";
-import type {
-    CliCommandDefinition,
-    CliExecutionContext,
-} from "../../contracts/cli.ts";
+import type { CliCommandDefinition } from "../../contracts/cli.ts";
 
-import { stat } from "node:fs/promises";
-import { basename, resolve } from "node:path";
 import { z } from "zod";
 import { requireIdentity } from "../../auth/identity.ts";
-import { CliUserError } from "../../contracts/cli.ts";
 import { bucketTelemetryBytes } from "../../telemetry/buckets.ts";
+import { readUploadSourceFile } from "../shared/upload-source-file.ts";
 import {
     resolveAccountTeamIdentity,
     teamIdentityInputShape,
@@ -31,10 +25,6 @@ interface FileUploadInput {
     team?: string;
 }
 
-type RecordTelemetryProperties = NonNullable<
-    CliExecutionContext["telemetry"]
->["recordProperties"];
-
 export const fileUploadCommand: CliCommandDefinition<FileUploadInput> = {
     name: "upload",
     summaryKey: "commands.file.upload.summary",
@@ -56,11 +46,15 @@ export const fileUploadCommand: CliCommandDefinition<FileUploadInput> = {
     handler: async (input, context) => {
         const { account } = await requireIdentity(context);
         const identity = await resolveAccountTeamIdentity(input, account, context);
-        const sourceFile = await readSourceFile(
-            input.filePath,
-            context.cwd,
-            context.telemetry?.recordProperties,
-        );
+        const sourceFile = await readUploadSourceFile(input.filePath, context.cwd, {
+            errorKeys: {
+                pathNotFile: "errors.fileUpload.pathNotFile",
+                readFailed: "errors.fileUpload.readFailed",
+                tooLarge: "errors.fileUpload.tooLarge",
+            },
+            maxSizeBytes: maxFileUploadSizeBytes,
+            recordTelemetryProperties: context.telemetry?.recordProperties,
+        });
 
         context.telemetry?.recordProperties({
             bytes_total_bucket: bucketTelemetryBytes(sourceFile.fileSize),
@@ -121,53 +115,3 @@ export const fileUploadCommand: CliCommandDefinition<FileUploadInput> = {
         });
     },
 };
-
-async function readSourceFile(
-    filePath: string,
-    cwd: string,
-    recordTelemetryProperties: RecordTelemetryProperties | undefined,
-): Promise<{
-    file: {
-        size: number;
-        slice: (start?: number, end?: number) => Blob;
-    };
-    fileName: string;
-    fileSize: number;
-}> {
-    const resolvedPath = resolve(cwd, filePath);
-    let metadata: Stats;
-
-    try {
-        metadata = await stat(resolvedPath);
-    }
-    catch (error) {
-        throw new CliUserError("errors.fileUpload.readFailed", 1, {
-            message: error instanceof Error ? error.message : String(error),
-            path: resolvedPath,
-        });
-    }
-
-    if (!metadata.isFile()) {
-        throw new CliUserError("errors.fileUpload.pathNotFile", 1, {
-            path: resolvedPath,
-        });
-    }
-
-    if (metadata.size > maxFileUploadSizeBytes) {
-        recordTelemetryProperties?.({
-            bytes_total_bucket: bucketTelemetryBytes(metadata.size),
-            rejected_too_large: true,
-        });
-        throw new CliUserError("errors.fileUpload.tooLarge", 2, {
-            max: maxFileUploadSizeBytes,
-            path: resolvedPath,
-            size: metadata.size,
-        });
-    }
-
-    return {
-        file: Bun.file(resolvedPath),
-        fileName: basename(resolvedPath),
-        fileSize: metadata.size,
-    };
-}

src/application/commands/shared/file-size.test.ts

@@ -0,0 +1,18 @@
+import { describe, expect, test } from "bun:test";
+
+import { formatFileSize } from "./file-size.ts";
+
+describe("formatFileSize", () => {
+    test("renders bytes without decimals and larger units with two", () => {
+        expect(formatFileSize(0)).toBe("0 B");
+        expect(formatFileSize(1023)).toBe("1023 B");
+        expect(formatFileSize(1024)).toBe("1.00 KiB");
+        expect(formatFileSize(1_536)).toBe("1.50 KiB");
+        expect(formatFileSize(20 * 1024 * 1024)).toBe("20.00 MiB");
+        expect(formatFileSize(3 * 1024 * 1024 * 1024)).toBe("3.00 GiB");
+    });
+
+    test("stops at the largest known unit", () => {
+        expect(formatFileSize(2048 * 1024 * 1024 * 1024)).toBe("2048.00 GiB");
+    });
+});

src/application/commands/shared/file-size.ts

@@ -0,0 +1,15 @@
+// Renders a byte count for humans with binary units, two decimals above bytes.
+export function formatFileSize(value: number): string {
+    const units = ["B", "KiB", "MiB", "GiB"] as const;
+    let unitIndex = 0;
+    let size = value;
+
+    while (size >= 1024 && unitIndex < units.length - 1) {
+        size /= 1024;
+        unitIndex += 1;
+    }
+
+    const decimalPlaces = unitIndex === 0 ? 0 : 2;
+
+    return `${size.toFixed(decimalPlaces)} ${units[unitIndex]}`;
+}