@adep/cli 0.1.8 → 0.1.9

package/dist/vite.js

@@ -4,8 +4,8 @@ import { adepPlugin } from "@adep/vite-plugin";
 // packages/cli/src/dev.ts
 import { createServer } from "node:http";
 import { watch } from "node:fs";
-import { mkdir as mkdir3, readdir as readdir2, readFile as readFile5, writeFile as writeFile3 } from "node:fs/promises";
-import { basename, join as join8, resolve as resolve2 } from "node:path";
+import { mkdir as mkdir3, readFile as readFile6, writeFile as writeFile3 } from "node:fs/promises";
+import { basename, join as join9, resolve as resolve2 } from "node:path";
 
 // packages/runtime/src/shared/capability-keys.ts
 var RPC_CAPABILITY_KEY = "__adepRpc";
@@ -1106,7 +1106,7 @@ function createDbCapability(driver, options = {}) {
   };
 }
 
-// packages/cli/src/sim/sql-engine.ts
+// packages/runtime/src/sim/sql-engine.ts
 var SimDbError = class extends Error {
   constructor(code, message) {
     super(message);
@@ -1146,7 +1146,7 @@ function parseCreateTable(ddl) {
   );
   if (m === null) return null;
   const name = ident(m[1]);
-  const body = m[2];
+  const body = m[3];
   const columns = [];
   for (const part of body.split(",")) {
     const tokens = part.trim().split(/\s+/);
@@ -1236,9 +1236,9 @@ function matchValue(value, clause) {
   const right = clause.value;
   switch (op) {
     case "=":
-      return left === right;
+      return left !== null && right !== null && left === right;
     case "!=":
-      return left !== right;
+      return left !== null && right !== null && left !== right;
     case ">":
       return left !== null && right !== null && left > right;
     case ">=":
@@ -1698,6 +1698,19 @@ function assertSafeStoragePath(path) {
   }
   return path;
 }
+function assertStoragePrefix(prefix) {
+  if (prefix !== void 0 && prefix !== "") {
+    const segments = prefix.split("/");
+    if (prefix.startsWith("/") || /[\\]/.test(prefix) || segments.some((segment) => segment === "..")) {
+      throw new StorageError(
+        400,
+        STORAGE_CODES.invalidPath,
+        `\u975E\u6CD5\u524D\u7F00 "${prefix}"\uFF08\u7981\u6B62 / \u5F00\u5934\u3001\u53CD\u659C\u6760\u6216 .. \u7A7F\u8D8A\uFF09`
+      );
+    }
+  }
+  return prefix ?? "";
+}
 
 // packages/runtime/src/storage/hmac-sha256.ts
 var K = new Uint32Array([
@@ -2081,16 +2094,7 @@ function createLocalStorageDriver(options) {
       await unlink(metaPath(projectId, path)).catch(() => void 0);
     },
     async list(projectId, prefix) {
-      if (prefix !== void 0 && prefix !== "") {
-        const segments = prefix.split("/");
-        if (prefix.startsWith("/") || /[\\]/.test(prefix) || segments.some((segment) => segment === "..")) {
-          throw new StorageError(
-            400,
-            STORAGE_CODES.invalidPath,
-            `\u975E\u6CD5\u524D\u7F00 "${prefix}"\uFF08\u7981\u6B62 / \u5F00\u5934\u3001\u53CD\u659C\u6760\u6216 .. \u7A7F\u8D8A\uFF09`
-          );
-        }
-      }
+      assertStoragePrefix(prefix);
       const root = bucketDir(projectId);
       const metas = [];
       const walk = async (dir, relative) => {
@@ -2156,7 +2160,7 @@ function createSimStorageCapability(options) {
   return { bundle, driver };
 }
 
-// packages/cli/src/sim/realtime.ts
+// packages/runtime/src/sim/realtime.ts
 var SimRealtime = class {
   seq = 0;
   subscribers = /* @__PURE__ */ new Map();
@@ -2278,10 +2282,7 @@ function createSimRealtimeCapability() {
   };
 }
 
-// packages/cli/src/sim/runtime.ts
-function simDir(cwd) {
-  return join4(cwd, ".adep", "sim");
-}
+// packages/runtime/src/sim/merge.ts
 function mergeBundles(bundles) {
   const capabilities = [];
   const byName = /* @__PURE__ */ new Map();
@@ -2301,6 +2302,11 @@ function mergeBundles(bundles) {
   }
   return { capabilities, rpcHandlers };
 }
+
+// packages/cli/src/sim/runtime.ts
+function simDir(cwd) {
+  return join4(cwd, ".adep", "sim");
+}
 function jsonStorage(cwd) {
   const file = join4(simDir(cwd), "db.json");
   return {
@@ -2416,12 +2422,21 @@ function createSimInvokeHandler(options) {
   };
 }
 
-// packages/cli/src/builtin-deps.ts
-var LOCAL_STATE_OBJECTS_SPECIFIER = "@adep/runtime/state-objects";
-var LOCAL_BUILTIN_DEPS = [
-  "@adep/cf-compat",
-  LOCAL_STATE_OBJECTS_SPECIFIER
+// shared/builtin-deps.ts
+var CF_COMPAT_SPECIFIER = "@adep/cf-compat";
+var STATE_OBJECTS_SPECIFIER = "@adep/runtime/state-objects";
+var BUILTIN_DEPS = [
+  CF_COMPAT_SPECIFIER,
+  STATE_OBJECTS_SPECIFIER,
+  "axios",
+  "lodash",
+  "dayjs",
+  "zod"
 ];
+var BUILTIN_DEPS_CSV = BUILTIN_DEPS.join(",");
+
+// packages/cli/src/builtin-deps.ts
+var LOCAL_BUILTIN_DEPS = [CF_COMPAT_SPECIFIER, STATE_OBJECTS_SPECIFIER];
 
 // packages/cli/src/sim/boundary.ts
 var SIM_BOUNDARIES = [
@@ -3057,9 +3072,9 @@ function loadFunctionModule(files, entry, sandboxGlobals, resolveBare) {
 
 // packages/runtime/src/state-objects/loader.ts
 var STATE_OBJECTS_ENTRY = "state-objects.ts";
-var STATE_OBJECTS_SPECIFIER = "@adep/runtime/state-objects";
+var STATE_OBJECTS_SPECIFIER2 = "@adep/runtime/state-objects";
 function resolveStateObjectSpecifier(request) {
-  if (request === STATE_OBJECTS_SPECIFIER) return { StateObject };
+  if (request === STATE_OBJECTS_SPECIFIER2) return { StateObject };
   return void 0;
 }
 function defaultStateSandboxGlobals() {
@@ -3381,6 +3396,19 @@ function createSandboxFetch(options) {
   };
 }
 
+// packages/runtime/src/functions/runtime/rpc-wire.ts
+function wireRpcResponses(port, pending) {
+  port.on?.((message) => {
+    const reply = message;
+    if (reply?.type !== "rpc-response" || typeof reply.id !== "number") return;
+    const entry = pending.get(reply.id);
+    if (entry === void 0) return;
+    pending.delete(reply.id);
+    if (reply.ok === true) entry.resolve(reply.result);
+    else entry.reject(new Error(reply.error ?? "RPC \u80FD\u529B\u8C03\u7528\u5931\u8D25"));
+  });
+}
+
 // packages/runtime/src/functions/runtime/chain.ts
 function isChainCapability(value) {
   if (typeof value !== "object" || value === null) return false;
@@ -3452,6 +3480,11 @@ function createChainClient(capability, port, pending, nextId, spec) {
   return makeRoot(void 0);
 }
 
+// packages/runtime/src/shared/regexp.ts
+function escapeRegExp(text) {
+  return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
 // packages/runtime/src/functions/runtime/worker-entry.ts
 function isRpcCapability(value) {
   return typeof value === "object" && value !== null && value[RPC_CAPABILITY_KEY] === true;
@@ -3481,9 +3514,6 @@ function errorMessageOf2(error) {
   }
   return String(error);
 }
-function escapeRegExp(text) {
-  return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
 function firstUserFrame(stack, files) {
   for (const key of Object.keys(files)) {
     const match = new RegExp(
@@ -3542,15 +3572,7 @@ function runWorker(input, port) {
   const container = createCloudContainer();
   const pending = /* @__PURE__ */ new Map();
   let rpcId = 0;
-  port.on?.((message) => {
-    const reply = message;
-    if (reply?.type !== "rpc-response" || typeof reply.id !== "number") return;
-    const entry = pending.get(reply.id);
-    if (entry === void 0) return;
-    pending.delete(reply.id);
-    if (reply.ok === true) entry.resolve(reply.result);
-    else entry.reject(new Error(reply.error ?? "RPC \u80FD\u529B\u8C03\u7528\u5931\u8D25"));
-  });
+  wireRpcResponses(port, pending);
   for (const capability of input.capabilities ?? []) {
     container.register(
       capability.name,
@@ -3656,30 +3678,36 @@ if (workerPort !== null && workerData !== void 0) {
   runWorker(workerData, port);
 }
 
-// packages/cli/src/dev.ts
-async function loadConfig(cwd) {
-  const name = basename(resolve2(cwd));
-  const config = await loadAdepConfigModule(cwd);
-  return {
-    name: config?.name ?? name,
-    functionsDir: config?.functionsDir ?? "functions",
-    functionsPrefix: config?.functions_prefix ?? "",
-    ...config?.environment === void 0 ? {} : { environment: config.environment }
+// packages/cli/src/dev-shared.ts
+import { readdir as readdir2, readFile as readFile5 } from "node:fs/promises";
+import { join as join8 } from "node:path";
+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 createBearerUserResolver(issuer) {
+  const userinfoUrl = `${issuer.replace(/\/+$/, "")}/oauth/userinfo`;
+  return async (headers) => {
+    const match = BEARER_TOKEN_RE.exec((headers["authorization"] ?? "").trim());
+    const token = match?.[1]?.trim();
+    if (token === void 0 || token === "") return null;
+    try {
+      const res = await fetch(userinfoUrl, { headers: { authorization: `Bearer ${token}` } });
+      if (!res.ok) return null;
+      const claims = await res.json();
+      if (typeof claims.sub !== "string" || claims.sub.length === 0) return null;
+      return {
+        id: claims.sub,
+        ...typeof claims.name === "string" ? { name: claims.name } : {},
+        ...typeof claims.email === "string" ? { email: claims.email } : {}
+      };
+    } catch {
+      return null;
+    }
   };
 }
-function parseEnvFile(content) {
-  const env = {};
-  for (const raw of content.split(/\r?\n/)) {
-    const line = raw.trim();
-    if (line.length === 0 || line.startsWith("#")) continue;
-    const eq = line.indexOf("=");
-    if (eq === -1) continue;
-    const key = line.slice(0, eq).trim();
-    if (key.length === 0) continue;
-    env[key] = line.slice(eq + 1).trim();
-  }
-  return env;
-}
 async function collectFunctions(dir) {
   const files = {};
   const walk = async (sub, prefix) => {
@@ -3721,6 +3749,42 @@ function bodyOf(req) {
     req.on("error", rejectBody);
   });
 }
+function writeJson(res, status, payload) {
+  res.writeHead(status, { "content-type": "application/json" });
+  res.end(JSON.stringify(payload));
+}
+async function requestInput(url, req, readBody) {
+  const query = {};
+  for (const key of new Set(url.searchParams.keys())) {
+    const values = url.searchParams.getAll(key);
+    query[key] = values.length > 1 ? values.join(",") : values[0] ?? "";
+  }
+  const headers = {};
+  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);
+  return {
+    method: req.method ?? "GET",
+    path: url.pathname,
+    query,
+    headers,
+    ...body === void 0 ? {} : { body }
+  };
+}
+
+// packages/cli/src/dev.ts
+async function loadConfig(cwd) {
+  const name = basename(resolve2(cwd));
+  const config = await loadAdepConfigModule(cwd);
+  return {
+    name: config?.name ?? name,
+    functionsDir: config?.functionsDir ?? "functions",
+    functionsPrefix: config?.functions_prefix ?? "",
+    ...config?.environment === void 0 ? {} : { environment: config.environment }
+  };
+}
+var parseEnvFile = parseEnv;
 function resolveRouteFnName(pathname, prefix) {
   const segments = pathname.split("/").filter((segment) => segment.length > 0);
   const normalizedPrefix = prefix.replace(/^\/+|\/+$/g, "");
@@ -3747,10 +3811,6 @@ function resolveRouteFnName(pathname, prefix) {
   }
   return { fnName: second };
 }
-function writeJson(res, status, payload) {
-  res.writeHead(status, { "content-type": "application/json" });
-  res.end(JSON.stringify(payload));
-}
 function printBoundaries(log) {
   log("[adep] \u80FD\u529B\u8FB9\u754C\uFF08\u6A21\u62DF\u8FD0\u884C\u65F6\u53EA\u66FF\u6362\u4F20\u8F93/\u6301\u4E45\u5316\uFF0C\u4E0D\u6539\u5199\u8BED\u4E49\uFF09\uFF1A");
   for (const b of SIM_BOUNDARIES) {
@@ -3758,8 +3818,8 @@ function printBoundaries(log) {
   }
 }
 async function ensureGitignore(cwd) {
-  const gitignorePath = join8(cwd, ".gitignore");
-  const existing = await readFile5(gitignorePath, "utf8").catch(() => "");
+  const gitignorePath = join9(cwd, ".gitignore");
+  const existing = await readFile6(gitignorePath, "utf8").catch(() => "");
   if (existing.split(/\r?\n/).includes(".adep/")) return;
   await writeFile3(gitignorePath, `${existing.replace(/\n+$/, "")}
 .adep/
@@ -3773,8 +3833,9 @@ async function startDevServer(options) {
   if (options.prefix !== void 0) {
     config.functionsPrefix = options.prefix.replace(/^\/+|\/+$/g, "");
   }
-  const functionsDir = join8(cwd, config.functionsDir);
+  const functionsDir = join9(cwd, config.functionsDir);
   const coldStartAt = Date.now();
+  const bearerUser = bearerUserResolverFromEnv();
   const executor = new WorkerFunctionExecutor({
     deps: { rootDir: cwd, builtin: LOCAL_BUILTIN_DEPS }
   });
@@ -3865,12 +3926,12 @@ async function startDevServer(options) {
   const reload = async () => {
     const [nextFiles, envText2] = await Promise.all([
       collectFunctions(functionsDir),
-      readFile5(join8(cwd, ".env.local"), "utf8").catch(() => "")
+      readFile6(join9(cwd, ".env.local"), "utf8").catch(() => "")
     ]);
     files = nextFiles;
     env = { ...config.environment, ...parseEnvFile(envText2) };
   };
-  const envText = await readFile5(join8(cwd, ".env.local"), "utf8").catch(() => "");
+  const envText = await readFile6(join9(cwd, ".env.local"), "utf8").catch(() => "");
   env = { ...config.environment, ...parseEnvFile(envText) };
   let debounceTimer;
   let watcher;
@@ -3885,29 +3946,15 @@ async function startDevServer(options) {
     watcher = void 0;
   }
   const buildInput = async (fnName, entry, url, req) => {
-    const query = {};
-    for (const key of new Set(url.searchParams.keys())) {
-      const values = url.searchParams.getAll(key);
-      query[key] = values.length > 1 ? values.join(",") : values[0] ?? "";
-    }
-    const headers = {};
-    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 bodyOf(req);
     const hasEnv = Object.keys(env).length > 0;
+    const request = await requestInput(url, req, bodyOf);
+    if (bearerUser !== void 0) request.user = await bearerUser(request.headers);
     return {
       project: { id: "local", slug: config.name },
       fn: { id: fnName, name: fnName },
       files,
       entry,
-      request: {
-        method: req.method ?? "GET",
-        path: url.pathname,
-        query,
-        headers,
-        ...body === void 0 ? {} : { body }
-      },
+      request,
       // 模拟运行时能力：db / storage / realtime 各自只读复用线上装配，语义一致。
       capabilities: dbBundle.capabilities,
       rpcHandlers: {
@@ -4044,6 +4091,9 @@ async function startDevServer(options) {
   log(`[adep] dev server listening on ${baseUrl}\uFF08\u6A21\u62DF\u8FD0\u884C\u65F6\uFF0C\u51B7\u542F\u52A8 ${coldStartMs}ms\uFF09`);
   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] \u6A21\u62DF\u6570\u636E\u76EE\u5F55\uFF1A${simDir(cwd)}`);
   startStateAlarmScheduler();
   return {

package/dist/worker-entry.js

@@ -434,6 +434,19 @@ var DB_RPC = {
   chain: "chain"
 };
 
+// packages/runtime/src/functions/runtime/rpc-wire.ts
+function wireRpcResponses(port, pending) {
+  port.on?.((message) => {
+    const reply = message;
+    if (reply?.type !== "rpc-response" || typeof reply.id !== "number") return;
+    const entry = pending.get(reply.id);
+    if (entry === void 0) return;
+    pending.delete(reply.id);
+    if (reply.ok === true) entry.resolve(reply.result);
+    else entry.reject(new Error(reply.error ?? "RPC \u80FD\u529B\u8C03\u7528\u5931\u8D25"));
+  });
+}
+
 // packages/runtime/src/functions/runtime/chain.ts
 function isChainCapability(value) {
   if (typeof value !== "object" || value === null) return false;
@@ -514,6 +527,11 @@ function splitBareSpecifier(request) {
   return request.split("/")[0];
 }
 
+// packages/runtime/src/shared/regexp.ts
+function escapeRegExp(text) {
+  return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
 // packages/runtime/src/functions/runtime/worker-entry.ts
 function isRpcCapability(value) {
   return typeof value === "object" && value !== null && value[RPC_CAPABILITY_KEY] === true;
@@ -543,9 +561,6 @@ function errorMessageOf2(error) {
   }
   return String(error);
 }
-function escapeRegExp(text) {
-  return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
 function firstUserFrame(stack, files) {
   for (const key of Object.keys(files)) {
     const match = new RegExp(
@@ -604,15 +619,7 @@ function runWorker(input, port) {
   const container = createCloudContainer();
   const pending = /* @__PURE__ */ new Map();
   let rpcId = 0;
-  port.on?.((message) => {
-    const reply = message;
-    if (reply?.type !== "rpc-response" || typeof reply.id !== "number") return;
-    const entry = pending.get(reply.id);
-    if (entry === void 0) return;
-    pending.delete(reply.id);
-    if (reply.ok === true) entry.resolve(reply.result);
-    else entry.reject(new Error(reply.error ?? "RPC \u80FD\u529B\u8C03\u7528\u5931\u8D25"));
-  });
+  wireRpcResponses(port, pending);
   for (const capability of input.capabilities ?? []) {
     container.register(
       capability.name,

package/package.json

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