@adep/cli 0.1.12 → 0.1.13

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;

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