@zhin.js/adapter-napcat 1.0.0 → 2.0.0
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 +23 -0
- package/README.md +6 -6
- package/client/NapCatManagement.tsx +14 -14
- package/dist/index.js +1 -1
- package/lib/adapter.d.ts +16 -15
- package/lib/adapter.d.ts.map +1 -1
- package/lib/adapter.js +46 -45
- package/lib/adapter.js.map +1 -1
- package/lib/{bot-base.d.ts → endpoint-base.d.ts} +7 -7
- package/lib/endpoint-base.d.ts.map +1 -0
- package/lib/{bot-base.js → endpoint-base.js} +7 -7
- package/lib/endpoint-base.js.map +1 -0
- package/lib/{bot-http.d.ts → endpoint-http.d.ts} +3 -3
- package/lib/endpoint-http.d.ts.map +1 -0
- package/lib/{bot-http.js → endpoint-http.js} +7 -7
- package/lib/endpoint-http.js.map +1 -0
- package/lib/{bot-ws-client.d.ts → endpoint-ws-client.d.ts} +3 -3
- package/lib/endpoint-ws-client.d.ts.map +1 -0
- package/lib/{bot-ws-client.js → endpoint-ws-client.js} +9 -9
- package/lib/endpoint-ws-client.js.map +1 -0
- package/lib/{bot-ws-server.d.ts → endpoint-ws-server.d.ts} +3 -3
- package/lib/endpoint-ws-server.d.ts.map +1 -0
- package/lib/{bot-ws-server.js → endpoint-ws-server.js} +9 -9
- package/lib/endpoint-ws-server.js.map +1 -0
- package/lib/index.d.ts +5 -5
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +6 -5
- package/lib/index.js.map +1 -1
- package/lib/routes.js +14 -14
- package/lib/routes.js.map +1 -1
- package/lib/tools.d.ts.map +1 -1
- package/lib/tools.js +150 -150
- package/lib/tools.js.map +1 -1
- package/lib/types.d.ts +1 -1
- package/lib/types.d.ts.map +1 -1
- package/lib/typing-indicator.d.ts +6 -6
- package/lib/typing-indicator.d.ts.map +1 -1
- package/lib/typing-indicator.js +17 -17
- package/lib/typing-indicator.js.map +1 -1
- package/package.json +11 -9
- package/skills/napcat/PERMITS.md +19 -0
- package/skills/napcat/SKILL.md +4 -4
- package/src/adapter.ts +42 -40
- package/src/{bot-base.ts → endpoint-base.ts} +9 -9
- package/src/{bot-http.ts → endpoint-http.ts} +6 -6
- package/src/{bot-ws-client.ts → endpoint-ws-client.ts} +8 -8
- package/src/{bot-ws-server.ts → endpoint-ws-server.ts} +8 -8
- package/src/index.ts +7 -5
- package/src/routes.ts +14 -14
- package/src/tools.ts +153 -153
- package/src/types.ts +1 -1
- package/src/typing-indicator.ts +20 -20
- package/lib/bot-base.d.ts.map +0 -1
- package/lib/bot-base.js.map +0 -1
- package/lib/bot-http.d.ts.map +0 -1
- package/lib/bot-http.js.map +0 -1
- package/lib/bot-ws-client.d.ts.map +0 -1
- package/lib/bot-ws-client.js.map +0 -1
- package/lib/bot-ws-server.d.ts.map +0 -1
- package/lib/bot-ws-server.js.map +0 -1
|
@@ -4,11 +4,11 @@
|
|
|
4
4
|
* 入站:挂载 webhook 路由接收 NapCat 的 HTTP POST 事件上报
|
|
5
5
|
*/
|
|
6
6
|
import { formatCompact } from 'zhin.js';
|
|
7
|
-
import {
|
|
7
|
+
import { NapCatEndpointBase } from './endpoint-base.js';
|
|
8
8
|
import { registerFetchRoute } from '@zhin.js/host-router/router';
|
|
9
9
|
import * as crypto from 'crypto';
|
|
10
10
|
import { enableTypingIndicator } from './typing-indicator.js';
|
|
11
|
-
export class
|
|
11
|
+
export class NapCatHttpEndpoint extends NapCatEndpointBase {
|
|
12
12
|
router;
|
|
13
13
|
pollTimer;
|
|
14
14
|
constructor(adapter, router, config) {
|
|
@@ -21,7 +21,7 @@ export class NapCatHttpBot extends NapCatBotBase {
|
|
|
21
21
|
this.startPoll();
|
|
22
22
|
this.$connected = true;
|
|
23
23
|
this.initTypingIndicator();
|
|
24
|
-
this.logger.info(formatCompact({
|
|
24
|
+
this.logger.info(formatCompact({ endpoint: this.$id, mode: 'http' }));
|
|
25
25
|
}
|
|
26
26
|
async $disconnect() {
|
|
27
27
|
if (this.pollTimer) {
|
|
@@ -79,10 +79,10 @@ export class NapCatHttpBot extends NapCatBotBase {
|
|
|
79
79
|
this.dispatchEvent(body);
|
|
80
80
|
}
|
|
81
81
|
catch (e) {
|
|
82
|
-
this.logger.warn(formatCompact({ op: 'recv',
|
|
82
|
+
this.logger.warn(formatCompact({ op: 'recv', endpoint: this.$id, ok: false, error: String(e) }));
|
|
83
83
|
}
|
|
84
84
|
});
|
|
85
|
-
this.logger.info(formatCompact({ op: 'webhook',
|
|
85
|
+
this.logger.info(formatCompact({ op: 'webhook', endpoint: this.$id, path: postPath }));
|
|
86
86
|
}
|
|
87
87
|
async checkConnection() {
|
|
88
88
|
try {
|
|
@@ -100,7 +100,7 @@ export class NapCatHttpBot extends NapCatBotBase {
|
|
|
100
100
|
}
|
|
101
101
|
catch {
|
|
102
102
|
this.$connected = false;
|
|
103
|
-
this.logger.warn(formatCompact({ op: 'heartbeat',
|
|
103
|
+
this.logger.warn(formatCompact({ op: 'heartbeat', endpoint: this.$id, ok: false }));
|
|
104
104
|
}
|
|
105
105
|
}, interval);
|
|
106
106
|
}
|
|
@@ -116,4 +116,4 @@ export class NapCatHttpBot extends NapCatBotBase {
|
|
|
116
116
|
}
|
|
117
117
|
}
|
|
118
118
|
}
|
|
119
|
-
//# sourceMappingURL=
|
|
119
|
+
//# sourceMappingURL=endpoint-http.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"endpoint-http.js","sourceRoot":"","sources":["../src/endpoint-http.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { NapCatEndpointBase } from './endpoint-base.js';
|
|
2
2
|
import type { NapCatWsClientConfig } from './types.js';
|
|
3
3
|
import type { NapCatAdapter } from './adapter.js';
|
|
4
|
-
export declare class NapCatWsClient extends
|
|
4
|
+
export declare class NapCatWsClient extends NapCatEndpointBase {
|
|
5
5
|
private ws?;
|
|
6
6
|
private reconnectTimer?;
|
|
7
7
|
private heartbeatTimer?;
|
|
@@ -18,4 +18,4 @@ export declare class NapCatWsClient extends NapCatBotBase {
|
|
|
18
18
|
protected handleMeta(event: any): void;
|
|
19
19
|
private initTypingIndicator;
|
|
20
20
|
}
|
|
21
|
-
//# sourceMappingURL=
|
|
21
|
+
//# sourceMappingURL=endpoint-ws-client.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"endpoint-ws-client.d.ts","sourceRoot":"","sources":["../src/endpoint-ws-client.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,oBAAoB,EAAe,MAAM,YAAY,CAAC;AACpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAGlD,qBAAa,cAAe,SAAQ,kBAAkB;IACpD,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"}
|
|
@@ -3,9 +3,9 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import WebSocket from 'ws';
|
|
5
5
|
import { formatCompact } from 'zhin.js';
|
|
6
|
-
import {
|
|
6
|
+
import { NapCatEndpointBase } from './endpoint-base.js';
|
|
7
7
|
import { enableTypingIndicator } from './typing-indicator.js';
|
|
8
|
-
export class NapCatWsClient extends
|
|
8
|
+
export class NapCatWsClient extends NapCatEndpointBase {
|
|
9
9
|
ws;
|
|
10
10
|
reconnectTimer;
|
|
11
11
|
heartbeatTimer;
|
|
@@ -28,9 +28,9 @@ export class NapCatWsClient extends NapCatBotBase {
|
|
|
28
28
|
this.ws.on('open', () => {
|
|
29
29
|
this.$connected = true;
|
|
30
30
|
if (!this.$config.access_token) {
|
|
31
|
-
this.logger.warn(formatCompact({
|
|
31
|
+
this.logger.warn(formatCompact({ endpoint: this.$id, ok: false, error: 'missing access_token' }));
|
|
32
32
|
}
|
|
33
|
-
this.logger.info(formatCompact({
|
|
33
|
+
this.logger.info(formatCompact({ endpoint: this.$id, mode: 'ws' }));
|
|
34
34
|
this.startHeartbeat();
|
|
35
35
|
this.initTypingIndicator();
|
|
36
36
|
resolve();
|
|
@@ -49,7 +49,7 @@ export class NapCatWsClient extends NapCatBotBase {
|
|
|
49
49
|
const codeHint = code === 1005 ? ' [no status]' : code === 1006 ? ' [abnormal]' : '';
|
|
50
50
|
this.logger.warn(formatCompact({
|
|
51
51
|
op: 'disconnect',
|
|
52
|
-
|
|
52
|
+
endpoint: this.$id,
|
|
53
53
|
code,
|
|
54
54
|
error: reasonStr || 'closed',
|
|
55
55
|
reconnect_ms: this.$config.reconnect_interval || 5000,
|
|
@@ -60,7 +60,7 @@ export class NapCatWsClient extends NapCatBotBase {
|
|
|
60
60
|
this.ws.on('error', (error) => {
|
|
61
61
|
this.logger.warn(formatCompact({
|
|
62
62
|
op: 'ws_error',
|
|
63
|
-
|
|
63
|
+
endpoint: this.$id,
|
|
64
64
|
ok: false,
|
|
65
65
|
error: error instanceof Error ? error.message : String(error),
|
|
66
66
|
}));
|
|
@@ -134,7 +134,7 @@ export class NapCatWsClient extends NapCatBotBase {
|
|
|
134
134
|
}
|
|
135
135
|
handleMeta(event) {
|
|
136
136
|
if (event.meta_event_type === 'lifecycle' && event.sub_type === 'connect') {
|
|
137
|
-
this.logger.info(formatCompact({
|
|
137
|
+
this.logger.info(formatCompact({ endpoint: this.$id, lifecycle: 'connect', self_id: event.self_id }));
|
|
138
138
|
}
|
|
139
139
|
}
|
|
140
140
|
initTypingIndicator() {
|
|
@@ -158,8 +158,8 @@ export class NapCatWsClient extends NapCatBotBase {
|
|
|
158
158
|
removeDelay: 5000,
|
|
159
159
|
} : undefined,
|
|
160
160
|
});
|
|
161
|
-
this.logger.info(formatCompact({
|
|
161
|
+
this.logger.info(formatCompact({ endpoint: this.$id, typingIndicator: 'enabled' }));
|
|
162
162
|
}
|
|
163
163
|
}
|
|
164
164
|
}
|
|
165
|
-
//# sourceMappingURL=
|
|
165
|
+
//# sourceMappingURL=endpoint-ws-client.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"endpoint-ws-client.js","sourceRoot":"","sources":["../src/endpoint-ws-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { NapCatEndpointBase } from './endpoint-base.js';
|
|
2
2
|
import type { NapCatWsServerConfig } from './types.js';
|
|
3
3
|
import type { NapCatAdapter } from './adapter.js';
|
|
4
4
|
import type { Router } from '@zhin.js/host-router';
|
|
5
|
-
export declare class NapCatWsServer extends
|
|
5
|
+
export declare class NapCatWsServer extends NapCatEndpointBase {
|
|
6
6
|
#private;
|
|
7
7
|
router: Router;
|
|
8
8
|
private heartbeatTimer?;
|
|
@@ -18,4 +18,4 @@ export declare class NapCatWsServer extends NapCatBotBase {
|
|
|
18
18
|
private startHeartbeat;
|
|
19
19
|
private initTypingIndicator;
|
|
20
20
|
}
|
|
21
|
-
//# sourceMappingURL=
|
|
21
|
+
//# sourceMappingURL=endpoint-ws-server.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"endpoint-ws-server.d.ts","sourceRoot":"","sources":["../src/endpoint-ws-server.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,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,kBAAkB;;IAaT,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"}
|
|
@@ -3,9 +3,9 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import WebSocket from 'ws';
|
|
5
5
|
import { formatCompact } from 'zhin.js';
|
|
6
|
-
import {
|
|
6
|
+
import { NapCatEndpointBase } from './endpoint-base.js';
|
|
7
7
|
import { enableTypingIndicator } from './typing-indicator.js';
|
|
8
|
-
export class NapCatWsServer extends
|
|
8
|
+
export class NapCatWsServer extends NapCatEndpointBase {
|
|
9
9
|
router;
|
|
10
10
|
#wss;
|
|
11
11
|
#clientMap = new Map();
|
|
@@ -18,7 +18,7 @@ export class NapCatWsServer extends NapCatBotBase {
|
|
|
18
18
|
}
|
|
19
19
|
async $connect() {
|
|
20
20
|
if (!this.$config.access_token) {
|
|
21
|
-
this.logger.warn(formatCompact({
|
|
21
|
+
this.logger.warn(formatCompact({ endpoint: this.$id, ok: false, error: 'missing access_token' }));
|
|
22
22
|
}
|
|
23
23
|
this.#wss = this.router.ws(this.$config.path, {
|
|
24
24
|
verifyClient: (info) => {
|
|
@@ -30,13 +30,13 @@ export class NapCatWsServer extends NapCatBotBase {
|
|
|
30
30
|
return true;
|
|
31
31
|
},
|
|
32
32
|
});
|
|
33
|
-
this.logger.info(formatCompact({ op: 'listen',
|
|
33
|
+
this.logger.info(formatCompact({ op: 'listen', endpoint: this.$id, mode: 'wss', path: this.$config.path }));
|
|
34
34
|
this.#wss.on('connection', (client, req) => {
|
|
35
35
|
this.startHeartbeat();
|
|
36
|
-
this.logger.info(formatCompact({
|
|
36
|
+
this.logger.info(formatCompact({ endpoint: this.$id, peer: req.socket.remoteAddress }));
|
|
37
37
|
client.on('error', (err) => this.logger.warn(formatCompact({
|
|
38
38
|
op: 'ws_error',
|
|
39
|
-
|
|
39
|
+
endpoint: this.$id,
|
|
40
40
|
ok: false,
|
|
41
41
|
error: err instanceof Error ? err.message : String(err),
|
|
42
42
|
})));
|
|
@@ -44,7 +44,7 @@ export class NapCatWsServer extends NapCatBotBase {
|
|
|
44
44
|
const reasonStr = reason?.toString?.() || '';
|
|
45
45
|
this.logger.warn(formatCompact({
|
|
46
46
|
op: 'disconnect',
|
|
47
|
-
|
|
47
|
+
endpoint: this.$id,
|
|
48
48
|
code,
|
|
49
49
|
error: reasonStr || undefined,
|
|
50
50
|
}));
|
|
@@ -118,7 +118,7 @@ export class NapCatWsServer extends NapCatBotBase {
|
|
|
118
118
|
if (message.post_type === 'meta_event' && message.sub_type === 'connect') {
|
|
119
119
|
this.#clientMap.set(String(message.self_id), client);
|
|
120
120
|
this.$connected = true;
|
|
121
|
-
this.logger.info(formatCompact({
|
|
121
|
+
this.logger.info(formatCompact({ endpoint: this.$id, self_id: message.self_id }));
|
|
122
122
|
this.initTypingIndicator();
|
|
123
123
|
return;
|
|
124
124
|
}
|
|
@@ -147,4 +147,4 @@ export class NapCatWsServer extends NapCatBotBase {
|
|
|
147
147
|
}
|
|
148
148
|
}
|
|
149
149
|
}
|
|
150
|
-
//# sourceMappingURL=
|
|
150
|
+
//# sourceMappingURL=endpoint-ws-server.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"endpoint-ws-server.js","sourceRoot":"","sources":["../src/endpoint-ws-server.ts"],"names":[],"mappings":"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"}
|
package/lib/index.d.ts
CHANGED
|
@@ -2,11 +2,11 @@ import type { Router } from '@zhin.js/host-router';
|
|
|
2
2
|
import { PageManager } from '@zhin.js/host-api';
|
|
3
3
|
import { NapCatAdapter } from './adapter.js';
|
|
4
4
|
export * from './types.js';
|
|
5
|
-
export { NapCatWsClient } from './
|
|
6
|
-
export { NapCatWsServer } from './
|
|
7
|
-
export {
|
|
8
|
-
export { NapCatAdapter, type
|
|
9
|
-
export {
|
|
5
|
+
export { NapCatWsClient } from './endpoint-ws-client.js';
|
|
6
|
+
export { NapCatWsServer } from './endpoint-ws-server.js';
|
|
7
|
+
export { NapCatHttpEndpoint } from './endpoint-http.js';
|
|
8
|
+
export { NapCatAdapter, type NapCatEndpoint } from './adapter.js';
|
|
9
|
+
export { NapCatEndpointBase } from './endpoint-base.js';
|
|
10
10
|
export { NapCatTypingIndicatorManager, enableTypingIndicator, type NapCatTypingIndicatorConfig, } from './typing-indicator.js';
|
|
11
11
|
declare module 'zhin.js' {
|
|
12
12
|
namespace Plugin {
|
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":"AAiBA,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,yBAAyB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,KAAK,cAAc,EAAE,MAAM,cAAc,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,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"}
|
package/lib/index.js
CHANGED
|
@@ -4,17 +4,17 @@
|
|
|
4
4
|
* 连接方式:正向 WS / 反向 WS / HTTP
|
|
5
5
|
*/
|
|
6
6
|
import path from 'path';
|
|
7
|
-
import { usePlugin, createGroupManagementTools, registerAgentPromptContributor, unregisterAgentPromptContributor, } from 'zhin.js';
|
|
7
|
+
import { usePlugin, createGroupManagementTools, registerDefaultGroupPlatformPermitChecker, registerAgentPromptContributor, unregisterAgentPromptContributor, } from 'zhin.js';
|
|
8
8
|
import { NapCatAdapter } from './adapter.js';
|
|
9
9
|
import { createNapCatTools } from './tools.js';
|
|
10
10
|
import { createNapCatAgentPromptContributor } from './agent-prompt.js';
|
|
11
11
|
import { registerRoutes } from './routes.js';
|
|
12
12
|
export * from './types.js';
|
|
13
|
-
export { NapCatWsClient } from './
|
|
14
|
-
export { NapCatWsServer } from './
|
|
15
|
-
export {
|
|
13
|
+
export { NapCatWsClient } from './endpoint-ws-client.js';
|
|
14
|
+
export { NapCatWsServer } from './endpoint-ws-server.js';
|
|
15
|
+
export { NapCatHttpEndpoint } from './endpoint-http.js';
|
|
16
16
|
export { NapCatAdapter } from './adapter.js';
|
|
17
|
-
export {
|
|
17
|
+
export { NapCatEndpointBase } from './endpoint-base.js';
|
|
18
18
|
export { NapCatTypingIndicatorManager, enableTypingIndicator, } from './typing-indicator.js';
|
|
19
19
|
const plugin = usePlugin();
|
|
20
20
|
const { provide, useContext } = plugin;
|
|
@@ -36,6 +36,7 @@ provide({
|
|
|
36
36
|
// ── AI 工具注册 ────────────────────────────────────────────────────
|
|
37
37
|
useContext('tool', 'napcat', (toolService, napcat) => {
|
|
38
38
|
const disposers = [];
|
|
39
|
+
disposers.push(registerDefaultGroupPlatformPermitChecker('napcat'));
|
|
39
40
|
const groupTools = createGroupManagementTools(napcat, 'napcat');
|
|
40
41
|
disposers.push(...groupTools.map(t => toolService.addTool(t, plugin.name)));
|
|
41
42
|
const napcatTools = createNapCatTools(napcat);
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EACL,SAAS,EAIT,0BAA0B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/lib/routes.js
CHANGED
|
@@ -1,25 +1,25 @@
|
|
|
1
1
|
export function registerRoutes(router, napcat) {
|
|
2
|
-
router.get('/api/napcat/
|
|
2
|
+
router.get('/api/napcat/endpoints', async (ctx) => {
|
|
3
3
|
try {
|
|
4
|
-
const
|
|
5
|
-
if (
|
|
6
|
-
ctx.body = { success: true, data: [], message: '暂无 NapCat
|
|
4
|
+
const endpoints = Array.from(napcat.endpoints.values());
|
|
5
|
+
if (endpoints.length === 0) {
|
|
6
|
+
ctx.body = { success: true, data: [], message: '暂无 NapCat Endpoint 实例' };
|
|
7
7
|
return;
|
|
8
8
|
}
|
|
9
|
-
const result = await Promise.all(
|
|
9
|
+
const result = await Promise.all(endpoints.map(async (endpoint) => {
|
|
10
10
|
try {
|
|
11
|
-
const connection =
|
|
11
|
+
const connection = endpoint.$config.connection ?? 'ws';
|
|
12
12
|
const base = {
|
|
13
|
-
name:
|
|
14
|
-
connected:
|
|
13
|
+
name: endpoint.$config.name,
|
|
14
|
+
connected: endpoint.$connected || false,
|
|
15
15
|
connection,
|
|
16
|
-
status:
|
|
16
|
+
status: endpoint.$connected ? 'online' : 'offline',
|
|
17
17
|
lastActivity: new Date().toISOString(),
|
|
18
18
|
};
|
|
19
|
-
if (
|
|
19
|
+
if (endpoint.$connected) {
|
|
20
20
|
try {
|
|
21
|
-
const friends = await
|
|
22
|
-
const groups = await
|
|
21
|
+
const friends = await endpoint.getFriendList();
|
|
22
|
+
const groups = await endpoint.getGroupList();
|
|
23
23
|
base.friendCount = Array.isArray(friends) ? friends.length : 0;
|
|
24
24
|
base.groupCount = Array.isArray(groups) ? groups.length : 0;
|
|
25
25
|
}
|
|
@@ -36,7 +36,7 @@ export function registerRoutes(router, napcat) {
|
|
|
36
36
|
}
|
|
37
37
|
catch {
|
|
38
38
|
return {
|
|
39
|
-
name:
|
|
39
|
+
name: endpoint.$config.name,
|
|
40
40
|
connected: false,
|
|
41
41
|
connection: 'unknown',
|
|
42
42
|
status: 'error',
|
|
@@ -52,7 +52,7 @@ export function registerRoutes(router, napcat) {
|
|
|
52
52
|
ctx.body = {
|
|
53
53
|
success: false,
|
|
54
54
|
error: 'NAPCAT_API_ERROR',
|
|
55
|
-
message: '
|
|
55
|
+
message: '获取 Endpoint 数据失败',
|
|
56
56
|
details: process.env.NODE_ENV === 'development' ? error.message : undefined,
|
|
57
57
|
};
|
|
58
58
|
}
|
package/lib/routes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,cAAc,CAAC,MAAc,EAAE,MAAqB;IAClE,MAAM,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"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"}
|
package/lib/tools.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAwB,IAAI,EAAa,MAAM,SAAS,CAAC;AACrE,OAAO,KAAK,EAAE,aAAa,EAAkB,MAAM,cAAc,CAAC;AAimBlE,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,EAAE,CAiBhE"}
|