@zhin.js/adapter-napcat 0.1.13 → 0.1.15
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 +36 -13
- package/README.md +121 -0
- package/client/NapCatManagement.tsx +113 -0
- package/client/index.tsx +11 -0
- package/client/tsconfig.json +7 -0
- package/client/utils/api.ts +30 -0
- package/dist/index.js +27 -0
- package/lib/adapter.d.ts +3 -0
- package/lib/adapter.d.ts.map +1 -1
- package/lib/adapter.js +5 -2
- package/lib/adapter.js.map +1 -1
- package/lib/agent-prompt.d.ts +3 -0
- package/lib/agent-prompt.d.ts.map +1 -0
- package/lib/agent-prompt.js +107 -0
- package/lib/agent-prompt.js.map +1 -0
- package/lib/bot-base.d.ts +6 -1
- package/lib/bot-base.d.ts.map +1 -1
- package/lib/bot-base.js +35 -1
- package/lib/bot-base.js.map +1 -1
- package/lib/bot-http.d.ts +2 -1
- package/lib/bot-http.d.ts.map +1 -1
- package/lib/bot-http.js +23 -1
- package/lib/bot-http.js.map +1 -1
- package/lib/bot-ws-client.d.ts +2 -0
- package/lib/bot-ws-client.d.ts.map +1 -1
- package/lib/bot-ws-client.js +32 -0
- package/lib/bot-ws-client.js.map +1 -1
- package/lib/bot-ws-server.d.ts +2 -1
- package/lib/bot-ws-server.d.ts.map +1 -1
- package/lib/bot-ws-server.js +14 -0
- package/lib/bot-ws-server.js.map +1 -1
- package/lib/index.d.ts +5 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +22 -1
- package/lib/index.js.map +1 -1
- package/lib/napcat-inbound.d.ts +21 -0
- package/lib/napcat-inbound.d.ts.map +1 -0
- package/lib/napcat-inbound.js +55 -0
- package/lib/napcat-inbound.js.map +1 -0
- package/lib/onebot-get-msg.d.ts +3 -0
- package/lib/onebot-get-msg.d.ts.map +1 -0
- package/lib/onebot-get-msg.js +27 -0
- package/lib/onebot-get-msg.js.map +1 -0
- package/lib/routes.d.ts +4 -0
- package/lib/routes.d.ts.map +1 -0
- package/lib/routes.js +61 -0
- package/lib/routes.js.map +1 -0
- package/lib/types.d.ts +18 -0
- package/lib/types.d.ts.map +1 -1
- package/lib/typing-indicator.d.ts +45 -0
- package/lib/typing-indicator.d.ts.map +1 -0
- package/lib/typing-indicator.js +132 -0
- package/lib/typing-indicator.js.map +1 -0
- package/package.json +22 -6
- package/plugin.yml +1 -1
- package/src/adapter.ts +3 -3
- package/src/agent-prompt.ts +115 -0
- package/src/bot-base.ts +36 -1
- package/src/bot-http.ts +19 -1
- package/src/bot-ws-client.ts +34 -0
- package/src/bot-ws-server.ts +16 -1
- package/src/index.ts +41 -2
- package/src/napcat-inbound.ts +57 -0
- package/src/onebot-get-msg.ts +33 -0
- package/src/routes.ts +61 -0
- package/src/types.ts +13 -0
- package/src/typing-indicator.ts +183 -0
package/lib/bot-base.d.ts
CHANGED
|
@@ -3,13 +3,15 @@
|
|
|
3
3
|
* 子类只需实现 callApi / $connect / $disconnect，其余 API 方法和事件处理全部复用。
|
|
4
4
|
*/
|
|
5
5
|
import { EventEmitter } from 'events';
|
|
6
|
-
import { Bot, Message, SendOptions } from 'zhin.js';
|
|
6
|
+
import { Bot, Message, SendOptions, type QuotedMessagePayload } from 'zhin.js';
|
|
7
7
|
import type { NapCatBotConfig, NapCatMessageEvent, MessageSegment } from './types.js';
|
|
8
8
|
import type { NapCatAdapter } from './adapter.js';
|
|
9
|
+
import { InboundMessageDeduper } from './napcat-inbound.js';
|
|
9
10
|
export declare abstract class NapCatBotBase extends EventEmitter implements Bot<NapCatBotConfig, NapCatMessageEvent> {
|
|
10
11
|
adapter: NapCatAdapter;
|
|
11
12
|
$config: NapCatBotConfig;
|
|
12
13
|
$connected: boolean;
|
|
14
|
+
protected readonly inboundDeduper: InboundMessageDeduper;
|
|
13
15
|
get logger(): import("zhin.js").Logger;
|
|
14
16
|
get $id(): string;
|
|
15
17
|
constructor(adapter: NapCatAdapter, $config: NapCatBotConfig);
|
|
@@ -19,6 +21,8 @@ export declare abstract class NapCatBotBase extends EventEmitter implements Bot<
|
|
|
19
21
|
$formatMessage(ev: NapCatMessageEvent): Message<NapCatMessageEvent>;
|
|
20
22
|
$sendMessage(options: SendOptions): Promise<string>;
|
|
21
23
|
$recallMessage(id: string): Promise<void>;
|
|
24
|
+
$addReaction(messageId: string, emojiId: string): Promise<string>;
|
|
25
|
+
$removeReaction(messageId: string, _reactionId: string): Promise<void>;
|
|
22
26
|
protected dispatchEvent(event: any): void;
|
|
23
27
|
private handleMessage;
|
|
24
28
|
private handleNotice;
|
|
@@ -30,6 +34,7 @@ export declare abstract class NapCatBotBase extends EventEmitter implements Bot<
|
|
|
30
34
|
}>;
|
|
31
35
|
deleteMsg(messageId: number): Promise<any>;
|
|
32
36
|
getMsg(messageId: number): Promise<any>;
|
|
37
|
+
$getMsg(messageId: string): Promise<QuotedMessagePayload>;
|
|
33
38
|
getForwardMsg(id: string): Promise<any>;
|
|
34
39
|
sendLike(userId: number, times?: number): Promise<any>;
|
|
35
40
|
setGroupKick(groupId: number, userId: number, rejectAddRequest?: boolean): Promise<any>;
|
package/lib/bot-base.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bot-base.d.ts","sourceRoot":"","sources":["../src/bot-base.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EACL,GAAG,EACH,OAAO,EACP,WAAW,
|
|
1
|
+
{"version":3,"file":"bot-base.d.ts","sourceRoot":"","sources":["../src/bot-base.ts"],"names":[],"mappings":"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"}
|
package/lib/bot-base.js
CHANGED
|
@@ -4,10 +4,13 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { EventEmitter } from 'events';
|
|
6
6
|
import { Message, segment, Notice, Request, } from 'zhin.js';
|
|
7
|
+
import { parseOneBotGetMsgResponse } from './onebot-get-msg.js';
|
|
8
|
+
import { InboundMessageDeduper, isSelfMessage, normalizeMessage, resolveSideEventDedupeKey } from './napcat-inbound.js';
|
|
7
9
|
export class NapCatBotBase extends EventEmitter {
|
|
8
10
|
adapter;
|
|
9
11
|
$config;
|
|
10
12
|
$connected = false;
|
|
13
|
+
inboundDeduper = new InboundMessageDeduper();
|
|
11
14
|
get logger() { return this.adapter.plugin.logger; }
|
|
12
15
|
get $id() { return this.$config.name; }
|
|
13
16
|
constructor(adapter, $config) {
|
|
@@ -19,6 +22,9 @@ export class NapCatBotBase extends EventEmitter {
|
|
|
19
22
|
// 消息格式化
|
|
20
23
|
// ══════════════════════════════════════════════════════════════════
|
|
21
24
|
$formatMessage(ev) {
|
|
25
|
+
const content = normalizeMessage(ev.message);
|
|
26
|
+
const quoteId = Message.quoteIdFromContent(content);
|
|
27
|
+
Message.alignReplySegments(content, quoteId);
|
|
22
28
|
const message = Message.from(ev, {
|
|
23
29
|
$id: ev.message_id.toString(),
|
|
24
30
|
$adapter: 'napcat',
|
|
@@ -32,7 +38,8 @@ export class NapCatBotBase extends EventEmitter {
|
|
|
32
38
|
id: (ev.group_id || ev.user_id).toString(),
|
|
33
39
|
type: ev.group_id ? 'group' : 'private',
|
|
34
40
|
},
|
|
35
|
-
$content:
|
|
41
|
+
$content: content,
|
|
42
|
+
$quote_id: quoteId,
|
|
36
43
|
$raw: ev.raw_message,
|
|
37
44
|
$timestamp: ev.time,
|
|
38
45
|
$recall: async () => { await this.deleteMsg(ev.message_id); },
|
|
@@ -67,6 +74,16 @@ export class NapCatBotBase extends EventEmitter {
|
|
|
67
74
|
async $recallMessage(id) {
|
|
68
75
|
await this.deleteMsg(parseInt(id));
|
|
69
76
|
}
|
|
77
|
+
async $addReaction(messageId, emojiId) {
|
|
78
|
+
await this.setMsgEmojiLike(parseInt(messageId), emojiId);
|
|
79
|
+
return `reaction:${messageId}:${emojiId}`;
|
|
80
|
+
}
|
|
81
|
+
async $removeReaction(messageId, _reactionId) {
|
|
82
|
+
// NapCat 的 set_msg_emoji_like 是 toggle 行为，再调一次即取消
|
|
83
|
+
const parts = _reactionId.split(':');
|
|
84
|
+
const emojiId = parts[2] || parts[0];
|
|
85
|
+
await this.setMsgEmojiLike(parseInt(messageId), emojiId);
|
|
86
|
+
}
|
|
70
87
|
// ══════════════════════════════════════════════════════════════════
|
|
71
88
|
// 事件分发
|
|
72
89
|
// ══════════════════════════════════════════════════════════════════
|
|
@@ -84,11 +101,20 @@ export class NapCatBotBase extends EventEmitter {
|
|
|
84
101
|
}
|
|
85
102
|
}
|
|
86
103
|
handleMessage(ev) {
|
|
104
|
+
if (isSelfMessage(ev))
|
|
105
|
+
return;
|
|
106
|
+
const msgId = ev.message_id.toString();
|
|
107
|
+
if (!this.inboundDeduper.shouldProcess(msgId))
|
|
108
|
+
return;
|
|
109
|
+
ev.message = normalizeMessage(ev.message);
|
|
87
110
|
const message = this.$formatMessage(ev);
|
|
88
111
|
this.adapter.emit('message.receive', message);
|
|
89
112
|
this.logger.debug(`${this.$id} recv ${message.$channel.type}(${message.$channel.id}):${segment.raw(message.$content)}`);
|
|
90
113
|
}
|
|
91
114
|
handleNotice(event) {
|
|
115
|
+
const dedupeKey = resolveSideEventDedupeKey(event, 'notice');
|
|
116
|
+
if (!this.inboundDeduper.shouldProcess(dedupeKey))
|
|
117
|
+
return;
|
|
92
118
|
const noticeTypeMap = {
|
|
93
119
|
group_increase: 'group_member_increase',
|
|
94
120
|
group_decrease: 'group_member_decrease',
|
|
@@ -131,6 +157,9 @@ export class NapCatBotBase extends EventEmitter {
|
|
|
131
157
|
}
|
|
132
158
|
}
|
|
133
159
|
handleRequest(event) {
|
|
160
|
+
const dedupeKey = resolveSideEventDedupeKey(event, 'request');
|
|
161
|
+
if (!this.inboundDeduper.shouldProcess(dedupeKey))
|
|
162
|
+
return;
|
|
134
163
|
const typeMap = {
|
|
135
164
|
friend: 'friend_add',
|
|
136
165
|
group: event.sub_type === 'invite' ? 'group_invite' : 'group_add',
|
|
@@ -169,6 +198,11 @@ export class NapCatBotBase extends EventEmitter {
|
|
|
169
198
|
}
|
|
170
199
|
async deleteMsg(messageId) { return this.callApi('delete_msg', { message_id: messageId }); }
|
|
171
200
|
async getMsg(messageId) { return this.callApi('get_msg', { message_id: messageId }); }
|
|
201
|
+
async $getMsg(messageId) {
|
|
202
|
+
const idParam = /^\d+$/.test(messageId) ? Number(messageId) : messageId;
|
|
203
|
+
const data = await this.callApi('get_msg', { message_id: idParam });
|
|
204
|
+
return parseOneBotGetMsgResponse(messageId, data);
|
|
205
|
+
}
|
|
172
206
|
async getForwardMsg(id) { return this.callApi('get_forward_msg', { id }); }
|
|
173
207
|
async sendLike(userId, times = 1) { return this.callApi('send_like', { user_id: userId, times }); }
|
|
174
208
|
// 群管理
|
package/lib/bot-base.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bot-base.js","sourceRoot":"","sources":["../src/bot-base.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"bot-base.js","sourceRoot":"","sources":["../src/bot-base.ts"],"names":[],"mappings":"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"}
|
package/lib/bot-http.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { NapCatBotBase } from './bot-base.js';
|
|
2
2
|
import type { NapCatHttpConfig } from './types.js';
|
|
3
3
|
import type { NapCatAdapter } from './adapter.js';
|
|
4
|
-
import { type Router } from '@zhin.js/
|
|
4
|
+
import { type Router } from '@zhin.js/host-router/router';
|
|
5
5
|
export declare class NapCatHttpBot extends NapCatBotBase {
|
|
6
6
|
router: Router;
|
|
7
7
|
private pollTimer?;
|
|
@@ -13,5 +13,6 @@ export declare class NapCatHttpBot extends NapCatBotBase {
|
|
|
13
13
|
private mountWebhook;
|
|
14
14
|
private checkConnection;
|
|
15
15
|
private startPoll;
|
|
16
|
+
private initTypingIndicator;
|
|
16
17
|
}
|
|
17
18
|
//# sourceMappingURL=bot-http.d.ts.map
|
package/lib/bot-http.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bot-http.d.ts","sourceRoot":"","sources":["../src/bot-http.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAe,MAAM,YAAY,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAsB,KAAK,MAAM,EAAsB,MAAM,
|
|
1
|
+
{"version":3,"file":"bot-http.d.ts","sourceRoot":"","sources":["../src/bot-http.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAe,MAAM,YAAY,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAsB,KAAK,MAAM,EAAsB,MAAM,6BAA6B,CAAC;AAIlG,qBAAa,aAAc,SAAQ,aAAa;IAKH,MAAM,EAAE,MAAM;IAJzD,OAAO,CAAC,SAAS,CAAC,CAAiB;IAE3B,OAAO,EAAE,gBAAgB,CAAC;gBAEtB,OAAO,EAAE,aAAa,EAAS,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB;IAI7E,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IASzB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAM5B,OAAO,CAAC,CAAC,GAAG,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAcpF,OAAO,CAAC,YAAY;YA0BN,eAAe;IAQ7B,OAAO,CAAC,SAAS;IAYjB,OAAO,CAAC,mBAAmB;CAW5B"}
|
package/lib/bot-http.js
CHANGED
|
@@ -5,8 +5,9 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { formatCompact } from 'zhin.js';
|
|
7
7
|
import { NapCatBotBase } from './bot-base.js';
|
|
8
|
-
import { registerFetchRoute } from '@zhin.js/
|
|
8
|
+
import { registerFetchRoute } from '@zhin.js/host-router/router';
|
|
9
9
|
import * as crypto from 'crypto';
|
|
10
|
+
import { enableTypingIndicator } from './typing-indicator.js';
|
|
10
11
|
export class NapCatHttpBot extends NapCatBotBase {
|
|
11
12
|
router;
|
|
12
13
|
pollTimer;
|
|
@@ -19,6 +20,7 @@ export class NapCatHttpBot extends NapCatBotBase {
|
|
|
19
20
|
await this.checkConnection();
|
|
20
21
|
this.startPoll();
|
|
21
22
|
this.$connected = true;
|
|
23
|
+
this.initTypingIndicator();
|
|
22
24
|
this.logger.info(formatCompact({ bot: this.$id, mode: 'http' }));
|
|
23
25
|
}
|
|
24
26
|
async $disconnect() {
|
|
@@ -26,6 +28,7 @@ export class NapCatHttpBot extends NapCatBotBase {
|
|
|
26
28
|
clearInterval(this.pollTimer);
|
|
27
29
|
this.pollTimer = undefined;
|
|
28
30
|
}
|
|
31
|
+
this.inboundDeduper.clear();
|
|
29
32
|
this.$connected = false;
|
|
30
33
|
}
|
|
31
34
|
async callApi(action, params = {}) {
|
|
@@ -53,6 +56,7 @@ export class NapCatHttpBot extends NapCatBotBase {
|
|
|
53
56
|
}
|
|
54
57
|
if (this.$config.access_token) {
|
|
55
58
|
const sig = ctx.get('x-signature');
|
|
59
|
+
const authHeader = ctx.get('authorization');
|
|
56
60
|
if (sig) {
|
|
57
61
|
const expected = 'sha1=' + crypto.createHmac('sha1', this.$config.access_token).update(JSON.stringify(body)).digest('hex');
|
|
58
62
|
if (sig !== expected) {
|
|
@@ -61,6 +65,13 @@ export class NapCatHttpBot extends NapCatBotBase {
|
|
|
61
65
|
return;
|
|
62
66
|
}
|
|
63
67
|
}
|
|
68
|
+
else if (authHeader) {
|
|
69
|
+
if (authHeader !== `Bearer ${this.$config.access_token}`) {
|
|
70
|
+
ctx.status = 403;
|
|
71
|
+
ctx.body = { error: 'auth failed' };
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
64
75
|
}
|
|
65
76
|
ctx.status = 204;
|
|
66
77
|
ctx.body = '';
|
|
@@ -93,5 +104,16 @@ export class NapCatHttpBot extends NapCatBotBase {
|
|
|
93
104
|
}
|
|
94
105
|
}, interval);
|
|
95
106
|
}
|
|
107
|
+
initTypingIndicator() {
|
|
108
|
+
const tiConfig = this.$config.typingIndicator;
|
|
109
|
+
if (tiConfig && tiConfig.enabled !== false) {
|
|
110
|
+
enableTypingIndicator(this, {
|
|
111
|
+
enabled: true,
|
|
112
|
+
defaultEmoji: tiConfig.defaultEmoji || '128516',
|
|
113
|
+
autoRemove: true,
|
|
114
|
+
removeDelay: 5000,
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
}
|
|
96
118
|
}
|
|
97
119
|
//# sourceMappingURL=bot-http.js.map
|
package/lib/bot-http.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bot-http.js","sourceRoot":"","sources":["../src/bot-http.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAG9C,OAAO,EAAE,kBAAkB,EAAmC,MAAM,
|
|
1
|
+
{"version":3,"file":"bot-http.js","sourceRoot":"","sources":["../src/bot-http.ts"],"names":[],"mappings":"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"}
|
package/lib/bot-ws-client.d.ts
CHANGED
|
@@ -15,5 +15,7 @@ export declare class NapCatWsClient extends NapCatBotBase {
|
|
|
15
15
|
private handleWsMessage;
|
|
16
16
|
private startHeartbeat;
|
|
17
17
|
private scheduleReconnect;
|
|
18
|
+
protected handleMeta(event: any): void;
|
|
19
|
+
private initTypingIndicator;
|
|
18
20
|
}
|
|
19
21
|
//# sourceMappingURL=bot-ws-client.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bot-ws-client.d.ts","sourceRoot":"","sources":["../src/bot-ws-client.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,oBAAoB,EAAe,MAAM,YAAY,CAAC;AACpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"bot-ws-client.d.ts","sourceRoot":"","sources":["../src/bot-ws-client.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,oBAAoB,EAAe,MAAM,YAAY,CAAC;AACpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAGlD,qBAAa,cAAe,SAAQ,aAAa;IAC/C,OAAO,CAAC,EAAE,CAAC,CAAY;IACvB,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,eAAe,CAIlB;IAEG,OAAO,EAAE,oBAAoB,CAAC;gBAE1B,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,oBAAoB;IAI1D,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IA0DzB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAU5B,OAAO,CAAC,CAAC,GAAG,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAUpF,OAAO,CAAC,eAAe;IAYvB,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,iBAAiB;IASzB,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,GAAG,IAAI;IAMtC,OAAO,CAAC,mBAAmB;CAwB5B"}
|
package/lib/bot-ws-client.js
CHANGED
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
import WebSocket from 'ws';
|
|
5
5
|
import { formatCompact } from 'zhin.js';
|
|
6
6
|
import { NapCatBotBase } from './bot-base.js';
|
|
7
|
+
import { enableTypingIndicator } from './typing-indicator.js';
|
|
7
8
|
export class NapCatWsClient extends NapCatBotBase {
|
|
8
9
|
ws;
|
|
9
10
|
reconnectTimer;
|
|
@@ -31,6 +32,7 @@ export class NapCatWsClient extends NapCatBotBase {
|
|
|
31
32
|
}
|
|
32
33
|
this.logger.info(formatCompact({ bot: this.$id, mode: 'ws' }));
|
|
33
34
|
this.startHeartbeat();
|
|
35
|
+
this.initTypingIndicator();
|
|
34
36
|
resolve();
|
|
35
37
|
});
|
|
36
38
|
this.ws.on('message', (data) => {
|
|
@@ -84,6 +86,7 @@ export class NapCatWsClient extends NapCatBotBase {
|
|
|
84
86
|
this.ws.close();
|
|
85
87
|
this.ws = undefined;
|
|
86
88
|
}
|
|
89
|
+
this.inboundDeduper.clear();
|
|
87
90
|
this.$connected = false;
|
|
88
91
|
}
|
|
89
92
|
async callApi(action, params = {}) {
|
|
@@ -129,5 +132,34 @@ export class NapCatWsClient extends NapCatBotBase {
|
|
|
129
132
|
}
|
|
130
133
|
}, interval);
|
|
131
134
|
}
|
|
135
|
+
handleMeta(event) {
|
|
136
|
+
if (event.meta_event_type === 'lifecycle' && event.sub_type === 'connect') {
|
|
137
|
+
this.logger.info(formatCompact({ bot: this.$id, lifecycle: 'connect', self_id: event.self_id }));
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
initTypingIndicator() {
|
|
141
|
+
const tiConfig = this.$config.typingIndicator;
|
|
142
|
+
if (tiConfig && tiConfig.enabled !== false) {
|
|
143
|
+
enableTypingIndicator(this, {
|
|
144
|
+
enabled: tiConfig.enabled ?? true,
|
|
145
|
+
defaultEmoji: tiConfig.defaultEmoji || '128516',
|
|
146
|
+
autoRemove: true,
|
|
147
|
+
removeDelay: 5000,
|
|
148
|
+
privateConfig: tiConfig.privateConfig ? {
|
|
149
|
+
type: tiConfig.privateConfig.type || 'message',
|
|
150
|
+
message: tiConfig.privateConfig.message || '正在思考中...',
|
|
151
|
+
autoRemove: true,
|
|
152
|
+
removeDelay: 3000,
|
|
153
|
+
} : undefined,
|
|
154
|
+
groupConfig: tiConfig.groupConfig ? {
|
|
155
|
+
type: tiConfig.groupConfig.type || 'reaction',
|
|
156
|
+
emoji: tiConfig.groupConfig.emoji || '128516',
|
|
157
|
+
autoRemove: true,
|
|
158
|
+
removeDelay: 5000,
|
|
159
|
+
} : undefined,
|
|
160
|
+
});
|
|
161
|
+
this.logger.info(formatCompact({ bot: this.$id, typingIndicator: 'enabled' }));
|
|
162
|
+
}
|
|
163
|
+
}
|
|
132
164
|
}
|
|
133
165
|
//# sourceMappingURL=bot-ws-client.js.map
|
package/lib/bot-ws-client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bot-ws-client.js","sourceRoot":"","sources":["../src/bot-ws-client.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,SAAS,MAAM,IAAI,CAAC;AAC3B,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"bot-ws-client.js","sourceRoot":"","sources":["../src/bot-ws-client.ts"],"names":[],"mappings":"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"}
|
package/lib/bot-ws-server.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { NapCatBotBase } from './bot-base.js';
|
|
2
2
|
import type { NapCatWsServerConfig } from './types.js';
|
|
3
3
|
import type { NapCatAdapter } from './adapter.js';
|
|
4
|
-
import type { Router } from '@zhin.js/
|
|
4
|
+
import type { Router } from '@zhin.js/host-router';
|
|
5
5
|
export declare class NapCatWsServer extends NapCatBotBase {
|
|
6
6
|
#private;
|
|
7
7
|
router: Router;
|
|
@@ -16,5 +16,6 @@ export declare class NapCatWsServer extends NapCatBotBase {
|
|
|
16
16
|
private getFirstSelfId;
|
|
17
17
|
private handleWsMessage;
|
|
18
18
|
private startHeartbeat;
|
|
19
|
+
private initTypingIndicator;
|
|
19
20
|
}
|
|
20
21
|
//# sourceMappingURL=bot-ws-server.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bot-ws-server.d.ts","sourceRoot":"","sources":["../src/bot-ws-server.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,oBAAoB,EAAe,MAAM,YAAY,CAAC;AACpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"bot-ws-server.d.ts","sourceRoot":"","sources":["../src/bot-ws-server.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,oBAAoB,EAAe,MAAM,YAAY,CAAC;AACpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAGnD,qBAAa,cAAe,SAAQ,aAAa;;IAaJ,MAAM,EAAE,MAAM;IAVzD,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,eAAe,CAIlB;IAEG,OAAO,EAAE,oBAAoB,CAAC;gBAE1B,OAAO,EAAE,aAAa,EAAS,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB;IAIjF,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IA6CzB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAS5B,OAAO,CAAC,CAAC,GAAG,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAYpF,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,eAAe;IA2BvB,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,mBAAmB;CAW5B"}
|
package/lib/bot-ws-server.js
CHANGED
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
import WebSocket from 'ws';
|
|
5
5
|
import { formatCompact } from 'zhin.js';
|
|
6
6
|
import { NapCatBotBase } from './bot-base.js';
|
|
7
|
+
import { enableTypingIndicator } from './typing-indicator.js';
|
|
7
8
|
export class NapCatWsServer extends NapCatBotBase {
|
|
8
9
|
router;
|
|
9
10
|
#wss;
|
|
@@ -75,6 +76,7 @@ export class NapCatWsServer extends NapCatBotBase {
|
|
|
75
76
|
req.reject(new Error('Connection closed'));
|
|
76
77
|
}
|
|
77
78
|
this.pendingRequests.clear();
|
|
79
|
+
this.inboundDeduper.clear();
|
|
78
80
|
this.$connected = false;
|
|
79
81
|
}
|
|
80
82
|
async callApi(action, params = {}) {
|
|
@@ -117,6 +119,7 @@ export class NapCatWsServer extends NapCatBotBase {
|
|
|
117
119
|
this.#clientMap.set(String(message.self_id), client);
|
|
118
120
|
this.$connected = true;
|
|
119
121
|
this.logger.info(formatCompact({ bot: this.$id, self_id: message.self_id }));
|
|
122
|
+
this.initTypingIndicator();
|
|
120
123
|
return;
|
|
121
124
|
}
|
|
122
125
|
this.dispatchEvent(message);
|
|
@@ -132,5 +135,16 @@ export class NapCatWsServer extends NapCatBotBase {
|
|
|
132
135
|
}
|
|
133
136
|
}, interval);
|
|
134
137
|
}
|
|
138
|
+
initTypingIndicator() {
|
|
139
|
+
const tiConfig = this.$config.typingIndicator;
|
|
140
|
+
if (tiConfig && tiConfig.enabled !== false) {
|
|
141
|
+
enableTypingIndicator(this, {
|
|
142
|
+
enabled: true,
|
|
143
|
+
defaultEmoji: tiConfig.defaultEmoji || '128516',
|
|
144
|
+
autoRemove: true,
|
|
145
|
+
removeDelay: 5000,
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
}
|
|
135
149
|
}
|
|
136
150
|
//# sourceMappingURL=bot-ws-server.js.map
|
package/lib/bot-ws-server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bot-ws-server.js","sourceRoot":"","sources":["../src/bot-ws-server.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,SAA8B,MAAM,IAAI,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"bot-ws-server.js","sourceRoot":"","sources":["../src/bot-ws-server.ts"],"names":[],"mappings":"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"}
|
package/lib/index.d.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import type { Router } from '@zhin.js/host-router';
|
|
2
|
+
import { PageManager } from '@zhin.js/host-api';
|
|
1
3
|
import { NapCatAdapter } from './adapter.js';
|
|
2
4
|
export * from './types.js';
|
|
3
5
|
export { NapCatWsClient } from './bot-ws-client.js';
|
|
@@ -5,10 +7,12 @@ export { NapCatWsServer } from './bot-ws-server.js';
|
|
|
5
7
|
export { NapCatHttpBot } from './bot-http.js';
|
|
6
8
|
export { NapCatAdapter, type NapCatBot } from './adapter.js';
|
|
7
9
|
export { NapCatBotBase } from './bot-base.js';
|
|
10
|
+
export { NapCatTypingIndicatorManager, enableTypingIndicator, type NapCatTypingIndicatorConfig, } from './typing-indicator.js';
|
|
8
11
|
declare module 'zhin.js' {
|
|
9
12
|
namespace Plugin {
|
|
10
13
|
interface Contexts {
|
|
11
|
-
|
|
14
|
+
web: PageManager;
|
|
15
|
+
router: Router;
|
|
12
16
|
}
|
|
13
17
|
}
|
|
14
18
|
interface Adapters {
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAK7C,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EACL,4BAA4B,EAC5B,qBAAqB,EACrB,KAAK,2BAA2B,GACjC,MAAM,uBAAuB,CAAC;AAE/B,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAU,MAAM,CAAC;QACf,UAAU,QAAQ;YAChB,GAAG,EAAE,WAAW,CAAC;YACjB,MAAM,EAAE,MAAM,CAAC;SAChB;KACF;IACD,UAAU,QAAQ;QAChB,MAAM,EAAE,aAAa,CAAC;KACvB;CACF"}
|