onebots 0.2.3 → 0.2.4

package/lib/onebot.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BOOLS = exports.OneBotStatus = exports.OneBot = exports.NotFoundError = void 0;
 require("icqq-cq-enable");
@@ -10,6 +33,7 @@ const icqq_1 = require("icqq");
 const message_1 = require("icqq/lib/message");
 const V11_1 = require("./service/V11");
 const V12_1 = require("./service/V12");
+const process = __importStar(require("process"));
 class NotFoundError extends Error {
     constructor() {
         super(...arguments);
@@ -66,11 +90,24 @@ class OneBot extends events_1.EventEmitter {
                 this.off('system.login.qrcode', qrcodeHelper);
             });
         });
-        this.client.trap('system.login.device', function deviceHelper() {
-            console.log('请输入密保手机接收的验证码');
+        this.client.trap('system.login.device', function deviceHelper(e) {
+            console.log('请选择验证方式：1.短信验证  2.url验证');
             this.sendSmsCode();
-            process.stdin.once('data', (e) => {
-                this.submitSmsCode(e.toString().trim());
+            process.stdin.once('data', (buf) => {
+                const input = e.toString().trim();
+                if (input === '1') {
+                    this.sendSmsCode();
+                    console.log('请输入短信验证码:');
+                    process.stdin.once('data', buf => {
+                        this.submitSmsCode(buf.toString().trim());
+                    });
+                }
+                else {
+                    console.log(`请前往：${e.url} 完成验证后回车继续`);
+                    process.stdin.once('data', buf => {
+                        this.login();
+                    });
+                }
             });
             disposeArr.push(() => {
                 this.off('system.login.device', deviceHelper);

package/lib/service/V11/action/friend.d.ts

@@ -8,7 +8,7 @@ export declare class FriendAction {
      * @param message {import('icqq').Sendable} 发送的消息
      * @param message_id {string} 引用的消息ID
      */
-    sendPrivateMsg(this: V11, user_id: number, message: string | SegmentElem[], message_id?: string): Promise<import("icqq").MessageRet>;
+    sendPrivateMsg(this: V11, user_id: number, message: string | SegmentElem | SegmentElem[], message_id?: string): Promise<import("icqq").MessageRet>;
     /**
      * 获取好友列表
      */

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FriendAction = void 0;
-const icqq_cq_enable_1 = require("icqq-cq-enable");
+const utils_1 = require("../../../service/V11/action/utils");
 class FriendAction {
     /**
      * 发送私聊消息
@@ -10,15 +10,15 @@ class FriendAction {
      * @param message_id {string} 引用的消息ID
      */
     async sendPrivateMsg(user_id, message, message_id) {
-        const element = typeof message === 'string' ? (0, icqq_cq_enable_1.fromCqcode)(message) : (0, icqq_cq_enable_1.fromSegment)(message);
-        let quote, quoteIdx = element.findIndex(e => e.type === 'reply');
-        if (quoteIdx !== -1) {
-            quote = element[quoteIdx];
-            element.splice(quoteIdx, 1);
+        const msg = message ? await this.client.getMsg(message_id) : undefined;
+        const { element, quote, music, share } = await utils_1.processMessage.apply(this.client, [message, msg]);
+        if (music)
+            await this.client.pickUser(user_id).shareMusic(music.data.platform, music.data.id);
+        if (share)
+            await this.client.pickUser(user_id).shareUrl(music.data);
+        if (element.length) {
+            return await this.client.sendPrivateMsg(user_id, element, quote ? await this.client.getMsg(quote.data.message_id) : undefined);
         }
-        if (quote && !message_id)
-            message_id = quote.message_id;
-        return await this.client.sendPrivateMsg(user_id, element, message_id ? await this.client.getMsg(message_id) : undefined);
     }
     /**
      * 获取好友列表

package/lib/service/V11/action/group.d.ts

@@ -7,7 +7,7 @@ export declare class GroupAction {
      * @param message {import('icqq').Sendable} 消息
      * @param message_id {string} 引用的消息ID
      */
-    sendGroupMsg(this: V11, group_id: number, message: string | SegmentElem[], message_id?: string): Promise<import("icqq").MessageRet>;
+    sendGroupMsg(this: V11, group_id: number, message: string | SegmentElem | SegmentElem[], message_id?: string): Promise<import("icqq").MessageRet>;
     /**
      * 群组踢人
      * @param group_id {number} 群id

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GroupAction = void 0;
-const icqq_cq_enable_1 = require("icqq-cq-enable");
+const utils_1 = require("../../../service/V11/action/utils");
 class GroupAction {
     /**
      * 发送群聊消息
@@ -10,15 +10,15 @@ class GroupAction {
      * @param message_id {string} 引用的消息ID
      */
     async sendGroupMsg(group_id, message, message_id) {
-        const element = typeof message === 'string' ? (0, icqq_cq_enable_1.fromCqcode)(message) : (0, icqq_cq_enable_1.fromSegment)(message);
-        let quote, quoteIdx = element.findIndex(e => e.type === 'reply');
-        if (quoteIdx !== -1) {
-            quote = element[quoteIdx];
-            element.splice(quoteIdx, 1);
+        const msg = message ? await this.client.getMsg(message_id) : undefined;
+        const { element, quote, music, share } = await utils_1.processMessage.apply(this.client, [message, msg]);
+        if (music)
+            await this.client.pickGroup(group_id).shareMusic(music.data.platform, music.data.id);
+        if (share)
+            await this.client.pickGroup(group_id).shareUrl(music.data);
+        if (element.length) {
+            return await this.client.sendGroupMsg(group_id, element, quote ? await this.client.getMsg(quote.data.message_id) : undefined);
         }
-        if (quote && !message_id)
-            message_id = quote.message_id;
-        return await this.client.sendGroupMsg(group_id, element, message_id ? await this.client.getMsg(message_id) : undefined);
     }
     /**
      * 群组踢人

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

@@ -0,0 +1,9 @@
+import { Client, MessageElem, ShareElem } from "icqq";
+import { SegmentElem } from "icqq-cq-enable/lib/utils";
+import { QuoteElem } from "icqq/lib/message";
+export declare function processMessage(this: Client, message: string | SegmentElem | SegmentElem[], source?: QuoteElem): Promise<{
+    element: MessageElem[];
+    music?: MessageElem;
+    share?: ShareElem;
+    quote?: QuoteElem;
+}>;

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

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processMessage = void 0;
+const utils_1 = require("../../../utils");
+const utils_2 = require("icqq-cq-enable/lib/utils");
+async function processMessage(message, source) {
+    const element = typeof message === 'string' ? (0, utils_2.fromCqcode)(message) : (0, utils_2.fromSegment)(message);
+    let quote = element.find(e => e.type === 'reply');
+    if (quote)
+        (0, utils_1.remove)(element, quote);
+    let music = element.find(e => e.type === 'music');
+    if (music)
+        (0, utils_1.remove)(element, music);
+    let share = element.find(e => e.type === 'share');
+    if (share)
+        (0, utils_1.remove)(element, share);
+    return { element, quote: quote || source, share, music };
+}
+exports.processMessage = processMessage;

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

@@ -14,10 +14,7 @@ export declare class FriendAction {
      * @param message {import('onebots/lib/service/v12').Sendable} 消息
      * @param source {import('onebots/lib/service/v12').SegmentElem<'reply'>} 引用内容
      */
-    sendPrivateMsg(this: V12, user_id: number, message: V12.Sendable, source?: V12.SegmentElem<'reply'>): Promise<import("icqq").MessageRet | {
-        message_id: string;
-        message: V12.Sendable;
-    }>;
+    sendPrivateMsg(this: V12, user_id: number, message: V12.Sendable, source?: V12.SegmentElem<'reply'>): Promise<import("icqq").MessageRet>;
     /**
      * 为指定用户点赞
      * @param user_id {number} 用户id

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

@@ -17,20 +17,13 @@ class FriendAction {
      */
     async sendPrivateMsg(user_id, message, source) {
         let { element, quote, music, share } = await utils_1.processMessage.apply(this.client, [message, source]);
-        if (!element.length && (!music || !share))
-            throw new Error('发送消息不受支持');
-        if (music || share) {
-            const target = this.client.pickFriend(user_id);
-            if (music)
-                await target.shareMusic(music.data.type, music.data.id);
-            if (share)
-                await target.shareUrl(share.data);
-            return {
-                message_id: '',
-                message
-            };
+        if (music)
+            await this.client.pickUser(user_id).shareMusic(music.data.platform, music.data.id);
+        if (share)
+            await this.client.pickUser(user_id).shareUrl(music.data);
+        if (element.length) {
+            return await this.client.sendPrivateMsg(user_id, element, quote ? await this.client.getMsg(quote.data.message_id) : undefined);
         }
-        return await this.client.sendPrivateMsg(user_id, element, quote ? await this.client.getMsg(quote.data.message_id) : undefined);
     }
     /**
      * 为指定用户点赞

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

@@ -6,10 +6,7 @@ export declare class GroupAction {
      * @param message {import('icqq/lib/service').Sendable} 消息
      * @param source {import('onebots/lib/service/v12').SegmentElem<'reply'>} 引用内容
      */
-    sendGroupMsg(this: V12, group_id: number, message: V12.Sendable, source?: V12.SegmentElem<'reply'>): Promise<import("icqq").MessageRet | {
-        message_id: string;
-        message: V12.Sendable;
-    }>;
+    sendGroupMsg(this: V12, group_id: number, message: V12.Sendable, source?: V12.SegmentElem<'reply'>): Promise<import("icqq").MessageRet>;
     /**
      * 群组踢人
      * @param group_id {number} 群id

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

@@ -11,20 +11,13 @@ class GroupAction {
      */
     async sendGroupMsg(group_id, message, source) {
         let { element, quote, music, share } = await utils_1.processMessage.apply(this.client, [message, source]);
-        if (!element.length && (!music || !share))
-            throw new Error('发送消息不受支持');
-        if (music || share) {
-            const target = this.client.pickGroup(group_id);
-            if (music)
-                await target.shareMusic(music.data.type, music.data.id);
-            if (share)
-                await target.shareUrl(share.data);
-            return {
-                message_id: '',
-                message
-            };
+        if (music)
+            await this.client.pickGroup(group_id).shareMusic(music.data.platform, music.data.id);
+        if (share)
+            await this.client.pickGroup(group_id).shareUrl(music.data);
+        if (element.length) {
+            return await this.client.sendGroupMsg(group_id, element, quote ? await this.client.getMsg(quote.data.message_id) : undefined);
         }
-        return await this.client.sendGroupMsg(group_id, element, quote ? await this.client.getMsg(quote.data.message_id) : undefined);
     }
     /**
      * 群组踢人

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

@@ -1,6 +1,5 @@
 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.Sendable, source?: V12.SegmentElem<'reply'>): Promise<{
     element: MessageElem[];
     music?: V12.SegmentElem<'music'>;

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

@@ -1,46 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processMessage = exports.processMusic = void 0;
+exports.processMessage = 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, source) {
     let segments = [].concat(message).map(m => {
         if (typeof m === 'string')
             return { type: 'text', data: { text: m } };
         return m;
     });
-    const music = segments.find(e => e.type === 'music');
+    let quote = segments.find(e => e.type === 'reply');
+    if (quote)
+        (0, utils_1.remove)(segments, quote);
+    let music = segments.find(e => e.type === 'music');
     if (music)
         (0, utils_1.remove)(segments, music);
-    if (segments.find(e => e.type === 'music'))
-        throw new Error('一次只能发送一个音乐元素');
-    if (segments.length && music)
-        throw new Error('音乐元素只能单独发送');
-    const share = segments.find(e => e.type === 'share');
+    let share = segments.find(e => e.type === 'share');
     if (share)
         (0, utils_1.remove)(segments, share);
-    if (segments.find(e => e.type === 'share'))
-        throw new Error('一次只能发送一个分享元素');
-    if (segments.length && share)
-        throw new Error('分享元素只能单独发送');
-    const forwardNodes = segments.filter(e => e.type === 'node');
-    segments = segments.filter(s => !forwardNodes.includes(s));
-    if (forwardNodes.length && segments.length)
-        throw new Error('只能单独发送转发节点');
-    let quote = segments.find(e => e.type === 'reply');
-    if (quote)
-        (0, utils_1.remove)(segments, quote);
     segments = segments.filter(n => [
         'face', 'text', 'image',
         'rpx', 'dice', 'poke', 'mention', 'mention_all',
@@ -49,20 +26,6 @@ async function processMessage(message, source) {
         'music', 'share', 'xml', 'json', 'location', // 分享类
     ].includes(n.type));
     const element = V12_1.V12.fromSegment(segments);
-    if (forwardNodes.length)
-        element.unshift(
-        // 构造抓发消息
-        await this.makeForwardMsg(await Promise.all(
-        // 处理转发消息段
-        forwardNodes.map(async (forwardNode) => {
-            return {
-                // 转发套转发处理
-                message: (await processMessage.apply(this, [forwardNode.data.message])).element,
-                user_id: Number(forwardNode.data.user_id),
-                nickname: forwardNode.data.user_name,
-                time: forwardNode.data.time
-            };
-        }))));
-    return { element, quote: quote || source, music, share };
+    return { element, quote: quote || source, share, music };
 }
 exports.processMessage = processMessage;

package/package.json

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