@adep/cli 0.4.6 → 0.4.11

package/dist/vite.js

@@ -1090,6 +1090,20 @@ var CLOUD_DB_SPEC = {
 };
 var WRITE_TERMINALS = /* @__PURE__ */ new Set(["insert", "insertMany", "update", "delete"]);
 function errorWithCode(error) {
+  if (error instanceof Error) {
+    const sqlite = /no such table: (\S+)/.exec(error.message);
+    if (sqlite !== null) {
+      return new Error(
+        `[DB_TABLE_MISSING] \u9879\u76EE\u5E93\u5DF2\u542F\u52A8\u4F46\u7F3A\u8868 "${sqlite[1]}"\uFF1A\u8BF7\u6267\u884C adep db migrate <schema.sql> \u5EFA\u8868\uFF08\u53D1\u5E03\u4E0D\u542B\u5EFA\u8868\uFF09\u3002\u539F\u59CB\u9519\u8BEF\uFF1A${error.message}`
+      );
+    }
+    const pg = /relation "([^"]+)" does not exist/.exec(error.message);
+    if (pg !== null) {
+      return new Error(
+        `[DB_TABLE_MISSING] \u9879\u76EE\u5E93\u5DF2\u542F\u52A8\u4F46\u7F3A\u8868\uFF08\u6216\u5173\u7CFB\uFF09"${pg[1]}"\uFF1A\u8BF7\u6267\u884C adep db migrate <schema.sql> \u5EFA\u8868\uFF08\u53D1\u5E03\u4E0D\u542B\u5EFA\u8868\uFF09\u3002\u539F\u59CB\u9519\u8BEF\uFF1A${error.message}`
+      );
+    }
+  }
   const code = typeof error === "object" && error !== null && typeof error.code === "string" ? error.code : void 0;
   if (code !== void 0 && error instanceof Error) {
     return new Error(`[${code}] ${error.message}`);
@@ -2742,7 +2756,7 @@ async function createSimRuntime(options) {
 import { readFile as readFile3 } from "node:fs/promises";
 import { join as join5, relative, resolve as resolve3 } from "node:path";
 
-// packages/cli/src/db.ts
+// packages/runtime/src/shared/sql-split.ts
 function splitSqlStatements(source) {
   const statements = [];
   let buffer = "";
@@ -2751,12 +2765,13 @@ function splitSqlStatements(source) {
   for (const rawLine of lines) {
     const trimmed = rawLine.trim();
     if (!inQuote && (trimmed.length === 0 || trimmed.startsWith("--"))) continue;
-    for (let i = 0; i < rawLine.length; i++) {
-      const ch = rawLine[i];
+    const scanLine = inQuote ? rawLine : trimmed;
+    for (let i = 0; i < scanLine.length; i++) {
+      const ch = scanLine[i];
       if (inQuote) {
         if (ch === "'") {
-          if (rawLine[i + 1] === "'") {
-            buffer += ch + rawLine[i + 1];
+          if (scanLine[i + 1] === "'") {
+            buffer += ch + scanLine[i + 1];
             i++;
             continue;
           }
@@ -2770,7 +2785,7 @@ function splitSqlStatements(source) {
         buffer += ch;
         continue;
       }
-      if (ch === "-" && rawLine[i + 1] === "-") break;
+      if (ch === "-" && scanLine[i + 1] === "-") break;
       if (ch === ";") {
         const statement = buffer.trim();
         if (statement.length > 0) statements.push(statement);
@@ -2779,10 +2794,14 @@ function splitSqlStatements(source) {
       }
       buffer += ch;
     }
-    buffer += inQuote ? "\n" : " ";
+    if (inQuote) {
+      buffer += "\n";
+    } else if (buffer.length > 0 && !/\s$/.test(buffer)) {
+      buffer += " ";
+    }
   }
   if (inQuote) {
-    throw new Error(`SQL \u8FC1\u79FB\u6587\u4EF6\u5F15\u53F7\u672A\u95ED\u5408\uFF1A${buffer.trim().slice(0, 80)}\u2026`);
+    throw new Error(`SQL \u811A\u672C\u5F15\u53F7\u672A\u95ED\u5408\uFF1A${buffer.trim().slice(0, 80)}\u2026`);
   }
   const tail = buffer.trim();
   if (tail.length > 0) statements.push(tail);
@@ -4842,12 +4861,120 @@ function mergeSharedSource(files, shared) {
   return merged;
 }
 
+// packages/runtime/src/shared/multipart.ts
+var MultipartParseError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "MultipartParseError";
+  }
+};
+function extractBoundary(contentType) {
+  const match = /boundary\s*=\s*(?:"([^"]+)"|([^;\s]+))/i.exec(contentType);
+  if (match === null) {
+    throw new MultipartParseError("Content-Type \u7F3A\u5C11 boundary \u53C2\u6570\uFF0C\u65E0\u6CD5\u89E3\u6790 multipart \u8BF7\u6C42\u4F53");
+  }
+  const boundary = match[1] ?? match[2];
+  if (boundary === void 0 || boundary.length === 0) {
+    throw new MultipartParseError("Content-Type \u7684 boundary \u4E3A\u7A7A");
+  }
+  return boundary;
+}
+var HEADER_BODY_SEP = [13, 10, 13, 10];
+var encoder2 = new TextEncoder();
+var decoder2 = new TextDecoder();
+function indexOfSequence(haystack, needle, from) {
+  outer: for (let i = from; i + needle.length <= haystack.length; i++) {
+    for (let j = 0; j < needle.length; j++) {
+      if (haystack[i + j] !== needle[j]) continue outer;
+    }
+    return i;
+  }
+  return -1;
+}
+function unquote(value) {
+  return value.replace(/\\(.)/g, "$1");
+}
+function parseMultipart(contentType, raw) {
+  const boundary = extractBoundary(contentType);
+  const delim = encoder2.encode(`--${boundary}`);
+  const positions = [];
+  scan: for (let i = 0; i + delim.length <= raw.length; i++) {
+    if (raw[i] !== delim[0]) continue;
+    for (let j = 1; j < delim.length; j++) {
+      if (raw[i + j] !== delim[j]) continue scan;
+    }
+    positions.push(i);
+  }
+  if (positions.length === 0) {
+    throw new MultipartParseError(
+      `\u8BF7\u6C42\u4F53\u91CC\u627E\u4E0D\u5230 boundary "${boundary}" \u7684\u5206\u9694\u7B26\u2014\u2014\u53EF\u80FD\u662F\u8BF7\u6C42\u88AB\u622A\u65AD\u6216 Content-Type \u4E0E\u8BF7\u6C42\u4F53\u4E0D\u5339\u914D`
+    );
+  }
+  const lastPos = positions[positions.length - 1];
+  if (raw[lastPos + delim.length] !== 45 || raw[lastPos + delim.length + 1] !== 45) {
+    throw new MultipartParseError("multipart \u6570\u636E\u88AB\u622A\u65AD\uFF1A\u7F3A\u5C11\u7EC8\u7ED3\u5206\u9694\u7B26 --boundary--");
+  }
+  const files = [];
+  const fields = {};
+  let fieldCount = 0;
+  for (let k = 0; k + 1 < positions.length; k++) {
+    const partStart = positions[k] + delim.length + 2;
+    const partEnd = positions[k + 1] - 2;
+    if (raw[partStart - 2] !== 13 || raw[partStart - 1] !== 10) {
+      throw new MultipartParseError("multipart \u5206\u9694\u7B26\u540E\u7F3A\u5C11 CRLF\uFF0C\u8BF7\u6C42\u4F53\u683C\u5F0F\u975E\u6CD5");
+    }
+    if (partEnd < partStart) {
+      throw new MultipartParseError("multipart part \u5185\u5BB9\u4E3A\u7A7A\uFF08header \u4E0E\u6B63\u6587\u90FD\u4E0D\u5B58\u5728\uFF09");
+    }
+    const part = raw.subarray(partStart, partEnd);
+    const headerSep = indexOfSequence(part, HEADER_BODY_SEP, 0);
+    if (headerSep < 0) {
+      throw new MultipartParseError("multipart part \u7F3A\u5C11 header \u4E0E\u6B63\u6587\u4E4B\u95F4\u7684\u7A7A\u884C\u5206\u9694");
+    }
+    const headerLines = decoder2.decode(part.subarray(0, headerSep)).split("\r\n");
+    const data = part.subarray(headerSep + HEADER_BODY_SEP.length);
+    const disposition = headerLines.find(
+      (line) => line.toLowerCase().startsWith("content-disposition:")
+    );
+    if (disposition === void 0) {
+      throw new MultipartParseError("multipart part \u7F3A\u5C11 Content-Disposition \u5934");
+    }
+    const nameMatch = /name="((?:[^"\\]|\\.)*)"/.exec(disposition);
+    if (nameMatch === null) {
+      throw new MultipartParseError("multipart part \u7684 Content-Disposition \u7F3A\u5C11 name \u53C2\u6570");
+    }
+    const fieldName = unquote(nameMatch[1]);
+    const filenameMatch = /filename="((?:[^"\\]|\\.)*)"/.exec(disposition);
+    if (filenameMatch !== null) {
+      const clientName = unquote(filenameMatch[1]);
+      if (clientName === "") continue;
+      const typeLine = headerLines.find((line) => line.toLowerCase().startsWith("content-type:"));
+      const type = typeLine === void 0 ? "application/octet-stream" : typeLine.slice(typeLine.indexOf(":") + 1).trim();
+      files.push({ name: clientName, type, size: data.length, data });
+    } else {
+      const value = decoder2.decode(data);
+      const prev = fields[fieldName];
+      if (prev === void 0) fields[fieldName] = value;
+      else if (typeof prev === "string") fields[fieldName] = [prev, value];
+      else fields[fieldName] = [...prev, value];
+      fieldCount++;
+    }
+  }
+  return { fields: fieldCount > 0 ? fields : void 0, files };
+}
+
 // packages/cli/src/dev-shared.ts
 var BEARER_TOKEN_RE = /^Bearer\s+(.+)$/i;
-function bearerUserResolverFromEnv() {
-  const raw = process.env.ADEP_AUTH_ISSUER;
-  if (raw === void 0 || raw.trim() === "") return void 0;
-  return createBearerUserResolver(raw.trim());
+function bearerUserResolverFromEnv(fileEnv = {}) {
+  const raw = firstNonEmpty(process.env.ADEP_AUTH_ISSUER, fileEnv.ADEP_AUTH_ISSUER);
+  return raw === void 0 ? void 0 : createBearerUserResolver(raw);
+}
+function firstNonEmpty(...values) {
+  for (const value of values) {
+    const trimmed = value?.trim();
+    if (trimmed !== void 0 && trimmed !== "") return trimmed;
+  }
+  return void 0;
 }
 function createBearerUserResolver(issuer) {
   const userinfoUrl = `${issuer.replace(/\/+$/, "")}/oauth/userinfo`;
@@ -4914,25 +5041,41 @@ function mergeSharedIntoFunctions(files) {
   }
   return out;
 }
-function bodyOf(req) {
-  return new Promise((resolveBody, rejectBody) => {
+function readRawBody(req) {
+  return new Promise((resolveRaw, rejectRaw) => {
     const chunks = [];
     req.on("data", (chunk) => chunks.push(chunk));
-    req.on("end", () => {
-      const raw = Buffer.concat(chunks).toString("utf8");
-      if (raw.length === 0) {
-        resolveBody(void 0);
-        return;
-      }
-      try {
-        resolveBody(JSON.parse(raw));
-      } catch {
-        resolveBody(raw);
-      }
-    });
-    req.on("error", rejectBody);
+    req.on("end", () => resolveRaw(Buffer.concat(chunks)));
+    req.on("error", rejectRaw);
   });
 }
+async function bodyOf(req) {
+  const raw = (await readRawBody(req)).toString("utf8");
+  if (raw.length === 0) return void 0;
+  try {
+    return JSON.parse(raw);
+  } catch {
+    return raw;
+  }
+}
+async function bodyWithFiles(req) {
+  const contentType = String(req.headers["content-type"] ?? "");
+  if (!contentType.toLowerCase().startsWith("multipart/form-data")) {
+    return { body: await bodyOf(req) };
+  }
+  const bytes = await readRawBody(req);
+  let parsed;
+  try {
+    parsed = parseMultipart(contentType, bytes);
+  } catch (error) {
+    const message = error instanceof MultipartParseError ? error.message : `multipart \u89E3\u6790\u5931\u8D25\uFF1A${error instanceof Error ? error.message : String(error)}`;
+    throw new ExecutorError(400, "FN_MULTIPART_INVALID", message);
+  }
+  return {
+    body: parsed.fields,
+    ...parsed.files.length > 0 ? { files: [...parsed.files] } : {}
+  };
+}
 function writeJson(res, status, payload) {
   res.writeHead(status, { "content-type": "application/json" });
   res.end(JSON.stringify(payload));
@@ -4947,13 +5090,14 @@ async function requestInput(url, req, readBody) {
   for (const [key, value] of Object.entries(req.headers)) {
     if (typeof value === "string") headers[key] = value;
   }
-  const body = req.method === "GET" || req.method === "HEAD" ? void 0 : await readBody(req);
+  const parsed = req.method === "GET" || req.method === "HEAD" ? void 0 : await readBody(req);
   return {
     method: req.method ?? "GET",
     path: url.pathname,
     query,
     headers,
-    ...body === void 0 ? {} : { body }
+    ...parsed?.body === void 0 ? {} : { body: parsed.body },
+    ...parsed?.files === void 0 ? {} : { files: parsed.files }
   };
 }
 
@@ -5024,8 +5168,8 @@ async function startDevServer(options) {
     ...options.db === void 0 ? {} : { db: options.db },
     ...options.dbFile === void 0 ? {} : { dbFile: options.dbFile }
   });
-  const bearerUser = bearerUserResolverFromEnv();
   const simEnv = await loadSimEnv(cwd).catch(() => ({}));
+  let bearerUser = bearerUserResolverFromEnv(simEnv);
   const fetchConfig = resolveLocalFetchConfig(simEnv);
   const executor = new WorkerFunctionExecutor({
     deps: { rootDir: cwd, builtin: LOCAL_BUILTIN_DEPS },
@@ -5139,6 +5283,7 @@ async function startDevServer(options) {
     ]);
     files = nextFiles;
     env = { ...config.environment, ...parseEnvFile(envText2) };
+    bearerUser = bearerUserResolverFromEnv(await loadSimEnv(cwd).catch(() => ({})));
   };
   const envText = await readFile7(join10(cwd, ".env.local"), "utf8").catch(() => "");
   env = { ...config.environment, ...parseEnvFile(envText) };
@@ -5156,7 +5301,7 @@ async function startDevServer(options) {
   }
   const buildInput = async (fnName, entry, url, req) => {
     const hasEnv = Object.keys(env).length > 0;
-    const request = await requestInput(url, req, bodyOf);
+    const request = await requestInput(url, req, bodyWithFiles);
     if (bearerUser !== void 0) request.user = await bearerUser(request.headers);
     return {
       project: { id: "local", slug: config.name },
@@ -5230,9 +5375,9 @@ async function startDevServer(options) {
       writeJson(res, 404, { error: { code: "FN_NOT_FOUND", message: `\u51FD\u6570 "${fnName}" \u4E0D\u5B58\u5728` } });
       return;
     }
-    const input = await buildInput(fnName, entry, url, req);
     const startedAt = performance.now();
     try {
+      const input = await buildInput(fnName, entry, url, req);
       const result = await executor.execute(input);
       const durationMs = Math.round(performance.now() - startedAt);
       for (const line of result.logs) log(`[adep]   ${line}`);
@@ -5305,7 +5450,9 @@ async function startDevServer(options) {
   log(`[adep] curl \u793A\u4F8B\uFF1Acurl ${baseUrl}${curlPath}`);
   printBoundaries(log);
   if (bearerUser !== void 0) {
-    log(`[adep] \u767B\u5F55\u5373\u670D\u52A1\uFF1AADEP_AUTH_ISSUER \u5DF2\u914D\u7F6E\uFF0CBearer token \u5C06\u89E3\u6790\u4E3A\u7528\u6237\u8EAB\u4EFD\uFF08userinfo \u7AEF\u70B9\uFF09`);
+    log(
+      `[adep] \u767B\u5F55\u5373\u670D\u52A1\uFF1AADEP_AUTH_ISSUER \u5DF2\u914D\u7F6E\uFF0CBearer token \u5C06\u89E3\u6790\u4E3A\u7528\u6237\u8EAB\u4EFD\uFF08userinfo \u7AEF\u70B9\uFF09`
+    );
   }
   log(`[adep] \u6570\u636E\u5E93\uFF1A${dbLabel} \u2192 ${dbTargetText}`);
   startStateAlarmScheduler();

package/package.json

@@ -7,7 +7,7 @@
   },
   "homepage": "https://adep.top",
   "bugs": "https://gitcode.com/yunqiang_wu/ai-yunke/issues",
-  "version": "0.4.6",
+  "version": "0.4.11",
   "type": "module",
   "description": "`adep` 命令行工具包位：登录 / 初始化 / 本地调试 / 部署 / 数据库维护 / 云存储 / 静态托管 / 微前端组件（widget），实现见任务单 CLI-001 ~ CLI-003 与 FE-002；子路径 `@adep/cli/vite` 提供云函数 vite 插件（CLI-014）",
   "bin": {
@@ -30,11 +30,11 @@
     "esbuild": "0.25.12",
     "yaml": "2.9.1",
     "zod": "^4.6.6",
-    "@adep/runtime": "0.3.5",
     "@adep/app-runtime": "0.1.1",
     "@adep/cf-compat": "0.1.4",
-    "@adep/vite-plugin": "0.1.9",
-    "@adep/crypto": "0.1.1"
+    "@adep/vite-plugin": "0.1.11",
+    "@adep/crypto": "0.1.1",
+    "@adep/runtime": "0.3.7"
   },
   "devDependencies": {
     "@adep/types": "0.3.2"