@kotori-bot/loader 1.1.0 → 1.2.0

package/lib/consts.d.ts

@@ -0,0 +1,4 @@
+export declare const DEV_FILE = ".ts";
+export declare const BUILD_FILE = ".js";
+export declare const DEV_IMPORT = "./src/index.ts";
+export declare const DEV_CODE_DIRS = "./src/";

package/lib/global.d.ts

@@ -0,0 +1,25 @@
+import { BaseDir } from '@kotori-bot/core';
+export declare const isDev: () => boolean;
+export declare const CONFIG_FILE: () => "kotori.dev.yml" | "kotori.yml";
+export declare const getBaseDir: () => {
+    root: any;
+    modules: string;
+};
+export declare const getGlobalConfig: (baseDir: BaseDir) => import("@kotori-bot/core").ObjectParserInfer<{
+    global: import("@kotori-bot/core").IntersectionParser<[import("@kotori-bot/core").ObjectParser<{
+        dirs: import("@kotori-bot/core").ArrayParser<import("@kotori-bot/core").StringParser>;
+    }>, import("@kotori-bot/core").ObjectParser<{
+        lang: import("@kotori-bot/core").UnionParser<[import("@kotori-bot/core").UnionParser<[import("@kotori-bot/core").LiteralParser<"en_US">, import("@kotori-bot/core").LiteralParser<"ja_JP">]>, import("@kotori-bot/core").UnionParser<[import("@kotori-bot/core").LiteralParser<"zh_CN">, import("@kotori-bot/core").LiteralParser<"zh_TW">]>]>;
+        'command-prefix': import("@kotori-bot/core").StringParser;
+    }>]>;
+    adapter: import("@kotori-bot/core").Parser<import("@kotori-bot/core").IndexObject<import("@kotori-bot/core").ObjectParserInfer<{
+        extends: import("@kotori-bot/core").StringParser;
+        master: import("@kotori-bot/core").UnionParser<[import("@kotori-bot/core").NumberParser, import("@kotori-bot/core").StringParser]>;
+    }> & import("@kotori-bot/core").ObjectParserInfer<{
+        lang: import("@kotori-bot/core").UnionParser<[import("@kotori-bot/core").UnionParser<[import("@kotori-bot/core").LiteralParser<"en_US">, import("@kotori-bot/core").LiteralParser<"ja_JP">]>, import("@kotori-bot/core").UnionParser<[import("@kotori-bot/core").LiteralParser<"zh_CN">, import("@kotori-bot/core").LiteralParser<"zh_TW">]>]>;
+        'command-prefix': import("@kotori-bot/core").StringParser;
+    }>>>;
+    plugin: import("@kotori-bot/core").Parser<import("@kotori-bot/core").IndexObject<import("@kotori-bot/core").ObjectParserInfer<{
+        priority: import("@kotori-bot/core").NumberParser;
+    }>>>;
+}>;

package/lib/global.js

@@ -3,17 +3,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.globalConfig = exports.baseDir = void 0;
+exports.getGlobalConfig = exports.getBaseDir = exports.CONFIG_FILE = exports.isDev = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const kotori_bot_1 = require("kotori-bot");
-const CONFIG_FILE = 'kotori.yml';
-exports.baseDir = (() => {
+const core_1 = require("@kotori-bot/core");
+const isDev = () => globalThis.env_mode === 'dev';
+exports.isDev = isDev;
+const CONFIG_FILE = () => ((0, exports.isDev)() ? 'kotori.dev.yml' : 'kotori.yml');
+exports.CONFIG_FILE = CONFIG_FILE;
+const getBaseDir = () => {
+    const { env_dir: envDir } = globalThis;
+    if (envDir) {
+        return {
+            root: envDir,
+            modules: path_1.default.join(envDir, 'modules'),
+        };
+    }
     let root = path_1.default.resolve(__dirname, '..').replace('loader', 'kotori');
     let count = 0;
-    while (!fs_1.default.existsSync(path_1.default.join(root, CONFIG_FILE))) {
+    while (!fs_1.default.existsSync(path_1.default.join(root, (0, exports.CONFIG_FILE)()))) {
         if (count > 5)
-            throw new kotori_bot_1.CoreError(`cannot find kotori-bot global ${CONFIG_FILE}`);
+            throw new core_1.CoreError(`cannot find kotori-bot global ${exports.CONFIG_FILE}`);
         root = path_1.default.join(root, '..');
         count += 1;
     }
@@ -21,20 +31,23 @@ exports.baseDir = (() => {
         root,
         modules: path_1.default.join(root, 'modules'),
     };
-})();
-exports.globalConfig = (() => {
-    const data = (0, kotori_bot_1.loadConfig)(path_1.default.join(exports.baseDir.root, CONFIG_FILE), 'yaml');
+};
+exports.getBaseDir = getBaseDir;
+const getGlobalConfig = (baseDir) => {
+    const data = (0, core_1.loadConfig)(path_1.default.join(baseDir.root, (0, exports.CONFIG_FILE)()), 'yaml');
     const isExistsGlobal = data && typeof data === 'object' && data.global && typeof data.global === 'object';
     try {
         if (!isExistsGlobal)
-            throw new kotori_bot_1.TsuError('en_US', 'array_error');
-        const lang = data.global.lang ? kotori_bot_1.localeTypeSchema.parse(data.global.lang) : undefined;
+            throw new core_1.TsuError('en_US', 'array_error');
+        const lang = data.global.lang ? core_1.localeTypeSchema.parse(data.global.lang) : undefined;
         const commandPrefix = data.global['command-prefix'] ? data.global['command-prefix'] : undefined;
-        return (0, kotori_bot_1.globalConfigSchemaController)(lang, commandPrefix).parse(data);
+        return (0, core_1.globalConfigSchemaController)(lang, commandPrefix).parse(data);
     }
     catch (err) {
-        if (!(err instanceof kotori_bot_1.TsuError))
+        if (!(err instanceof core_1.TsuError))
             throw err;
-        throw new kotori_bot_1.CoreError(`kotori-bot global ${CONFIG_FILE} format error`);
+        // process.exit(1);
+        throw new core_1.CoreError(`kotori-bot global ${exports.CONFIG_FILE} format error: ${err.message}`);
     }
-})();
+};
+exports.getGlobalConfig = getGlobalConfig;

package/lib/index.d.ts

@@ -0,0 +1,2 @@
+import loader from './loader';
+export default loader;

package/lib/index.js

@@ -8,8 +8,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * @Blog: https://hotaru.icu
  * @Date: 2023-10-29 16:20:51
  * @LastEditors: Hotaru biyuehuya@gmail.com
- * @LastEditTime: 2023-11-05 16:29:15
+ * @LastEditTime: 2023-12-30 17:32:51
  */
-const main_1 = __importDefault(require("./main"));
-const loader = new main_1.default();
-loader.run();
+const loader_1 = __importDefault(require("./loader"));
+exports.default = loader_1.default;

package/lib/loader.d.ts

@@ -0,0 +1,13 @@
+import { ContextInstance } from '@kotori-bot/core';
+declare class Main extends ContextInstance {
+    private ctx;
+    constructor();
+    run(): void;
+    private handleError;
+    private catchError;
+    private listenMessage;
+    private loadAllModule;
+    private loadAllAdapter;
+    private checkUpdate;
+}
+export default Main;

package/lib/{main.js → loader.js}

@@ -8,26 +8,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * @Blog: https://hotaru.icu
  * @Date: 2023-06-24 15:12:55
  * @LastEditors: Hotaru biyuehuya@gmail.com
- * @LastEditTime: 2023-12-17 15:54:48
+ * @LastEditTime: 2023-12-30 19:12:43
  */
-const kotori_bot_1 = require("kotori-bot");
+const core_1 = require("@kotori-bot/core");
 const modules_1 = __importDefault(require("./modules"));
 const global_1 = require("./global");
 const log_1 = __importDefault(require("./log"));
-const isDev = process.env.NODE_ENV === 'dev';
-const kotoriConfig = {
-    baseDir: global_1.baseDir,
-    config: global_1.globalConfig,
-    options: {
-        env: isDev ? 'dev' : 'build',
-    },
+const kotoriConfig = () => {
+    let result = {};
+    const baseDir = (0, global_1.getBaseDir)();
+    result = {
+        baseDir,
+        config: (0, global_1.getGlobalConfig)(baseDir),
+        options: {
+            env: (0, global_1.isDev)() ? 'dev' : 'build',
+        },
+    };
+    return result;
 };
-class Main extends kotori_bot_1.ContextInstance {
+class Main extends core_1.ContextInstance {
     ctx;
     constructor() {
-        kotori_bot_1.ContextInstance.setInstance(new modules_1.default(kotoriConfig));
         super();
-        this.ctx = kotori_bot_1.ContextInstance.getInstance();
+        core_1.ContextInstance.setInstance(new modules_1.default(kotoriConfig()));
+        this.ctx = core_1.ContextInstance.getInstance();
         // 静态类型继续居然她妈是隔离的
     }
     run() {
@@ -38,15 +42,17 @@ class Main extends kotori_bot_1.ContextInstance {
         this.checkUpdate();
     }
     handleError(err, prefix) {
-        const isKotoriError = err instanceof kotori_bot_1.KotoriError;
+        const isKotoriError = err instanceof core_1.KotoriError;
         if (!isKotoriError) {
             this.ctx.logger.tag(prefix, 'default', prefix === 'UCE' ? 'cyanBG' : 'greenBG').error(err);
             return;
         }
         this.ctx.logger
             .tag(err.name.split('Error')[0].toUpperCase(), 'yellow', 'default')[err.level === 'normal' ? 'error' : err.level](err.message, err.stack);
-        if (err.name === 'CoreError')
-            process.emit('SIGINT');
+        if (err.name !== 'CoreError')
+            return;
+        this.ctx.logger.tag('CORE', 'black', 'red').error(err.message);
+        process.emit('SIGINT');
     }
     catchError() {
         process.on('uncaughtExceptionMonitor', err => this.handleError(err, 'UCE'));
@@ -78,7 +84,7 @@ class Main extends kotori_bot_1.ContextInstance {
     }
     loadAllModule() {
         this.ctx.moduleAll();
-        if (isDev)
+        if ((0, global_1.isDev)())
             this.ctx.watchFile();
     }
     loadAllAdapter() {
@@ -110,7 +116,7 @@ class Main extends kotori_bot_1.ContextInstance {
         const res = await this.ctx.http
             .get('https://hotaru.icu/api/agent/?url=https://raw.githubusercontent.com/kotorijs/kotori/master/packages/kotori/package.json')
             .catch(() => this.ctx.logger.error('Get update failed, please check your network'));
-        if (!res || !kotori_bot_1.Tsu.Object({ version: kotori_bot_1.Tsu.String() }).check(res)) {
+        if (!res || !core_1.Tsu.Object({ version: core_1.Tsu.String() }).check(res)) {
             this.ctx.logger.error(`Detection update failed`);
         }
         else if (version === res.version) {

package/lib/log.d.ts

@@ -0,0 +1,3 @@
+import type { Context, PackageInfo } from '@kotori-bot/core';
+export declare function loadInfo(info: PackageInfo, ctx: Context): void;
+export default loadInfo;

package/lib/modules.d.ts

@@ -0,0 +1,18 @@
+import { Context } from '@kotori-bot/core';
+declare module '@kotori-bot/core' {
+    interface Context {
+        readonly moduleAll?: () => void;
+        readonly watchFile?: () => void;
+    }
+}
+export declare class Modules extends Context {
+    private isDev;
+    private readonly moduleRootDir;
+    private getDirFiles;
+    private getModuleRootDir;
+    private getModuleList;
+    private moduleQuick;
+    readonly moduleAll: () => Promise<void>;
+    readonly watchFile: () => Promise<void>;
+}
+export default Modules;

package/lib/modules.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Modules = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const kotori_bot_1 = require("kotori-bot");
+const core_1 = require("@kotori-bot/core");
 const consts_1 = require("./consts");
-class Modules extends kotori_bot_1.Context {
+class Modules extends core_1.Context {
     isDev = this.options.env === 'dev';
     moduleRootDir = [];
     getDirFiles(rootDir) {
@@ -26,7 +26,7 @@ class Modules extends kotori_bot_1.Context {
         return list;
     }
     getModuleRootDir() {
-        Object.assign(this.config.global.dirs, this.baseDir.modules).forEach(dir => {
+        Object.assign(this.config.global.dirs, [this.baseDir.modules]).forEach(dir => {
             if (fs_1.default.existsSync(dir) && fs_1.default.statSync(dir).isDirectory())
                 this.moduleRootDir.push(dir);
         });
@@ -37,6 +37,8 @@ class Modules extends kotori_bot_1.Context {
             const dir = path_1.default.join(rootDir, fileName);
             if (!fs_1.default.statSync(dir).isDirectory())
                 return;
+            if (rootDir !== this.baseDir.modules && fileName.startsWith(core_1.PLUGIN_PREFIX))
+                return;
             const packagePath = path_1.default.join(dir, 'package.json');
             let packageJson;
             if (!fs_1.default.existsSync(packagePath))
@@ -45,16 +47,15 @@ class Modules extends kotori_bot_1.Context {
                 packageJson = JSON.parse(fs_1.default.readFileSync(packagePath).toString());
             }
             catch {
-                throw new kotori_bot_1.DevError(`illegal package.json ${packagePath}`);
+                throw new core_1.DevError(`illegal package.json ${packagePath}`);
             }
-            if (!kotori_bot_1.ModulePackageSchema.check(packageJson)) {
-                if (rootDir !== this.baseDir.modules)
-                    return;
-                throw new kotori_bot_1.DevError(`package.json format error ${packagePath}`);
+            const result = core_1.ModulePackageSchema.parseSafe(packageJson);
+            if (!result.value && rootDir === this.baseDir.modules) {
+                throw new core_1.DevError(`package.json format error ${packagePath}: ${result.error.message}`);
             }
             const mainPath = path_1.default.join(dir, this.isDev ? consts_1.DEV_IMPORT : packageJson.main);
             if (!fs_1.default.existsSync(mainPath))
-                throw new kotori_bot_1.DevError(`cannot find ${mainPath}`);
+                throw new core_1.DevError(`cannot find ${mainPath}`);
             const codeDirs = path_1.default.join(dir, this.isDev ? consts_1.DEV_CODE_DIRS : path_1.default.dirname(packageJson.main));
             this.moduleStack.push({
                 package: packageJson,
@@ -64,14 +65,14 @@ class Modules extends kotori_bot_1.Context {
         });
     }
     moduleQuick(moduleData) {
-        return this.use(moduleData, this, this.config.plugin[(0, kotori_bot_1.stringRightSplit)(moduleData.package.name, kotori_bot_1.PLUGIN_PREFIX)] ?? {});
+        return this.use(moduleData, this, this.config.plugin[(0, core_1.stringRightSplit)(moduleData.package.name, core_1.PLUGIN_PREFIX)] ?? {});
     }
     moduleAll = async () => {
         this.getModuleRootDir();
         this.moduleRootDir.forEach(dir => {
             this.getModuleList(dir);
         });
-        const array = this.moduleStack.filter(data => data.package.name.startsWith(kotori_bot_1.OFFICIAL_MODULES_SCOPE));
+        const array = this.moduleStack.filter(data => data.package.name.startsWith(core_1.OFFICIAL_MODULES_SCOPE));
         array.push(...this.moduleStack.filter(data => !array.includes(data)));
         array.forEach(moduleData => this.moduleQuick(moduleData));
     };

package/package.json

@@ -1,27 +1,18 @@
 {
   "name": "@kotori-bot/loader",
-  "version": "1.1.0",
+  "version": "v1.2.0",
   "description": "Loader For KotoriBot",
   "license": "GPL-3.0",
+  "main": "lib/index.js",
   "author": "Hotaru <biyuehuya@gmail.com>",
   "dependencies": {
-    "cross-env": "^7.0.3",
-    "kotori-bot": "^1.0.0"
+    "@kotori-bot/core": "^v1.1.0"
   },
   "files": [
     "lib"
   ],
   "devDependencies": {
     "ts-node": "^10.9.2",
-    "tsconfig-paths": "^4.2.0",
     "typescript": "^5.1.3"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "scripts": {
-    "dev": "cross-env NODE_ENV=dev ts-node --esm -r tsconfig-paths/register ./src/index.ts --no-signale",
-    "start": "cross-env NODE_ENV=build node ./dist/index.js",
-    "build": "tsc --build"
   }
 }