befly 3.13.9 → 3.14.0

package/dist/befly.js

@@ -7590,25 +7590,25 @@ async function checkApi(apis) {
         hasError = true;
         continue;
       }
-      if (typeof api?.routePath !== "string" || api.routePath.trim() === "") {
-        Logger.warn(Object.assign({}, omit(api, ["handler"]), { msg: "\u63A5\u53E3\u7684 routePath \u5C5E\u6027\u5FC5\u987B\u662F\u975E\u7A7A\u5B57\u7B26\u4E32\uFF08\u7531\u7CFB\u7EDF\u751F\u6210\uFF09" }));
+      if (typeof api?.path !== "string" || api.path.trim() === "") {
+        Logger.warn(Object.assign({}, omit(api, ["handler"]), { msg: "\u63A5\u53E3\u7684 path \u5C5E\u6027\u5FC5\u987B\u662F\u975E\u7A7A\u5B57\u7B26\u4E32\uFF08\u7531\u7CFB\u7EDF\u751F\u6210\uFF09" }));
         hasError = true;
       } else {
-        const routePath = api.routePath.trim();
-        if (/^(GET|POST|PUT|PATCH|DELETE|OPTIONS|HEAD)\b/i.test(routePath)) {
-          Logger.warn(Object.assign({}, omit(api, ["handler"]), { msg: "\u63A5\u53E3\u7684 routePath \u4E0D\u5141\u8BB8\u5305\u542B method \u524D\u7F00\uFF0C\u5E94\u4E3A url.pathname\uFF08\u4F8B\u5982 /api/app/xxx\uFF09" }));
+        const path = api.path.trim();
+        if (/^(GET|POST|PUT|PATCH|DELETE|OPTIONS|HEAD)\b/i.test(path)) {
+          Logger.warn(Object.assign({}, omit(api, ["handler"]), { msg: "\u63A5\u53E3\u7684 path \u4E0D\u5141\u8BB8\u5305\u542B method \u524D\u7F00\uFF0C\u5E94\u4E3A url.pathname\uFF08\u4F8B\u5982 /api/app/xxx\uFF09" }));
           hasError = true;
         }
-        if (!routePath.startsWith("/api/")) {
-          Logger.warn(Object.assign({}, omit(api, ["handler"]), { msg: "\u63A5\u53E3\u7684 routePath \u5FC5\u987B\u4EE5 /api/ \u5F00\u5934" }));
+        if (!path.startsWith("/api/")) {
+          Logger.warn(Object.assign({}, omit(api, ["handler"]), { msg: "\u63A5\u53E3\u7684 path \u5FC5\u987B\u4EE5 /api/ \u5F00\u5934" }));
           hasError = true;
         }
-        if (routePath.includes(" ")) {
-          Logger.warn(Object.assign({}, omit(api, ["handler"]), { msg: "\u63A5\u53E3\u7684 routePath \u4E0D\u5141\u8BB8\u5305\u542B\u7A7A\u683C" }));
+        if (path.includes(" ")) {
+          Logger.warn(Object.assign({}, omit(api, ["handler"]), { msg: "\u63A5\u53E3\u7684 path \u4E0D\u5141\u8BB8\u5305\u542B\u7A7A\u683C" }));
           hasError = true;
         }
-        if (routePath.includes("/api//")) {
-          Logger.warn(Object.assign({}, omit(api, ["handler"]), { msg: "\u63A5\u53E3\u7684 routePath \u4E0D\u5141\u8BB8\u51FA\u73B0 /api//\uFF08\u91CD\u590D\u659C\u6760\uFF09" }));
+        if (path.includes("/api//")) {
+          Logger.warn(Object.assign({}, omit(api, ["handler"]), { msg: "\u63A5\u53E3\u7684 path \u4E0D\u5141\u8BB8\u51FA\u73B0 /api//\uFF08\u91CD\u590D\u659C\u6760\uFF09" }));
           hasError = true;
         }
       }
@@ -8320,7 +8320,7 @@ var presetFields = {
 };
 
 // utils/processAtSymbol.ts
-function processAtSymbol(fields, apiName, routePath) {
+function processAtSymbol(fields, apiName, path) {
   if (!fields || typeof fields !== "object")
     return fields;
   const processed = {};
@@ -8331,7 +8331,7 @@ function processAtSymbol(fields, apiName, routePath) {
         continue;
       }
       const validKeys = Object.keys(presetFields).join(", ");
-      throw new Error(`API [${apiName}] (${routePath}) \u5B57\u6BB5 [${key}] \u5F15\u7528\u4E86\u672A\u5B9A\u4E49\u7684\u9884\u8BBE\u5B57\u6BB5 "${value}"\u3002\u53EF\u7528\u7684\u9884\u8BBE\u5B57\u6BB5\u6709: ${validKeys}`);
+      throw new Error(`API [${apiName}] (${path}) \u5B57\u6BB5 [${key}] \u5F15\u7528\u4E86\u672A\u5B9A\u4E49\u7684\u9884\u8BBE\u5B57\u6BB5 "${value}"\u3002\u53EF\u7528\u7684\u9884\u8BBE\u5B57\u6BB5\u6709: ${validKeys}`);
     }
     processed[key] = value;
   }
@@ -8342,14 +8342,13 @@ function processAtSymbol(fields, apiName, routePath) {
 async function loadApis(apis) {
   const apisMap = new Map;
   for (const api of apis) {
-    const apiType = api.type;
-    if (apiType && apiType !== "api") {
+    if (api.type !== "api") {
       continue;
     }
     try {
       const apiRoute = api;
-      apiRoute.fields = processAtSymbol(apiRoute.fields || {}, apiRoute.name, apiRoute.routePath);
-      apisMap.set(apiRoute.routePath, apiRoute);
+      apiRoute.fields = processAtSymbol(apiRoute.fields || {}, apiRoute.name, apiRoute.path);
+      apisMap.set(apiRoute.path, apiRoute);
     } catch (error) {
       Logger.error({ err: error, api: api.relativePath, file: api.filePath, msg: "\u63A5\u53E3\u52A0\u8F7D\u5931\u8D25" });
       throw error;
@@ -8783,6 +8782,15 @@ function staticHandler(corsConfig = undefined) {
 // sync/syncApi.ts
 init_logger();
 init_util();
+var getApiParentPath = (apiPath) => {
+  const segments = apiPath.split("/").map((s) => s.trim()).filter((s) => s.length > 0);
+  const seg2 = segments[1] || "";
+  const take = seg2 === "addon" ? 4 : 3;
+  const parentSegments = segments.slice(0, Math.min(take, segments.length));
+  if (parentSegments.length === 0)
+    return "";
+  return `/${parentSegments.join("/")}`;
+};
 async function syncApi(ctx, apis) {
   const tableName = "addon_admin_api";
   if (!ctx.db) {
@@ -8797,55 +8805,61 @@ async function syncApi(ctx, apis) {
   }
   const allDbApis = await ctx.db.getAll({
     table: tableName,
-    fields: ["id", "routePath", "name", "addonName", "auth", "state"],
+    fields: ["id", "path", "parentPath", "name", "addonName", "auth", "state"],
     where: { state$gte: 0 }
   });
   const dbLists = allDbApis.data.lists || [];
-  const allDbApiMap = keyBy(dbLists, (item) => item.routePath);
+  const allDbApiMap = keyBy(dbLists, (item) => item.path);
   const insData = [];
   const updData = [];
   const delData = [];
   const apiRouteKeys = new Set;
   for (const api of apis) {
-    const apiType = api.type;
-    if (apiType && apiType !== "api") {
+    if (api.type !== "api") {
       continue;
     }
-    const normalizedAuth = api.auth === 0 || api.auth === false ? 0 : 1;
-    const normalizedApi = {
-      name: api.name,
-      routePath: api.routePath,
-      addonName: api.addonName,
-      auth: normalizedAuth
-    };
-    const routePath = normalizedApi.routePath;
-    apiRouteKeys.add(routePath);
-    const item = allDbApiMap[routePath];
+    const auth = api.auth === false || api.auth === 0 ? 0 : 1;
+    const parentPath = getApiParentPath(api.path);
+    apiRouteKeys.add(api.path);
+    const item = allDbApiMap[api.path];
     if (item) {
-      const dbAuth = item.auth === 0 || item.auth === false ? 0 : 1;
-      const shouldUpdate = normalizedApi.name !== item.name || normalizedApi.routePath !== item.routePath || normalizedApi.addonName !== item.addonName || normalizedAuth !== dbAuth;
+      const shouldUpdate = api.name !== item.name || api.path !== item.path || api.addonName !== item.addonName || parentPath !== item.parentPath || auth !== item.auth;
       if (shouldUpdate) {
-        updData.push({ id: item.id, api: normalizedApi });
+        updData.push({
+          id: item.id,
+          name: api.name,
+          path: api.path,
+          parentPath,
+          addonName: api.addonName,
+          auth
+        });
       }
     } else {
-      insData.push(normalizedApi);
+      insData.push({
+        name: api.name,
+        path: api.path,
+        parentPath,
+        addonName: api.addonName,
+        auth
+      });
     }
   }
   for (const record of dbLists) {
-    if (!apiRouteKeys.has(record.routePath)) {
+    if (!apiRouteKeys.has(record.path)) {
       delData.push(record.id);
     }
   }
   if (updData.length > 0) {
     try {
-      await ctx.db.updBatch(tableName, updData.map((item) => {
+      await ctx.db.updBatch(tableName, updData.map((api) => {
         return {
-          id: item.id,
+          id: api.id,
           data: {
-            name: item.api.name,
-            routePath: item.api.routePath,
-            addonName: item.api.addonName,
-            auth: item.api.auth === 0 || item.api.auth === false ? 0 : 1
+            name: api.name,
+            path: api.path,
+            parentPath: api.parentPath,
+            addonName: api.addonName,
+            auth: api.auth
           }
         };
       }));
@@ -8858,9 +8872,10 @@ async function syncApi(ctx, apis) {
       await ctx.db.insBatch(tableName, insData.map((api) => {
         return {
           name: api.name,
-          routePath: api.routePath,
+          path: api.path,
+          parentPath: api.parentPath,
           addonName: api.addonName,
-          auth: api.auth === 0 || api.auth === false ? 0 : 1
+          auth: api.auth
         };
       }));
     } catch (error) {
@@ -9000,7 +9015,6 @@ async function syncDev(ctx, config2 = {}) {
   if (!config2.devPassword) {
     return;
   }
-  const devEmail = typeof config2.devEmail === "string" && config2.devEmail.length > 0 ? config2.devEmail : "dev@qq.com";
   if (!ctx.db) {
     throw new Error("syncDev: ctx.db \u672A\u521D\u59CB\u5316\uFF08Db \u63D2\u4EF6\u672A\u52A0\u8F7D\u6216\u6CE8\u5165\u5931\u8D25\uFF09");
   }
@@ -9019,140 +9033,130 @@ async function syncDev(ctx, config2 = {}) {
     Logger.debug(`addon_admin_menu \u8868\u4E0D\u5B58\u5728`);
     return;
   }
+  if (!(await ctx.db.tableExists("addon_admin_api")).data) {
+    Logger.debug(`addon_admin_api \u8868\u4E0D\u5B58\u5728`);
+    return;
+  }
   const allMenus = await ctx.db.getAll({
     table: "addon_admin_menu",
     fields: ["path"],
     where: { state$gte: 0 },
     orderBy: ["id#ASC"]
   });
-  const menuPaths = Array.from(new Set((allMenus.data.lists || []).map((m) => typeof m?.path === "string" ? m.path.trim() : "").filter((p) => p.length > 0)));
-  const existApi = await ctx.db.tableExists("addon_admin_api");
-  let apiPaths = [];
-  if (existApi.data) {
-    const allApis = await ctx.db.getAll({
-      table: "addon_admin_api",
-      fields: ["routePath"],
-      where: { state$gte: 0 },
-      orderBy: ["id#ASC"]
-    });
-    apiPaths = Array.from(new Set((allApis.data.lists || []).map((a) => {
-      if (typeof a?.routePath !== "string") {
-        throw new Error("syncDev: addon_admin_api.routePath \u5FC5\u987B\u662F\u5B57\u7B26\u4E32");
-      }
-      const routePath = a.routePath.trim();
-      if (routePath.length === 0) {
-        throw new Error("syncDev: addon_admin_api.routePath \u4E0D\u5141\u8BB8\u4E3A\u7A7A\u5B57\u7B26\u4E32");
+  const allApis = await ctx.db.getAll({
+    table: "addon_admin_api",
+    fields: ["path"],
+    where: { state$gte: 0 },
+    orderBy: ["id#ASC"]
+  });
+  const devRole = await ctx.db.getOne({
+    table: "addon_admin_role",
+    where: { code: "dev" }
+  });
+  const devRoleData = {
+    code: "dev",
+    name: "\u5F00\u53D1\u8005\u89D2\u8272",
+    description: "\u62E5\u6709\u6240\u6709\u83DC\u5355\u548C\u63A5\u53E3\u6743\u9650\u7684\u5F00\u53D1\u8005\u89D2\u8272",
+    menus: allMenus.data.lists.map((item) => item.path).filter((v) => v),
+    apis: allApis.data.lists.map((item) => item.path).filter((v) => v),
+    sort: 0
+  };
+  if (devRole.data) {
+    await ctx.db.updData({
+      table: "addon_admin_role",
+      where: { code: "dev" },
+      data: {
+        name: devRoleData.name,
+        description: devRoleData.description,
+        menus: devRoleData.menus,
+        apis: devRoleData.apis,
+        sort: devRoleData.sort
       }
-      if (!routePath.startsWith("/")) {
-        throw new Error(`syncDev: addon_admin_api.routePath \u5FC5\u987B\u662F pathname\uFF08\u4EE5 / \u5F00\u5934\uFF09\uFF0C\u5F53\u524D\u503C=${routePath}`);
+    });
+  } else {
+    await ctx.db.insData({
+      table: "addon_admin_role",
+      data: devRoleData
+    });
+  }
+  const devAdminData = {
+    nickname: "\u5F00\u53D1\u8005",
+    email: config2.devEmail || "dev@qq.com",
+    username: "dev",
+    password: await Cipher.hashPassword(Cipher.sha256(config2.devPassword + "befly")),
+    roleCode: "dev",
+    roleType: "admin"
+  };
+  const devAdmin = await ctx.db.getOne({
+    table: "addon_admin_admin",
+    where: { username: "dev" }
+  });
+  if (devAdmin.data) {
+    await ctx.db.updData({
+      table: "addon_admin_admin",
+      where: { username: "dev" },
+      data: {
+        nickname: devAdminData.nickname,
+        email: devAdminData.email,
+        username: devAdminData.username,
+        password: devAdminData.password,
+        roleCode: devAdminData.roleCode,
+        roleType: devAdminData.roleType
       }
-      return routePath;
-    })));
+    });
+  } else {
+    await ctx.db.insData({
+      table: "addon_admin_admin",
+      data: devAdminData
+    });
   }
   const roles = [
-    {
-      code: "dev",
-      name: "\u5F00\u53D1\u8005\u89D2\u8272",
-      description: "\u62E5\u6709\u6240\u6709\u83DC\u5355\u548C\u63A5\u53E3\u6743\u9650\u7684\u5F00\u53D1\u8005\u89D2\u8272",
-      menus: menuPaths,
-      apis: apiPaths,
-      sort: 0
-    },
     {
       code: "user",
       name: "\u7528\u6237\u89D2\u8272",
       description: "\u666E\u901A\u7528\u6237\u89D2\u8272",
-      menus: [],
-      apis: [],
       sort: 1
     },
     {
       code: "admin",
       name: "\u7BA1\u7406\u5458\u89D2\u8272",
       description: "\u7BA1\u7406\u5458\u89D2\u8272",
-      menus: [],
-      apis: [],
       sort: 2
     },
     {
       code: "guest",
       name: "\u8BBF\u5BA2\u89D2\u8272",
       description: "\u8BBF\u5BA2\u89D2\u8272",
-      menus: [],
-      apis: [],
       sort: 3
     }
   ];
-  let devRole = null;
   for (const roleConfig of roles) {
     const existingRole = await ctx.db.getOne({
       table: "addon_admin_role",
       where: { code: roleConfig.code }
     });
-    if (existingRole.data) {
-      const nextMenus = roleConfig.menus;
-      const nextApis = roleConfig.apis;
-      const existingMenus = Array.isArray(existingRole.data.menus) ? existingRole.data.menus : [];
-      const existingApis = Array.isArray(existingRole.data.apis) ? existingRole.data.apis : [];
-      const menusChanged = existingMenus.length !== nextMenus.length || existingMenus.some((v, i) => v !== nextMenus[i]);
-      const apisChanged = existingApis.length !== nextApis.length || existingApis.some((v, i) => v !== nextApis[i]);
-      const hasChanges = existingRole.data.name !== roleConfig.name || existingRole.data.description !== roleConfig.description || menusChanged || apisChanged || existingRole.data.sort !== roleConfig.sort;
-      if (hasChanges) {
-        await ctx.db.updData({
-          table: "addon_admin_role",
-          where: { code: roleConfig.code },
-          data: {
-            name: roleConfig.name,
-            description: roleConfig.description,
-            menus: roleConfig.menus,
-            apis: roleConfig.apis,
-            sort: roleConfig.sort
-          }
-        });
-      }
-      if (roleConfig.code === "dev") {
-        devRole = existingRole.data;
-      }
+    if (existingRole.data?.id) {
+      await ctx.db.updData({
+        table: "addon_admin_role",
+        where: { code: roleConfig.code },
+        data: {
+          name: roleConfig.name,
+          description: roleConfig.description,
+          sort: roleConfig.sort
+        }
+      });
     } else {
-      const roleId = await ctx.db.insData({
+      await ctx.db.insData({
         table: "addon_admin_role",
-        data: roleConfig
+        data: {
+          code: roleConfig.code,
+          name: roleConfig.name,
+          description: roleConfig.description,
+          sort: roleConfig.sort
+        }
       });
-      if (roleConfig.code === "dev") {
-        devRole = { id: roleId.data };
-      }
     }
   }
-  if (!devRole) {
-    Logger.error("dev \u89D2\u8272\u4E0D\u5B58\u5728\uFF0C\u65E0\u6CD5\u521B\u5EFA\u5F00\u53D1\u8005\u8D26\u53F7");
-    return;
-  }
-  const sha256Hashed = Cipher.sha256(config2.devPassword + "befly");
-  const hashed = await Cipher.hashPassword(sha256Hashed);
-  const devData = {
-    nickname: "\u5F00\u53D1\u8005",
-    email: devEmail,
-    username: "dev",
-    password: hashed,
-    roleCode: "dev",
-    roleType: "admin"
-  };
-  const existing = await ctx.db.getOne({
-    table: "addon_admin_admin",
-    where: { email: devEmail }
-  });
-  if (existing.data) {
-    await ctx.db.updData({
-      table: "addon_admin_admin",
-      where: { email: devEmail },
-      data: devData
-    });
-  } else {
-    await ctx.db.insData({
-      table: "addon_admin_admin",
-      data: devData
-    });
-  }
 }
 
 // sync/syncMenu.ts
@@ -15179,7 +15183,7 @@ async function scanFiles(dir, source, type, pattern) {
       });
       if (type === "api") {
         base.routePrefix = source === "app" ? "/app" : `/addon/${addonName}`;
-        base.routePath = `/api${base.routePrefix}/${relativePath}`;
+        base.path = `/api${base.routePrefix}/${relativePath}`;
       }
       results.push(base);
     }
@@ -15232,13 +15236,12 @@ class Befly {
   hooks = [];
   context = {};
   config = null;
-  async start(env) {
+  async start(env = {}) {
     try {
       const serverStartTime = Bun.nanoseconds();
-      const runtimeEnv = env || {};
-      this.config = await loadBeflyConfig(runtimeEnv.NODE_ENV);
+      this.config = await loadBeflyConfig(env.NODE_ENV || "development");
       this.context.config = this.config;
-      this.context.env = runtimeEnv;
+      this.context.env = env;
       const { apis, tables, plugins, hooks, addons } = await scanSources();
       this.context.addons = addons;
       await checkApi(apis);
@@ -15298,7 +15301,7 @@ class Befly {
         }
       });
       const finalStartupTime = calcPerfTime(serverStartTime);
-      const processRole = getProcessRole(runtimeEnv);
+      const processRole = getProcessRole(env);
       const roleLabel = processRole.role === "primary" ? "\u4E3B\u8FDB\u7A0B" : `\u5DE5\u4F5C\u8FDB\u7A0B #${processRole.instanceId}`;
       const envLabel = processRole.env === "standalone" ? "" : ` [${processRole.env}]`;
       Logger.info(`${this.config.appName} \u542F\u52A8\u6210\u529F! (${roleLabel}${envLabel})`);