@soimy/dingtalk 3.6.9 → 3.6.11

package/src/peer-id-registry.ts

@@ -8,13 +8,7 @@
  * can be delivered correctly.
  */
 
-import { readFileSync, readdirSync } from "fs";
-import * as os from "os";
-import { join } from "path";
-import { getLogger } from "./logger-context";
-
 const peerIdMap = new Map<string, string>();
-let preloaded = false;
 
 /**
  * Register an original peer ID, keyed by its lowercased form.
@@ -26,20 +20,9 @@ export function registerPeerId(originalId: string): void {
   peerIdMap.set(originalId.toLowerCase(), originalId);
 }
 
-function maybeRegisterDingTalkGroupPeerId(value: unknown): void {
-  // DingTalk group openConversationId values are base64-like and consistently start with "cid".
-  // User IDs in DM contexts do not follow this pattern and do not require case restoration.
-  if (typeof value === "string" && value.startsWith("cid")) {
-    registerPeerId(value);
-  }
-}
-
 /**
  * Resolve a possibly-lowercased peer ID back to its original casing.
  *
- * If registry is empty at first outbound call (for example, cron/delivery queue
- * fires before inbound callbacks), perform a one-time lazy preload from sessions.
- *
  * Returns the original if found, otherwise returns the input as-is.
  */
 export function resolveOriginalPeerId(id: string): string {
@@ -47,10 +30,6 @@ export function resolveOriginalPeerId(id: string): string {
     return id;
   }
 
-  if (!preloaded) {
-    preloadPeerIdsFromSessions();
-  }
-
   return peerIdMap.get(id.toLowerCase()) || id;
 }
 
@@ -59,83 +38,4 @@ export function resolveOriginalPeerId(id: string): string {
  */
 export function clearPeerIdRegistry(): void {
   peerIdMap.clear();
-  preloaded = false;
-}
-
-/**
- * Preload known peer IDs from all agents' sessions.json files.
- *
- * Safe to call repeatedly:
- * - without explicit homeDir: runs once, then no-ops;
- * - with explicit homeDir: always runs (useful for tests).
- */
-export function preloadPeerIdsFromSessions(homeDir?: string): void {
-  if (!homeDir && preloaded) {
-    return;
-  }
-
-  const home = homeDir || os.homedir();
-  const agentsDir = join(home, ".openclaw", "agents");
-  const log = getLogger();
-  let preloadCompleted = false;
-
-  try {
-    const agentDirs = readdirSync(agentsDir, { withFileTypes: true })
-      .filter((entry) => entry.isDirectory())
-      .map((entry) => entry.name);
-
-    for (const agentName of agentDirs) {
-      const sessionsPath = join(agentsDir, agentName, "sessions", "sessions.json");
-
-      try {
-        const raw = readFileSync(sessionsPath, "utf-8");
-        const parsed = JSON.parse(raw);
-        if (!parsed || typeof parsed !== "object") {
-          continue;
-        }
-
-        for (const session of Object.values(parsed as Record<string, unknown>)) {
-          if (!session || typeof session !== "object") {
-            continue;
-          }
-
-          const sessionRecord = session as Record<string, unknown>;
-          maybeRegisterDingTalkGroupPeerId(sessionRecord.lastTo);
-
-          const origin = sessionRecord.origin;
-          if (!origin || typeof origin !== "object") {
-            continue;
-          }
-
-          const originRecord = origin as Record<string, unknown>;
-          maybeRegisterDingTalkGroupPeerId(originRecord.from);
-          maybeRegisterDingTalkGroupPeerId(originRecord.to);
-        }
-      } catch (err) {
-        // sessions.json may be missing or malformed for some agents; ignore per file.
-        log?.debug?.(
-          `[DingTalk][PeerIdRegistry] Failed to parse preload sessions file ${sessionsPath}: ${
-            err instanceof Error ? err.message : String(err)
-          }`,
-        );
-      }
-    }
-    preloadCompleted = true;
-  } catch (err) {
-    const errorCode = (err as NodeJS.ErrnoException | undefined)?.code;
-    if (errorCode === "ENOENT") {
-      // agents directory may not exist yet; this is a stable no-op state.
-      preloadCompleted = true;
-    } else {
-      log?.debug?.(
-        `[DingTalk][PeerIdRegistry] Failed to scan preload directory ${agentsDir}: ${
-          err instanceof Error ? err.message : String(err)
-        }`,
-      );
-    }
-  }
-
-  if (!homeDir && preloadCompleted) {
-    preloaded = true;
-  }
 }

package/src/secret-input.ts

@@ -1,6 +1,10 @@
-import { readFile } from "node:fs/promises";
+import type { OpenClawConfig } from "openclaw/plugin-sdk/core";
+import {
+  hasConfiguredSecretInput as hasConfiguredOpenClawSecretInput,
+  resolveConfiguredSecretInputString,
+} from "openclaw/plugin-sdk/secret-input-runtime";
 import { z } from "zod";
-import { resolveRelativePath } from "./path-utils";
+import { getDingTalkRuntime } from "./runtime";
 
 export type SecretInputRef = {
   source: "env" | "file";
@@ -68,19 +72,7 @@ export function isSecretInputRef(value: unknown): value is SecretInputRef {
 }
 
 export function hasConfiguredSecretInput(value: unknown): boolean {
-  if (typeof value === "string") {
-    return value.trim().length > 0;
-  }
-  if (!isSecretInputRef(value)) {
-    return false;
-  }
-  if (value.source === "env") {
-    return Boolean(process.env[value.id]?.trim());
-  }
-  // File references are considered configured when the reference shape is
-  // present. The actual filesystem lookup happens at runtime so status checks
-  // can stay side-effect free.
-  return true;
+  return hasConfiguredOpenClawSecretInput(value);
 }
 
 export function normalizeSecretInputString(value: unknown): string | undefined {
@@ -116,13 +108,15 @@ export function parseSecretInputString(value: unknown): SecretInput | undefined
 export async function resolveSecretInputString(
   value: unknown,
   log?: SecretInputLog,
+  hostConfig?: OpenClawConfig,
 ): Promise<string | undefined> {
-  return (await resolveSecretInputStringWithFailure(value, log)).value;
+  return (await resolveSecretInputStringWithFailure(value, log, hostConfig)).value;
 }
 
 export async function resolveSecretInputStringWithFailure(
   value: unknown,
   log?: SecretInputLog,
+  hostConfig?: OpenClawConfig,
 ): Promise<{ value?: string; failure?: SecretInputResolutionFailure }> {
   if (typeof value === "string") {
     const trimmed = value.trim();
@@ -131,34 +125,40 @@ export async function resolveSecretInputStringWithFailure(
   if (!isSecretInputRef(value)) {
     return {};
   }
-  if (value.source === "env") {
-    const envValue = process.env[value.id]?.trim();
-    if (envValue) {
-      return { value: envValue };
+  if (!hostConfig) {
+    try {
+      hostConfig = getDingTalkRuntime().config.current() as OpenClawConfig;
+    } catch {
+      hostConfig = {} as OpenClawConfig;
     }
-    const failure = buildSecretInputFailure(value, "environment variable is not set or is empty");
-    log?.warn?.("[DingTalk][SecretInput] Failed to resolve env secret", {
+  }
+  try {
+    const resolved = await resolveConfiguredSecretInputString({
+      config: hostConfig,
+      env: process.env,
+      value,
+      path: "channels.dingtalk.clientSecret",
+      unresolvedReasonStyle: "detailed",
+    });
+    if (resolved.value) {
+      return { value: resolved.value };
+    }
+    const failure = buildSecretInputFailure(
+      value,
+      resolved.unresolvedRefReason || "secret reference is unresolved",
+    );
+    log?.warn?.("[DingTalk][SecretInput] Failed to resolve secret", {
       provider: value.provider,
       id: value.id,
       error: failure.reason,
     });
     return { failure };
-  }
-  try {
-    // Trust boundary: file SecretInput reads the configured local path. Use it
-    // only with trusted plugin configuration.
-    const filePath = resolveRelativePath(value.id);
-    const secret = (await readFile(filePath, "utf8")).trim();
-    if (secret) {
-      return { value: secret };
-    }
-    return { failure: buildSecretInputFailure(value, "file secret is empty") };
   } catch (error) {
     const failure = buildSecretInputFailure(
       value,
       error instanceof Error ? error.message : String(error),
     );
-    log?.warn?.("[DingTalk][SecretInput] Failed to read file secret", {
+    log?.warn?.("[DingTalk][SecretInput] Failed to resolve secret", {
       provider: value.provider,
       id: value.id,
       error: failure.reason,

package/src/types.ts

@@ -13,7 +13,7 @@ import type {
   ChannelAccountSnapshot as SDKChannelAccountSnapshot,
   ChannelGatewayContext as SDKChannelGatewayContext,
   ChannelLogSink as SDKChannelLogSink,
-} from "openclaw/plugin-sdk/channel-runtime";
+} from "openclaw/plugin-sdk/channel-contract";
 import type { ChannelPlugin as SDKChannelPlugin, OpenClawConfig } from "openclaw/plugin-sdk/core";
 import type { ChannelSetupWizard } from "openclaw/plugin-sdk/setup";
 import type { SecretInput } from "./secret-input";

package/dist/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAuR5F,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;;kBAmCnC,iBAAiB;;;;;;;;AAFjC,wBAaE"}