onebots 0.4.56 → 0.4.58
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/lib/adapter.d.ts +2 -0
- package/lib/adapter.js +7 -0
- package/lib/adapters/dingtalk/index.js +3 -0
- package/lib/adapters/icqq/index.js +3 -0
- package/lib/adapters/qq/index.js +3 -0
- package/lib/adapters/wechat/index.js +3 -0
- package/lib/service/V12/index.js +2 -5
- package/package.json +3 -2
package/README.md
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
[](https://12.onebot.dev/) [](https://nodejs.org)
|
|
7
7
|
[](https://jq.qq.com/?_wv=1027&k=B22VGXov)
|
|
8
8
|
|
|
9
|
-
[
|
|
9
|
+
[Docs](https://docs.onebots.org)
|
|
10
10
|
|
|
11
11
|
</p>
|
|
12
12
|
</div>
|
package/lib/adapter.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ import { App } from "./server/app";
|
|
|
4
4
|
import { OneBot } from "./onebot";
|
|
5
5
|
import { Dict } from "@zhinjs/shared";
|
|
6
6
|
import { Logger } from "log4js";
|
|
7
|
+
import { V11 } from "./service/V11";
|
|
7
8
|
export declare abstract class Adapter<T extends string = string> extends EventEmitter {
|
|
8
9
|
#private;
|
|
9
10
|
app: App;
|
|
@@ -12,6 +13,7 @@ export declare abstract class Adapter<T extends string = string> extends EventEm
|
|
|
12
13
|
oneBots: Map<string, OneBot>;
|
|
13
14
|
icon: string;
|
|
14
15
|
protected constructor(app: App, platform: T, config: Adapter.Configs[T]);
|
|
16
|
+
transformMessage(uin: string, version: OneBot.Version, message: any): string | (import("./service/V12").V12.Segment | V11.Segment)[];
|
|
15
17
|
getOneBot<C = any>(uin: string): OneBot<C>;
|
|
16
18
|
get logger(): Logger;
|
|
17
19
|
get info(): {
|
package/lib/adapter.js
CHANGED
|
@@ -24,6 +24,13 @@ class Adapter extends events_1.EventEmitter {
|
|
|
24
24
|
this.oneBots = new Map();
|
|
25
25
|
_Adapter_logger.set(this, void 0);
|
|
26
26
|
}
|
|
27
|
+
transformMessage(uin, version, message) {
|
|
28
|
+
const onebot = this.getOneBot(uin);
|
|
29
|
+
const instance = onebot.instances.find(V => V.version === version);
|
|
30
|
+
return instance.config.post_message_format === "string"
|
|
31
|
+
? this.toCqcode(version, message)
|
|
32
|
+
: this.toSegment(version, message);
|
|
33
|
+
}
|
|
27
34
|
getOneBot(uin) {
|
|
28
35
|
return this.oneBots.get(uin);
|
|
29
36
|
}
|
|
@@ -248,6 +248,9 @@ class DingtalkAdapter extends adapter_1.Adapter {
|
|
|
248
248
|
message_id: `${data.message_type}:${data.group_id || data.user_id}:${data.message_id}`,
|
|
249
249
|
};
|
|
250
250
|
delete result.bot;
|
|
251
|
+
if (event === "message") {
|
|
252
|
+
result.message = this.transformMessage(uin, version, result.message);
|
|
253
|
+
}
|
|
251
254
|
if (version === "V11") {
|
|
252
255
|
oneBot.V11.transformStrToIntForObj(result, ["user_id", "group_id", "message_id"]);
|
|
253
256
|
}
|
|
@@ -184,6 +184,9 @@ class IcqqAdapter extends adapter_1.Adapter {
|
|
|
184
184
|
data.message.unshift(replyEl);
|
|
185
185
|
}
|
|
186
186
|
}
|
|
187
|
+
if (event === "message") {
|
|
188
|
+
result.message = this.transformMessage(uin, version, result.message);
|
|
189
|
+
}
|
|
187
190
|
if (version === "V11" && result.message_id) {
|
|
188
191
|
result.message_id = oneBot.V11.transformToInt("message_id", result.message_id);
|
|
189
192
|
}
|
package/lib/adapters/qq/index.js
CHANGED
|
@@ -274,6 +274,9 @@ class QQAdapter extends adapter_1.Adapter {
|
|
|
274
274
|
}
|
|
275
275
|
delete result.bot;
|
|
276
276
|
const oneBot = this.getOneBot(uin);
|
|
277
|
+
if (event === "message") {
|
|
278
|
+
result.message = this.transformMessage(uin, version, result.message);
|
|
279
|
+
}
|
|
277
280
|
switch (version) {
|
|
278
281
|
case "V11":
|
|
279
282
|
oneBot.V11.transformStrToIntForObj(result, ["message_id", "user_id", "group_id"]);
|
|
@@ -281,6 +281,9 @@ class WechatAdapter extends adapter_1.Adapter {
|
|
|
281
281
|
delete result.bot;
|
|
282
282
|
delete result.c;
|
|
283
283
|
delete result.parser;
|
|
284
|
+
if (event === "message") {
|
|
285
|
+
result.message = this.transformMessage(uin, version, result.message);
|
|
286
|
+
}
|
|
284
287
|
if (version === "V11") {
|
|
285
288
|
bot.V11.transformStrToIntForObj(result, ["user_id", "group_id", "message_id"]);
|
|
286
289
|
bot.V11.transformStrToIntForObj(result.self, ["user_id"]);
|
package/lib/service/V12/index.js
CHANGED
|
@@ -620,14 +620,11 @@ class V12 extends service_1.Service {
|
|
|
620
620
|
if (config.access_token)
|
|
621
621
|
remoteUrl += `?access_token=${config.access_token}`;
|
|
622
622
|
const headers = {
|
|
623
|
-
"
|
|
624
|
-
"X-Client-Role": "Universal",
|
|
625
|
-
"User-Agent": `OneBot/12 (${this.oneBot.platform}) Node-onebots/V12`,
|
|
626
|
-
"Sec-WebSocket-Protocol": "12.onebots.v" + utils_1.version,
|
|
623
|
+
"User-Agent": `OneBot/12 (${this.oneBot.platform}) onebots/${utils_1.version}`,
|
|
627
624
|
};
|
|
628
625
|
if (config.access_token)
|
|
629
626
|
headers.Authorization = "Bearer " + config.access_token;
|
|
630
|
-
const ws = new ws_1.WebSocket(remoteUrl, { headers });
|
|
627
|
+
const ws = new ws_1.WebSocket(remoteUrl, ["12.OneBots"], { headers });
|
|
631
628
|
ws.on("error", err => {
|
|
632
629
|
this.logger.error(err.message);
|
|
633
630
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "onebots",
|
|
3
|
-
"version": "0.4.
|
|
3
|
+
"version": "0.4.58",
|
|
4
4
|
"description": "基于icqq的多例oneBot实现",
|
|
5
5
|
"engines": {
|
|
6
6
|
"node": ">=16"
|
|
@@ -56,6 +56,7 @@
|
|
|
56
56
|
"unplugin-auto-import": "^0.17.3",
|
|
57
57
|
"unplugin-vue-components": "^0.26.0",
|
|
58
58
|
"vite": "^5.0.10",
|
|
59
|
+
"vite-plugin-style-import": "^2.0.0",
|
|
59
60
|
"vitepress": "^1.0.0-rc.33",
|
|
60
61
|
"vue": "^3.4.0",
|
|
61
62
|
"vue-router": "^4.2.5"
|
|
@@ -83,6 +84,6 @@
|
|
|
83
84
|
"koa-static": "^5.0.0",
|
|
84
85
|
"log4js": "^6.5.2",
|
|
85
86
|
"reflect-metadata": "^0.1.13",
|
|
86
|
-
"ws": "^8.
|
|
87
|
+
"ws": "^8.16.0"
|
|
87
88
|
}
|
|
88
89
|
}
|