@lark-apaas/miaoda-cli 0.1.0-alpha.41ce8f5 → 0.1.0-alpha.5f650e8

package/dist/api/db/api.js

@@ -5,8 +5,6 @@ exports.getSchema = getSchema;
 exports.importData = importData;
 exports.exportData = exportData;
 const http_1 = require("../../utils/http");
-// TODO(REMOVE-BEFORE-RELEASE): debug-only HTTP trace（详见 _debug_trace.ts）
-const _debug_trace_1 = require("./_debug_trace");
 const error_1 = require("../../utils/error");
 const client_1 = require("./client");
 // CLI 不再为 dbBranch 设默认值：
@@ -26,16 +24,9 @@ async function execSql(opts) {
     const url = (0, client_1.buildInnerUrl)(opts.appId, "/db/sql", {
         dbBranch: opts.dbBranch,
     });
-    let response;
-    try {
-        (0, _debug_trace_1.traceRequest)("POST", url, client);
-        response = await client.post(url, { sql: opts.sql });
-        (0, _debug_trace_1.traceResponse)("POST", url, response.status, response.headers, client);
-    }
-    catch (err) {
-        (0, _debug_trace_1.traceError)("POST", url, err, client);
-        throw err;
-    }
+    const start = Date.now();
+    const response = await client.post(url, { sql: opts.sql });
+    (0, client_1.traceHttp)("POST", url, start, response);
     if (!response.ok) {
         // 4xx / 5xx：尝试解析 body 取 status_code 映射业务错误
         let body = null;
@@ -68,16 +59,9 @@ async function getSchema(opts) {
         includeStats: opts.includeStats ? "true" : undefined,
         dbBranch: opts.dbBranch,
     });
-    let response;
-    try {
-        (0, _debug_trace_1.traceRequest)("GET", url, client);
-        response = await client.get(url);
-        (0, _debug_trace_1.traceResponse)("GET", url, response.status, response.headers, client);
-    }
-    catch (err) {
-        (0, _debug_trace_1.traceError)("GET", url, err, client);
-        throw err;
-    }
+    const start = Date.now();
+    const response = await client.get(url);
+    (0, client_1.traceHttp)("GET", url, start, response);
     if (!response.ok) {
         let body = null;
         try {
@@ -93,37 +77,32 @@ async function getSchema(opts) {
     const body = (await response.json());
     return (0, client_1.extractData)(body);
 }
-// ── db data import → InnerImportData ──
+// ── db data import → InnerAdminImportData ──
 /**
  * 导入文件。
- * 后端：POST /v1/dataloom/app/{appId}/data/import?tableName=...&format=csv|json&dbBranch=main
+ * 后端：POST /v1/dataloom/app/{appId}/data/import
  *
- * Body 为原始文件字节（不走 JSON envelope）。
+ * 全字段走 JSON body envelope（idl-larkgw 36125a2f）：
+ *   {tableName, format, records, dbBranch?}
+ *
+ * `records` 字段携带 CSV / JSON 文本内容（utf8 字符串），与 dataloom 上
+ * Import/ExportAdminRecords 命名风格对齐。CLI 端把 Buffer 解码成 utf8
+ * 字符串后塞进 envelope 即可。
  */
 async function importData(opts) {
     const client = (0, http_1.getHttpClient)();
-    const url = (0, client_1.buildInnerUrl)(opts.appId, "/data/import", {
+    const url = (0, client_1.buildInnerUrl)(opts.appId, "/data/import");
+    const reqBody = {
         tableName: opts.tableName,
         format: opts.format,
-        dbBranch: opts.dbBranch,
-    });
-    const contentType = opts.format === "csv" ? "text/csv" : "application/json";
-    const ab = opts.body.buffer.slice(opts.body.byteOffset, opts.body.byteOffset + opts.body.byteLength);
-    let response;
-    try {
-        (0, _debug_trace_1.traceRequest)("POST", url, client);
-        response = await client.request({
-            method: "POST",
-            url,
-            headers: { "Content-Type": contentType },
-            body: ab,
-        });
-        (0, _debug_trace_1.traceResponse)("POST", url, response.status, response.headers, client);
-    }
-    catch (err) {
-        (0, _debug_trace_1.traceError)("POST", url, err, client);
-        throw err;
+        records: opts.body.toString("utf8"),
+    };
+    if (opts.dbBranch !== undefined && opts.dbBranch !== "") {
+        reqBody.dbBranch = opts.dbBranch;
     }
+    const start = Date.now();
+    const response = await client.post(url, reqBody);
+    (0, client_1.traceHttp)("POST", url, start, response);
     if (!response.ok) {
         let body = null;
         try {
@@ -136,40 +115,37 @@ async function importData(opts) {
             (0, client_1.extractData)(body);
         throw new error_1.HttpError(response.status, url, `Failed to import data: ${String(response.status)} ${response.statusText}`);
     }
-    // 后端 InnerImportData 响应里 data 直接返 {tableName, rows, durationMs}
+    // 后端 InnerAdminImportData 响应里 data 直接返 {tableName, recordCount, durationMs}
     const body = (await response.json());
     const data = (0, client_1.extractData)(body);
     return {
         tableName: data.tableName ?? opts.tableName,
-        rows: data.rows ?? 0,
+        recordCount: data.recordCount ?? 0,
         durationMs: data.durationMs ?? 0,
     };
 }
-// ── db data export → InnerExportData ──
+// ── db data export → InnerAdminExportData ──
 /**
  * 导出数据。
- * 后端：POST /v1/dataloom/app/{appId}/data/export?tableName=...&format=csv|json&dbBranch=main
+ * 后端：POST /v1/dataloom/app/{appId}/data/export?tableName=...&format=csv|json&limit=5000&dbBranch=main
  *
- * 响应 body 为原始 CSV/JSON 字节（不走 envelope）。错误仍通过 HTTP 4xx/5xx + BaseResp 传达。
+ * 所有参数（含 limit）均按 IDL `api.query` 走 query string；HTTP 方法是 POST（对齐
+ * inner_api 网关插件路由约定，与 InnerAdminExecuteSQL 同 method）。请求体为空。
+ * 响应 body 为原始 CSV/JSON 字节，RecordCount 通过响应头 `X-Miaoda-Record-Count`
+ * 回传，错误仍走 HTTP 4xx/5xx + envelope。
  */
 async function exportData(opts) {
     const client = (0, http_1.getHttpClient)();
     const url = (0, client_1.buildInnerUrl)(opts.appId, "/data/export", {
         tableName: opts.tableName,
         format: opts.format,
+        limit: String(opts.limit ?? 5000),
         dbBranch: opts.dbBranch,
     });
-    const reqBody = { limit: opts.limit ?? 5000 };
-    let response;
-    try {
-        (0, _debug_trace_1.traceRequest)("POST", url, client);
-        response = await client.post(url, reqBody);
-        (0, _debug_trace_1.traceResponse)("POST", url, response.status, response.headers, client);
-    }
-    catch (err) {
-        (0, _debug_trace_1.traceError)("POST", url, err, client);
-        throw err;
-    }
+    // POST + 空 body：所有业务参数都在 query 里
+    const start = Date.now();
+    const response = await client.request({ method: "POST", url });
+    (0, client_1.traceHttp)("POST", url, start, response);
     if (!response.ok) {
         // 错误路径：body 是 JSON envelope
         let body = null;
@@ -183,7 +159,8 @@ async function exportData(opts) {
             (0, client_1.extractData)(body);
         throw new error_1.HttpError(response.status, url, `Failed to export data: ${String(response.status)} ${response.statusText}`);
     }
-    // 成功路径：响应 body 是原始 CSV/JSON 字节
+    // 成功路径：响应 body 通常是原始 CSV/JSON 字节，但部分错误场景下网关会返
+    // HTTP 200 + JSON envelope（status_code != "0"），需要在这里嗅探兜底。
     const contentType = response.headers.get("Content-Type") ??
         (opts.format === "csv" ? "text/csv" : "application/json");
     const ab = await response.arrayBuffer();
@@ -191,10 +168,33 @@ async function exportData(opts) {
     if (buf.length === 0) {
         throw new error_1.AppError("INTERNAL_DB_ERROR", "Empty export response body");
     }
+    // Envelope sniff：HTTP 200 + Content-Type 为 application/json + body 解析得到
+    // InnerEnvelope 且 status_code 非 "0" 时，按业务错误抛出。
+    // 仅 CSV 格式做 sniff —— JSON 格式正常成功响应也是 application/json，会误判。
+    if (opts.format === "csv" && /application\/json/i.test(contentType)) {
+        try {
+            const parsed = JSON.parse(buf.toString("utf8"));
+            if (parsed.status_code != null && parsed.status_code !== "0") {
+                // 复用 extractData 的错误映射逻辑（throw AppError）
+                (0, client_1.extractData)(parsed);
+            }
+        }
+        catch (err) {
+            // 已经被 extractData 抛成 AppError → 透传；否则 JSON.parse 失败说明 body
+            // 真的是 CSV 文本，继续按成功流程走
+            if (err instanceof error_1.AppError)
+                throw err;
+        }
+    }
+    // 后端通过响应头回传记录数（避免污染 body）；header 缺失或解析失败 → undefined
+    const recordCountHeader = response.headers.get("X-Miaoda-Record-Count");
+    const parsedCount = recordCountHeader != null ? Number(recordCountHeader) : NaN;
+    const recordCount = Number.isFinite(parsedCount) && parsedCount >= 0 ? parsedCount : undefined;
     return {
         tableName: opts.tableName,
         format: opts.format,
         contentType,
         body: buf,
+        recordCount,
     };
 }

package/dist/api/db/client.js

@@ -1,10 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SQLSTATE_MAP = void 0;
+exports.traceHttp = traceHttp;
 exports.ensureInnerSuccess = ensureInnerSuccess;
 exports.extractData = extractData;
 exports.buildInnerUrl = buildInnerUrl;
 const error_1 = require("../../utils/error");
+const logger_1 = require("../../utils/logger");
+/**
+ * 输出一条 HTTP 调试日志（仅 --verbose 模式生效）。
+ *
+ * 主要用于把后端返回的 `x-tt-logid` 透出给用户，方便拿这个 id 去 server / 网关日志里
+ * 直接定位本次请求的 `[MiaodaCLI.metric]` 行与上下游 trace。
+ *
+ * 使用约定：
+ *   const start = Date.now();
+ *   const response = await client.post(url, body);
+ *   traceHttp("POST", url, start, response);
+ *   // 或错误路径：traceHttp("POST", url, start, err.response, err)
+ */
+function traceHttp(method, url, start, response, err) {
+    // debug() 内部已判断 verbose 开关，这里不重复判断；保持调用点轻量
+    try {
+        const cost = Date.now() - start;
+        const status = response?.status ?? 0;
+        const logid = response?.headers?.get?.("x-tt-logid") ?? "-";
+        if (err !== undefined) {
+            const errMsg = err instanceof Error
+                ? err.message
+                : typeof err === "string"
+                    ? err
+                    : JSON.stringify(err);
+            (0, logger_1.debug)(`http ${method} ${url} ${String(status)} cost=${String(cost)}ms x-tt-logid=${logid} err=${errMsg}`);
+            return;
+        }
+        (0, logger_1.debug)(`http ${method} ${url} ${String(status)} cost=${String(cost)}ms x-tt-logid=${logid}`);
+    }
+    catch {
+        // debug 失败不应影响业务，吞掉
+    }
+}
 /**
  * 校验 dataloom InnerAPI 响应的 envelope。
  *
@@ -19,12 +54,16 @@ function ensureInnerSuccess(body) {
     const code = body.status_code ?? body.ErrorCode ?? "0";
     if (code === "0" || code === "")
         return;
-    const message = body.error_msg ?? body.ErrorMessage ?? `dataloom API error [${code}]`;
+    const message = stripPgPrefix(body.error_msg ?? body.ErrorMessage ?? `dataloom API error [${code}]`);
+    // PRD 多语句失败：后端在 envelope 顶层透出 errorStatementIndex（从 0 起计），
+    // 单语句 / 单元执行不会带这个字段。下面的 AppError 都把它带上，让最终
+    // CLI JSON envelope 写到 error.statement_index。
+    const stmtIdx = typeof body.errorStatementIndex === "number" ? body.errorStatementIndex : undefined;
     // k_dl_1300002 是 PG 执行透传错误；error_msg 里常带 SQLSTATE，优先按 SQLSTATE 映射
     if (code === "k_dl_1300002") {
         const sqlstate = extractSqlstate(message);
         if (sqlstate && exports.SQLSTATE_MAP[sqlstate]) {
-            throw new error_1.AppError(exports.SQLSTATE_MAP[sqlstate], message);
+            throw new error_1.AppError(exports.SQLSTATE_MAP[sqlstate], message, { statement_index: stmtIdx });
         }
     }
     // k_dl_1600000 是 dataloom 通用参数错误，不能整体映射；
@@ -35,7 +74,7 @@ function ensureInnerSuccess(body) {
     if (code === "k_dl_1600000" && message.startsWith("Invalid DB Branch")) {
         throw new error_1.AppError("MULTI_ENV_NOT_INITIALIZED", "--env is not available (multi-env not initialized)", {
             next_actions: [
-                "Verify the --env value matches an existing dbBranch, or run `miaoda db migration init` to set up multi-env for this app.",
+                "Verify the --env value matches an existing dbBranch.",
             ],
         });
     }
@@ -44,10 +83,19 @@ function ensureInnerSuccess(body) {
     if (mapped) {
         throw new error_1.AppError(mapped.code, mapped.message ?? message, {
             next_actions: mapped.hint ? [mapped.hint] : undefined,
+            statement_index: stmtIdx,
         });
     }
     // 兜底：dataloom 未映射的 code 原样透传
-    throw new error_1.AppError(`DB_API_${code}`, message);
+    throw new error_1.AppError(`DB_API_${code}`, message, { statement_index: stmtIdx });
+}
+/**
+ * 剥掉 PG 透传错误的 "ERROR:" 前缀：CLI 输出本身就会前缀 "Error:"，
+ * 不去掉就会变成 `Error: ERROR: relation ...` 双重前缀，PRD 不要这种冗余。
+ * 大小写敏感，只匹配 PG 标准格式。
+ */
+function stripPgPrefix(msg) {
+    return msg.replace(/^ERROR:\s*/, "");
 }
 /** 从 PG 执行错误消息里提取 "(SQLSTATE XXXXX)"。 */
 function extractSqlstate(msg) {

package/dist/api/db/parsers.js

@@ -27,16 +27,23 @@ function parseSqlResult(r) {
             recordCount: r.recordCount ?? rows.length,
         };
     }
-    if (r.sqlType === "INSERT" || r.sqlType === "UPDATE" || r.sqlType === "DELETE") {
+    if (r.sqlType === "INSERT" ||
+        r.sqlType === "UPDATE" ||
+        r.sqlType === "DELETE" ||
+        r.sqlType === "MERGE" ||
+        r.sqlType === "DML") {
         const affected = r.affectedRows ?? extractRowCount(r.data);
         return {
             kind: "dml",
+            // 上面已 narrow，这里 cast 是为了 SqlType 联合里的 (string & {}) 让 TS 无法
+            // 自动收窄到字面量集合，不影响运行时安全
             sqlType: r.sqlType,
             affectedRows: affected,
         };
     }
-    // DDL or unknown
-    return { kind: "ddl" };
+    // DDL or unknown — sqlType 透传后端给的细粒度（CREATE_TABLE / DROP_TABLE / ...
+    //  / 笼统 "DDL"），CLI JSON 输出直接当 command 用
+    return { kind: "ddl", sqlType: r.sqlType };
 }
 /** DML 的 data 通常是 `[{"rowCount": N}]`；兜底从这里读影响行数。 */
 function extractRowCount(data) {
@@ -82,7 +89,6 @@ function toSummary(t, stats) {
         columns: (t.fields ?? []).length,
         estimated_row_count: typeof stats?.estimatedRowCount === "number" ? stats.estimatedRowCount : null,
         size_bytes: typeof stats?.sizeBytes === "number" ? stats.sizeBytes : null,
-        updated_at: t.updatedAt,
     };
 }
 /**
@@ -118,8 +124,6 @@ function toDetail(t, stats) {
         indexes: rawIndexes.map(toIndex),
         estimated_row_count: typeof stats?.estimatedRowCount === "number" ? stats.estimatedRowCount : null,
         size_bytes: typeof stats?.sizeBytes === "number" ? stats.sizeBytes : null,
-        created_at: t.createdAt,
-        updated_at: t.updatedAt,
     };
 }
 function toColumn(f) {

package/dist/api/file/api.js

@@ -214,7 +214,7 @@ async function resolveByName(appId, input) {
             error: {
                 code: "FILE_NOT_FOUND",
                 message: `File '${input}' does not exist`,
-                hint: "Run `miaoda file ls` to verify file_name.",
+                hint: "Run `miaoda file ls` to see available files.",
             },
         };
     }
@@ -225,7 +225,7 @@ async function resolveByName(appId, input) {
             error: {
                 code: "AMBIGUOUS_FILE_NAME",
                 message: `Multiple files match name '${input}' (${String(matches.length)} found)`,
-                hint: `Use absolute /path instead. Run \`miaoda file ls --name ${input}\` to see candidates.`,
+                hint: `Use path instead. Run \`miaoda file ls --name ${input}\` to see candidates.`,
             },
         };
     }
@@ -280,6 +280,7 @@ async function uploadFile(opts) {
         // Node 20+ 内置 fetch 运行时接受 Buffer，但 TS 的 BodyInit 要求更严格的类型；
         // 这里复制到独立 ArrayBuffer 以满足 lib.dom.d.ts 的 BodyInit 约束
         const ab = body.buffer.slice(body.byteOffset, body.byteOffset + body.byteLength);
+        const uploadStart = Date.now();
         const res = await fetch(pre.uploadURL, {
             method: "PUT",
             headers: {
@@ -288,6 +289,7 @@ async function uploadFile(opts) {
             },
             body: ab,
         });
+        (0, logger_1.debug)(`http PUT <upload-cdn> ${String(res.status)} cost=${String(Date.now() - uploadStart)}ms size=${String(opts.fileSize)}`);
         if (!res.ok) {
             throw new error_1.AppError("FILE_UPLOAD_FAILED", `Upload PUT failed with status ${String(res.status)}`);
         }
@@ -364,12 +366,15 @@ async function signDownload(opts) {
  */
 async function downloadFile(opts) {
     let res;
+    const downloadStart = Date.now();
     try {
         res = await fetch(opts.signedURL);
     }
     catch (err) {
+        (0, logger_1.debug)(`http GET <download-cdn> 0 cost=${String(Date.now() - downloadStart)}ms err=${err instanceof Error ? err.message : String(err)}`);
         throw new error_1.AppError("FILE_DOWNLOAD_FAILED", `Download GET failed: ${err instanceof Error ? err.message : String(err)}`);
     }
+    (0, logger_1.debug)(`http GET <download-cdn> ${String(res.status)} cost=${String(Date.now() - downloadStart)}ms`);
     if (!res.ok) {
         throw new error_1.AppError("FILE_DOWNLOAD_FAILED", `Download failed with status ${String(res.status)}`);
     }

package/dist/api/file/client.js

@@ -8,9 +8,34 @@ exports.doPost = doPost;
 exports.doRequest = doRequest;
 const http_1 = require("../../utils/http");
 const error_1 = require("../../utils/error");
-// TODO(REMOVE-BEFORE-RELEASE): debug-only HTTP trace（详见 _debug_trace.ts）
-const _debug_trace_1 = require("./_debug_trace");
+const logger_1 = require("../../utils/logger");
 const http_client_1 = require("@lark-apaas/http-client");
+/**
+ * 输出一条 HTTP 调试日志（仅 --verbose 模式生效）。
+ *
+ * 主要用于把后端返回的 `x-tt-logid` 透出给用户，方便拿这个 id 去 server / 网关日志里
+ * 直接定位本次请求的 `[MiaodaCLI.metric]` 行与上下游 trace。
+ */
+function traceHttp(method, url, start, response, err) {
+    try {
+        const cost = Date.now() - start;
+        const status = response?.status ?? 0;
+        const logid = response?.headers?.get?.("x-tt-logid") ?? "-";
+        if (err !== undefined) {
+            const errMsg = err instanceof Error
+                ? err.message
+                : typeof err === "string"
+                    ? err
+                    : JSON.stringify(err);
+            (0, logger_1.debug)(`http ${method} ${url} ${String(status)} cost=${String(cost)}ms x-tt-logid=${logid} err=${errMsg}`);
+            return;
+        }
+        (0, logger_1.debug)(`http ${method} ${url} ${String(status)} cost=${String(cost)}ms x-tt-logid=${logid}`);
+    }
+    catch {
+        // debug 失败不应影响业务，吞掉
+    }
+}
 /** 进程内 bucket 缓存：{appId: bucketId}。不跨进程。 */
 const bucketCache = new Map();
 /**
@@ -132,57 +157,42 @@ async function mapHttpError(err, opts) {
  * 通过第三个参数显式传入 getRuntimeHttpClient() 切换。
  */
 async function doGet(url, opts = {}, client = (0, http_1.getHttpClient)()) {
+    const start = Date.now();
     try {
-        (0, _debug_trace_1.traceRequest)("GET", url, client);
         const response = await client.get(url);
-        (0, _debug_trace_1.traceResponse)("GET", url, response.status, response.headers, client);
+        traceHttp("GET", url, start, response);
         return (await response.json());
     }
     catch (err) {
-        if (err instanceof http_client_1.HttpError && err.response) {
-            (0, _debug_trace_1.traceResponse)("GET", url, err.response.status, err.response.headers, client);
-        }
-        else {
-            (0, _debug_trace_1.traceError)("GET", url, err, client);
-        }
+        traceHttp("GET", url, start, err instanceof http_client_1.HttpError ? err.response : undefined, err);
         await mapHttpError(err, opts);
         throw err; // 不可达，mapHttpError 必定 throw
     }
 }
 /** 包一层 client.post + HttpError 统一映射。默认 admin innerapi，可显式切 runtime。 */
 async function doPost(url, body, opts = {}, client = (0, http_1.getHttpClient)()) {
+    const start = Date.now();
     try {
-        (0, _debug_trace_1.traceRequest)("POST", url, client);
         const response = await client.post(url, body);
-        (0, _debug_trace_1.traceResponse)("POST", url, response.status, response.headers, client);
+        traceHttp("POST", url, start, response);
         return (await response.json());
     }
     catch (err) {
-        if (err instanceof http_client_1.HttpError && err.response) {
-            (0, _debug_trace_1.traceResponse)("POST", url, err.response.status, err.response.headers, client);
-        }
-        else {
-            (0, _debug_trace_1.traceError)("POST", url, err, client);
-        }
+        traceHttp("POST", url, start, err instanceof http_client_1.HttpError ? err.response : undefined, err);
         await mapHttpError(err, opts);
         throw err;
     }
 }
 /** 包一层 client.request + HttpError 统一映射（DELETE 带 body 的场景）。 */
 async function doRequest(cfg, opts = {}, client = (0, http_1.getHttpClient)()) {
+    const start = Date.now();
     try {
-        (0, _debug_trace_1.traceRequest)(cfg.method, cfg.url, client);
         const response = await client.request(cfg);
-        (0, _debug_trace_1.traceResponse)(cfg.method, cfg.url, response.status, response.headers, client);
+        traceHttp(cfg.method, cfg.url, start, response);
         return (await response.json());
     }
     catch (err) {
-        if (err instanceof http_client_1.HttpError && err.response) {
-            (0, _debug_trace_1.traceResponse)(cfg.method, cfg.url, err.response.status, err.response.headers, client);
-        }
-        else {
-            (0, _debug_trace_1.traceError)(cfg.method, cfg.url, err, client);
-        }
+        traceHttp(cfg.method, cfg.url, start, err instanceof http_client_1.HttpError ? err.response : undefined, err);
         await mapHttpError(err, opts);
         throw err;
     }