befly 3.8.17 → 3.8.19

package/check.ts

@@ -255,7 +255,7 @@ export const checkTable = async function (): Promise<boolean> {
  */
 export const checkApi = async function (): Promise<boolean> {
     try {
-        const apiGlob = new Bun.Glob('**/*.ts');
+        const apiGlob = new Bun.Glob('**/*.{ts,js}');
 
         // 收集所有 API 文件
         const allApiFiles: Array<{ file: string; displayName: string }> = [];
@@ -267,6 +267,9 @@ export const checkApi = async function (): Promise<boolean> {
                 onlyFiles: true,
                 absolute: true
             })) {
+                if (file.endsWith('.d.ts')) {
+                    continue;
+                }
                 allApiFiles.push({
                     file: file,
                     displayName: '用户'
@@ -285,6 +288,9 @@ export const checkApi = async function (): Promise<boolean> {
                 onlyFiles: true,
                 absolute: true
             })) {
+                if (file.endsWith('.d.ts')) {
+                    continue;
+                }
                 allApiFiles.push({
                     file: file,
                     displayName: `组件${addon}`
@@ -294,8 +300,8 @@ export const checkApi = async function (): Promise<boolean> {
 
         // 合并进行验证逻辑
         for (const item of allApiFiles) {
-            const fileName = basename(item.file).replace(/\.ts$/, '');
-            const apiPath = relative(item.displayName === '用户' ? projectApiDir : getAddonDir(item.displayName.replace('组件', ''), 'apis'), item.file).replace(/\.ts$/, '');
+            const fileName = basename(item.file).replace(/\.(ts|js)$/, '');
+            const apiPath = relative(item.displayName === '用户' ? projectApiDir : getAddonDir(item.displayName.replace('组件', ''), 'apis'), item.file).replace(/\.(ts|js)$/, '');
 
             // 跳过以下划线开头的文件
             if (apiPath.indexOf('_') !== -1) continue;

package/env.ts

@@ -1,7 +1,7 @@
 /**
  * 环境变量配置
  * 根据 NODE_ENV 自动切换开发/生产环境配置
- * 项目可通过创建 env.ts 文件覆盖这些配置
+ * 项目可通过创建 env.ts 或 env.js 文件覆盖这些配置
  */
 
 import { existsSync } from 'node:fs';
@@ -22,6 +22,7 @@ const coreEnv: EnvConfig = {
     DEV_EMAIL: '',
     DEV_PASSWORD: '123456',
     BODY_LIMIT: 10 * 1024 * 1024, // 10MB
+    DATABASE_ENABLE: 0,
     // ========== 时区配置 ==========
     TZ: 'Asia/Shanghai',
 
@@ -33,7 +34,6 @@ const coreEnv: EnvConfig = {
     LOG_MAX_SIZE: 10 * 1024 * 1024, // 10MB
 
     // ========== 数据库配置 ==========
-    DATABASE_ENABLE: 0,
     DB_TYPE: 'mysql',
     DB_HOST: '127.0.0.1',
     DB_PORT: 3306,
@@ -69,11 +69,19 @@ const coreEnv: EnvConfig = {
  */
 async function loadProjectEnv(): Promise<Partial<EnvConfig>> {
     try {
-        // 尝试从项目根目录加载 env.ts
-        const projectEnvPath = process.cwd() + '/env.ts';
+        // 尝试从项目根目录加载 env.ts 或 env.js
+        const projectEnvPathTs = process.cwd() + '/env.ts';
+        const projectEnvPathJs = process.cwd() + '/env.js';
+
+        let projectEnvPath = '';
+        if (existsSync(projectEnvPathTs)) {
+            projectEnvPath = projectEnvPathTs;
+        } else if (existsSync(projectEnvPathJs)) {
+            projectEnvPath = projectEnvPathJs;
+        }
 
         // 检查文件是否存在
-        if (!existsSync(projectEnvPath)) {
+        if (!projectEnvPath) {
             return {};
         }
 

package/lib/validator.ts

@@ -154,22 +154,29 @@ export class Validator {
      */
     private validateNumber(value: any, name: string, min: number | null, max: number | null, spec: string | null, fieldName: string): ValidationError {
         try {
-            if (typeof value !== 'number' || Number.isNaN(value) || !isFinite(value)) {
+            // 允许数字类型的字符串
+            let numValue = value;
+            if (typeof value === 'string') {
+                numValue = Number(value);
+                if (Number.isNaN(numValue) || !isFinite(numValue)) {
+                    return `${name}(${fieldName})必须是数字`;
+                }
+            } else if (typeof numValue !== 'number' || Number.isNaN(numValue) || !isFinite(numValue)) {
                 return `${name}(${fieldName})必须是数字`;
             }
 
-            if (min !== null && value < min) {
+            if (min !== null && numValue < min) {
                 return `${name}(${fieldName})不能小于${min}`;
             }
 
-            if (max !== null && max > 0 && value > max) {
+            if (max !== null && max > 0 && numValue > max) {
                 return `${name}(${fieldName})不能大于${max}`;
             }
 
             if (spec && spec.trim() !== '') {
                 try {
                     const regExp = new RegExp(spec);
-                    if (!regExp.test(String(value))) {
+                    if (!regExp.test(String(numValue))) {
                         return `${name}(${fieldName})格式不正确`;
                     }
                 } catch (error: any) {

package/loader/loadApis.ts

@@ -12,6 +12,8 @@ import { projectApiDir } from '../paths.js';
 import { scanAddons, getAddonDir, addonDirExists } from '../util.js';
 import type { ApiRoute } from '../types/api.js';
 
+const API_GLOB_PATTERN = '**/*.{ts,js}';
+
 /**
  * API 默认字段定义
  * 这些字段会自动合并到所有 API 的 fields 中
@@ -60,14 +62,17 @@ async function scanUserApis(): Promise<Array<{ file: string; routePrefix: string
         return apis;
     }
 
-    const glob = new Bun.Glob('**/*.ts');
+    const glob = new Bun.Glob(API_GLOB_PATTERN);
 
     for await (const file of glob.scan({
         cwd: projectApiDir,
         onlyFiles: true,
         absolute: true
     })) {
-        const apiPath = relative(projectApiDir, file).replace(/\.ts$/, '');
+        if (file.endsWith('.d.ts')) {
+            continue;
+        }
+        const apiPath = relative(projectApiDir, file).replace(/\.(ts|js)$/, '');
         if (apiPath.indexOf('_') !== -1) continue;
 
         apis.push({
@@ -85,7 +90,7 @@ async function scanUserApis(): Promise<Array<{ file: string; routePrefix: string
  */
 async function scanAddonApis(): Promise<Array<{ file: string; routePrefix: string; displayName: string }>> {
     const apis: Array<{ file: string; routePrefix: string; displayName: string }> = [];
-    const glob = new Bun.Glob('**/*.ts');
+    const glob = new Bun.Glob(API_GLOB_PATTERN);
     const addons = scanAddons();
 
     for (const addon of addons) {
@@ -97,7 +102,10 @@ async function scanAddonApis(): Promise<Array<{ file: string; routePrefix: strin
             onlyFiles: true,
             absolute: true
         })) {
-            const apiPath = relative(addonApiDir, file).replace(/\.ts$/, '');
+            if (file.endsWith('.d.ts')) {
+                continue;
+            }
+            const apiPath = relative(addonApiDir, file).replace(/\.(ts|js)$/, '');
             if (apiPath.indexOf('_') !== -1) continue;
 
             apis.push({
@@ -117,7 +125,7 @@ async function scanAddonApis(): Promise<Array<{ file: string; routePrefix: strin
 async function initApi(apiRoutes: Map<string, ApiRoute>, apiInfo: { file: string; routePrefix: string; displayName: string }): Promise<void> {
     const { file, routePrefix, displayName } = apiInfo;
     const apiDir = routePrefix === '' ? projectApiDir : getAddonDir(routePrefix.replace('addon/', ''), 'apis');
-    const apiPath = relative(apiDir, file).replace(/\.ts$/, '');
+    const apiPath = relative(apiDir, file).replace(/\.(ts|js)$/, '');
 
     try {
         // Windows 下路径需要转换为正斜杠格式

package/loader/loadPlugins.ts

@@ -49,14 +49,15 @@ function sortPlugins(plugins: Plugin[]): Plugin[] | false {
  */
 async function scanCorePlugins(loadedPluginNames: Set<string>): Promise<Plugin[]> {
     const plugins: Plugin[] = [];
-    const glob = new Bun.Glob('*.ts');
+    const glob = new Bun.Glob('*.{ts,js}');
 
     for await (const file of glob.scan({
         cwd: corePluginDir,
         onlyFiles: true,
         absolute: true
     })) {
-        const fileName = basename(file).replace(/\.ts$/, '');
+        if (file.endsWith('.d.ts')) continue;
+        const fileName = basename(file).replace(/\.(ts|js)$/, '');
         if (fileName.startsWith('_')) continue;
 
         try {
@@ -79,7 +80,7 @@ async function scanCorePlugins(loadedPluginNames: Set<string>): Promise<Plugin[]
  */
 async function scanAddonPlugins(loadedPluginNames: Set<string>): Promise<Plugin[]> {
     const plugins: Plugin[] = [];
-    const glob = new Bun.Glob('*.ts');
+    const glob = new Bun.Glob('*.{ts,js}');
     const addons = scanAddons();
 
     for (const addon of addons) {
@@ -91,7 +92,8 @@ async function scanAddonPlugins(loadedPluginNames: Set<string>): Promise<Plugin[
             onlyFiles: true,
             absolute: true
         })) {
-            const fileName = basename(file).replace(/\.ts$/, '');
+            if (file.endsWith('.d.ts')) continue;
+            const fileName = basename(file).replace(/\.(ts|js)$/, '');
             if (fileName.startsWith('_')) continue;
 
             const addonCamelCase = camelCase(addon);
@@ -103,10 +105,11 @@ async function scanAddonPlugins(loadedPluginNames: Set<string>): Promise<Plugin[
             }
 
             try {
-                const pluginImport = await import(file);
+                const normalizedFilePath = file.replace(/\\/g, '/');
+                const pluginImport = await import(normalizedFilePath);
                 const plugin = pluginImport.default;
                 plugin.pluginName = pluginFullName;
-                plugins.push(pluginInstance);
+                plugins.push(plugin);
                 loadedPluginNames.add(pluginFullName);
             } catch (err: any) {
                 Logger.error(`组件${addon} ${fileName} 导入失败`, err);
@@ -128,13 +131,14 @@ async function scanUserPlugins(loadedPluginNames: Set<string>): Promise<Plugin[]
         return plugins;
     }
 
-    const glob = new Bun.Glob('*.ts');
+    const glob = new Bun.Glob('*.{ts,js}');
     for await (const file of glob.scan({
         cwd: projectPluginDir,
         onlyFiles: true,
         absolute: true
     })) {
-        const fileName = basename(file).replace(/\.ts$/, '');
+        if (file.endsWith('.d.ts')) continue;
+        const fileName = basename(file).replace(/\.(ts|js)$/, '');
         if (fileName.startsWith('_')) continue;
 
         const fileNameCamelCase = camelCase(fileName);
@@ -145,10 +149,11 @@ async function scanUserPlugins(loadedPluginNames: Set<string>): Promise<Plugin[]
         }
 
         try {
-            const pluginImport = await import(file);
+            const normalizedFilePath = file.replace(/\\/g, '/');
+            const pluginImport = await import(normalizedFilePath);
             const plugin = pluginImport.default;
             plugin.pluginName = pluginFullName;
-            plugins.push(pluginInstance);
+            plugins.push(plugin);
             loadedPluginNames.add(pluginFullName);
         } catch (err: any) {
             Logger.error(`用户插件 ${fileName} 导入失败`, err);

package/main.ts

@@ -120,7 +120,7 @@ export class Befly {
         });
 
         const finalStartupTime = calcPerfTime(startTime);
-        Logger.info(`${Env.APP_NAME} 服务器启动成功! `);
+        Logger.info(`${Env.APP_NAME} 启动成功! `);
         Logger.info(`服务器启动耗时: ${finalStartupTime}`);
         Logger.info(`服务器监听地址: http://${Env.APP_HOST}:${Env.APP_PORT}`);
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "3.8.17",
+    "version": "3.8.19",
     "description": "Befly - 为 Bun 专属打造的 TypeScript API 接口框架核心引擎",
     "type": "module",
     "private": false,
@@ -65,5 +65,5 @@
         "es-toolkit": "^1.41.0",
         "pathe": "^2.0.3"
     },
-    "gitHead": "fdcc704f076a7eaa5d4c30d98c0ab270ff7ca0e6"
+    "gitHead": "0619a7cfdd889be9fdd1b187c3d6522288707df0"
 }