@nextclaw/openclaw-compat 0.3.26 → 0.3.28

package/dist/index.d.ts

@@ -110,7 +110,12 @@ type OpenClawChannelSetup = {
     }) => Record<string, unknown>;
 };
 type OpenClawChannelGatewayStartContext = {
+    cfg?: Config;
     accountId?: string | null;
+    channelId?: string;
+    abortSignal?: AbortSignal;
+    runtime?: Record<string, unknown>;
+    setStatus?: (status: Record<string, unknown>) => void;
     log?: {
         debug?: (message: string) => void;
         info?: (message: string) => void;
@@ -464,6 +469,7 @@ type PluginChannelGatewayHandle = {
     pluginId: string;
     channelId: string;
     accountId: string;
+    abort?: () => void;
     stop?: () => void | Promise<void>;
 };
 declare function getPluginChannelBindings(registry: PluginRegistry): PluginChannelBinding[];

package/dist/index.js

@@ -181,6 +181,7 @@ function addPluginLoadPath(config, loadPath) {
 }
 
 // src/plugins/channel-runtime.ts
+import { ConfigSchema } from "@nextclaw/core";
 function normalizeChannelId(channel) {
   return (channel ?? "").trim().toLowerCase();
 }
@@ -244,17 +245,49 @@ function getPluginUiMetadataFromRegistry(registry) {
 function cloneConfig(value) {
   return JSON.parse(JSON.stringify(value));
 }
+var DEFAULT_CONFIG = ConfigSchema.parse({});
+function cloneRecord(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return {};
+  }
+  return cloneConfig(value);
+}
+function hasExplicitChannelConfig(channelId, config) {
+  const defaultChannelConfig = cloneRecord(
+    DEFAULT_CONFIG.channels[channelId]
+  );
+  return JSON.stringify(config) !== JSON.stringify(defaultChannelConfig);
+}
+function resolveProjectedChannelConfig(params) {
+  if (hasExplicitChannelConfig(params.channelId, params.rawChannelConfig)) {
+    return cloneConfig(params.rawChannelConfig);
+  }
+  return cloneConfig(params.pluginConfig);
+}
 function resolveProjectedPluginChannelEnabled(params) {
   const channelEnabled = typeof params.channelConfig?.enabled === "boolean" ? params.channelConfig.enabled : false;
   return params.entryEnabled !== false && channelEnabled;
 }
+function isProjectedChannelEnabled(channelId, configView) {
+  const channels = configView?.channels && typeof configView.channels === "object" && !Array.isArray(configView.channels) ? configView.channels : {};
+  const channelConfig = channels[channelId];
+  if (!channelConfig || typeof channelConfig !== "object" || Array.isArray(channelConfig)) {
+    return false;
+  }
+  return channelConfig.enabled === true;
+}
 function toPluginConfigView(config, bindings) {
   const view = cloneConfig(config);
   const channels = view.channels && typeof view.channels === "object" && !Array.isArray(view.channels) ? { ...view.channels } : {};
   for (const binding of bindings) {
     const pluginEntry = config.plugins.entries?.[binding.pluginId];
-    const pluginConfig = pluginEntry?.config;
-    const normalizedChannelConfig = pluginConfig && typeof pluginConfig === "object" && !Array.isArray(pluginConfig) ? cloneConfig(pluginConfig) : {};
+    const pluginConfig = cloneRecord(pluginEntry?.config);
+    const rawChannelConfig = cloneRecord(config.channels?.[binding.channelId]);
+    const normalizedChannelConfig = resolveProjectedChannelConfig({
+      channelId: binding.channelId,
+      rawChannelConfig,
+      pluginConfig
+    });
     channels[binding.channelId] = {
       ...normalizedChannelConfig,
       enabled: resolveProjectedPluginChannelEnabled({
@@ -281,10 +314,14 @@ function mergePluginConfigView(baseConfig, pluginViewConfig, bindings) {
     const normalizedChannelConfig = cloneConfig(channelConfig);
     const projectedEnabled = typeof normalizedChannelConfig.enabled === "boolean" ? normalizedChannelConfig.enabled : void 0;
     const currentEntry = entries[binding.pluginId] ?? {};
+    const { config: _legacyChannelConfig, ...currentEntryWithoutLegacyConfig } = currentEntry;
     entries[binding.pluginId] = {
-      ...currentEntry,
-      ...projectedEnabled === true ? { enabled: true } : {},
-      config: normalizedChannelConfig
+      ...currentEntryWithoutLegacyConfig,
+      ...projectedEnabled === true ? { enabled: true } : {}
+    };
+    next.channels = {
+      ...next.channels,
+      [binding.channelId]: cloneConfig(normalizedChannelConfig)
     };
   }
   next.plugins = {
@@ -304,6 +341,9 @@ async function startPluginChannelGateways(params) {
     if (!gateway?.startAccount) {
       continue;
     }
+    if (!isProjectedChannelEnabled(binding.channelId, configView)) {
+      continue;
+    }
     const accountIdsRaw = binding.channel.config?.listAccountIds?.(configView) ?? [
       binding.channel.config?.defaultAccountId?.(configView) ?? "default"
     ];
@@ -313,15 +353,33 @@ async function startPluginChannelGateways(params) {
     const finalAccountIds = accountIds.length > 0 ? accountIds : ["default"];
     for (const accountId of finalAccountIds) {
       try {
+        const abortController = new AbortController();
         const started = await gateway.startAccount({
           accountId,
+          channelId: binding.channelId,
+          cfg: configView,
+          abortSignal: abortController.signal,
+          runtime: logger ? {
+            log: logger.info,
+            info: logger.info,
+            warn: logger.warn,
+            error: logger.error,
+            debug: logger.debug
+          } : void 0,
+          setStatus: () => void 0,
           log: logger
         });
         handles.push({
           pluginId: binding.pluginId,
           channelId: binding.channelId,
           accountId,
-          stop: started && typeof started === "object" && "stop" in started && typeof started.stop === "function" ? started.stop : void 0
+          abort: () => abortController.abort(),
+          stop: async () => {
+            abortController.abort();
+            if (started && typeof started === "object" && "stop" in started && typeof started.stop === "function") {
+              await started.stop();
+            }
+          }
         });
       } catch (error) {
         const raw = String(error);
@@ -345,11 +403,9 @@ async function startPluginChannelGateways(params) {
 }
 async function stopPluginChannelGateways(handles) {
   for (const handle of handles) {
-    if (!handle.stop) {
-      continue;
-    }
     try {
-      await handle.stop();
+      handle.abort?.();
+      await handle.stop?.();
     } catch {
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/openclaw-compat",
-  "version": "0.3.26",
+  "version": "0.3.28",
   "private": false,
   "description": "OpenClaw plugin compatibility layer for NextClaw.",
   "type": "module",
@@ -19,21 +19,21 @@
     "jiti": "^1.21.7",
     "jszip": "^3.10.1",
     "tar": "^7.4.3",
-    "@nextclaw/channel-plugin-feishu": "0.2.19",
-    "@nextclaw/channel-plugin-dingtalk": "0.2.14",
-    "@nextclaw/channel-plugin-discord": "0.2.14",
-    "@nextclaw/channel-plugin-slack": "0.2.14",
-    "@nextclaw/channel-plugin-qq": "0.2.14",
-    "@nextclaw/channel-plugin-mochat": "0.2.14",
-    "@nextclaw/channel-plugin-email": "0.2.14",
-    "@nextclaw/channel-plugin-telegram": "0.2.14",
-    "@nextclaw/channel-plugin-wecom": "0.2.14",
-    "@nextclaw/channel-runtime": "0.4.0",
-    "@nextclaw/ncp-toolkit": "0.4.2",
+    "@nextclaw/channel-plugin-dingtalk": "0.2.16",
+    "@nextclaw/channel-plugin-discord": "0.2.16",
+    "@nextclaw/channel-plugin-email": "0.2.16",
+    "@nextclaw/channel-plugin-mochat": "0.2.16",
+    "@nextclaw/channel-plugin-qq": "0.2.16",
+    "@nextclaw/channel-plugin-slack": "0.2.16",
+    "@nextclaw/channel-plugin-telegram": "0.2.16",
+    "@nextclaw/channel-plugin-wecom": "0.2.16",
+    "@nextclaw/channel-runtime": "0.4.2",
+    "@nextclaw/core": "0.11.1",
+    "@nextclaw/channel-plugin-whatsapp": "0.2.16",
     "@nextclaw/ncp": "0.3.2",
-    "@nextclaw/channel-plugin-whatsapp": "0.2.14",
-    "@nextclaw/core": "0.11.0",
-    "@nextclaw/channel-plugin-weixin": "0.1.8"
+    "@nextclaw/ncp-toolkit": "0.4.2",
+    "@nextclaw/channel-plugin-feishu": "0.2.19",
+    "@nextclaw/channel-plugin-weixin": "0.1.9"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",