onebots 0.4.6 → 0.4.8

package/lib/service/V12/index.d.ts

@@ -49,6 +49,8 @@ export declare class V12 extends EventEmitter implements OneBot.Base {
     };
     dispatch(data: Record<string, any>): void;
     apply(req: V12.RequestAction): Promise<string>;
+    private httpAuth;
+    private httpRequestHandler;
     private _httpRequestHandler;
     /**
      * 快速操作

package/lib/service/V12/index.js

@@ -121,6 +121,7 @@ class V12 extends events_1.EventEmitter {
         }
     }
     startHttp(config) {
+        this.oneBot.app.router.all(this.path, (ctx) => this.httpRequestHandler(ctx, config));
         this.oneBot.app.router.all(new RegExp(`^${this.path}/(.*)$`), (ctx) => this._httpRequestHandler(ctx, config));
         this.logger.mark(`开启http服务器成功，监听:http://127.0.0.1:${this.oneBot.app.config.port}${this.path}`);
         this.on('dispatch', (payload) => {
@@ -433,7 +434,7 @@ class V12 extends events_1.EventEmitter {
         else
             throw new onebot_1.NotFoundError();
     }
-    async _httpRequestHandler(ctx, config) {
+    async httpAuth(ctx, config) {
         if (ctx.method === 'OPTIONS') {
             return ctx.writeHead(200, {
                 'Access-Control-Allow-Origin': '*',
@@ -458,6 +459,37 @@ class V12 extends events_1.EventEmitter {
         ctx.res.setHeader("Content-Type", "application/json; charset=utf-8");
         if (this.config.enable_cors)
             ctx.res.setHeader("Access-Control-Allow-Origin", "*");
+    }
+    async httpRequestHandler(ctx, config) {
+        if (await this.httpAuth(ctx, config))
+            return;
+        if (ctx.method === "GET") {
+            try {
+                const ret = await this.apply(ctx.query);
+                ctx.res.writeHead(200).end(ret);
+            }
+            catch (e) {
+                ctx.res.writeHead(500).end(e.message);
+            }
+        }
+        else if (ctx.method === "POST") {
+            try {
+                const params = { ...(ctx.request.query || {}), ...(ctx.request.body || {}) };
+                const ret = await this.apply(params);
+                ctx.res.writeHead(200).end(ret);
+            }
+            catch (e) {
+                ctx.res.writeHead(500).end(e.message);
+            }
+        }
+        else {
+            ctx.res.writeHead(405).end();
+        }
+    }
+    async _httpRequestHandler(ctx, config) {
+        if (await this.httpAuth(ctx, config))
+            return;
+        const url = new url_1.URL(ctx.url, `http://127.0.0.1`);
         const action = url.pathname.replace(`${this.path}`, '').slice(1);
         if (ctx.method === "GET") {
             try {

package/lib/service/V12/utils.js

@@ -25,7 +25,7 @@ async function processMessage(message, source) {
         'forward', 'node',
         'music', 'share', 'xml', 'json', 'location', // 分享类
     ].includes(n.type));
-    segments.forEach(seg => {
+    for (const seg of segments) {
         if (['image', 'video', 'audio'].includes(seg.type)) {
             const { file_id } = seg.data;
             const fileInfo = this.getFile(file_id);
@@ -34,7 +34,13 @@ async function processMessage(message, source) {
             if (seg.data['file_id']?.startsWith('base64://'))
                 seg.data['file_id'] = Buffer.from(seg.data['file_id'].slice(9), 'base64');
         }
-    });
+        else if (['mention', 'mention_all'].includes(seg.type)) {
+            seg.data['qq'] = seg.data['user_id'];
+        }
+        else if (seg.type === 'node') {
+            seg.data['message'] = (await processMessage.call(this, seg.data['message'])).element;
+        }
+    }
     const element = V12_1.V12.fromSegment(segments);
     return { element, quote: quote || source, share, music };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onebots",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "description": "基于icqq的多例oneBot实现",
   "engines": {
     "node": ">=16"
@@ -55,7 +55,7 @@
   "dependencies": {
     "@koa/router": "^10.1.1",
     "@zhinjs/shared": "^0.0.9",
-    "icqq": "^0.4.1",
+    "icqq": "^0.4.6",
     "icqq-cq-enable": "^1.0.1",
     "js-yaml": "^4.1.0",
     "koa": "^2.13.4",