fix(msteams): bound team group lookup cache (#102814)

steipete · sunlit-deng · web-flow · commit f6b990124353 · 2026-07-09T14:31:45.000+01:00
Co-authored-by: sunlit-deng &lt;yang.jiajun1@xydigit.com&gt;
diff --git a/extensions/msteams/src/graph-thread.test.ts b/extensions/msteams/src/graph-thread.test.ts
@@ -123,6 +123,37 @@ describe("resolveTeamGroupId", () => {
     const result = await resolveTeamGroupId("tok", "team-fallback");
     expect(result).toBe("team-fallback");
   });
+
+  it("caps cache at 500 entries — evicts oldest on overflow", async () => {
+    vi.mocked(fetchGraphJson).mockResolvedValue({ id: "group-guid" } as never);
+
+    const token = "test-token";
+    for (let i = 0; i < 500; i++) {
+      await resolveTeamGroupId(token, `team-${i}`);
+    }
+    expect(_teamGroupIdCacheForTest.size).toBe(500);
+    expect(_teamGroupIdCacheForTest.has("team-0")).toBe(true);
+    expect(_teamGroupIdCacheForTest.has("team-499")).toBe(true);
+
+    vi.mocked(fetchGraphJson).mockClear();
+    await resolveTeamGroupId(token, "team-500");
+    expect(fetchGraphJson).toHaveBeenCalledTimes(1);
+    expect(_teamGroupIdCacheForTest.size).toBe(500);
+    expect(_teamGroupIdCacheForTest.has("team-0")).toBe(false);
+    expect(_teamGroupIdCacheForTest.has("team-500")).toBe(true);
+
+    vi.mocked(fetchGraphJson).mockClear();
+    await resolveTeamGroupId(token, "team-0");
+    expect(fetchGraphJson).toHaveBeenCalledTimes(1);
+    expect(_teamGroupIdCacheForTest.size).toBe(500);
+    expect(_teamGroupIdCacheForTest.has("team-1")).toBe(false);
+    expect(_teamGroupIdCacheForTest.has("team-500")).toBe(true);
+
+    // team-500 remains cached after team-0 is reinserted at the insertion-order tail.
+    vi.mocked(fetchGraphJson).mockClear();
+    await resolveTeamGroupId(token, "team-500");
+    expect(fetchGraphJson).toHaveBeenCalledTimes(0);
+  });
 });
 
 describe("fetchChannelMessage", () => {
diff --git a/extensions/msteams/src/graph-thread.ts b/extensions/msteams/src/graph-thread.ts
@@ -1,4 +1,5 @@
 // Msteams plugin module implements graph thread behavior.
+import { pruneMapToMaxSize } from "openclaw/plugin-sdk/collection-runtime";
 import {
   asDateTimestampMs,
   resolveExpiresAtMsFromDurationMs,
@@ -15,9 +16,11 @@ export type GraphThreadMessage = {
   createdDateTime?: string;
 };
 
-// TTL cache for team ID -> group GUID mapping.
+// Successful lookups use a 10-minute TTL and a 500-entry insertion-order cap.
+// Pruning after insert evicts the oldest team IDs before this process cache grows unbounded.
 const teamGroupIdCache = new Map<string, { groupId: string; expiresAt: number }>();
 const CACHE_TTL_MS = 10 * 60 * 1000; // 10 minutes
+const TEAM_GROUP_ID_CACHE_MAX_ENTRIES = 500;
 
 function resolveTeamGroupIdCacheExpiresAt(nowRaw = Date.now()): number | undefined {
   const now = asDateTimestampMs(nowRaw);
@@ -84,6 +87,7 @@ export async function resolveTeamGroupId(
         groupId,
         expiresAt,
       });
+      pruneMapToMaxSize(teamGroupIdCache, TEAM_GROUP_ID_CACHE_MAX_ENTRIES);
     }
 
     return groupId;
