@zhin.js/adapter-icqq 1.0.21 → 1.0.23
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/CHANGELOG.md +20 -0
- package/README.md +301 -24
- package/lib/index.d.ts +23 -8
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +83 -79
- package/lib/index.js.map +1 -1
- package/package.json +6 -9
- package/src/index.ts +262 -235
package/lib/index.js
CHANGED
|
@@ -1,48 +1,53 @@
|
|
|
1
1
|
import { Client } from "@icqqjs/icqq";
|
|
2
2
|
import path from "path";
|
|
3
|
-
import { usePlugin,
|
|
3
|
+
import { usePlugin, Adapter, Message, segment, } from "zhin.js";
|
|
4
4
|
const plugin = usePlugin();
|
|
5
|
+
const { useContext } = plugin;
|
|
5
6
|
export class IcqqBot extends Client {
|
|
6
|
-
|
|
7
|
-
|
|
7
|
+
adapter;
|
|
8
|
+
$connected = false;
|
|
9
|
+
get $id() {
|
|
10
|
+
return this.$config.name;
|
|
11
|
+
}
|
|
12
|
+
constructor(adapter, config) {
|
|
8
13
|
if (!config.scope)
|
|
9
|
-
config.scope =
|
|
14
|
+
config.scope = "icqqjs";
|
|
10
15
|
if (!config.data_dir)
|
|
11
|
-
config.data_dir = path.join(process.cwd(),
|
|
12
|
-
if (config.scope.startsWith(
|
|
16
|
+
config.data_dir = path.join(process.cwd(), "data");
|
|
17
|
+
if (config.scope.startsWith("@"))
|
|
13
18
|
config.scope = config.scope.slice(1);
|
|
14
19
|
super(config);
|
|
20
|
+
this.adapter = adapter;
|
|
15
21
|
this.$config = config;
|
|
16
22
|
}
|
|
17
23
|
handleIcqqMessage(msg) {
|
|
18
24
|
const message = this.$formatMessage(msg);
|
|
19
|
-
|
|
20
|
-
plugin.logger.
|
|
21
|
-
plugin.dispatch(`message.${message.$channel.type}.receive`, message);
|
|
25
|
+
this.adapter.emit("message.receive", message);
|
|
26
|
+
plugin.logger.debug(`${this.$config.name} recv ${message.$channel.type}(${message.$channel.id}):${segment.raw(message.$content)}`);
|
|
22
27
|
}
|
|
23
28
|
async $connect() {
|
|
24
|
-
this.on(
|
|
25
|
-
this.on(
|
|
29
|
+
this.on("message", this.handleIcqqMessage.bind(this));
|
|
30
|
+
this.on("system.login.device", async (e) => {
|
|
26
31
|
await this.sendSmsCode();
|
|
27
|
-
plugin.logger.info(
|
|
28
|
-
process.stdin.once(
|
|
32
|
+
plugin.logger.info("请输入短信验证码:");
|
|
33
|
+
process.stdin.once("data", (data) => {
|
|
29
34
|
this.submitSmsCode(data.toString().trim());
|
|
30
35
|
});
|
|
31
36
|
});
|
|
32
|
-
this.on(
|
|
37
|
+
this.on("system.login.qrcode", (e) => {
|
|
33
38
|
plugin.logger.info(`取码地址：${e.image}\n请扫码完成后回车继续:`);
|
|
34
|
-
process.stdin.once(
|
|
39
|
+
process.stdin.once("data", () => {
|
|
35
40
|
this.login();
|
|
36
41
|
});
|
|
37
42
|
});
|
|
38
|
-
this.on(
|
|
43
|
+
this.on("system.login.slider", (e) => {
|
|
39
44
|
plugin.logger.info(`取码地址：${e.url}\n请输入滑块验证ticket:`);
|
|
40
|
-
process.stdin.once(
|
|
45
|
+
process.stdin.once("data", (e) => {
|
|
41
46
|
this.submitSlider(e.toString().trim());
|
|
42
47
|
});
|
|
43
48
|
});
|
|
44
49
|
return new Promise((resolve) => {
|
|
45
|
-
this.once(
|
|
50
|
+
this.once("system.online", () => {
|
|
46
51
|
this.$connected = true;
|
|
47
52
|
resolve();
|
|
48
53
|
});
|
|
@@ -56,15 +61,15 @@ export class IcqqBot extends Client {
|
|
|
56
61
|
$formatMessage(msg) {
|
|
57
62
|
const result = Message.from(msg, {
|
|
58
63
|
$id: msg.message_id.toString(),
|
|
59
|
-
$adapter:
|
|
64
|
+
$adapter: "icqq",
|
|
60
65
|
$bot: `${this.$config.name}`,
|
|
61
66
|
$sender: {
|
|
62
67
|
id: msg.sender.user_id.toString(),
|
|
63
68
|
name: msg.sender.nickname.toString(),
|
|
64
69
|
},
|
|
65
70
|
$channel: {
|
|
66
|
-
id: msg.message_type ===
|
|
67
|
-
type: msg.message_type
|
|
71
|
+
id: msg.message_type === "group" ? msg.group_id.toString() : msg.from_id.toString(),
|
|
72
|
+
type: msg.message_type,
|
|
68
73
|
},
|
|
69
74
|
$content: IcqqBot.toSegments(msg.message),
|
|
70
75
|
$raw: msg.raw_message,
|
|
@@ -76,14 +81,14 @@ export class IcqqBot extends Client {
|
|
|
76
81
|
if (!Array.isArray(content))
|
|
77
82
|
content = [content];
|
|
78
83
|
if (quote)
|
|
79
|
-
content.unshift({ type:
|
|
84
|
+
content.unshift({ type: "reply", data: { id: typeof quote === "boolean" ? result.$id : quote } });
|
|
80
85
|
return await this.$sendMessage({
|
|
81
86
|
...result.$channel,
|
|
82
|
-
context:
|
|
87
|
+
context: "icqq",
|
|
83
88
|
bot: `${this.uin}`,
|
|
84
|
-
content
|
|
89
|
+
content,
|
|
85
90
|
});
|
|
86
|
-
}
|
|
91
|
+
},
|
|
87
92
|
});
|
|
88
93
|
return result;
|
|
89
94
|
}
|
|
@@ -91,19 +96,16 @@ export class IcqqBot extends Client {
|
|
|
91
96
|
await this.deleteMsg(id);
|
|
92
97
|
}
|
|
93
98
|
async $sendMessage(options) {
|
|
94
|
-
options = await plugin.app.handleBeforeSend(options);
|
|
95
99
|
switch (options.type) {
|
|
96
|
-
case
|
|
100
|
+
case "private": {
|
|
97
101
|
const result = await this.sendPrivateMsg(Number(options.id), IcqqBot.toSendable(options.content));
|
|
98
|
-
plugin.logger.
|
|
102
|
+
plugin.logger.debug(`${this.$config.name} send ${options.type}(${options.id}):${segment.raw(options.content)}`);
|
|
99
103
|
return result.message_id.toString();
|
|
100
|
-
break;
|
|
101
104
|
}
|
|
102
105
|
case "group": {
|
|
103
106
|
const result = await this.sendGroupMsg(Number(options.id), IcqqBot.toSendable(options.content));
|
|
104
|
-
plugin.logger.
|
|
107
|
+
plugin.logger.debug(`${this.$config.name} send ${options.type}(${options.id}):${segment.raw(options.content)}`);
|
|
105
108
|
return result.message_id.toString();
|
|
106
|
-
break;
|
|
107
109
|
}
|
|
108
110
|
default:
|
|
109
111
|
throw new Error(`unsupported channel type ${options.type}`);
|
|
@@ -111,34 +113,17 @@ export class IcqqBot extends Client {
|
|
|
111
113
|
}
|
|
112
114
|
}
|
|
113
115
|
(function (IcqqBot) {
|
|
114
|
-
const allowTypes = [
|
|
115
|
-
'text',
|
|
116
|
-
'face',
|
|
117
|
-
'image',
|
|
118
|
-
'record',
|
|
119
|
-
'audio',
|
|
120
|
-
'dice',
|
|
121
|
-
'rps',
|
|
122
|
-
'video',
|
|
123
|
-
'file',
|
|
124
|
-
'location',
|
|
125
|
-
'share',
|
|
126
|
-
'json',
|
|
127
|
-
'at',
|
|
128
|
-
'reply',
|
|
129
|
-
'long_msg',
|
|
130
|
-
'button',
|
|
131
|
-
'markdown',
|
|
132
|
-
'xml',
|
|
133
|
-
];
|
|
116
|
+
const allowTypes = ["text", "face", "image", "record", "audio", "dice", "rps", "video", "file", "location", "share", "json", "at", "reply", "long_msg", "button", "markdown", "xml"];
|
|
134
117
|
function toSegments(message) {
|
|
135
118
|
if (!Array.isArray(message))
|
|
136
119
|
message = [message];
|
|
137
|
-
return message
|
|
138
|
-
|
|
139
|
-
|
|
120
|
+
return message
|
|
121
|
+
.filter((item, index) => {
|
|
122
|
+
return typeof item === "string" || item.type !== "long_msg" || index !== 0;
|
|
123
|
+
})
|
|
124
|
+
.map((item) => {
|
|
140
125
|
if (typeof item === "string")
|
|
141
|
-
return { type:
|
|
126
|
+
return { type: "text", data: { text: item } };
|
|
142
127
|
const { type, ...data } = item;
|
|
143
128
|
return { type, data };
|
|
144
129
|
});
|
|
@@ -149,39 +134,60 @@ export class IcqqBot extends Client {
|
|
|
149
134
|
content = [content];
|
|
150
135
|
return content.map((seg) => {
|
|
151
136
|
if (typeof seg === "string")
|
|
152
|
-
return { type:
|
|
137
|
+
return { type: "text", text: seg };
|
|
153
138
|
let { type, data } = seg;
|
|
154
|
-
if (typeof type ===
|
|
139
|
+
if (typeof type === "function")
|
|
155
140
|
type = type.name;
|
|
156
141
|
if (!allowTypes.includes(type))
|
|
157
|
-
return { type:
|
|
142
|
+
return { type: "text", text: segment.toString(seg) };
|
|
158
143
|
return { type, ...data };
|
|
159
144
|
});
|
|
160
145
|
}
|
|
161
146
|
IcqqBot.toSendable = toSendable;
|
|
162
147
|
})(IcqqBot || (IcqqBot = {}));
|
|
163
|
-
|
|
164
|
-
|
|
148
|
+
class IcqqAdapter extends Adapter {
|
|
149
|
+
constructor(plugin) {
|
|
150
|
+
super(plugin, "icqq", []);
|
|
151
|
+
}
|
|
152
|
+
createBot(config) {
|
|
153
|
+
return new IcqqBot(this, config);
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
const { provide } = usePlugin();
|
|
157
|
+
provide({
|
|
158
|
+
name: "icqq",
|
|
159
|
+
description: "ICQQ Adapter",
|
|
160
|
+
mounted: async (p) => {
|
|
161
|
+
const adapter = new IcqqAdapter(p);
|
|
162
|
+
await adapter.start();
|
|
163
|
+
return adapter;
|
|
164
|
+
},
|
|
165
|
+
dispose: async (adapter) => {
|
|
166
|
+
await adapter.stop();
|
|
167
|
+
},
|
|
168
|
+
});
|
|
169
|
+
useContext("web", (web) => {
|
|
165
170
|
// 注册ICQQ适配器的客户端入口文件
|
|
166
171
|
const dispose = web.addEntry({
|
|
167
|
-
production: path.resolve(import.meta.dirname,
|
|
168
|
-
development: path.resolve(import.meta.dirname,
|
|
172
|
+
production: path.resolve(import.meta.dirname, "../dist/index.js"),
|
|
173
|
+
development: path.resolve(import.meta.dirname, "../client/index.tsx"),
|
|
169
174
|
});
|
|
170
175
|
return dispose;
|
|
171
176
|
});
|
|
172
|
-
useContext(
|
|
173
|
-
|
|
177
|
+
useContext("router", async (router) => {
|
|
178
|
+
const icqq = plugin.root.inject("icqq");
|
|
179
|
+
router.get("/api/icqq/bots", async (ctx) => {
|
|
174
180
|
try {
|
|
175
181
|
const bots = Array.from(icqq.bots.values());
|
|
176
182
|
if (bots.length === 0) {
|
|
177
183
|
ctx.body = {
|
|
178
184
|
success: true,
|
|
179
185
|
data: [],
|
|
180
|
-
message:
|
|
186
|
+
message: "暂无ICQQ机器人实例",
|
|
181
187
|
};
|
|
182
188
|
return;
|
|
183
189
|
}
|
|
184
|
-
const result = bots.map(bot => {
|
|
190
|
+
const result = bots.map((bot) => {
|
|
185
191
|
try {
|
|
186
192
|
return {
|
|
187
193
|
name: bot.$config.name,
|
|
@@ -190,14 +196,13 @@ useContext('router', 'icqq', (router, icqq) => {
|
|
|
190
196
|
friendCount: bot.fl?.size || 0,
|
|
191
197
|
receiveCount: bot.stat?.recv_msg_cnt || 0,
|
|
192
198
|
sendCount: bot.stat?.sent_msg_cnt || 0,
|
|
193
|
-
loginMode: bot.$config.password ?
|
|
194
|
-
status: bot.$connected ?
|
|
195
|
-
lastActivity: new Date().toISOString()
|
|
199
|
+
loginMode: bot.$config.password ? "password" : "qrcode",
|
|
200
|
+
status: bot.$connected ? "online" : "offline",
|
|
201
|
+
lastActivity: new Date().toISOString(),
|
|
196
202
|
};
|
|
197
203
|
}
|
|
198
204
|
catch (botError) {
|
|
199
205
|
// 单个机器人数据获取失败时的处理
|
|
200
|
-
// 获取机器人数据失败，返回错误状态
|
|
201
206
|
return {
|
|
202
207
|
name: bot.$config.name,
|
|
203
208
|
connected: false,
|
|
@@ -205,27 +210,26 @@ useContext('router', 'icqq', (router, icqq) => {
|
|
|
205
210
|
friendCount: 0,
|
|
206
211
|
receiveCount: 0,
|
|
207
212
|
sendCount: 0,
|
|
208
|
-
loginMode:
|
|
209
|
-
status:
|
|
210
|
-
error:
|
|
213
|
+
loginMode: "unknown",
|
|
214
|
+
status: "error",
|
|
215
|
+
error: "数据获取失败",
|
|
211
216
|
};
|
|
212
217
|
}
|
|
213
218
|
});
|
|
214
219
|
ctx.body = {
|
|
215
220
|
success: true,
|
|
216
221
|
data: result,
|
|
217
|
-
timestamp: new Date().toISOString()
|
|
222
|
+
timestamp: new Date().toISOString(),
|
|
218
223
|
};
|
|
219
224
|
}
|
|
220
225
|
catch (error) {
|
|
221
|
-
// ICQQ API调用失败
|
|
222
226
|
ctx.status = 500;
|
|
223
227
|
ctx.body = {
|
|
224
228
|
success: false,
|
|
225
|
-
error:
|
|
226
|
-
message:
|
|
227
|
-
details: process.env.NODE_ENV ===
|
|
228
|
-
timestamp: new Date().toISOString()
|
|
229
|
+
error: "ICQQ_API_ERROR",
|
|
230
|
+
message: "获取机器人数据失败",
|
|
231
|
+
details: process.env.NODE_ENV === "development" ? error.message : undefined,
|
|
232
|
+
timestamp: new Date().toISOString(),
|
|
229
233
|
};
|
|
230
234
|
}
|
|
231
235
|
});
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zhin.js/adapter-icqq",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.23",
|
|
4
4
|
"description": "zhin adapter for icqq",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./lib/index.js",
|
|
@@ -43,11 +43,11 @@
|
|
|
43
43
|
"typescript": "^5.3.0"
|
|
44
44
|
},
|
|
45
45
|
"peerDependencies": {
|
|
46
|
-
"@zhin.js/
|
|
47
|
-
"@zhin.js/
|
|
48
|
-
"@zhin.js/console": "1.0.
|
|
49
|
-
"zhin.js": "1.0.
|
|
50
|
-
"
|
|
46
|
+
"@zhin.js/core": "1.0.18",
|
|
47
|
+
"@zhin.js/client": "1.0.6",
|
|
48
|
+
"@zhin.js/console": "1.0.14",
|
|
49
|
+
"@zhin.js/http": "1.0.9",
|
|
50
|
+
"zhin.js": "1.0.18"
|
|
51
51
|
},
|
|
52
52
|
"peerDependenciesMeta": {
|
|
53
53
|
"@zhin.js/client": {
|
|
@@ -58,9 +58,6 @@
|
|
|
58
58
|
},
|
|
59
59
|
"@zhin.js/console": {
|
|
60
60
|
"optional": true
|
|
61
|
-
},
|
|
62
|
-
"@zhin.js/types": {
|
|
63
|
-
"optional": true
|
|
64
61
|
}
|
|
65
62
|
},
|
|
66
63
|
"scripts": {
|