@zhin.js/adapter-onebot12 0.0.31 → 0.0.33
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 +1 -1
- package/lib/bot-webhook.d.ts.map +1 -1
- package/lib/bot-webhook.js +5 -4
- package/lib/bot-webhook.js.map +1 -1
- package/lib/bot-ws.d.ts.map +1 -1
- package/lib/bot-ws.js +21 -5
- package/lib/bot-ws.js.map +1 -1
- package/lib/bot-wss.d.ts.map +1 -1
- package/lib/bot-wss.js +14 -4
- package/lib/bot-wss.js.map +1 -1
- package/package.json +6 -6
- package/src/adapter.ts +1 -2
- package/src/bot-webhook.ts +5 -5
- package/src/bot-ws.ts +21 -5
- package/src/bot-wss.ts +14 -4
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,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,KAAK,EACV,iBAAiB,EAIlB,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,WAAW,GAAG,gBAAgB,GAAG,kBAAkB,GAAG,iBAAiB,CAAC;AAEpF,qBAAa,eAAgB,SAAQ,OAAO,CAAC,WAAW,CAAC;;gBAG3C,MAAM,EAAE,MAAM;IAI1B,SAAS,CAAC,MAAM,EAAE,iBAAiB,GAAG,WAAW;IAmB3C,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,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAUjD,MAAM,OAAO,eAAgB,SAAQ,OAAoB;IACvD,OAAO,CAAU;IAEjB,YAAY,MAAc;QACxB,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;IAChC,CAAC;IAED,SAAS,CAAC,MAAyB;QACjC,QAAQ,MAAM,CAAC,UAAU,EAAE,CAAC;YAC1B,KAAK,IAAI;gBACP,OAAO,IAAI,gBAAgB,CAAC,IAAI,EAAE,MAA0B,CAAC,CAAC;YAChE,KAAK,SAAS;gBACZ,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;oBAClB,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;gBACrF,CAAC;gBACD,OAAO,IAAI,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,MAA+B,CAAC,CAAC;YACrF,KAAK,KAAK;gBACR,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;oBAClB,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;gBACjF,CAAC;gBACD,OAAO,IAAI,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,MAA2B,CAAC,CAAC;YAChF;gBACE,MAAM,IAAI,KAAK,CAAC,gCAAiC,MAA4B,CAAC,UAAU,EAAE,CAAC,CAAC;QAChG,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
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import { EventEmitter } from 'events';
|
|
5
5
|
import { Bot, Message, SendOptions } from 'zhin.js';
|
|
6
|
-
import type
|
|
6
|
+
import { type Router } from '@zhin.js/http/router';
|
|
7
7
|
import type { OneBot12WebhookConfig, OneBot12Event } from './types.js';
|
|
8
8
|
import type { OneBot12Adapter } from './adapter.js';
|
|
9
9
|
export declare class OneBot12WebhookBot extends EventEmitter implements Bot<OneBot12WebhookConfig, OneBot12Event> {
|
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,EAAsB,KAAK,MAAM,EAAsB,MAAM,sBAAsB,CAAC;AAE3F,OAAO,KAAK,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAGpD,qBAAa,kBAAmB,SAAQ,YAAa,YAAW,GAAG,CAAC,qBAAqB,EAAE,aAAa,CAAC;IAQ9F,OAAO,EAAE,eAAe;IACxB,MAAM,EAAE,MAAM;IACd,OAAO,EAAE,qBAAqB;IATvC,UAAU,EAAE,OAAO,CAAQ;IAE3B,IAAI,MAAM,6BAET;gBAGQ,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,qBAAqB;IAKvC,IAAI,GAAG,WAEN;IAED,OAAO,CAAC,WAAW;IAKb,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBzB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAIlC,OAAO,CAAC,WAAW;IAQnB,cAAc,CAAC,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IA8BnD,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;IAwBnD,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAKhD"}
|
package/lib/bot-webhook.js
CHANGED
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
* OneBot 12 HTTP Webhook Bot：OneBot 实现 POST 事件到应用 path，可选 api_url 用于发消息
|
|
3
3
|
*/
|
|
4
4
|
import { EventEmitter } from 'events';
|
|
5
|
-
import { Message, segment } from 'zhin.js';
|
|
5
|
+
import { formatCompact, Message, segment } from 'zhin.js';
|
|
6
|
+
import { registerFetchRoute } from '@zhin.js/http/router';
|
|
6
7
|
import { callOneBot12Action } from './api.js';
|
|
7
8
|
import { formatOneBot12MessagePayload, isMessageEvent, contentToOb12Segments } from './utils.js';
|
|
8
9
|
export class OneBot12WebhookBot extends EventEmitter {
|
|
@@ -28,7 +29,7 @@ export class OneBot12WebhookBot extends EventEmitter {
|
|
|
28
29
|
}
|
|
29
30
|
async $connect() {
|
|
30
31
|
const path = this.$config.path.startsWith('/') ? this.$config.path : `/${this.$config.path}`;
|
|
31
|
-
this.router
|
|
32
|
+
registerFetchRoute(this.router, 'POST', path, async (ctx) => {
|
|
32
33
|
const body = ctx.request.body;
|
|
33
34
|
if (!body || typeof body !== 'object' || !body.id || body.time == null || !body.type) {
|
|
34
35
|
ctx.status = 400;
|
|
@@ -36,7 +37,7 @@ export class OneBot12WebhookBot extends EventEmitter {
|
|
|
36
37
|
return;
|
|
37
38
|
}
|
|
38
39
|
const token = this.$config.access_token;
|
|
39
|
-
const auth = ctx.
|
|
40
|
+
const auth = ctx.get('authorization');
|
|
40
41
|
if (token && auth !== `Bearer ${token}`) {
|
|
41
42
|
ctx.status = 401;
|
|
42
43
|
ctx.body = { message: 'Unauthorized' };
|
|
@@ -46,7 +47,7 @@ export class OneBot12WebhookBot extends EventEmitter {
|
|
|
46
47
|
ctx.status = 204;
|
|
47
48
|
ctx.body = undefined;
|
|
48
49
|
});
|
|
49
|
-
this.logger.info(
|
|
50
|
+
this.logger.info(formatCompact({ op: 'webhook', path }));
|
|
50
51
|
}
|
|
51
52
|
async $disconnect() {
|
|
52
53
|
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,EAAe,OAAO,EAAE,MAAM,
|
|
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;AAC5E,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAiD,MAAM,YAAY,CAAC;AACjH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAGpD,qBAAa,gBAAiB,SAAQ,YAAa,YAAW,GAAG,CAAC,gBAAgB,EAAE,aAAa,CAAC;IAY7E,OAAO,EAAE,eAAe;IAAS,OAAO,EAAE,gBAAgB;IAX7E,UAAU,EAAE,OAAO,CAAC;IACpB,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,CAAmH;IAE1I,IAAI,MAAM,6BAET;gBAEkB,OAAO,EAAE,eAAe,EAAS,OAAO,EAAE,gBAAgB;IAK7E,IAAI,GAAG,WAEN;IAED,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,iBAAiB;IAczB,OAAO,CAAC,UAAU;IAoBZ,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAyEzB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAqBlC,cAAc,CAAC,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IA8BnD,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;IAqBnD,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAGhD"}
|
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, clearTimeout } from 'node:timers';
|
|
7
|
-
import { Message, segment } from 'zhin.js';
|
|
7
|
+
import { formatCompact, Message, segment } from 'zhin.js';
|
|
8
8
|
import { formatOneBot12MessagePayload, isMessageEvent, contentToOb12Segments } from './utils.js';
|
|
9
9
|
export class OneBot12WsClient extends EventEmitter {
|
|
10
10
|
adapter;
|
|
@@ -39,7 +39,12 @@ export class OneBot12WsClient extends EventEmitter {
|
|
|
39
39
|
const delay = this.$config.reconnect_interval ?? 5000;
|
|
40
40
|
this.reconnectTimer = setTimeout(() => {
|
|
41
41
|
this.reconnectTimer = undefined;
|
|
42
|
-
this.$connect().catch((err) => this.logger.warn(
|
|
42
|
+
this.$connect().catch((err) => this.logger.warn(formatCompact({
|
|
43
|
+
op: 'reconnect',
|
|
44
|
+
bot: this.$id,
|
|
45
|
+
ok: false,
|
|
46
|
+
error: err instanceof Error ? err.message : String(err),
|
|
47
|
+
})));
|
|
43
48
|
}, delay);
|
|
44
49
|
}
|
|
45
50
|
callAction(action, params) {
|
|
@@ -76,7 +81,7 @@ export class OneBot12WsClient extends EventEmitter {
|
|
|
76
81
|
this.$connected = true;
|
|
77
82
|
const safeUrl = new URL(connectUrl);
|
|
78
83
|
safeUrl.searchParams.delete('access_token');
|
|
79
|
-
this.logger.info(
|
|
84
|
+
this.logger.info(formatCompact({ bot: this.$id, mode: 'ws' }));
|
|
80
85
|
this.startHeartbeat();
|
|
81
86
|
resolve();
|
|
82
87
|
});
|
|
@@ -111,12 +116,23 @@ export class OneBot12WsClient extends EventEmitter {
|
|
|
111
116
|
this.$connected = false;
|
|
112
117
|
const reasonStr = reason?.toString?.() || String(reason);
|
|
113
118
|
const codeHint = code === 1005 ? ' [无状态，多为服务端/代理未发 close 帧即断开]' : code === 1006 ? ' [异常关闭]' : '';
|
|
114
|
-
this.logger.warn(
|
|
119
|
+
this.logger.warn(formatCompact({
|
|
120
|
+
op: 'disconnect',
|
|
121
|
+
bot: this.$config.name,
|
|
122
|
+
code,
|
|
123
|
+
error: `${reasonStr || 'closed'}${codeHint}`,
|
|
124
|
+
reconnect_ms: this.$config.reconnect_interval ?? 5000,
|
|
125
|
+
}));
|
|
115
126
|
reject(new Error(`OneBot12 WS 关闭: ${code} ${reasonStr}`));
|
|
116
127
|
this.scheduleReconnect();
|
|
117
128
|
});
|
|
118
129
|
this.ws.on('error', (err) => {
|
|
119
|
-
this.logger.warn(
|
|
130
|
+
this.logger.warn(formatCompact({
|
|
131
|
+
op: 'ws_error',
|
|
132
|
+
bot: this.$config.name,
|
|
133
|
+
ok: false,
|
|
134
|
+
error: err instanceof Error ? err.message : String(err),
|
|
135
|
+
}));
|
|
120
136
|
reject(err);
|
|
121
137
|
});
|
|
122
138
|
});
|
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,YAAY,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAO,OAAO,
|
|
1
|
+
{"version":3,"file":"bot-ws.js","sourceRoot":"","sources":["../src/bot-ws.ts"],"names":[],"mappings":"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"}
|
package/lib/bot-wss.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bot-wss.d.ts","sourceRoot":"","sources":["../src/bot-wss.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,
|
|
1
|
+
{"version":3,"file":"bot-wss.d.ts","sourceRoot":"","sources":["../src/bot-wss.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,EAAiB,GAAG,EAAE,OAAO,EAAW,WAAW,EAAE,MAAM,SAAS,CAAC;AAC5E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAiD,MAAM,YAAY,CAAC;AAClH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAGpD,qBAAa,iBAAkB,SAAQ,YAAa,YAAW,GAAG,CAAC,iBAAiB,EAAE,aAAa,CAAC;;IAazF,OAAO,EAAE,eAAe;IACxB,MAAM,EAAE,MAAM;IACd,OAAO,EAAE,iBAAiB;IAdnC,UAAU,EAAE,OAAO,CAAS;IAG5B,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,eAAe,CAAmH;IAE1I,IAAI,MAAM,6BAET;gBAGQ,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,iBAAiB;IAKnC,IAAI,GAAG,WAEN;IAED,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,UAAU;IAmBZ,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAsEzB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBlC,cAAc,CAAC,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IA8BnD,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;IAmBnD,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAGhD"}
|
package/lib/bot-wss.js
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
import WebSocket from 'ws';
|
|
5
5
|
import { EventEmitter } from 'events';
|
|
6
6
|
import { clearInterval, clearTimeout } from 'node:timers';
|
|
7
|
-
import { Message, segment } from 'zhin.js';
|
|
7
|
+
import { formatCompact, Message, segment } from 'zhin.js';
|
|
8
8
|
import { formatOneBot12MessagePayload, isMessageEvent, contentToOb12Segments } from './utils.js';
|
|
9
9
|
export class OneBot12WssServer extends EventEmitter {
|
|
10
10
|
adapter;
|
|
@@ -68,7 +68,7 @@ export class OneBot12WssServer extends EventEmitter {
|
|
|
68
68
|
}
|
|
69
69
|
this.#client = ws;
|
|
70
70
|
this.$connected = true;
|
|
71
|
-
this.logger.info(
|
|
71
|
+
this.logger.info(formatCompact({ bot: this.$config.name, mode: 'wss' }));
|
|
72
72
|
ws.on('message', (data) => {
|
|
73
73
|
try {
|
|
74
74
|
const msg = JSON.parse(data.toString());
|
|
@@ -101,10 +101,20 @@ export class OneBot12WssServer extends EventEmitter {
|
|
|
101
101
|
this.#client = undefined;
|
|
102
102
|
const reasonStr = reason?.toString?.() || String(reason ?? '');
|
|
103
103
|
const codeHint = code === 1005 ? ' [无状态]' : code === 1006 ? ' [异常关闭]' : '';
|
|
104
|
-
this.logger.warn(
|
|
104
|
+
this.logger.warn(formatCompact({
|
|
105
|
+
op: 'disconnect',
|
|
106
|
+
bot: this.$config.name,
|
|
107
|
+
code: code ?? '?',
|
|
108
|
+
error: `${reasonStr || 'closed'}${codeHint}`,
|
|
109
|
+
}));
|
|
105
110
|
});
|
|
106
111
|
ws.on('error', (err) => {
|
|
107
|
-
this.logger.warn(
|
|
112
|
+
this.logger.warn(formatCompact({
|
|
113
|
+
op: 'ws_error',
|
|
114
|
+
bot: this.$config.name,
|
|
115
|
+
ok: false,
|
|
116
|
+
error: err instanceof Error ? err.message : String(err),
|
|
117
|
+
}));
|
|
108
118
|
});
|
|
109
119
|
});
|
|
110
120
|
}
|
package/lib/bot-wss.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bot-wss.js","sourceRoot":"","sources":["../src/bot-wss.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,SAA8B,MAAM,IAAI,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE1D,OAAO,EAAO,OAAO,
|
|
1
|
+
{"version":3,"file":"bot-wss.js","sourceRoot":"","sources":["../src/bot-wss.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zhin.js/adapter-onebot12",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.33",
|
|
4
4
|
"description": "Zhin.js adapter for OneBot 12 protocol",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./lib/index.js",
|
|
@@ -42,13 +42,13 @@
|
|
|
42
42
|
"@types/node": "^25.8.0",
|
|
43
43
|
"@types/ws": "^8.18.1",
|
|
44
44
|
"typescript": "^6.0.3",
|
|
45
|
-
"@zhin.js/cli": "1.0.
|
|
46
|
-
"@zhin.js/client": "1.
|
|
47
|
-
"zhin.js": "1.0.
|
|
45
|
+
"@zhin.js/cli": "1.0.79",
|
|
46
|
+
"@zhin.js/client": "1.1.2",
|
|
47
|
+
"zhin.js": "1.0.83"
|
|
48
48
|
},
|
|
49
49
|
"peerDependencies": {
|
|
50
|
-
"zhin.js": "1.0.
|
|
51
|
-
"@zhin.js/http": "1.0.
|
|
50
|
+
"zhin.js": "1.0.83",
|
|
51
|
+
"@zhin.js/http": "1.0.76"
|
|
52
52
|
},
|
|
53
53
|
"peerDependenciesMeta": {
|
|
54
54
|
"@zhin.js/http": {
|
package/src/adapter.ts
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* 协议文档：https://12.onebot.dev/
|
|
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 { OneBot12WsClient } from './bot-ws.js';
|
|
8
8
|
import { OneBot12WebhookBot } from './bot-webhook.js';
|
|
9
9
|
import { OneBot12WssServer } from './bot-wss.js';
|
|
@@ -48,6 +48,5 @@ export class OneBot12Adapter extends Adapter<OneBot12Bot> {
|
|
|
48
48
|
this.#router = router;
|
|
49
49
|
});
|
|
50
50
|
await super.start();
|
|
51
|
-
this.plugin.logger.info('OneBot12 适配器已启动');
|
|
52
51
|
}
|
|
53
52
|
}
|
package/src/bot-webhook.ts
CHANGED
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
* OneBot 12 HTTP Webhook Bot：OneBot 实现 POST 事件到应用 path，可选 api_url 用于发消息
|
|
3
3
|
*/
|
|
4
4
|
import { EventEmitter } from 'events';
|
|
5
|
-
import { Bot, Message,
|
|
6
|
-
import type
|
|
5
|
+
import { formatCompact, Bot, Message, segment, SendOptions } from 'zhin.js';
|
|
6
|
+
import { registerFetchRoute, type Router, type RouterContext } from '@zhin.js/http/router';
|
|
7
7
|
import { callOneBot12Action } from './api.js';
|
|
8
8
|
import type { OneBot12WebhookConfig, OneBot12Event } from './types.js';
|
|
9
9
|
import type { OneBot12Adapter } from './adapter.js';
|
|
@@ -35,7 +35,7 @@ export class OneBot12WebhookBot extends EventEmitter implements Bot<OneBot12Webh
|
|
|
35
35
|
|
|
36
36
|
async $connect(): Promise<void> {
|
|
37
37
|
const path = this.$config.path.startsWith('/') ? this.$config.path : `/${this.$config.path}`;
|
|
38
|
-
this.router
|
|
38
|
+
registerFetchRoute(this.router, 'POST', path, async (ctx: RouterContext) => {
|
|
39
39
|
const body = ctx.request.body as OneBot12Event | undefined;
|
|
40
40
|
if (!body || typeof body !== 'object' || !body.id || body.time == null || !body.type) {
|
|
41
41
|
ctx.status = 400;
|
|
@@ -43,7 +43,7 @@ export class OneBot12WebhookBot extends EventEmitter implements Bot<OneBot12Webh
|
|
|
43
43
|
return;
|
|
44
44
|
}
|
|
45
45
|
const token = this.$config.access_token;
|
|
46
|
-
const auth = ctx.
|
|
46
|
+
const auth = ctx.get('authorization');
|
|
47
47
|
if (token && auth !== `Bearer ${token}`) {
|
|
48
48
|
ctx.status = 401;
|
|
49
49
|
ctx.body = { message: 'Unauthorized' };
|
|
@@ -53,7 +53,7 @@ export class OneBot12WebhookBot extends EventEmitter implements Bot<OneBot12Webh
|
|
|
53
53
|
ctx.status = 204;
|
|
54
54
|
ctx.body = undefined;
|
|
55
55
|
});
|
|
56
|
-
this.logger.info(
|
|
56
|
+
this.logger.info(formatCompact( { op: 'webhook', path }));
|
|
57
57
|
}
|
|
58
58
|
|
|
59
59
|
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, clearTimeout } from 'node:timers';
|
|
7
|
-
import { Bot, Message,
|
|
7
|
+
import { formatCompact, Bot, Message, segment, SendOptions } from 'zhin.js';
|
|
8
8
|
import type { OneBot12WsConfig, OneBot12Event, OneBot12ActionRequest, OneBot12ActionResponse } from './types.js';
|
|
9
9
|
import type { OneBot12Adapter } from './adapter.js';
|
|
10
10
|
import { formatOneBot12MessagePayload, isMessageEvent, contentToOb12Segments } from './utils.js';
|
|
@@ -42,7 +42,12 @@ export class OneBot12WsClient extends EventEmitter implements Bot<OneBot12WsConf
|
|
|
42
42
|
const delay = this.$config.reconnect_interval ?? 5000;
|
|
43
43
|
this.reconnectTimer = setTimeout(() => {
|
|
44
44
|
this.reconnectTimer = undefined;
|
|
45
|
-
this.$connect().catch((err) => this.logger.warn(
|
|
45
|
+
this.$connect().catch((err) => this.logger.warn(formatCompact( {
|
|
46
|
+
op: 'reconnect',
|
|
47
|
+
bot: this.$id,
|
|
48
|
+
ok: false,
|
|
49
|
+
error: err instanceof Error ? err.message : String(err),
|
|
50
|
+
})));
|
|
46
51
|
}, delay);
|
|
47
52
|
}
|
|
48
53
|
|
|
@@ -82,7 +87,7 @@ export class OneBot12WsClient extends EventEmitter implements Bot<OneBot12WsConf
|
|
|
82
87
|
this.$connected = true;
|
|
83
88
|
const safeUrl = new URL(connectUrl);
|
|
84
89
|
safeUrl.searchParams.delete('access_token');
|
|
85
|
-
this.logger.info(
|
|
90
|
+
this.logger.info(formatCompact({ bot: this.$id, mode: 'ws' }));
|
|
86
91
|
this.startHeartbeat();
|
|
87
92
|
resolve();
|
|
88
93
|
});
|
|
@@ -116,13 +121,24 @@ export class OneBot12WsClient extends EventEmitter implements Bot<OneBot12WsConf
|
|
|
116
121
|
this.$connected = false;
|
|
117
122
|
const reasonStr = reason?.toString?.() || String(reason);
|
|
118
123
|
const codeHint = code === 1005 ? ' [无状态，多为服务端/代理未发 close 帧即断开]' : code === 1006 ? ' [异常关闭]' : '';
|
|
119
|
-
this.logger.warn(
|
|
124
|
+
this.logger.warn(formatCompact( {
|
|
125
|
+
op: 'disconnect',
|
|
126
|
+
bot: this.$config.name,
|
|
127
|
+
code,
|
|
128
|
+
error: `${reasonStr || 'closed'}${codeHint}`,
|
|
129
|
+
reconnect_ms: this.$config.reconnect_interval ?? 5000,
|
|
130
|
+
}));
|
|
120
131
|
reject(new Error(`OneBot12 WS 关闭: ${code} ${reasonStr}`));
|
|
121
132
|
this.scheduleReconnect();
|
|
122
133
|
});
|
|
123
134
|
|
|
124
135
|
this.ws.on('error', (err) => {
|
|
125
|
-
this.logger.warn(
|
|
136
|
+
this.logger.warn(formatCompact( {
|
|
137
|
+
op: 'ws_error',
|
|
138
|
+
bot: this.$config.name,
|
|
139
|
+
ok: false,
|
|
140
|
+
error: err instanceof Error ? err.message : String(err),
|
|
141
|
+
}));
|
|
126
142
|
reject(err);
|
|
127
143
|
});
|
|
128
144
|
});
|
package/src/bot-wss.ts
CHANGED
|
@@ -5,7 +5,7 @@ import WebSocket, { WebSocketServer } from 'ws';
|
|
|
5
5
|
import { EventEmitter } from 'events';
|
|
6
6
|
import { clearInterval, clearTimeout } from 'node:timers';
|
|
7
7
|
import { IncomingMessage } from 'http';
|
|
8
|
-
import { Bot, Message,
|
|
8
|
+
import { formatCompact, Bot, Message, segment, SendOptions } from 'zhin.js';
|
|
9
9
|
import type { Router } from '@zhin.js/http';
|
|
10
10
|
import type { OneBot12WssConfig, OneBot12Event, OneBot12ActionRequest, OneBot12ActionResponse } from './types.js';
|
|
11
11
|
import type { OneBot12Adapter } from './adapter.js';
|
|
@@ -77,7 +77,7 @@ export class OneBot12WssServer extends EventEmitter implements Bot<OneBot12WssCo
|
|
|
77
77
|
}
|
|
78
78
|
this.#client = ws;
|
|
79
79
|
this.$connected = true;
|
|
80
|
-
this.logger.info(
|
|
80
|
+
this.logger.info(formatCompact({ bot: this.$config.name, mode: 'wss' }));
|
|
81
81
|
|
|
82
82
|
ws.on('message', (data) => {
|
|
83
83
|
try {
|
|
@@ -109,11 +109,21 @@ export class OneBot12WssServer extends EventEmitter implements Bot<OneBot12WssCo
|
|
|
109
109
|
this.#client = undefined;
|
|
110
110
|
const reasonStr = reason?.toString?.() || String(reason ?? '');
|
|
111
111
|
const codeHint = code === 1005 ? ' [无状态]' : code === 1006 ? ' [异常关闭]' : '';
|
|
112
|
-
this.logger.warn(
|
|
112
|
+
this.logger.warn(formatCompact( {
|
|
113
|
+
op: 'disconnect',
|
|
114
|
+
bot: this.$config.name,
|
|
115
|
+
code: code ?? '?',
|
|
116
|
+
error: `${reasonStr || 'closed'}${codeHint}`,
|
|
117
|
+
}));
|
|
113
118
|
});
|
|
114
119
|
|
|
115
120
|
ws.on('error', (err) => {
|
|
116
|
-
this.logger.warn(
|
|
121
|
+
this.logger.warn(formatCompact( {
|
|
122
|
+
op: 'ws_error',
|
|
123
|
+
bot: this.$config.name,
|
|
124
|
+
ok: false,
|
|
125
|
+
error: err instanceof Error ? err.message : String(err),
|
|
126
|
+
}));
|
|
117
127
|
});
|
|
118
128
|
});
|
|
119
129
|
}
|