onebots 0.1.4 → 0.1.6

package/lib/onebot.js

@@ -22,8 +22,7 @@ class OneBot extends events_1.EventEmitter {
         super();
         this.app = app;
         this.uin = uin;
-        if (!Array.isArray(config))
-            config = new Array(config);
+        config = [].concat(config);
         this.config = config.map(c => {
             if (c.password)
                 this.password = c.password;
@@ -31,9 +30,9 @@ class OneBot extends events_1.EventEmitter {
                 c.version = 'V11';
             switch (c.version) {
                 case 'V11':
-                    return (0, utils_1.deepMerge)(this.app.config.general.V11, c);
+                    return (0, utils_1.deepMerge)((0, utils_1.deepClone)(this.app.config.general.V11), c);
                 case 'V12':
-                    return (0, utils_1.deepMerge)(this.app.config.general.V12, c);
+                    return (0, utils_1.deepMerge)((0, utils_1.deepClone)(this.app.config.general.V12), c);
                 default:
                     throw new Error('不支持的oneBot版本：' + c.version);
             }

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/common.d.ts

@@ -31,7 +31,7 @@ export declare class CommonAction {
     getVersion(this: V12): {
         impl: string;
         platform: string;
-        version: string;
+        version: any;
         onebot_version: string;
     };
     callLogin(this: V12, func: string, ...args: any[]): Promise<unknown>;

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

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommonAction = void 0;
 const icqq_1 = require("icqq");
-const onebot_1 = require("../../../onebot");
 const utils_1 = require("../../../utils");
+const onebot_1 = require("../../../onebot");
+const utils_2 = require("../../../utils");
 class CommonAction {
     sendMessage() { }
     /**
@@ -51,7 +52,7 @@ class CommonAction {
         return {
             impl: 'onebots',
             platform: 'qq',
-            version: '0.0.15',
+            version: utils_1.version,
             onebot_version: '12'
         };
     }
@@ -114,9 +115,9 @@ class CommonAction {
         });
     }
     getSupportedActions() {
-        return [...new Set((0, utils_1.getProperties)(this.action))].filter(key => {
+        return [...new Set((0, utils_2.getProperties)(this.action))].filter(key => {
             return key !== 'constructor';
-        }).map(utils_1.toLine);
+        }).map(utils_2.toLine);
     }
 }
 exports.CommonAction = CommonAction;

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.d.ts

@@ -14,6 +14,16 @@ export declare class GroupAction {
      * @param reject_add_request {boolean} 是否禁止此人加群请求
      */
     setGroupKick(this: V12, group_id: number, user_id: number, reject_add_request?: boolean): Promise<boolean>;
+    /**
+     * 设置群精华
+     * @param message_id
+     */
+    setEssenceMessage(this: V12, message_id: string): Promise<string>;
+    /**
+     * 移除群精华
+     * @param message_id
+     */
+    deleteEssenceMessage(this: V12, message_id: string): Promise<string>;
     /**
      * 群禁言指定人
      * @param group_id {number} 群id

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);
     }
     /**
      * 群组踢人
@@ -40,6 +25,20 @@ class GroupAction {
     setGroupKick(group_id, user_id, reject_add_request) {
         return this.client.setGroupKick(group_id, user_id, reject_add_request);
     }
+    /**
+     * 设置群精华
+     * @param message_id
+     */
+    setEssenceMessage(message_id) {
+        return this.client.setEssenceMessage(message_id);
+    }
+    /**
+     * 移除群精华
+     * @param message_id
+     */
+    deleteEssenceMessage(message_id) {
+        return this.client.removeEssenceMessage(message_id);
+    }
     /**
      * 群禁言指定人
      * @param group_id {number} 群id

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

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.V12 = void 0;
 const icqq_1 = require("icqq");
+const utils_1 = require("../../utils");
 const path_1 = require("path");
 const onebot_1 = require("../../onebot");
 const action_1 = require("./action");
@@ -13,7 +14,7 @@ const url_1 = require("url");
 const http_1 = __importDefault(require("http"));
 const https_1 = __importDefault(require("https"));
 const ws_1 = require("ws");
-const utils_1 = require("../../utils");
+const utils_2 = require("../../utils");
 const db_1 = require("../../db");
 const app_1 = require("../../server/app");
 const fs_1 = require("fs");
@@ -116,7 +117,7 @@ class V12 extends events_1.EventEmitter {
             timeout: config.timeout || this.config.request_timeout,
             headers: {
                 "Content-Type": "application/json",
-                "User-Agent": "OneBot/12 (qq) Node-onebots/0.0.15",
+                "User-Agent": "OneBot/12 (qq) Node-onebots/" + utils_1.version,
                 "X-OneBot-Version": 12,
                 "X-Impl": "icqq_onebot",
             },
@@ -317,7 +318,7 @@ class V12 extends events_1.EventEmitter {
     }
     dispatch(data) {
         const payload = {
-            id: (0, utils_1.uuid)(),
+            id: (0, utils_2.uuid)(),
             impl: 'icqq_onebot',
             version: 12,
             platform: 'qq',
@@ -325,7 +326,7 @@ class V12 extends events_1.EventEmitter {
                 platform: 'qq',
                 user_id: `${this.oneBot.uin}`
             },
-            ...(0, utils_1.transformObj)(data, (key, value) => {
+            ...(0, utils_2.transformObj)(data, (key, value) => {
                 if (!['user_id', 'group_id', 'discuss_id', 'member_id', 'channel_id', 'guild_id'].includes(key))
                     return value;
                 return value + '';
@@ -335,7 +336,7 @@ class V12 extends events_1.EventEmitter {
     }
     async apply(req) {
         let { action, params, echo } = req;
-        action = (0, utils_1.toLine)(action);
+        action = (0, utils_2.toLine)(action);
         let is_async = action.includes("_async");
         if (is_async)
             action = action.replace("_async", "");
@@ -354,7 +355,7 @@ class V12 extends events_1.EventEmitter {
             else
                 throw new Error('required detail_type or input (user_id/group_id/(guild_id and channel_id))');
         }
-        const method = (0, utils_1.toHump)(action);
+        const method = (0, utils_2.toHump)(action);
         if (Reflect.has(this.action, method)) {
             const ARGS = String(Reflect.get(this.action, method)).match(/\(.*\)/)?.[0]
                 .replace("(", "")
@@ -365,10 +366,9 @@ class V12 extends events_1.EventEmitter {
             for (let k of ARGS) {
                 if (Reflect.has(params, k)) {
                     if (onebot_1.BOOLS.includes(k))
-                        params[k] = (0, utils_1.toBool)(params[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]);
                 }
@@ -484,12 +484,12 @@ class V12 extends events_1.EventEmitter {
         const headers = {
             "X-Self-ID": String(this.oneBot.uin),
             "X-Client-Role": "Universal",
-            "User-Agent": "OneBot/12 (qq) Node-onebots/0.0.15",
-            "Sec-WebSocket-Protocol": "12.onebots.v0.0.15"
+            "User-Agent": "OneBot/12 (qq) Node-onebots/" + utils_1.version,
+            "Sec-WebSocket-Protocol": "12.onebots.v" + utils_1.version
         };
         if (config.access_token)
             headers.Authorization = "Bearer " + config.access_token;
-        const ws = new ws_1.WebSocket(url, '12.onebots.v0.0.15', { headers });
+        const ws = new ws_1.WebSocket(url, '12.onebots.v' + utils_1.version, { headers });
         ws.on("error", (err) => {
             this.logger.error(err.message);
         });
@@ -564,6 +564,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) => {
@@ -572,9 +573,17 @@ 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'];
+            }
             return {
                 type: type.replace('mention', 'at').replace('at_all', 'at'),
                 ...other,
@@ -589,6 +598,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/lib/utils.d.ts

@@ -1,4 +1,5 @@
-export declare function deepMerge<T extends any>(base: T, ...from: T[]): T;
+export declare const version: any;
+export declare function deepMerge(base: any, ...from: any[]): any;
 export declare function transformObj(obj: any, callback: any): any;
 export declare function deepClone<T extends any>(obj: T): T;
 export declare function pick<T extends object, K extends keyof T>(source: T, keys?: Iterable<K>, forced?: boolean): Pick<T, K>;

package/lib/utils.js

@@ -23,10 +23,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProperties = exports.protectedFields = exports.uuid = exports.toBool = exports.toLine = exports.remove = exports.toHump = exports.Mixin = exports.omit = exports.pick = exports.deepClone = exports.transformObj = exports.deepMerge = void 0;
+exports.getProperties = exports.protectedFields = exports.uuid = exports.toBool = exports.toLine = exports.remove = exports.toHump = exports.Mixin = exports.omit = exports.pick = exports.deepClone = exports.transformObj = exports.deepMerge = exports.version = void 0;
 const crypto = __importStar(require("crypto"));
+const packageJson = require('../package.json');
+exports.version = packageJson.version;
 // 合并对象/数组
 function deepMerge(base, ...from) {
+    if (base === null || base === undefined)
+        base = from.shift();
     if (from.length === 0) {
         return base;
     }
@@ -34,22 +38,19 @@ function deepMerge(base, ...from) {
         return base;
     }
     if (Array.isArray(base)) {
-        return base.concat(...from);
+        return Array.from(new Set(base.concat(...from)));
     }
     for (const item of from) {
         for (const key in item) {
             if (base.hasOwnProperty(key)) {
                 if (typeof base[key] === 'object') {
-                    // @ts-ignore
                     base[key] = deepMerge(base[key], item[key]);
                 }
                 else {
-                    // @ts-ignore
                     base[key] = item[key];
                 }
             }
             else {
-                // @ts-ignore
                 base[key] = item[key];
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onebots",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "基于icqq的多例oneBot实现",
   "engines": {
     "node": ">=16"
@@ -50,7 +50,7 @@
   ],
   "dependencies": {
     "@koa/router": "^10.1.1",
-    "icqq": "^0.0.13-6",
+    "icqq": "^0.0.13-7",
     "icqq-cq-enable": "^1.0.0",
     "js-yaml": "^4.1.0",
     "koa": "^2.13.4",