@zhin.js/adapter-kook 1.0.7 → 1.0.8

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 CHANGED
@@ -1,5 +1,14 @@
1
1
  # @zhin.js/adapter-kook
2
2
 
3
+ ## 1.0.8
4
+
5
+ ### Patch Changes
6
+
7
+ - 551c4d2: fix: 插件支持配置文件读取,优化 test 用例
8
+ - Updated dependencies [551c4d2]
9
+ - @zhin.js/types@1.0.3
10
+ - zhin.js@1.0.8
11
+
3
12
  ## 1.0.7
4
13
 
5
14
  ### Patch Changes
package/lib/index.d.ts CHANGED
@@ -1,11 +1,11 @@
1
1
  import { Client, PrivateMessageEvent, ChannelMessageEvent, Sendable } from "kook-client";
2
- import { Bot, BotConfig, Adapter, Plugin, Message, SendOptions, MessageSegment, SendContent } from "zhin.js";
2
+ import { Bot, Adapter, Message, SendOptions, MessageSegment, SendContent } from "zhin.js";
3
3
  declare module '@zhin.js/types' {
4
4
  interface RegisteredAdapters {
5
5
  kook: Adapter<KookBot>;
6
6
  }
7
7
  }
8
- export interface KookBotConfig extends BotConfig, Client.Config {
8
+ export interface KookBotConfig extends Bot.Config, Client.Config {
9
9
  context: 'kook';
10
10
  name: `${number}`;
11
11
  }
@@ -13,9 +13,8 @@ export interface KookBot {
13
13
  $config: KookBotConfig;
14
14
  }
15
15
  export declare class KookBot extends Client implements Bot<PrivateMessageEvent | ChannelMessageEvent, KookBotConfig> {
16
- private plugin;
17
16
  $connected?: boolean;
18
- constructor(plugin: Plugin, config: KookBotConfig);
17
+ constructor(config: KookBotConfig);
19
18
  $formatMessage(msg: PrivateMessageEvent | ChannelMessageEvent): Message<PrivateMessageEvent | ChannelMessageEvent>;
20
19
  $connect(): Promise<void>;
21
20
  $disconnect(): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,mBAAmB,EAA+B,mBAAmB,EAAE,QAAQ,EAAC,MAAM,aAAa,CAAC;AAErH,OAAO,EACH,GAAG,EACH,SAAS,EACT,OAAO,EACP,MAAM,EAEN,OAAO,EACP,WAAW,EACX,cAAc,EACd,WAAW,EAEd,MAAM,SAAS,CAAC;AACjB,OAAO,QAAQ,gBAAgB,CAAA;IAC3B,UAAU,kBAAkB;QACxB,IAAI,EAAC,OAAO,CAAC,OAAO,CAAC,CAAA;KACxB;CACJ;AACD,MAAM,WAAW,aAAc,SAAQ,SAAS,EAAC,MAAM,CAAC,MAAM;IAC1D,OAAO,EAAC,MAAM,CAAA;IACd,IAAI,EAAC,GAAG,MAAM,EAAE,CAAA;CACnB;AACD,MAAM,WAAW,OAAO;IACpB,OAAO,EAAC,aAAa,CAAA;CACxB;AACD,qBAAa,OAAQ,SAAQ,MAAO,YAAW,GAAG,CAAC,mBAAmB,GAAC,mBAAmB,EAAC,aAAa,CAAC;IAEzF,OAAO,CAAC,MAAM;IAD1B,UAAU,CAAC,EAAC,OAAO,CAAA;gBACC,MAAM,EAAC,MAAM,EAAC,MAAM,EAAC,aAAa;IAMtD,cAAc,CAAC,GAAG,EAAE,mBAAmB,GAAG,mBAAmB;IA8BvD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAMzB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;IAmBnD,cAAc,CAAC,EAAE,EAAC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC;IAO7C,OAAO,CAAC,iBAAiB;CAO5B;AACD,yBAAiB,OAAO,CAAA;IACpB,SAAgB,UAAU,CAAC,OAAO,EAAC,QAAQ,GAAE,cAAc,EAAE,CAO5D;IACD,SAAgB,UAAU,CAAC,OAAO,EAAC,WAAW,GAAE,QAAQ,CAOvD;CACJ"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,mBAAmB,EAA+B,mBAAmB,EAAE,QAAQ,EAAC,MAAM,aAAa,CAAC;AAErH,OAAO,EACH,GAAG,EACH,OAAO,EAEP,OAAO,EACP,WAAW,EACX,cAAc,EACd,WAAW,EAGd,MAAM,SAAS,CAAC;AACjB,OAAO,QAAQ,gBAAgB,CAAA;IAC3B,UAAU,kBAAkB;QACxB,IAAI,EAAC,OAAO,CAAC,OAAO,CAAC,CAAA;KACxB;CACJ;AAED,MAAM,WAAW,aAAc,SAAQ,GAAG,CAAC,MAAM,EAAC,MAAM,CAAC,MAAM;IAC3D,OAAO,EAAC,MAAM,CAAA;IACd,IAAI,EAAC,GAAG,MAAM,EAAE,CAAA;CACnB;AACD,MAAM,WAAW,OAAO;IACpB,OAAO,EAAC,aAAa,CAAA;CACxB;AACD,qBAAa,OAAQ,SAAQ,MAAO,YAAW,GAAG,CAAC,mBAAmB,GAAC,mBAAmB,EAAC,aAAa,CAAC;IACrG,UAAU,CAAC,EAAC,OAAO,CAAA;gBACP,MAAM,EAAC,aAAa;IAMhC,cAAc,CAAC,GAAG,EAAE,mBAAmB,GAAG,mBAAmB;IA8BvD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAMzB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;IAmBnD,cAAc,CAAC,EAAE,EAAC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC;IAO7C,OAAO,CAAC,iBAAiB;CAO5B;AACD,yBAAiB,OAAO,CAAA;IACpB,SAAgB,UAAU,CAAC,OAAO,EAAC,QAAQ,GAAE,cAAc,EAAE,CAO5D;IACD,SAAgB,UAAU,CAAC,OAAO,EAAC,WAAW,GAAE,QAAQ,CAOvD;CACJ"}
package/lib/index.js CHANGED
@@ -1,14 +1,13 @@
1
1
  import { Client } from "kook-client";
2
2
  import path from "path";
3
- import { Adapter, registerAdapter, Message, segment } from "zhin.js";
3
+ import { Adapter, registerAdapter, Message, segment, usePlugin } from "zhin.js";
4
+ const plugin = usePlugin();
4
5
  export class KookBot extends Client {
5
- plugin;
6
6
  $connected;
7
- constructor(plugin, config) {
7
+ constructor(config) {
8
8
  if (!config.data_dir)
9
9
  config.data_dir = path.join(process.cwd(), 'data');
10
10
  super(config);
11
- this.plugin = plugin;
12
11
  this.$config = config;
13
12
  }
14
13
  $formatMessage(msg) {
@@ -52,17 +51,17 @@ export class KookBot extends Client {
52
51
  this.$connected = false;
53
52
  }
54
53
  async $sendMessage(options) {
55
- options = await this.plugin.app.handleBeforeSend(options);
54
+ options = await plugin.app.handleBeforeSend(options);
56
55
  switch (options.type) {
57
56
  case 'private': {
58
57
  const result = await this.sendPrivateMsg(options.id, KookBot.toSendable(options.content));
59
- this.plugin.logger.info(`send ${options.type}(${options.id}):${segment.raw(options.content)}`);
58
+ plugin.logger.info(`send ${options.type}(${options.id}):${segment.raw(options.content)}`);
60
59
  return `private-${options.id}:${result.msg_id.toString()}`;
61
60
  break;
62
61
  }
63
62
  case "channel": {
64
63
  const result = await this.sendChannelMsg(options.id, KookBot.toSendable(options.content));
65
- this.plugin.logger.info(`send ${options.type}(${options.id}):${segment.raw(options.content)}`);
64
+ plugin.logger.info(`send ${options.type}(${options.id}):${segment.raw(options.content)}`);
66
65
  return `channel-${options.id}:${result.msg_id.toString()}`;
67
66
  break;
68
67
  }
@@ -81,9 +80,9 @@ export class KookBot extends Client {
81
80
  }
82
81
  handleKookMessage(msg) {
83
82
  const message = this.$formatMessage(msg);
84
- this.plugin.dispatch('message.receive', message);
85
- this.plugin.logger.info(`recv ${message.$channel.type}(${message.$channel.id}):${segment.raw(message.$content)}`);
86
- this.plugin.dispatch(`message.${message.$channel.type}.receive`, message);
83
+ plugin.dispatch('message.receive', message);
84
+ plugin.logger.info(`recv ${message.$channel.type}(${message.$channel.id}):${segment.raw(message.$content)}`);
85
+ plugin.dispatch(`message.${message.$channel.type}.receive`, message);
87
86
  }
88
87
  }
89
88
  (function (KookBot) {
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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zhin.js/adapter-kook",
3
- "version": "1.0.7",
3
+ "version": "1.0.8",
4
4
  "description": "zhin adapter for kook",
5
5
  "type": "module",
6
6
  "main": "./lib/index.js",
@@ -18,8 +18,8 @@
18
18
  "typescript": "^5.3.0"
19
19
  },
20
20
  "peerDependencies": {
21
- "zhin.js": "1.0.7",
22
- "@zhin.js/types": "1.0.2"
21
+ "zhin.js": "1.0.8",
22
+ "@zhin.js/types": "1.0.3"
23
23
  },
24
24
  "peerDependenciesMeta": {
25
25
  "@zhin.js/types": {
package/src/index.ts CHANGED
@@ -2,22 +2,22 @@ import { Client, PrivateMessageEvent,MessageSegment as MessageElem,ChannelMessag
2
2
  import path from "path";
3
3
  import {
4
4
  Bot,
5
- BotConfig,
6
5
  Adapter,
7
- Plugin,
8
6
  registerAdapter,
9
7
  Message,
10
8
  SendOptions,
11
9
  MessageSegment,
12
10
  SendContent,
13
- segment
11
+ segment,
12
+ usePlugin
14
13
  } from "zhin.js";
15
14
  declare module '@zhin.js/types'{
16
15
  interface RegisteredAdapters{
17
16
  kook:Adapter<KookBot>
18
17
  }
19
18
  }
20
- export interface KookBotConfig extends BotConfig,Client.Config{
19
+ const plugin =usePlugin()
20
+ export interface KookBotConfig extends Bot.Config,Client.Config{
21
21
  context:'kook'
22
22
  name:`${number}`
23
23
  }
@@ -26,7 +26,7 @@ export interface KookBot{
26
26
  }
27
27
  export class KookBot extends Client implements Bot<PrivateMessageEvent|ChannelMessageEvent,KookBotConfig>{
28
28
  $connected?:boolean
29
- constructor(private plugin:Plugin,config:KookBotConfig) {
29
+ constructor(config:KookBotConfig) {
30
30
  if(!config.data_dir) config.data_dir=path.join(process.cwd(),'data')
31
31
  super(config);
32
32
  this.$config=config;
@@ -74,17 +74,17 @@ export class KookBot extends Client implements Bot<PrivateMessageEvent|ChannelMe
74
74
  }
75
75
 
76
76
  async $sendMessage(options: SendOptions): Promise<string> {
77
- options=await this.plugin.app.handleBeforeSend(options)
77
+ options=await plugin.app.handleBeforeSend(options)
78
78
  switch (options.type){
79
79
  case 'private':{
80
80
  const result= await this.sendPrivateMsg(options.id,KookBot.toSendable(options.content));
81
- this.plugin.logger.info(`send ${options.type}(${options.id}):${segment.raw(options.content)}`);
81
+ plugin.logger.info(`send ${options.type}(${options.id}):${segment.raw(options.content)}`);
82
82
  return `private-${options.id}:${(result as unknown as {msg_id:string}).msg_id.toString()}`
83
83
  break;
84
84
  }
85
85
  case "channel":{
86
86
  const result=await this.sendChannelMsg(options.id,KookBot.toSendable(options.content));
87
- this.plugin.logger.info(`send ${options.type}(${options.id}):${segment.raw(options.content)}`);
87
+ plugin.logger.info(`send ${options.type}(${options.id}):${segment.raw(options.content)}`);
88
88
  return `channel-${options.id}:${(result as unknown as {msg_id:string}).msg_id.toString()}`
89
89
  break;
90
90
  }
@@ -101,9 +101,9 @@ export class KookBot extends Client implements Bot<PrivateMessageEvent|ChannelMe
101
101
 
102
102
  private handleKookMessage(msg: PrivateMessageEvent|ChannelMessageEvent): void {
103
103
  const message=this.$formatMessage(msg)
104
- this.plugin.dispatch('message.receive',message)
105
- this.plugin.logger.info(`recv ${message.$channel.type}(${message.$channel.id}):${segment.raw(message.$content)}`)
106
- this.plugin.dispatch(`message.${message.$channel.type}.receive`,message)
104
+ plugin.dispatch('message.receive',message)
105
+ plugin.logger.info(`recv ${message.$channel.type}(${message.$channel.id}):${segment.raw(message.$content)}`)
106
+ plugin.dispatch(`message.${message.$channel.type}.receive`,message)
107
107
  }
108
108
 
109
109
  }