refactor: share directory config listers

2026-03-27 09:21:35 +07:00 · 2026-03-26 22:58:23 +00:00
parent 4151b48d6c
commit bfad32aa16
8 changed files with 205 additions and 152 deletions
--- a/extensions/discord/src/directory-config.ts
+++ b/extensions/discord/src/directory-config.ts
@@ -1,6 +1,6 @@
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import {
-  listResolvedDirectoryEntriesFromSources,
+  createResolvedDirectoryEntriesLister,
  type DirectoryConfigParams,
 } from "openclaw/plugin-sdk/directory-runtime";
 import { mergeDiscordAccountConfig, resolveDefaultDiscordAccountId } from "./accounts.js";
@@ -18,38 +18,36 @@ function resolveDiscordDirectoryConfigAccount(
  };
 }

-export async function listDiscordDirectoryPeersFromConfig(params: DirectoryConfigParams) {
-  return listResolvedDirectoryEntriesFromSources({
-    ...params,
-    kind: "user",
-    resolveAccount: (cfg, accountId) => resolveDiscordDirectoryConfigAccount(cfg, accountId),
-    resolveSources: (account) => {
-      const allowFrom = account.config.allowFrom ?? account.config.dm?.allowFrom ?? [];
-      const guildUsers = Object.values(account.config.guilds ?? {}).flatMap((guild) => [
-        ...(guild.users ?? []),
-        ...Object.values(guild.channels ?? {}).flatMap((channel) => channel.users ?? []),
-      ]);
-      return [allowFrom, Object.keys(account.config.dms ?? {}), guildUsers];
-    },
-    normalizeId: (raw) => {
-      const mention = raw.match(/^<@!?(\d+)>$/);
-      const cleaned = (mention?.[1] ?? raw).replace(/^(discord|user):/i, "").trim();
-      return /^\d+$/.test(cleaned) ? `user:${cleaned}` : null;
-    },
-  });
-}
+export const listDiscordDirectoryPeersFromConfig = createResolvedDirectoryEntriesLister<
+  ReturnType<typeof resolveDiscordDirectoryConfigAccount>
+>({
+  kind: "user",
+  resolveAccount: (cfg, accountId) => resolveDiscordDirectoryConfigAccount(cfg, accountId),
+  resolveSources: (account) => {
+    const allowFrom = account.config.allowFrom ?? account.config.dm?.allowFrom ?? [];
+    const guildUsers = Object.values(account.config.guilds ?? {}).flatMap((guild) => [
+      ...(guild.users ?? []),
+      ...Object.values(guild.channels ?? {}).flatMap((channel) => channel.users ?? []),
+    ]);
+    return [allowFrom, Object.keys(account.config.dms ?? {}), guildUsers];
+  },
+  normalizeId: (raw) => {
+    const mention = raw.match(/^<@!?(\d+)>$/);
+    const cleaned = (mention?.[1] ?? raw).replace(/^(discord|user):/i, "").trim();
+    return /^\d+$/.test(cleaned) ? `user:${cleaned}` : null;
+  },
+});

-export async function listDiscordDirectoryGroupsFromConfig(params: DirectoryConfigParams) {
-  return listResolvedDirectoryEntriesFromSources({
-    ...params,
-    kind: "group",
-    resolveAccount: (cfg, accountId) => resolveDiscordDirectoryConfigAccount(cfg, accountId),
-    resolveSources: (account) =>
-      Object.values(account.config.guilds ?? {}).map((guild) => Object.keys(guild.channels ?? {})),
-    normalizeId: (raw) => {
-      const mention = raw.match(/^<#(\d+)>$/);
-      const cleaned = (mention?.[1] ?? raw).replace(/^(discord|channel|group):/i, "").trim();
-      return /^\d+$/.test(cleaned) ? `channel:${cleaned}` : null;
-    },
-  });
-}
+export const listDiscordDirectoryGroupsFromConfig = createResolvedDirectoryEntriesLister<
+  ReturnType<typeof resolveDiscordDirectoryConfigAccount>
+>({
+  kind: "group",
+  resolveAccount: (cfg, accountId) => resolveDiscordDirectoryConfigAccount(cfg, accountId),
+  resolveSources: (account) =>
+    Object.values(account.config.guilds ?? {}).map((guild) => Object.keys(guild.channels ?? {})),
+  normalizeId: (raw) => {
+    const mention = raw.match(/^<#(\d+)>$/);
+    const cleaned = (mention?.[1] ?? raw).replace(/^(discord|channel|group):/i, "").trim();
+    return /^\d+$/.test(cleaned) ? `channel:${cleaned}` : null;
+  },
+});
--- a/extensions/irc/src/channel.ts
+++ b/extensions/irc/src/channel.ts
@@ -13,7 +13,7 @@ import {
 import { createChatChannelPlugin } from "openclaw/plugin-sdk/core";
 import {
  createChannelDirectoryAdapter,
-  listResolvedDirectoryEntriesFromSources,
+  createResolvedDirectoryEntriesLister,
 } from "openclaw/plugin-sdk/directory-runtime";
 import { runStoppablePassiveMonitor } from "openclaw/plugin-sdk/extension-shared";
 import {
@@ -61,6 +61,30 @@ function normalizePairingTarget(raw: string): string {
  return normalized.split(/[!@]/, 1)[0]?.trim() ?? "";
 }

+const listIrcDirectoryPeersFromConfig = createResolvedDirectoryEntriesLister<ResolvedIrcAccount>({
+  kind: "user",
+  resolveAccount: adaptScopedAccountAccessor(resolveIrcAccount),
+  resolveSources: (account) => [
+    account.config.allowFrom ?? [],
+    account.config.groupAllowFrom ?? [],
+    ...Object.values(account.config.groups ?? {}).map((group) => group.allowFrom ?? []),
+  ],
+  normalizeId: (entry) => normalizePairingTarget(entry) || null,
+});
+
+const listIrcDirectoryGroupsFromConfig = createResolvedDirectoryEntriesLister<ResolvedIrcAccount>({
+  kind: "group",
+  resolveAccount: adaptScopedAccountAccessor(resolveIrcAccount),
+  resolveSources: (account) => [
+    account.config.channels ?? [],
+    Object.keys(account.config.groups ?? {}),
+  ],
+  normalizeId: (entry) => {
+    const normalized = normalizeIrcMessagingTarget(entry);
+    return normalized && isChannelTarget(normalized) ? normalized : null;
+  },
+});
+
 const ircConfigAdapter = createScopedChannelConfigAdapter<
  ResolvedIrcAccount,
  ResolvedIrcAccount,
@@ -227,32 +251,9 @@ export const ircPlugin: ChannelPlugin<ResolvedIrcAccount, IrcProbe> = createChat
      },
    },
    directory: createChannelDirectoryAdapter({
-      listPeers: async (params) =>
-        listResolvedDirectoryEntriesFromSources<ResolvedIrcAccount>({
-          ...params,
-          kind: "user",
-          resolveAccount: adaptScopedAccountAccessor(resolveIrcAccount),
-          resolveSources: (account) => [
-            account.config.allowFrom ?? [],
-            account.config.groupAllowFrom ?? [],
-            ...Object.values(account.config.groups ?? {}).map((group) => group.allowFrom ?? []),
-          ],
-          normalizeId: (entry) => normalizePairingTarget(entry) || null,
-        }),
+      listPeers: async (params) => listIrcDirectoryPeersFromConfig(params),
      listGroups: async (params) => {
-        const entries = listResolvedDirectoryEntriesFromSources<ResolvedIrcAccount>({
-          ...params,
-          kind: "group",
-          resolveAccount: adaptScopedAccountAccessor(resolveIrcAccount),
-          resolveSources: (account) => [
-            account.config.channels ?? [],
-            Object.keys(account.config.groups ?? {}),
-          ],
-          normalizeId: (entry) => {
-            const normalized = normalizeIrcMessagingTarget(entry);
-            return normalized && isChannelTarget(normalized) ? normalized : null;
-          },
-        });
+        const entries = await listIrcDirectoryGroupsFromConfig(params);
        return entries.map((entry) => ({ ...entry, name: entry.id }));
      },
    }),
--- a/extensions/matrix/src/channel.ts
+++ b/extensions/matrix/src/channel.ts
@@ -16,8 +16,8 @@ import { createScopedAccountReplyToModeResolver } from "openclaw/plugin-sdk/conv
 import { createChatChannelPlugin } from "openclaw/plugin-sdk/core";
 import {
  createChannelDirectoryAdapter,
+  createResolvedDirectoryEntriesLister,
  createRuntimeDirectoryLiveAdapter,
-  listResolvedDirectoryEntriesFromSources,
 } from "openclaw/plugin-sdk/directory-runtime";
 import { buildTrafficStatusSummary } from "openclaw/plugin-sdk/extension-shared";
 import { createLazyRuntimeNamedExport } from "openclaw/plugin-sdk/lazy-runtime";
@@ -78,6 +78,46 @@ const meta = {
  quickstartAllowFrom: true,
 };

+const listMatrixDirectoryPeersFromConfig =
+  createResolvedDirectoryEntriesLister<ResolvedMatrixAccount>({
+    kind: "user",
+    resolveAccount: adaptScopedAccountAccessor(resolveMatrixAccount),
+    resolveSources: (account) => [
+      account.config.dm?.allowFrom ?? [],
+      account.config.groupAllowFrom ?? [],
+      ...Object.values(account.config.groups ?? account.config.rooms ?? {}).map(
+        (room) => room.users ?? [],
+      ),
+    ],
+    normalizeId: (entry) => {
+      const raw = entry.replace(/^matrix:/i, "").trim();
+      if (!raw || raw === "*") {
+        return null;
+      }
+      const lowered = raw.toLowerCase();
+      const cleaned = lowered.startsWith("user:") ? raw.slice("user:".length).trim() : raw;
+      return cleaned.startsWith("@") ? `user:${cleaned}` : cleaned;
+    },
+  });
+
+const listMatrixDirectoryGroupsFromConfig =
+  createResolvedDirectoryEntriesLister<ResolvedMatrixAccount>({
+    kind: "group",
+    resolveAccount: adaptScopedAccountAccessor(resolveMatrixAccount),
+    resolveSources: (account) => [Object.keys(account.config.groups ?? account.config.rooms ?? {})],
+    normalizeId: (entry) => {
+      const raw = entry.replace(/^matrix:/i, "").trim();
+      if (!raw || raw === "*") {
+        return null;
+      }
+      const lowered = raw.toLowerCase();
+      if (lowered.startsWith("room:") || lowered.startsWith("channel:")) {
+        return raw;
+      }
+      return raw.startsWith("!") ? `room:${raw}` : raw;
+    },
+  });
+
 const matrixConfigAdapter = createScopedChannelConfigAdapter<
  ResolvedMatrixAccount,
  ReturnType<typeof resolveMatrixAccountConfig>,
@@ -246,53 +286,14 @@ export const matrixPlugin: ChannelPlugin<ResolvedMatrixAccount, MatrixProbe> =
      },
      directory: createChannelDirectoryAdapter({
        listPeers: async (params) => {
-          const entries = listResolvedDirectoryEntriesFromSources<ResolvedMatrixAccount>({
-            ...params,
-            kind: "user",
-            resolveAccount: adaptScopedAccountAccessor(resolveMatrixAccount),
-            resolveSources: (account) => [
-              account.config.dm?.allowFrom ?? [],
-              account.config.groupAllowFrom ?? [],
-              ...Object.values(account.config.groups ?? account.config.rooms ?? {}).map(
-                (room) => room.users ?? [],
-              ),
-            ],
-            normalizeId: (entry) => {
-              const raw = entry.replace(/^matrix:/i, "").trim();
-              if (!raw || raw === "*") {
-                return null;
-              }
-              const lowered = raw.toLowerCase();
-              const cleaned = lowered.startsWith("user:") ? raw.slice("user:".length).trim() : raw;
-              return cleaned.startsWith("@") ? `user:${cleaned}` : cleaned;
-            },
-          });
+          const entries = await listMatrixDirectoryPeersFromConfig(params);
          return entries.map((entry) => {
            const raw = entry.id.startsWith("user:") ? entry.id.slice("user:".length) : entry.id;
            const incomplete = !raw.startsWith("@") || !raw.includes(":");
            return incomplete ? { ...entry, name: "incomplete id; expected @user:server" } : entry;
          });
        },
-        listGroups: async (params) =>
-          listResolvedDirectoryEntriesFromSources<ResolvedMatrixAccount>({
-            ...params,
-            kind: "group",
-            resolveAccount: adaptScopedAccountAccessor(resolveMatrixAccount),
-            resolveSources: (account) => [
-              Object.keys(account.config.groups ?? account.config.rooms ?? {}),
-            ],
-            normalizeId: (entry) => {
-              const raw = entry.replace(/^matrix:/i, "").trim();
-              if (!raw || raw === "*") {
-                return null;
-              }
-              const lowered = raw.toLowerCase();
-              if (lowered.startsWith("room:") || lowered.startsWith("channel:")) {
-                return raw;
-              }
-              return raw.startsWith("!") ? `room:${raw}` : raw;
-            },
-          }),
+        listGroups: async (params) => await listMatrixDirectoryGroupsFromConfig(params),
        ...createRuntimeDirectoryLiveAdapter({
          getRuntime: loadMatrixChannelRuntime,
          listPeersLive: (runtime) => runtime.listMatrixDirectoryPeersLive,
--- a/extensions/slack/src/directory-config.ts
+++ b/extensions/slack/src/directory-config.ts
@@ -1,6 +1,6 @@
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-resolution";
 import {
-  listResolvedDirectoryEntriesFromSources,
+  createResolvedDirectoryEntriesLister,
  type DirectoryConfigParams,
 } from "openclaw/plugin-sdk/directory-runtime";
 import { mergeSlackAccountConfig, resolveDefaultSlackAccountId } from "./accounts.js";
@@ -19,40 +19,38 @@ function resolveSlackDirectoryConfigAccount(
  };
 }

-export async function listSlackDirectoryPeersFromConfig(params: DirectoryConfigParams) {
-  return listResolvedDirectoryEntriesFromSources({
-    ...params,
-    kind: "user",
-    resolveAccount: (cfg, accountId) => resolveSlackDirectoryConfigAccount(cfg, accountId),
-    resolveSources: (account) => {
-      const allowFrom = account.config.allowFrom ?? account.dm?.allowFrom ?? [];
-      const channelUsers = Object.values(account.config.channels ?? {}).flatMap(
-        (channel) => channel.users ?? [],
-      );
-      return [allowFrom, Object.keys(account.config.dms ?? {}), channelUsers];
-    },
-    normalizeId: (raw) => {
-      const mention = raw.match(/^<@([A-Z0-9]+)>$/i);
-      const normalizedUserId = (mention?.[1] ?? raw).replace(/^(slack|user):/i, "").trim();
-      if (!normalizedUserId) {
-        return null;
-      }
-      const target = `user:${normalizedUserId}`;
-      const normalized = parseSlackTarget(target, { defaultKind: "user" });
-      return normalized?.kind === "user" ? `user:${normalized.id.toLowerCase()}` : null;
-    },
-  });
-}
+export const listSlackDirectoryPeersFromConfig = createResolvedDirectoryEntriesLister<
+  ReturnType<typeof resolveSlackDirectoryConfigAccount>
+>({
+  kind: "user",
+  resolveAccount: (cfg, accountId) => resolveSlackDirectoryConfigAccount(cfg, accountId),
+  resolveSources: (account) => {
+    const allowFrom = account.config.allowFrom ?? account.dm?.allowFrom ?? [];
+    const channelUsers = Object.values(account.config.channels ?? {}).flatMap(
+      (channel) => channel.users ?? [],
+    );
+    return [allowFrom, Object.keys(account.config.dms ?? {}), channelUsers];
+  },
+  normalizeId: (raw) => {
+    const mention = raw.match(/^<@([A-Z0-9]+)>$/i);
+    const normalizedUserId = (mention?.[1] ?? raw).replace(/^(slack|user):/i, "").trim();
+    if (!normalizedUserId) {
+      return null;
+    }
+    const target = `user:${normalizedUserId}`;
+    const normalized = parseSlackTarget(target, { defaultKind: "user" });
+    return normalized?.kind === "user" ? `user:${normalized.id.toLowerCase()}` : null;
+  },
+});

-export async function listSlackDirectoryGroupsFromConfig(params: DirectoryConfigParams) {
-  return listResolvedDirectoryEntriesFromSources({
-    ...params,
-    kind: "group",
-    resolveAccount: (cfg, accountId) => resolveSlackDirectoryConfigAccount(cfg, accountId),
-    resolveSources: (account) => [Object.keys(account.config.channels ?? {})],
-    normalizeId: (raw) => {
-      const normalized = parseSlackTarget(raw, { defaultKind: "channel" });
-      return normalized?.kind === "channel" ? `channel:${normalized.id.toLowerCase()}` : null;
-    },
-  });
-}
+export const listSlackDirectoryGroupsFromConfig = createResolvedDirectoryEntriesLister<
+  ReturnType<typeof resolveSlackDirectoryConfigAccount>
+>({
+  kind: "group",
+  resolveAccount: (cfg, accountId) => resolveSlackDirectoryConfigAccount(cfg, accountId),
+  resolveSources: (account) => [Object.keys(account.config.channels ?? {})],
+  normalizeId: (raw) => {
+    const normalized = parseSlackTarget(raw, { defaultKind: "channel" });
+    return normalized?.kind === "channel" ? `channel:${normalized.id.toLowerCase()}` : null;
+  },
+});
--- a/extensions/telegram/src/directory-config.ts
+++ b/extensions/telegram/src/directory-config.ts
@@ -1,13 +1,9 @@
 import { mapAllowFromEntries } from "openclaw/plugin-sdk/channel-config-helpers";
-import {
-  listInspectedDirectoryEntriesFromSources,
-  type DirectoryConfigParams,
-} from "openclaw/plugin-sdk/directory-runtime";
+import { createInspectedDirectoryEntriesLister } from "openclaw/plugin-sdk/directory-runtime";
 import { inspectTelegramAccount, type InspectedTelegramAccount } from "./account-inspect.js";

-export async function listTelegramDirectoryPeersFromConfig(params: DirectoryConfigParams) {
-  return listInspectedDirectoryEntriesFromSources({
-    ...params,
+export const listTelegramDirectoryPeersFromConfig =
+  createInspectedDirectoryEntriesLister<InspectedTelegramAccount>({
    kind: "user",
    inspectAccount: (cfg, accountId) =>
      inspectTelegramAccount({ cfg, accountId }) as InspectedTelegramAccount | null,
@@ -26,15 +22,12 @@ export async function listTelegramDirectoryPeersFromConfig(params: DirectoryConf
      return trimmed.startsWith("@") ? trimmed : `@${trimmed}`;
    },
  });
-}

-export async function listTelegramDirectoryGroupsFromConfig(params: DirectoryConfigParams) {
-  return listInspectedDirectoryEntriesFromSources({
-    ...params,
+export const listTelegramDirectoryGroupsFromConfig =
+  createInspectedDirectoryEntriesLister<InspectedTelegramAccount>({
    kind: "group",
    inspectAccount: (cfg, accountId) =>
      inspectTelegramAccount({ cfg, accountId }) as InspectedTelegramAccount | null,
    resolveSources: (account) => [Object.keys(account.config.groups ?? {})],
    normalizeId: (entry) => entry.trim() || null,
  });
-}
--- a/src/channels/plugins/directory-config-helpers.test.ts
+++ b/src/channels/plugins/directory-config-helpers.test.ts
@@ -1,5 +1,7 @@
 import { describe, expect, it } from "vitest";
 import {
+  createInspectedDirectoryEntriesLister,
+  createResolvedDirectoryEntriesLister,
  listDirectoryEntriesFromSources,
  listInspectedDirectoryEntriesFromSources,
  listDirectoryGroupEntriesFromMapKeysAndAllowFrom,
@@ -128,6 +130,21 @@ describe("listInspectedDirectoryEntriesFromSources", () => {
  });
 });

+describe("createInspectedDirectoryEntriesLister", () => {
+  it("builds a reusable inspected-account lister", async () => {
+    const listGroups = createInspectedDirectoryEntriesLister({
+      kind: "group",
+      inspectAccount: () => ({ ids: [["room:a"], ["room:b", "room:a"]] }),
+      resolveSources: (account) => account.ids,
+      normalizeId: (entry) => entry.replace(/^room:/i, ""),
+    });
+
+    await expect(listGroups({ cfg: {} as never, query: "a" })).resolves.toEqual([
+      { kind: "group", id: "a" },
+    ]);
+  });
+});
+
 describe("resolved account directory helpers", () => {
  const cfg = {} as never;
  const resolveAccount = () => ({
@@ -174,4 +191,18 @@ describe("resolved account directory helpers", () => {

    expectUserDirectoryEntries(entries);
  });
+
+  it("builds a reusable resolved-account lister", async () => {
+    const listUsers = createResolvedDirectoryEntriesLister({
+      kind: "user",
+      resolveAccount,
+      resolveSources: (account) => [account.allowFrom, ["user:carla", "user:alice"]],
+      normalizeId: (entry) => entry.replace(/^user:/i, ""),
+    });
+
+    await expect(listUsers({ cfg, query: "a", limit: 2 })).resolves.toEqual([
+      { kind: "user", id: "alice" },
+      { kind: "user", id: "carla" },
+    ]);
+  });
 });
--- a/src/channels/plugins/directory-config-helpers.ts
+++ b/src/channels/plugins/directory-config-helpers.ts
@@ -121,6 +121,22 @@ export function listInspectedDirectoryEntriesFromSources<InspectedAccount>(
  });
 }

+export function createInspectedDirectoryEntriesLister<InspectedAccount>(params: {
+  kind: "user" | "group";
+  inspectAccount: (
+    cfg: OpenClawConfig,
+    accountId?: string | null,
+  ) => InspectedAccount | null | undefined;
+  resolveSources: (account: InspectedAccount) => Iterable<unknown>[];
+  normalizeId: (entry: string) => string | null | undefined;
+}) {
+  return async (configParams: DirectoryConfigParams): Promise<ChannelDirectoryEntry[]> =>
+    listInspectedDirectoryEntriesFromSources({
+      ...configParams,
+      ...params,
+    });
+}
+
 export function listResolvedDirectoryEntriesFromSources<ResolvedAccount>(
  params: DirectoryConfigParams & {
    kind: "user" | "group";
@@ -139,6 +155,19 @@ export function listResolvedDirectoryEntriesFromSources<ResolvedAccount>(
  });
 }

+export function createResolvedDirectoryEntriesLister<ResolvedAccount>(params: {
+  kind: "user" | "group";
+  resolveAccount: (cfg: OpenClawConfig, accountId?: string | null) => ResolvedAccount;
+  resolveSources: (account: ResolvedAccount) => Iterable<unknown>[];
+  normalizeId: (entry: string) => string | null | undefined;
+}) {
+  return async (configParams: DirectoryConfigParams): Promise<ChannelDirectoryEntry[]> =>
+    listResolvedDirectoryEntriesFromSources({
+      ...configParams,
+      ...params,
+    });
+}
+
 export function listDirectoryUserEntriesFromAllowFrom(params: {
  allowFrom?: readonly unknown[];
  query?: string | null;
--- a/src/plugin-sdk/directory-runtime.ts
+++ b/src/plugin-sdk/directory-runtime.ts
@@ -14,6 +14,8 @@ export {
 export {
  applyDirectoryQueryAndLimit,
  collectNormalizedDirectoryIds,
+  createInspectedDirectoryEntriesLister,
+  createResolvedDirectoryEntriesLister,
  listDirectoryEntriesFromSources,
  listDirectoryGroupEntriesFromMapKeys,
  listDirectoryGroupEntriesFromMapKeysAndAllowFrom,