@adep/cli 0.5.0 → 0.5.1

package/dist/index.js

@@ -8472,6 +8472,163 @@ var init_hash = __esm({
   }
 });
 
+// packages/cli/src/publish-checks.ts
+import { posix as posix3 } from "node:path";
+function formatFindings(findings) {
+  const lines = findings.map(
+    (finding) => `${finding.file}:${finding.line} [${finding.rule}] ${finding.severity === "error" ? "\u5371\u9669" : "\u8B66\u544A"}\uFF1A${finding.message}`
+  );
+  return [`\u53D1\u5E03\u524D\u9759\u6001\u6821\u9A8C\u53D1\u73B0 ${findings.length} \u4E2A\u95EE\u9898\uFF1A`, ...lines, "\u4FEE\u590D\u540E\u91CD\u8BD5\uFF1Bwarn \u7EA7\u53EF\u7528 --force \u653E\u884C\uFF0Cerror \u7EA7\u4E0D\u53EF\u653E\u884C\u3002"].join(
+    "\n"
+  );
+}
+function locate(content, index) {
+  const before = content.slice(0, index);
+  const line = before.split("\n").length;
+  const start = before.lastIndexOf("\n") + 1;
+  const end = content.indexOf("\n", index);
+  return { line, text: content.slice(start, end === -1 ? content.length : end) };
+}
+function checkFilePath(functionName, file2) {
+  const normalized = file2.split("\\").join("/");
+  const segments = normalized.split("/");
+  const escapes = normalized.startsWith("/") || segments.some((s) => ESCAPE_KEY_SEGMENTS.has(s));
+  if (!escapes) return [];
+  return [
+    {
+      rule: "PATH_ESCAPE",
+      severity: "error",
+      functionName,
+      file: file2,
+      line: 1,
+      message: `bundle \u952E\u4E0D\u80FD\u662F\u7EDD\u5BF9\u8DEF\u5F84\u6216\u5305\u542B ".."\uFF08\u6536\u5230 "${file2}"\uFF09`
+    }
+  ];
+}
+function checkImportSpecifiers(functionName, file2, content) {
+  const findings = [];
+  for (const matched of content.matchAll(IMPORT_SPECIFIER)) {
+    const specifier = matched[1] ?? "";
+    if (!specifier.startsWith(".")) continue;
+    const resolved = posix3.normalize(posix3.join(posix3.dirname(file2.split("\\").join("/")), specifier));
+    if (!resolved.startsWith("..") && !posix3.isAbsolute(resolved)) continue;
+    const { line } = locate(content, matched.index ?? 0);
+    findings.push({
+      rule: "PATH_ESCAPE",
+      severity: "error",
+      functionName,
+      file: file2,
+      line,
+      message: `import "${specifier}" \u89E3\u6790\u5230 "${resolved}"\uFF0C\u9003\u51FA\u51FD\u6570 bundle \u6839`
+    });
+  }
+  return findings;
+}
+function checkSqlConcat(functionName, file2, content) {
+  const findings = [];
+  for (const matched of content.matchAll(SQL_CALL)) {
+    const arg = matched.groups?.["arg"] ?? "";
+    if (!SQL_KEYWORD.test(arg) || !CONCAT_OR_TEMPLATE.test(arg)) continue;
+    const { line } = locate(content, matched.index ?? 0);
+    findings.push({
+      rule: "SQL_CONCAT",
+      severity: "error",
+      functionName,
+      file: file2,
+      line,
+      message: "SQL \u8BED\u53E5\u542B\u5B57\u7B26\u4E32\u62FC\u63A5 / \u6A21\u677F\u63D2\u503C\uFF1B\u6539\u7528\u53C2\u6570\u5316\u5360\u4F4D\u7B26\uFF08? / $1\uFF09"
+    });
+  }
+  return findings;
+}
+function checkSecrets(functionName, file2, content) {
+  const findings = [];
+  const lines = content.split("\n");
+  lines.forEach((text, index) => {
+    for (const rule of SECRET_RULES) {
+      if (!rule.pattern.test(text)) continue;
+      findings.push({
+        rule: "SECRET_LITERAL",
+        severity: rule.severity,
+        functionName,
+        file: file2,
+        line: index + 1,
+        message: rule.message
+      });
+    }
+  });
+  return findings;
+}
+function collectPrecheckFindings(functions) {
+  const findings = [];
+  for (const [functionName, files] of Object.entries(functions).toSorted(
+    ([a], [b]) => a.localeCompare(b)
+  )) {
+    const sortedFiles = Object.entries(files).toSorted(([a], [b]) => a.localeCompare(b));
+    for (const [file2, content] of sortedFiles) {
+      findings.push(...checkFilePath(functionName, file2));
+      findings.push(...checkImportSpecifiers(functionName, file2, content));
+      findings.push(...checkSqlConcat(functionName, file2, content));
+      findings.push(...checkSecrets(functionName, file2, content));
+    }
+  }
+  const seen = /* @__PURE__ */ new Set();
+  return findings.filter((finding) => {
+    const key = `${finding.rule}|${finding.functionName}|${finding.file}|${finding.line}|${finding.message}`;
+    if (seen.has(key)) return false;
+    seen.add(key);
+    return true;
+  }).toSorted(
+    (a, b) => a.file.localeCompare(b.file) || a.line - b.line || a.rule.localeCompare(b.rule)
+  );
+}
+function assertPrechecks(functions, options = {}) {
+  const findings = collectPrecheckFindings(functions);
+  const errors = findings.filter((finding) => finding.severity === "error");
+  const warnings = findings.filter((finding) => finding.severity === "warn");
+  if (errors.length > 0) throw new PrecheckError(findings);
+  if (warnings.length > 0 && options.force !== true) throw new PrecheckError(warnings);
+  return warnings;
+}
+var PrecheckError, ESCAPE_KEY_SEGMENTS, IMPORT_SPECIFIER, SQL_CALL, SQL_KEYWORD, CONCAT_OR_TEMPLATE, SECRET_RULES;
+var init_publish_checks = __esm({
+  "packages/cli/src/publish-checks.ts"() {
+    "use strict";
+    init_auth();
+    PrecheckError = class extends CliError {
+      findings;
+      constructor(findings) {
+        super("PRECHECK_FAILED", formatFindings(findings));
+        this.name = "PrecheckError";
+        this.findings = findings;
+      }
+    };
+    ESCAPE_KEY_SEGMENTS = /* @__PURE__ */ new Set([".."]);
+    IMPORT_SPECIFIER = /(?:from\s*|import\s*|require\s*\(\s*)['"]([^'"]+)['"]/g;
+    SQL_CALL = /\.(?:query|execute|run|all|get|prepare)\s*\(\s*(?<arg>[^\n]*)/g;
+    SQL_KEYWORD = /\b(?:SELECT|INSERT|UPDATE|DELETE|REPLACE|WITH|WHERE|FROM)\b/i;
+    CONCAT_OR_TEMPLATE = /(?:\$\{|`\s*\+|\+\s*['"`]|['"`]\s*\+)/;
+    SECRET_RULES = [
+      {
+        pattern: /-----BEGIN (?:RSA |EC |OPENSSH |DSA )?PRIVATE KEY-----/,
+        message: "\u6E90\u7801\u542B PEM \u79C1\u94A5\u660E\u6587",
+        severity: "error"
+      },
+      { pattern: /AKIA[0-9A-Z]{16}/, message: "\u6E90\u7801\u542B AWS Access Key \u660E\u6587", severity: "error" },
+      {
+        pattern: /(?:sk|pk)_(?:live|test)_[0-9A-Za-z]{16,}/,
+        message: "\u6E90\u7801\u542B\u652F\u4ED8\u6E20\u9053\u5BC6\u94A5\u660E\u6587",
+        severity: "error"
+      },
+      {
+        pattern: /(?:password|passwd|secret|api[_-]?key|access[_-]?token)\s*[:=]\s*['"][^'"]{8,}['"]/i,
+        message: "\u7591\u4F3C\u5BC6\u94A5 / \u53E3\u4EE4\u786C\u7F16\u7801\uFF1B\u6539\u4ECE ctx.env / \u5E73\u53F0\u73AF\u5883\u53D8\u91CF\u8BFB\u53D6",
+        severity: "warn"
+      }
+    ];
+  }
+});
+
 // packages/cli/src/deploy.ts
 var deploy_exports = {};
 __export(deploy_exports, {
@@ -8577,6 +8734,10 @@ async function deploy(paths, options) {
   }
   const shared = await collectShared(functionsDir);
   const filesFor = (name) => local[name] ?? {};
+  const precheckWarnings = assertPrechecks(local, { force: options.force === true });
+  for (const finding of precheckWarnings) {
+    log(`[adep] \u6821\u9A8C\u8B66\u544A ${finding.file}:${finding.line} [${finding.rule}] ${finding.message}`);
+  }
   const sharedRows = Object.entries(shared).map(([path, content]) => ({ path, content }));
   const hashFiles = (name) => {
     const filesAsRuntimeSees = mergeSharedSource(filesFor(name), sharedRows);
@@ -8677,6 +8838,7 @@ var init_deploy = __esm({
     init_hash();
     init_dev();
     init_net();
+    init_publish_checks();
     init_shared_source();
     init_shared_source();
     AmbiguousFunctionError = class extends CliError {
@@ -10037,7 +10199,9 @@ var init_git = __esm({
 var functions_exports = {};
 __export(functions_exports, {
   functionsList: () => functionsList,
-  functionsLogs: () => functionsLogs
+  functionsLogs: () => functionsLogs,
+  logsByTrace: () => logsByTrace,
+  resolveProject: () => resolveProject2
 });
 import { resolve as resolve20 } from "node:path";
 async function functionsList(paths, options) {
@@ -10080,6 +10244,22 @@ async function functionsLogs(paths, options) {
   );
   return { functionId: target.id, name: target.name, logs: result.logs };
 }
+async function logsByTrace(paths, options) {
+  const trace = options.trace.trim();
+  if (trace.length === 0) {
+    throw new CliError("INVALID_ARGUMENT", "\u7F3A\u5C11 traceId\uFF1Aadep logs --trace <traceId>");
+  }
+  const client = await createClient(paths);
+  const project2 = await resolveProject2(client, options);
+  const params = new URLSearchParams({ trace });
+  if (options.tail !== void 0) params.set("tail", String(options.tail));
+  const result = await client.request(
+    `/api/v1/projects/${project2.id}/logs?${params.toString()}`,
+    {},
+    "FUNCTION_LOGS_FAILED"
+  );
+  return { projectId: project2.id, slug: project2.slug, traceId: result.traceId, logs: result.logs };
+}
 async function resolveProject2(client, options) {
   const slug = await resolveSlug(resolve20(options.cwd), options.slug);
   const projects = await projectsListFrom(client);
@@ -10104,6 +10284,65 @@ var init_functions = __esm({
   }
 });
 
+// packages/cli/src/rollback.ts
+var rollback_exports = {};
+__export(rollback_exports, {
+  parseVersionFlag: () => parseVersionFlag,
+  rollbackFunctionTo: () => rollbackFunctionTo
+});
+function parseVersionFlag(raw) {
+  const text = (raw ?? "").trim();
+  const matched = /^v?(\d+)$/.exec(text);
+  const version2 = matched === null ? Number.NaN : Number(matched[1]);
+  if (!Number.isInteger(version2) || version2 <= 0) {
+    throw new CliError("INVALID_ARGUMENT", `--to \u987B\u4E3A\u7248\u672C\u53F7\uFF08\u5982 v2 \u6216 2\uFF09\uFF0C\u6536\u5230 "${raw ?? ""}"`);
+  }
+  return version2;
+}
+async function rollbackFunctionTo(paths, options) {
+  if (!Number.isInteger(options.to) || options.to <= 0) {
+    throw new CliError("INVALID_ARGUMENT", `--to \u987B\u4E3A\u6B63\u6574\u6570\uFF0C\u6536\u5230 ${options.to}`);
+  }
+  const client = await createClient(paths);
+  const project2 = await resolveProject2(client, options);
+  const listed = await client.request(
+    `/api/v1/projects/${project2.id}/functions`,
+    {},
+    "FUNCTION_LIST_FAILED"
+  );
+  const target = listed.functions.find((fn) => fn.name === options.name);
+  if (target === void 0) {
+    throw new CliError("FN_NOT_FOUND", `\u51FD\u6570 "${options.name}" \u4E0D\u5B58\u5728\u4E8E\u9879\u76EE "${project2.slug}"`);
+  }
+  const versions = await client.request(`/api/v1/functions/${target.id}/versions`, {}, "FUNCTION_VERSIONS_FAILED");
+  if (!versions.versions.some((version2) => version2.version === options.to)) {
+    const available = versions.versions.map((version2) => `v${version2.version}`).join(", ");
+    throw new CliError(
+      "VERSION_NOT_FOUND",
+      `\u7248\u672C v${options.to} \u4E0D\u5728\u4FDD\u7559\u7A97\u53E3\u5185\uFF08\u5F53\u524D v${versions.current ?? "\u2014"}\uFF1B\u53EF\u7528\uFF1A${available === "" ? "\u65E0" : available}\uFF09`
+    );
+  }
+  const result = await client.request(
+    `/api/v1/functions/${target.id}/rollback`,
+    { method: "POST", body: { version: options.to } },
+    "ROLLBACK_FAILED"
+  );
+  return {
+    functionId: target.id,
+    name: target.name,
+    from: versions.current,
+    to: result.version
+  };
+}
+var init_rollback = __esm({
+  "packages/cli/src/rollback.ts"() {
+    "use strict";
+    init_auth();
+    init_client();
+    init_functions();
+  }
+});
+
 // packages/cli/src/cli.ts
 init_config();
 import { Command } from "commander";
@@ -38765,6 +39004,59 @@ function registerHosting(program2, ctx) {
   });
 }
 
+// packages/cli/src/commands/logs.ts
+init_auth();
+function registerLogs(program2, ctx) {
+  program2.command("logs").description("\u6309 traceId \u67E5\u8BE2\u4E00\u6B21\u8C03\u7528\u94FE\u7684\u65E5\u5FD7\uFF08traceId \u89C1\u9519\u8BEF\u4FE1\u5C01\u6216\u54CD\u5E94\u5934\uFF09").option("--trace <traceId>", "W3C traceId\uFF0832 \u4F4D hex\uFF09").option("--tail <count>", "\u53D6\u6700\u8FD1\u591A\u5C11\u6761\uFF08\u7F3A\u7701 100\uFF0C\u670D\u52A1\u7AEF\u6709\u4E0A\u9650\uFF09").option("-p, --project <slug>", "\u76EE\u6807\u5E73\u53F0\u9879\u76EE slug\uFF08\u7F3A\u7701\u53D6 adep.config.ts \u7684 name\uFF09").action(async (flags) => {
+    const command = ctx.io("logs");
+    await command.run(async () => {
+      const trace = flags.trace?.trim() ?? "";
+      if (trace.length === 0) {
+        throw new CliError("INVALID_ARGUMENT", "\u7F3A\u5C11 --trace\uFF1Aadep logs --trace <traceId>");
+      }
+      const tail = flags.tail === void 0 ? void 0 : Number(flags.tail);
+      if (tail !== void 0 && (!Number.isFinite(tail) || tail <= 0)) {
+        throw new CliError("INVALID_TAIL", `--tail \u987B\u4E3A\u6B63\u6574\u6570\uFF0C\u6536\u5230 "${flags.tail}"`);
+      }
+      const { logsByTrace: logsByTrace2 } = await Promise.resolve().then(() => (init_functions(), functions_exports));
+      const result = await logsByTrace2(ctx.paths, {
+        cwd: ctx.cwd,
+        trace,
+        ...tail === void 0 ? {} : { tail },
+        ...flags.project === void 0 ? {} : { slug: flags.project }
+      });
+      command.ok(result, (data) => {
+        const r = data;
+        if (r.logs.length === 0) {
+          return `\uFF08trace ${r.traceId} \u6682\u65E0\u65E5\u5FD7\uFF1A\u786E\u8BA4 traceId \u6B63\u786E\uFF0C\u4E14\u8BE5\u8C03\u7528\u53D1\u751F\u5728\u65E5\u5FD7\u7F13\u51B2\u4FDD\u7559\u7A97\u53E3\u5185\uFF09`;
+        }
+        return r.logs.map((log) => `${log.at}  [${log.level}]  ${log.message}`);
+      });
+    });
+  });
+}
+
+// packages/cli/src/commands/rollback.ts
+function registerRollback(program2, ctx) {
+  program2.command("rollback <fn>").description("\u628A\u5DF2\u53D1\u5E03\u51FD\u6570\u5207\u56DE\u5386\u53F2\u7248\u672C\uFF08\u7248\u672C\u6765\u81EA adep publish \u751F\u6210\u7684\u81EA\u589E\u53F7\uFF09").option("--to <version>", "\u76EE\u6807\u7248\u672C\u53F7\uFF0C\u5982 v2 \u6216 2").option("-p, --project <slug>", "\u76EE\u6807\u5E73\u53F0\u9879\u76EE slug\uFF08\u7F3A\u7701\u53D6 adep.config.ts \u7684 name\uFF09").action(async (name, flags) => {
+    const command = ctx.io("rollback");
+    await command.run(async () => {
+      const { parseVersionFlag: parseVersionFlag2, rollbackFunctionTo: rollbackFunctionTo2 } = await Promise.resolve().then(() => (init_rollback(), rollback_exports));
+      const to = parseVersionFlag2(flags.to);
+      const result = await rollbackFunctionTo2(ctx.paths, {
+        cwd: ctx.cwd,
+        name,
+        to,
+        ...flags.project === void 0 ? {} : { slug: flags.project }
+      });
+      command.ok(result, (data) => {
+        const r = data;
+        return `\u5DF2\u56DE\u6EDA ${r.name}\uFF1Av${r.from ?? "\u2014"} \u2192 v${r.to}`;
+      });
+    });
+  });
+}
+
 // packages/cli/src/cli.ts
 var requireJson = createRequire2(import.meta.url);
 var APP_VERSION = requireJson("../package.json").version;
@@ -38800,6 +39092,8 @@ function buildProgram(options = {}) {
   registerAuth(program2, ctx);
   registerMcp(program2, ctx);
   registerGit(program2, ctx);
+  registerLogs(program2, ctx);
+  registerRollback(program2, ctx);
   registerDeploy(program2, ctx);
   registerProjects(program2, ctx);
   registerFunctions(program2, ctx);

package/package.json

@@ -7,7 +7,7 @@
   },
   "homepage": "https://adep.top",
   "bugs": "https://gitcode.com/yunqiang_wu/ai-yunke/issues",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "type": "module",
   "description": "`adep` 命令行工具包位：登录 / 初始化 / 本地调试 / 部署 / 数据库维护 / 云存储 / 静态托管 / 微前端组件（widget），实现见任务单 CLI-001 ~ CLI-003 与 FE-002；子路径 `@adep/cli/vite` 提供云函数 vite 插件（CLI-014）",
   "bin": {
@@ -37,7 +37,7 @@
     "@adep/runtime": "0.3.8"
   },
   "devDependencies": {
-    "@adep/types": "0.4.0"
+    "@adep/types": "0.4.1"
   },
   "scripts": {
     "test": "vitest run",