refactor: add new dingbot adapter

libs/dingtalk-bot/package.json

@@ -22,11 +22,12 @@
   },
   "scripts": {
     "build": "tsc",
-    "watch": "tsc -w",
+    "watch": "../../node_modules/.bin/tsc -w",
     "test": "jest",
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
+    "@opensumi/bot-commander": "workspace:^",
     "@opensumi/workers-utils": "workspace:^",
     "dingtalk-stream": "^2.1.4"
   }

libs/dingtalk-bot/src/bot/base-adapter.ts

@@ -0,0 +1,11 @@
+import { Message, SendMessage } from '../types';
+
+export interface IBotAdapter {
+  id: string;
+  msg: Message;
+
+  replyText(text: string, contentExtra?: Record<string, any>): Promise<void>;
+  reply(content: SendMessage): Promise<void>;
+
+  handle(): Promise<void>;
+}

libs/dingtalk-bot/src/bot/dingtalk-adapter.ts

@@ -0,0 +1,53 @@
+import { CommandCenter, ICommandCenterOptions } from '@opensumi/bot-commander';
+import * as types from '../types';
+import { send } from '../utils';
+import { IBotAdapter } from './base-adapter';
+
+function prepare(s: string) {
+  return s.toString().trim();
+}
+
+export class DingBotAdapter<CommandCenterContext extends Record<string, any>>
+  implements IBotAdapter
+{
+  public cc: CommandCenter<CommandCenterContext>;
+
+  constructor(
+    public id: string,
+    public msg: types.Message,
+    public commandOptions?: ICommandCenterOptions<CommandCenterContext>,
+  ) {
+    this.cc = new CommandCenter(commandOptions);
+  }
+
+  public async getContext(): Promise<CommandCenterContext> {
+    return {} as CommandCenterContext;
+  }
+
+  async handle(options?: {
+    timeout?: number | null;
+  }) {
+    const msg = this.msg;
+    console.log(
+      `${this.id} receive dingtalk msg: `,
+      JSON.stringify(msg, null, 2),
+    );
+
+    // 其实目前钉钉机器人也就支持这一种消息类型
+    if (msg.msgtype === 'text') {
+      const text = prepare(msg.text.content);
+      console.log(`DingBot ~ handle ~ text`, text);
+
+      await this.cc.tryHandle(text, await this.getContext(), options);
+    }
+  }
+
+  async replyText(text: string, contentExtra: Record<string, any> = {}) {
+    await this.reply(types.compose(types.text(text), contentExtra));
+  }
+
+  async reply(content: types.SendMessage) {
+    console.log(`DingBot ~ reply:`, JSON.stringify(content));
+    await send(content, this.msg.sessionWebhook);
+  }
+}

libs/dingtalk-bot/src/bot/session.ts

@@ -0,0 +1,14 @@
+import { IBotAdapter } from './base-adapter';
+
+export class Session {
+  constructor(public impl: IBotAdapter) {}
+
+  async run() {
+    await this.impl.handle().catch(async (err: Error) => {
+      await this.impl.replyText(
+        `处理消息出错: ${(err as Error).message} ${(err as Error).stack}`,
+      );
+      throw err;
+    });
+  }
+}

libs/dingtalk-bot/src/index.ts

@@ -55,3 +55,7 @@ export async function verifyMessage(headers: Headers, token: string) {
     // return 'not valid ding msg, missing validation field';
   }
 }
+
+export { IBotAdapter } from './bot/base-adapter';
+export { DingBotAdapter } from './bot/dingtalk-adapter';
+export { Session } from './bot/session';

src/api/controllers/ding.ts

@@ -1,7 +1,6 @@
-import { Session } from '@/im/bot';
 import { DingBotAdapter } from '@/im/ding/bot';
 import { DingKVManager } from '@/kv/ding';
-import { verifyMessage } from '@opensumi/dingtalk-bot';
+import { Session, verifyMessage } from '@opensumi/dingtalk-bot';
 
 export function route(hono: THono) {
   hono.post('/ding/:id', async (c) => {
@@ -36,7 +35,6 @@ export function route(hono: THono) {
     }
 
     const session = new Session(
-      c,
       new DingBotAdapter(
         id,
         c,
@@ -47,7 +45,7 @@ export function route(hono: THono) {
       ),
     );
 
-    session.runInBackground();
+    c.executionCtx.waitUntil(session.run());
 
     return c.send.message('ok');
   });

src/im/commands/opensumi.ts

@@ -9,7 +9,7 @@ import {
 import { IBotAdapter } from '../types';
 
 import { KnownRepo } from './constants';
-import { Context, IMCommandCenter, IMCommandCenterContext } from './types';
+import { CommandCenterContext, Context, IMCommandCenter } from './types';
 import { hasApp, replyIfAppNotDefined } from './utils';
 
 /**
@@ -157,7 +157,7 @@ export function registerOpenSumiCommand(it: IMCommandCenter) {
 
 async function publishNextVersion(
   command: string,
-  { ctx, bot }: IMCommandCenterContext,
+  { ctx, bot }: CommandCenterContext,
   payload: ICommand<any>,
   repo: 'core' | 'codeblitz',
 ) {
@@ -217,7 +217,7 @@ async function publishNextVersion(
 }
 
 async function syncVersion(
-  { ctx, bot }: IMCommandCenterContext,
+  { ctx, bot }: CommandCenterContext,
   command: ICommand<any>,
   repo: 'core' | 'codeblitz',
 ) {

src/im/commands/types.ts

@@ -3,14 +3,15 @@ import { CommandCenter } from '@opensumi/bot-commander';
 import { Message } from '@opensumi/dingtalk-bot/lib/types';
 
 import { IBotAdapter } from '../types';
+
 export interface Context {
   message: Message;
   app?: App;
 }
 
-export interface IMCommandCenterContext {
+export type CommandCenterContext = {
   bot: IBotAdapter;
   ctx: Context;
-}
+};
 
-export type IMCommandCenter = CommandCenter<IMCommandCenterContext>;
+export type IMCommandCenter = CommandCenter<CommandCenterContext>;

src/im/ding/bot.ts

@@ -5,18 +5,15 @@ import { App, initApp } from '@/github/app';
 import { DingKVManager, DingUserKVManager } from '@/kv/ding';
 import { GitHubKVManager } from '@/kv/github';
 import { IDingBotSetting } from '@/kv/types';
-import * as types from '@opensumi/dingtalk-bot/lib/types';
+import { DingBotAdapter as BaseDingBotAdapter } from '@opensumi/dingtalk-bot';
 import { Message } from '@opensumi/dingtalk-bot/lib/types';
-import { send } from '@opensumi/dingtalk-bot/lib/utils';
 
-import { cc } from '../commands';
-import { IBotAdapter } from '../types';
+import { registerCommonCommand } from '../commands/common';
+import { registerGitHubCommand } from '../commands/github';
+import { registerOpenSumiCommand } from '../commands/opensumi';
+import { CommandCenterContext } from '../commands/types';
 
-function prepare(s: string) {
-  return s.toString().trim();
-}
-
-export class DingBotAdapter implements IBotAdapter {
+export class DingBotAdapter extends BaseDingBotAdapter<CommandCenterContext> {
   githubKVManager: GitHubKVManager;
   userInfoKVManager: DingUserKVManager;
 
@@ -28,50 +25,34 @@ export class DingBotAdapter implements IBotAdapter {
     public ctx: ExecutionContext,
     public setting: IDingBotSetting,
   ) {
+    super(id, msg, {
+      prefix: [''],
+    });
+
+    registerCommonCommand(this.cc);
+    registerGitHubCommand(this.cc);
+    registerOpenSumiCommand(this.cc);
+
     this.githubKVManager = GitHubKVManager.instance();
     this.userInfoKVManager = new DingUserKVManager();
   }
 
-  async handle() {
-    const msg = this.msg;
-    console.log(
-      `${this.id} receive dingtalk msg: `,
-      JSON.stringify(msg, null, 2),
-    );
+  override async handle(): Promise<void> {
+    super.handle({
+      timeout: Environment.instance().timeout,
+    });
+  }
 
+  override async getContext(): Promise<CommandCenterContext> {
     let app: App | undefined;
     const setting = await this.githubKVManager.getAppSettingById(this.id);
     if (setting) {
       app = await initApp(setting);
     }
 
-    // 其实目前钉钉机器人也就支持这一种消息类型
-    if (msg.msgtype === 'text') {
-      const text = prepare(msg.text.content);
-      console.log(`DingBot ~ handle ~ text`, text);
-
-      await cc.tryHandle(
-        text,
-        {
-          bot: this,
-          ctx: {
-            message: msg,
-            app,
-          },
-        },
-        {
-          timeout: Environment.instance().timeout,
-        },
-      );
-    }
-  }
-
-  async replyText(text: string, contentExtra: Record<string, any> = {}) {
-    await this.reply(types.compose(types.text(text), contentExtra));
-  }
-
-  async reply(content: types.SendMessage) {
-    console.log(`DingBot ~ reply:`, JSON.stringify(content));
-    await send(content, this.msg.sessionWebhook);
+    return {
+      bot: this,
+      ctx: { message: this.msg, app },
+    };
   }
 }

src/im/types.ts

@@ -1,14 +1,7 @@
 import type { DingKVManager, DingUserKVManager } from '@/kv/ding';
-import { Message, SendMessage } from '@opensumi/dingtalk-bot/lib/types';
+import { IBotAdapter as _IBotAdapter } from '@opensumi/dingtalk-bot/lib/bot/adapter';
 
-export interface IBotAdapter {
-  id: string;
+export interface IBotAdapter extends _IBotAdapter {
   kvManager: DingKVManager;
   userInfoKVManager: DingUserKVManager;
-  msg: Message;
-
-  replyText(text: string, contentExtra?: Record<string, any>): Promise<void>;
-  reply(content: SendMessage): Promise<void>;
-
-  handle(): Promise<void>;
 }

yarn.lock

@@ -2377,6 +2377,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@opensumi/dingtalk-bot@workspace:libs/dingtalk-bot"
   dependencies:
+    "@opensumi/bot-commander": "workspace:^"
     "@opensumi/workers-utils": "workspace:^"
     dingtalk-stream: "npm:^2.1.4"
   languageName: unknown