@lark-apaas/miaoda-cli 0.1.2-alpha.d0d2ae1 → 0.1.2-alpha.d5d1878

package/dist/api/db/api.js

@@ -10,7 +10,9 @@ exports.setAuditConfig = setAuditConfig;
 exports.listAuditLog = listAuditLog;
 exports.migrationInit = migrationInit;
 exports.migrate = migrate;
+exports.getMigrationStatus = getMigrationStatus;
 exports.recover = recover;
+exports.getRecoveryPreview = getRecoveryPreview;
 exports.getDbQuota = getDbQuota;
 const http_1 = require("../../utils/http");
 const error_1 = require("../../utils/error");
@@ -33,6 +35,22 @@ async function mapDbHttpError(err, url, ctx,
 onErrorBody) {
     if (err instanceof error_1.AppError)
         throw err;
+    // 客户端超时 / abort：SdkHttpError 时 response 通常缺失（status=0），落到 throw 时
+    // message 形如 'Failed to recover: 0' 让用户看不懂。识别 abort / timeout 关键字
+    // 转成专用错误码 + 友好 hint。
+    if (err instanceof Error) {
+        const msg = err.message.toLowerCase();
+        if (msg.includes("aborted") ||
+            msg.includes("timeout") ||
+            err.name === "AbortError" ||
+            err.name === "TimeoutError") {
+            throw new error_1.AppError("REQUEST_TIMEOUT", `${ctx}: request timed out`, {
+                next_actions: [
+                    "Server-side async tasks may take up to 60s. Retry the command if the underlying task likely succeeded.",
+                ],
+            });
+        }
+    }
     if (err instanceof http_client_1.HttpError) {
         const status = err.response?.status ?? 0;
         const statusText = err.response?.statusText ?? "";
@@ -484,6 +502,31 @@ async function migrate(opts) {
     const respBody = (await response.json());
     return (0, client_1.extractData)(respBody);
 }
+/**
+ * 后端：GET /v1/dataloom/app/{appId}/db/migration/status?taskId=...
+ * CLI 拿到 migration apply 的 taskId 后定时调本接口，直到 status=success/failed。
+ * 网络层超时仍走 mapDbHttpError → 单次 30s；轮询节奏由 CLI handler 自行控制。
+ */
+async function getMigrationStatus(opts) {
+    const client = (0, http_1.getHttpClient)();
+    const url = (0, client_1.buildInnerUrl)(opts.appId, "/db/migration/status", {
+        taskId: opts.taskId,
+        dbBranch: opts.dbBranch,
+    });
+    const start = Date.now();
+    let response;
+    try {
+        response = await client.get(url);
+        (0, client_1.traceHttp)("GET", url, start, response);
+    }
+    catch (err) {
+        (0, client_1.traceHttp)("GET", url, start, err instanceof http_client_1.HttpError ? err.response : undefined, err);
+        await mapDbHttpError(err, url, "Failed to get migration status");
+        throw err; // 不可达
+    }
+    const body = (await response.json());
+    return (0, client_1.extractData)(body);
+}
 // ── db recovery → InnerAdminRecover ──
 /**
  * 后端：POST /v1/dataloom/app/{appId}/db/recovery
@@ -509,6 +552,30 @@ async function recover(opts) {
     const respBody = (await response.json());
     return (0, client_1.extractData)(respBody);
 }
+/**
+ * 后端：GET /v1/dataloom/app/{appId}/db/recovery/preview?previewRequestId=...
+ * CLI 拿到 recovery diff 的 previewRequestId 后定时调本接口直到 previewStatus=success/failed。
+ */
+async function getRecoveryPreview(opts) {
+    const client = (0, http_1.getHttpClient)();
+    const url = (0, client_1.buildInnerUrl)(opts.appId, "/db/recovery/preview", {
+        previewRequestId: opts.previewRequestId,
+        dbBranch: opts.dbBranch,
+    });
+    const start = Date.now();
+    let response;
+    try {
+        response = await client.get(url);
+        (0, client_1.traceHttp)("GET", url, start, response);
+    }
+    catch (err) {
+        (0, client_1.traceHttp)("GET", url, start, err instanceof http_client_1.HttpError ? err.response : undefined, err);
+        await mapDbHttpError(err, url, "Failed to get recovery preview");
+        throw err; // 不可达
+    }
+    const body = (await response.json());
+    return (0, client_1.extractData)(body);
+}
 // ── db quota → InnerAdminGetDbQuota ──
 /**
  * 后端：GET /v1/dataloom/app/{appId}/db/quota?dbBranch=

package/dist/api/db/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pickTableDetail = exports.flattenSchemaList = exports.parseSqlResult = exports.SQLSTATE_MAP = exports.ensureInnerSuccess = exports.buildInnerUrl = exports.getDbQuota = exports.recover = exports.migrate = exports.migrationInit = exports.listAuditLog = exports.setAuditConfig = exports.getAuditStatus = exports.listDDLChangelog = exports.exportData = exports.importData = exports.getSchema = exports.execSql = void 0;
+exports.pickTableDetail = exports.flattenSchemaList = exports.parseSqlResult = exports.SQLSTATE_MAP = exports.ensureInnerSuccess = exports.buildInnerUrl = exports.getDbQuota = exports.getRecoveryPreview = exports.recover = exports.getMigrationStatus = exports.migrate = exports.migrationInit = exports.listAuditLog = exports.setAuditConfig = exports.getAuditStatus = exports.listDDLChangelog = exports.exportData = exports.importData = exports.getSchema = exports.execSql = void 0;
 var api_1 = require("./api");
 Object.defineProperty(exports, "execSql", { enumerable: true, get: function () { return api_1.execSql; } });
 Object.defineProperty(exports, "getSchema", { enumerable: true, get: function () { return api_1.getSchema; } });
@@ -12,7 +12,9 @@ Object.defineProperty(exports, "setAuditConfig", { enumerable: true, get: functi
 Object.defineProperty(exports, "listAuditLog", { enumerable: true, get: function () { return api_1.listAuditLog; } });
 Object.defineProperty(exports, "migrationInit", { enumerable: true, get: function () { return api_1.migrationInit; } });
 Object.defineProperty(exports, "migrate", { enumerable: true, get: function () { return api_1.migrate; } });
+Object.defineProperty(exports, "getMigrationStatus", { enumerable: true, get: function () { return api_1.getMigrationStatus; } });
 Object.defineProperty(exports, "recover", { enumerable: true, get: function () { return api_1.recover; } });
+Object.defineProperty(exports, "getRecoveryPreview", { enumerable: true, get: function () { return api_1.getRecoveryPreview; } });
 Object.defineProperty(exports, "getDbQuota", { enumerable: true, get: function () { return api_1.getDbQuota; } });
 var client_1 = require("./client");
 Object.defineProperty(exports, "buildInnerUrl", { enumerable: true, get: function () { return client_1.buildInnerUrl; } });

package/dist/cli/handlers/db/migration.js

@@ -44,6 +44,7 @@ const api = __importStar(require("../../../api/index"));
 const shared_1 = require("../../../cli/commands/shared");
 const error_1 = require("../../../utils/error");
 const output_1 = require("../../../utils/output");
+const poll_1 = require("../../../utils/poll");
 const render_1 = require("../../../utils/render");
 async function handleDbMigrationInit(opts) {
     const appId = (0, shared_1.resolveAppId)(opts);
@@ -136,21 +137,42 @@ async function handleDbMigrationApply(opts) {
     catch (err) {
         throw decorateMigrationError(err);
     }
+    // dataloom 立即返 taskId（apply 实际是异步流水线）。CLI 自己 poll 直到 success/failed，
+    // 避免单次 HTTP 长连接 30s+ 被网关 / SDK 中断。
+    if (result.taskId === undefined || result.taskId === "") {
+        throw new error_1.AppError("INTERNAL_DB_ERROR", "migration apply did not return taskId");
+    }
+    const taskId = result.taskId;
+    const final = await (0, poll_1.pollUntilDone)({
+        label: "migration apply",
+        intervalMs: 1000,
+        fetch: () => api.db.getMigrationStatus({ appId, taskId }),
+        isDone: (cur) => {
+            // 同 recovery preview，dataloom 上下游枚举大小写不完全统一，客户端归一兜底。
+            const status = cur.status.toLowerCase();
+            if (status === "success")
+                return { done: true, value: cur };
+            if (status === "failed") {
+                throw new error_1.AppError("DB_API_k_dl_1300030", cur.errorMessage ?? `migration apply failed (taskId=${taskId})`);
+            }
+            return { done: false };
+        },
+    });
+    const appliedCount = final.changesApplied ?? result.changes.length;
     if ((0, output_1.isJsonMode)()) {
         // PRD：{"status": "applied", "from": "dev", "to": "online", "changes_applied": 2}
         (0, output_1.emitOk)((0, output_1.snakeCaseKeys)({
-            status: result.status ?? "applied",
+            status: "applied",
             from: result.from,
             to: result.to,
-            changesApplied: result.changesApplied ?? result.changes.length,
+            changesApplied: appliedCount,
         }));
         return;
     }
     const tty = (0, render_1.isStdoutTty)();
     const prefix = tty ? "✓" : "OK";
     const arrow = tty ? "→" : "->";
-    const applied = result.changesApplied ?? result.changes.length;
-    (0, output_1.emit)(`${prefix} Applied ${result.from} ${arrow} ${result.to} (${String(applied)} changes)`);
+    (0, output_1.emit)(`${prefix} Applied ${result.from} ${arrow} ${result.to} (${String(appliedCount)} changes)`);
 }
 // ── helpers ──
 // PRD diff 输出：

package/dist/cli/handlers/db/recovery.js

@@ -43,34 +43,27 @@ const api = __importStar(require("../../../api/index"));
 const shared_1 = require("../../../cli/commands/shared");
 const error_1 = require("../../../utils/error");
 const output_1 = require("../../../utils/output");
+const poll_1 = require("../../../utils/poll");
 const render_1 = require("../../../utils/render");
 // ── recovery diff ──
+//
+// PITR preview 是异步任务：dataloom 立即返 previewRequestId，CLI 自己 poll 直到 success/failed。
+// 失败时 dataloom 已用 translateRestoreErr 把中文窗口错误翻成 PRD 英文 + k_dl_1300036 code，
+// CLI 走 decorateRecoveryError 补 hint。
 async function handleDbRecoveryDiff(target, opts) {
     const appId = (0, shared_1.resolveAppId)(opts);
     const ts = normalizeTimestamp(target);
-    let result;
-    try {
-        result = await api.db.recover({ appId, target: ts, dryRun: true });
-    }
-    catch (err) {
-        throw decorateRecoveryError(err);
-    }
-    renderDiff(result);
+    const preview = await runRecoveryPreview(appId, ts);
+    renderDiff(ts, preview);
 }
 async function handleDbRecoveryApply(target, opts) {
     const appId = (0, shared_1.resolveAppId)(opts);
     const ts = normalizeTimestamp(target);
     // PITR 高危：TTY 下先 diff 给用户审；--yes 直接执行
     if (!opts.yes && !(0, output_1.isJsonMode)()) {
-        let preview;
-        try {
-            preview = await api.db.recover({ appId, target: ts, dryRun: true });
-        }
-        catch (err) {
-            throw decorateRecoveryError(err);
-        }
-        renderDiff(preview);
-        const ok = await confirm(`? Restore database to ${preview.target}? This will overwrite current data. (y/N) `);
+        const preview = await runRecoveryPreview(appId, ts);
+        renderDiff(ts, preview);
+        const ok = await confirm(`? Restore database to ${ts}? This will overwrite current data. (y/N) `);
         if (!ok) {
             (0, output_1.emit)("Aborted.");
             return;
@@ -84,37 +77,87 @@ async function handleDbRecoveryApply(target, opts) {
         throw decorateRecoveryError(err);
     }
     if ((0, output_1.isJsonMode)()) {
-        // PRD：{"status": "restored", "target": "...", "tables_affected": 2, "elapsed_seconds": 30}
+        // PRD：{"status": "restored", "target": "...", "elapsed_seconds": 30}
+        // tables_affected 来源于 preview，apply 路径不再回带，由 CLI 不强求字段。
         (0, output_1.emitOk)((0, output_1.snakeCaseKeys)({
             status: result.status ?? "restored",
             target: result.target,
-            tablesAffected: result.tablesAffected,
             elapsedSeconds: result.elapsedSeconds ?? 0,
         }));
         return;
     }
     const tty = (0, render_1.isStdoutTty)();
     const prefix = tty ? "✓" : "OK";
-    (0, output_1.emit)(`${prefix} Database restored to ${result.target} ` +
-        `(${String(result.tablesAffected)} tables affected, ${String(result.elapsedSeconds ?? 0)}s elapsed)`);
+    (0, output_1.emit)(`${prefix} Database restore triggered for ${result.target} ` +
+        `(${String(result.elapsedSeconds ?? 0)}s elapsed)`);
+}
+/**
+ * 触发 PITR 预览任务并轮询到终态：
+ *   1. POST /db/recovery dryRun=true → previewRequestId
+ *   2. GET /db/recovery/preview?previewRequestId 直到 previewStatus=success/failed
+ *
+ * 错误透传：业务错误（窗口超限 / 格式错）由 dataloom 直接 throw，CLI 在 catch 里
+ * 补 hint。failed 状态下 dataloom 已把 errorMessage 翻好，CLI 包成 k_dl_1300036
+ * 让 decorateRecoveryError 命中窗口超限 hint。
+ */
+async function runRecoveryPreview(appId, ts) {
+    let triggered;
+    try {
+        triggered = await api.db.recover({ appId, target: ts, dryRun: true });
+    }
+    catch (err) {
+        throw decorateRecoveryError(err);
+    }
+    if (triggered.previewRequestId === undefined || triggered.previewRequestId === "") {
+        throw new error_1.AppError("INTERNAL_DB_ERROR", "recovery diff did not return previewRequestId");
+    }
+    const previewRequestId = triggered.previewRequestId;
+    try {
+        return await (0, poll_1.pollUntilDone)({
+            label: "recovery preview",
+            intervalMs: 1000,
+            fetch: () => api.db.getRecoveryPreview({ appId, previewRequestId }),
+            isDone: (cur) => {
+                // dataloom 内部 pgsvc 返回首字母大写枚举（Pending/Running/Success/Failed），
+                // 但 admin-inner thrift 契约里写的是小写。客户端做大小写归一兜底，避免依赖
+                // 上游 case 一致性导致死循环。
+                const status = cur.previewStatus.toLowerCase();
+                if (status === "success")
+                    return { done: true, value: cur };
+                if (status === "failed") {
+                    // 复用 k_dl_1300036（窗口超限 / 预览失败的统一对外码），让 decorateRecoveryError
+                    // 命中后给 PITR 7 天窗口的 hint。errorMessage 优先用 dataloom 翻好的 PRD 文案。
+                    throw new error_1.AppError("DB_API_k_dl_1300036", cur.errorMessage ?? "recovery preview failed");
+                }
+                return { done: false };
+            },
+        });
+    }
+    catch (err) {
+        throw decorateRecoveryError(err);
+    }
 }
 // ── helpers ──
 /**
- * 把用户传入的时间统一成 ISO 8601 UTC。
- * 接受：`YYYY-MM-DD` / `YYYY-MM-DD HH:MM:SS` / 完整 ISO 8601。
+ * 把用户传入的时间统一成 ISO 8601 UTC。PRD 只接受两种格式：
+ *   - `YYYY-MM-DD`（按 UTC 0 点解释）
+ *   - 完整 ISO 8601 `YYYY-MM-DDTHH:MM:SS[Z|±HH:MM]`
+ *
+ * 严格 regex 匹配 + 不用 new Date(input) 兜底——Node Date 解析 `2026/04/15` 这种
+ * 非 ISO 字符串居然成功（落到本地时区），绕过格式校验把脏值送到后端，导致用户拿到
+ * 「窗口超限」错误而不是「格式错误」。PRD 明确这两种格式以外的都应该报 INVALID_TIMESTAMP。
  */
 function normalizeTimestamp(input) {
-    const FORMAT_HINT = "Use ISO 8601 / yyyy-mm-dd / yyyy-mm-dd HH:MM:SS.";
+    // PRD hint 文案对齐 PRD 截图（同时是 dataloom 端 ErrInvalidTimestamp 的 hint）
+    const FORMAT_HINT = "Use ISO 8601 format, e.g. 2026-04-15 or 2026-04-15T10:00:00Z";
     if (input === "") {
         throw new error_1.AppError("ARGS_INVALID", "target timestamp is required", {
             next_actions: ["Usage: miaoda db recovery diff|apply <timestamp>"],
         });
     }
+    // 仅日期：YYYY-MM-DD → 按 UTC 0 点
     if (/^\d{4}-\d{2}-\d{2}$/.test(input)) {
-        return new Date(`${input}T00:00:00Z`).toISOString();
-    }
-    if (/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}(:\d{2})?$/.test(input)) {
-        const d = new Date(input.replace(" ", "T"));
+        const d = new Date(`${input}T00:00:00Z`);
         if (Number.isNaN(d.getTime())) {
             throw new error_1.AppError("INVALID_TIMESTAMP", `Invalid timestamp format '${input}'`, {
                 next_actions: [FORMAT_HINT],
@@ -122,13 +165,20 @@ function normalizeTimestamp(input) {
         }
         return d.toISOString();
     }
-    const d = new Date(input);
-    if (Number.isNaN(d.getTime())) {
-        throw new error_1.AppError("INVALID_TIMESTAMP", `Invalid timestamp format '${input}'`, {
-            next_actions: [FORMAT_HINT],
-        });
+    // 完整 ISO 8601 datetime：T 分隔，秒可选 ms，Z 或 ±HH:MM 时区
+    if (/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:?\d{2})$/.test(input)) {
+        const d = new Date(input);
+        if (Number.isNaN(d.getTime())) {
+            throw new error_1.AppError("INVALID_TIMESTAMP", `Invalid timestamp format '${input}'`, {
+                next_actions: [FORMAT_HINT],
+            });
+        }
+        return d.toISOString();
     }
-    return d.toISOString();
+    // 其它一律按格式错误拒绝（`2026/04/15` / `2026.04.15` / `2026年4月15日` 等都走这里）
+    throw new error_1.AppError("INVALID_TIMESTAMP", `Invalid timestamp format '${input}'`, {
+        next_actions: [FORMAT_HINT],
+    });
 }
 // PRD diff 输出（结构化 prose）：
 //   Recovery preview (→ 2026-04-15T10:00:00Z):
@@ -138,12 +188,15 @@ function normalizeTimestamp(input) {
 //     orders:  table will be restored (was dropped at 10:25:00)
 //
 //     estimated time: ~30s
-function renderDiff(result) {
+function renderDiff(target, preview) {
+    const changes = preview.changes ?? [];
+    const tablesAffected = preview.tablesAffected ?? changes.length;
+    const estimated = preview.estimatedSeconds;
     if ((0, output_1.isJsonMode)()) {
         (0, output_1.emitOk)((0, output_1.snakeCaseKeys)({
-            target: result.target,
-            tablesAffected: result.tablesAffected,
-            changes: result.changes.map((c) => ({
+            target,
+            tablesAffected,
+            changes: changes.map((c) => ({
                 table: c.table,
                 inserted: c.inserted,
                 deleted: c.deleted,
@@ -151,28 +204,28 @@ function renderDiff(result) {
                 action: c.action,
                 droppedAt: c.droppedAt,
             })),
-            estimatedSeconds: result.estimatedSeconds ?? 0,
+            estimatedSeconds: estimated ?? 0,
         }));
         return;
     }
     const tty = (0, render_1.isStdoutTty)();
     const arrow = tty ? "→" : "->";
-    if (result.changes.length === 0) {
-        (0, output_1.emit)(`Recovery preview (${arrow} ${result.target}):\n\n` +
+    if (changes.length === 0) {
+        (0, output_1.emit)(`Recovery preview (${arrow} ${target}):\n\n` +
             `  No changes — database is already at this state.`);
         return;
     }
     const lines = [
-        `Recovery preview (${arrow} ${result.target}):`,
+        `Recovery preview (${arrow} ${target}):`,
         "",
-        `  tables affected: ${String(result.tablesAffected)}`,
+        `  tables affected: ${String(tablesAffected)}`,
     ];
-    for (const c of result.changes) {
+    for (const c of changes) {
         lines.push(`  ${c.table}:  ${describeChange(c)}`);
     }
-    if (result.estimatedSeconds !== undefined) {
+    if (estimated !== undefined) {
         lines.push("");
-        lines.push(`  estimated time: ~${String(result.estimatedSeconds)}s`);
+        lines.push(`  estimated time: ~${String(estimated)}s`);
     }
     (0, output_1.emit)(lines.join("\n"));
 }

package/dist/utils/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setRuntimeHttpClient = exports.setHttpClient = exports.resetHttpClient = exports.getRuntimeHttpClient = exports.getHttpClient = exports.log = exports.debug = exports.isJsonMode = exports.emitError = exports.emit = exports.getLogId = exports.generateLogId = exports.initConfigFromOpts = exports.resetConfig = exports.setConfig = exports.getConfig = exports.HttpError = exports.AppError = void 0;
+exports.pollUntilDone = exports.setRuntimeHttpClient = exports.setHttpClient = exports.resetHttpClient = exports.getRuntimeHttpClient = exports.getHttpClient = exports.log = exports.debug = exports.isJsonMode = exports.emitError = exports.emit = exports.getLogId = exports.generateLogId = exports.initConfigFromOpts = exports.resetConfig = exports.setConfig = exports.getConfig = exports.HttpError = exports.AppError = void 0;
 var error_1 = require("./error");
 Object.defineProperty(exports, "AppError", { enumerable: true, get: function () { return error_1.AppError; } });
 Object.defineProperty(exports, "HttpError", { enumerable: true, get: function () { return error_1.HttpError; } });
@@ -25,3 +25,5 @@ Object.defineProperty(exports, "getRuntimeHttpClient", { enumerable: true, get:
 Object.defineProperty(exports, "resetHttpClient", { enumerable: true, get: function () { return http_1.resetHttpClient; } });
 Object.defineProperty(exports, "setHttpClient", { enumerable: true, get: function () { return http_1.setHttpClient; } });
 Object.defineProperty(exports, "setRuntimeHttpClient", { enumerable: true, get: function () { return http_1.setRuntimeHttpClient; } });
+var poll_1 = require("./poll");
+Object.defineProperty(exports, "pollUntilDone", { enumerable: true, get: function () { return poll_1.pollUntilDone; } });

package/dist/utils/poll.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pollUntilDone = pollUntilDone;
+const error_1 = require("../utils/error");
+async function pollUntilDone(opts) {
+    const interval = opts.intervalMs ?? 1000;
+    const timeout = opts.timeoutMs ?? 300_000;
+    const deadline = Date.now() + timeout;
+    // 立即拉一次（绝大多数轻量任务在 dataloom 端已是同步语义，第一次 fetch 就能拿到 success）
+    for (;;) {
+        const cur = await opts.fetch();
+        const verdict = opts.isDone(cur);
+        if (verdict.done)
+            return verdict.value;
+        if (Date.now() + interval > deadline) {
+            throw new error_1.AppError("TASK_TIMEOUT", `${opts.label} did not complete within ${String(Math.round(timeout / 1000))}s`, {
+                next_actions: [
+                    "The task may still be running server-side. Retry the command, or check `miaoda db migration diff` to verify final state.",
+                ],
+            });
+        }
+        await sleep(interval);
+    }
+}
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/miaoda-cli",
-  "version": "0.1.2-alpha.d0d2ae1",
+  "version": "0.1.2-alpha.d5d1878",
   "description": "Miaoda 平台命令行工具，面向 Agent 调用",
   "type": "commonjs",
   "bin": {