onebots 0.0.28 → 0.0.30

package/lib/bin.js

@@ -7,5 +7,4 @@ const obj = {};
 for (let i = 0; i < execArgv.length; i += 2) {
     obj[execArgv[i]] = execArgv[i + 1];
 }
-console.log(obj);
 (0, app_1.createApp)(obj['-c']).start();

package/lib/onebot.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
-import 'oicq2-cq-enable';
+import 'icqq-cq-enable';
 import { EventEmitter } from 'events';
 import { App } from "./server/app";
-import { Client } from "oicq";
+import { Client } from "icqq";
 import { V11 } from "./service/V11";
 import { V12 } from "./service/V12";
 import { MayBeArray } from "./types";

package/lib/onebot.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BOOLS = exports.OneBotStatus = exports.OneBot = exports.NotFoundError = void 0;
-require("oicq2-cq-enable");
+require("icqq-cq-enable");
 const events_1 = require("events");
 const app_1 = require("./server/app");
 const utils_1 = require("./utils");
 const path_1 = require("path");
-const oicq_1 = require("oicq");
-const message_1 = require("oicq/lib/message");
+const icqq_1 = require("icqq");
+const message_1 = require("icqq/lib/message");
 const V11_1 = require("./service/V11");
 const V12_1 = require("./service/V12");
 class NotFoundError extends Error {
@@ -38,7 +38,7 @@ class OneBot extends events_1.EventEmitter {
                     throw new Error('不支持的oneBot版本：' + c.version);
             }
         });
-        this.client = new oicq_1.Client(uin, { platform: this.app.config.platform, data_dir: (0, path_1.join)(app_1.App.configDir, 'data') });
+        this.client = new icqq_1.Client({ platform: this.app.config.platform, data_dir: (0, path_1.join)(app_1.App.configDir, 'data') });
         this.instances = this.config.map(c => {
             switch (c.version) {
                 case 'V11':
@@ -58,7 +58,7 @@ class OneBot extends events_1.EventEmitter {
                 disposeArr.shift()();
             }
         };
-        this.client.on('system.login.qrcode', function qrcodeHelper() {
+        this.client.trap('system.login.qrcode', function qrcodeHelper() {
             console.log('扫码后回车继续');
             process.stdin.once('data', () => {
                 this.login();
@@ -67,7 +67,7 @@ class OneBot extends events_1.EventEmitter {
                 this.off('system.login.qrcode', qrcodeHelper);
             });
         });
-        this.client.on('system.login.device', function deviceHelper() {
+        this.client.trap('system.login.device', function deviceHelper() {
             console.log('请输入密保手机接收的验证码');
             this.sendSmsCode();
             process.stdin.once('data', (e) => {
@@ -77,7 +77,7 @@ class OneBot extends events_1.EventEmitter {
                 this.off('system.login.device', deviceHelper);
             });
         });
-        this.client.on('system.login.error', function errorHandler(e) {
+        this.client.trap('system.login.error', function errorHandler(e) {
             if (e.message.includes('密码错误')) {
                 process.stdin.once('data', (e) => {
                     this.login(e.toString().trim());
@@ -88,7 +88,7 @@ class OneBot extends events_1.EventEmitter {
             }
             this.off('system.login.error', errorHandler);
         });
-        this.client.on('system.login.slider', function sliderHelper(e) {
+        this.client.trap('system.login.slider', function sliderHelper(e) {
             console.log('滑块验证地址：' + e.url);
             console.log('请输入滑块验证返回的ticket');
             process.stdin.once('data', (e) => {
@@ -98,14 +98,14 @@ class OneBot extends events_1.EventEmitter {
                 this.off('system.login.slider', sliderHelper);
             });
         });
-        this.client.on('system.online', clean);
-        await this.client.login(this.password);
+        this.client.trap('system.online', clean);
+        await this.client.login(this.uin, this.password);
     }
     startListen() {
-        this.client.on('system', this.dispatch.bind(this, 'system'));
-        this.client.on('notice', this.dispatch.bind(this, 'notice'));
-        this.client.on('request', this.dispatch.bind(this, 'request'));
-        this.client.on('message', this.dispatch.bind(this, 'message'));
+        this.client.trap('system', this.dispatch.bind(this, 'system'));
+        this.client.trap('notice', this.dispatch.bind(this, 'notice'));
+        this.client.trap('request', this.dispatch.bind(this, 'request'));
+        this.client.trap('message', this.dispatch.bind(this, 'message'));
         for (const instance of this.instances) {
             instance.start(this.instances.length > 1 ? '/' + instance.version : undefined);
         }
@@ -114,7 +114,7 @@ class OneBot extends events_1.EventEmitter {
         for (const instance of this.instances) {
             await instance.stop(force);
         }
-        this.client.removeAllListeners();
+        this.client.logout(force);
     }
     dispatch(event, data) {
         for (const instance of this.instances) {

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

@@ -16,12 +16,12 @@ export declare class CommonAction {
      * 获取消息
      * @param message_id {string} 消息id
      */
-    getMsg(this: V11, message_id: string): Promise<import("oicq").GroupMessage | import("oicq").PrivateMessage>;
+    getMsg(this: V11, message_id: string): Promise<import("icqq").GroupMessage | import("icqq").PrivateMessage>;
     /**
      * 获取合并消息
      * @param id {string} 合并id
      */
-    getForwardMsg(this: V11, id: string): Promise<import("oicq").ForwardMessage[]>;
+    getForwardMsg(this: V11, id: string): Promise<import("icqq").ForwardMessage[]>;
     /**
      * 获取 Cookies
      * @param domain {string} 域名

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

@@ -1,6 +1,6 @@
 import { OneBot } from "../../../onebot";
 import { V11 } from "../../../service/V11";
-import { SegmentElem } from "oicq2-cq-enable/lib/utils";
+import { SegmentElem } from "icqq-cq-enable/lib/utils";
 export declare class FriendAction {
     /**
      * 发送私聊消息
@@ -8,11 +8,11 @@ export declare class FriendAction {
      * @param message {import('oicq').Sendable} 发送的消息
      * @param message_id {string} 引用的消息ID
      */
-    sendPrivateMsg(this: V11, user_id: number, message: string | SegmentElem[], message_id?: string): Promise<import("oicq").MessageRet>;
+    sendPrivateMsg(this: V11, user_id: number, message: string | SegmentElem[], message_id?: string): Promise<import("icqq").MessageRet>;
     /**
      * 获取好友列表
      */
-    getFriendList(this: OneBot<'V11'>): Promise<import("oicq").FriendInfo[]>;
+    getFriendList(this: OneBot<'V11'>): Promise<import("icqq").FriendInfo[]>;
     /**
      * 处理好友添加请求
      * @param flag {string} 请求flag
@@ -27,7 +27,7 @@ export declare class FriendAction {
     getStrangerInfo(this: OneBot<'V11'>, user_id: number): Promise<{
         user_id: number;
         nickname: string;
-        sex: import("oicq").Gender;
+        sex: import("icqq").Gender;
         age: number;
         area: string;
     }>;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FriendAction = void 0;
-const oicq2_cq_enable_1 = require("oicq2-cq-enable");
+const icqq_cq_enable_1 = require("icqq-cq-enable");
 class FriendAction {
     /**
      * 发送私聊消息
@@ -10,7 +10,7 @@ class FriendAction {
      * @param message_id {string} 引用的消息ID
      */
     async sendPrivateMsg(user_id, message, message_id) {
-        const element = typeof message === 'string' ? (0, oicq2_cq_enable_1.fromCqcode)(message) : (0, oicq2_cq_enable_1.fromSegment)(message);
+        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];

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

@@ -1,5 +1,5 @@
 import { V11 } from "../../../service/V11";
-import { SegmentElem } from "oicq2-cq-enable/lib/utils";
+import { SegmentElem } from "icqq-cq-enable/lib/utils";
 export declare class GroupAction {
     /**
      * 发送群聊消息
@@ -7,7 +7,7 @@ export declare class GroupAction {
      * @param message {import('oicq').Sendable} 消息
      * @param message_id {string} 引用的消息ID
      */
-    sendGroupMsg(this: V11, group_id: number, message: string | SegmentElem[], message_id?: string): Promise<import("oicq").MessageRet>;
+    sendGroupMsg(this: V11, group_id: number, message: string | SegmentElem[], message_id?: string): Promise<import("icqq").MessageRet>;
     /**
      * 群组踢人
      * @param group_id {number} 群id
@@ -85,21 +85,21 @@ export declare class GroupAction {
     /**
      * 获取群列表
      */
-    getGroupList(this: V11): Promise<Map<number, import("oicq").GroupInfo>>;
+    getGroupList(this: V11): Promise<Map<number, import("icqq").GroupInfo>>;
     /**
      * 获取指定群信息
      * @param group_id
      */
-    getGroupInfo(this: V11, group_id: number): Promise<import("oicq").GroupInfo>;
+    getGroupInfo(this: V11, group_id: number): Promise<import("icqq").GroupInfo>;
     /**
      * 获取群成员列表
      * @param group_id
      */
-    getGroupMemberList(this: V11, group_id: number): Promise<Map<number, import("oicq").MemberInfo>>;
+    getGroupMemberList(this: V11, group_id: number): Promise<Map<number, import("icqq").MemberInfo>>;
     /**
      * 获取指定群成员信息
      * @param group_id
      * @param user_id
      */
-    getGroupMemberInfo(this: V11, group_id: number, user_id: number): Promise<import("oicq").MemberInfo>;
+    getGroupMemberInfo(this: V11, group_id: number, user_id: number): Promise<import("icqq").MemberInfo>;
 }

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GroupAction = void 0;
-const oicq2_cq_enable_1 = require("oicq2-cq-enable");
+const icqq_cq_enable_1 = require("icqq-cq-enable");
 class GroupAction {
     /**
      * 发送群聊消息
@@ -10,7 +10,7 @@ class GroupAction {
      * @param message_id {string} 引用的消息ID
      */
     async sendGroupMsg(group_id, message, message_id) {
-        const element = typeof message === 'string' ? (0, oicq2_cq_enable_1.fromCqcode)(message) : (0, oicq2_cq_enable_1.fromSegment)(message);
+        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];

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

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { Client } from "oicq";
+import { Client } from "icqq";
 import { Config } from "./config";
 import { Action } from "./action";
 import { OneBot } from "../../onebot";

package/lib/service/V11/index.js

@@ -4,13 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.V11 = void 0;
-const oicq_1 = require("oicq");
+const icqq_1 = require("icqq");
 const action_1 = require("./action");
 const onebot_1 = require("../../onebot");
 const ws_1 = require("ws");
 const url_1 = require("url");
 const utils_1 = require("../../utils");
-const oicq2_cq_enable_1 = require("oicq2-cq-enable");
+const icqq_cq_enable_1 = require("icqq-cq-enable");
 const onebot_2 = require("../../onebot");
 const http_1 = __importDefault(require("http"));
 const https_1 = __importDefault(require("https"));
@@ -63,7 +63,7 @@ class V11 extends events_1.EventEmitter {
                 this.dispatch({
                     self_id: this.client.uin,
                     status: {
-                        online: this.client.status === oicq_1.OnlineStatus.Online,
+                        online: this.client.status === icqq_1.OnlineStatus.Online,
                         good: this.oneBot.status === onebot_1.OneBotStatus.Good
                     },
                     time: Math.floor(Date.now() / 1000),
@@ -174,7 +174,7 @@ class V11 extends events_1.EventEmitter {
         });
     }
     async stop(force) {
-        if (this.client.status === oicq_1.OnlineStatus.Online) {
+        if (this.client.status === icqq_1.OnlineStatus.Online) {
             await this.client.terminate();
         }
         if (force) {
@@ -190,7 +190,7 @@ class V11 extends events_1.EventEmitter {
         if (data.post_type === 'system') {
         }
         if (data.message && data.post_type === 'message') {
-            data.message = this.config.post_message_format === 'array' ? (0, oicq2_cq_enable_1.toSegment)(data.message) : (0, oicq2_cq_enable_1.toCqcode)(data);
+            data.message = this.config.post_message_format === 'array' ? (0, icqq_cq_enable_1.toSegment)(data.message) : (0, icqq_cq_enable_1.toCqcode)(data);
         }
         data.time = Math.floor(Date.now() / 1000);
         this.emit('dispatch', JSON.stringify(data));
@@ -393,10 +393,10 @@ class V11 extends events_1.EventEmitter {
                         params[k] = (0, utils_1.toBool)(params[k]);
                     if (k === 'message') {
                         if (typeof params[k] === 'string') {
-                            params[k] = (0, oicq2_cq_enable_1.fromCqcode)(params[k]);
+                            params[k] = (0, icqq_cq_enable_1.fromCqcode)(params[k]);
                         }
                         else {
-                            params[k] = (0, oicq2_cq_enable_1.fromSegment)(params[k]);
+                            params[k] = (0, icqq_cq_enable_1.fromSegment)(params[k]);
                         }
                         params['message_id'] = params[k].find(e => e.type === 'reply')?.message_id;
                     }

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

@@ -1,5 +1,5 @@
 import { V12 } from '../../../service/V12';
-import { OnlineStatus } from "oicq";
+import { OnlineStatus } from "icqq";
 import { Action } from "./";
 export declare class CommonAction {
     sendMessage(): void;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommonAction = void 0;
-const oicq_1 = require("oicq");
+const icqq_1 = require("icqq");
 const onebot_1 = require("../../../onebot");
 const utils_1 = require("../../../utils");
 class CommonAction {
@@ -27,7 +27,7 @@ class CommonAction {
             bots: [
                 {
                     self: this.action.getSelfInfo.apply(this),
-                    online: this.client.status = oicq_1.OnlineStatus.Online,
+                    online: this.client.status = icqq_1.OnlineStatus.Online,
                 }
             ]
         };

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

@@ -3,16 +3,16 @@ export declare class FriendAction {
     getUserInfo(this: V12, user_id: number): Promise<{
         user_id: number;
         nickname: string;
-        sex: import("oicq").Gender;
+        sex: import("icqq").Gender;
         age: number;
         area: string;
     }>;
-    getFriendList(this: V12): Map<number, import("oicq").FriendInfo>;
+    getFriendList(this: V12): Map<number, import("icqq").FriendInfo>;
     /**
      * 发送私聊消息
      * @param user_id {number} 用户id
      * @param message {import('oicq').Sendable} 发送的消息
      * @param message_id {string} 引用的消息ID
      */
-    sendPrivateMsg(this: V12, user_id: number, message: V12.SegmentElem[], message_id?: string): Promise<import("oicq").MessageRet>;
+    sendPrivateMsg(this: V12, user_id: number, message: V12.SegmentElem[], message_id?: string): Promise<import("icqq").MessageRet>;
 }

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

@@ -6,7 +6,7 @@ export declare class GroupAction {
      * @param message {import('oicq').Sendable} 消息
      * @param message_id {string} 引用的消息ID
      */
-    sendGroupMsg(this: V12, group_id: number, message: V12.SegmentElem[], message_id?: string): Promise<import("oicq").MessageRet>;
+    sendGroupMsg(this: V12, group_id: number, message: V12.SegmentElem[], message_id?: string): Promise<import("icqq").MessageRet>;
     /**
      * 群组踢人
      * @param group_id {number} 群id
@@ -84,21 +84,21 @@ export declare class GroupAction {
     /**
      * 获取群列表
      */
-    getGroupList(this: V12): Promise<Map<number, import("oicq").GroupInfo>>;
+    getGroupList(this: V12): Promise<Map<number, import("icqq").GroupInfo>>;
     /**
      * 获取指定群信息
      * @param group_id
      */
-    getGroupInfo(this: V12, group_id: number): Promise<import("oicq").GroupInfo>;
+    getGroupInfo(this: V12, group_id: number): Promise<import("icqq").GroupInfo>;
     /**
      * 获取群成员列表
      * @param group_id
      */
-    getGroupMemberList(this: V12, group_id: number): Promise<Map<number, import("oicq").MemberInfo>>;
+    getGroupMemberList(this: V12, group_id: number): Promise<Map<number, import("icqq").MemberInfo>>;
     /**
      * 获取指定群成员信息
      * @param group_id
      * @param user_id
      */
-    getGroupMemberInfo(this: V12, group_id: number, user_id: number): Promise<import("oicq").MemberInfo>;
+    getGroupMemberInfo(this: V12, group_id: number, user_id: number): Promise<import("icqq").MemberInfo>;
 }

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

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { Client, EventMap, MessageElem, Sendable } from "oicq";
+import { Client, EventMap, MessageElem, Sendable } from "icqq";
 import { Config } from './config';
 import { OneBot } from "../../onebot";
 import { Action } from "./action";
@@ -137,7 +137,7 @@ export declare namespace V12 {
     const defaultConfig: Config;
     type Payload<T extends any> = {
         id: string;
-        impl: 'oicq_onebot';
+        impl: 'icqq_onebot';
         version: 12;
         platform: 'qq';
         self: {

package/lib/service/V12/index.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.V12 = void 0;
-const oicq_1 = require("oicq");
+const icqq_1 = require("icqq");
 const path_1 = require("path");
 const onebot_1 = require("../../onebot");
 const action_1 = require("./action");
@@ -118,7 +118,7 @@ class V12 extends events_1.EventEmitter {
                 "Content-Type": "application/json",
                 "User-Agent": "OneBot/12 (qq) Node-onebots/0.0.15",
                 "X-OneBot-Version": 12,
-                "X-Impl": "oicq_onebot",
+                "X-Impl": "icqq_onebot",
             },
         };
         if (config.access_token) {
@@ -261,7 +261,7 @@ class V12 extends events_1.EventEmitter {
         });
     }
     async stop(force) {
-        if (this.client.status === oicq_1.OnlineStatus.Online) {
+        if (this.client.status === icqq_1.OnlineStatus.Online) {
             await this.client.terminate();
         }
         this.wss.close();
@@ -318,7 +318,7 @@ class V12 extends events_1.EventEmitter {
     dispatch(data) {
         const payload = {
             id: (0, utils_1.uuid)(),
-            impl: 'oicq_onebot',
+            impl: 'icqq_onebot',
             version: 12,
             platform: 'qq',
             self: {
@@ -340,7 +340,7 @@ class V12 extends events_1.EventEmitter {
                 action = "send_" + params.detail_type + "_msg";
             }
             else if (params.user_id)
-                action = "send_private_msg";
+                action = "send_Private_Msg";
             else if (params.group_id)
                 action = "send_group_msg";
             else if (params.discuss_id)
@@ -569,9 +569,10 @@ exports.V12 = V12;
                 return { type: 'text', text: msg };
             }
             const { type, data, ...other } = msg;
+            if (type === 'mention')
+                data['qq'] = Number(data['user_id']);
             return {
                 type: type.replace('mention', 'at').replace('at_all', 'at'),
-                qq: data['user_id'],
                 ...other,
                 ...data
             };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onebots",
-  "version": "0.0.28",
+  "version": "0.0.30",
   "description": "基于oicq的多例oneBot实现",
   "engines": {
     "node": ">=16"
@@ -50,12 +50,12 @@
   ],
   "dependencies": {
     "@koa/router": "^10.1.1",
+    "icqq": "^0.0.13-4",
+    "icqq-cq-enable": "^1.0.0",
     "js-yaml": "^4.1.0",
     "koa": "^2.13.4",
     "koa-bodyparser": "^4.3.0",
     "log4js": "^6.5.2",
-    "oicq": "^2.3.1",
-    "oicq2-cq-enable": "^1.0.6",
     "ws": "^8.8.0"
   }
 }