@zhin.js/adapter-napcat 0.1.9 → 0.1.11
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 +18 -0
- package/lib/adapter.d.ts.map +1 -1
- package/lib/adapter.js +0 -1
- package/lib/adapter.js.map +1 -1
- package/lib/bot-http.d.ts +1 -6
- package/lib/bot-http.d.ts.map +1 -1
- package/lib/bot-http.js +8 -6
- package/lib/bot-http.js.map +1 -1
- package/lib/bot-ws-client.d.ts.map +1 -1
- package/lib/bot-ws-client.js +18 -5
- package/lib/bot-ws-client.js.map +1 -1
- package/lib/bot-ws-server.d.ts.map +1 -1
- package/lib/bot-ws-server.js +19 -7
- package/lib/bot-ws-server.js.map +1 -1
- package/package.json +5 -5
- package/src/adapter.ts +1 -2
- package/src/bot-http.ts +10 -7
- package/src/bot-ws-client.ts +18 -4
- package/src/bot-ws-server.ts +19 -6
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,23 @@
|
|
|
1
1
|
# @zhin.js/adapter-napcat
|
|
2
2
|
|
|
3
|
+
## 0.1.11
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 775427e: fix: edge 支持
|
|
8
|
+
- Updated dependencies [775427e]
|
|
9
|
+
- @zhin.js/http@1.0.76
|
|
10
|
+
- zhin.js@1.0.83
|
|
11
|
+
|
|
12
|
+
## 0.1.10
|
|
13
|
+
|
|
14
|
+
### Patch Changes
|
|
15
|
+
|
|
16
|
+
- 32049f5: fix: init publish
|
|
17
|
+
- Updated dependencies [32049f5]
|
|
18
|
+
- @zhin.js/http@1.0.75
|
|
19
|
+
- zhin.js@1.0.82
|
|
20
|
+
|
|
3
21
|
## 0.1.9
|
|
4
22
|
|
|
5
23
|
### Patch Changes
|
package/lib/adapter.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAIA,OAAO,
|
|
1
|
+
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiB,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACzD,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,KAAK,EAAE,eAAe,EAAgE,MAAM,YAAY,CAAC;AAEhH,MAAM,MAAM,SAAS,GAAG,cAAc,GAAG,cAAc,GAAG,aAAa,CAAC;AAExE,qBAAa,aAAc,SAAQ,OAAO,CAAC,SAAS,CAAC;;gBAGvC,MAAM,EAAE,MAAM;IAI1B,SAAS,CAAC,MAAM,EAAE,eAAe,GAAG,SAAS;IAkBvC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAMzD,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,SAAM;IAMzE,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAO;IAMrD,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,UAAO;IAMtE,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAMlF,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAMzD,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;;;;IAY1C,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAM3C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAO7B"}
|
package/lib/adapter.js
CHANGED
package/lib/adapter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAIA,OAAO,
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"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"}
|
package/lib/bot-http.d.ts
CHANGED
|
@@ -1,12 +1,7 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* NapCat HTTP 连接方式
|
|
3
|
-
* 出站：HTTP POST 调用 NapCat API
|
|
4
|
-
* 入站：挂载 webhook 路由接收 NapCat 的 HTTP POST 事件上报
|
|
5
|
-
*/
|
|
6
1
|
import { NapCatBotBase } from './bot-base.js';
|
|
7
2
|
import type { NapCatHttpConfig } from './types.js';
|
|
8
3
|
import type { NapCatAdapter } from './adapter.js';
|
|
9
|
-
import type
|
|
4
|
+
import { type Router } from '@zhin.js/http/router';
|
|
10
5
|
export declare class NapCatHttpBot extends NapCatBotBase {
|
|
11
6
|
router: Router;
|
|
12
7
|
private pollTimer?;
|
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":"
|
|
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,sBAAsB,CAAC;AAG3F,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;IAQzB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B,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;YAuBN,eAAe;IAQ7B,OAAO,CAAC,SAAS;CAWlB"}
|
package/lib/bot-http.js
CHANGED
|
@@ -3,7 +3,9 @@
|
|
|
3
3
|
* 出站：HTTP POST 调用 NapCat API
|
|
4
4
|
* 入站：挂载 webhook 路由接收 NapCat 的 HTTP POST 事件上报
|
|
5
5
|
*/
|
|
6
|
+
import { formatCompact } from 'zhin.js';
|
|
6
7
|
import { NapCatBotBase } from './bot-base.js';
|
|
8
|
+
import { registerFetchRoute } from '@zhin.js/http/router';
|
|
7
9
|
import * as crypto from 'crypto';
|
|
8
10
|
export class NapCatHttpBot extends NapCatBotBase {
|
|
9
11
|
router;
|
|
@@ -17,7 +19,7 @@ export class NapCatHttpBot extends NapCatBotBase {
|
|
|
17
19
|
await this.checkConnection();
|
|
18
20
|
this.startPoll();
|
|
19
21
|
this.$connected = true;
|
|
20
|
-
this.logger.info(
|
|
22
|
+
this.logger.info(formatCompact({ bot: this.$id, mode: 'http' }));
|
|
21
23
|
}
|
|
22
24
|
async $disconnect() {
|
|
23
25
|
if (this.pollTimer) {
|
|
@@ -42,7 +44,7 @@ export class NapCatHttpBot extends NapCatBotBase {
|
|
|
42
44
|
}
|
|
43
45
|
mountWebhook() {
|
|
44
46
|
const postPath = this.$config.post_path;
|
|
45
|
-
this.router
|
|
47
|
+
registerFetchRoute(this.router, 'POST', postPath, async (ctx) => {
|
|
46
48
|
const body = ctx.request.body;
|
|
47
49
|
if (!body || typeof body !== 'object') {
|
|
48
50
|
ctx.status = 400;
|
|
@@ -50,7 +52,7 @@ export class NapCatHttpBot extends NapCatBotBase {
|
|
|
50
52
|
return;
|
|
51
53
|
}
|
|
52
54
|
if (this.$config.access_token) {
|
|
53
|
-
const sig = ctx.
|
|
55
|
+
const sig = ctx.get('x-signature');
|
|
54
56
|
if (sig) {
|
|
55
57
|
const expected = 'sha1=' + crypto.createHmac('sha1', this.$config.access_token).update(JSON.stringify(body)).digest('hex');
|
|
56
58
|
if (sig !== expected) {
|
|
@@ -66,10 +68,10 @@ export class NapCatHttpBot extends NapCatBotBase {
|
|
|
66
68
|
this.dispatchEvent(body);
|
|
67
69
|
}
|
|
68
70
|
catch (e) {
|
|
69
|
-
this.logger.warn(
|
|
71
|
+
this.logger.warn(formatCompact({ op: 'recv', bot: this.$id, ok: false, error: String(e) }));
|
|
70
72
|
}
|
|
71
73
|
});
|
|
72
|
-
this.logger.info(
|
|
74
|
+
this.logger.info(formatCompact({ op: 'webhook', bot: this.$id, path: postPath }));
|
|
73
75
|
}
|
|
74
76
|
async checkConnection() {
|
|
75
77
|
try {
|
|
@@ -87,7 +89,7 @@ export class NapCatHttpBot extends NapCatBotBase {
|
|
|
87
89
|
}
|
|
88
90
|
catch {
|
|
89
91
|
this.$connected = false;
|
|
90
|
-
this.logger.warn(
|
|
92
|
+
this.logger.warn(formatCompact({ op: 'heartbeat', bot: this.$id, ok: false }));
|
|
91
93
|
}
|
|
92
94
|
}, interval);
|
|
93
95
|
}
|
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,eAAe,CAAC;
|
|
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,sBAAsB,CAAC;AAC3F,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAEjC,MAAM,OAAO,aAAc,SAAQ,aAAa;IAKH;IAJnC,SAAS,CAAkB;IAInC,YAAY,OAAsB,EAAS,MAAc,EAAE,MAAwB;QACjF,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QADkB,WAAM,GAAN,MAAM,CAAQ;IAEzD,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAC7B,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,WAAW;QACf,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAAC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAAC,CAAC;QAClF,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,OAAO,CAAU,MAAc,EAAE,SAA8B,EAAE;QACrE,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,MAAM,EAAE,CAAC;QACpE,MAAM,OAAO,GAA2B,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAC;QAC/E,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY;YAAE,OAAO,CAAC,eAAe,CAAC,GAAG,UAAU,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;QAEhG,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACzF,IAAI,CAAC,IAAI,CAAC,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,QAAQ,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,UAAU,QAAQ,MAAM,EAAE,CAAC,CAAC;QACtF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,EAAoB,CAAC;QACjD,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,IAAI,IAAI,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;YAC/C,MAAM,IAAI,KAAK,CAAC,cAAc,IAAI,CAAC,OAAO,MAAM,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,IAAI,SAAS,EAAE,CAAC,CAAC;QAC/F,CAAC;QACD,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAEO,YAAY;QAClB,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;QACxC,kBAAkB,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAkB,EAAE,EAAE;YAC7E,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC;YAC9B,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAAC,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;gBAAC,GAAG,CAAC,IAAI,GAAG,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC;gBAAC,OAAO;YAAC,CAAC;YAE1G,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;gBAC9B,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;gBACnC,IAAI,GAAG,EAAE,CAAC;oBACR,MAAM,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oBAC3H,IAAI,GAAG,KAAK,QAAQ,EAAE,CAAC;wBAAC,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;wBAAC,GAAG,CAAC,IAAI,GAAG,EAAE,KAAK,EAAE,oBAAoB,EAAE,CAAC;wBAAC,OAAO;oBAAC,CAAC;gBACjG,CAAC;YACH,CAAC;YAED,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;YACjB,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC;YACd,IAAI,CAAC;gBAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAAC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBAC3C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAE,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC/F,CAAC;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAE,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IACrF,CAAC;IAEO,KAAK,CAAC,eAAe;QAC3B,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QACvC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,GAAG,yCAAyC,IAAI,CAAC,OAAO,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC,CAAC;QACrG,CAAC;IACH,CAAC;IAEO,SAAS;QACf,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,IAAI,KAAK,CAAC;QACrD,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;YACtC,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YACnC,CAAC;YAAC,MAAM,CAAC;gBACP,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;gBACxB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAE,EAAE,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YAClF,CAAC;QACH,CAAC,EAAE,QAAQ,CAAC,CAAC;IACf,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bot-ws-client.d.ts","sourceRoot":"","sources":["../src/bot-ws-client.ts"],"names":[],"mappings":"
|
|
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;AAElD,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;IAyDzB,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;IAUpF,OAAO,CAAC,eAAe;IAYvB,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,iBAAiB;CAQ1B"}
|
package/lib/bot-ws-client.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
* NapCat 正向 WebSocket 连接
|
|
3
3
|
*/
|
|
4
4
|
import WebSocket from 'ws';
|
|
5
|
+
import { formatCompact } from 'zhin.js';
|
|
5
6
|
import { NapCatBotBase } from './bot-base.js';
|
|
6
7
|
export class NapCatWsClient extends NapCatBotBase {
|
|
7
8
|
ws;
|
|
@@ -25,9 +26,10 @@ export class NapCatWsClient extends NapCatBotBase {
|
|
|
25
26
|
this.ws = new WebSocket(url, { headers });
|
|
26
27
|
this.ws.on('open', () => {
|
|
27
28
|
this.$connected = true;
|
|
28
|
-
if (!this.$config.access_token)
|
|
29
|
-
this.logger.warn(
|
|
30
|
-
|
|
29
|
+
if (!this.$config.access_token) {
|
|
30
|
+
this.logger.warn(formatCompact({ bot: this.$id, ok: false, error: 'missing access_token' }));
|
|
31
|
+
}
|
|
32
|
+
this.logger.info(formatCompact({ bot: this.$id, mode: 'ws' }));
|
|
31
33
|
this.startHeartbeat();
|
|
32
34
|
resolve();
|
|
33
35
|
});
|
|
@@ -43,12 +45,23 @@ export class NapCatWsClient extends NapCatBotBase {
|
|
|
43
45
|
this.$connected = false;
|
|
44
46
|
const reasonStr = reason?.toString?.() || '';
|
|
45
47
|
const codeHint = code === 1005 ? ' [no status]' : code === 1006 ? ' [abnormal]' : '';
|
|
46
|
-
this.logger.warn(
|
|
48
|
+
this.logger.warn(formatCompact({
|
|
49
|
+
op: 'disconnect',
|
|
50
|
+
bot: this.$id,
|
|
51
|
+
code,
|
|
52
|
+
error: reasonStr || 'closed',
|
|
53
|
+
reconnect_ms: this.$config.reconnect_interval || 5000,
|
|
54
|
+
}));
|
|
47
55
|
reject({ code, reason });
|
|
48
56
|
this.scheduleReconnect();
|
|
49
57
|
});
|
|
50
58
|
this.ws.on('error', (error) => {
|
|
51
|
-
this.logger.warn(
|
|
59
|
+
this.logger.warn(formatCompact({
|
|
60
|
+
op: 'ws_error',
|
|
61
|
+
bot: this.$id,
|
|
62
|
+
ok: false,
|
|
63
|
+
error: error instanceof Error ? error.message : String(error),
|
|
64
|
+
}));
|
|
52
65
|
reject(error);
|
|
53
66
|
});
|
|
54
67
|
});
|
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,eAAe,CAAC;AAI9C,MAAM,OAAO,cAAe,SAAQ,aAAa;IACvC,EAAE,CAAa;IACf,cAAc,CAAkB;IAChC,cAAc,CAAkB;IAChC,SAAS,GAAG,CAAC,CAAC;IACd,eAAe,GAAG,IAAI,GAAG,EAI7B,CAAC;IAIL,YAAY,OAAsB,EAAE,MAA4B;QAC9D,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,OAAO,GAA2B,EAAE,CAAC;YAC3C,IAAI,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;YAC3B,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;gBAC9B,OAAO,CAAC,eAAe,CAAC,GAAG,UAAU,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;gBACjE,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;gBACvB,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;gBAC9D,GAAG,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;YACrB,CAAC;YACD,IAAI,CAAC,EAAE,GAAG,IAAI,SAAS,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;YAE1C,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;gBACtB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;gBACvB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY;
|
|
1
|
+
{"version":3,"file":"bot-ws-client.js","sourceRoot":"","sources":["../src/bot-ws-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bot-ws-server.d.ts","sourceRoot":"","sources":["../src/bot-ws-server.ts"],"names":[],"mappings":"
|
|
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,eAAe,CAAC;AAE5C,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;IAQ5B,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;IA0BvB,OAAO,CAAC,cAAc;CASvB"}
|
package/lib/bot-ws-server.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
* NapCat 反向 WebSocket 连接
|
|
3
3
|
*/
|
|
4
4
|
import WebSocket from 'ws';
|
|
5
|
+
import { formatCompact } from 'zhin.js';
|
|
5
6
|
import { NapCatBotBase } from './bot-base.js';
|
|
6
7
|
export class NapCatWsServer extends NapCatBotBase {
|
|
7
8
|
router;
|
|
@@ -15,8 +16,9 @@ export class NapCatWsServer extends NapCatBotBase {
|
|
|
15
16
|
this.router = router;
|
|
16
17
|
}
|
|
17
18
|
async $connect() {
|
|
18
|
-
if (!this.$config.access_token)
|
|
19
|
-
this.logger.warn(
|
|
19
|
+
if (!this.$config.access_token) {
|
|
20
|
+
this.logger.warn(formatCompact({ bot: this.$id, ok: false, error: 'missing access_token' }));
|
|
21
|
+
}
|
|
20
22
|
this.#wss = this.router.ws(this.$config.path, {
|
|
21
23
|
verifyClient: (info) => {
|
|
22
24
|
const authorization = info.req.headers['authorization'] || '';
|
|
@@ -27,14 +29,24 @@ export class NapCatWsServer extends NapCatBotBase {
|
|
|
27
29
|
return true;
|
|
28
30
|
},
|
|
29
31
|
});
|
|
30
|
-
this.logger.info(
|
|
32
|
+
this.logger.info(formatCompact({ op: 'listen', bot: this.$id, mode: 'wss', path: this.$config.path }));
|
|
31
33
|
this.#wss.on('connection', (client, req) => {
|
|
32
34
|
this.startHeartbeat();
|
|
33
|
-
this.logger.info(
|
|
34
|
-
client.on('error', (err) => this.logger.warn(
|
|
35
|
+
this.logger.info(formatCompact({ bot: this.$id, peer: req.socket.remoteAddress }));
|
|
36
|
+
client.on('error', (err) => this.logger.warn(formatCompact({
|
|
37
|
+
op: 'ws_error',
|
|
38
|
+
bot: this.$id,
|
|
39
|
+
ok: false,
|
|
40
|
+
error: err instanceof Error ? err.message : String(err),
|
|
41
|
+
})));
|
|
35
42
|
client.on('close', (code, reason) => {
|
|
36
43
|
const reasonStr = reason?.toString?.() || '';
|
|
37
|
-
this.logger.warn(
|
|
44
|
+
this.logger.warn(formatCompact({
|
|
45
|
+
op: 'disconnect',
|
|
46
|
+
bot: this.$id,
|
|
47
|
+
code,
|
|
48
|
+
error: reasonStr || undefined,
|
|
49
|
+
}));
|
|
38
50
|
for (const [key, val] of this.#clientMap) {
|
|
39
51
|
if (val === client)
|
|
40
52
|
this.#clientMap.delete(key);
|
|
@@ -104,7 +116,7 @@ export class NapCatWsServer extends NapCatBotBase {
|
|
|
104
116
|
if (message.post_type === 'meta_event' && message.sub_type === 'connect') {
|
|
105
117
|
this.#clientMap.set(String(message.self_id), client);
|
|
106
118
|
this.$connected = true;
|
|
107
|
-
this.logger.info(
|
|
119
|
+
this.logger.info(formatCompact({ bot: this.$id, self_id: message.self_id }));
|
|
108
120
|
return;
|
|
109
121
|
}
|
|
110
122
|
this.dispatchEvent(message);
|
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;
|
|
1
|
+
{"version":3,"file":"bot-ws-server.js","sourceRoot":"","sources":["../src/bot-ws-server.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zhin.js/adapter-napcat",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.11",
|
|
4
4
|
"description": "Zhin.js adapter for NapCatQQ (OneBot11 superset with go-cqhttp & NapCat extensions)",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./lib/index.js",
|
|
@@ -50,12 +50,12 @@
|
|
|
50
50
|
"@types/node": "^25.8.0",
|
|
51
51
|
"@types/ws": "^8.18.1",
|
|
52
52
|
"typescript": "^6.0.3",
|
|
53
|
-
"@zhin.js/cli": "1.0.
|
|
54
|
-
"zhin.js": "1.0.
|
|
53
|
+
"@zhin.js/cli": "1.0.79",
|
|
54
|
+
"zhin.js": "1.0.83"
|
|
55
55
|
},
|
|
56
56
|
"peerDependencies": {
|
|
57
|
-
"@zhin.js/http": "1.0.
|
|
58
|
-
"zhin.js": "1.0.
|
|
57
|
+
"@zhin.js/http": "1.0.76",
|
|
58
|
+
"zhin.js": "1.0.83"
|
|
59
59
|
},
|
|
60
60
|
"peerDependenciesMeta": {
|
|
61
61
|
"@zhin.js/http": {
|
package/src/adapter.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* NapCat 适配器：支持正向 WS / 反向 WS / HTTP
|
|
3
3
|
*/
|
|
4
4
|
import type { Router } from '@zhin.js/http';
|
|
5
|
-
import { Adapter, Plugin } from 'zhin.js';
|
|
5
|
+
import { formatCompact, Adapter, Plugin } from 'zhin.js';
|
|
6
6
|
import { NapCatWsClient } from './bot-ws-client.js';
|
|
7
7
|
import { NapCatWsServer } from './bot-ws-server.js';
|
|
8
8
|
import { NapCatHttpBot } from './bot-http.js';
|
|
@@ -95,6 +95,5 @@ export class NapCatAdapter extends Adapter<NapCatBot> {
|
|
|
95
95
|
this.#router = router;
|
|
96
96
|
});
|
|
97
97
|
await super.start();
|
|
98
|
-
this.plugin.logger.info('NapCat adapter started');
|
|
99
98
|
}
|
|
100
99
|
}
|
package/src/bot-http.ts
CHANGED
|
@@ -3,10 +3,11 @@
|
|
|
3
3
|
* 出站：HTTP POST 调用 NapCat API
|
|
4
4
|
* 入站：挂载 webhook 路由接收 NapCat 的 HTTP POST 事件上报
|
|
5
5
|
*/
|
|
6
|
+
import { formatCompact } from 'zhin.js';
|
|
6
7
|
import { NapCatBotBase } from './bot-base.js';
|
|
7
8
|
import type { NapCatHttpConfig, ApiResponse } from './types.js';
|
|
8
9
|
import type { NapCatAdapter } from './adapter.js';
|
|
9
|
-
import type
|
|
10
|
+
import { registerFetchRoute, type Router, type RouterContext } from '@zhin.js/http/router';
|
|
10
11
|
import * as crypto from 'crypto';
|
|
11
12
|
|
|
12
13
|
export class NapCatHttpBot extends NapCatBotBase {
|
|
@@ -23,7 +24,7 @@ export class NapCatHttpBot extends NapCatBotBase {
|
|
|
23
24
|
await this.checkConnection();
|
|
24
25
|
this.startPoll();
|
|
25
26
|
this.$connected = true;
|
|
26
|
-
this.logger.info(
|
|
27
|
+
this.logger.info(formatCompact({ bot: this.$id, mode: 'http' }));
|
|
27
28
|
}
|
|
28
29
|
|
|
29
30
|
async $disconnect(): Promise<void> {
|
|
@@ -47,12 +48,12 @@ export class NapCatHttpBot extends NapCatBotBase {
|
|
|
47
48
|
|
|
48
49
|
private mountWebhook(): void {
|
|
49
50
|
const postPath = this.$config.post_path;
|
|
50
|
-
this.router
|
|
51
|
+
registerFetchRoute(this.router, 'POST', postPath, async (ctx: RouterContext) => {
|
|
51
52
|
const body = ctx.request.body;
|
|
52
53
|
if (!body || typeof body !== 'object') { ctx.status = 400; ctx.body = { error: 'invalid body' }; return; }
|
|
53
54
|
|
|
54
55
|
if (this.$config.access_token) {
|
|
55
|
-
const sig = ctx.
|
|
56
|
+
const sig = ctx.get('x-signature');
|
|
56
57
|
if (sig) {
|
|
57
58
|
const expected = 'sha1=' + crypto.createHmac('sha1', this.$config.access_token).update(JSON.stringify(body)).digest('hex');
|
|
58
59
|
if (sig !== expected) { ctx.status = 403; ctx.body = { error: 'signature mismatch' }; return; }
|
|
@@ -61,9 +62,11 @@ export class NapCatHttpBot extends NapCatBotBase {
|
|
|
61
62
|
|
|
62
63
|
ctx.status = 204;
|
|
63
64
|
ctx.body = '';
|
|
64
|
-
try { this.dispatchEvent(body); } catch (e) {
|
|
65
|
+
try { this.dispatchEvent(body); } catch (e) {
|
|
66
|
+
this.logger.warn(formatCompact( { op: 'recv', bot: this.$id, ok: false, error: String(e) }));
|
|
67
|
+
}
|
|
65
68
|
});
|
|
66
|
-
this.logger.info(
|
|
69
|
+
this.logger.info(formatCompact( { op: 'webhook', bot: this.$id, path: postPath }));
|
|
67
70
|
}
|
|
68
71
|
|
|
69
72
|
private async checkConnection(): Promise<void> {
|
|
@@ -81,7 +84,7 @@ export class NapCatHttpBot extends NapCatBotBase {
|
|
|
81
84
|
await this.callApi('get_status');
|
|
82
85
|
} catch {
|
|
83
86
|
this.$connected = false;
|
|
84
|
-
this.logger.warn(
|
|
87
|
+
this.logger.warn(formatCompact( { op: 'heartbeat', bot: this.$id, ok: false }));
|
|
85
88
|
}
|
|
86
89
|
}, interval);
|
|
87
90
|
}
|
package/src/bot-ws-client.ts
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
* NapCat 正向 WebSocket 连接
|
|
3
3
|
*/
|
|
4
4
|
import WebSocket from 'ws';
|
|
5
|
+
import { formatCompact } from 'zhin.js';
|
|
5
6
|
import { NapCatBotBase } from './bot-base.js';
|
|
6
7
|
import type { NapCatWsClientConfig, ApiResponse } from './types.js';
|
|
7
8
|
import type { NapCatAdapter } from './adapter.js';
|
|
@@ -37,8 +38,10 @@ export class NapCatWsClient extends NapCatBotBase {
|
|
|
37
38
|
|
|
38
39
|
this.ws.on('open', () => {
|
|
39
40
|
this.$connected = true;
|
|
40
|
-
if (!this.$config.access_token)
|
|
41
|
-
|
|
41
|
+
if (!this.$config.access_token) {
|
|
42
|
+
this.logger.warn(formatCompact({ bot: this.$id, ok: false, error: 'missing access_token' }));
|
|
43
|
+
}
|
|
44
|
+
this.logger.info(formatCompact({ bot: this.$id, mode: 'ws' }));
|
|
42
45
|
this.startHeartbeat();
|
|
43
46
|
resolve();
|
|
44
47
|
});
|
|
@@ -55,13 +58,24 @@ export class NapCatWsClient extends NapCatBotBase {
|
|
|
55
58
|
this.$connected = false;
|
|
56
59
|
const reasonStr = reason?.toString?.() || '';
|
|
57
60
|
const codeHint = code === 1005 ? ' [no status]' : code === 1006 ? ' [abnormal]' : '';
|
|
58
|
-
this.logger.warn(
|
|
61
|
+
this.logger.warn(formatCompact( {
|
|
62
|
+
op: 'disconnect',
|
|
63
|
+
bot: this.$id,
|
|
64
|
+
code,
|
|
65
|
+
error: reasonStr || 'closed',
|
|
66
|
+
reconnect_ms: this.$config.reconnect_interval || 5000,
|
|
67
|
+
}));
|
|
59
68
|
reject({ code, reason });
|
|
60
69
|
this.scheduleReconnect();
|
|
61
70
|
});
|
|
62
71
|
|
|
63
72
|
this.ws.on('error', (error) => {
|
|
64
|
-
this.logger.warn(
|
|
73
|
+
this.logger.warn(formatCompact( {
|
|
74
|
+
op: 'ws_error',
|
|
75
|
+
bot: this.$id,
|
|
76
|
+
ok: false,
|
|
77
|
+
error: error instanceof Error ? error.message : String(error),
|
|
78
|
+
}));
|
|
65
79
|
reject(error);
|
|
66
80
|
});
|
|
67
81
|
});
|
package/src/bot-ws-server.ts
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
* NapCat 反向 WebSocket 连接
|
|
3
3
|
*/
|
|
4
4
|
import WebSocket, { WebSocketServer } from 'ws';
|
|
5
|
+
import { formatCompact } from 'zhin.js';
|
|
5
6
|
import type { IncomingMessage } from 'http';
|
|
6
7
|
import { NapCatBotBase } from './bot-base.js';
|
|
7
8
|
import type { NapCatWsServerConfig, ApiResponse } from './types.js';
|
|
@@ -26,7 +27,9 @@ export class NapCatWsServer extends NapCatBotBase {
|
|
|
26
27
|
}
|
|
27
28
|
|
|
28
29
|
async $connect(): Promise<void> {
|
|
29
|
-
if (!this.$config.access_token)
|
|
30
|
+
if (!this.$config.access_token) {
|
|
31
|
+
this.logger.warn(formatCompact({ bot: this.$id, ok: false, error: 'missing access_token' }));
|
|
32
|
+
}
|
|
30
33
|
this.#wss = this.router.ws(this.$config.path, {
|
|
31
34
|
verifyClient: (info: { origin: string; secure: boolean; req: IncomingMessage }) => {
|
|
32
35
|
const authorization = info.req.headers['authorization'] || '';
|
|
@@ -37,16 +40,26 @@ export class NapCatWsServer extends NapCatBotBase {
|
|
|
37
40
|
return true;
|
|
38
41
|
},
|
|
39
42
|
});
|
|
40
|
-
this.logger.info(
|
|
43
|
+
this.logger.info(formatCompact( { op: 'listen', bot: this.$id, mode: 'wss', path: this.$config.path }));
|
|
41
44
|
|
|
42
45
|
this.#wss.on('connection', (client, req) => {
|
|
43
46
|
this.startHeartbeat();
|
|
44
|
-
this.logger.info(
|
|
47
|
+
this.logger.info(formatCompact({ bot: this.$id, peer: req.socket.remoteAddress }));
|
|
45
48
|
|
|
46
|
-
client.on('error', (err) => this.logger.warn(
|
|
49
|
+
client.on('error', (err) => this.logger.warn(formatCompact( {
|
|
50
|
+
op: 'ws_error',
|
|
51
|
+
bot: this.$id,
|
|
52
|
+
ok: false,
|
|
53
|
+
error: err instanceof Error ? err.message : String(err),
|
|
54
|
+
})));
|
|
47
55
|
client.on('close', (code, reason) => {
|
|
48
56
|
const reasonStr = reason?.toString?.() || '';
|
|
49
|
-
this.logger.warn(
|
|
57
|
+
this.logger.warn(formatCompact( {
|
|
58
|
+
op: 'disconnect',
|
|
59
|
+
bot: this.$id,
|
|
60
|
+
code,
|
|
61
|
+
error: reasonStr || undefined,
|
|
62
|
+
}));
|
|
50
63
|
for (const [key, val] of this.#clientMap) {
|
|
51
64
|
if (val === client) this.#clientMap.delete(key);
|
|
52
65
|
}
|
|
@@ -104,7 +117,7 @@ export class NapCatWsServer extends NapCatBotBase {
|
|
|
104
117
|
if (message.post_type === 'meta_event' && message.sub_type === 'connect') {
|
|
105
118
|
this.#clientMap.set(String(message.self_id), client);
|
|
106
119
|
this.$connected = true;
|
|
107
|
-
this.logger.info(
|
|
120
|
+
this.logger.info(formatCompact({ bot: this.$id, self_id: message.self_id }));
|
|
108
121
|
return;
|
|
109
122
|
}
|
|
110
123
|
this.dispatchEvent(message);
|