alemonjs 1.1.38 → 1.2.0-rc.0

package/README.md

@@ -27,25 +27,24 @@
 | [alemonjs]        | [![alemonjs-status]][alemonjs-package]               | 标准应用解析器  |
 | [create-alemonjs] | [![create-alemonjs-status]][create-alemonjs-package] | 模板创建脚手架  |
 | [afloat]          | [![afloat-status]][afloat-package]                   | 应用构建工具    |
-| [alemon-image]    | [![alemon-image-status]][alemon-image-package]       | 图片调试工具    |
 | [alemon-ffmpeg]   | [![alemon-ffmpeg-status]][alemon-ffmpeg-package]     | ffmpeg 自动下载 |
 | [alemon-onebot]   | [![alemon-onebot-status]][alemon-onebot-package]     | OneBot 协议平台 |
 
 >
 
-[alemonjs]: https://github.com/ningmengchongshui/alemon
+[alemonjs]: https://github.com/ningmengchongshui/alemonjs
 [alemonjs-status]: https://img.shields.io/npm/v/alemonjs.svg
 [alemonjs-package]: https://www.npmjs.com/package/alemonjs
 
 >
 
-[create-alemonjs]: https://github.com/ningmengchongshui/alemon/tree/cli
+[create-alemonjs]: https://github.com/ningmengchongshui/alemonjs/tree/create-alemonjs
 [create-alemonjs-status]: https://img.shields.io/npm/v/create-alemonjs.svg
 [create-alemonjs-package]: https://www.npmjs.com/package/create-alemonjs
 
 >
 
-[afloat]: https://github.com/ningmengchongshui/alemon/tree/rollup
+[afloat]: https://github.com/ningmengchongshui/alemonjs/tree/rollup
 [afloat-status]: https://img.shields.io/npm/v/afloat.svg
 [afloat-package]: https://www.npmjs.com/package/afloat
 
@@ -57,13 +56,7 @@
 
 >
 
-[alemon-image]: https://github.com/ningmengchongshui/alemon/tree/alemon-image
-[alemon-image-status]: https://img.shields.io/npm/v/alemon-image.svg
-[alemon-image-package]: https://www.npmjs.com/package/alemon-image
-
->
-
-[alemon-onebot]: https://github.com/ningmengchongshui/alemon/tree/alemon-onebot
+[alemon-onebot]: https://github.com/ningmengchongshui/alemonjs/tree/alemon-onebot
 [alemon-onebot-status]: https://img.shields.io/npm/v/alemon-onebot.svg
 [alemon-onebot-package]: https://www.npmjs.com/package/alemon-onebot
 
@@ -156,20 +149,8 @@ import { createApp, AMessage, APlugin } from 'alemonjs'
 createApp(import.meta.url)
   .on('MESSAGE', e => {
     if (/^你好$/.test(e.msg)) e.reply('你好呀', e.user_name)
-    // 放行
-    return false
-  })
-  .on('MESSAGE', e => {
-    if (e.typing == 'DELETE') console.log(e.user_id, '撤回了一条消息')
-    // 不放行
-    console.log('停止了')
-  })
-  .on('MESSAGE', e => {
-    // 不再执行
-    console.log('看不到我')
   })
   .on('GUILD_MEMBERS', e => {
-    // 执行
     console.log('成员', e.user_name, '加入')
   })
 ```
@@ -186,7 +167,21 @@ npm run build
 
 该程序可放置于`plugins/your plugin name`文件夹下
 
-### dependencies
+# Unknown file ".ts"
+
+node >= 20.0.0
+
+```ts
+npx ts-node alemon.config.ts
+```
+
+更改为
+
+```ts
+node --no-warnings=ExperimentalWarning --loader ts-node/esm alemon.config.ts
+```
+
+### Dependencies
 
 ```json
 {
@@ -195,9 +190,6 @@ npm run build
   "form-data": "文件流",
   "image-size": "图片大小",
   "koa": "服务框架",
-  "koa-bodyparser": "数据解析",
-  "koa-router": "路由处理",
-  "koa2-cors": "跨域处理",
   "lodash-es": "工具包",
   "mime-types": "文件类型",
   "protobufjs": "新文件格式",
@@ -207,3 +199,7 @@ npm run build
   "ws": "连接协议"
 }
 ```
+
+### Community
+
+QQ Group 806943302

package/lib/api/index.js

@@ -4,27 +4,18 @@
  * ***********
  */
 export { ClientQQ } from '../qq/index.js';
-/**
- * villa客户端
- */
 export { ClientVILLA } from '../villa/index.js';
-/**
- * ntqq客户端
- */
 export { ClientNTQQ } from '../ntqq/index.js';
-/**
- * server客户端
- */
 export { ClientKOA } from '../koa/index.js';
-/**
- * kook客户端
- */
 export { ClientKOOK } from '../kook/index.js';
-/**
- * discord
- */
 export { ClientDISOCRD } from '../discord/index.js';
 /**
- * Controller
+ * ************
+ * Controllers
+ * ************
  */
-export { Controller } from './controller.js';
+export { Controllers as ControllerVILLA } from '../villa/alemon/controller.js';
+export { Controllers as ControllerQQ } from '../qq/alemon/controller.js';
+export { Controllers as ControllerDISCORD } from '../discord/alemon/controller.js';
+export { Controllers as ControllerNTQQ } from '../ntqq/alemon/controller.js';
+export { Controllers as ControllerKOOK } from '../kook/alemon/controller.js';

package/lib/config/login.js

@@ -1,38 +1,38 @@
 import { DefaultConfig } from '../default/index.js';
-import { defineKOOK as kook } from '../kook/kook.js';
-import { defineVILLA as villa } from '../villa/villa.js';
-import { defineQQ as qq } from '../qq/qq.js';
-import { defineNtqq as ntqq } from '../ntqq/ntqq.js';
-import { defineDISCORD as discord } from '../discord/discord.js';
+import { defineKOOK as kook } from '../kook/sdk/ws.js';
+import { defineVILLA as villa } from '../villa/sdk/wss.js';
+import { defineQQ as qq } from '../qq/sdk/wss.js';
+import { defineNtqq as ntqq } from '../ntqq/sdk/wss.js';
+import { defineDISCORD as discord } from '../discord/sdk/wss.js';
 import { Screenshot } from '../core/index.js';
-class BotConfig {
-    data = {
-        ...DefaultConfig,
-        kook,
-        villa,
-        qq,
-        ntqq,
-        puppeteer: Screenshot.launch,
-        discord
-    };
+class BaseConfig {
+    #data = null;
+    constructor(val) {
+        this.#data = val;
+    }
+    /**
+     * 设置配置
+     * @param key
+     * @param val
+     */
     set(key, val) {
         if (key == 'puppeteer') {
             // pup 不用检查 直接覆盖
             for (const item in val) {
-                this.data[key][item] = val[item];
+                this.#data[key][item] = val[item];
             }
         }
         else {
             for (const item in val) {
                 // 当前仅当同属性名的时候才会覆盖默认配置
-                if (Object.prototype.hasOwnProperty.call(this.data[key], item)) {
-                    this.data[key][item] = val[item];
+                if (Object.prototype.hasOwnProperty.call(this.#data[key], item)) {
+                    this.#data[key][item] = val[item];
                 }
                 else {
                     // 不属于默认
                     try {
-                        this.data[key] = {};
-                        this.data[key] = val[item];
+                        this.#data[key] = {};
+                        this.#data[key] = val[item];
                         console.info('KEY secess');
                     }
                     catch {
@@ -42,25 +42,24 @@ class BotConfig {
             }
         }
     }
+    /**
+     * 读取配置
+     * @param key
+     * @returns
+     */
     get(key) {
-        return this.data[key];
+        return this.#data[key];
     }
 }
 /**
  * 机器人配置
  */
-export const BOTCONFIG = new BotConfig();
-/**
- * 设置机器人基础配置
- * @param key 配置名
- * @param val 配置值
- * @deprecated 已废弃
- */
-export const setBotConfigByKey = BOTCONFIG.set;
-/**
- * g得到机器人基础配置
- * @param key 配置名
- * @returns 得到配置值
- * @deprecated 已废弃
- */
-export const getBotConfigByKey = BOTCONFIG.get;
+export const BOTCONFIG = new BaseConfig({
+    ...DefaultConfig,
+    kook,
+    villa,
+    qq,
+    ntqq,
+    puppeteer: Screenshot.launch,
+    discord
+});

package/lib/core/index.js

@@ -3,12 +3,10 @@
  * private
  * ********
  */
-export * from './plugin/index.js';
-export * from './configs.js';
-export * from './apps.js';
-export * from './cache/index.js';
-export * from './conversation/index.js';
-export * from './dealmsg.js';
-export * from './application.js';
+export * from './processor/configs.js';
 export * from './typings.js';
 export * from './utils/index.js';
+export * from './types.js';
+export * from './processor/path.js';
+export * from './processor/application.js';
+export * from './processor/log.js';

package/lib/core/main.js

@@ -3,10 +3,14 @@
  * public
  * ********
  */
-export * from './apps.js';
-export * from './configs.js';
-export * from './help.js';
-export * from './conversation/index.js';
-export * from './plugin/index.js';
+export * from './processor/configs.js';
+export * from './processor/help.js';
+export * from './index.js';
 export * from './utils/index.js';
 export * from './typings.js';
+export * from './types.js';
+export * from './processor/alemon.js';
+export * from './processor/path.js';
+export * from './processor/help.js';
+export * from './processor/plugin.js';
+export * from './processor/subscribe.js';