@kotori-bot/core 1.6.0 → 1.6.2

package/lib/app/config.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/app/core.d.ts

@@ -1,138 +1,143 @@
 import { Http } from '@kotori-bot/tools';
 import I18n from '@kotori-bot/i18n';
 import type { Parser } from 'tsukiko';
-import Context from 'fluoro';
+import FluoroContext, { Service as FluoroService, type EventsList as FluoroEventsList } from 'fluoro';
 import Config from './config';
 import Message from './message';
 import type { AdapterClass } from '../types';
 import { Cache, type Api } from '../components';
 import { Symbols } from '../global';
-declare module 'fluoro' {
-    interface Context {
-        /**
-         * Adapter constructors list.
-         *
-         * @readonly
-         */
-        readonly [Symbols.adapter]: Core[typeof Symbols.adapter];
-        /**
-         * Bot instances list.
-         *
-         * @readonly
-         */
-        readonly [Symbols.bot]: Core[typeof Symbols.bot];
-        /**
-         * Core config.
-         *
-         * @readonly
-         */
-        readonly config: Config['config'];
-        /**
-         * Meta information.
-         *
-         * @readonly
-         */
-        readonly meta: Config['meta'];
-        /**
-         * Registered middlewares list.
-         *
-         * @readonly
-         */
-        readonly [Symbols.midware]: Message[typeof Symbols.midware];
-        /**
-         * Registered commands list.
-         *
-         * @readonly
-         */
-        readonly [Symbols.command]: Message[typeof Symbols.command];
-        /**
-         * Registered regexps list.
-         *
-         * @readonly
-         */
-        readonly [Symbols.regexp]: Message[typeof Symbols.regexp];
-        /**
-         * Registered scheduled tasks list.
-         *
-         * @readonly
-         */
-        readonly [Symbols.task]: Message[typeof Symbols.task];
-        /**
-         * Registered session filters list.
-         *
-         * @readonly
-         */
-        readonly [Symbols.filter]: Message[typeof Symbols.filter];
-        /**
-         * Session promises in progress list.
-         *
-         * @readonly
-         */
-        readonly [Symbols.promise]: Message[typeof Symbols.promise];
-        /**
-         * Register a message handled middleware.
-         *
-         * @param callback - Middleware callback
-         * @param priority - Middleware priority, default is 100
-         * @returns dispose function
-         */
-        midware: Message['midware'];
-        /**
-         * Register a command.
-         *
-         * @param template - Command template
-         * @param config - Command config, optional
-         * @returns Command instance
-         */
-        command: Message['command'];
-        /**
-         * Register a regexp.
-         *
-         * @param match - Regexp to match
-         * @param callback - Regexp callback
-         * @returns dispose function
-         */
-        regexp: Message['regexp'];
-        /**
-         * Register a scheduled task.
-         *
-         * @param options - Task options
-         * @param callback - Task callback
-         * @returns dispose function
-         */
-        task: Message['task'];
-        /**
-         * Register a session filter.
-         *
-         * @param option - Filter option
-         * @returns new context
-         */
-        filter: Message['filter'];
-        /**
-         * Send a notified message to the master of first bot instance at config.
-         *
-         * @experimental
-         */
-        notify: Message['notify'];
-        /**
-         * Send a message to all sessions on all bots.
-         *
-         * @experimental
-         */
-        boardcast: Message['boardcast'];
-        /** Http request methods */
-        http: Http;
-        /** International methods */
-        i18n: I18n;
-        /** Cache service */
-        cache: Cache;
-    }
+import type { EventsMapping } from '../types/events';
+export * from 'fluoro';
+export type EventsList = FluoroEventsList<EventsMapping>;
+export interface Context {
+    /**
+     * Adapter constructors list.
+     *
+     * @readonly
+     */
+    readonly [Symbols.adapter]: Context[typeof Symbols.adapter];
+    /**
+     * Bot instances list.
+     *
+     * @readonly
+     */
+    readonly [Symbols.bot]: Context[typeof Symbols.bot];
+    /**
+     * Core config.
+     *
+     * @readonly
+     */
+    readonly config: Config['config'];
+    /**
+     * Meta information.
+     *
+     * @readonly
+     */
+    readonly meta: Config['meta'];
+    /**
+     * Registered middlewares list.
+     *
+     * @readonly
+     */
+    readonly [Symbols.midware]: Message[typeof Symbols.midware];
+    /**
+     * Registered commands list.
+     *
+     * @readonly
+     */
+    readonly [Symbols.command]: Message[typeof Symbols.command];
+    /**
+     * Registered regexps list.
+     *
+     * @readonly
+     */
+    readonly [Symbols.regexp]: Message[typeof Symbols.regexp];
+    /**
+     * Registered scheduled tasks list.
+     *
+     * @readonly
+     */
+    readonly [Symbols.task]: Message[typeof Symbols.task];
+    /**
+     * Registered session filters list.
+     *
+     * @readonly
+     */
+    readonly [Symbols.filter]: Message[typeof Symbols.filter];
+    /**
+     * Session promises in progress list.
+     *
+     * @readonly
+     */
+    readonly [Symbols.promise]: Message[typeof Symbols.promise];
+    /**
+     * Register a message handled middleware.
+     *
+     * @param callback - Middleware callback
+     * @param priority - Middleware priority, default is 100
+     * @returns dispose function
+     */
+    midware: Message['midware'];
+    /**
+     * Register a command.
+     *
+     * @param template - Command template
+     * @param config - Command config, optional
+     * @returns Command instance
+     */
+    command: Message['command'];
+    /**
+     * Register a regexp.
+     *
+     * @param match - Regexp to match
+     * @param callback - Regexp callback
+     * @returns dispose function
+     */
+    regexp: Message['regexp'];
+    /**
+     * Register a scheduled task.
+     *
+     * @param options - Task options
+     * @param callback - Task callback
+     * @returns dispose function
+     */
+    task: Message['task'];
+    /**
+     * Register a session filter.
+     *
+     * @param option - Filter option
+     * @returns new context
+     */
+    filter: Message['filter'];
+    /**
+     * Send a notified message to the master of first bot instance at config.
+     *
+     * @experimental
+     */
+    notify: Message['notify'];
+    /**
+     * Send a message to all sessions on all bots.
+     *
+     * @experimental
+     */
+    boardcast: Message['boardcast'];
+    /** Http request methods */
+    http: Http;
+    /** International methods */
+    i18n: I18n;
+    /** Cache service */
+    cache: Cache;
 }
-export declare class Core extends Context {
+export declare class Context extends FluoroContext<EventsMapping> implements Context {
     readonly [Symbols.adapter]: Map<string, [AdapterClass, Parser<unknown>?]>;
     readonly [Symbols.bot]: Map<string, Set<Api>>;
     constructor(config?: ConstructorParameters<typeof Config>[0]);
     start(): void;
     stop(): void;
 }
+export type Core = Context;
+export declare const Core: typeof Context;
+export type Service<T extends object = object> = FluoroService<T, Context>;
+export declare const Service: new <T extends object = object>(ctx: Context, config: T, identity: string) => Service<T>;
 export default Core;

package/lib/app/core.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";
@@ -28,6 +28,7 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
   // If the importer is in node compatibility mode or this is not an ESM
   // file that has been converted to a CommonJS file using a Babel-
@@ -39,7 +40,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var core_exports = {};
 __export(core_exports, {
+  Context: () => Context,
   Core: () => Core,
+  Service: () => Service,
   default: () => core_default
 });
 module.exports = __toCommonJS(core_exports);
@@ -50,7 +53,8 @@ var import_config = __toESM(require("./config"));
 var import_message = __toESM(require("./message"));
 var import_components = require("../components");
 var import_global = require("../global");
-class Core extends import_fluoro.default {
+__reExport(core_exports, require("fluoro"), module.exports);
+class Context extends import_fluoro.default {
   [import_global.Symbols.adapter] = /* @__PURE__ */ new Map();
   [import_global.Symbols.bot] = /* @__PURE__ */ new Map();
   constructor(config) {
@@ -79,9 +83,20 @@ class Core extends import_fluoro.default {
     this.inject("i18n");
     this.service("cache", new import_components.Cache(this.extends("cache")));
   }
+  start() {
+    this.emit("ready");
+  }
+  stop() {
+    this.emit("dispose");
+  }
 }
+const Core = Context;
+const Service = import_fluoro.Service;
 var core_default = Core;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  Core
+  Context,
+  Core,
+  Service,
+  ...require("fluoro")
 });

package/lib/app/index.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/app/message.d.ts

@@ -1,8 +1,8 @@
-import type { Context } from 'fluoro';
 import { CronJob } from 'cron';
 import { type CommandConfig, type MidwareCallback, type RegexpCallback, type TaskCallback, type FilterOption, type TaskOptions } from '../types';
 import { Filter, Command, type SessionMsg } from '../components';
 import { Symbols } from '../global';
+import type { Context } from './core';
 interface MidwareData {
     callback: MidwareCallback;
     priority: number;

package/lib/app/message.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/components/adapter.d.ts

@@ -1,9 +1,9 @@
-import type { Context, EventsList } from 'fluoro';
 import type Api from './api';
 import type { AdapterConfig, EventDataApiBase } from '../types';
 import type Elements from './elements';
 import { Session } from './session';
-export type EventApiType = {
+import type { EventsList, Context } from '../app';
+type EventApiType = {
     [K in keyof EventsList]: EventsList[K] extends EventDataApiBase ? EventsList[K] : never;
 };
 /** Bot Status */

package/lib/components/adapter.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/components/api.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/components/cache.d.ts

@@ -1,4 +1,4 @@
-import { Service } from 'fluoro';
+import { Service, type Context } from '../app';
 type CacheKey = string | symbol | number;
 type CacheValue = string | number | object;
 type Container = Map<CacheKey, CacheValue>;
@@ -10,7 +10,7 @@ type Container = Map<CacheKey, CacheValue>;
  */
 export declare class Cache extends Service {
     private cache?;
-    constructor(ctx: ConstructorParameters<typeof Service>[0]);
+    constructor(ctx: Context);
     start(): void;
     stop(): void;
     /**

package/lib/components/cache.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";
@@ -33,9 +33,9 @@ __export(cache_exports, {
   default: () => cache_default
 });
 module.exports = __toCommonJS(cache_exports);
-var import_fluoro = require("fluoro");
 var import_error = require("../utils/error");
-class Cache extends import_fluoro.Service {
+var import_app = require("../app");
+class Cache extends import_app.Service {
   cache = /* @__PURE__ */ new Map();
   constructor(ctx) {
     super(ctx, {}, "cache");

package/lib/components/command.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/components/elements.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/components/filter.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/components/index.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/components/messages.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/components/session.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/decorators/index.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/decorators/plugin.d.ts

@@ -1,4 +1,4 @@
-import type { Context } from 'fluoro';
+import type { Context } from '../app';
 export declare abstract class KotoriPlugin<T extends object | undefined = undefined> {
     protected readonly ctx: Context;
     protected readonly config: T;

package/lib/decorators/plugin.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/decorators/utils.d.ts

@@ -1,10 +1,11 @@
 import 'reflect-metadata';
-import { type Context, type EventsList, type ModuleConfig } from 'fluoro';
+import { type EventsList, type ModuleConfig } from 'fluoro';
 import { type Constructor, Parser } from 'tsukiko';
 import { Symbols } from '../global';
 import type { CommandConfig } from '../types';
 import type { KotoriPlugin } from './plugin';
-declare module 'fluoro' {
+import type { Context } from '../app';
+declare module '../types/events' {
     interface EventsMapping {
         literal_ready_module_decorator(name: string, config: ModuleConfig): void;
     }

package/lib/decorators/utils.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/global/constants.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/global/index.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/global/symbols.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/index.d.ts

@@ -1,5 +1,4 @@
 import 'reflect-metadata';
-export * from 'fluoro';
 export * from './app';
 export * from './components';
 export * from './decorators';

package/lib/index.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";
@@ -27,7 +27,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var src_exports = {};
 module.exports = __toCommonJS(src_exports);
 var import_reflect_metadata = require("reflect-metadata");
-__reExport(src_exports, require("fluoro"), module.exports);
 __reExport(src_exports, require("./app"), module.exports);
 __reExport(src_exports, require("./components"), module.exports);
 __reExport(src_exports, require("./decorators"), module.exports);
@@ -41,7 +40,6 @@ __reExport(src_exports, require("@kotori-bot/i18n"), module.exports);
 __reExport(src_exports, require("tsukiko"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ...require("fluoro"),
   ...require("./app"),
   ...require("./components"),
   ...require("./decorators"),

package/lib/types/adapter.d.ts

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

package/lib/types/adapter.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/types/api.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/types/command.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/types/config.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/types/events.d.ts

@@ -0,0 +1,3 @@
+import type { EventsMapping as EventsMappingFluoro } from 'fluoro';
+export interface EventsMapping extends EventsMappingFluoro {
+}

package/lib/types/events.js

@@ -0,0 +1,27 @@
+
+/**
+ * @Package @kotori-bot/core
+ * @Version 1.6.2
+ * @Author Arimura Sena <me@hotaru.icu>
+ * @Copyright 2024 Hotaru. All rights reserved.
+ * @License GPL-3.0
+ * @Link https://github.com/kotorijs/kotori
+ * @Date 2024/8/16 12:06:16
+ */
+
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var events_exports = {};
+module.exports = __toCommonJS(events_exports);

package/lib/types/filter.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/types/index.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/types/message.d.ts

@@ -1,8 +1,8 @@
-import type { Context } from 'fluoro';
 import type { CommandError } from '../utils/error';
 import type { Api, Command, MessageList, MessageSingle, SessionMsg } from '../components';
 import type { CommandAction, CommandArgType } from './command';
-declare module 'fluoro' {
+import type { Context } from '../app';
+declare module './events' {
     interface EventsMapping {
         before_command(data: EventDataBeforeCommand): void;
         /**

package/lib/types/message.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/types/session.d.ts

@@ -1,6 +1,6 @@
 import type { Session } from '../components';
 import type { Message, MessageScope } from './message';
-declare module 'fluoro' {
+declare module './events' {
     interface EventsMapping {
         on_message(session: Session<EventDataPrivateMsg | EventDataGroupMsg | EventDataChannelMsg>): void;
         /**

package/lib/types/session.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/utils/container.d.ts

@@ -1,5 +1,5 @@
-import type Context from 'fluoro';
 import { Symbols } from '../global';
+import type { Context } from '../app';
 export declare class Container {
     private constructor();
     static instance: Context;

package/lib/utils/container.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/utils/error.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/utils/factory.d.ts

@@ -1,6 +1,6 @@
 import type { I18n } from '@kotori-bot/i18n';
 import type { CommandArgType, Message, MessageMapping } from '../types';
-import { MessageList, MessageSingle } from '../components';
+import { MessageList } from '../components';
 /**
  * Create a format function base on i18n instance
  * @param i18n - i18n instance
@@ -8,5 +8,5 @@ import { MessageList, MessageSingle } from '../components';
  */
 export declare function formatFactory(i18n: I18n): {
     (template: string, data: Record<string, CommandArgType | undefined> | (CommandArgType | undefined)[]): string;
-    <T extends keyof MessageMapping>(template: string, data: (string | number | boolean | MessageList<"text" | T> | MessageSingle<"text" | T> | undefined)[]): MessageList<"text" | T>;
+    <T extends keyof MessageMapping>(template: string, data: (Message<T> | CommandArgType | undefined)[]): MessageList<T | 'text'>;
 };

package/lib/utils/factory.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/lib/utils/internal.js

@@ -1,12 +1,12 @@
 
 /**
  * @Package @kotori-bot/core
- * @Version 1.6.0-rc.1
+ * @Version 1.6.2
  * @Author Arimura Sena <me@hotaru.icu>
  * @Copyright 2024 Hotaru. All rights reserved.
  * @License GPL-3.0
  * @Link https://github.com/kotorijs/kotori
- * @Date 2024/8/9 17:33:05
+ * @Date 2024/8/16 12:06:16
  */
 
 "use strict";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kotori-bot/core",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "Kotori Core",
   "main": "lib/index.js",
   "license": "GPL-3.0",
@@ -29,8 +29,8 @@
     "reflect-metadata": "^0.2.2",
     "tsukiko": "^1.4.2",
     "@kotori-bot/i18n": "^1.3.2",
-    "@kotori-bot/tools": "^1.5.0",
-    "fluoro": "^1.1.0"
+    "fluoro": "^1.1.1",
+    "@kotori-bot/tools": "^1.5.1"
   },
   "devDependencies": {
     "@types/minimist": "^1.2.5"