befly 3.71.0 → 3.73.0

package/schemas/config.js

@@ -0,0 +1,67 @@
+import { RUN_MODE_VALUES } from "../configs/constConfig.js";
+
+const noTrimString = { type: "string", noTrim: true };
+const boolInt = { type: "boolInt" };
+const port = { type: "number", integer: true, min: 1, max: 65535 };
+
+export const configSchema = {
+    root: {
+        runMode: { type: "values", values: RUN_MODE_VALUES },
+        appName: noTrimString,
+        appPort: port,
+        appHost: noTrimString,
+        apiHost: noTrimString,
+        devEmail: { type: "string", noTrim: true, check: "emailOrEmpty" },
+        devPassword: { type: "string", min: 6 },
+        bodyLimit: { type: "number", integer: true, min: 1 },
+        tz: { type: "string", check: "timeZone" },
+        excludeApisLog: { type: "stringArray", noTrim: true }
+    },
+    groups: {
+        upload: {
+            maxSize: { type: "number", integer: true, min: 1 },
+            publicDir: { ...noTrimString, min: 1 },
+            publicHost: noTrimString,
+            allowedExtensions: { ...noTrimString, pattern: /^\.[a-z0-9]+(?:,\.[a-z0-9]+)*$/ },
+            allowedMimeTypes: { ...noTrimString, pattern: /^[a-z0-9][a-z0-9.+-]*\/[a-z0-9][a-z0-9.+-]*(?:,[a-z0-9][a-z0-9.+-]*\/[a-z0-9][a-z0-9.+-]*)*$/ },
+            forceDownloadExtensions: { ...noTrimString, pattern: /^(|\.[a-z0-9]+(?:,\.[a-z0-9]+)*)$/ }
+        },
+        logger: { debug: boolInt, excludeFields: { type: "stringArray", noTrim: true } },
+        mysql: {
+            hostname: noTrimString,
+            port: port,
+            username: noTrimString,
+            password: noTrimString,
+            database: noTrimString,
+            max: { type: "number", min: 1 },
+            beflyMode: { type: "values", values: ["manual", "auto"], optional: true },
+            idleTimeout: { type: "number", min: 1, optional: true },
+            maxLifetime: { type: "number", min: 0, optional: true },
+            connectionTimeout: { type: "number", min: 1, optional: true }
+        },
+        redis: {
+            hostname: noTrimString,
+            port: port,
+            username: noTrimString,
+            password: noTrimString,
+            db: { type: "number", integer: true, min: 0, max: 16 },
+            prefix: { ...noTrimString, check: "redisPrefix" }
+        },
+        session: { expireDays: { type: "number", integer: true, min: 1 } },
+        email: { host: noTrimString, port: port, secure: boolInt, user: noTrimString, pass: noTrimString, label: { ...noTrimString, optional: true } },
+        cors: {
+            methods: noTrimString,
+            allowedHeaders: noTrimString,
+            exposedHeaders: noTrimString,
+            maxAge: { type: "number", integer: true, min: 0 },
+            credentials: { type: "values", values: ["true", "false", true, false] }
+        },
+        rateLimit: {
+            enable: boolInt,
+            defaultLimit: { type: "number", integer: true, min: 1 },
+            defaultWindow: { type: "number", integer: true, min: 1 },
+            key: noTrimString,
+            skipRoutes: { type: "stringArray", noTrim: true }
+        }
+    }
+};

package/utils/cors.js

@@ -5,7 +5,7 @@
  * @returns CORS 响应头对象
  */
 export function setCorsOptions(req, config) {
-    const origin = config.origin;
+    const origin = req.headers.get("origin");
     const allowCredentials = config.credentials === true || config.credentials === "true" ? "true" : "false";
     const requestedHeaders = req.headers.get("Access-Control-Request-Headers") || "";
 
@@ -42,7 +42,7 @@ export function setCorsOptions(req, config) {
     const allowHeaders = allowedHeaderItems.join(", ");
 
     return {
-        "Access-Control-Allow-Origin": origin === "*" && allowCredentials === "false" ? req.headers.get("origin") || "*" : origin,
+        ...(origin ? { "Access-Control-Allow-Origin": origin, Vary: "Origin" } : {}),
         "Access-Control-Allow-Methods": config.methods,
         "Access-Control-Allow-Headers": allowHeaders,
         "Access-Control-Expose-Headers": config.exposedHeaders,

package/utils/formatValidationIssues.js

@@ -0,0 +1,28 @@
+function pickFileLabel(item, itemLabel, index) {
+    if (item) {
+        if (item.filePath) return item.filePath;
+        if (item.relativePath) return item.relativePath;
+        if (item.fileName) return item.fileName;
+        if (item.name) return item.name;
+    }
+
+    return typeof index === "number" ? `${itemLabel}[${index}]` : itemLabel;
+}
+
+export function formatValidationIssues(issues, options = {}) {
+    const items = Array.isArray(options.items) ? options.items : null;
+    const item = options.item || null;
+    const itemLabel = options.itemLabel || "item";
+
+    return issues.map((issue) => {
+        const path = Array.isArray(issue.path) ? issue.path : [];
+        const hasIndex = items && typeof path[0] === "number";
+        const index = hasIndex ? path[0] : null;
+        const fieldPath = (hasIndex ? path.slice(1) : path).join(".") || "(root)";
+
+        return {
+            file: pickFileLabel(hasIndex ? items[index] : item, itemLabel, index),
+            expected: `字段 ${fieldPath} ${issue.message}`
+        };
+    });
+}

package/utils/is.js

@@ -113,7 +113,7 @@ export function isBoolean(value) {
  * 判断值是否为 function。
  */
 export function isFunction(value) {
-    return Object.prototype.toString.call(value) === "[object Function]";
+    return typeof value === "function";
 }
 
 /**
@@ -349,8 +349,9 @@ export function isEmpty(value) {
  * 判断当前进程是否为主进程。
  * PM2 cluster 的实例 0 是主进程；未由 PM2 启动时视为主进程。
  */
-export function isPrimaryProcess(env) {
-    return env.NODE_APP_INSTANCE === "0" || env.NODE_APP_INSTANCE === 0 || env.NODE_APP_INSTANCE === undefined;
+export function isPrimaryProcess() {
+    const instance = Bun.env.NODE_APP_INSTANCE;
+    return instance === "0" || instance === 0 || instance === undefined;
 }
 
 export const isDirentDirectory = (parentDir, entry) => {

package/utils/formatZodIssues.js

@@ -1,98 +0,0 @@
-function formatValue(value) {
-    if (value === undefined) return "undefined";
-    if (value === null) return "null";
-    if (typeof value === "string") return value;
-    if (typeof value === "number" || typeof value === "boolean") return value;
-    if (typeof value === "function") return "[Function]";
-    if (Array.isArray(value)) return value.map((item) => formatValue(item)).join(", ");
-
-    try {
-        return JSON.stringify(value);
-    } catch {
-        return String(value);
-    }
-}
-
-function pickFileLabel(item, itemLabel, index) {
-    if (item) {
-        if (item.filePath) return item.filePath;
-        if (item.relativePath) return item.relativePath;
-        if (item.fileName) return item.fileName;
-        if (item.name) return item.name;
-    }
-
-    if (typeof index === "number") return `${itemLabel}[${index}]`;
-
-    return itemLabel;
-}
-
-function buildExpectedMessage(issue, fieldPath) {
-    if (issue.code === "invalid_enum_value" && Array.isArray(issue.options)) {
-        return `字段 ${fieldPath} 仅允许 ${issue.options.join("|")}`;
-    }
-
-    if (issue.code === "invalid_literal") {
-        return `字段 ${fieldPath} 仅允许 ${formatValue(issue.expected)}`;
-    }
-
-    if (issue.code === "invalid_type") {
-        return `字段 ${fieldPath} 必须是 ${issue.expected}`;
-    }
-
-    if (issue.code === "too_small") {
-        if (typeof issue.minimum === "number") {
-            const sign = issue.inclusive ? ">=" : ">";
-            return `字段 ${fieldPath} ${sign}${issue.minimum}`;
-        }
-    }
-
-    if (issue.code === "too_big") {
-        if (typeof issue.maximum === "number") {
-            const sign = issue.inclusive ? "<=" : "<";
-            return `字段 ${fieldPath} ${sign}${issue.maximum}`;
-        }
-    }
-
-    if (issue.message) {
-        return `字段 ${fieldPath} ${issue.message}`;
-    }
-
-    return `字段 ${fieldPath} 无效`;
-}
-
-export function formatZodIssues(issues, options = {}) {
-    const result = [];
-    const items = Array.isArray(options.items) ? options.items : null;
-    const item = options.item || null;
-    const itemLabel = options.itemLabel || "item";
-
-    for (const issue of issues) {
-        const issuePath = Array.isArray(issue.path) ? issue.path : [];
-        const hasIndex = items && typeof issuePath[0] === "number";
-        const index = hasIndex ? issuePath[0] : null;
-        const path = hasIndex ? issuePath.slice(1) : issuePath;
-
-        const targetItem = hasIndex ? items[index] : item;
-        const fileLabel = pickFileLabel(targetItem, itemLabel, index);
-        const fieldPath = path.length > 0 ? path.join(".") : "(root)";
-
-        const expectedMessage = buildExpectedMessage(issue, fieldPath);
-
-        if (issue.code === "unrecognized_keys" && Array.isArray(issue.keys)) {
-            for (const key of issue.keys) {
-                result.push({
-                    file: fileLabel,
-                    expected: `字段 ${key} 禁止出现`
-                });
-            }
-            continue;
-        }
-
-        result.push({
-            file: fileLabel,
-            expected: expectedMessage
-        });
-    }
-
-    return result;
-}