@adep/cli 0.1.12 → 0.1.14

package/README.md

@@ -235,8 +235,8 @@ adep serve --db sqlite --db-file var/local.sqlite   # 指定库文件
 - 绑定非回环地址时给出对外暴露警告（它不带生产级加固）。
 
 - 数据库两档模式（`--db`）：
-  - `sim`（缺省）：内置模拟引擎，库是 JSON 文件 `.adep/sim/db.json`。`--schema` 只支持 DDL 子集，其余语句跳过并告警；
-  - `sqlite`：**真实 SQLite 库文件**，驱动按运行时分派（Bun → `bun:sqlite`，Node ≥ 22.5 → `node:sqlite`）。`--schema` 的每条语句都真实执行，**失败即停**（视图 / 唯一索引 / 触发器等 sim 做不到的能力全可用）。运行时两者都没有时拒绝启动并提示回退 `--db sim`。
+  - `sqlite`（缺省）：**真实 SQLite 库文件**，驱动按运行时分派（Bun → `bun:sqlite`，Node ≥ 22.5 → `node:sqlite`）。`--schema` 的每条语句都真实执行，**失败即停**（视图 / 唯一索引 / 触发器等 sim 做不到的能力全可用）。运行时不支持（Bun / Node < 22.5）或打开库文件失败时**自动降级 `sim` 并告警**，不拒绝启动；
+  - `sim`：内置模拟引擎，库是 JSON 文件 `.adep/sim/db.json`。`--schema` 只支持 DDL 子集，其余语句跳过并告警。
   - 模式名写错（旗标或环境变量）一律拒绝启动，不静默换库；启动横幅与根路径 `/` 会回显 `db.mode` / `db.file` / `db.driver`。
 
 ### `adep publish`

package/dist/index.js

@@ -54,7 +54,8 @@ async function loadCredentials(paths) {
     return {
       server: parsed["server"],
       email: parsed["email"],
-      encodedToken: parsed["encodedToken"]
+      encodedToken: parsed["encodedToken"],
+      ...typeof parsed["cookieName"] === "string" ? { cookieName: parsed["cookieName"] } : {}
     };
   } catch {
     return null;
@@ -69,6 +70,10 @@ function encodeToken(token) {
 function decodeToken(encoded) {
   return Buffer.from(encoded, "base64").toString("utf8");
 }
+function sessionCookieHeader(credentials) {
+  const name = credentials.cookieName ?? (credentials.server.startsWith("https://") ? "__Secure-better-auth.session_token" : "better-auth.session_token");
+  return `${name}=${decodeToken(credentials.encodedToken)}`;
+}
 var init_credentials = __esm({
   "packages/cli/src/credentials.ts"() {
     "use strict";
@@ -149,7 +154,7 @@ var init_net = __esm({
 // packages/cli/src/auth.ts
 function sessionCookieOf(setCookie) {
   const line = setCookie.find(
-    (entry) => entry.startsWith("better-auth.session_token=") && !/max-age=0/i.test(entry)
+    (entry) => !/max-age=0/i.test(entry) && /^(?:__Secure-)?better-auth\.session_token=/.test(entry)
   );
   if (line === void 0) {
     throw new CliError("LOGIN_FAILED", "\u767B\u5F55\u6210\u529F\u4F46\u672A\u8FD4\u56DE\u4F1A\u8BDD token\uFF0C\u8BF7\u68C0\u67E5\u5E73\u53F0\u7248\u672C");
@@ -176,11 +181,14 @@ async function login(paths, input) {
     throw new CliError("LOGIN_FAILED", "\u767B\u5F55\u5931\u8D25\uFF1A\u90AE\u7BB1\u6216\u5BC6\u7801\u4E0D\u6B63\u786E\uFF08\u6216\u8BE5\u8D26\u53F7\u672A\u6CE8\u518C\uFF09");
   }
   const cookie = sessionCookieOf(response.headers.getSetCookie());
-  const token = cookie.slice(cookie.indexOf("=") + 1);
+  const eq = cookie.indexOf("=");
+  const cookieName = cookie.slice(0, eq);
+  const token = cookie.slice(eq + 1);
   await saveCredentials(paths, {
     server,
     email: input.email,
-    encodedToken: encodeToken(token)
+    encodedToken: encodeToken(token),
+    cookieName
   });
   return { email: input.email };
 }
@@ -191,7 +199,7 @@ async function whoami(paths) {
     throw new CliError("NOT_LOGGED_IN", "\u672A\u767B\u5F55\uFF1A\u8BF7\u5148\u6267\u884C adep login");
   }
   const response = await fetch(`${credentials.server}/api/auth/get-session`, {
-    headers: { cookie: `better-auth.session_token=${decodeToken(credentials.encodedToken)}` }
+    headers: { cookie: sessionCookieHeader(credentials) }
   });
   if (response.status !== 200) {
     throw new CliError("SESSION_EXPIRED", "\u4F1A\u8BDD\u5DF2\u5931\u6548\uFF1A\u8BF7\u91CD\u65B0\u6267\u884C adep login");
@@ -209,7 +217,7 @@ async function logout(paths) {
     try {
       await fetch(`${credentials.server}/api/auth/sign-out`, {
         method: "POST",
-        headers: { cookie: `better-auth.session_token=${decodeToken(credentials.encodedToken)}` }
+        headers: { cookie: sessionCookieHeader(credentials) }
       });
     } catch {
     }
@@ -1683,6 +1691,10 @@ function toNumber(raw) {
   const n = Number(t);
   return Number.isNaN(n) ? null : n;
 }
+function arithmeticOperand(v) {
+  const n = Number(v);
+  return Number.isFinite(n) ? n : 0;
+}
 function stripQuotes(raw) {
   const t = raw.trim();
   if (/^'.*'$/.test(t)) return t.slice(1, -1);
@@ -1837,10 +1849,6 @@ function resolveSetValue(value, existing, row) {
   return value;
 }
 function evalArithmetic(src, existing, row) {
-  const num = (v) => {
-    const n2 = Number(v);
-    return Number.isFinite(n2) ? n2 : 0;
-  };
   let i = 0;
   const n = src.length;
   const skip = () => {
@@ -1885,7 +1893,7 @@ function evalArithmetic(src, existing, row) {
     const id = parseIdent();
     if (id !== null) {
       const v = id.excluded ? row[id.col] : existing[id.col];
-      return num(v);
+      return arithmeticOperand(v);
     }
     return 0;
   };
@@ -2035,6 +2043,9 @@ function parseSelectItem(raw) {
   const plain = unqualifyColumn(ident(name));
   return { name: plain, qualified, alias: as === null ? plain : ident(as[1] ?? ""), star: false };
 }
+function projectValueOf(row, item) {
+  return item.qualified !== "" && row[item.qualified] !== void 0 ? row[item.qualified] : row[item.name];
+}
 function project(rows, selectRaw) {
   if (/^count\s*\(\s*\*/i.test(selectRaw) || /^count\s*\(\s*1\)/i.test(selectRaw)) {
     const alias = selectRaw.match(/\bAS\s+([A-Za-z_][A-Za-z0-9_]*)/i)?.[1] ?? "n";
@@ -2046,20 +2057,19 @@ function project(rows, selectRaw) {
   }
   if (selectRaw.trim() === "*") return rows;
   const items = selectRaw.split(",").map(parseSelectItem);
-  const valueOf = (row, item) => item.qualified !== "" && row[item.qualified] !== void 0 ? row[item.qualified] : row[item.name];
   if (items.some((item) => item.star)) {
     return rows.map((row) => {
       const out = { ...row };
       for (const item of items) {
         if (item.star) continue;
-        out[item.alias] = valueOf(row, item);
+        out[item.alias] = projectValueOf(row, item);
       }
       return out;
     });
   }
   return rows.map((row) => {
     const out = {};
-    for (const item of items) out[item.alias] = valueOf(row, item);
+    for (const item of items) out[item.alias] = projectValueOf(row, item);
     return out;
   });
 }
@@ -2581,7 +2591,7 @@ var init_driver = __esm({
 function compress(h, block, w) {
   for (let i = 0; i < 16; i += 1) {
     const j = i * 4;
-    w[i] = (block[j] ?? 0) << 24 | (block[j + 1] ?? 0) << 16 | (block[j + 2] ?? 0) << 8 | (block[j + 3] ?? 0);
+    w[i] = block[j] << 24 | block[j + 1] << 16 | block[j + 2] << 8 | block[j + 3];
   }
   for (let i = 16; i < 64; i += 1) {
     const s0 = rotr(w[i - 15], 7) ^ rotr(w[i - 15], 18) ^ w[i - 15] >>> 3;
@@ -5159,7 +5169,7 @@ async function createClient(paths) {
     throw new CliError("NOT_LOGGED_IN", "\u672A\u767B\u5F55\uFF1A\u8BF7\u5148\u6267\u884C adep login");
   }
   const server = credentials.server;
-  const cookie = `better-auth.session_token=${decodeToken(credentials.encodedToken)}`;
+  const cookie = sessionCookieHeader(credentials);
   const request = async (path, init = {}, fallbackCode = "API_REQUEST_FAILED") => {
     const method = init.method ?? (init.body === void 0 ? "GET" : "POST");
     let response;
@@ -5495,7 +5505,7 @@ var init_db_mode = __esm({
   "packages/cli/src/serve/db-mode.ts"() {
     "use strict";
     SERVE_DB_MODES = ["sim", "sqlite"];
-    DEFAULT_SERVE_DB_MODE = "sim";
+    DEFAULT_SERVE_DB_MODE = "sqlite";
     DEFAULT_SQLITE_DB_FILE = ".adep/data/project.sqlite";
   }
 });
@@ -5521,9 +5531,12 @@ function detectSqliteRuntime(versions = process.versions) {
 function sqliteModuleName(runtime) {
   return runtime === "bun" ? "bun:sqlite" : "node:sqlite";
 }
-function sqliteRuntimeRequirementMessage(versions = process.versions) {
+function sqliteUnavailableReason(versions = process.versions) {
   const current = isBun(versions) ? `Bun ${versions["bun"] ?? ""}`.trim() : `Node ${versions["node"] ?? "\u672A\u77E5"}`;
-  return `--db sqlite \u9700\u8981 Bun\uFF08\u5185\u7F6E bun:sqlite\uFF09\u6216 Node \u2265 ${NODE_SQLITE_MIN.major}.${NODE_SQLITE_MIN.minor}\uFF08\u5185\u7F6E node:sqlite\uFF09\uFF1B\u5F53\u524D\u8FD0\u884C\u65F6 ${current} \u4E0D\u63D0\u4F9B SQLite \u5185\u5EFA\u6A21\u5757\u3002\u8BF7\u6539\u7528 \`--db sim\`\uFF08\u5185\u7F6E\u6A21\u62DF\u5F15\u64CE\uFF0C\u65E0\u9700\u989D\u5916\u8FD0\u884C\u65F6\uFF09\uFF0C\u6216\u5347\u7EA7 Node / \u7528 Bun \u8FD0\u884C\u3002`;
+  return `\u5F53\u524D\u8FD0\u884C\u65F6 ${current} \u4E0D\u63D0\u4F9B SQLite \u5185\u5EFA\u6A21\u5757\uFF08\u9700\u8981 Bun \u6216 Node \u2265 ${NODE_SQLITE_MIN.major}.${NODE_SQLITE_MIN.minor}\uFF09`;
+}
+function sqliteRuntimeRequirementMessage(versions = process.versions) {
+  return `--db sqlite \u9700\u8981 Bun\uFF08\u5185\u7F6E bun:sqlite\uFF09\u6216 Node \u2265 ${NODE_SQLITE_MIN.major}.${NODE_SQLITE_MIN.minor}\uFF08\u5185\u7F6E node:sqlite\uFF09\uFF1B${sqliteUnavailableReason(versions)}\u3002\u8BF7\u6539\u7528 \`--db sim\`\uFF08\u5185\u7F6E\u6A21\u62DF\u5F15\u64CE\uFF0C\u65E0\u9700\u989D\u5916\u8FD0\u884C\u65F6\uFF09\uFF0C\u6216\u5347\u7EA7 Node / \u7528 Bun \u8FD0\u884C\u3002`;
 }
 async function openSqliteProjectDriver(file, options = {}) {
   const runtime = options.runtime ?? detectSqliteRuntime();
@@ -5629,8 +5642,8 @@ async function startServeServer(options) {
     cwd,
     options.staticDir ?? envString("ADEP_SERVE_STATIC_DIR") ?? "public"
   );
-  const dbMode = resolveServeDbMode(options.db);
-  const sqliteFile = dbMode === "sqlite" ? resolveServeDbFile(cwd, options.dbFile) : null;
+  let dbMode = resolveServeDbMode(options.db);
+  let sqliteFile = dbMode === "sqlite" ? resolveServeDbFile(cwd, options.dbFile) : null;
   const config = await loadConfig(cwd);
   const functionsDir = join14(cwd, config.functionsDir);
   const bearerUser = bearerUserResolverFromEnv();
@@ -5651,9 +5664,27 @@ async function startServeServer(options) {
   let sqliteDriver = null;
   if (sqliteFile !== null) {
     const runtimeName = detectSqliteRuntime();
-    if (runtimeName === null) throw new Error(sqliteRuntimeRequirementMessage());
-    sqliteModule = sqliteModuleName(runtimeName);
-    sqliteDriver = await openSqliteProjectDriver(sqliteFile, { runtime: runtimeName });
+    if (runtimeName === null) {
+      log(
+        `[serve] \u8B66\u544A\uFF1A${sqliteUnavailableReason()}\uFF0C\u5DF2\u81EA\u52A8\u964D\u7EA7\u4E3A sim \u6A21\u5F0F\uFF08\u5185\u7F6E\u6A21\u62DF\u5F15\u64CE\uFF0C\u5E93 ${displayPath(cwd, join14(simDir(cwd), "db.json"))}\uFF09\u3002\u5982\u9700\u771F\u5B9E SQLite\uFF0C\u8BF7\u7528 Bun \u6216\u5347\u7EA7 Node \u540E\u91CD\u8BD5\u3002`
+      );
+      dbMode = "sim";
+      sqliteFile = null;
+    } else {
+      sqliteModule = sqliteModuleName(runtimeName);
+      try {
+        sqliteDriver = await openSqliteProjectDriver(sqliteFile, { runtime: runtimeName });
+      } catch (error) {
+        const detail = error instanceof Error ? error.message : String(error);
+        log(
+          `[serve] \u8B66\u544A\uFF1A\u6253\u5F00 SQLite \u5E93\u5931\u8D25\uFF08${detail}\uFF09\uFF0C\u5DF2\u81EA\u52A8\u964D\u7EA7\u4E3A sim \u6A21\u5F0F\uFF08\u5185\u7F6E\u6A21\u62DF\u5F15\u64CE\uFF0C\u5E93 ${displayPath(cwd, join14(simDir(cwd), "db.json"))}\uFF09\u3002`
+        );
+        sqliteModule = null;
+        sqliteDriver = null;
+        sqliteFile = null;
+        dbMode = "sim";
+      }
+    }
   }
   const runtime = await createSimRuntime({
     cwd,
@@ -12255,7 +12286,7 @@ function registerDevServers(program2, ctx) {
     "\u6570\u636E\u5E93\u7ED3\u6784\u6587\u4EF6\uFF1A\u542F\u52A8\u65F6\u5BF9\u672C\u5730\u5E93\u9010\u6761\u5E94\u7528\uFF08\u5EFA\u8868\u8BED\u53E5\u5EFA\u8BAE IF NOT EXISTS\uFF0C\u5E42\u7B49\u53EF\u91CD\u590D\u542F\u52A8\uFF09"
   ).option(
     "--db <mode>",
-    "\u6570\u636E\u5E93\u6A21\u5F0F\uFF1Asim\uFF08\u7F3A\u7701\uFF0C\u5185\u7F6E\u6A21\u62DF\u5F15\u64CE + .adep/sim/db.json\uFF09| sqlite\uFF08\u771F\u5B9E SQLite \u5E93\u6587\u4EF6\uFF0C\u9700 Bun \u6216 Node \u2265 22.5\uFF09"
+    "\u6570\u636E\u5E93\u6A21\u5F0F\uFF1Asqlite\uFF08\u7F3A\u7701\uFF0C\u771F\u5B9E SQLite \u5E93\u6587\u4EF6\uFF0C\u9700 Bun \u6216 Node \u2265 22.5\uFF1B\u8FD0\u884C\u65F6\u4E0D\u652F\u6301\u6216\u6253\u5F00\u5931\u8D25\u65F6\u81EA\u52A8\u964D\u7EA7 sim\uFF09| sim\uFF08\u5185\u7F6E\u6A21\u62DF\u5F15\u64CE + .adep/sim/db.json\uFF09"
   ).option(
     "--db-file <path>",
     "sqlite \u6A21\u5F0F\u7684\u5E93\u6587\u4EF6\uFF08\u7F3A\u7701\u53D6 ADEP_SERVE_DB_FILE\uFF0C\u518D\u7F3A\u7701 .adep/data/project.sqlite\uFF09"

package/dist/vite.js

@@ -1134,6 +1134,10 @@ function toNumber(raw) {
   const n = Number(t);
   return Number.isNaN(n) ? null : n;
 }
+function arithmeticOperand(v) {
+  const n = Number(v);
+  return Number.isFinite(n) ? n : 0;
+}
 function stripQuotes(raw) {
   const t = raw.trim();
   if (/^'.*'$/.test(t)) return t.slice(1, -1);
@@ -1303,10 +1307,6 @@ function resolveSetValue(value, existing, row) {
   return value;
 }
 function evalArithmetic(src, existing, row) {
-  const num = (v) => {
-    const n2 = Number(v);
-    return Number.isFinite(n2) ? n2 : 0;
-  };
   let i = 0;
   const n = src.length;
   const skip = () => {
@@ -1351,7 +1351,7 @@ function evalArithmetic(src, existing, row) {
     const id = parseIdent();
     if (id !== null) {
       const v = id.excluded ? row[id.col] : existing[id.col];
-      return num(v);
+      return arithmeticOperand(v);
     }
     return 0;
   };
@@ -1781,6 +1781,9 @@ function parseSelectItem(raw) {
   const plain = unqualifyColumn(ident(name));
   return { name: plain, qualified, alias: as === null ? plain : ident(as[1] ?? ""), star: false };
 }
+function projectValueOf(row, item) {
+  return item.qualified !== "" && row[item.qualified] !== void 0 ? row[item.qualified] : row[item.name];
+}
 function project(rows, selectRaw) {
   if (/^count\s*\(\s*\*/i.test(selectRaw) || /^count\s*\(\s*1\)/i.test(selectRaw)) {
     const alias = selectRaw.match(/\bAS\s+([A-Za-z_][A-Za-z0-9_]*)/i)?.[1] ?? "n";
@@ -1792,20 +1795,19 @@ function project(rows, selectRaw) {
   }
   if (selectRaw.trim() === "*") return rows;
   const items = selectRaw.split(",").map(parseSelectItem);
-  const valueOf = (row, item) => item.qualified !== "" && row[item.qualified] !== void 0 ? row[item.qualified] : row[item.name];
   if (items.some((item) => item.star)) {
     return rows.map((row) => {
       const out = { ...row };
       for (const item of items) {
         if (item.star) continue;
-        out[item.alias] = valueOf(row, item);
+        out[item.alias] = projectValueOf(row, item);
       }
       return out;
     });
   }
   return rows.map((row) => {
     const out = {};
-    for (const item of items) out[item.alias] = valueOf(row, item);
+    for (const item of items) out[item.alias] = projectValueOf(row, item);
     return out;
   });
 }
@@ -2058,7 +2060,7 @@ var rotr = (x, n) => x >>> n | x << 32 - n;
 function compress(h, block, w) {
   for (let i = 0; i < 16; i += 1) {
     const j = i * 4;
-    w[i] = (block[j] ?? 0) << 24 | (block[j + 1] ?? 0) << 16 | (block[j + 2] ?? 0) << 8 | (block[j + 3] ?? 0);
+    w[i] = block[j] << 24 | block[j + 1] << 16 | block[j + 2] << 8 | block[j + 3];
   }
   for (let i = 16; i < 64; i += 1) {
     const s0 = rotr(w[i - 15], 7) ^ rotr(w[i - 15], 18) ^ w[i - 15] >>> 3;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adep/cli",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "type": "module",
   "description": "`adep` 命令行工具包位：登录 / 初始化 / 本地调试 / 部署 / 数据库维护 / 云存储 / 静态托管 / 微前端组件（widget），实现见任务单 CLI-001 ~ CLI-003 与 FE-002；子路径 `@adep/cli/vite` 提供云函数 vite 插件（CLI-014）",
   "bin": {
@@ -25,7 +25,7 @@
   },
   "devDependencies": {
     "@adep/types": "0.2.3",
-    "@adep/runtime": "0.2.5"
+    "@adep/runtime": "0.2.6"
   },
   "scripts": {
     "test": "vitest run",