onebots 0.4.23 → 0.4.25

package/lib/service/V11/db_entities.js

@@ -28,7 +28,7 @@ __decorate([
 ], MsgEntry.prototype, "seq", void 0);
 __decorate([
     (0, typeorm_1.Column)(),
-    __metadata("design:type", Number)
+    __metadata("design:type", String)
 ], MsgEntry.prototype, "user_id", void 0);
 __decorate([
     (0, typeorm_1.Column)(),

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

@@ -38,7 +38,7 @@ export declare class Database {
      * @param group_id
      * @param seq
      */
-    getMsgByParams(user_id: number, group_id: number, seq: number): Promise<MsgEntry | null>;
+    getMsgByParams(user_id: string, group_id: number, seq: number): Promise<MsgEntry | null>;
     /**
      * 将一条消息标记为 recalled
      * @param base64_id

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

@@ -1,21 +1,20 @@
 /// <reference types="node" />
-import { OneBot } from "../../onebot";
-import { Service } from "../../service";
-import { Dispose } from "../../types";
-import { Client } from "icqq";
+import { Config } from "./config";
+import { Action } from "./action";
+import { OneBot, OneBotStatus } from "../../onebot";
 import { Logger } from "log4js";
 import { WebSocket, WebSocketServer } from "ws";
-import { Action } from "./action";
-import { Config } from "./config";
+import { Dispose } from "../../types";
 import { Database } from "./db_sqlite";
+import { Service } from "../../service";
+import { Dict } from "@zhinjs/shared";
 export declare class V11 extends Service<"V11"> implements OneBot.Base {
-    oneBot: OneBot<"V11">;
-    client: Client;
+    oneBot: OneBot<'V11'>;
+    config: OneBot.Config<'V11'>;
     action: Action;
-    version: string;
+    version: OneBot.Version;
     protected timestamp: number;
     protected heartbeat?: NodeJS.Timeout;
-    private path;
     db: Database;
     disposes: Dispose[];
     protected _queue: Array<{
@@ -26,15 +25,14 @@ export declare class V11 extends Service<"V11"> implements OneBot.Base {
     logger: Logger;
     wss?: WebSocketServer;
     wsr: Set<WebSocket>;
-    constructor(oneBot: OneBot<"V11">, client: Client, config: OneBot.Config<"V11">);
-    start(path?: string): void;
+    constructor(oneBot: OneBot<'V11'>, config: OneBot.Config<'V11'>);
+    start(): void;
     private startHttp;
     private startHttpReverse;
     private startWs;
     private startWsReverse;
     stop(force?: boolean): Promise<void>;
     format(_: any, data: any): any;
-    system_online(data: any): void;
     dispatch(data: any): Promise<void>;
     private _formatEvent;
     private addMsgToDB;
@@ -68,7 +66,7 @@ export declare class V11 extends Service<"V11"> implements OneBot.Base {
     /**
      * 限速队列调用
      */
-    protected _runQueue(): Promise<void>;
+    _runQueue(): Promise<void>;
 }
 export declare namespace V11 {
     interface Result<T extends any> {
@@ -81,8 +79,8 @@ export declare namespace V11 {
     function ok<T extends any>(data: T, retcode?: number, pending?: boolean): Result<T>;
     function error(error: string, retcode?: number): Result<any>;
     const defaultConfig: Config;
-    function genMetaEvent(uin: number, type: string): {
-        self_id: number;
+    function genMetaEvent(uin: string, type: string): {
+        self_id: string | number;
         time: number;
         post_type: string;
         meta_event_type: string;
@@ -108,4 +106,37 @@ export declare namespace V11 {
         http_reverse?: (string | Config.HttpReverseConfig)[];
         ws_reverse?: string[];
     }
+    type Payload<T = Dict> = {
+        [P in string | symbol]: any;
+    } & T;
+    type SelfInfo = {
+        status: OneBotStatus;
+        nickname: string;
+    };
+    interface GroupInfo {
+        group_id: number;
+        group_name: string;
+    }
+    interface UserInfo {
+        user_id: number;
+        user_name: string;
+    }
+    interface GroupMemberInfo {
+        group_id: number;
+        user_id: number;
+        user_name: string;
+    }
+    interface Message {
+    }
+    interface Segment {
+        type: string;
+        data: Dict;
+    }
+    interface MessageElement {
+        type: string;
+        data: Dict;
+    }
+    interface MessageRet {
+        message_id: number;
+    }
 }

package/lib/service/V11/index.js

@@ -1,68 +1,49 @@
 "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;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.V11 = void 0;
+const action_1 = require("./action");
 const onebot_1 = require("../../onebot");
-const app_1 = require("../../server/app");
-const service_1 = require("../../service");
+const crypto_1 = __importDefault(require("crypto"));
+const ws_1 = require("ws");
+const url_1 = require("url");
 const utils_1 = require("../../utils");
-const crypto = __importStar(require("crypto"));
-const fs_1 = require("fs");
+const onebot_2 = require("../../onebot");
 const http_1 = __importDefault(require("http"));
 const https_1 = __importDefault(require("https"));
-const icqq_1 = require("icqq");
-const icqq_cq_enable_1 = require("icqq-cq-enable");
+const db_sqlite_1 = require("./db_sqlite");
 const path_1 = require("path");
-const url_1 = require("url");
-const ws_1 = require("ws");
-const action_1 = require("./action");
+const app_1 = require("../../server/app");
 const db_entities_1 = require("./db_entities");
-const db_sqlite_1 = require("./db_sqlite");
+const service_1 = require("../../service");
 const sendMsgTypes = ["private", "group", "discuss"];
 const sendMsgMethodRegex = new RegExp(`send_(${sendMsgTypes.join("|")})_msg`);
 class V11 extends service_1.Service {
-    constructor(oneBot, client, config) {
-        super(config);
+    constructor(oneBot, config) {
+        super(oneBot.adapter, config);
         this.oneBot = oneBot;
-        this.client = client;
-        this.version = "V11";
+        this.config = config;
+        this.version = 'V11';
         this.timestamp = Date.now();
         this._queue = [];
         this.queue_running = false;
         this.wsr = new Set();
         this.action = new action_1.Action();
-        this.logger = this.oneBot.app.getLogger(this.oneBot.uin, this.version);
-        this.db = new db_sqlite_1.Database((0, path_1.join)(app_1.App.configDir, "data", this.oneBot.uin + ".db"), this.logger);
+        this.logger = this.oneBot.adapter.getLogger(this.oneBot.uin, this.version);
+        this.db = new db_sqlite_1.Database((0, path_1.join)(app_1.App.configDir, 'data', this.oneBot.uin + '.db'), this.logger);
+        this.oneBot.on('online', async () => {
+            this.logger.info("【好友列表】");
+            const friendList = await this.oneBot.getFriendList('V11');
+            friendList.forEach((item) => this.logger.info(`\t${item.user_name}(${item.user_id})`));
+            this.logger.info("【群列表】");
+            const groupList = await this.oneBot.getGroupList('V11');
+            groupList.forEach(item => this.logger.info(`\t${item.group_name}(${item.group_id})`));
+            this.logger.info('');
+        });
     }
-    start(path) {
-        this.path = `/${this.oneBot.uin}`;
-        if (path)
-            this.path += path;
+    start() {
         if (this.config.use_http)
             this.startHttp();
         if (this.config.use_ws)
@@ -106,13 +87,32 @@ class V11 extends service_1.Service {
                 });
             }
         });
+        this.on("dispatch", (serialized) => {
+            for (const ws of this.wss.clients) {
+                ws.send(serialized, (err) => {
+                    if (err)
+                        this.logger.error(`正向WS(${ws.url})上报事件失败: ` + err.message);
+                    else
+                        this.logger.debug(`正向WS(${ws.url})上报事件成功: ` + serialized);
+                });
+            }
+            for (const ws of this.wsr) {
+                ws.send(serialized, (err) => {
+                    if (err) {
+                        this.logger.error(`反向WS(${ws.url})上报事件失败: ` + err.message);
+                    }
+                    else
+                        this.logger.debug(`反向WS(${ws.url})上报事件成功: ` + serialized);
+                });
+            }
+        });
         if (this.config.heartbeat) {
             this.heartbeat = setInterval(() => {
                 this.dispatch({
                     self_id: this.oneBot.uin,
                     status: {
-                        online: this.client.status === icqq_1.OnlineStatus.Online,
-                        good: this.oneBot.status === onebot_1.OneBotStatus.Good,
+                        online: this.adapter.getSelfInfo(this.oneBot.uin, 'V11').status === onebot_1.OneBotStatus.Online,
+                        good: this.oneBot.status === onebot_1.OneBotStatus.Good
                     },
                     time: Math.floor(Date.now() / 1000),
                     post_type: "meta_event",
@@ -121,14 +121,25 @@ class V11 extends service_1.Service {
                 });
             }, this.config.heartbeat * 1000);
         }
+        this.adapter.on('message.receive', (uin, event) => {
+            const payload = this.adapter.formatEventPayload('V11', 'message', event);
+            this.dispatch(payload);
+        });
+        this.adapter.on('notice.receive', (uin, event) => {
+            const payload = this.adapter.formatEventPayload('V11', 'notice', event);
+            this.dispatch(payload);
+        });
+        this.adapter.on('request.receive', (uin, event) => {
+            const payload = this.adapter.formatEventPayload('V11', 'request', event);
+            this.dispatch(payload);
+        });
     }
     startHttp() {
         this.oneBot.app.router.all(new RegExp(`^${this.path}/(.*)$`), this._httpRequestHandler.bind(this));
         this.logger.mark(`开启http服务器成功，监听:http://127.0.0.1:${this.oneBot.app.config.port}${this.path}`);
     }
     startHttpReverse(config) {
-        this.on("dispatch", (unserialized) => {
-            const serialized = JSON.stringify(unserialized);
+        this.on("dispatch", (serialized) => {
             const options = {
                 method: "POST",
                 timeout: this.config.post_timeout * 1000,
@@ -142,7 +153,7 @@ class V11 extends service_1.Service {
             if (this.config.secret) {
                 //@ts-ignore
                 options.headers["X-Signature"] =
-                    "sha1=" + crypto.createHmac("sha1", String(this.config.secret)).update(serialized).digest("hex");
+                    "sha1=" + crypto_1.default.createHmac("sha1", String(this.config.secret)).update(serialized).digest("hex");
             }
             const protocol = config.url.startsWith("https") ? https_1.default : http_1.default;
             try {
@@ -158,7 +169,7 @@ class V11 extends service_1.Service {
                         if (!data)
                             return;
                         try {
-                            this._quickOperate(unserialized, JSON.parse(data));
+                            this._quickOperate(JSON.parse(serialized), JSON.parse(data));
                         }
                         catch (e) {
                             this.logger.error(`快速操作遇到错误：` + e.message);
@@ -207,43 +218,29 @@ class V11 extends service_1.Service {
         this._createWsr(url);
     }
     async stop(force) {
-        if (this.client.status === icqq_1.OnlineStatus.Online) {
-            await this.client.terminate();
+        for (const ws of this.wss.clients) {
+            ws.close();
         }
-        if (force) {
-            (0, fs_1.rmSync)(this.client.dir, { force: true, recursive: true });
+        this.wss.close();
+        for (const ws of this.wsr) {
+            ws.close();
         }
     }
     format(_, data) {
         return data;
     }
-    system_online(data) {
-        this.logger.info("【好友列表】");
-        this.client.fl.forEach((item) => this.logger.info(`\t${item.nickname}(${item.user_id})`));
-        this.logger.info("【群列表】");
-        this.client.gl.forEach((item) => this.logger.info(`\t${item.group_name}(${item.group_id})`));
-        this.logger.info("");
-    }
     async dispatch(data) {
-        data.post_type = data.post_type || "system";
-        if (data.message && data.post_type === "message") {
-            if (this.config.post_message_format === "array") {
-                data.message = (0, icqq_cq_enable_1.toSegment)(data.message);
-                if (data.source) {
-                    // reply
+        data.post_type = data.post_type || 'system';
+        if (data.message && data.post_type === 'message') {
+            if (this.config.post_message_format === 'array') {
+                data.message = this.adapter.toSegment('V11', data.message);
+                if (data.source) { // reply
                     let msg0 = data.message[0];
                     msg0.data["id"] = await this.getReplyMsgIdFromDB(data);
                 }
             }
             else {
-                if (data.source) {
-                    data.message.shift();
-                    // segment 更好用, cq 一般只用来显示，就不存储真实id了, 有需求的自己去改
-                    data.message = (0, icqq_cq_enable_1.toCqcode)(data).replace(/^(\[CQ:reply,id=)(.+?)\]/, `$1${data.source.seq}]`);
-                }
-                else {
-                    data.message = (0, icqq_cq_enable_1.toCqcode)(data);
-                }
+                data.message = this.adapter.toCqcode("V11", data.message);
             }
         }
         if (data.message_id) {
@@ -265,20 +262,15 @@ class V11 extends service_1.Service {
         this.emit("dispatch", this._formatEvent(data));
     }
     _formatEvent(data) {
-        if (data.post_type === "notice") {
+        if (data.post_type === 'notice') {
             // console.log(JSON.stringify(data))
             const data1 = { ...data };
             if (data.notice_type === "group") {
                 delete data1.group;
                 delete data1.member;
                 switch (data.sub_type) {
-                    case "decrease":
-                        data1.sub_type =
-                            data.operator_id === data.user_id
-                                ? "leave"
-                                : data.user_id === this.client.uin
-                                    ? "kick_me"
-                                    : "kick";
+                    case 'decrease':
+                        data1.sub_type = data.operator_id === data.user_id ? 'leave' : data.user_id === this.oneBot.uin ? 'kick_me' : 'kick';
                         data1.notice_type = `${data.notice_type}_${data.sub_type}`;
                         break;
                     case "increase":
@@ -343,7 +335,7 @@ class V11 extends service_1.Service {
             msg.group_id = 0;
             msg.group_name = "";
         }
-        msg.content = data.cqCode;
+        msg.content = data.cqCode || data.message;
         return await this.db.addOrUpdateMsg(msg);
     }
     /**
@@ -453,7 +445,7 @@ class V11 extends service_1.Service {
             }
             catch (e) {
                 let code, message;
-                if (e instanceof onebot_1.NotFoundError) {
+                if (e instanceof onebot_2.NotFoundError) {
                     code = 1404;
                     message = "不支持的api";
                 }
@@ -521,20 +513,20 @@ class V11 extends service_1.Service {
                     return;
                 const action = event.message_type === "private" ? "sendPrivateMsg" : "sendGroupMsg";
                 const id = event.message_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, res.auto_escape]);
             }
             if (event.message_type === "group") {
                 if (res.delete)
-                    this.client.deleteMsg(event.message_id);
+                    this.adapter.deleteMessage(this.oneBot.uin, 'V11', [event.message_id]);
                 if (res.kick && !event.anonymous)
-                    this.client.setGroupKick(event.group_id, event.user_id, res.reject_add_request);
+                    this.adapter.call(this.oneBot.uin, 'V11', 'setGroupKick', [event.group_id, event.user_id, res.reject_add_request]);
                 if (res.ban)
-                    this.client.setGroupBan(event.group_id, event.user_id, res.ban_duration > 0 ? res.ban_duration : 1800);
+                    this.adapter.call(this.oneBot.uin, 'V11', 'setGroupBan', [event.group_id, event.user_id, res.ban_duration > 0 ? res.ban_duration : 1800]);
             }
         }
         if (event.post_type === "request" && "approve" in res) {
             const action = event.request_type === "friend" ? "setFriendAddRequest" : "setGroupAddRequest";
-            this.client[action](event.flag, res.approve, res.reason ? res.reason : "", !!res.block);
+            this.adapter.call(this.oneBot.uin, 'V11', action, [event.flag, res.approve, res.reason ? res.reason : "", !!res.block]);
         }
     }
     /**
@@ -565,89 +557,75 @@ class V11 extends service_1.Service {
             action = "send_user_like";
         }
         const method = (0, utils_1.toHump)(action);
-        if (!Reflect.has(this.action, method))
-            throw new onebot_1.NotFoundError();
-        const processOBMessage = (message) => {
-            if (typeof message === "string")
-                message = (0, icqq_cq_enable_1.fromCqcode)(message);
-            const [firstSeg] = message;
-            if (firstSeg.type == "music" && firstSeg?.data?.type) {
-                firstSeg.data.platform = firstSeg.data.type;
-                delete firstSeg.data.type;
-            }
-            return (0, icqq_cq_enable_1.fromSegment)(message);
-        };
-        for (const key of Object.keys(params)) {
-            if (onebot_1.BOOLS.includes(key))
-                params[key] = (0, utils_1.toBool)(params[key]);
-            else if (key === "message") {
-                const message = processOBMessage(params[key]);
-                const replyFilter = (e) => e.type === "reply";
-                const replyElem = message.find(replyFilter);
-                const messageId = replyElem?.id ?? replyElem?.message_id;
-                if (messageId)
-                    params.message_id = messageId;
-                params.message = message.filter((e) => !replyFilter(e));
-            }
-        }
-        if (action === "get_msg")
-            params.onebot_id = params.message_id;
-        if (typeof params.message_id === "number" || /^\d+$/.test(params.message_id)) {
-            params.message_id = (await this.db.getMsgById(params.message_id)).base64_id; // 调用api时把本地的数字id转为base64发给icqq
-        }
-        // this.logger.info(`处理过后的请求 params: `, params)
-        const orgArgNameList = String(Reflect.get(this.action, method))
-            .match(/\(.*\)/)?.[0]
-            .replace("(", "")
-            .replace(")", "")
-            .split(",")
-            .filter(Boolean)
-            .map((v) => v.replace(/=.+/, "").trim());
-        const args = orgArgNameList.map((k) => params[k]);
-        // this.logger.info(`Action 原参数名列表: `, orgArgNameList)
-        // this.logger.info(`处理后的 Action 参数列表: `, args)
-        let ret, result;
-        if (is_queue) {
-            this._queue.push({ method, args });
-            this._runQueue();
-            result = V11.ok(null, 0, true);
-        }
-        else {
-            try {
-                ret = await this.action[method].apply(this, args);
+        if (Reflect.has(this.action, method)) {
+            const ARGS = String(Reflect.get(this.action, method)).match(/\(.*\)/)?.[0]
+                .replace("(", "")
+                .replace(")", "")
+                .split(",")
+                .filter(Boolean).map(v => v.replace(/=.+/, "").trim());
+            const args = [];
+            for (let k of ARGS) {
+                if (Reflect.has(params, k)) {
+                    if (onebot_2.BOOLS.includes(k))
+                        params[k] = (0, utils_1.toBool)(params[k]);
+                    if (k === 'message') {
+                        if (typeof params[k] === 'string') {
+                            if (/[CQ:music,type=.+,id=.+]/.test(params[k])) {
+                                params[k] = params[k].replace(',type=', ',platform=');
+                            }
+                            params[k] = this.adapter.fromCqcode('V11', params[k]);
+                        }
+                        else {
+                            if (params[k][0].type == 'music' && params[k][0]?.data?.type) {
+                                params[k][0].data.platform = params[k][0].data.type;
+                                delete params[k][0].data.type;
+                            }
+                            params[k] = this.adapter.fromSegment('V11', params[k]);
+                        }
+                        params['message_id'] = params[k].find(e => e.type === 'reply')?.message_id;
+                    }
+                    args.push(params[k]);
+                }
             }
-            catch (e) {
-                this.logger.error(e);
-                const err = V11.error(e.message);
-                if (echo)
-                    err.echo = echo;
-                return JSON.stringify(err);
+            let ret, result;
+            if (is_queue) {
+                this._queue.push({ method, args });
+                this._runQueue();
+                result = V11.ok(null, 0, true);
             }
-            if (ret instanceof Promise) {
-                if (is_async) {
-                    result = V11.ok(null, 0, true);
+            else {
+                try {
+                    ret = await this.action[method].apply(this, args);
+                }
+                catch (e) {
+                    return JSON.stringify(V11.error(e.message));
+                }
+                if (ret instanceof Promise) {
+                    if (is_async) {
+                        result = V11.ok(null, 0, true);
+                    }
+                    else {
+                        result = V11.ok(await ret, 0, false);
+                    }
                 }
                 else {
                     result = V11.ok(await ret, 0, false);
                 }
             }
-            else {
-                result = V11.ok(await ret, 0, false);
+            if (result.data instanceof Map)
+                result.data = [...result.data.values()];
+            if (result.data?.message)
+                result.data.message = this.adapter.toSegment('V11', result.data.message);
+            // send_msg_xxx 时提前把数据写入数据库(也有可能来的比message慢，后来的话会被数据库忽略)
+            if (result.status === "ok" && action.match(sendMsgMethodRegex) && result.data?.message_id && result.data?.seq) {
+                result.data.message_id = await this.addMsgToDBFromSendMsgResult(this.oneBot.uin, // msg send resp uin is always bot uin
+                params.group_id || 0, result.data.seq, result.data.message_id);
             }
+            if (echo) {
+                result.echo = echo;
+            }
+            return JSON.stringify(result);
         }
-        if (result.data instanceof Map)
-            result.data = [...result.data.values()];
-        if (result.data?.message)
-            result.data.message = (0, icqq_cq_enable_1.toSegment)(result.data.message);
-        // send_msg_xxx 时提前把数据写入数据库(也有可能来的比message慢，后来的话会被数据库忽略)
-        if (result.status === "ok" && action.match(sendMsgMethodRegex) && result.data?.message_id && result.data?.seq) {
-            result.data.message_id = await this.addMsgToDBFromSendMsgResult(this.client.uin, // msg send resp uin is always bot uin
-            params.group_id || 0, result.data.seq, result.data.message_id);
-        }
-        if (echo) {
-            result.echo = echo;
-        }
-        return JSON.stringify(result);
     }
     /**
      * 限速队列调用
@@ -704,7 +682,7 @@ exports.V11 = V11;
     };
     function genMetaEvent(uin, type) {
         return {
-            self_id: uin,
+            self_id: Number.isNaN(parseInt(uin)) ? uin : parseInt(uin),
             time: Math.floor(Date.now() / 1000),
             post_type: "meta_event",
             meta_event_type: "lifecycle",