From b241adbfa400fe5095f3d7e9c4561d3e1751e783 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=8E=E5=A3=B0?= <lijiacheng.ljc@antgroup.com>
Date: Fri, 27 Sep 2024 13:55:47 +0800
Subject: [PATCH] fix: cache app and webhook

---
 __tests__/queue/base.test.ts  |  4 ++--
 src/queue/index.ts            |  8 ++++----
 src/queue/worker/github.ts    | 20 ++++++++++++++++++++
 src/runtime/cfworker/index.ts |  4 ++--
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/__tests__/queue/base.test.ts b/__tests__/queue/base.test.ts
index 818e74f..10b3a4a 100644
--- a/__tests__/queue/base.test.ts
+++ b/__tests__/queue/base.test.ts
@@ -1,4 +1,4 @@
-import { QueueConsumer } from '@/queue';
+import { QueueBatchConsumer } from '@/queue';
 import { BaseWorker } from '@/queue/worker';
 
 import { MockMessage, MockMessageBatch } from '../__mocks__/queue/message';
@@ -11,7 +11,7 @@ class Worker<T> extends BaseWorker<T> {
 
 describe('queue consumer', () => {
   it('can work', async () => {
-    const consumer = new QueueConsumer<FakeMessage>();
+    const consumer = new QueueBatchConsumer<FakeMessage>();
     const batch = createMessageBatch();
     const wk = new Worker<FakeMessage>();
     consumer.addWorker('test', wk);
diff --git a/src/queue/index.ts b/src/queue/index.ts
index baa625b..02ad423 100644
--- a/src/queue/index.ts
+++ b/src/queue/index.ts
@@ -6,7 +6,7 @@ import { TQueueMessage } from './types';
 import { BaseWorker } from './worker';
 import { GitHubEventWorker } from './worker/github';
 
-export class QueueConsumer<T extends { type: string }> {
+export class QueueBatchConsumer<T extends { type: string }> {
   logger = Logger.instance();
 
   private workerMap = new MultiMap<string, BaseWorker<T>>();
@@ -21,7 +21,7 @@ export class QueueConsumer<T extends { type: string }> {
       const workers = this.workerMap.get(v.body.type);
       if (!workers) {
         this.logger.error('no worker found for', v.body.type);
-        return;
+        continue;
       }
 
       for (const worker of workers) {
@@ -39,8 +39,8 @@ export class QueueConsumer<T extends { type: string }> {
   }
 }
 
-export const createConsumer = () => {
-  const consumer = new QueueConsumer<TQueueMessage>();
+export const createBatchConsumer = () => {
+  const consumer = new QueueBatchConsumer<TQueueMessage>();
   consumer.addWorker('github-app', new GitHubEventWorker('app'));
   consumer.addWorker('github-webhook', new GitHubEventWorker('webhook'));
   return consumer;
diff --git a/src/queue/worker/github.ts b/src/queue/worker/github.ts
index 1b2d36a..fe0ea4f 100644
--- a/src/queue/worker/github.ts
+++ b/src/queue/worker/github.ts
@@ -12,6 +12,7 @@ import { Logger } from '@/utils/logger';
 
 import { IGitHubEventQueueMessage } from '../types';
 
+import { memoize, pMemoize } from '@opensumi/ide-utils';
 import { BaseWorker } from '.';
 
 export function createUniqueMessageId(
@@ -50,7 +51,13 @@ export class GitHubEventWorker extends BaseWorker<IGitHubEventQueueMessage> {
     // do nothing
   }
 
+  private _appMap = new Map<string, IOctokitShape>();
   async createGitHubApp(botId: string): Promise<IOctokitShape | undefined> {
+    const cached = this._appMap.get(botId);
+    if (cached) {
+      return cached;
+    }
+
     const appSetting =
       await GitHubKVManager.instance().getAppSettingById(botId);
 
@@ -68,13 +75,22 @@ export class GitHubEventWorker extends BaseWorker<IGitHubEventQueueMessage> {
     }
 
     const app = await initApp(appSetting);
+    this._appMap.set(botId, {
+      webhooks: app.webhooks,
+      setting: appSetting,
+    });
     return {
       webhooks: app.webhooks,
       setting: appSetting,
     };
   }
 
+  private _webhookMap = new Map<string, IOctokitShape>();
   async createWebhook(botId: string): Promise<IOctokitShape | undefined> {
+    const cached = this._webhookMap.get(botId);
+    if (cached) {
+      return cached;
+    }
     const _setting = await GitHubKVManager.instance().getSettingById(botId);
     if (!_setting) {
       this.logger.error('github app worker error: setting not found', botId);
@@ -96,6 +112,10 @@ export class GitHubEventWorker extends BaseWorker<IGitHubEventQueueMessage> {
     });
     const setting = _setting;
 
+    this._webhookMap.set(botId, {
+      webhooks,
+      setting,
+    });
     return {
       webhooks,
       setting,
diff --git a/src/runtime/cfworker/index.ts b/src/runtime/cfworker/index.ts
index f748748..cf4544b 100644
--- a/src/runtime/cfworker/index.ts
+++ b/src/runtime/cfworker/index.ts
@@ -1,6 +1,6 @@
 import { ignition } from '@/api';
 import Environment from '@/env';
-import { createConsumer } from '@/queue';
+import { createBatchConsumer } from '@/queue';
 import { TQueueMessage } from '@/queue/types';
 import { RequiredField } from '@/types';
 import { Logger } from '@/utils/logger';
@@ -22,7 +22,7 @@ export default {
     const logger = Logger.instance();
     Environment.initialize(runtimeConfig, env);
 
-    const consumer = createConsumer();
+    const consumer = createBatchConsumer();
 
     consumer.push(...batch.messages);
     ctx.waitUntil(