@kotori-bot/core 1.3.0 → 1.4.0

package/README.md

@@ -1,17 +1,17 @@
-# @kotori-bot/core
-
-- Context
-- Symbols
-- Service
-- Modules
-- Core
-- Config
-- Message
-- Adapter
-- Api
-- Elements
-- Cache
-
-## Reference
-
-- [Kotori Docs](https://kotori.js.org/)
+# @kotori-bot/core
+
+- Context
+- Symbols
+- Service
+- Modules
+- Core
+- Config
+- Message
+- Adapter
+- Api
+- Elements
+- Cache
+
+## Reference
+
+- [Kotori Docs](https://kotori.js.org/)

package/lib/components/config.js

@@ -7,7 +7,7 @@ exports.Config = void 0;
 const tsukiko_1 = __importDefault(require("tsukiko"));
 const path_1 = require("path");
 const tools_1 = require("@kotori-bot/tools");
-const consts_1 = require("../consts");
+const global_1 = require("../global");
 const packageInfoSchema = tsukiko_1.default.Object({
     name: tsukiko_1.default.String(),
     version: tsukiko_1.default.String(),
@@ -19,7 +19,7 @@ const packageInfoSchema = tsukiko_1.default.Object({
 class Config {
     config;
     pkg;
-    constructor(config = consts_1.DEFAULT_CORE_CONFIG) {
+    constructor(config = global_1.DEFAULT_CORE_CONFIG) {
         this.config = config;
         /* load package.json */
         const info = (0, tools_1.loadConfig)((0, path_1.join)(__dirname, '../../package.json'));

package/lib/components/core.d.ts

@@ -1,12 +1,13 @@
 import { Http } from '@kotori-bot/tools';
 import I18n from '@kotori-bot/i18n';
 import type { Parser } from 'tsukiko';
-import { Context, Symbols } from '../context';
+import { Context } from 'fluoro';
 import Config from './config';
 import Message from './message';
 import type { AdapterClass } from '../types';
 import { Cache, type Api } from '../service';
-declare module '../context' {
+import { Symbols } from '../global';
+declare module 'fluoro' {
     interface Context {
         readonly [Symbols.adapter]: Core[typeof Symbols.adapter];
         readonly [Symbols.bot]: Core[typeof Symbols.bot];

package/lib/components/core.js

@@ -6,13 +6,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Core = void 0;
 const tools_1 = require("@kotori-bot/tools");
 const i18n_1 = __importDefault(require("@kotori-bot/i18n"));
-const context_1 = require("../context");
+const fluoro_1 = require("fluoro");
 const config_1 = __importDefault(require("./config"));
 const message_1 = __importDefault(require("./message"));
 const service_1 = require("../service");
-class Core extends context_1.Context {
-    [context_1.Symbols.adapter] = new Map();
-    [context_1.Symbols.bot] = new Map();
+const global_1 = require("../global");
+class Core extends fluoro_1.Context {
+    [global_1.Symbols.adapter] = new Map();
+    [global_1.Symbols.bot] = new Map();
     constructor(config) {
         super();
         this.provide('config', new config_1.default(config));

package/lib/components/index.d.ts

@@ -1 +1,2 @@
 export * from './core';
+export * from '../global';

package/lib/components/index.js

@@ -15,3 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./core"), exports);
+__exportStar(require("../global"), exports);

package/lib/components/message.d.ts

@@ -1,6 +1,7 @@
-import { type Context, Symbols } from '../context';
+import { type Context } from 'fluoro';
 import { type CommandConfig, type MidwareCallback, type RegexpCallback } from '../types';
 import { Command } from '../utils/command';
+import { Symbols } from '../global';
 interface MidwareData {
     callback: MidwareCallback;
     priority: number;

package/lib/components/message.js

@@ -5,20 +5,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Message = void 0;
 const tools_1 = require("@kotori-bot/tools");
-const context_1 = require("../context");
 const factory_1 = require("../utils/factory");
 const command_1 = require("../utils/command");
 const commandError_1 = __importDefault(require("../utils/commandError"));
+const global_1 = require("../global");
 class Message {
-    [context_1.Symbols.midware] = new Set();
-    [context_1.Symbols.command] = new Set();
-    [context_1.Symbols.regexp] = new Set();
+    [global_1.Symbols.midware] = new Set();
+    [global_1.Symbols.command] = new Set();
+    [global_1.Symbols.regexp] = new Set();
     handleMidware(session) {
         const { api } = session;
-        api.adapter.status.receivedMsg += 1;
         let isPass = true;
         let midwares = [];
-        this[context_1.Symbols.midware].forEach((val) => midwares.push(val));
+        api.adapter.status.receivedMsg += 1;
+        this[global_1.Symbols.midware].forEach((val) => midwares.push(val));
         midwares = midwares.sort((first, second) => first.priority - second.priority);
         let lastMidwareNum = -1;
         while (midwares.length > 0) {
@@ -35,7 +35,7 @@ class Message {
         const { session } = data;
         if (!data.isPass)
             return;
-        this[context_1.Symbols.regexp].forEach((data) => {
+        this[global_1.Symbols.regexp].forEach((data) => {
             const match = session.message.match(data.match);
             if (!match)
                 return;
@@ -57,7 +57,7 @@ class Message {
         if (cancel.value)
             return;
         let matched;
-        this[context_1.Symbols.command].forEach(async (cmd) => {
+        this[global_1.Symbols.command].forEach(async (cmd) => {
             if (matched || !cmd.meta.action)
                 return;
             const result = command_1.Command.run(params.raw, cmd.meta);
@@ -111,22 +111,22 @@ class Message {
     }
     midware(callback, priority = 100) {
         const data = { callback, priority };
-        this[context_1.Symbols.midware].add(data);
-        const dispose = () => this[context_1.Symbols.midware].delete(data);
+        this[global_1.Symbols.midware].add(data);
+        const dispose = () => this[global_1.Symbols.midware].delete(data);
         (0, factory_1.disposeFactory)(this.ctx, dispose);
         return dispose;
     }
     command(template, config) {
         const command = new command_1.Command(template, config);
-        this[context_1.Symbols.command].add(command);
-        const dispose = () => this[context_1.Symbols.command].delete(command);
+        this[global_1.Symbols.command].add(command);
+        const dispose = () => this[global_1.Symbols.command].delete(command);
         (0, factory_1.disposeFactory)(this.ctx, dispose);
         return command;
     }
     regexp(match, callback) {
         const data = { match, callback };
-        this[context_1.Symbols.regexp].add(data);
-        const dispose = () => this[context_1.Symbols.regexp].delete(data);
+        this[global_1.Symbols.regexp].add(data);
+        const dispose = () => this[global_1.Symbols.regexp].delete(data);
         (0, factory_1.disposeFactory)(this.ctx, dispose);
         return dispose;
     }

package/lib/constants.d.ts

@@ -0,0 +1,15 @@
+export declare const OFFICIAL_MODULES_SCOPE = "@kotori-bot/";
+export declare const PLUGIN_PREFIX = "kotori-plugin-";
+export declare const DATABASE_PREFIX = "kotori-plugin-database-";
+export declare const ADAPTER_PREFIX = "kotori-plugin-adapter-";
+export declare const CUSTOM_PREFIX = "kotori-plugin-custom-";
+export declare const DEFAULT_PORT = 720;
+export declare const DEFAULT_CORE_CONFIG: {
+    global: {
+        lang: "en_US" | "en_GB" | "en_AU" | "zh_CN" | "zh_HK" | "zh_TW" | "zh_SG" | "es_ES" | "es_MX" | "ar_EG" | "ar_AE" | "ru_RU" | "fr_FR" | "fr_CA" | "de_DE" | "de_CH" | "it_IT" | "it_CH" | "hi_IN" | "pt_BR" | "pt_PT" | "tr_TR" | "ja_JP" | "id_ID" | "uk_UA" | "vi_VN" | "th_TH" | "sv_SE" | "nb_NO" | "da_DK" | "fi_FI" | "he_IL" | "sk_SK" | "bg_BG" | "lt_LT" | "sl_SI" | "sr_RS" | "mk_MK" | "sq_AL" | "et_EE" | "mt_MT";
+        'command-prefix': string;
+        port: number;
+    };
+    adapter: {};
+    plugin: {};
+};

package/lib/constants.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_CORE_CONFIG = exports.DEFAULT_PORT = exports.CUSTOM_PREFIX = exports.ADAPTER_PREFIX = exports.DATABASE_PREFIX = exports.PLUGIN_PREFIX = exports.OFFICIAL_MODULES_SCOPE = void 0;
+const i18n_1 = require("@kotori-bot/i18n");
+exports.OFFICIAL_MODULES_SCOPE = '@kotori-bot/';
+exports.PLUGIN_PREFIX = 'kotori-plugin-';
+exports.DATABASE_PREFIX = `${exports.PLUGIN_PREFIX}database-`;
+exports.ADAPTER_PREFIX = `${exports.PLUGIN_PREFIX}adapter-`;
+exports.CUSTOM_PREFIX = `${exports.PLUGIN_PREFIX}custom-`;
+exports.DEFAULT_PORT = 720;
+exports.DEFAULT_CORE_CONFIG = {
+    global: {
+        lang: i18n_1.DEFAULT_LANG,
+        'command-prefix': '/',
+        port: exports.DEFAULT_PORT
+    },
+    adapter: {},
+    plugin: {}
+};

package/lib/context/context.d.ts

@@ -25,6 +25,7 @@ export declare class Context implements ContextImpl {
     readonly [Symbols.container]: Map<string, obj>;
     readonly [Symbols.table]: Map<string, string[]>;
     root: Context;
+    parent: Context | null;
     constructor(root?: Context);
     get<T = obj | undefined>(prop: string): T;
     inject<T extends Keys>(prop: T): void;

package/lib/context/context.js

@@ -9,7 +9,7 @@ exports.Context = void 0;
  * @Blog: https://hotaru.icu
  * @Date: 2024-02-07 13:44:38
  * @LastEditors: Hotaru biyuehuya@gmail.com
- * @LastEditTime: 2024-02-21 10:38:39
+ * @LastEditTime: 2024-05-01 21:32:19
  */
 const tools_1 = require("@kotori-bot/tools");
 const symbols_1 = __importDefault(require("./symbols"));
@@ -25,10 +25,12 @@ const handler = (value, ctx) => {
         }
     });
 };
+const DEFAULT_EXTENDS_NAME = 'sub';
 class Context {
     [symbols_1.default.container] = new Map();
     [symbols_1.default.table] = new Map();
     root;
+    parent = null;
     constructor(root) {
         this.root = root || this;
         this.provide('events', root ? root.get('events') : new tools_1.Events());
@@ -75,7 +77,9 @@ class Context {
         const ctx = new Proxy(new Context(this.root), {
             get: (target, prop) => {
                 if (prop === 'identity')
-                    return identity ?? this.identity ?? 'sub';
+                    return identity ?? this.identity ?? DEFAULT_EXTENDS_NAME;
+                if (prop === 'parent')
+                    return this;
                 if (target[prop])
                     return handler(target[prop], ctx);
                 let value;

package/lib/context/modules.js

@@ -9,7 +9,7 @@ const service_1 = require("./service");
 function handleFunction(func, ctx, config) {
     func(ctx, config);
 }
-function handleCconstructor(Class, ctx, config) {
+function handleConstructor(Class, ctx, config) {
     (0, tools_1.none)(new Class(ctx, config));
 }
 const DEFAULT_MODULE_CONFIG = { filter: {} };
@@ -22,9 +22,9 @@ class Modules {
         const ctx = this.ctx.extends({}, !this.ctx.identity && typeof instance === 'object' ? instance.name : this.ctx.identity);
         if (instance instanceof Function) {
             if ((0, tools_1.isClass)(instance))
-                handleCconstructor(instance, ctx, DEFAULT_MODULE_CONFIG);
+                handleConstructor(instance, ctx, DEFAULT_MODULE_CONFIG);
             else
-                instance(ctx, DEFAULT_MODULE_CONFIG);
+                handleFunction(instance, ctx, DEFAULT_MODULE_CONFIG);
             this.ctx.emit('ready_module', { instance });
             return;
         }
@@ -40,7 +40,7 @@ class Modules {
         }
         if (defaults) {
             if ((0, tools_1.isClass)(defaults))
-                handleCconstructor(defaults, ctx, config ?? DEFAULT_MODULE_CONFIG);
+                handleConstructor(defaults, ctx, config ?? DEFAULT_MODULE_CONFIG);
             else
                 handleFunction(defaults, ctx, config ?? DEFAULT_MODULE_CONFIG);
         }
@@ -48,7 +48,7 @@ class Modules {
             handleFunction(main, ctx, config ?? DEFAULT_MODULE_CONFIG);
         }
         else if (Main) {
-            handleCconstructor(Main, ctx, config ?? DEFAULT_MODULE_CONFIG);
+            handleConstructor(Main, ctx, config ?? DEFAULT_MODULE_CONFIG);
         }
         this.ctx.emit('ready_module', { instance });
     }

package/lib/global/constants.d.ts

@@ -0,0 +1,15 @@
+export declare const OFFICIAL_MODULES_SCOPE = "@kotori-bot/";
+export declare const PLUGIN_PREFIX = "kotori-plugin-";
+export declare const DATABASE_PREFIX = "kotori-plugin-database-";
+export declare const ADAPTER_PREFIX = "kotori-plugin-adapter-";
+export declare const CUSTOM_PREFIX = "kotori-plugin-custom-";
+export declare const DEFAULT_PORT = 720;
+export declare const DEFAULT_CORE_CONFIG: {
+    global: {
+        lang: "en_US" | "en_GB" | "en_AU" | "zh_CN" | "zh_HK" | "zh_TW" | "zh_SG" | "es_ES" | "es_MX" | "ar_EG" | "ar_AE" | "ru_RU" | "fr_FR" | "fr_CA" | "de_DE" | "de_CH" | "it_IT" | "it_CH" | "hi_IN" | "pt_BR" | "pt_PT" | "tr_TR" | "ja_JP" | "id_ID" | "uk_UA" | "vi_VN" | "th_TH" | "sv_SE" | "nb_NO" | "da_DK" | "fi_FI" | "he_IL" | "sk_SK" | "bg_BG" | "lt_LT" | "sl_SI" | "sr_RS" | "mk_MK" | "sq_AL" | "et_EE" | "mt_MT";
+        'command-prefix': string;
+        port: number;
+    };
+    adapter: {};
+    plugin: {};
+};

package/lib/global/constants.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_CORE_CONFIG = exports.DEFAULT_PORT = exports.CUSTOM_PREFIX = exports.ADAPTER_PREFIX = exports.DATABASE_PREFIX = exports.PLUGIN_PREFIX = exports.OFFICIAL_MODULES_SCOPE = void 0;
+const i18n_1 = require("@kotori-bot/i18n");
+exports.OFFICIAL_MODULES_SCOPE = '@kotori-bot/';
+exports.PLUGIN_PREFIX = 'kotori-plugin-';
+exports.DATABASE_PREFIX = `${exports.PLUGIN_PREFIX}database-`;
+exports.ADAPTER_PREFIX = `${exports.PLUGIN_PREFIX}adapter-`;
+exports.CUSTOM_PREFIX = `${exports.PLUGIN_PREFIX}custom-`;
+exports.DEFAULT_PORT = 720;
+exports.DEFAULT_CORE_CONFIG = {
+    global: {
+        lang: i18n_1.DEFAULT_LANG,
+        'command-prefix': '/',
+        port: exports.DEFAULT_PORT
+    },
+    adapter: {},
+    plugin: {}
+};

package/lib/global/index.d.ts

@@ -0,0 +1,2 @@
+export * from './constants';
+export * from './symbols';

package/lib/global/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./constants"), exports);
+__exportStar(require("./symbols"), exports);

package/lib/global/symbols.d.ts

@@ -0,0 +1,8 @@
+export declare class Symbols {
+    static readonly adapter: unique symbol;
+    static readonly bot: unique symbol;
+    static readonly midware: unique symbol;
+    static readonly command: unique symbol;
+    static readonly regexp: unique symbol;
+    static readonly modules: unique symbol;
+}

package/lib/global/symbols.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Symbols = void 0;
+class Symbols {
+    static adapter = Symbol.for('kotori.core.adapter');
+    static bot = Symbol.for('kotori.core.bot');
+    static midware = Symbol.for('kotori.core.midware');
+    static command = Symbol.for('kotori.core.command');
+    static regexp = Symbol.for('kotori.core.regexp');
+    static modules = Symbol.for('kotori.loader.module');
+}
+exports.Symbols = Symbols;

package/lib/global/tokens.d.ts

@@ -0,0 +1,8 @@
+export declare class Tokens {
+    static readonly adapter: unique symbol;
+    static readonly bot: unique symbol;
+    static readonly midware: unique symbol;
+    static readonly command: unique symbol;
+    static readonly regexp: unique symbol;
+    static readonly modules: unique symbol;
+}

package/lib/global/tokens.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Tokens = void 0;
+class Tokens {
+    static adapter = Symbol.for('kotori.core.adapter');
+    static bot = Symbol.for('kotori.core.bot');
+    static midware = Symbol.for('kotori.core.midware');
+    static command = Symbol.for('kotori.core.command');
+    static regexp = Symbol.for('kotori.core.regexp');
+    static modules = Symbol.for('kotori.loader.module');
+}
+exports.Tokens = Tokens;

package/lib/index.d.ts

@@ -1,11 +1,11 @@
-export * from './context';
+export * from 'fluoro';
 export * from './components';
 export * from './service';
 export * from './utils/command';
-export * from './utils/errror';
+export * from './utils/error';
 export * from './utils/commandError';
 export * from './utils/container';
-export * from './consts';
+export * from './global';
 export * from './types';
 export * from '@kotori-bot/tools';
 export * from '@kotori-bot/i18n';

package/lib/index.js

@@ -19,16 +19,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * @Blog: https://hotaru.icu
  * @Date: 2024-02-07 13:44:38
  * @LastEditors: Hotaru biyuehuya@gmail.com
- * @LastEditTime: 2024-02-07 14:47:23
+ * @LastEditTime: 2024-05-03 11:36:22
  */
-__exportStar(require("./context"), exports);
+__exportStar(require("fluoro"), exports);
 __exportStar(require("./components"), exports);
 __exportStar(require("./service"), exports);
 __exportStar(require("./utils/command"), exports);
-__exportStar(require("./utils/errror"), exports);
+__exportStar(require("./utils/error"), exports);
 __exportStar(require("./utils/commandError"), exports);
 __exportStar(require("./utils/container"), exports);
-__exportStar(require("./consts"), exports);
+__exportStar(require("./global"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("@kotori-bot/tools"), exports);
 __exportStar(require("@kotori-bot/i18n"), exports);

package/lib/service/adapter.d.ts

@@ -1,5 +1,5 @@
+import { Context, EventsList } from 'fluoro';
 import type Api from './api';
-import { Context, EventsList } from '../context';
 import { EventDataApiBase, EventDataTargetId, AdapterConfig } from '../types';
 import Elements from './elements';
 type EventApiType = {

package/lib/service/adapter.js

@@ -5,16 +5,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Adapter = void 0;
 const tools_1 = require("@kotori-bot/tools");
-const context_1 = require("../context");
 const types_1 = require("../types");
 const elements_1 = __importDefault(require("./elements"));
 const factory_1 = require("../utils/factory");
 const commandError_1 = __importDefault(require("../utils/commandError"));
+const global_1 = require("../global");
 function setProxy(api, ctx) {
     const proxy = Object.create(api);
     proxy.sendPrivateMsg = new Proxy(api.sendPrivateMsg, {
         apply(_, __, argArray) {
-            const { '0': message, '1': targetId } = argArray;
+            const [message, targetId] = argArray;
             const cancel = (0, factory_1.cancelFactory)();
             ctx.emit('before_send', { api, message, messageType: types_1.MessageScope.PRIVATE, targetId, cancel: cancel.get() });
             if (cancel.value)
@@ -24,7 +24,7 @@ function setProxy(api, ctx) {
     });
     proxy.sendGroupMsg = new Proxy(api.sendGroupMsg, {
         apply(_, __, argArray) {
-            const { '0': message, '1': targetId } = argArray;
+            const [message, targetId] = argArray;
             const cancel = (0, factory_1.cancelFactory)();
             ctx.emit('before_send', { api, message, messageType: types_1.MessageScope.PRIVATE, targetId, cancel: cancel.get() });
             if (cancel.value)
@@ -62,7 +62,7 @@ function formatFactory(i18n) {
         return (0, tools_1.stringTemp)(i18n.locale(template), params);
     };
 }
-function qucikFactory(send, i18n) {
+function quickFactory(send, i18n) {
     return async (message) => {
         const msg = await message;
         if (!msg || msg instanceof commandError_1.default)
@@ -118,9 +118,9 @@ class Adapter {
         this.platform = config.extends;
         this.api = setProxy(new Api(this), this.ctx);
         this.elements = el;
-        if (!this.ctx[context_1.Symbols.bot].get(this.platform))
-            this.ctx[context_1.Symbols.bot].set(this.platform, new Set());
-        this.ctx[context_1.Symbols.bot].get(this.platform).add(this.api);
+        if (!this.ctx[global_1.Symbols.bot].get(this.platform))
+            this.ctx[global_1.Symbols.bot].set(this.platform, new Set());
+        this.ctx[global_1.Symbols.bot].get(this.platform).add(this.api);
     }
     online() {
         if (this.status.value !== 'offline')
@@ -139,7 +139,7 @@ class Adapter {
         const i18n = this.ctx.i18n.extends(this.config.lang);
         const send = sendMessageFactory(this, type, data);
         const format = formatFactory(i18n);
-        const quick = qucikFactory(send, i18n);
+        const quick = quickFactory(send, i18n);
         const prompt = promptFactory(quick, this, data);
         const confirm = confirmFactory(quick, this, data);
         const { api, elements: el } = this;

package/lib/service/cache.d.ts

@@ -1,4 +1,4 @@
-import { Service } from '../context';
+import { Service } from 'fluoro';
 type CacheKey = string | symbol;
 type CacheValue = string | number | object;
 export declare class Cache extends Service {

package/lib/service/cache.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Cache = void 0;
-const context_1 = require("../context");
-class Cache extends context_1.Service {
+const fluoro_1 = require("fluoro");
+class Cache extends fluoro_1.Service {
     cache;
     constructor(ctx) {
         super(ctx, {}, 'cache');

package/lib/types/adapter.d.ts

@@ -1,7 +1,7 @@
-import type { Context } from '../context';
+import type { Context } from 'fluoro';
 import type { Adapter } from '../service';
 import type { AdapterConfig } from './config';
-declare module '../context/events' {
+declare module 'fluoro' {
     interface EventsMapping {
         connect(data: EventDataConnect): void;
         status(data: EventDataStatus): void;

package/lib/types/config.d.ts

@@ -1,6 +1,6 @@
 import type { LocaleType } from '@kotori-bot/i18n';
+import { ModuleConfig } from 'fluoro';
 import type { EventDataTargetId } from './message';
-import { ModuleConfig } from '../context';
 export interface CoreConfig {
     global: GlobalConfig;
     adapter: {
@@ -11,6 +11,7 @@ export interface CoreConfig {
     };
 }
 export interface GlobalConfig {
+    level?: number;
     lang: LocaleType;
     'command-prefix': string;
 }

package/lib/types/message.d.ts

@@ -1,10 +1,10 @@
 import Tsu, { TsuError } from 'tsukiko';
 import type I18n from '@kotori-bot/i18n';
-import type { EventsList } from '../context';
+import type { EventsList } from 'fluoro';
 import type CommandError from '../utils/commandError';
 import type { Api, Elements } from '../service';
 import { Command } from '../utils/command';
-declare module '../context/events' {
+declare module 'fluoro' {
     interface EventsMapping {
         midwares(data: EventDataMidwares): void;
         before_parse(data: EventDataBeforeParse): void;

package/lib/utils/command.js

@@ -61,15 +61,15 @@ class Command {
         const result = (0, minimist_1.default)(arr, opts);
         /* handle args */
         const args = result._;
-        const nums = {
+        const count = {
             expected: data.args.filter((el) => !el.optional).length,
             reality: args.length
         };
-        if (nums.reality < nums.expected)
-            return new commandError_1.CommandError({ type: 'arg_few', ...nums });
-        nums.expected = data.args.length;
-        if ((data.args.length <= 0 || !data.args[data.args.length - 1].rest) && nums.reality > nums.expected)
-            return new commandError_1.CommandError({ type: 'arg_many', ...nums });
+        if (count.reality < count.expected)
+            return new commandError_1.CommandError({ type: 'arg_few', ...count });
+        count.expected = data.args.length;
+        if ((data.args.length <= 0 || !data.args[data.args.length - 1].rest) && count.reality > count.expected)
+            return new commandError_1.CommandError({ type: 'arg_many', ...count });
         let error;
         data.args.forEach((val, index) => {
             /* exit when happen error or last arg is empty */

package/lib/utils/commandError.d.ts

@@ -1,7 +1,7 @@
 import { CommandResultExtra } from '../types';
-import { KotoriError } from './errror';
+import { KotoriError } from './error';
 export declare class CommandError extends KotoriError {
-    value: CommandResultExtra[keyof CommandResultExtra];
+    readonly value: CommandResultExtra[keyof CommandResultExtra];
     constructor(value: CommandResultExtra[keyof CommandResultExtra]);
 }
 export default CommandError;

package/lib/utils/commandError.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommandError = void 0;
-const errror_1 = require("./errror");
-class CommandError extends errror_1.KotoriError {
+const error_1 = require("./error");
+class CommandError extends error_1.KotoriError {
     value;
     constructor(value) {
         super();

package/lib/utils/container.d.ts

@@ -1,4 +1,4 @@
-import { Context } from '../context';
+import { Context } from 'fluoro';
 export declare class Container {
     protected constructor();
     private static instance;

package/lib/utils/error.d.ts

@@ -0,0 +1,25 @@
+/// <reference types="node" />
+type KotoriErrorType = 'ServiceError' | 'ModuleError' | 'UnknownError' | 'DevError';
+interface KotoriErrorImpl {
+    readonly name: KotoriErrorType;
+    readonly extend: () => typeof KotoriError;
+}
+export declare class KotoriError<T extends object = object> extends Error implements KotoriErrorImpl {
+    constructor(message?: string, extra?: T, type?: KotoriErrorType);
+    readonly extra?: T;
+    readonly name: KotoriErrorType;
+    extend(): typeof KotoriError<T>;
+}
+export declare const ModuleError: {
+    new (message?: string, extra?: object | undefined, type?: KotoriErrorType): KotoriError<object>;
+    captureStackTrace(targetObject: object, constructorOpt?: Function | undefined): void;
+    prepareStackTrace?: ((err: Error, stackTraces: NodeJS.CallSite[]) => any) | undefined;
+    stackTraceLimit: number;
+};
+export declare const DevError: {
+    new (message?: string, extra?: object | undefined, type?: KotoriErrorType): KotoriError<object>;
+    captureStackTrace(targetObject: object, constructorOpt?: Function | undefined): void;
+    prepareStackTrace?: ((err: Error, stackTraces: NodeJS.CallSite[]) => any) | undefined;
+    stackTraceLimit: number;
+};
+export default KotoriError;

package/lib/utils/error.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DevError = exports.ModuleError = exports.KotoriError = void 0;
+class KotoriError extends Error {
+    constructor(message, extra, type = 'UnknownError') {
+        super(message);
+        this.name = type;
+        this.extra = extra;
+    }
+    extra;
+    name;
+    extend() {
+        const { message: fatherMessage, name: fatherType, extra: fatherExtra } = this;
+        // const newClass: typeof KotoriError = Object.create(KotoriError);
+        return new Proxy((KotoriError), {
+            construct(Class, params) {
+                const args = params;
+                args[0] = `${fatherMessage} ${args[0]}`;
+                args[1] = args[1] ?? fatherExtra;
+                args[2] = args[2] ?? fatherType;
+                return new Class(...args);
+            }
+        });
+    }
+}
+exports.KotoriError = KotoriError;
+exports.ModuleError = new KotoriError(undefined, undefined, 'ModuleError').extend();
+exports.DevError = new KotoriError(undefined, undefined, 'DevError').extend();
+exports.default = KotoriError;

package/lib/utils/errror.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 type KotoriErrorType = 'ServiceError' | 'ModuleError' | 'UnknownError' | 'DevError';
 interface KotoriErrorImpl {
     readonly name: KotoriErrorType;

package/lib/utils/factory.d.ts

@@ -1,5 +1,5 @@
-import type { Context } from '../context';
-export declare function disposeFactory(ctx: Context, dispose: Function): void;
+import type { Context } from 'fluoro';
+export declare function disposeFactory(ctx: Context, dispose: () => void): void;
 export declare function cancelFactory(): {
     get(): () => void;
     fn(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kotori-bot/core",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Kotori Core",
   "main": "lib/index.js",
   "license": "GPL-3.0",
@@ -27,7 +27,11 @@
     "@types/minimist": "^1.2.5",
     "minimist": "^1.2.8",
     "tsukiko": "^1.2.1",
-    "@kotori-bot/tools": "^1.2.1",
-    "@kotori-bot/i18n": "^1.2.1"
+    "@kotori-bot/i18n": "^1.2.1",
+    "@kotori-bot/tools": "^1.3.0",
+    "fluoro": "^1.0.0"
+  },
+  "scripts": {
+    "build": "tsc --build"
   }
 }