onebots 0.1.5 → 0.1.7

package/lib/server/app.js

@@ -123,6 +123,12 @@ class App extends koa_1.default {
         for (const oneBot of this.oneBots) {
             oneBot.start();
         }
+        process.on('uncaughtException', (e) => {
+            console.error('uncaughtException', e);
+        });
+        process.on('unhandledRejection', (e) => {
+            console.error('unhandledRejection', e);
+        });
         this.httpServer.listen(this.config.port);
         this.router.get('/list', (ctx) => {
             ctx.body = this.oneBots.map(bot => {

package/lib/service/V12/action/friend.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FriendAction = void 0;
-const index_1 = require("../index");
-const utils_1 = require("../../../utils");
+const utils_1 = require("../../../service/V12/action/utils");
 class FriendAction {
     getUserInfo(user_id) {
         return this.client.getStrangerInfo(user_id);
@@ -17,25 +16,11 @@ class FriendAction {
      * @param message_id {string} 引用的消息ID
      */
     async sendPrivateMsg(user_id, message, message_id) {
-        const forward = message.find(e => e.type === 'node');
-        if (forward)
-            (0, utils_1.remove)(message, forward);
-        let quote = message.find(e => e.type === 'reply');
-        if (quote)
-            (0, utils_1.remove)(message, quote);
-        const element = index_1.V12.fromSegment(message);
-        if (forward)
-            element.unshift(await this.client.makeForwardMsg(forward.data.message.map(segment => {
-                return {
-                    message: index_1.V12.fromSegment([segment]),
-                    user_id: forward.data.user_id,
-                    nickname: forward.data.user_name,
-                    time: forward.data.time
-                };
-            })));
-        if (quote && !message_id)
-            message_id = quote.data.message_id;
-        return await this.client.sendPrivateMsg(user_id, element, message_id ? await this.client.getMsg(message_id) : undefined);
+        let { element, quote_id } = await utils_1.processMessage.apply(this.client, [message, message_id]);
+        element = await utils_1.processMusic.apply(this.client, ['friend', user_id, element]);
+        if (!element.length)
+            return;
+        return await this.client.sendPrivateMsg(user_id, element, quote_id ? await this.client.getMsg(quote_id) : undefined);
     }
 }
 exports.FriendAction = FriendAction;

package/lib/service/V12/action/group.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GroupAction = void 0;
-const index_1 = require("../index");
-const utils_1 = require("../../../utils");
+const utils_1 = require("../../../service/V12/action/utils");
 class GroupAction {
     /**
      * 发送群聊消息
@@ -11,25 +10,11 @@ class GroupAction {
      * @param message_id {string} 引用的消息ID
      */
     async sendGroupMsg(group_id, message, message_id) {
-        const forward = message.find(e => e.type === 'node');
-        if (forward)
-            (0, utils_1.remove)(message, forward);
-        let quote = message.find(e => e.type === 'reply');
-        if (quote)
-            (0, utils_1.remove)(message, quote);
-        const element = index_1.V12.fromSegment(message);
-        if (forward)
-            element.unshift(await this.client.makeForwardMsg(forward.data.message.map(segment => {
-                return {
-                    message: index_1.V12.fromSegment([segment]),
-                    user_id: forward.data.user_id,
-                    nickname: forward.data.user_name,
-                    time: forward.data.time
-                };
-            })));
-        if (quote && !message_id)
-            message_id = quote.data.message_id;
-        return await this.client.sendGroupMsg(group_id, element, message_id ? await this.client.getMsg(message_id) : undefined);
+        let { element, quote_id } = await utils_1.processMessage.apply(this.client, [message, message_id]);
+        element = await utils_1.processMusic.apply(this.client, ['group', group_id, element]);
+        if (!element.length)
+            return;
+        return await this.client.sendGroupMsg(group_id, element, quote_id ? await this.client.getMsg(quote_id) : undefined);
     }
     /**
      * 群组踢人

package/lib/service/V12/action/guild.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GuildAction = void 0;
-const V12_1 = require("../../../service/V12");
-const utils_1 = require("../../../utils");
+const utils_1 = require("../../../service/V12/action/utils");
 class GuildAction {
     getGuildList() {
         return this.client.getGuildList();
@@ -14,22 +13,9 @@ class GuildAction {
         return this.client.getGuildMemberList(guild_id);
     }
     async sendGuildMsg(guild_id, channel_id, message) {
-        const forward = message.find(e => e.type === 'node');
-        if (forward)
-            (0, utils_1.remove)(message, forward);
-        let quote = message.find(e => e.type === 'reply');
-        if (quote)
-            (0, utils_1.remove)(message, quote);
-        const element = V12_1.V12.fromSegment(message);
-        // if(forward) element.unshift(await this.client.makeForwardMsg(forward.data.message.map(segment=>{
-        //     return {
-        //         message:V12.fromSegment([segment]),
-        //         user_id:forward.data.user_id,
-        //         nickname:forward.data.user_name,
-        //         time:forward.data.time
-        //     }
-        // })))
-        // if(quote && !message_id) message_id=quote.data.message_id
+        const { element } = await utils_1.processMessage.apply(this.client, [message]);
+        if (!element.length)
+            return;
         return await this.client.sendGuildMsg(guild_id, channel_id, element);
     }
 }

package/lib/service/V12/action/utils.d.ts

@@ -0,0 +1,7 @@
+import { Client, MessageElem } from "icqq";
+import { V12 } from "../../../service/V12";
+export declare function processMusic(this: Client, target_type: 'group' | 'friend', target_id: number, element: any): Promise<any>;
+export declare function processMessage(this: Client, message: V12.SegmentElem[], quote_id?: string): Promise<{
+    element: MessageElem[];
+    quote_id?: string;
+}>;

package/lib/service/V12/action/utils.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processMessage = exports.processMusic = void 0;
+const V12_1 = require("../../../service/V12");
+const utils_1 = require("../../../utils");
+async function processMusic(target_type, target_id, element) {
+    const musicList = element.filter(e => e.type === 'music');
+    element = element.filter(e => !musicList.includes(e));
+    const target = target_type === 'group' ? this.pickGroup(target_id) : this.pickFriend(target_id);
+    if (musicList.length)
+        await Promise.all(musicList.map(async (music) => {
+            return await target.shareMusic(music.platform, music.id);
+        }));
+    return element;
+}
+exports.processMusic = processMusic;
+async function processMessage(message, quote_id) {
+    const forward = message.find(e => e.type === 'node');
+    if (forward)
+        (0, utils_1.remove)(message, forward);
+    let quote = message.find(e => e.type === 'reply');
+    if (quote)
+        (0, utils_1.remove)(message, quote);
+    const element = V12_1.V12.fromSegment(message);
+    if (forward)
+        element.unshift(
+        // 构造抓发消息
+        await this.makeForwardMsg(await Promise.all(
+        // 处理转发消息段
+        forward.data.message.map(async (segment) => {
+            return {
+                // 转发套转发处理
+                message: (await processMessage.apply(this, [V12_1.V12.fromSegment([segment])])).element,
+                user_id: forward.data.user_id,
+                nickname: forward.data.user_name,
+                time: forward.data.time
+            };
+        }))));
+    if (quote && !quote_id)
+        quote_id = quote.data.message_id;
+    return { element, quote_id };
+}
+exports.processMessage = processMessage;

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

@@ -81,6 +81,13 @@ export declare namespace V12 {
         file: {
             file_id: string;
         };
+        music: {
+            type: "163" | 'qq' | 'xm' | 'custom';
+            id?: string;
+            url?: string;
+            audio?: string;
+            title?: string;
+        };
         location: {
             latitude: number;
             longitude: number;
@@ -93,6 +100,12 @@ export declare namespace V12 {
             user_name?: string;
             message: SegmentElem[];
         };
+        share: {
+            url: string;
+            title: string;
+            content?: string;
+            image?: string;
+        };
         reply: {
             message_id: string;
         };

package/lib/service/V12/index.js

@@ -367,10 +367,6 @@ class V12 extends events_1.EventEmitter {
                 if (Reflect.has(params, k)) {
                     if (onebot_1.BOOLS.includes(k))
                         params[k] = (0, utils_2.toBool)(params[k]);
-                    if (k === 'message') {
-                        params[k] = V12.fromSegment(params[k]);
-                        params['message_id'] = params[k].find(e => e.type === 'reply')?.message_id;
-                    }
                     args.push(params[k]);
                 }
             }
@@ -461,7 +457,7 @@ class V12 extends events_1.EventEmitter {
                     return;
                 const action = event.detail_type === "private" ? "sendPrivateMsg" : "sendGroupMsg";
                 const id = event.detail_type === "private" ? event.user_id : event.group_id;
-                this.client[action](id, res.reply, res.auto_escape);
+                this.action[action].apply(this, [id, res.reply]);
             }
             if (event.detail_type === "group") {
                 if (res.delete)
@@ -546,6 +542,7 @@ class V12 extends events_1.EventEmitter {
                 }
                 else {
                     code = 10003;
+                    this.logger.debug(e);
                     message = "请求格式错误";
                 }
                 ws.send(JSON.stringify({
@@ -565,6 +562,7 @@ class V12 extends events_1.EventEmitter {
 }
 exports.V12 = V12;
 (function (V12) {
+    const fileTypes = ['image', "file", 'record', 'video', 'flash'];
     function fromSegment(msgList) {
         msgList = [].concat(msgList);
         return msgList.map((msg) => {
@@ -573,9 +571,18 @@ exports.V12 = V12;
             if (typeof msg === 'string') {
                 return { type: 'text', text: msg };
             }
-            const { type, data, ...other } = msg;
+            const { type, data = {}, ...other } = msg;
+            Object.assign(data, other);
+            if (type === 'music' && !data['platform']) {
+                data['platform'] = data['type'];
+                delete data['type'];
+            }
             if (type === 'mention')
                 data['qq'] = Number(data['user_id']);
+            if (fileTypes.includes(type) && !data['file']) {
+                data['file'] = data['file_id'];
+                delete data['file_id'];
+            }
             return {
                 type: type.replace('mention', 'at').replace('at_all', 'at'),
                 ...other,
@@ -590,6 +597,8 @@ exports.V12 = V12;
             if (typeof msg === 'string')
                 return { type: 'text', data: { text: msg } };
             let { type, ...other } = msg;
+            if (fileTypes.includes(type))
+                other['file_id'] = other['file'];
             return {
                 type: type === 'at' ? other['qq'] ? 'mention' : "mention_all" : type,
                 data: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onebots",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "基于icqq的多例oneBot实现",
   "engines": {
     "node": ">=16"