@tencent-weixin/openclaw-weixin 2.4.1 → 2.4.2

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";
 
@@ -428,6 +428,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 +447,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;
-}