zhin.js 1.0.6 → 1.0.8

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # zhin.js
 
+## 1.0.8
+
+### Patch Changes
+
+- 551c4d2: fix: 插件支持配置文件读取,优化 test 用例
+- Updated dependencies [551c4d2]
+  - @zhin.js/core@1.0.8
+
+## 1.0.7
+
+### Patch Changes
+
+- Updated dependencies [47845fb]
+  - @zhin.js/core@1.0.7
+
 ## 1.0.6
 
 ### Patch Changes

package/lib/index.d.ts

@@ -2,4 +2,5 @@ export * from '@zhin.js/core';
 import { AppConfig, App } from '@zhin.js/core';
 export { default as logger } from '@zhin.js/logger';
 export declare function createApp(config?: Partial<AppConfig>): Promise<App>;
+export declare function createApp(config_file?: string): Promise<App>;
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,cAAc,eAAe,CAAA;AAE7B,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAM9C,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAEnD,wBAAsB,SAAS,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CA4BzE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,cAAc,eAAe,CAAA;AAE7B,OAAO,EAAE,SAAS,EAAE,GAAG,EAAU,MAAM,eAAe,CAAA;AAKtD,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAEnD,wBAAsB,SAAS,CAAC,MAAM,CAAC,EAAC,OAAO,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;AACzE,wBAAsB,SAAS,CAAC,WAAW,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA"}

package/lib/index.js

@@ -3,42 +3,23 @@
 // ================================================================================================
 // 导出核心框架
 export * from '@zhin.js/core';
-import logger from '@zhin.js/logger';
-import { App } from '@zhin.js/core';
-import { loadConfig } from '@zhin.js/core';
+import { App, Config } from '@zhin.js/core';
 import path from 'path';
 import fs from 'fs';
 // 重新导出 logger（作为独立的工具）
 export { default as logger } from '@zhin.js/logger';
-export async function createApp(config) {
-    let finalConfig, configPath = '';
-    const envFiles = ['.env', `.env.${process.env.NODE_ENV}`]
-        .filter(filename => fs.existsSync(path.join(process.cwd(), filename)));
-    if (!config || Object.keys(config).length === 0) {
-        try {
-            logger.info('🔍 正在查找配置文件...');
-            [configPath, finalConfig] = await loadConfig();
-            logger.info('✅ 配置文件加载成功');
-        }
-        catch (error) {
-            logger.warn('⚠️  配置文件加载失败，使用默认配置', {
-                error: error instanceof Error ? error.message : String(error)
-            });
-            finalConfig = Object.assign({}, App.defaultConfig);
-        }
+export async function createApp(config_param) {
+    const envFiles = ['.env', `.env.${process.env.NODE_ENV}`].filter(f => fs.existsSync(path.join(process.cwd(), f)));
+    if (config_param === undefined) {
+        config_param = Config.supportedExtensions.map(ext => `zhin.config${ext}`).find(f => fs.existsSync(path.join(process.cwd(), f)));
     }
-    else {
-        finalConfig = Object.assign({}, App.defaultConfig, config);
-    }
-    const app = new App(finalConfig);
+    if (config_param === undefined)
+        throw new Error('No configuration file found and no configuration provided.');
+    const app = new App(config_param);
     app.watching(envFiles, () => {
+        console.log('Environment file changed, exiting to reload...');
         process.exit(51);
     });
-    if (configPath) {
-        app.watching(configPath, () => {
-            process.exit(51);
-        });
-    }
     return app;
 }
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,mGAAmG;AACnG,uBAAuB;AACvB,mGAAmG;AAEnG,SAAS;AACT,cAAc,eAAe,CAAA;AAC7B,OAAO,MAAM,MAAM,iBAAiB,CAAA;AACpC,OAAO,EAAa,GAAG,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,uBAAuB;AACvB,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAEnD,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,MAA2B;IACvD,IAAI,WAAsB,EAAC,UAAU,GAAQ,EAAE,CAAC;IAChD,MAAM,QAAQ,GAAC,CAAC,MAAM,EAAC,QAAQ,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;SACjD,MAAM,CAAC,QAAQ,CAAA,EAAE,CAAA,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;IACvE,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9C,IAAI,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAC9B,CAAC,UAAU,EAAC,WAAW,CAAC,GAAG,MAAM,UAAU,EAAE,CAAC;YAC9C,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,CAAC,IAAI,CAAC,qBAAqB,EAAE;gBAC/B,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAChE,CAAC,CAAC;YACH,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC;QACvD,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;IACD,MAAM,GAAG,GAAE,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;IAChC,GAAG,CAAC,QAAQ,CAAC,QAAQ,EAAC,GAAE,EAAE;QACtB,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACpB,CAAC,CAAC,CAAA;IACF,IAAG,UAAU,EAAC,CAAC;QACX,GAAG,CAAC,QAAQ,CAAC,UAAU,EAAC,GAAE,EAAE;YACxB,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACrB,CAAC,CAAC,CAAA;IACN,CAAC;IACD,OAAO,GAAG,CAAA;AACd,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,mGAAmG;AACnG,uBAAuB;AACvB,mGAAmG;AAEnG,SAAS;AACT,cAAc,eAAe,CAAA;AAE7B,OAAO,EAAa,GAAG,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AACtD,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,uBAAuB;AACvB,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAInD,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,YAAuC;IACnE,MAAM,QAAQ,GAAC,CAAC,MAAM,EAAC,QAAQ,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA,EAAE,CAAA,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAC3G,IAAG,YAAY,KAAG,SAAS,EAAC,CAAC;QACzB,YAAY,GAAC,MAAM,CAAC,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAA,EAAE,CAAA,cAAc,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA,EAAE,CAAA,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAC5H,CAAC;IACD,IAAG,YAAY,KAAG,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAA;IAC1G,MAAM,GAAG,GAAE,IAAI,GAAG,CAAC,YAAsB,CAAC,CAAC;IAC3C,GAAG,CAAC,QAAQ,CAAC,QAAQ,EAAC,GAAE,EAAE;QACtB,OAAO,CAAC,GAAG,CAAC,gDAAgD,CAAC,CAAA;QAC7D,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACpB,CAAC,CAAC,CAAA;IACF,OAAO,GAAG,CAAA;AACd,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zhin.js",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "开箱即用的机器人框架 - 包含进程适配器、HTTP服务、Web控制台和SQLite数据库",
   "type": "module",
   "main": "./lib/index.js",
@@ -24,7 +24,7 @@
     }
   },
   "dependencies": {
-    "@zhin.js/core": "1.0.6",
+    "@zhin.js/core": "1.0.8",
     "@zhin.js/logger": "0.1.0"
   },
   "devDependencies": {

package/src/index.ts

@@ -5,40 +5,25 @@
 // 导出核心框架
 export * from '@zhin.js/core'
 import logger from '@zhin.js/logger'
-import { AppConfig, App } from '@zhin.js/core'
-import { loadConfig } from '@zhin.js/core'
+import { AppConfig, App, Config } from '@zhin.js/core'
 import path from 'path'
 import fs from 'fs'
 
 // 重新导出 logger（作为独立的工具）
 export { default as logger } from '@zhin.js/logger'
 
-export async function createApp(config?: Partial<AppConfig>): Promise<App> {
-    let finalConfig: AppConfig,configPath:string='';
-    const envFiles=['.env',`.env.${process.env.NODE_ENV}`]
-        .filter(filename=>fs.existsSync(path.join(process.cwd(),filename)))
-    if (!config || Object.keys(config).length === 0) {
-        try {
-            logger.info('🔍 正在查找配置文件...');
-            [configPath,finalConfig] = await loadConfig();
-            logger.info('✅ 配置文件加载成功');
-        } catch (error) {
-            logger.warn('⚠️  配置文件加载失败，使用默认配置', { 
-                error: error instanceof Error ? error.message : String(error) 
-            });
-            finalConfig = Object.assign({}, App.defaultConfig);
-        }
-    } else {
-        finalConfig = Object.assign({}, App.defaultConfig, config);
+export async function createApp(config?:Partial<AppConfig>): Promise<App>
+export async function createApp(config_file?:string): Promise<App>
+export async function createApp(config_param?:string|Partial<AppConfig>): Promise<App>  {
+    const envFiles=['.env',`.env.${process.env.NODE_ENV}`].filter(f=>fs.existsSync(path.join(process.cwd(),f)))
+    if(config_param===undefined){
+        config_param=Config.supportedExtensions.map(ext=>`zhin.config${ext}`).find(f=>fs.existsSync(path.join(process.cwd(),f)))
     }
-    const app= new App(finalConfig);
+    if(config_param===undefined) throw new Error('No configuration file found and no configuration provided.')
+    const app= new App(config_param as string);
     app.watching(envFiles,()=>{
+        console.log('Environment file changed, exiting to reload...')
         process.exit(51)
     })
-    if(configPath){
-        app.watching(configPath,()=>{
-            process.exit(51);
-        })
-    }
     return app
 }