feat: service, cache, database and server

modules/random-img/src/index.ts

@@ -24,6 +24,10 @@ const quick = (url: string, el: Elements) => el.image(url) || 'corei18n.template
 export const lang = [__dirname, '../locales'];
 
 export function main(ctx: Context) {
+  ctx.on('ready', () => {
+    ctx.logger.debug(ctx.db);
+  });
+
   ctx.command('sex [tags] - random_img.descr.sex').action(async (data, session) => {
     session.quick('random_img.msg.sex.tips');
     const res = sexSchema.parse(

modules/testing/src/index.ts

@@ -16,6 +16,10 @@ export const inject = ['database'];
 
 /* 插件入口 */
 export function main(ctx: Context, config: Config) {
+  ctx.on('ready', () => {
+    ctx.logger.debug(ctx.db);
+  });
+
   /* 事件监听 */
   ctx.on('on_group_decrease', (session) => {
     session.quick([

packages/core/package.json

@@ -30,4 +30,4 @@
     "minimist": "^1.2.8",
     "tsukiko": "^1.2.1"
   }
-}
+}

packages/core/src/components/core.ts

@@ -6,7 +6,7 @@ import Config from './config';
 import Message from './message';
 import Modules from './modules';
 import type { AdapterClass, EventsMapping } from '../types';
-import type { Api } from '../service';
+import { Cache, type Api } from '../service';
 
 declare module '../context' {
   interface Context extends Events<EventsMapping> {
@@ -32,6 +32,8 @@ declare module '../context' {
     /* Inject */
     http: Http;
     i18n: I18n;
+    /* Service */
+    cache: Cache;
   }
 }
 
@@ -54,7 +56,9 @@ export class Core extends Context {
     this.inject('http');
     this.provide('i18n', new I18n({ lang: this.config.global.lang }));
     this.inject('i18n');
-    this.inject('i18n');
+    this.provide('cache', new Cache(this));
+    this.on('ready', () => (this.get('cache') as Cache).start());
+    this.on('dispose', () => (this.get('cache') as Cache).stop());
   }
 }
 

packages/core/src/components/modules.ts

@@ -41,21 +41,28 @@ function checkConfig(schema: unknown, config: ModuleConfig) {
 export class Modules {
   private handleExports(identity: string, ctx: Context, exports: obj, config: ModuleConfig) {
     /* before handle */
-    const { lang, config: schema, default: defaults, main, Main } = exports.default;
+    const { lang, inject, config: schema, default: defaults, main, Main } = exports.default;
     if (lang) this.ctx.i18n.use(Array.isArray(lang) ? resolve(...lang) : resolve(lang));
     /* handle */
+    /* service */
     if (isServiceConsructor(defaults)) {
-      /* adapter */
+      return undefined;
+    }
+    /* adapter */
+    if (isAdapterClass(defaults)) {
       const adapterName = identity.split(ADAPTER_PREFIX)[1];
-      // const databaseName = moduleName.split(DATABASE_PREFIX)[1];
-      if (adapterName && isAdapterClass(defaults)) {
-        this.ctx[Symbols.adapter].set(adapterName, [defaults, schema]);
-      } /* else if (databaseName && isDatabaseClass(default)) {
-        service and database
-      } */
+      if (adapterName) this.ctx[Symbols.adapter].set(adapterName, [defaults, schema]);
       return undefined;
     }
     /* plugin */
+    if (inject && (typeof inject === 'string' || Array.isArray(inject))) {
+      (typeof inject === 'string' ? [inject] : (inject as string[])).forEach((identity) => {
+        this.ctx[Symbols.container].forEach((service, name) => {
+          if (!(service instanceof Service) || service.identity !== identity) return;
+          ctx.inject(name as Exclude<keyof Context, Symbols | number>);
+        });
+      });
+    }
     const moduleConfig = checkConfig(schema, config);
     if (moduleConfig instanceof TsuError)
       return new ModuleError(`Config format of module ${identity} is error: ${moduleConfig.message}`);

packages/core/src/context/context.ts

@@ -1,3 +1,10 @@
+/*
+ * @Author: Hotaru [email protected]
+ * @Blog: https://hotaru.icu
+ * @Date: 2024-02-07 13:44:38
+ * @LastEditors: Hotaru [email protected]
+ * @LastEditTime: 2024-02-07 16:40:35
+ */
 import Symbols from './symbols';
 
 interface obj {
@@ -57,7 +64,7 @@ export class Context implements ContextImpl {
     this[Symbols.table].set(prop, keys);
     keys.forEach((key) => {
       if (this[key] || !instance[key]) return;
-      this[key] = instance[key];
+      this[key] = instance[key] as this[K];
       if (typeof this[key] === 'function') this[key] = (this[key] as Function).bind(instance);
     });
   }
@@ -79,9 +86,9 @@ export class Context implements ContextImpl {
     };
     /* set proxy */
     const ctx: Context = new Proxy(new Context(this.root), {
-      get: <T>(target: T, prop: keyof T) => {
+      get: <T extends Context>(target: T, prop: keyof T) => {
         if (prop === 'identity') return identity ?? this.identity ?? 'sub';
-        if (target[prop]) return target[prop];
+        if (target[prop]) return handler(target[prop], target);
         let value: unknown;
         this[Symbols.table].forEach((keys, key) => {
           if (value || (typeof prop === 'string' && !keys.includes(prop))) return;

packages/core/src/context/symbols.ts

@@ -6,7 +6,7 @@ export class Symbols {
   static readonly containerKey = (prop: string) => Symbol.for(`kotori.context.container.${prop}`);
 
   /* custom */
-  static readonly service = Symbol.for('kotori.core.service');
+  // static readonly service = Symbol.for('kotori.core.service');
 
   static readonly adapter = Symbol.for('kotori.core.adapter');
 

packages/core/src/index.ts

@@ -1,3 +1,10 @@
+/*
+ * @Author: Hotaru [email protected]
+ * @Blog: https://hotaru.icu
+ * @Date: 2024-02-07 13:44:38
+ * @LastEditors: Hotaru [email protected]
+ * @LastEditTime: 2024-02-07 14:47:23
+ */
 export * from './context';
 export * from './components';
 export * from './service';
@@ -8,4 +15,5 @@ export * from './utils/container';
 export * from './consts';
 export * from './types';
 export * from '@kotori-bot/tools';
+export * from '@kotori-bot/i18n';
 export * from 'tsukiko';

packages/core/src/service/adapter.ts

@@ -12,7 +12,6 @@ import {
   AdapterConfig,
   CommandResult
 } from '../types';
-import Service from './service';
 import Elements from './elements';
 import { cancelFactory } from '../utils/factory';
 import CommandError from '../utils/commandError';
@@ -30,8 +29,9 @@ interface AdapterStatus {
   offlineTimes: number;
 }
 
-interface AdapterImpl<T extends Api = Api> extends Service {
+interface AdapterImpl<T extends Api = Api> {
   readonly ctx: Context;
+  readonly config: AdapterConfig;
   readonly platform: string;
   readonly selfId: EventDataTargetId;
   readonly identity: string;
@@ -95,15 +95,14 @@ function error<K extends keyof CommandResult>(type: K, data?: CommandResult[K])
   return new CommandError(Object.assign(data ?? {}, { type }) as ConstructorParameters<typeof CommandError>[0]);
 }
 
-export abstract class Adapter<T extends Api = Api> extends Service implements AdapterImpl<T> {
+export abstract class Adapter<T extends Api = Api> implements AdapterImpl<T> {
   constructor(
     ctx: Context,
     config: AdapterConfig,
     identity: string,
     Api: new (adapter: Adapter) => T,
     el: Elements = new Elements()
   ) {
-    super('adapter', '');
     this.ctx = ctx;
     this.config = config;
     this.identity = identity;
@@ -114,6 +113,12 @@ export abstract class Adapter<T extends Api = Api> extends Service implements Ad
     this.ctx[Symbols.bot].get(this.platform)!.add(this.api);
   }
 
+  abstract handle(...data: unknown[]): void;
+
+  abstract start(): void;
+
+  abstract stop(): void;
+
   abstract send(action: string, params?: object): void | object | Promise<unknown> | null | undefined;
 
   protected online() {

packages/core/src/service/cache.ts

@@ -1,26 +1,31 @@
-import { none, obj } from '@kotori-bot/tools';
 import Service from './service';
 
+type CacheKey = string | symbol;
+type CacheValue = string | number | object;
+
 export class Cache extends Service {
-  private cacheStack?: obj;
+  private cache?: Map<CacheKey, CacheValue>;
+
+  constructor(ctx: ConstructorParameters<typeof Service>[0]) {
+    super(ctx, {}, 'cache');
+  }
 
-  constructor() {
-    super('custom', 'cache');
+  start() {
+    if (this.cache) return;
+    this.cache = new Map();
   }
 
-  handle(data: unknown[]): void {
-    none(this);
+  stop() {
+    this.cache?.clear();
+    delete this.cache;
   }
 
-  start(): void {
-    this.cacheStack = {};
+  get(prop: CacheKey) {
+    return this.cache!.get(prop);
   }
 
-  stop(): void {
-    Object.keys(this.cacheStack!).forEach((key) => {
-      delete this.cacheStack![key];
-    });
-    delete this.cacheStack;
+  set(prop: CacheKey, value: CacheValue) {
+    this.cache!.set(prop, value);
   }
 }
 

packages/core/src/service/index.ts

@@ -2,5 +2,4 @@ export * from './service';
 export * from './adapter';
 export * from './api';
 export * from './elements';
-export * from './database';
 export * from './cache';

packages/core/src/service/service.ts

@@ -1,20 +1,24 @@
 import { none } from '@kotori-bot/tools';
+import { Context } from '../context';
 
-type ModuleType = 'database' | 'adapter' | 'service' | 'plugin';
-type ServiceType = Exclude<ModuleType, 'plugin' | 'service'> | 'custom';
-
-interface ServiceImpl {
-  readonly config: object;
-  readonly serviceType: ServiceType;
-  readonly service: string;
-  handle(...data: unknown[]): void;
+interface ServiceImpl<T extends object = object> {
+  readonly identity: string;
+  readonly config: T;
   start(): void;
   stop(): void;
 }
 
-export abstract class Service implements ServiceImpl {
-  handle(...data: unknown[]): void {
-    return none(this, data);
+export abstract class Service<T extends object = object> implements ServiceImpl<T> {
+  readonly ctx: Context;
+
+  readonly config: T;
+
+  readonly identity: string;
+
+  constructor(ctx: Context, config: T, identity: string) {
+    this.ctx = ctx;
+    this.config = config;
+    this.identity = identity;
   }
 
   start(): void {
@@ -24,26 +28,6 @@ export abstract class Service implements ServiceImpl {
   stop(): void {
     return none(this);
   }
-
-  readonly serviceType: ServiceType;
-
-  readonly service: string;
-
-  readonly config: object;
-
-  constructor(serviceType: ServiceType, service: string, config: object = {}) {
-    this.serviceType = serviceType;
-    this.config = config;
-    if (serviceType === 'adapter') {
-      this.service = 'adapter';
-      return;
-    }
-    if (serviceType === 'database') {
-      this.service = 'database';
-      return;
-    }
-    this.service = service;
-  }
 }
 
 export default Service;

packages/core/src/types/service.ts

@@ -24,4 +24,3 @@ interface EventDataStatus {
 
 export type ServiceClass = new (config: object) => Service;
 export type AdapterClass = new (ctx: Context, config: AdapterConfig, identity: string) => Adapter;
-// export type DatabaseClass = new (config: /* DatabaseConfig , identity: string */ /*  object) => Database;

packages/core/src/utils/errror.ts

@@ -1,4 +1,4 @@
-type KotoriErrorType = 'DatabaseError' | 'ModuleError' | 'UnknownError' | 'DevError';
+type KotoriErrorType = 'ServiceError' | 'ModuleError' | 'UnknownError' | 'DevError';
 
 interface KotoriErrorImpl {
   readonly name: KotoriErrorType;

packages/kotori/README.md

@@ -46,10 +46,11 @@ kotori 是一个**跨平台、解耦合、现代化**于一体的聊天机器人
 - WeChat/微信
 - Discord
 
-#### Database（待支持）
+#### Database
 
-- Memory
 - Sqlite
+  即将支持：
+- Memory
 - Mysql
 
 ---

packages/kotori/package.json

@@ -23,6 +23,8 @@
   ],
   "files": [
     "lib",
+    "kotori.yml",
+    "bin.js",
     "LICENSE",
     "README.md"
   ],

packages/kotori/src/cli.ts

@@ -1,6 +1,7 @@
 import cac from 'cac';
 import { Loader, Logger } from '@kotori-bot/loader';
 import { readFileSync } from 'fs';
+import { resolve } from 'path';
 
 const program = cac();
 
@@ -12,8 +13,7 @@ program
   .command('')
   .option('--dir [path]', 'Set running root dir of program')
   .action((options) => {
-    Logger.info(options);
-    new Loader({ mode: 'build' }).run();
+    new Loader({ mode: 'build', dir: resolve(process.cwd(), options.dir ?? '') }).run();
   });
 
 program