@alemonjs/qq-bot 0.0.5 → 0.0.7
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/lib/api.js +2 -1
- package/lib/client.js +2 -2
- package/lib/from.js +4 -4
- package/lib/index.js +14 -7
- package/package.json +1 -2
package/lib/api.js
CHANGED
|
@@ -103,7 +103,8 @@ class QQBotAPI {
|
|
|
103
103
|
// 如果映射表大小超过 100,则删除最早添加的 MessageId
|
|
104
104
|
if (this.#map.size > 100) {
|
|
105
105
|
const firstKey = this.#map.keys().next().value;
|
|
106
|
-
|
|
106
|
+
if (firstKey)
|
|
107
|
+
this.#map.delete(firstKey);
|
|
107
108
|
}
|
|
108
109
|
return seq;
|
|
109
110
|
}
|
package/lib/client.js
CHANGED
|
@@ -196,10 +196,10 @@ class QQBotClient extends QQBotAPI {
|
|
|
196
196
|
// 重连5次,超过5次不再重连
|
|
197
197
|
if (this.#count > 5)
|
|
198
198
|
return;
|
|
199
|
-
//
|
|
199
|
+
// 1.3s 后重连
|
|
200
200
|
setTimeout(() => {
|
|
201
201
|
reconnect();
|
|
202
|
-
},
|
|
202
|
+
}, 1300);
|
|
203
203
|
});
|
|
204
204
|
this.#ws.on('error', e => {
|
|
205
205
|
this.#error(e);
|
package/lib/from.js
CHANGED
|
@@ -21,18 +21,18 @@ async function createPicFrom(image, name = 'image.jpg') {
|
|
|
21
21
|
// 是 buffer
|
|
22
22
|
}
|
|
23
23
|
else if (Buffer.isBuffer(image)) {
|
|
24
|
-
const
|
|
24
|
+
const file = await fileTypeFromBuffer(image);
|
|
25
25
|
if (!name)
|
|
26
|
-
name = 'file.' + ext;
|
|
26
|
+
name = 'file.' + file?.ext;
|
|
27
27
|
picData = new Readable();
|
|
28
28
|
picData.push(image);
|
|
29
29
|
picData.push(null);
|
|
30
30
|
// 是 文件流
|
|
31
31
|
}
|
|
32
32
|
else if (isReadable(image)) {
|
|
33
|
-
const
|
|
33
|
+
const file = await fileTypeFromStream(image);
|
|
34
34
|
if (!name)
|
|
35
|
-
name = 'file.' + ext;
|
|
35
|
+
name = 'file.' + file?.ext;
|
|
36
36
|
picData = image;
|
|
37
37
|
}
|
|
38
38
|
else {
|
package/lib/index.js
CHANGED
|
@@ -12,8 +12,10 @@ const client = new Proxy({}, {
|
|
|
12
12
|
});
|
|
13
13
|
const platform = 'qq-bot';
|
|
14
14
|
var index = defineBot(() => {
|
|
15
|
-
|
|
16
|
-
|
|
15
|
+
let value = getConfigValue();
|
|
16
|
+
if (!value)
|
|
17
|
+
value = {};
|
|
18
|
+
const config = value[platform];
|
|
17
19
|
const client = new QQBotClient({
|
|
18
20
|
secret: config?.secret,
|
|
19
21
|
app_id: config?.app_id,
|
|
@@ -55,6 +57,7 @@ var index = defineBot(() => {
|
|
|
55
57
|
});
|
|
56
58
|
// 定义消
|
|
57
59
|
const e = {
|
|
60
|
+
name: 'message.create',
|
|
58
61
|
// 事件类型
|
|
59
62
|
Platform: platform,
|
|
60
63
|
// guild
|
|
@@ -107,6 +110,7 @@ var index = defineBot(() => {
|
|
|
107
110
|
});
|
|
108
111
|
// 定义消
|
|
109
112
|
const e = {
|
|
113
|
+
name: 'private.message.create',
|
|
110
114
|
// 事件类型
|
|
111
115
|
Platform: platform,
|
|
112
116
|
// 用户Id
|
|
@@ -163,11 +167,12 @@ var index = defineBot(() => {
|
|
|
163
167
|
});
|
|
164
168
|
// 定义消
|
|
165
169
|
const e = {
|
|
170
|
+
name: 'private.message.create',
|
|
166
171
|
// 事件类型
|
|
167
172
|
Platform: platform,
|
|
168
173
|
//
|
|
169
|
-
GuildId: event.guild_id,
|
|
170
|
-
ChannelId: event.channel_id,
|
|
174
|
+
// GuildId: event.guild_id,
|
|
175
|
+
// ChannelId: event.channel_id,
|
|
171
176
|
// 用户Id
|
|
172
177
|
UserId: event?.author?.id ?? '',
|
|
173
178
|
UserKey,
|
|
@@ -177,7 +182,7 @@ var index = defineBot(() => {
|
|
|
177
182
|
IsBot: event.author?.bot,
|
|
178
183
|
// message
|
|
179
184
|
MessageId: event.id,
|
|
180
|
-
MessageText: msg,
|
|
185
|
+
MessageText: msg?.trim(),
|
|
181
186
|
OpenId: event.guild_id,
|
|
182
187
|
CreateAt: Date.now(),
|
|
183
188
|
//
|
|
@@ -222,6 +227,7 @@ var index = defineBot(() => {
|
|
|
222
227
|
});
|
|
223
228
|
// 定义消
|
|
224
229
|
const e = {
|
|
230
|
+
name: 'message.create',
|
|
225
231
|
// 事件类型
|
|
226
232
|
Platform: platform,
|
|
227
233
|
GuildId: event.guild_id,
|
|
@@ -235,7 +241,7 @@ var index = defineBot(() => {
|
|
|
235
241
|
IsBot: event.author?.bot,
|
|
236
242
|
// message
|
|
237
243
|
MessageId: event.id,
|
|
238
|
-
MessageText: msg,
|
|
244
|
+
MessageText: msg?.trim(),
|
|
239
245
|
OpenId: event.guild_id,
|
|
240
246
|
CreateAt: Date.now(),
|
|
241
247
|
//
|
|
@@ -306,6 +312,7 @@ var index = defineBot(() => {
|
|
|
306
312
|
});
|
|
307
313
|
// 定义消
|
|
308
314
|
const e = {
|
|
315
|
+
name: 'message.create',
|
|
309
316
|
// 事件类型
|
|
310
317
|
Platform: platform,
|
|
311
318
|
//
|
|
@@ -319,7 +326,7 @@ var index = defineBot(() => {
|
|
|
319
326
|
IsBot: false,
|
|
320
327
|
// message
|
|
321
328
|
MessageId: event.id,
|
|
322
|
-
MessageText: msg,
|
|
329
|
+
MessageText: msg?.trim(),
|
|
323
330
|
OpenId: event.guild_id,
|
|
324
331
|
CreateAt: Date.now(),
|
|
325
332
|
//
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@alemonjs/qq-bot",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.7",
|
|
4
4
|
"description": "qq-bot",
|
|
5
5
|
"author": "lemonade",
|
|
6
6
|
"license": "MIT",
|
|
@@ -26,7 +26,6 @@
|
|
|
26
26
|
"@noble/curves": "^1.7.0"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
|
-
"alemonjs": "^2.0.0-rc.77",
|
|
30
29
|
"@rollup/plugin-typescript": "^11.1.6",
|
|
31
30
|
"lvyjs": "^0.2.13",
|
|
32
31
|
"rollup": "^4.18.1",
|