@twikoojs/edgeone-makers 2.0.14 → 2.0.15

package/dist/cloud-functions/index.js

@@ -43,7 +43,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __require = /* #__PURE__ */ (() => createRequire(import.meta.url))();
 //#endregion
 //#region ../shared/dist/index.mjs
-/*! @twikoojs/shared v2.0.14 */
+/*! @twikoojs/shared v2.0.15 */
 /**
 * Twikoo 统一版本号常量（构建期占位符）。
 *
@@ -56,7 +56,7 @@ var __require = /* #__PURE__ */ (() => createRequire(import.meta.url))();
 * 占位符字面量由 `@twikoojs/tsdown-config` 的 `VERSION_PLACEHOLDER` 常量定义，
 * 客户端与服务端统一读取本常量，避免版本号在多包之间手工同步。
 */
-const VERSION = "2.0.14";
+const VERSION = "2.0.15";
 /**
 * 后端事件名常量（Scope E：24 个客户端事件 + 1 个服务端内部事件）。
 *
@@ -27597,6 +27597,34 @@ function allowCors(request, config) {
 		"Access-Control-Max-Age": "600"
 	};
 }
+/** 错误路径共用进行中的配置读取，避免并发拒绝请求堆积查询。 */
+const pendingCorsConfig = /* @__PURE__ */ new WeakMap();
+/** 错误响应只读取已有数据库的配置，最多等待 100ms；失败或超时不放行跨域，也不改变原错误。 */
+async function allowCorsForError(request, database) {
+	if (!request.headers.origin) return {};
+	let pending = pendingCorsConfig.get(database);
+	if (!pending) {
+		pending = (async () => {
+			try {
+				return await database.getConfig() ?? {};
+			} catch (e) {
+				console.error("Twikoo CORS configuration failed:", e);
+				return null;
+			}
+		})();
+		pendingCorsConfig.set(database, pending);
+		pending.then(() => pendingCorsConfig.delete(database));
+	}
+	let timer;
+	try {
+		const config = await Promise.race([pending, new Promise((resolve) => {
+			timer = setTimeout(() => resolve(null), 100);
+		})]);
+		return config === null ? {} : allowCors(request, config);
+	} finally {
+		clearTimeout(timer);
+	}
+}
 /**
 * 计算放行的 Origin（1.x getAllowedOrigin 逐行对齐）。
 * @param origin 请求 Origin
@@ -27666,13 +27694,15 @@ function createPipeline(adapters) {
 		let status = 200;
 		/** 步骤 3 产出，步骤 9 回填判断用 */
 		let accessToken = "";
+		let corsAttempted = false;
 		try {
 			protect(request, logger);
 			validateClientFields(request.body);
 			accessToken = anonymousSignIn(request);
+			corsAttempted = true;
 			await adapters.database.init();
 			const { config, failed: configReadFailed } = await readConfig(adapters, logger);
-			Object.assign(headers, allowCors(request, config));
+			if (!configReadFailed) Object.assign(headers, allowCors(request, config));
 			if (request.method === "OPTIONS") return {
 				status: 204,
 				body: {},
@@ -27698,6 +27728,7 @@ function createPipeline(adapters) {
 				message: getErrorMessage(e)
 			};
 			if (e instanceof RateLimitError) status = 429;
+			if (!corsAttempted) Object.assign(headers, await allowCorsForError(request, adapters.database));
 		}
 		if (!body.code && !request.body.accessToken) body.accessToken = accessToken;
 		logger.verbose("请求返回：", body);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twikoojs/edgeone-makers",
-  "version": "2.0.14",
+  "version": "2.0.15",
   "description": "Twikoo comment system backend for Tencent EdgeOne Makers",
   "license": "MIT",
   "repository": {
@@ -21,14 +21,14 @@
   "dependencies": {
     "@cap.js/server": "^4.0.5",
     "@edgeone/pages-blob": "latest",
-    "@twikoojs/common": "2.0.14",
-    "@twikoojs/shared": "2.0.14",
+    "@twikoojs/common": "2.0.15",
+    "@twikoojs/shared": "2.0.15",
     "bowser": "^2.14.1",
     "form-data": "^4.0.6",
     "html-to-text": "^10.0.1",
     "marked": "^18.0.13",
     "pako": "^3.0.2",
-    "pushoo": "^2.0.14",
+    "pushoo": "^2.0.15",
     "xml2js": "^0.6.2"
   },
   "devDependencies": {