befly 3.66.0 → 3.68.0

package/apis/tongJi/dailyStats.js

@@ -86,7 +86,7 @@ function buildProductSummary(item, stats, todayCount) {
     };
 }
 
-async function loadProjectLists(befly) {
+async function loadProjects(befly) {
     if (!befly.mysql) {
         return [];
     }
@@ -102,9 +102,9 @@ async function loadProjectLists(befly) {
 }
 
 async function buildDailyStatsProducts(befly, history, dateStats) {
-    const projectLists = await loadProjectLists(befly);
+    const projects = await loadProjects(befly);
     const products = await Promise.all(
-        projectLists.map(async (item) => {
+        projects.map(async (item) => {
             const stats = history[item.code] || { yesterday: 0, dayBeforeYesterday: 0, month: 0, lastMonth: 0 };
             const todayCount = await getTodayCount(befly, dateStats.reportDate, item.code);
 

package/checks/config.js

@@ -12,31 +12,6 @@ const noTrimString = z.string().refine(isNoTrimStringAllowEmpty, "不允许首
 const beflyModeSchema = z.union([z.literal("manual"), z.literal("auto")]);
 const uploadExtensionListSchema = noTrimString.regex(/^\.[a-z0-9]+(?:,\.[a-z0-9]+)*$/);
 const uploadMimeTypeListSchema = noTrimString.regex(/^[a-z0-9][a-z0-9.+-]*\/[a-z0-9][a-z0-9.+-]*(?:,[a-z0-9][a-z0-9.+-]*\/[a-z0-9][a-z0-9.+-]*)*$/);
-const projectListCodeSchema = z.string().regex(/^[a-zA-Z][a-zA-Z0-9_-]*$/, "必须以字母开头，只允许字母、数字、短横线、下划线");
-const projectListItemSchema = z
-    .object({
-        code: projectListCodeSchema,
-        name: noTrimString.min(1)
-    })
-    .strict();
-const projectListsSchema = z.array(projectListItemSchema).superRefine((projectLists, ctx) => {
-    const codeSet = new Set();
-
-    for (let index = 0; index < projectLists.length; index += 1) {
-        const code = projectLists[index].code;
-
-        if (codeSet.has(code)) {
-            ctx.addIssue({
-                code: "custom",
-                message: `projectLists[${index}].code 重复`,
-                path: [index, "code"]
-            });
-        }
-
-        codeSet.add(code);
-    }
-});
-
 const configSchema = z
     .object({
         runMode: z.enum(RUN_MODE_VALUES),
@@ -142,9 +117,7 @@ const configSchema = z
                 skipRoutes: z.array(noTrimString),
                 rules: z.array(z.object({}).passthrough())
             })
-            .strict(),
-
-        projectLists: projectListsSchema
+            .strict()
     })
     .strict();
 

package/configs/beflyConfig.json

@@ -70,6 +70,5 @@
         "key": "ip",
         "skipRoutes": [],
         "rules": []
-    },
-    "projectLists": []
+    }
 }

package/index.js

@@ -55,34 +55,6 @@ function prefixMenuPaths(menus, prefix) {
     });
 }
 
-function mergeProjectListsByCode(projectLists) {
-    if (!Array.isArray(projectLists)) {
-        return [];
-    }
-
-    const itemMap = new Map();
-
-    for (const item of projectLists) {
-        const code = String(item?.code || "");
-        const name = String(item?.name || "");
-
-        if (!code) {
-            continue;
-        }
-
-        if (itemMap.has(code)) {
-            itemMap.delete(code);
-        }
-
-        itemMap.set(code, {
-            code: code,
-            name: name
-        });
-    }
-
-    return Array.from(itemMap.values());
-}
-
 async function ensureSyncPrerequisites(ctx) {
     const missingCtxKeys = ["ctx.redis", "ctx.mysql", "ctx.cache"].filter((key) => !ctx[key.slice(4)]);
     if (missingCtxKeys.length > 0) {
@@ -118,7 +90,6 @@ async function ensureSyncPrerequisites(ctx) {
 export async function createBefly(config = {}, menus = []) {
     const mergedConfig = deepMerge(beflyConfig, config);
     const mergedMenus = deepMerge(prefixMenuPaths(beflyMenus, "core"), menus);
-    mergedConfig.projectLists = mergeProjectListsByCode(mergedConfig.projectLists);
 
     Logger.configure({
         runtimeEnv: mergedConfig.runMode,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "3.66.0",
+    "version": "3.68.0",
     "gitHead": "49c39d36695036e85fc64083cc43c1652fff96cb",
     "private": false,
     "description": "Befly - 为 Bun 专属打造的 JavaScript API 接口框架核心引擎",

package/utils/is.js

@@ -350,7 +350,7 @@ export function isEmpty(value) {
  * PM2 cluster 的实例 0 是主进程；未由 PM2 启动时视为主进程。
  */
 export function isPrimaryProcess(env) {
-    return env.NODE_APP_INSTANCE === "0" || env.NODE_APP_INSTANCE === undefined;
+    return env.NODE_APP_INSTANCE === "0" || env.NODE_APP_INSTANCE === 0 || env.NODE_APP_INSTANCE === undefined;
 }
 
 export const isDirentDirectory = (parentDir, entry) => {