@tencent-weixin/openclaw-weixin 2.4.1 → 2.4.3

package/src/api/api.ts

@@ -38,14 +38,49 @@ interface PackageJson {
   ilink_appid?: string;
 }
 
-function readPackageJson(): PackageJson {
+/**
+ * Identify whether a parsed package.json belongs to this plugin.
+ *
+ * The walk-up search may pass through unrelated `package.json` files
+ * (e.g. nested `node_modules/<dep>/package.json`); only ours is accepted.
+ */
+function isOwnPackageJson(parsed: PackageJson): boolean {
+  if (parsed.ilink_appid !== undefined) return true;
+  return typeof parsed.name === "string" && parsed.name.includes("openclaw-weixin");
+}
+
+/**
+ * Walk up from `startDir` searching for the plugin's own `package.json`.
+ *
+ * Resilient to differing layouts between dev (TS source under `src/`) and
+ * publish (compiled output under `dist/src/`) by not assuming a fixed depth.
+ */
+export function readPackageJsonFromDir(startDir: string): PackageJson {
   try {
-    const dir = path.dirname(fileURLToPath(import.meta.url));
-    const pkgPath = path.resolve(dir, "..", "..", "package.json");
-    return JSON.parse(fs.readFileSync(pkgPath, "utf-8")) as PackageJson;
+    let dir = startDir;
+    const { root } = path.parse(dir);
+    while (dir && dir !== root) {
+      const candidate = path.join(dir, "package.json");
+      if (fs.existsSync(candidate)) {
+        try {
+          const parsed = JSON.parse(fs.readFileSync(candidate, "utf-8")) as PackageJson;
+          if (isOwnPackageJson(parsed)) {
+            return parsed;
+          }
+        } catch {
+          // Malformed package.json — keep walking up.
+        }
+      }
+      dir = path.dirname(dir);
+    }
   } catch {
-    return {};
+    // Fall through to empty default.
   }
+  return {};
+}
+
+function readPackageJson(): PackageJson {
+  return readPackageJsonFromDir(path.dirname(fileURLToPath(import.meta.url)));
 }
 
 const pkg = readPackageJson();
@@ -201,11 +236,10 @@ function buildCommonHeaders(): Record<string, string> {
   return headers;
 }
 
-function buildHeaders(opts: { token?: string; body: string }): Record<string, string> {
+function buildHeaders(opts: { token?: string }): Record<string, string> {
   const headers: Record<string, string> = {
     "Content-Type": "application/json",
     AuthorizationType: "ilink_bot_token",
-    "Content-Length": String(Buffer.byteLength(opts.body, "utf-8")),
     "X-WECHAT-UIN": randomWechatUin(),
     ...buildCommonHeaders(),
   };
@@ -277,7 +311,7 @@ export async function apiPostFetch(params: {
 }): Promise<string> {
   const base = ensureTrailingSlash(params.baseUrl);
   const url = new URL(params.endpoint, base);
-  const hdrs = buildHeaders({ token: params.token, body: params.body });
+  const hdrs = buildHeaders({ token: params.token });
   logger.debug(`POST ${redactUrl(url.toString())} body=${redactBody(params.body)}`);
 
   const controller =

package/src/auth/accounts.ts

@@ -4,7 +4,6 @@ import path from "node:path";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import type { OpenClawConfig } from "openclaw/plugin-sdk/core";
 
-import { getWeixinRuntime } from "../runtime.js";
 import { resolveStateDir } from "../storage/state-dir.js";
 import { resolveFrameworkAllowFromPath } from "./pairing.js";
 import { logger } from "../util/logger.js";

package/src/auth/login-qr.ts

@@ -159,6 +159,13 @@ export type WeixinQrStartResult = {
 
 export type WeixinQrWaitResult = {
   connected: boolean;
+  /**
+   * Server reported `binded_redirect`: the scanned bot is already bound to
+   * this OpenClaw instance, so no new credentials are issued and existing
+   * local credentials remain valid. Callers should treat this as a successful
+   * outcome (semantically "already done") rather than a login failure.
+   */
+  alreadyConnected?: boolean;
   botToken?: string;
   accountId?: string;
   baseUrl?: string;
@@ -385,6 +392,7 @@ export async function waitForWeixinLogin(opts: {
           activeLogins.delete(opts.sessionKey);
           return {
             connected: false,
+            alreadyConnected: true,
             message: "已连接过此 OpenClaw，无需重复连接。",
           };
         }

package/src/channel.ts

@@ -1,6 +1,6 @@
 import path from "node:path";
 
-import type { ChannelPlugin, OpenClawConfig } from "openclaw/plugin-sdk/core";
+import type { ChannelPlugin, OpenClawConfig, PluginRuntime } from "openclaw/plugin-sdk/core";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { resolvePreferredOpenClawTmpDir } from "openclaw/plugin-sdk/infra-runtime";
 
@@ -373,6 +373,15 @@ export const weixinPlugin: ChannelPlugin<ResolvedWeixinAccount> = {
           );
           log(`⚠️  保存账号数据失败: ${String(err)}`);
         }
+      } else if (waitResult.alreadyConnected) {
+        // Server confirmed this OpenClaw is already bound to the scanned bot;
+        // local credentials are intact, nothing to persist. Exit successfully
+        // so that automated installers don't treat re-runs as login failures.
+        // The QR poller already wrote the user-facing message to stdout, so
+        // we deliberately do NOT echo it again via `log(...)`.
+        logger.info(
+          `auth.login: bot already connected to this OpenClaw accountId=${account.accountId}`,
+        );
       } else {
         logger.warn(
           `auth.login: login did not complete accountId=${account.accountId} message=${waitResult.message}`,
@@ -428,6 +437,17 @@ export const weixinPlugin: ChannelPlugin<ResolvedWeixinAccount> = {
       const logPath = aLog.getLogFilePath();
       ctx.log?.info?.(`[${account.accountId}] weixin logs: ${logPath}`);
 
+      // The gateway injects the channel runtime surface per-call (task-scoped). We require it:
+      // it carries reply/routing/session/media/commands helpers used by processOneMessage.
+      // Available on hosts >= 2026.2.19 (our peerDependency is >= 2026.3.22).
+      if (!ctx.channelRuntime) {
+        const msg = `ctx.channelRuntime missing — host too old or plugin SDK contract violated`;
+        aLog.error(msg);
+        ctx.log?.error?.(`[${account.accountId}] ${msg}`);
+        ctx.setStatus?.({ accountId: account.accountId, running: false });
+        throw new Error(msg);
+      }
+
       const { monitorWeixinProvider } = await import("./monitor/monitor.js");
       return monitorWeixinProvider({
         baseUrl: account.baseUrl,
@@ -436,6 +456,7 @@ export const weixinPlugin: ChannelPlugin<ResolvedWeixinAccount> = {
         accountId: account.accountId,
         config: ctx.cfg,
         runtime: ctx.runtime,
+        channelRuntime: ctx.channelRuntime as unknown as PluginRuntime["channel"],
         abortSignal: ctx.abortSignal,
         setStatus: ctx.setStatus,
       });

package/src/monitor/monitor.ts

@@ -5,7 +5,6 @@ import { getUpdates } from "../api/api.js";
 import { WeixinConfigManager } from "../api/config-cache.js";
 import { SESSION_EXPIRED_ERRCODE, pauseSession, getRemainingPauseMs } from "../api/session-guard.js";
 import { processOneMessage } from "../messaging/process-message.js";
-import { getWeixinRuntime, waitForWeixinRuntime } from "../runtime.js";
 import { getSyncBufFilePath, loadGetUpdatesBuf, saveGetUpdatesBuf } from "../storage/sync-buf.js";
 import { logger } from "../util/logger.js";
 import type { Logger } from "../util/logger.js";
@@ -25,6 +24,11 @@ export type MonitorWeixinOpts = {
   allowFrom?: string[];
   config: import("openclaw/plugin-sdk/core").OpenClawConfig;
   runtime?: { log?: (msg: string) => void; error?: (msg: string) => void };
+  /**
+   * Gateway-injected channel runtime surface (reply/routing/session/media/commands/...).
+   * Required for inbound message processing; provided by `ChannelGatewayContext.channelRuntime`.
+   */
+  channelRuntime: PluginRuntime["channel"];
   abortSignal?: AbortSignal;
   longPollTimeoutMs?: number;
   /** Gateway status callback — called on each successful poll and inbound message. */
@@ -42,6 +46,7 @@ export async function monitorWeixinProvider(opts: MonitorWeixinOpts): Promise<vo
     token,
     accountId,
     config,
+    channelRuntime,
     abortSignal,
     longPollTimeoutMs,
     setStatus,
@@ -50,15 +55,11 @@ export async function monitorWeixinProvider(opts: MonitorWeixinOpts): Promise<vo
   const errLog = opts.runtime?.error ?? ((m: string) => log(m));
   const aLog: Logger = logger.withAccount(accountId);
 
-  aLog.info(`waiting for Weixin runtime...`);
-  let channelRuntime: PluginRuntime["channel"];
-  try {
-    const pluginRuntime = await waitForWeixinRuntime();
-    channelRuntime = pluginRuntime.channel;
-    aLog.info(`Weixin runtime acquired, channelRuntime type: ${typeof channelRuntime}`);
-  } catch (err) {
-    aLog.error(`waitForWeixinRuntime() failed: ${String(err)}`);
-    throw err;
+  if (!channelRuntime) {
+    const msg =
+      "channelRuntime missing on monitor opts; gateway must inject ChannelGatewayContext.channelRuntime";
+    aLog.error(msg);
+    throw new Error(msg);
   }
 
   log(`weixin monitor started (${baseUrl}, account=${accountId})`);

package/src/runtime.ts

@@ -1,70 +0,0 @@
-import type { PluginRuntime } from "openclaw/plugin-sdk/core";
-
-import { logger } from "./util/logger.js";
-
-let pluginRuntime: PluginRuntime | null = null;
-
-export type PluginChannelRuntime = PluginRuntime["channel"];
-
-/**
- * Sets the global Weixin runtime (called from plugin register).
- */
-export function setWeixinRuntime(next: PluginRuntime): void {
-  pluginRuntime = next;
-  logger.info(`[runtime] setWeixinRuntime called, runtime set successfully`);
-}
-
-/**
- * Gets the global Weixin runtime (throws if not initialized).
- */
-export function getWeixinRuntime(): PluginRuntime {
-  if (!pluginRuntime) {
-    throw new Error("Weixin runtime not initialized");
-  }
-  return pluginRuntime;
-}
-
-const WAIT_INTERVAL_MS = 100;
-const DEFAULT_TIMEOUT_MS = 10_000;
-
-/**
- * Waits for the Weixin runtime to be initialized (async polling).
- */
-export async function waitForWeixinRuntime(
-  timeoutMs = DEFAULT_TIMEOUT_MS,
-): Promise<PluginRuntime> {
-  const start = Date.now();
-  while (!pluginRuntime) {
-    if (Date.now() - start > timeoutMs) {
-      throw new Error("Weixin runtime initialization timeout");
-    }
-    await new Promise((resolve) => setTimeout(resolve, WAIT_INTERVAL_MS));
-  }
-  return pluginRuntime;
-}
-
-/**
- * Resolves `PluginRuntime["channel"]` for the long-poll monitor.
- *
- * Prefer the gateway-injected `channelRuntime` on `ChannelGatewayContext` when present (avoids
- * races with the module-global from `register()`). Fall back to the global set by `setWeixinRuntime()`,
- * then to a short wait for legacy hosts.
- */
-export async function resolveWeixinChannelRuntime(params: {
-  channelRuntime?: PluginChannelRuntime;
-  waitTimeoutMs?: number;
-}): Promise<PluginChannelRuntime> {
-  if (params.channelRuntime) {
-    logger.debug("[runtime] channelRuntime from gateway context");
-    return params.channelRuntime;
-  }
-  if (pluginRuntime) {
-    logger.debug("[runtime] channelRuntime from register() global");
-    return pluginRuntime.channel;
-  }
-  logger.warn(
-    "[runtime] no channelRuntime on ctx and no global runtime yet; waiting for register()",
-  );
-  const pr = await waitForWeixinRuntime(params.waitTimeoutMs ?? DEFAULT_TIMEOUT_MS);
-  return pr.channel;
-}