@kotori-bot/loader 1.5.0 → 1.5.1

package/lib/class/loader.d.ts

@@ -1,4 +1,4 @@
-import { Container, Symbols } from '@kotori-bot/core';
+import { Container, Symbols, formatFactory } from '@kotori-bot/core';
 import Logger from '@kotori-bot/logger';
 import Runner from './runner';
 import Server from '../service/server';
@@ -15,6 +15,8 @@ declare module '@kotori-bot/core' {
         server: Server;
         db: Database;
         file: File;
+        format: ReturnType<typeof formatFactory>;
+        locale: Context['i18n']['locale'];
     }
     interface GlobalConfig {
         dirs: string[];

package/lib/class/loader.js

@@ -32,11 +32,11 @@ exports.Loader = void 0;
  * @Blog: https://hotaru.icu
  * @Date: 2023-06-24 15:12:55
  * @LastEditors: Hotaru biyuehuya@gmail.com
- * @LastEditTime: 2024-05-03 22:05:36
+ * @LastEditTime: 2024-05-12 16:24:15
  */
 const core_1 = require("@kotori-bot/core");
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
+const node_path_1 = __importDefault(require("node:path"));
+const node_fs_1 = __importDefault(require("node:fs"));
 const logger_1 = __importStar(require("@kotori-bot/logger"));
 const runner_1 = __importStar(require("./runner"));
 const log_1 = __importDefault(require("../utils/log"));
@@ -47,26 +47,26 @@ function getBaseDir(file, dir) {
     const handle = (root) => {
         const baseDir = {
             root,
-            modules: path_1.default.join(root, 'modules'),
-            data: path_1.default.join(root, 'data'),
-            logs: path_1.default.join(root, 'logs')
+            modules: node_path_1.default.join(root, 'modules'),
+            data: node_path_1.default.join(root, 'data'),
+            logs: node_path_1.default.join(root, 'logs')
         };
         Object.values(baseDir).forEach((val) => {
-            if (!fs_1.default.existsSync(val))
-                fs_1.default.mkdirSync(val);
+            if (!node_fs_1.default.existsSync(val))
+                node_fs_1.default.mkdirSync(val);
         });
         return baseDir;
     };
     if (dir)
-        return handle(path_1.default.resolve(dir));
-    let root = path_1.default.resolve(__dirname, '..').replace('loader', 'kotori');
+        return handle(node_path_1.default.resolve(dir));
+    let root = node_path_1.default.resolve(__dirname, '..').replace('loader', 'kotori');
     let count = 0;
-    while (!fs_1.default.existsSync(path_1.default.join(root, file))) {
+    while (!node_fs_1.default.existsSync(node_path_1.default.join(root, file))) {
         if (count > 5) {
             logger_1.default.fatal(`cannot find file ${file} `);
             process.exit();
         }
-        root = path_1.default.join(root, '..');
+        root = node_path_1.default.join(root, '..');
         count += 1;
     }
     return handle(root);
@@ -88,7 +88,7 @@ function getCoreConfig(file, baseDir) {
                 .default(core_1.DEFAULT_CORE_CONFIG.plugin)
         })
             .default({ global: Object.assign(core_1.DEFAULT_CORE_CONFIG.global), plugin: core_1.DEFAULT_CORE_CONFIG.plugin })
-            .parse((0, core_1.loadConfig)(path_1.default.join(baseDir.root, file), 'yaml'));
+            .parse((0, core_1.loadConfig)(node_path_1.default.join(baseDir.root, file), 'yaml'));
         return core_1.Tsu.Object({
             adapter: core_1.Tsu.Object({})
                 .index(core_1.Tsu.Object({
@@ -122,6 +122,9 @@ class Loader extends core_1.Container {
         ctx.provide('runner', new runner_1.default(ctx, runnerConfig));
         ctx.mixin('runner', ['baseDir', 'options']);
         core_1.Container.setInstance(ctx);
+        ctx.provide('loader-tools', { format: (0, core_1.formatFactory)(ctx.i18n), locale: ctx.i18n.locale.bind(ctx.i18n) });
+        ctx.mixin('loader-tools', ['locale', 'format']);
+        ctx.i18n.use(node_path_1.default.resolve(__dirname, '../../locales'));
         this.ctx = core_1.Container.getInstance();
         this.ctx.logger.trace(`options:`, options);
         this.ctx.logger.trace(`runnerConfig:`, runnerConfig);
@@ -161,42 +164,39 @@ class Loader extends core_1.Container {
         process.on('uncaughtExceptionMonitor', (err) => this.handleError(err, 'sync'));
         process.on('unhandledRejection', (err) => this.handleError(err, 'async'));
         process.on('SIGINT', () => process.exit());
-        this.ctx.logger.debug('run info: develop with debugging...');
+        this.ctx.logger.debug(this.ctx.locale('loader.debug.info'));
     }
     listenMessage() {
         this.ctx.on('connect', (data) => {
-            const { type, mode, normal, address, adapter } = data;
+            const { type, mode, normal, address: addr, adapter } = data;
             let msg;
             if (type === 'connect') {
                 switch (mode) {
                     case 'ws':
-                        msg = `${normal ? 'Connect' : 'Reconnect'} server to ${address}`;
+                        msg = this.ctx.format(`loader.bots.${normal ? 'connect' : 'reconnect'}`, [addr]);
                         break;
                     case 'ws-reverse':
-                        msg = `server ${normal ? 'start' : 'restart'} at ${address}`;
+                        msg = this.ctx.format(`loader.bots.${normal ? 'start' : 'restart'}`, [addr]);
                         break;
                     default:
-                        msg = `ready completed about ${address}`;
+                        msg = this.ctx.format('loader.bots.ready', [addr]);
                 }
             }
             else {
                 switch (mode) {
                     case 'ws':
-                        msg = `disconnect server from ${address}${normal ? '' : ' unexpectedly'}`;
+                        msg = this.ctx.format(`loader.bots.disconnect${normal ? '' : '.error'}`, [addr]);
                         break;
                     case 'ws-reverse':
-                        msg = `server stop at ${address}${normal ? '' : ' unexpectedly'}`;
+                        msg = this.ctx.format(`loader.bots.stop${normal ? '' : '.error'}`, [addr]);
                         break;
                     default:
-                        msg = `dispose completed about ${address}`;
+                        msg = this.ctx.format('loader.bots.dispose', [addr]);
                 }
             }
             adapter.ctx.logger[normal ? 'info' : 'warn'](msg);
         });
-        this.ctx.on('status', (data) => {
-            const { status, adapter } = data;
-            adapter.ctx.logger.info(status);
-        });
+        this.ctx.on('status', ({ status, adapter }) => adapter.ctx.logger.info(status));
         this.ctx.on('ready_module', (data) => {
             if (typeof data.instance !== 'object')
                 return;
@@ -207,16 +207,17 @@ class Loader extends core_1.Container {
                 return;
             this.loadCount += 1;
             const { name, version, author, peerDependencies } = pkg[0].pkg;
-            this.ctx.logger.info(`loaded module ${name} version: ${version} ${Array.isArray(author) ? `authors: ${author.join(',')}` : `author: ${author}`}`);
+            this.ctx.logger.info(this.ctx.format('loader.modules.load', [name, version, Array.isArray(author) ? author.join(',') : author]));
             const requiredVersion = peerDependencies['kotori-bot'];
-            if (!requiredVersion.includes('workspace') &&
-                (!constants_1.SUPPORTS_VERSION.exec(requiredVersion) || requiredVersion !== this.ctx.pkg.version)) {
-                if (constants_1.SUPPORTS_HALF_VERSION.exec(requiredVersion)) {
-                    this.ctx.logger.warn(`incomplete supported module version: ${requiredVersion}`);
-                }
-                else {
-                    this.ctx.logger.error(`unsupported module version: ${requiredVersion}`);
-                }
+            if (requiredVersion.includes('workspace') ||
+                constants_1.SUPPORTS_VERSION.exec(requiredVersion) ||
+                requiredVersion.includes(this.ctx.pkg.version))
+                return;
+            if (constants_1.SUPPORTS_HALF_VERSION.exec(requiredVersion)) {
+                this.ctx.logger.warn(this.ctx.format('loader.modules.incomplete', [requiredVersion]));
+            }
+            else {
+                this.ctx.logger.error(this.ctx.format('loader.modules.unsupported', [requiredVersion]));
             }
         });
     }
@@ -227,7 +228,7 @@ class Loader extends core_1.Container {
     loadAllModules() {
         this.ctx.get('runner').loadAll();
         const failLoadCount = this.ctx.get('runner')[core_1.Symbols.modules].size - this.loadCount;
-        this.ctx.logger.info(`loaded ${this.loadCount} modules successfully${failLoadCount > 0 ? `, failed to load ${failLoadCount} modules` : ''} `);
+        this.ctx.logger.info(this.ctx.format(`loader.modules.all${failLoadCount > 0 ? '.fail' : ''}`, [this.loadCount, failLoadCount]));
         this.loadAllAdapter();
         this.ctx.emit('ready');
     }
@@ -236,13 +237,11 @@ class Loader extends core_1.Container {
         Object.keys(this.ctx.config.adapter).forEach((botName) => {
             const botConfig = this.ctx.config.adapter[botName];
             const array = adapters.get(botConfig.extends);
-            if (!array) {
-                this.ctx.logger.warn(`cannot find adapter '${botConfig.extends}' for ${botName}`);
-                return;
-            }
+            if (!array)
+                return this.ctx.logger.warn(this.ctx.format('loader.adapter.notfound', [botConfig.extends, botName]));
             const result = array[1]?.parseSafe(botConfig);
             if (result && !result.value)
-                throw new core_1.ModuleError(`Config format of adapter ${botName} is error: ${result.error.message}`);
+                throw new core_1.ModuleError(this.ctx.format('error.module.config_bot', [botName, result.error.message]));
             const bot = new array[0](this.ctx.extends({}, `${botConfig.extends}/${botName}`), result ? result.data : botConfig, botName);
             this.ctx.on('ready', () => bot.start());
             this.ctx.on('dispose', () => bot.stop());
@@ -252,15 +251,15 @@ class Loader extends core_1.Container {
         const { version } = this.ctx.pkg;
         const res = await this.ctx.http
             .get("https://hotaru.icu/api/agent/?url=https://raw.githubusercontent.com/kotorijs/kotori/master/packages/core/package.json" /* GLOBAL.UPDATE */)
-            .catch(() => this.ctx.logger.error('get update failed, please check your network'));
+            .catch(() => this.ctx.logger.error(this.ctx.locale('loader.tips.update.failed')));
         if (!res || !core_1.Tsu.Object({ version: core_1.Tsu.String() }).check(res)) {
-            this.ctx.logger.warn(`detection update failed`);
+            this.ctx.logger.warn(this.ctx.locale('loader.tips.update.failed'));
         }
         else if (version === res.version) {
-            this.ctx.logger.info('kotori is currently the latest version');
+            this.ctx.logger.info(this.ctx.locale('loader.tips.update.latest'));
         }
         else {
-            this.ctx.logger.warn(`the current version of Kotori is ${version}, and the latest version is ${res.version}. please go to ${"https://github.com/kotorijs/kotori" /* GLOBAL.REPO */} to update`);
+            this.ctx.logger.warn(this.ctx.format('loader.tips.update.available', [version, res.version, "https://github.com/kotorijs/kotori" /* GLOBAL.REPO */]));
         }
     }
 }

package/lib/class/runner.d.ts

@@ -1,5 +1,6 @@
 import { Context, LocaleType, ModuleConfig, Symbols } from '@kotori-bot/core';
 import { BUILD_MODE, DEV_MODE, DEV_SOURCE_MODE } from '../constants';
+import './loader';
 interface BaseDir {
     root: string;
     modules: string;

package/lib/class/runner.js

@@ -27,12 +27,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Runner = exports.localeTypeSchema = void 0;
-const fs_1 = __importStar(require("fs"));
-const path_1 = __importStar(require("path"));
+const node_fs_1 = __importStar(require("node:fs"));
+const node_path_1 = __importStar(require("node:path"));
 const core_1 = require("@kotori-bot/core");
 const logger_1 = require("@kotori-bot/logger");
 const constants_1 = require("../constants");
 const logger_2 = __importDefault(require("../utils/logger"));
+require("./loader");
 exports.localeTypeSchema = core_1.Tsu.Union([
     core_1.Tsu.Union([core_1.Tsu.Literal('en_US'), core_1.Tsu.Literal('ja_JP')]),
     core_1.Tsu.Union([core_1.Tsu.Literal('zh_TW'), core_1.Tsu.Any()])
@@ -96,59 +97,59 @@ class Runner {
         ctx.inject('logger');
     }
     getDirFiles(rootDir) {
-        const files = fs_1.default.readdirSync(rootDir);
+        const files = node_fs_1.default.readdirSync(rootDir);
         const list = [];
         files.forEach((fileName) => {
-            const file = path_1.default.join(rootDir, fileName);
-            if (fs_1.default.statSync(file).isDirectory()) {
+            const file = node_path_1.default.join(rootDir, fileName);
+            if (node_fs_1.default.statSync(file).isDirectory()) {
                 list.push(...this.getDirFiles(file));
             }
-            if (path_1.default.parse(file).ext !== (this.isSourceDev ? constants_1.DEV_FILE : constants_1.BUILD_FILE))
+            if (node_path_1.default.parse(file).ext !== (this.isSourceDev ? constants_1.DEV_FILE : constants_1.BUILD_FILE))
                 return;
-            list.push(path_1.default.resolve(file));
+            list.push(node_path_1.default.resolve(file));
         });
         return list;
     }
     getModuleRootDir() {
         const moduleRootDir = [];
         [
-            ...this.ctx.config.global.dirs.map((dir) => path_1.default.resolve(this.ctx.baseDir.root, dir)),
+            ...this.ctx.config.global.dirs.map((dir) => node_path_1.default.resolve(this.ctx.baseDir.root, dir)),
             this.ctx.baseDir.modules
         ].forEach((dir) => {
-            if (fs_1.default.existsSync(dir) && fs_1.default.statSync(dir).isDirectory())
+            if (node_fs_1.default.existsSync(dir) && node_fs_1.default.statSync(dir).isDirectory())
                 moduleRootDir.push(dir);
         });
         return moduleRootDir;
     }
     async checkModuleFiles(rootDir, filename) {
-        const dir = path_1.default.join(rootDir, filename);
-        if (!fs_1.default.statSync(dir).isDirectory())
+        const dir = node_path_1.default.join(rootDir, filename);
+        if (!node_fs_1.default.statSync(dir).isDirectory())
             return;
         if (rootDir !== this.ctx.baseDir.modules && !filename.startsWith(core_1.PLUGIN_PREFIX))
             return;
-        const packagePath = path_1.default.join(dir, 'package.json');
+        const packagePath = node_path_1.default.join(dir, 'package.json');
         let pkg;
-        if (!fs_1.default.existsSync(packagePath))
+        if (!node_fs_1.default.existsSync(packagePath))
             return;
         try {
-            pkg = JSON.parse(fs_1.default.readFileSync(packagePath).toString());
+            pkg = JSON.parse(node_fs_1.default.readFileSync(packagePath).toString());
         }
         catch {
-            throw new core_1.DevError(`illegal package.json ${packagePath}`);
+            throw new core_1.DevError(this.ctx.format('error.dev.package.illegal', [packagePath]));
         }
         const result = modulePackageSchema.parseSafe(pkg);
         if (!result.value) {
             if (rootDir !== this.ctx.baseDir.modules)
                 return;
-            throw new core_1.DevError(`package.json format error ${packagePath}: ${result.error.message}`);
+            throw new core_1.DevError(this.ctx.format('error.dev.package.missing', [packagePath, result.error.message]));
         }
         pkg = result.data;
-        const devMode = this.isSourceDev && (0, fs_1.existsSync)(path_1.default.resolve(dir, constants_1.DEV_IMPORT));
-        const main = path_1.default.resolve(dir, devMode ? constants_1.DEV_IMPORT : pkg.main);
-        if (!fs_1.default.existsSync(main))
-            throw new core_1.DevError(`cannot find ${main}`);
-        const dirs = path_1.default.join(dir, devMode ? constants_1.DEV_CODE_DIRS : path_1.default.dirname(pkg.main));
-        const files = fs_1.default.statSync(dirs).isDirectory() ? this.getDirFiles(dirs) : [];
+        const devMode = this.isSourceDev && (0, node_fs_1.existsSync)(node_path_1.default.resolve(dir, constants_1.DEV_IMPORT));
+        const main = node_path_1.default.resolve(dir, devMode ? constants_1.DEV_IMPORT : pkg.main);
+        if (!node_fs_1.default.existsSync(main))
+            throw new core_1.DevError(this.ctx.format('error.dev.main_file', [main]));
+        const dirs = node_path_1.default.join(dir, devMode ? constants_1.DEV_CODE_DIRS : node_path_1.default.dirname(pkg.main));
+        const files = node_fs_1.default.statSync(dirs).isDirectory() ? this.getDirFiles(dirs) : [];
         this[core_1.Symbols.modules].set(pkg.name, [
             { pkg, files, main },
             this.ctx.config.plugin[(0, core_1.stringRightSplit)(pkg.name, core_1.PLUGIN_PREFIX)] || {}
@@ -156,20 +157,20 @@ class Runner {
     }
     getModuleList(rootDir) {
         this.ctx.logger.trace('load dirs:', rootDir);
-        fs_1.default.readdirSync(rootDir).forEach(async (filename) => {
+        node_fs_1.default.readdirSync(rootDir).forEach(async (filename) => {
             await this.checkModuleFiles(rootDir, filename);
         });
     }
     loadLang(lang) {
         if (lang)
-            this.ctx.i18n.use((0, path_1.resolve)(...(Array.isArray(lang) ? lang : [lang])));
+            this.ctx.i18n.use((0, node_path_1.resolve)(...(Array.isArray(lang) ? lang : [lang])));
     }
     loadEx(instance, origin) {
         this.ctx.logger.trace('module:', instance, origin);
         const parsed = (schema) => {
             const result = schema.parseSafe(config);
             if (!result.value)
-                throw new core_1.ModuleError(`Config format of module ${pkg.name} is error: ${result.error.message}`);
+                throw new core_1.ModuleError(this.ctx.format('error.module.config', [pkg.name, result.error.message]));
             return result.data;
         };
         const { main, pkg } = instance;
@@ -222,8 +223,8 @@ class Runner {
             this.watcher();
     }
     watcher() {
-        this[core_1.Symbols.modules].forEach((data) => data[0].files.forEach((file) => fs_1.default.watchFile(file, async () => {
-            this.ctx.logger.debug(`file happen changed, module ${data[0].pkg.name} is reloading...`);
+        this[core_1.Symbols.modules].forEach((data) => data[0].files.forEach((file) => node_fs_1.default.watchFile(file, async () => {
+            this.ctx.logger.debug(this.ctx.format('loader.debug.reload', [data[0].pkg.name]));
             this.unloadEx(data[0]);
             this.loadEx(...data);
         })));

package/lib/decorators/index.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.plugins = void 0;
-const fs_1 = require("fs");
-const path_1 = require("path");
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
 const core_1 = require("@kotori-bot/core");
 const utils_1 = __importDefault(require("./utils"));
 function plugins(plugin) {
@@ -14,7 +14,7 @@ function plugins(plugin) {
         pkgName = plugin.name;
     }
     else {
-        pkgName = JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(...(Array.isArray(plugin) ? plugin : [plugin]), 'package.json')).toString()).name;
+        pkgName = JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.resolve)(...(Array.isArray(plugin) ? plugin : [plugin]), 'package.json')).toString()).name;
     }
     const pluginName = pkgName.split(core_1.PLUGIN_PREFIX)[1] ?? pkgName;
     const ctx = core_1.Container.getInstance().extends(undefined, pluginName);

package/lib/decorators/utils.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Decorators = void 0;
-const path_1 = require("path");
+const node_path_1 = require("node:path");
 const core_1 = require("@kotori-bot/core");
 class Decorators {
     ctx;
@@ -32,7 +32,7 @@ class Decorators {
     lang = (target, property) => {
         this.register(() => {
             const lang = target[property];
-            this.ctx.parent.i18n.use((0, path_1.resolve)(...(Array.isArray(lang) ? lang : [lang])));
+            this.ctx.parent.i18n.use((0, node_path_1.resolve)(...(Array.isArray(lang) ? lang : [lang])));
         })();
     };
     inject = (target, property) => {

package/lib/service/file.js

@@ -2,16 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.File = void 0;
 const core_1 = require("@kotori-bot/core");
-const path_1 = require("path");
+const node_path_1 = require("node:path");
 class File extends core_1.Service {
     constructor(ctx) {
         super(ctx, {}, 'file');
     }
     getDir() {
-        return (0, path_1.join)(this.ctx.baseDir.data, ...(this.ctx.identity ? this.ctx.identity.split('/') : []));
+        return (0, node_path_1.join)(this.ctx.baseDir.data, ...(this.ctx.identity ? this.ctx.identity.split('/') : []));
     }
     getFile(filename) {
-        return (0, path_1.join)(this.getDir(), filename);
+        return (0, node_path_1.join)(this.getDir(), filename);
     }
     /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
     load(filename, type, init) {

package/lib/service/server.d.ts

@@ -4,7 +4,7 @@
 /// <reference types="node" />
 import { Context, Service } from '@kotori-bot/core';
 import express from 'express';
-import { IncomingMessage } from 'http';
+import { IncomingMessage } from 'node:http';
 import ws from 'ws';
 interface ServerConfig {
     port: number;

package/lib/service/server.js

@@ -14,7 +14,7 @@ class Server extends core_1.Service {
     constructor(ctx, config) {
         super(ctx, config, 'server');
         this.app = (0, express_1.default)();
-        this.app.use('/', (_, res, next) => {
+        this.app.use('/', (req, res, next) => {
             let isWebui = false;
             ctx[core_1.Symbols.modules].forEach((module) => {
                 if (isWebui)
@@ -22,11 +22,12 @@ class Server extends core_1.Service {
                 if (module[0].pkg.name === '@kotori-bot/kotori-plugin-webui')
                     isWebui = true;
             });
-            if (!isWebui) {
-                res.setHeader('Content-type', 'text/html');
-                res.send(/* html */ `<h1>Welcome to kotori!</h1>`);
+            if (isWebui || req.url !== '/') {
+                next();
+                return;
             }
-            next();
+            res.setHeader('Content-type', 'text/html');
+            res.send(/* html */ `<h1>Welcome to kotori!</h1>`);
         });
         this.get = this.app.get.bind(this.app);
         this.post = this.app.post.bind(this.app);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kotori-bot/loader",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Loader For KotoriBot",
   "license": "GPL-3.0",
   "main": "lib/index.js",
@@ -28,8 +28,8 @@
     "express": "^4.18.2",
     "knex": "^3.1.0",
     "ws": "^8.14.2",
-    "@kotori-bot/core": "^1.4.0",
-    "@kotori-bot/logger": "^1.2.0"
+    "@kotori-bot/core": "^1.4.1",
+    "@kotori-bot/logger": "^1.2.1"
   },
   "devDependencies": {
     "@types/body-parser": "^1.19.5",