ddchat 0.2.0 → 0.3.0

package/src/channel.ts

@@ -1,101 +1,101 @@
-import { createChatChannelPlugin, type OpenClawConfig } from "openclaw/plugin-sdk/core";
-import { patchScopedAccountConfig, prepareScopedSetupConfig } from "openclaw/plugin-sdk/setup";
-import { DDCHAT_CHANNEL_ID } from "./constants.js";
-import { ddchatGateway } from "./gateway.js";
-import { ddchatOutbound } from "./outbound.js";
-import { ddchatPairing } from "./pairing.js";
-import { listDdchatAccountIds, resolveDdchatAccount, type DdchatResolvedAccount } from "./types.js";
-
-function inspectDdchatAccount(cfg: OpenClawConfig, accountId?: string | null) {
-  const account = resolveDdchatAccount(cfg, accountId);
-  return {
-    enabled: account.enabled,
-    configured: account.configured,
-    tokenStatus: account.token ? "available" : "missing",
-    connectionMode: account.connectionMode,
-    dmPolicy: account.dmPolicy,
-    groupPolicy: account.groupPolicy,
-    streaming: account.streaming,
-    streamingMode: account.streamingMode,
-  };
-}
-
-export const ddchatPlugin = createChatChannelPlugin<DdchatResolvedAccount>({
-  base: {
-    id: DDCHAT_CHANNEL_ID,
-    meta: {
-      id: DDCHAT_CHANNEL_ID,
-      label: "DDChat",
-      selectionLabel: "DDChat (IM)",
-      blurb: "DDChat internal IM integration.",
-      order: 90,
-    },
-    capabilities: {
-      chatTypes: ["direct", "channel"],
-      media: true,
-      threads: false,
-      polls: false,
-    },
-    config: {
-      listAccountIds: (cfg) => listDdchatAccountIds(cfg),
-      resolveAccount: (cfg, accountId) => resolveDdchatAccount(cfg, accountId),
-      inspectAccount: inspectDdchatAccount,
-      isEnabled: (account) => account.enabled,
-      isConfigured: (account) => account.configured,
-    },
-    setup: {
-      resolveAccountId: ({ accountId }) => accountId ?? "default",
-      applyAccountName: ({ cfg, accountId, name }) =>
-        prepareScopedSetupConfig({
-          cfg,
-          channelKey: DDCHAT_CHANNEL_ID,
-          accountId,
-          name,
-          alwaysUseAccounts: true,
-        }),
-      validateInput: ({ input }) => {
-        const token = typeof input.token === "string" ? input.token.trim() : "";
-        return token ? null : "ddchat requires --token";
-      },
-      applyAccountConfig: ({ cfg, accountId, input }) => {
-        const token = typeof input.token === "string" ? input.token.trim() : "";
-        const next = prepareScopedSetupConfig({
-          cfg,
-          channelKey: DDCHAT_CHANNEL_ID,
-          accountId,
-          name: input.name,
-          alwaysUseAccounts: true,
-        });
-        const patch: Record<string, unknown> = {};
-        if (token) {
-          patch.token = token;
-        }
-        return patchScopedAccountConfig({
-          cfg: next,
-          channelKey: DDCHAT_CHANNEL_ID,
-          accountId,
-          patch,
-          accountPatch: patch,
-          ensureChannelEnabled: true,
-          ensureAccountEnabled: true,
-          scopeDefaultToAccounts: true,
-        });
-      },
-    },
-    gateway: ddchatGateway,
-  },
-  pairing: ddchatPairing,
-  security: {
-    dm: {
-      channelKey: DDCHAT_CHANNEL_ID,
-      resolvePolicy: (account) => account.dmPolicy,
-      resolveAllowFrom: (account) => account.allowFrom,
-      defaultPolicy: "pairing",
-      normalizeEntry: (raw) => raw.replace(/^ddchat:/i, "").trim(),
-    },
-  },
-  outbound: ddchatOutbound,
-  threading: {
-    topLevelReplyToMode: "off",
-  },
-});
+import { createChatChannelPlugin, type OpenClawConfig } from "openclaw/plugin-sdk/core";
+import { patchScopedAccountConfig, prepareScopedSetupConfig } from "openclaw/plugin-sdk/setup";
+import { DDCHAT_CHANNEL_ID } from "./constants.js";
+import { ddchatGateway } from "./gateway.js";
+import { ddchatOutbound } from "./outbound.js";
+import { ddchatPairing } from "./pairing.js";
+import { listDdchatAccountIds, resolveDdchatAccount, type DdchatResolvedAccount } from "./types.js";
+
+function inspectDdchatAccount(cfg: OpenClawConfig, accountId?: string | null) {
+  const account = resolveDdchatAccount(cfg, accountId);
+  return {
+    enabled: account.enabled,
+    configured: account.configured,
+    tokenStatus: account.token ? "available" : "missing",
+    connectionMode: account.connectionMode,
+    dmPolicy: account.dmPolicy,
+    groupPolicy: account.groupPolicy,
+    streaming: account.streaming,
+    streamingMode: account.streamingMode,
+  };
+}
+
+export const ddchatPlugin = createChatChannelPlugin<DdchatResolvedAccount>({
+  base: {
+    id: DDCHAT_CHANNEL_ID,
+    meta: {
+      id: DDCHAT_CHANNEL_ID,
+      label: "DDChat",
+      selectionLabel: "DDChat (IM)",
+      blurb: "DDChat internal IM integration.",
+      order: 90,
+    },
+    capabilities: {
+      chatTypes: ["direct", "channel"],
+      media: true,
+      threads: false,
+      polls: false,
+    },
+    config: {
+      listAccountIds: (cfg) => listDdchatAccountIds(cfg),
+      resolveAccount: (cfg, accountId) => resolveDdchatAccount(cfg, accountId),
+      inspectAccount: inspectDdchatAccount,
+      isEnabled: (account) => account.enabled,
+      isConfigured: (account) => account.configured,
+    },
+    setup: {
+      resolveAccountId: ({ accountId }) => accountId ?? "default",
+      applyAccountName: ({ cfg, accountId, name }) =>
+        prepareScopedSetupConfig({
+          cfg,
+          channelKey: DDCHAT_CHANNEL_ID,
+          accountId,
+          name,
+          alwaysUseAccounts: true,
+        }),
+      validateInput: ({ input }) => {
+        const token = typeof input.token === "string" ? input.token.trim() : "";
+        return token ? null : "ddchat requires --token";
+      },
+      applyAccountConfig: ({ cfg, accountId, input }) => {
+        const token = typeof input.token === "string" ? input.token.trim() : "";
+        const next = prepareScopedSetupConfig({
+          cfg,
+          channelKey: DDCHAT_CHANNEL_ID,
+          accountId,
+          name: input.name,
+          alwaysUseAccounts: true,
+        });
+        const patch: Record<string, unknown> = {};
+        if (token) {
+          patch.token = token;
+        }
+        return patchScopedAccountConfig({
+          cfg: next,
+          channelKey: DDCHAT_CHANNEL_ID,
+          accountId,
+          patch,
+          accountPatch: patch,
+          ensureChannelEnabled: true,
+          ensureAccountEnabled: true,
+          scopeDefaultToAccounts: true,
+        });
+      },
+    },
+    gateway: ddchatGateway,
+  },
+  pairing: ddchatPairing,
+  security: {
+    dm: {
+      channelKey: DDCHAT_CHANNEL_ID,
+      resolvePolicy: (account) => account.dmPolicy,
+      resolveAllowFrom: (account) => account.allowFrom,
+      defaultPolicy: "pairing",
+      normalizeEntry: (raw) => raw.replace(/^ddchat:/i, "").trim(),
+    },
+  },
+  outbound: ddchatOutbound,
+  threading: {
+    topLevelReplyToMode: "off",
+  },
+});

package/src/constants.ts

@@ -1,5 +1,5 @@
-export const DDCHAT_CHANNEL_ID = "ddchat";
-export const DDCHAT_DEFAULT_ACCOUNT_ID = "default";
-
-/** Default WebSocket endpoint when `channels.ddchat.wsUrl` / per-account `wsUrl` is unset (`token` query appended at connect). */
-export const DDCHAT_PLUGIN_WS_BASE_URL = "wss://chat.ddjf.info/socket/ai/plugin";
+export const DDCHAT_CHANNEL_ID = "ddchat";
+export const DDCHAT_DEFAULT_ACCOUNT_ID = "default";
+
+/** Default WebSocket endpoint when `channels.ddchat.wsUrl` / per-account `wsUrl` is unset (`token` query appended at connect). */
+export const DDCHAT_PLUGIN_WS_BASE_URL = "wss://chat.ddjf.info/socket/ai/claw";

package/src/dedupe.ts

@@ -1,31 +1,51 @@
-const DEFAULT_TTL_MS = 48 * 60 * 60 * 1000;
-
-export class DdchatDedupeStore {
-  private readonly seen = new Map<string, number>();
-  private readonly ttlMs: number;
-
-  constructor(ttlMs = DEFAULT_TTL_MS) {
-    this.ttlMs = ttlMs;
-  }
-
-  isDuplicate(accountId: string, messageId: string): boolean {
-    this.gc();
-    const key = `${accountId}:${messageId}`;
-    const now = Date.now();
-    const expiresAt = this.seen.get(key);
-    if (expiresAt && expiresAt > now) {
-      return true;
-    }
-    this.seen.set(key, now + this.ttlMs);
-    return false;
-  }
-
-  private gc(): void {
-    const now = Date.now();
-    for (const [key, expiresAt] of this.seen.entries()) {
-      if (expiresAt <= now) {
-        this.seen.delete(key);
-      }
-    }
-  }
-}
+const DEFAULT_TTL_MS = 48 * 60 * 60 * 1000;
+const DEFAULT_GC_INTERVAL_MS = 60 * 1000;
+const DEFAULT_GC_CHECK_INTERVAL = 1000;
+
+export class DdchatDedupeStore {
+  private readonly seen = new Map<string, number>();
+  private readonly ttlMs: number;
+  private lastGcAt = 0;
+  private checksSinceGc = 0;
+
+  constructor(
+    ttlMs = DEFAULT_TTL_MS,
+    private readonly gcIntervalMs = DEFAULT_GC_INTERVAL_MS,
+    private readonly gcCheckInterval = DEFAULT_GC_CHECK_INTERVAL,
+  ) {
+    this.ttlMs = ttlMs;
+  }
+
+  isDuplicate(accountId: string, messageId: string): boolean {
+    const key = `${accountId}:${messageId}`;
+    const now = Date.now();
+    this.gcIfNeeded(now);
+    const expiresAt = this.seen.get(key);
+    if (expiresAt && expiresAt > now) {
+      return true;
+    }
+    this.seen.set(key, now + this.ttlMs);
+    return false;
+  }
+
+  private gcIfNeeded(now: number): void {
+    this.checksSinceGc += 1;
+    if (
+      now - this.lastGcAt < this.gcIntervalMs &&
+      this.checksSinceGc < this.gcCheckInterval
+    ) {
+      return;
+    }
+    this.lastGcAt = now;
+    this.checksSinceGc = 0;
+    this.gc(now);
+  }
+
+  private gc(now: number): void {
+    for (const [key, expiresAt] of this.seen.entries()) {
+      if (expiresAt <= now) {
+        this.seen.delete(key);
+      }
+    }
+  }
+}