@zhin.js/adapter-satori 0.0.31 → 0.0.32
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/adapter.d.ts.map +1 -1
- package/lib/adapter.js +0 -1
- package/lib/adapter.js.map +1 -1
- package/lib/bot-webhook.d.ts.map +1 -1
- package/lib/bot-webhook.js +3 -3
- package/lib/bot-webhook.js.map +1 -1
- package/lib/bot-ws.d.ts.map +1 -1
- package/lib/bot-ws.js +22 -6
- package/lib/bot-ws.js.map +1 -1
- package/package.json +6 -6
- package/src/adapter.ts +1 -2
- package/src/bot-webhook.ts +3 -3
- package/src/bot-ws.ts +22 -6
package/lib/adapter.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAKA,OAAO,
|
|
1
|
+
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAKA,OAAO,EAAiB,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EACV,eAAe,EAGhB,MAAM,YAAY,CAAC;AAGpB,MAAM,MAAM,SAAS,GAAG,cAAc,GAAG,gBAAgB,CAAC;AAE1D,qBAAa,aAAc,SAAQ,OAAO,CAAC,SAAS,CAAC;;gBAGvC,MAAM,EAAE,MAAM;IAI1B,SAAS,CAAC,MAAM,EAAE,eAAe,GAAG,SAAS;IAcvC,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":"AAKA,OAAO,
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAKA,OAAO,EAAiB,OAAO,EAAU,MAAM,SAAS,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAUpD,MAAM,OAAO,aAAc,SAAQ,OAAkB;IACnD,OAAO,CAAU;IAEjB,YAAY,MAAc;QACxB,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,SAAS,CAAC,MAAuB;QAC/B,QAAQ,MAAM,CAAC,UAAU,EAAE,CAAC;YAC1B,KAAK,IAAI;gBACP,OAAO,IAAI,cAAc,CAAC,IAAI,EAAE,MAAwB,CAAC,CAAC;YAC5D,KAAK,SAAS;gBACZ,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;oBAClB,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;gBACnF,CAAC;gBACD,OAAO,IAAI,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,MAA6B,CAAC,CAAC;YACjF;gBACE,MAAM,IAAI,KAAK,CAAC,8BAA+B,MAA0B,CAAC,UAAU,EAAE,CAAC,CAAC;QAC5F,CAAC;IACH,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,OAAO,GAAI,IAAI,CAAC,MAAM,CAAC,MAA8C,CAAC,QAAQ,CAAC,CAAC;QACpF,IAAI,CAAC,MAAM,CAAC,UAAkE,CAAC,QAAQ,EAAE,CAAC,MAAc,EAAE,EAAE;YAC3G,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;CACF"}
|
package/lib/bot-webhook.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bot-webhook.d.ts","sourceRoot":"","sources":["../src/bot-webhook.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,
|
|
1
|
+
{"version":3,"file":"bot-webhook.d.ts","sourceRoot":"","sources":["../src/bot-webhook.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAiB,GAAG,EAAE,OAAO,EAAW,WAAW,EAAE,MAAM,SAAS,CAAC;AAC5E,OAAO,KAAK,EAAE,MAAM,EAAiB,MAAM,eAAe,CAAC;AAE3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,eAAe,EAAe,MAAM,YAAY,CAAC;AAEpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAGlD,qBAAa,gBAAiB,SAAQ,YAAa,YAAW,GAAG,CAAC,mBAAmB,EAAE,eAAe,CAAC;IAU5F,OAAO,EAAE,aAAa;IACtB,MAAM,EAAE,MAAM;IACd,OAAO,EAAE,mBAAmB;IAXrC,UAAU,EAAE,OAAO,CAAQ;IAC3B,iDAAiD;IACjD,OAAO,CAAC,KAAK,CAAC,CAAc;IAE5B,IAAI,MAAM,6BAET;gBAGQ,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,mBAAmB;IAKrC,IAAI,GAAG,WAEN;IAED,OAAO,CAAC,UAAU;IAMZ,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAezB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAIlC,OAAO,CAAC,WAAW;IAUnB,cAAc,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IA+BzD,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;IAanD,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAIhD"}
|
package/lib/bot-webhook.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Satori WebHook Bot：应用提供 POST path，SDK 推送 EVENT（Satori-Opcode: 0）
|
|
3
3
|
*/
|
|
4
4
|
import { EventEmitter } from 'events';
|
|
5
|
-
import { Message, segment } from 'zhin.js';
|
|
5
|
+
import { formatCompact, Message, segment } from 'zhin.js';
|
|
6
6
|
import { callSatoriApi } from './api.js';
|
|
7
7
|
import { SatoriOpcode } from './types.js';
|
|
8
8
|
import { formatSatoriMessagePayload, isMessageEvent } from './utils.js';
|
|
@@ -33,7 +33,7 @@ export class SatoriWebhookBot extends EventEmitter {
|
|
|
33
33
|
async $connect() {
|
|
34
34
|
const path = this.$config.path.startsWith('/') ? this.$config.path : `/${this.$config.path}`;
|
|
35
35
|
this.router.post(path, async (ctx) => {
|
|
36
|
-
const opcode = parseInt(ctx.
|
|
36
|
+
const opcode = parseInt(ctx.get('satori-opcode') ?? '', 10);
|
|
37
37
|
const body = ctx.request.body;
|
|
38
38
|
if (opcode === SatoriOpcode.EVENT && body) {
|
|
39
39
|
if (body.login && !this.login)
|
|
@@ -43,7 +43,7 @@ export class SatoriWebhookBot extends EventEmitter {
|
|
|
43
43
|
ctx.status = 200;
|
|
44
44
|
ctx.body = {};
|
|
45
45
|
});
|
|
46
|
-
this.logger.info(
|
|
46
|
+
this.logger.info(formatCompact({ op: 'webhook', path }));
|
|
47
47
|
}
|
|
48
48
|
async $disconnect() {
|
|
49
49
|
this.$connected = false;
|
package/lib/bot-webhook.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bot-webhook.js","sourceRoot":"","sources":["../src/bot-webhook.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAO,OAAO,
|
|
1
|
+
{"version":3,"file":"bot-webhook.js","sourceRoot":"","sources":["../src/bot-webhook.ts"],"names":[],"mappings":"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"}
|
package/lib/bot-ws.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bot-ws.d.ts","sourceRoot":"","sources":["../src/bot-ws.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,
|
|
1
|
+
{"version":3,"file":"bot-ws.d.ts","sourceRoot":"","sources":["../src/bot-ws.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAiB,GAAG,EAAE,OAAO,EAAW,WAAW,EAAE,MAAM,SAAS,CAAC;AAE5E,OAAO,KAAK,EAAE,cAAc,EAAgB,eAAe,EAAe,MAAM,YAAY,CAAC;AAE7F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAGlD,qBAAa,cAAe,SAAQ,YAAa,YAAW,GAAG,CAAC,cAAc,EAAE,eAAe,CAAC;IAa3E,OAAO,EAAE,aAAa;IAAS,OAAO,EAAE,cAAc;IAZzE,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,CAAY;IACvB,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,gDAAgD;IAChD,OAAO,CAAC,KAAK,CAAC,CAAc;IAC5B,OAAO,CAAC,MAAM,CAAC,CAAS;IAExB,IAAI,MAAM,6BAET;gBAEkB,OAAO,EAAE,aAAa,EAAS,OAAO,EAAE,cAAc;IAKzE,IAAI,GAAG,WAEN;IAED,OAAO,KAAK,KAAK,GAOhB;IAED,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,UAAU;IAKlB,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,iBAAiB;IAcnB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IA8DzB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBlC,OAAO,CAAC,WAAW;IAUnB,cAAc,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IA+BzD,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;IAcnD,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAIhD"}
|
package/lib/bot-ws.js
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
import WebSocket from 'ws';
|
|
5
5
|
import { EventEmitter } from 'events';
|
|
6
6
|
import { clearInterval } from 'node:timers';
|
|
7
|
-
import { Message, segment } from 'zhin.js';
|
|
7
|
+
import { formatCompact, Message, segment } from 'zhin.js';
|
|
8
8
|
import { callSatoriApi } from './api.js';
|
|
9
9
|
import { SatoriOpcode } from './types.js';
|
|
10
10
|
import { formatSatoriMessagePayload, isMessageEvent } from './utils.js';
|
|
@@ -60,7 +60,12 @@ export class SatoriWsClient extends EventEmitter {
|
|
|
60
60
|
const delay = 5000;
|
|
61
61
|
this.reconnectTimer = setTimeout(() => {
|
|
62
62
|
this.reconnectTimer = undefined;
|
|
63
|
-
this.$connect().catch((err) => this.logger.warn(
|
|
63
|
+
this.$connect().catch((err) => this.logger.warn(formatCompact({
|
|
64
|
+
op: 'reconnect',
|
|
65
|
+
bot: this.$id,
|
|
66
|
+
ok: false,
|
|
67
|
+
error: err instanceof Error ? err.message : String(err),
|
|
68
|
+
})));
|
|
64
69
|
}, delay);
|
|
65
70
|
}
|
|
66
71
|
async $connect() {
|
|
@@ -71,7 +76,7 @@ export class SatoriWsClient extends EventEmitter {
|
|
|
71
76
|
this.ws = new WebSocket(this.wsUrl, { headers });
|
|
72
77
|
this.ws.on('open', () => {
|
|
73
78
|
this.$connected = true;
|
|
74
|
-
this.logger.info(
|
|
79
|
+
this.logger.info(formatCompact({ bot: this.$id, mode: 'ws' }));
|
|
75
80
|
this.sendSignal(SatoriOpcode.IDENTIFY, {
|
|
76
81
|
token: this.$config.token,
|
|
77
82
|
sn: this.lastSn,
|
|
@@ -86,7 +91,7 @@ export class SatoriWsClient extends EventEmitter {
|
|
|
86
91
|
const logins = signal.body.logins;
|
|
87
92
|
this.login = logins[0];
|
|
88
93
|
if (!this.login?.platform || !this.login?.user?.id) {
|
|
89
|
-
this.logger.warn('
|
|
94
|
+
this.logger.warn(formatCompact({ op: 'ready', ok: false, error: 'missing platform/user' }));
|
|
90
95
|
}
|
|
91
96
|
}
|
|
92
97
|
else if (signal.op === SatoriOpcode.EVENT && signal.body) {
|
|
@@ -103,12 +108,23 @@ export class SatoriWsClient extends EventEmitter {
|
|
|
103
108
|
this.$connected = false;
|
|
104
109
|
const reasonStr = reason?.toString?.() || String(reason);
|
|
105
110
|
const codeHint = code === 1005 ? ' [无状态，多为服务端/代理未发 close 帧即断开]' : code === 1006 ? ' [异常关闭]' : '';
|
|
106
|
-
this.logger.warn(
|
|
111
|
+
this.logger.warn(formatCompact({
|
|
112
|
+
op: 'disconnect',
|
|
113
|
+
bot: this.$config.name,
|
|
114
|
+
code,
|
|
115
|
+
error: `${reasonStr || 'closed'}${codeHint}`,
|
|
116
|
+
reconnect_ms: 5000,
|
|
117
|
+
}));
|
|
107
118
|
reject(new Error(`Satori WS closed: ${code} ${reasonStr}`));
|
|
108
119
|
this.scheduleReconnect();
|
|
109
120
|
});
|
|
110
121
|
this.ws.on('error', (error) => {
|
|
111
|
-
this.logger.warn(
|
|
122
|
+
this.logger.warn(formatCompact({
|
|
123
|
+
op: 'ws_error',
|
|
124
|
+
bot: this.$config.name,
|
|
125
|
+
ok: false,
|
|
126
|
+
error: error instanceof Error ? error.message : String(error),
|
|
127
|
+
}));
|
|
112
128
|
reject(error);
|
|
113
129
|
});
|
|
114
130
|
});
|
package/lib/bot-ws.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bot-ws.js","sourceRoot":"","sources":["../src/bot-ws.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,SAAS,MAAM,IAAI,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAO,OAAO,
|
|
1
|
+
{"version":3,"file":"bot-ws.js","sourceRoot":"","sources":["../src/bot-ws.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zhin.js/adapter-satori",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.32",
|
|
4
4
|
"description": "Zhin.js adapter for Satori protocol",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./lib/index.js",
|
|
@@ -41,13 +41,13 @@
|
|
|
41
41
|
"@types/node": "^25.8.0",
|
|
42
42
|
"@types/ws": "^8.18.1",
|
|
43
43
|
"typescript": "^6.0.3",
|
|
44
|
-
"@zhin.js/cli": "1.0.
|
|
45
|
-
"@zhin.js/client": "1.
|
|
46
|
-
"zhin.js": "1.0.
|
|
44
|
+
"@zhin.js/cli": "1.0.78",
|
|
45
|
+
"@zhin.js/client": "1.1.1",
|
|
46
|
+
"zhin.js": "1.0.82"
|
|
47
47
|
},
|
|
48
48
|
"peerDependencies": {
|
|
49
|
-
"zhin.js": "1.0.
|
|
50
|
-
"
|
|
49
|
+
"@zhin.js/http": "1.0.75",
|
|
50
|
+
"zhin.js": "1.0.82"
|
|
51
51
|
},
|
|
52
52
|
"peerDependenciesMeta": {
|
|
53
53
|
"@zhin.js/http": {
|
package/src/adapter.ts
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* 协议文档：https://satori.chat/zh-CN/introduction.html
|
|
4
4
|
*/
|
|
5
5
|
import type { Router } from '@zhin.js/http';
|
|
6
|
-
import { Adapter, Plugin } from 'zhin.js';
|
|
6
|
+
import { formatCompact, Adapter, Plugin } from 'zhin.js';
|
|
7
7
|
import { SatoriWsClient } from './bot-ws.js';
|
|
8
8
|
import { SatoriWebhookBot } from './bot-webhook.js';
|
|
9
9
|
import type {
|
|
@@ -42,6 +42,5 @@ export class SatoriAdapter extends Adapter<SatoriBot> {
|
|
|
42
42
|
this.#router = router;
|
|
43
43
|
});
|
|
44
44
|
await super.start();
|
|
45
|
-
this.plugin.logger.info('Satori 适配器已启动');
|
|
46
45
|
}
|
|
47
46
|
}
|
package/src/bot-webhook.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Satori WebHook Bot：应用提供 POST path，SDK 推送 EVENT（Satori-Opcode: 0）
|
|
3
3
|
*/
|
|
4
4
|
import { EventEmitter } from 'events';
|
|
5
|
-
import { Bot, Message,
|
|
5
|
+
import { formatCompact, Bot, Message, segment, SendOptions } from 'zhin.js';
|
|
6
6
|
import type { Router, RouterContext } from '@zhin.js/http';
|
|
7
7
|
import { callSatoriApi } from './api.js';
|
|
8
8
|
import type { SatoriWebhookConfig, SatoriEventBody, SatoriLogin } from './types.js';
|
|
@@ -40,7 +40,7 @@ export class SatoriWebhookBot extends EventEmitter implements Bot<SatoriWebhookC
|
|
|
40
40
|
async $connect(): Promise<void> {
|
|
41
41
|
const path = this.$config.path.startsWith('/') ? this.$config.path : `/${this.$config.path}`;
|
|
42
42
|
this.router.post(path, async (ctx: RouterContext) => {
|
|
43
|
-
const opcode = parseInt(ctx.
|
|
43
|
+
const opcode = parseInt(ctx.get('satori-opcode') ?? '', 10);
|
|
44
44
|
const body = ctx.request.body as SatoriEventBody | undefined;
|
|
45
45
|
if (opcode === SatoriOpcode.EVENT && body) {
|
|
46
46
|
if (body.login && !this.login) this.login = body.login;
|
|
@@ -49,7 +49,7 @@ export class SatoriWebhookBot extends EventEmitter implements Bot<SatoriWebhookC
|
|
|
49
49
|
ctx.status = 200;
|
|
50
50
|
ctx.body = {};
|
|
51
51
|
});
|
|
52
|
-
this.logger.info(
|
|
52
|
+
this.logger.info(formatCompact( { op: 'webhook', path }));
|
|
53
53
|
}
|
|
54
54
|
|
|
55
55
|
async $disconnect(): Promise<void> {
|
package/src/bot-ws.ts
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
import WebSocket from 'ws';
|
|
5
5
|
import { EventEmitter } from 'events';
|
|
6
6
|
import { clearInterval } from 'node:timers';
|
|
7
|
-
import { Bot, Message,
|
|
7
|
+
import { formatCompact, Bot, Message, segment, SendOptions } from 'zhin.js';
|
|
8
8
|
import { callSatoriApi } from './api.js';
|
|
9
9
|
import type { SatoriWsConfig, SatoriSignal, SatoriEventBody, SatoriLogin } from './types.js';
|
|
10
10
|
import { SatoriOpcode } from './types.js';
|
|
@@ -65,7 +65,12 @@ export class SatoriWsClient extends EventEmitter implements Bot<SatoriWsConfig,
|
|
|
65
65
|
const delay = 5000;
|
|
66
66
|
this.reconnectTimer = setTimeout(() => {
|
|
67
67
|
this.reconnectTimer = undefined;
|
|
68
|
-
this.$connect().catch((err) => this.logger.warn(
|
|
68
|
+
this.$connect().catch((err) => this.logger.warn(formatCompact( {
|
|
69
|
+
op: 'reconnect',
|
|
70
|
+
bot: this.$id,
|
|
71
|
+
ok: false,
|
|
72
|
+
error: err instanceof Error ? err.message : String(err),
|
|
73
|
+
})));
|
|
69
74
|
}, delay);
|
|
70
75
|
}
|
|
71
76
|
|
|
@@ -77,7 +82,7 @@ export class SatoriWsClient extends EventEmitter implements Bot<SatoriWsConfig,
|
|
|
77
82
|
|
|
78
83
|
this.ws.on('open', () => {
|
|
79
84
|
this.$connected = true;
|
|
80
|
-
this.logger.info(
|
|
85
|
+
this.logger.info(formatCompact({ bot: this.$id, mode: 'ws' }));
|
|
81
86
|
this.sendSignal(SatoriOpcode.IDENTIFY, {
|
|
82
87
|
token: this.$config.token,
|
|
83
88
|
sn: this.lastSn,
|
|
@@ -93,7 +98,7 @@ export class SatoriWsClient extends EventEmitter implements Bot<SatoriWsConfig,
|
|
|
93
98
|
const logins = signal.body.logins as SatoriLogin[];
|
|
94
99
|
this.login = logins[0];
|
|
95
100
|
if (!this.login?.platform || !this.login?.user?.id) {
|
|
96
|
-
this.logger.warn('
|
|
101
|
+
this.logger.warn(formatCompact( { op: 'ready', ok: false, error: 'missing platform/user' }));
|
|
97
102
|
}
|
|
98
103
|
} else if (signal.op === SatoriOpcode.EVENT && signal.body) {
|
|
99
104
|
if (signal.body.sn != null) this.lastSn = signal.body.sn as number;
|
|
@@ -108,13 +113,24 @@ export class SatoriWsClient extends EventEmitter implements Bot<SatoriWsConfig,
|
|
|
108
113
|
this.$connected = false;
|
|
109
114
|
const reasonStr = reason?.toString?.() || String(reason);
|
|
110
115
|
const codeHint = code === 1005 ? ' [无状态，多为服务端/代理未发 close 帧即断开]' : code === 1006 ? ' [异常关闭]' : '';
|
|
111
|
-
this.logger.warn(
|
|
116
|
+
this.logger.warn(formatCompact( {
|
|
117
|
+
op: 'disconnect',
|
|
118
|
+
bot: this.$config.name,
|
|
119
|
+
code,
|
|
120
|
+
error: `${reasonStr || 'closed'}${codeHint}`,
|
|
121
|
+
reconnect_ms: 5000,
|
|
122
|
+
}));
|
|
112
123
|
reject(new Error(`Satori WS closed: ${code} ${reasonStr}`));
|
|
113
124
|
this.scheduleReconnect();
|
|
114
125
|
});
|
|
115
126
|
|
|
116
127
|
this.ws.on('error', (error) => {
|
|
117
|
-
this.logger.warn(
|
|
128
|
+
this.logger.warn(formatCompact( {
|
|
129
|
+
op: 'ws_error',
|
|
130
|
+
bot: this.$config.name,
|
|
131
|
+
ok: false,
|
|
132
|
+
error: error instanceof Error ? error.message : String(error),
|
|
133
|
+
}));
|
|
118
134
|
reject(error);
|
|
119
135
|
});
|
|
120
136
|
});
|