@zhin.js/adapter-onebot12 0.0.32 → 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/bot-webhook.d.ts +1 -1
- package/lib/bot-webhook.d.ts.map +1 -1
- package/lib/bot-webhook.js +2 -1
- package/lib/bot-webhook.js.map +1 -1
- package/package.json +6 -6
- package/src/bot-webhook.ts +2 -2
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,EAAiB,GAAG,EAAE,OAAO,EAAW,WAAW,EAAE,MAAM,SAAS,CAAC;AAC5E,OAAO,KAAK,
|
|
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
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import { EventEmitter } from 'events';
|
|
5
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;
|
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,EAAE,aAAa,EAAO,OAAO,EAAE,OAAO,EAAe,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"bot-webhook.js","sourceRoot":"","sources":["../src/bot-webhook.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/
|
|
46
|
-
"@zhin.js/
|
|
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/bot-webhook.ts
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import { EventEmitter } from 'events';
|
|
5
5
|
import { formatCompact, Bot, Message, segment, SendOptions } from 'zhin.js';
|
|
6
|
-
import type
|
|
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;
|