@zhin.js/adapter-onebot11 1.0.98 → 2.0.1

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.
Files changed (32) hide show
  1. package/CHANGELOG.md +14 -3
  2. package/README.md +17 -17
  3. package/lib/adapter.d.ts +13 -12
  4. package/lib/adapter.d.ts.map +1 -1
  5. package/lib/adapter.js +44 -43
  6. package/lib/adapter.js.map +1 -1
  7. package/lib/{bot-ws-client.d.ts → endpoint-ws-client.d.ts} +3 -3
  8. package/lib/endpoint-ws-client.d.ts.map +1 -0
  9. package/lib/{bot-ws-client.js → endpoint-ws-client.js} +35 -31
  10. package/lib/endpoint-ws-client.js.map +1 -0
  11. package/lib/{bot-ws-server.d.ts → endpoint-ws-server.d.ts} +3 -3
  12. package/lib/endpoint-ws-server.d.ts.map +1 -0
  13. package/lib/{bot-ws-server.js → endpoint-ws-server.js} +20 -16
  14. package/lib/endpoint-ws-server.js.map +1 -0
  15. package/lib/index.d.ts +2 -2
  16. package/lib/index.d.ts.map +1 -1
  17. package/lib/index.js +13 -10
  18. package/lib/index.js.map +1 -1
  19. package/lib/types.d.ts +8 -1
  20. package/lib/types.d.ts.map +1 -1
  21. package/package.json +8 -7
  22. package/skills/onebot11/PERMITS.md +14 -0
  23. package/skills/onebot11/SKILL.md +2 -2
  24. package/src/adapter.ts +38 -36
  25. package/src/{bot-ws-client.ts → endpoint-ws-client.ts} +35 -31
  26. package/src/{bot-ws-server.ts → endpoint-ws-server.ts} +20 -16
  27. package/src/index.ts +12 -9
  28. package/src/types.ts +3 -1
  29. package/lib/bot-ws-client.d.ts.map +0 -1
  30. package/lib/bot-ws-client.js.map +0 -1
  31. package/lib/bot-ws-server.d.ts.map +0 -1
  32. package/lib/bot-ws-server.js.map +0 -1
package/lib/{bot-ws-server.js → endpoint-ws-server.js} RENAMED
@@ -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 { formatCompact, Message, Notice, Request, segment } from 'zhin.js';
7
+ import { formatCompact, Message, Notice, Request, segment, applyQqSenderRoleToMessageSender } from 'zhin.js';
8
8
  import { parseOneBotGetMsgResponse } from './onebot-get-msg.js';
9
9
  export class OneBot11WsServer extends EventEmitter {
10
10
  adapter;
@@ -31,7 +31,7 @@ export class OneBot11WsServer extends EventEmitter {
31
31
  }
32
32
  async $connect() {
33
33
  if (!this.$config.access_token) {
34
- this.logger.warn(formatCompact({ bot: this.$id, ok: false, error: 'missing access_token' }));
34
+ this.logger.warn(formatCompact({ endpoint: this.$id, ok: false, error: 'missing access_token' }));
35
35
  }
36
36
  this.#wss = this.router.ws(this.$config.path, {
37
37
  verifyClient: (info) => {
@@ -44,13 +44,13 @@ export class OneBot11WsServer extends EventEmitter {
44
44
  return true;
45
45
  },
46
46
  });
47
- this.logger.info(formatCompact({ op: 'listen', bot: this.$id, mode: 'wss', path: this.$config.path }));
47
+ this.logger.info(formatCompact({ op: 'listen', endpoint: this.$id, mode: 'wss', path: this.$config.path }));
48
48
  this.#wss.on('connection', (client, req) => {
49
49
  this.startHeartbeat();
50
- this.logger.info(formatCompact({ bot: this.$id, peer: req.socket.remoteAddress }));
50
+ this.logger.info(formatCompact({ endpoint: this.$id, peer: req.socket.remoteAddress }));
51
51
  client.on('error', (err) => this.logger.warn(formatCompact({
52
52
  op: 'ws_error',
53
- bot: this.$id,
53
+ endpoint: this.$id,
54
54
  ok: false,
55
55
  error: err instanceof Error ? err.message : String(err),
56
56
  })));
@@ -59,7 +59,7 @@ export class OneBot11WsServer extends EventEmitter {
59
59
  const codeHint = code === 1005 ? ' [无状态]' : code === 1006 ? ' [异常关闭]' : '';
60
60
  this.logger.warn(formatCompact({
61
61
  op: 'disconnect',
62
- bot: this.$id,
62
+ endpoint: this.$id,
63
63
  peer: req.socket.remoteAddress,
64
64
  code: code ?? '?',
65
65
  error: `${reasonStr || 'closed'}${codeHint}`,
@@ -102,11 +102,15 @@ export class OneBot11WsServer extends EventEmitter {
102
102
  const message = Message.from(onebotMsg, {
103
103
  $id: msgId,
104
104
  $adapter: 'onebot11',
105
- $bot: `${this.$config.name}`,
106
- $sender: {
107
- id: onebotMsg.user_id.toString(),
108
- name: onebotMsg.user_id.toString(),
109
- },
105
+ $endpoint: `${this.$config.name}`,
106
+ $sender: (() => {
107
+ const sender = {
108
+ id: onebotMsg.user_id.toString(),
109
+ name: onebotMsg.sender?.nickname || onebotMsg.sender?.card || onebotMsg.user_id.toString(),
110
+ };
111
+ applyQqSenderRoleToMessageSender(sender, onebotMsg.sender?.role);
112
+ return sender;
113
+ })(),
110
114
  $channel: channel,
111
115
  $content: content,
112
116
  $quote_id: quoteId,
@@ -121,7 +125,7 @@ export class OneBot11WsServer extends EventEmitter {
121
125
  return await this.$sendMessage({
122
126
  ...channel,
123
127
  context: 'onebot11',
124
- bot: `${this.$config.name}`,
128
+ endpoint: `${this.$config.name}`,
125
129
  content,
126
130
  });
127
131
  },
@@ -263,7 +267,7 @@ export class OneBot11WsServer extends EventEmitter {
263
267
  case 'connect':
264
268
  this.#clientMap.set(String(message.self_id), client);
265
269
  this.$connected = true;
266
- this.logger.info(formatCompact({ bot: this.$config.name, self_id: message.self_id }));
270
+ this.logger.info(formatCompact({ endpoint: this.$config.name, self_id: message.self_id }));
267
271
  break;
268
272
  }
269
273
  }
@@ -289,7 +293,7 @@ export class OneBot11WsServer extends EventEmitter {
289
293
  const notice = Notice.from(event, {
290
294
  $id: `${event.self_id}:${event.time}_${event.notice_type}_${event.group_id || event.user_id}`,
291
295
  $adapter: 'onebot11',
292
- $bot: this.$config.name,
296
+ $endpoint: this.$config.name,
293
297
  $type,
294
298
  $subType: event.sub_type,
295
299
  $channel: {
@@ -312,7 +316,7 @@ export class OneBot11WsServer extends EventEmitter {
312
316
  const request = Request.from(event, {
313
317
  $id: event.flag || `${self_id}:${event.time}_${event.request_type}_${event.user_id}`,
314
318
  $adapter: 'onebot11',
315
- $bot: this.$config.name,
319
+ $endpoint: this.$config.name,
316
320
  $type,
317
321
  $subType: event.sub_type,
318
322
  $channel: {
@@ -341,4 +345,4 @@ export class OneBot11WsServer extends EventEmitter {
341
345
  }, interval);
342
346
  }
343
347
  }
344
- //# sourceMappingURL=bot-ws-server.js.map
348
+ //# sourceMappingURL=endpoint-ws-server.js.map
package/lib/endpoint-ws-server.js.map ADDED
@@ -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
@@ -1,7 +1,7 @@
1
1
  import { OneBot11Adapter } from './adapter.js';
2
2
  export * from './types.js';
3
- export { OneBot11WsClient } from './bot-ws-client.js';
4
- export { OneBot11WsServer } from './bot-ws-server.js';
3
+ export { OneBot11WsClient } from './endpoint-ws-client.js';
4
+ export { OneBot11WsServer } from './endpoint-ws-server.js';
5
5
  export { OneBot11Adapter, type OneBot11Bot } from './adapter.js';
6
6
  declare module 'zhin.js' {
7
7
  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":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAEjE,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAU,MAAM,CAAC;QACf,UAAU,QAAQ;YAChB,MAAM,EAAE,OAAO,sBAAsB,EAAE,MAAM,CAAC;SAC/C;KACF;IACD,UAAU,QAAQ;QAChB,QAAQ,EAAE,eAAe,CAAC;KAC3B;CACF"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAEjE,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAU,MAAM,CAAC;QACf,UAAU,QAAQ;YAChB,MAAM,EAAE,OAAO,sBAAsB,EAAE,MAAM,CAAC;SAC/C;KACF;IACD,UAAU,QAAQ;QAChB,QAAQ,EAAE,eAAe,CAAC;KAC3B;CACF"}
package/lib/index.js CHANGED
@@ -1,11 +1,11 @@
1
1
  /**
2
2
  * OneBot11 适配器入口：单一适配器，支持正向 WS / 反向 WS（connection: ws | wss）
3
3
  */
4
- import { usePlugin, createGroupManagementTools } from 'zhin.js';
4
+ import { usePlugin, createGroupManagementTools, registerDefaultGroupPlatformPermitChecker } from 'zhin.js';
5
5
  import { OneBot11Adapter } from './adapter.js';
6
6
  export * from './types.js';
7
- export { OneBot11WsClient } from './bot-ws-client.js';
8
- export { OneBot11WsServer } from './bot-ws-server.js';
7
+ export { OneBot11WsClient } from './endpoint-ws-client.js';
8
+ export { OneBot11WsServer } from './endpoint-ws-server.js';
9
9
  export { OneBot11Adapter } from './adapter.js';
10
10
  const plugin = usePlugin();
11
11
  const { provide, useContext } = plugin;
@@ -22,8 +22,10 @@ provide({
22
22
  },
23
23
  });
24
24
  useContext('tool', 'onebot11', (toolService, onebot11) => {
25
+ const disposers = [];
26
+ disposers.push(registerDefaultGroupPlatformPermitChecker('onebot11'));
25
27
  const groupTools = createGroupManagementTools(onebot11, 'onebot11');
26
- const disposers = groupTools.map(t => toolService.addTool(t, plugin.name));
28
+ disposers.push(...groupTools.map(t => toolService.addTool(t, plugin.name)));
27
29
  // Platform-specific tool: set title
28
30
  disposers.push(toolService.addTool({
29
31
  name: 'onebot11_set_title',
@@ -31,20 +33,21 @@ useContext('tool', 'onebot11', (toolService, onebot11) => {
31
33
  parameters: {
32
34
  type: 'object',
33
35
  properties: {
34
- bot: { type: 'string', description: 'Bot 名称' },
36
+ endpoint_id: { type: 'string', description: 'Endpoint 名称', contextKey: 'endpointId' },
35
37
  group_id: { type: 'number', description: '目标群号' },
36
38
  user_id: { type: 'number', description: '目标成员 QQ号' },
37
39
  title: { type: 'string', description: '头衔文字' },
38
40
  },
39
- required: ['bot', 'group_id', 'user_id', 'title'],
41
+ required: ['endpoint_id', 'group_id', 'user_id', 'title'],
40
42
  },
41
43
  platforms: ['onebot11'],
42
44
  tags: ['onebot11'],
45
+ permissions: ['platform(onebot11,group_owner)'],
43
46
  execute: async (args) => {
44
- const bot = onebot11.bots.get(args.bot);
45
- if (!bot)
46
- throw new Error(`Bot ${args.bot} 不存在`);
47
- const success = await bot.setTitle(args.group_id, args.user_id, args.title);
47
+ const endpoint = onebot11.endpoints.get(args.endpoint_id);
48
+ if (!endpoint)
49
+ throw new Error(`Endpoint ${args.endpoint_id} 不存在`);
50
+ const success = await endpoint.setTitle(args.group_id, args.user_id, args.title);
48
51
  return { success, message: success ? `已将 ${args.user_id} 的头衔设为 "${args.title}"` : '设置失败' };
49
52
  },
50
53
  }, plugin.name));
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/lib/types.d.ts CHANGED
@@ -29,7 +29,7 @@ export interface OneBot11WsServerConfig extends OneBot11ConfigBase {
29
29
  path: string;
30
30
  heartbeat_interval?: number;
31
31
  }
32
- export type OneBot11BotConfig = OneBot11WsClientConfig | OneBot11WsServerConfig;
32
+ export type OneBot11EndpointConfig = OneBot11WsClientConfig | OneBot11WsServerConfig;
33
33
  export interface OneBot11Message {
34
34
  post_type: string;
35
35
  self_id: string;
@@ -38,6 +38,13 @@ export interface OneBot11Message {
38
38
  message_id: number;
39
39
  user_id: number;
40
40
  group_id?: number;
41
+ /** go-cqhttp / NapCat 等实现提供的群成员信息 */
42
+ sender?: {
43
+ role?: string;
44
+ nickname?: string;
45
+ card?: string;
46
+ title?: string;
47
+ };
41
48
  message: Array<{
42
49
  type: string;
43
50
  data: Record<string, any>;
package/lib/types.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,QAAQ,CAAC;IACpC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,6DAA6D;AAC7D,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,UAAU,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,qCAAqC;AACrC,MAAM,WAAW,sBAAuB,SAAQ,kBAAkB;IAChE,UAAU,EAAE,IAAI,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,oCAAoC;AACpC,MAAM,WAAW,sBAAuB,SAAQ,kBAAkB;IAChE,UAAU,EAAE,KAAK,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,MAAM,iBAAiB,GAAG,sBAAsB,GAAG,sBAAsB,CAAC;AAEhF,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KAAE,CAAC,CAAC;IAC5D,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,WAAW,CAAC,CAAC,GAAG,GAAG;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,CAAC,CAAC;IACR,IAAI,CAAC,EAAE,MAAM,CAAC;CACf"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,QAAQ,CAAC;IACpC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,6DAA6D;AAC7D,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,UAAU,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,qCAAqC;AACrC,MAAM,WAAW,sBAAuB,SAAQ,kBAAkB;IAChE,UAAU,EAAE,IAAI,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,oCAAoC;AACpC,MAAM,WAAW,sBAAuB,SAAQ,kBAAkB;IAChE,UAAU,EAAE,KAAK,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,MAAM,sBAAsB,GAAG,sBAAsB,GAAG,sBAAsB,CAAC;AAErF,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,qCAAqC;IACrC,MAAM,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7E,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KAAE,CAAC,CAAC;IAC5D,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,WAAW,CAAC,CAAC,GAAG,GAAG;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,CAAC,CAAC;IACR,IAAI,CAAC,EAAE,MAAM,CAAC;CACf"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zhin.js/adapter-onebot11",
3
- "version": "1.0.98",
3
+ "version": "2.0.1",
4
4
  "description": "Zhin.js adapter for OneBot v11 protocol",
5
5
  "type": "module",
6
6
  "main": "./lib/index.js",
@@ -47,16 +47,17 @@
47
47
  "ws": "^8.21.0"
48
48
  },
49
49
  "devDependencies": {
50
- "@types/node": "^25.9.1",
50
+ "@types/node": "^25.9.2",
51
51
  "@types/ws": "^8.18.1",
52
52
  "typescript": "^6.0.3",
53
- "@zhin.js/cli": "1.0.88",
54
- "@zhin.js/client": "2.0.2",
55
- "zhin.js": "1.0.93"
53
+ "@zhin.js/cli": "1.0.89",
54
+ "@zhin.js/client": "2.0.3",
55
+ "@zhin.js/host-router": "1.0.1",
56
+ "zhin.js": "2.0.1"
56
57
  },
57
58
  "peerDependencies": {
58
- "@zhin.js/host-router": "0.0.3",
59
- "zhin.js": "1.0.93"
59
+ "@zhin.js/host-router": "1.0.1",
60
+ "zhin.js": "2.0.1"
60
61
  },
61
62
  "peerDependenciesMeta": {
62
63
  "@zhin.js/host-router": {
package/skills/onebot11/PERMITS.md ADDED
@@ -0,0 +1,14 @@
1
+ # OneBot v11 Platform Permits（QQ 群）
2
+
3
+ ## 入站字段
4
+
5
+ `sender.role` 来自 OneBot 事件，经 `applyQqSenderRoleToMessageSender` 写入 `$sender.role`。
6
+
7
+ ## Permit 词汇表
8
+
9
+ | `platform(onebot11,…)` | 含义 |
10
+ |------------------------|------|
11
+ | `group_owner` | 群主 |
12
+ | `group_admin` | 群管理员（含群主） |
13
+
14
+ 工厂工具默认 `group_admin` / `group_owner`；扩展工具如 `onebot11_set_title` 使用 `group_owner`。
package/skills/onebot11/SKILL.md CHANGED
@@ -5,7 +5,7 @@ platforms:
5
5
  description: >-
6
6
  OneBot11 协议群管理能力。当用户在 QQ 群中请求踢人、禁言、设管理员、改群名片、
7
7
  设专属头衔、查成员列表或群信息时使用此技能。即使用户没有提到 OneBot，
8
- 只要 Bot 所在平台是 OneBot11 协议且涉及群管理操作，就应触发。
8
+ 只要 Endpoint 所在平台是 OneBot11 协议且涉及群管理操作，就应触发。
9
9
  仅有昵称时必须先查成员列表获取 user_id。
10
10
  keywords:
11
11
  - onebot
@@ -76,5 +76,5 @@ Bot 权限不足时 API 会报错，应向用户说明而非重试。
76
76
  ## 易错点
77
77
 
78
78
  1. **禁言 duration=0 是解禁**，不是永久禁言。最长可设 2592000（30 天）。
79
- 2. **头衔只有群主能设**，管理员也不行。用户说「加个头衔」但 Bot 不是群主时，告知无法操作。
79
+ 2. **头衔只有群主能设**，管理员也不行。用户说「加个头衔」但 Endpoint 不是群主时，告知无法操作。
80
80
  3. **OneBot11 与 NapCat/ICQQ 功能范围不同**：标准 OneBot11 不支持合并转发、精华消息、群文件等扩展功能，这些属于 NapCat 或 ICQQ 的增强。
package/src/adapter.ts CHANGED
@@ -3,24 +3,26 @@
3
3
  */
4
4
  import { formatCompact, Adapter, Plugin } from 'zhin.js';
5
5
  import type { Router } from '@zhin.js/host-router';
6
- import { OneBot11WsClient } from './bot-ws-client.js';
7
- import { OneBot11WsServer } from './bot-ws-server.js';
6
+ import { OneBot11WsClient } from './endpoint-ws-client.js';
7
+ import { OneBot11WsServer } from './endpoint-ws-server.js';
8
8
  import type {
9
9
  OneBot11WsClientConfig,
10
10
  OneBot11WsServerConfig,
11
- OneBot11BotConfig,
11
+ OneBot11EndpointConfig,
12
12
  } from './types.js';
13
13
 
14
14
  export type OneBot11Bot = OneBot11WsClient | OneBot11WsServer;
15
15
 
16
16
  export class OneBot11Adapter extends Adapter<OneBot11Bot> {
17
+ static override readonly capabilities = ['inbound', 'outbound'] as const;
18
+
17
19
  #router?: Router;
18
20
 
19
21
  constructor(plugin: Plugin) {
20
22
  super(plugin, 'onebot11', []);
21
23
  }
22
24
 
23
- createBot(config: OneBot11BotConfig): OneBot11Bot {
25
+ createEndpoint(config: OneBot11EndpointConfig): OneBot11Bot {
24
26
  const connection = config.connection ?? 'ws';
25
27
  switch (connection) {
26
28
  case 'ws':
@@ -35,46 +37,46 @@ export class OneBot11Adapter extends Adapter<OneBot11Bot> {
35
37
  }
36
38
  }
37
39
 
38
- async kickMember(botId: string, sceneId: string, userId: string) {
39
- const bot = this.bots.get(botId);
40
- if (!bot) throw new Error(`Bot ${botId} 不存在`);
41
- return bot.kickMember(Number(sceneId), Number(userId), false);
40
+ async kickMember(endpointId: string, sceneId: string, userId: string) {
41
+ const endpoint = this.endpoints.get(endpointId);
42
+ if (!endpoint) throw new Error(`Endpoint ${endpointId} 不存在`);
43
+ return endpoint.kickMember(Number(sceneId), Number(userId), false);
42
44
  }
43
45
 
44
- async muteMember(botId: string, sceneId: string, userId: string, duration = 600) {
45
- const bot = this.bots.get(botId);
46
- if (!bot) throw new Error(`Bot ${botId} 不存在`);
47
- return bot.muteMember(Number(sceneId), Number(userId), duration);
46
+ async muteMember(endpointId: string, sceneId: string, userId: string, duration = 600) {
47
+ const endpoint = this.endpoints.get(endpointId);
48
+ if (!endpoint) throw new Error(`Endpoint ${endpointId} 不存在`);
49
+ return endpoint.muteMember(Number(sceneId), Number(userId), duration);
48
50
  }
49
51
 
50
- async muteAll(botId: string, sceneId: string, enable = true) {
51
- const bot = this.bots.get(botId);
52
- if (!bot) throw new Error(`Bot ${botId} 不存在`);
53
- return bot.muteAll(Number(sceneId), enable);
52
+ async muteAll(endpointId: string, sceneId: string, enable = true) {
53
+ const endpoint = this.endpoints.get(endpointId);
54
+ if (!endpoint) throw new Error(`Endpoint ${endpointId} 不存在`);
55
+ return endpoint.muteAll(Number(sceneId), enable);
54
56
  }
55
57
 
56
- async setAdmin(botId: string, sceneId: string, userId: string, enable = true) {
57
- const bot = this.bots.get(botId);
58
- if (!bot) throw new Error(`Bot ${botId} 不存在`);
59
- return bot.setAdmin(Number(sceneId), Number(userId), enable);
58
+ async setAdmin(endpointId: string, sceneId: string, userId: string, enable = true) {
59
+ const endpoint = this.endpoints.get(endpointId);
60
+ if (!endpoint) throw new Error(`Endpoint ${endpointId} 不存在`);
61
+ return endpoint.setAdmin(Number(sceneId), Number(userId), enable);
60
62
  }
61
63
 
62
- async setMemberNickname(botId: string, sceneId: string, userId: string, nickname: string) {
63
- const bot = this.bots.get(botId);
64
- if (!bot) throw new Error(`Bot ${botId} 不存在`);
65
- return bot.setCard(Number(sceneId), Number(userId), nickname);
64
+ async setMemberNickname(endpointId: string, sceneId: string, userId: string, nickname: string) {
65
+ const endpoint = this.endpoints.get(endpointId);
66
+ if (!endpoint) throw new Error(`Endpoint ${endpointId} 不存在`);
67
+ return endpoint.setCard(Number(sceneId), Number(userId), nickname);
66
68
  }
67
69
 
68
- async setGroupName(botId: string, sceneId: string, name: string) {
69
- const bot = this.bots.get(botId);
70
- if (!bot) throw new Error(`Bot ${botId} 不存在`);
71
- return bot.setGroupName(Number(sceneId), name);
70
+ async setGroupName(endpointId: string, sceneId: string, name: string) {
71
+ const endpoint = this.endpoints.get(endpointId);
72
+ if (!endpoint) throw new Error(`Endpoint ${endpointId} 不存在`);
73
+ return endpoint.setGroupName(Number(sceneId), name);
72
74
  }
73
75
 
74
- async listMembers(botId: string, sceneId: string) {
75
- const bot = this.bots.get(botId);
76
- if (!bot) throw new Error(`Bot ${botId} 不存在`);
77
- const members = await bot.getMemberList(Number(sceneId));
76
+ async listMembers(endpointId: string, sceneId: string) {
77
+ const endpoint = this.endpoints.get(endpointId);
78
+ if (!endpoint) throw new Error(`Endpoint ${endpointId} 不存在`);
79
+ const members = await endpoint.getMemberList(Number(sceneId));
78
80
  return {
79
81
  members: members.map((m: any) => ({
80
82
  user_id: m.user_id,
@@ -87,10 +89,10 @@ export class OneBot11Adapter extends Adapter<OneBot11Bot> {
87
89
  };
88
90
  }
89
91
 
90
- async getGroupInfo(botId: string, sceneId: string) {
91
- const bot = this.bots.get(botId);
92
- if (!bot) throw new Error(`Bot ${botId} 不存在`);
93
- return bot.getGroupInfo(Number(sceneId));
92
+ async getGroupInfo(endpointId: string, sceneId: string) {
93
+ const endpoint = this.endpoints.get(endpointId);
94
+ if (!endpoint) throw new Error(`Endpoint ${endpointId} 不存在`);
95
+ return endpoint.getGroupInfo(Number(sceneId));
94
96
  }
95
97
 
96
98
  async start(): Promise<void> {