@adep/cli 0.4.10 → 0.5.0

package/dist/vite.js

@@ -51,6 +51,8 @@ var ExecutorError = class extends Error {
     this.code = code;
     this.name = "ExecutorError";
   }
+  status;
+  code;
 };
 var TIMEOUT_CODE = "FN_EXEC_TIMEOUT";
 var OOM_CODE = "FN_EXEC_OOM";
@@ -430,6 +432,8 @@ var DbError = class extends Error {
     this.code = code;
     this.name = "DbError";
   }
+  status;
+  code;
 };
 var IDENTIFIER_PATTERN = /^[A-Za-z_][A-Za-z0-9_]{0,62}$/;
 function assertIdentifier(name) {
@@ -1212,11 +1216,13 @@ var SimDbError = class extends Error {
     this.code = code;
     this.name = "SimDbError";
   }
+  code;
 };
 var ParamCursor = class {
   constructor(params) {
     this.params = params;
   }
+  params;
   index = 0;
   take() {
     const v = this.params[this.index];
@@ -1398,16 +1404,19 @@ var ExcludedRef = class {
   constructor(column) {
     this.column = column;
   }
+  column;
 };
 var ColumnRef = class {
   constructor(column) {
     this.column = column;
   }
+  column;
 };
 var ExprRef = class {
   constructor(source) {
     this.source = source;
   }
+  source;
 };
 function resolveSetValue(value, existing, row) {
   if (value instanceof ExcludedRef) return row[value.column];
@@ -2064,9 +2073,12 @@ var StorageError = class extends Error {
     this.code = code;
     this.name = "StorageError";
   }
+  status;
+  code;
 };
 var STORAGE_CODES = {
   invalidPath: "STORAGE_INVALID_PATH",
+  invalidData: "STORAGE_INVALID_DATA",
   notFound: "STORAGE_NOT_FOUND",
   quotaExceeded: "STORAGE_QUOTA_EXCEEDED"
 };
@@ -2294,11 +2306,33 @@ function signDownloadUrl(config, projectId, path, ttlSeconds = DEFAULT_SIGN_TTL_
 var DEFAULT_VISIBILITY = "private";
 function asBytes(data) {
   if (typeof data === "string") return new TextEncoder().encode(data);
-  if (data instanceof ArrayBuffer) return new Uint8Array(data);
-  if (data instanceof Uint8Array) return data;
-  const candidate = data;
-  if (candidate.data instanceof Uint8Array) return candidate.data;
-  throw new StorageError(400, STORAGE_CODES.invalidPath, "\u4E0D\u652F\u6301\u7684\u5B58\u50A8\u6570\u636E\u7C7B\u578B");
+  if (isArrayBufferLike(data)) return new Uint8Array(data);
+  if (isBytes(data)) return toByteView(data);
+  if (isFunctionFile(data)) {
+    if (isBytes(data.data)) return toByteView(data.data);
+    if (isArrayBufferLike(data.data)) return new Uint8Array(data.data);
+    if (typeof data.data === "string") return new TextEncoder().encode(data.data);
+  }
+  throw new StorageError(400, STORAGE_CODES.invalidData, describeUnsupportedUploadData(data));
+}
+function isArrayBufferLike(value) {
+  return Object.prototype.toString.call(value) === "[object ArrayBuffer]";
+}
+function isBytes(value) {
+  return ArrayBuffer.isView(value) && !(Object.prototype.toString.call(value) === "[object DataView]");
+}
+function toByteView(view) {
+  return new Uint8Array(view.buffer, view.byteOffset, view.byteLength);
+}
+function isFunctionFile(value) {
+  if (typeof value !== "object" || value === null) return false;
+  const candidate = value;
+  return typeof candidate.name === "string" && "data" in candidate;
+}
+function describeUnsupportedUploadData(data) {
+  const tag = Object.prototype.toString.call(data);
+  const constructorName = typeof data === "object" && data !== null ? data.constructor?.name ?? "unknown" : "none";
+  return `\u4E0D\u652F\u6301\u7684\u5B58\u50A8\u6570\u636E\u7C7B\u578B\uFF08\u80FD\u529B cloud.storage\uFF0C\u65B9\u6CD5 upload\uFF09\uFF1Atypeof=${typeof data}\uFF0CtoString=${tag}\uFF0Cconstructor=${constructorName}\u3002\u652F\u6301\uFF1Astring / Uint8Array / ArrayBuffer / ctx.files\uFF08FunctionFile\uFF09\u3002\u82E5\u6570\u636E\u6765\u81EA\u5BB9\u5668\u6267\u884C\u5668\uFF0C\u8BF7\u786E\u8BA4\u5DF2\u5347\u7EA7\u5230\u5305\u542B RPC typed-array \u7F16\u89E3\u7801\u7684\u8FD0\u884C\u65F6\u955C\u50CF\u3002`;
 }
 function toStoredFile(meta) {
   return {
@@ -3001,6 +3035,189 @@ async function applyLocalSchema(driver, options) {
   log(`[${tag}] \u5DF2\u5E94\u7528\u6570\u636E\u5E93\u7ED3\u6784\uFF08--schema ${schemaFile}\uFF09\uFF1A${applied} \u6761\u8BED\u53E5${skipNote}`);
 }
 
+// packages/runtime/src/shared/fetch-blocked-ports.ts
+var FETCH_BLOCKED_PORTS = /* @__PURE__ */ new Set([
+  1,
+  7,
+  9,
+  11,
+  13,
+  15,
+  17,
+  19,
+  20,
+  21,
+  22,
+  23,
+  25,
+  37,
+  42,
+  43,
+  53,
+  69,
+  77,
+  79,
+  87,
+  95,
+  101,
+  102,
+  103,
+  104,
+  109,
+  110,
+  111,
+  113,
+  115,
+  117,
+  119,
+  123,
+  135,
+  137,
+  139,
+  143,
+  161,
+  179,
+  389,
+  427,
+  465,
+  512,
+  513,
+  514,
+  515,
+  526,
+  530,
+  531,
+  532,
+  540,
+  548,
+  554,
+  556,
+  563,
+  587,
+  601,
+  636,
+  989,
+  990,
+  993,
+  995,
+  1719,
+  1720,
+  1723,
+  2049,
+  3659,
+  4045,
+  4190,
+  5060,
+  5061,
+  6e3,
+  6566,
+  6665,
+  6666,
+  6667,
+  6668,
+  6669,
+  6679,
+  6697,
+  10080
+]);
+function isFetchBlockedPort(port) {
+  if (!Number.isInteger(port)) {
+    throw new TypeError(`[fetch-blocked-ports] \u7AEF\u53E3\u5FC5\u987B\u662F\u6574\u6570\uFF1A\u6536\u5230 ${String(port)}`);
+  }
+  return FETCH_BLOCKED_PORTS.has(port);
+}
+
+// packages/cli/src/serve/fetch-safe-port.ts
+var MAX_FETCH_SAFE_LISTEN_ATTEMPTS = 8;
+function listenOnce(server, port, host) {
+  return new Promise((resolve5, reject) => {
+    const onError = (error) => {
+      server.off("error", onError);
+      reject(error);
+    };
+    server.once("error", onError);
+    server.listen(port, host, () => {
+      server.off("error", onError);
+      resolve5();
+    });
+  });
+}
+function closeServer(server) {
+  return new Promise((resolve5, reject) => {
+    server.close((error) => error === void 0 ? resolve5() : reject(error));
+  });
+}
+async function closeQuietly(server) {
+  try {
+    await closeServer(server);
+  } catch (error) {
+    if (error.code !== "ERR_SERVER_NOT_RUNNING") throw error;
+  }
+}
+function readTcpPort(server, host) {
+  const address = server.address();
+  if (address === null || typeof address === "string") {
+    throw new Error(
+      `[adep] ${host} listen \u6210\u529F\u540E address() \u8FD4\u56DE ${JSON.stringify(address)}\uFF0C\u65E0\u6CD5\u5224\u5B9A\u7AEF\u53E3\uFF1B\u672C\u5730 dev / serve \u5FC5\u987B\u662F Internet \u57DF socket\u3002`
+    );
+  }
+  return address.port;
+}
+function buildExhaustedMessage(input) {
+  return [
+    `[adep] ${input.host} \u4E0A\u8FDE\u7EED ${input.maxAttempts} \u6B21 listen(0) \u90FD\u843D\u5728 undici \u62D2\u7EDD\u8BBF\u95EE\u7684\u7AEF\u53E3\u5185\uFF08\u547D\u4E2D\uFF1A${input.hits.join(", ")}\uFF09\uFF0C\u6700\u540E\u4E00\u6B21\u5DF2 close\u3002`,
+    "\u8FD9\u4E9B\u7AEF\u53E3\u7684\u8BF7\u6C42\u5728\u5EFA\u7ACB\u8FDE\u63A5\u4E4B\u524D\u5C31\u4F1A\u88AB fetch \u62D2\u7EDD\uFF08TypeError: fetch failed / cause: bad port\uFF09\uFF0C\u6D4F\u89C8\u5668\u5BFC\u822A\u5219\u662F ERR_UNSAFE_PORT\u2014\u2014\u670D\u52A1\u8D77\u6765\u4E86\u4F46\u9875\u9762\u6253\u4E0D\u5F00\u3002",
+    "\u53EF\u80FD\u539F\u56E0\uFF1A\u7CFB\u7EDF\u4E34\u65F6\u7AEF\u53E3\u8D77\u59CB\u503C\u88AB\u8C03\u4F4E\uFF08Windows \u7528 netsh int ipv4 show dynamicport tcp \u6838\u5BF9\uFF0CHyper-V / \u5BB9\u5668\u7F51\u7EDC\u4F1A\u6539\u5B83\uFF09\u3002\u53EF\u7528 --port \u6307\u5B9A\u4E00\u4E2A\u672A\u5360\u7528\u7684\u7AEF\u53E3\u7ED5\u8FC7\u3002"
+  ].join("\n");
+}
+async function listenOnFetchSafePort(server, options) {
+  const isBlocked = options.isBlocked ?? isFetchBlockedPort;
+  const warn = options.warn ?? (() => {
+  });
+  const notifyListenError = async (error) => {
+    try {
+      await options.onListenError?.(error);
+    } catch {
+    }
+  };
+  if (options.port !== 0) {
+    try {
+      await listenOnce(server, options.port, options.host);
+    } catch (error) {
+      await notifyListenError(error);
+      throw error;
+    }
+    const actual = readTcpPort(server, options.host);
+    if (isBlocked(actual)) {
+      warn(
+        `[adep] \u7AEF\u53E3 ${actual} \u5728 undici / \u6D4F\u89C8\u5668\u7684\u300C\u4E0D\u5B89\u5168\u7AEF\u53E3\u300D\u540D\u5355\u5185\uFF1A\u670D\u52A1\u53EF\u4EE5\u8D77\u6765\uFF0C\u4F46 fetch \u4F1A\u5728\u5EFA\u7ACB\u8FDE\u63A5\u524D\u62A5 bad port\u3001\u6D4F\u89C8\u5668\u5BFC\u822A\u62A5 ERR_UNSAFE_PORT\u3002\u5EFA\u8BAE\u6362\u4E2A\u7AEF\u53E3\u3002`
+      );
+    }
+    return actual;
+  }
+  const maxAttempts = options.maxAttempts ?? MAX_FETCH_SAFE_LISTEN_ATTEMPTS;
+  const hits = [];
+  for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
+    try {
+      await listenOnce(server, 0, options.host);
+    } catch (error) {
+      await notifyListenError(error);
+      throw error;
+    }
+    let actual;
+    try {
+      actual = readTcpPort(server, options.host);
+    } catch (error) {
+      await closeQuietly(server);
+      throw error;
+    }
+    if (!isBlocked(actual)) return actual;
+    hits.push(actual);
+    await closeQuietly(server);
+  }
+  throw new Error(buildExhaustedMessage({ host: options.host, hits, maxAttempts }));
+}
+
 // packages/cli/src/sim/env.ts
 import { readFile as readFile4 } from "node:fs/promises";
 import { join as join6 } from "node:path";
@@ -4548,6 +4765,90 @@ function createRpcClient(capability, port, pending, nextId) {
   });
 }
 
+// packages/runtime/src/functions/runtime/rpc-codec.ts
+var RPC_VALUE_TAG_KEY = "__adepRpcType";
+var RPC_VALUE_TAGS = {
+  typedArray: "Uint8Array",
+  arrayBuffer: "ArrayBuffer",
+  date: "Date",
+  map: "Map",
+  set: "Set",
+  undefined: "undefined",
+  number: "Number",
+  bigint: "BigInt",
+  /** 转义：用户对象自身带 `RPC_VALUE_TAG_KEY` 键时的包装形态。 */
+  object: "Object"
+};
+var RPC_VALUE_MAX_BYTES = 8 * 1024 * 1024;
+function base64ToBytes(base64) {
+  const binary = atob(base64);
+  const bytes = new Uint8Array(binary.length);
+  for (let index = 0; index < binary.length; index += 1) bytes[index] = binary.charCodeAt(index);
+  return bytes;
+}
+function decodeRpcValue(value) {
+  if (Array.isArray(value)) return value.map((entry) => decodeRpcValue(entry));
+  if (typeof value !== "object" || value === null) return value;
+  const nativeTag = Object.prototype.toString.call(value);
+  if (ArrayBuffer.isView(value) || nativeTag === "[object ArrayBuffer]" || nativeTag === "[object Date]" || nativeTag === "[object Map]" || nativeTag === "[object Set]") {
+    return value;
+  }
+  const candidate = value;
+  const tag = candidate[RPC_VALUE_TAG_KEY];
+  if (typeof tag !== "string") {
+    const output = {};
+    for (const [key, entry] of Object.entries(candidate)) output[key] = decodeRpcValue(entry);
+    return output;
+  }
+  switch (tag) {
+    case RPC_VALUE_TAGS.typedArray:
+      return base64ToBytes(String(candidate["data"] ?? ""));
+    case RPC_VALUE_TAGS.arrayBuffer: {
+      const bytes = base64ToBytes(String(candidate["data"] ?? ""));
+      return bytes.buffer.slice(bytes.byteOffset, bytes.byteOffset + bytes.byteLength);
+    }
+    case RPC_VALUE_TAGS.date:
+      return new Date(String(candidate["data"] ?? ""));
+    case RPC_VALUE_TAGS.map: {
+      const entries = Array.isArray(candidate["data"]) ? candidate["data"] : [];
+      const map = /* @__PURE__ */ new Map();
+      for (const entry of entries) {
+        if (!Array.isArray(entry) || entry.length < 2) continue;
+        map.set(decodeRpcValue(entry[0]), decodeRpcValue(entry[1]));
+      }
+      return map;
+    }
+    case RPC_VALUE_TAGS.set: {
+      const values = Array.isArray(candidate["data"]) ? candidate["data"] : [];
+      return new Set(values.map((entry) => decodeRpcValue(entry)));
+    }
+    case RPC_VALUE_TAGS.undefined:
+      return void 0;
+    case RPC_VALUE_TAGS.number: {
+      const raw = String(candidate["data"] ?? "");
+      if (raw === "NaN") return Number.NaN;
+      if (raw === "Infinity") return Number.POSITIVE_INFINITY;
+      if (raw === "-Infinity") return Number.NEGATIVE_INFINITY;
+      return Number(raw);
+    }
+    case RPC_VALUE_TAGS.bigint:
+      return BigInt(String(candidate["data"] ?? "0"));
+    case RPC_VALUE_TAGS.object: {
+      const escaped = candidate["data"];
+      if (typeof escaped !== "object" || escaped === null) return {};
+      const output = {};
+      for (const [key, entry] of Object.entries(escaped)) {
+        output[key] = decodeRpcValue(entry);
+      }
+      return output;
+    }
+    default:
+      return Object.fromEntries(
+        Object.entries(candidate).filter(([key]) => key !== RPC_VALUE_TAG_KEY).map(([key, entry]) => [key, decodeRpcValue(entry)])
+      );
+  }
+}
+
 // packages/runtime/src/functions/runtime/rpc-wire.ts
 function wireRpcResponses(port, pending) {
   port.on?.((message) => {
@@ -4556,7 +4857,7 @@ function wireRpcResponses(port, pending) {
     const entry = pending.get(reply.id);
     if (entry === void 0) return;
     pending.delete(reply.id);
-    if (reply.ok === true) entry.resolve(reply.result);
+    if (reply.ok === true) entry.resolve(decodeRpcValue(reply.result));
     else entry.reject(new Error(reply.error ?? "RPC \u80FD\u529B\u8C03\u7528\u5931\u8D25"));
   });
 }
@@ -5427,18 +5728,12 @@ async function startDevServer(options) {
     } catch {
     }
   };
-  await new Promise((resolveListen, rejectListen) => {
-    const onListenError = (error) => {
-      void disposeAfterListenError().finally(() => rejectListen(error));
-    };
-    server.once("error", onListenError);
-    server.listen(port, "127.0.0.1", () => {
-      server.off("error", onListenError);
-      resolveListen();
-    });
+  const actualPort = await listenOnFetchSafePort(server, {
+    port,
+    host: "127.0.0.1",
+    warn: log,
+    onListenError: disposeAfterListenError
   });
-  const address = server.address();
-  const actualPort = typeof address === "object" && address !== null ? address.port : port;
   const baseUrl = `http://127.0.0.1:${actualPort}`;
   const coldStartMs = Date.now() - coldStartAt;
   const curlPath = config.functionsPrefix.length === 0 ? "/hello" : `/${config.functionsPrefix}/hello`;

package/dist/worker-entry.js

@@ -812,6 +812,90 @@ function createRpcClient(capability, port, pending, nextId) {
   });
 }
 
+// packages/runtime/src/functions/runtime/rpc-codec.ts
+var RPC_VALUE_TAG_KEY = "__adepRpcType";
+var RPC_VALUE_TAGS = {
+  typedArray: "Uint8Array",
+  arrayBuffer: "ArrayBuffer",
+  date: "Date",
+  map: "Map",
+  set: "Set",
+  undefined: "undefined",
+  number: "Number",
+  bigint: "BigInt",
+  /** 转义：用户对象自身带 `RPC_VALUE_TAG_KEY` 键时的包装形态。 */
+  object: "Object"
+};
+var RPC_VALUE_MAX_BYTES = 8 * 1024 * 1024;
+function base64ToBytes(base64) {
+  const binary = atob(base64);
+  const bytes = new Uint8Array(binary.length);
+  for (let index = 0; index < binary.length; index += 1) bytes[index] = binary.charCodeAt(index);
+  return bytes;
+}
+function decodeRpcValue(value) {
+  if (Array.isArray(value)) return value.map((entry) => decodeRpcValue(entry));
+  if (typeof value !== "object" || value === null) return value;
+  const nativeTag = Object.prototype.toString.call(value);
+  if (ArrayBuffer.isView(value) || nativeTag === "[object ArrayBuffer]" || nativeTag === "[object Date]" || nativeTag === "[object Map]" || nativeTag === "[object Set]") {
+    return value;
+  }
+  const candidate = value;
+  const tag = candidate[RPC_VALUE_TAG_KEY];
+  if (typeof tag !== "string") {
+    const output = {};
+    for (const [key, entry] of Object.entries(candidate)) output[key] = decodeRpcValue(entry);
+    return output;
+  }
+  switch (tag) {
+    case RPC_VALUE_TAGS.typedArray:
+      return base64ToBytes(String(candidate["data"] ?? ""));
+    case RPC_VALUE_TAGS.arrayBuffer: {
+      const bytes = base64ToBytes(String(candidate["data"] ?? ""));
+      return bytes.buffer.slice(bytes.byteOffset, bytes.byteOffset + bytes.byteLength);
+    }
+    case RPC_VALUE_TAGS.date:
+      return new Date(String(candidate["data"] ?? ""));
+    case RPC_VALUE_TAGS.map: {
+      const entries = Array.isArray(candidate["data"]) ? candidate["data"] : [];
+      const map = /* @__PURE__ */ new Map();
+      for (const entry of entries) {
+        if (!Array.isArray(entry) || entry.length < 2) continue;
+        map.set(decodeRpcValue(entry[0]), decodeRpcValue(entry[1]));
+      }
+      return map;
+    }
+    case RPC_VALUE_TAGS.set: {
+      const values = Array.isArray(candidate["data"]) ? candidate["data"] : [];
+      return new Set(values.map((entry) => decodeRpcValue(entry)));
+    }
+    case RPC_VALUE_TAGS.undefined:
+      return void 0;
+    case RPC_VALUE_TAGS.number: {
+      const raw = String(candidate["data"] ?? "");
+      if (raw === "NaN") return Number.NaN;
+      if (raw === "Infinity") return Number.POSITIVE_INFINITY;
+      if (raw === "-Infinity") return Number.NEGATIVE_INFINITY;
+      return Number(raw);
+    }
+    case RPC_VALUE_TAGS.bigint:
+      return BigInt(String(candidate["data"] ?? "0"));
+    case RPC_VALUE_TAGS.object: {
+      const escaped = candidate["data"];
+      if (typeof escaped !== "object" || escaped === null) return {};
+      const output = {};
+      for (const [key, entry] of Object.entries(escaped)) {
+        output[key] = decodeRpcValue(entry);
+      }
+      return output;
+    }
+    default:
+      return Object.fromEntries(
+        Object.entries(candidate).filter(([key]) => key !== RPC_VALUE_TAG_KEY).map(([key, entry]) => [key, decodeRpcValue(entry)])
+      );
+  }
+}
+
 // packages/runtime/src/functions/runtime/rpc-wire.ts
 function wireRpcResponses(port, pending) {
   port.on?.((message) => {
@@ -820,7 +904,7 @@ function wireRpcResponses(port, pending) {
     const entry = pending.get(reply.id);
     if (entry === void 0) return;
     pending.delete(reply.id);
-    if (reply.ok === true) entry.resolve(reply.result);
+    if (reply.ok === true) entry.resolve(decodeRpcValue(reply.result));
     else entry.reject(new Error(reply.error ?? "RPC \u80FD\u529B\u8C03\u7528\u5931\u8D25"));
   });
 }

package/package.json

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