rol-websocket-channel 1.7.3 → 1.7.4

package/dist/src/admin/methods/pairing.js

@@ -51,11 +51,21 @@ async function exchangePairKey(key, endpoint, authOverride, existingMqttUrl) {
     if (auth) {
         headers.Authorization = auth;
     }
-    const response = await fetch(endpoint, {
-        method: 'POST',
-        headers,
-        body: JSON.stringify({ key })
-    });
+    let response;
+    try {
+        response = await fetch(endpoint, {
+            method: 'POST',
+            headers,
+            body: JSON.stringify({ key })
+        });
+    }
+    catch (error) {
+        throw new JsonRpcException(JSON_RPC_ERRORS.internalError, `pair exchange request failed: ${error instanceof Error ? error.message : String(error)}`, {
+            code: 'PAIR_EXCHANGE_REQUEST_FAILED',
+            endpoint,
+            cause: describeErrorCause(error)
+        });
+    }
     const rawText = await response.text();
     const payload = tryParseJson(rawText);
     if (!response.ok) {
@@ -66,8 +76,23 @@ async function exchangePairKey(key, endpoint, authOverride, existingMqttUrl) {
             payload
         });
     }
+    ensurePairExchangeSucceeded(payload, endpoint, response.status);
     return normalizePairingPayload(payload, endpoint, existingMqttUrl);
 }
+function ensurePairExchangeSucceeded(raw, endpoint, status) {
+    if (!isRecord(raw) || raw.success !== false) {
+        return;
+    }
+    const serviceMessage = pickString(raw.message) ?? pickString(raw.msg);
+    throw new JsonRpcException(JSON_RPC_ERRORS.internalError, `pair exchange failed${serviceMessage ? `: ${serviceMessage}` : ''}`, {
+        code: 'PAIR_EXCHANGE_FAILED',
+        endpoint,
+        status,
+        serviceCode: raw.code,
+        success: false,
+        ...(serviceMessage ? { serviceMessage } : {})
+    });
+}
 function normalizePairingPayload(raw, endpoint, existingMqttUrl) {
     const root = unwrapPayload(raw);
     const pluginId = pickString(root.pluginId) ?? pickString(root.plugin_id) ?? DEFAULT_PLUGIN_ID;
@@ -341,6 +366,30 @@ function pickRecord(...values) {
 function isRecord(value) {
     return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
 }
+function describeErrorCause(error) {
+    const detail = {};
+    if (error instanceof Error) {
+        detail.name = error.name;
+        detail.message = error.message;
+    }
+    else {
+        detail.message = String(error);
+    }
+    const cause = error?.cause;
+    if (isRecord(cause)) {
+        const causeDetail = {};
+        for (const key of ['name', 'message', 'code', 'errno', 'syscall', 'hostname', 'address', 'port']) {
+            const value = cause[key];
+            if (['string', 'number', 'boolean'].includes(typeof value)) {
+                causeDetail[key] = value;
+            }
+        }
+        if (Object.keys(causeDetail).length > 0) {
+            detail.cause = causeDetail;
+        }
+    }
+    return detail;
+}
 function throwPairingError(code, message, debug) {
     throw new JsonRpcException(JSON_RPC_ERRORS.invalidParams, message, {
         code,

package/dist/src/admin/methods/system.js

@@ -9,6 +9,7 @@ const execFileAsync = promisify(execFile);
 const UPDATE_COMMAND_TIMEOUT_MS = 10 * 60 * 1000;
 const UPDATE_COMMAND_MAX_BUFFER = 10 * 1024 * 1024;
 const CHANNEL_FALLBACK_VERSION = '1.5.9';
+const MIN_OPENCLAW_PLUGIN_UPDATE_VERSION = '2026.5.6';
 export const ping = async () => {
     return {
         ok: true,
@@ -74,6 +75,18 @@ export const doctorFix = async (_params, context) => {
     }
 };
 export const pluginSelfUpdate = async (_params, context) => {
+    const versionCheck = await checkOpenClawVersionForPluginUpdate(context);
+    if (!versionCheck.supported) {
+        return {
+            ok: false,
+            action: 'pluginSelfUpdate',
+            plugin: 'rol-websocket-channel',
+            skipped: true,
+            reason: versionCheck.reason,
+            message: versionCheck.message,
+            restartRecommended: false
+        };
+    }
     const result = await runOpenClawCommand(['plugins', 'update', 'rol-websocket-channel'], context, 'pluginSelfUpdate');
     const output = `${result.stdout}\n${result.stderr}`;
     if (isPathSourceUpdateSkip(output)) {
@@ -96,6 +109,45 @@ export const pluginSelfUpdate = async (_params, context) => {
         ...result
     };
 };
+async function checkOpenClawVersionForPluginUpdate(context) {
+    try {
+        const result = await runOpenClawCommand(['--version'], context, 'pluginSelfUpdate.versionCheck');
+        const output = `${result.stdout}\n${result.stderr}`.trim();
+        const currentVersion = extractOpenClawVersion(output);
+        if (!currentVersion) {
+            return {
+                supported: false,
+                reason: 'openclaw-version-unreadable',
+                message: `Unable to detect OpenClaw version. Please install or upgrade OpenClaw to ${MIN_OPENCLAW_PLUGIN_UPDATE_VERSION} or newer before updating rol-websocket-channel.`,
+                currentVersion: null,
+                output
+            };
+        }
+        if (!isOpenClawVersionAtLeast(currentVersion, MIN_OPENCLAW_PLUGIN_UPDATE_VERSION)) {
+            return {
+                supported: false,
+                reason: 'openclaw-version-too-old',
+                message: `OpenClaw ${currentVersion} is too old for rol-websocket-channel self update. Please install or upgrade OpenClaw to ${MIN_OPENCLAW_PLUGIN_UPDATE_VERSION} or newer.`,
+                currentVersion,
+                output
+            };
+        }
+        return {
+            supported: true,
+            currentVersion,
+            output
+        };
+    }
+    catch (error) {
+        return {
+            supported: false,
+            reason: 'openclaw-version-check-failed',
+            message: `Unable to check OpenClaw version. Please install or upgrade OpenClaw to ${MIN_OPENCLAW_PLUGIN_UPDATE_VERSION} or newer before updating rol-websocket-channel.`,
+            currentVersion: null,
+            output: error instanceof Error ? error.message : String(error)
+        };
+    }
+}
 export const currentVersion = async (_params, context) => {
     const [channelPackage, registryInfo] = await Promise.all([
         readJsonFile(path.join(context.projectRoot, 'package.json')),
@@ -117,6 +169,23 @@ export const currentVersion = async (_params, context) => {
     };
 };
 export const logs = async (params, context) => {
+    const limit = 10;
+    const maxBytes = normalizePositiveInteger(params?.maxBytes, 250000);
+    try {
+        const result = await runOpenClawCommand(['logs', '--json', '--limit', String(limit), '--max-bytes', String(maxBytes)], context, 'logs');
+        return {
+            ok: true,
+            source: 'openclaw logs',
+            nextOffset: null,
+            lines: parseOpenClawLogOutput(result.stdout).slice(-limit).reverse()
+        };
+    }
+    catch (officialError) {
+        console.error(`[system] openclaw logs failed, falling back to local file scan: ${officialError instanceof Error ? officialError.message : String(officialError)}`);
+        return await readLocalLogFiles(context, limit, maxBytes);
+    }
+};
+async function readLocalLogFiles(context, limit, maxBytes) {
     try {
         // 根据实际情况可能需要调整，这里默认尝试 project root 或 user home 下的 .openclaw/logs
         // 很多时候全局日志位于 ~/.openclaw/logs/gateway.log 或工程目录下的 .openclaw 文件夹中
@@ -168,8 +237,6 @@ export const logs = async (params, context) => {
         if (logFiles.length === 0) {
             return { ok: false, error: `No .log files found in directory: ${logDir}` };
         }
-        const limit = 10;
-        const maxBytes = params?.maxBytes ?? 250000;
         let offset = undefined;
         // 获取所有候选日志的详细信息并排序（对应 ls -t）
         const fileStats = await Promise.all(logFiles.map(async (file) => {
@@ -226,7 +293,31 @@ export const logs = async (params, context) => {
             error: error instanceof Error ? error.message : String(error)
         };
     }
-};
+}
+function parseOpenClawLogOutput(output) {
+    return output
+        .split(/\r?\n/)
+        .map((line) => line.trim())
+        .filter((line) => line.length > 0)
+        .map((line) => {
+        try {
+            return JSON.parse(line);
+        }
+        catch {
+            return line;
+        }
+    })
+        .filter((entry) => !(isJsonObject(entry) && entry.type === 'meta'));
+}
+function normalizePositiveInteger(value, fallback) {
+    if (typeof value !== 'number' || !Number.isFinite(value) || value <= 0) {
+        return fallback;
+    }
+    return Math.floor(value);
+}
+function isJsonObject(value) {
+    return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
+}
 async function runOpenClawCommand(args, context, action) {
     const command = process.env.OPENCLAW_BIN || 'openclaw';
     const options = buildExecOptions(context.openclawRoot, context.openclawRoot);
@@ -339,6 +430,28 @@ function normalizeVersion(value) {
     }
     return value.trim().replace(/^v/i, '');
 }
+function isOpenClawVersionAtLeast(current, minimum) {
+    const currentVersion = extractOpenClawVersion(current);
+    const minimumVersion = extractOpenClawVersion(minimum);
+    if (!currentVersion || !minimumVersion) {
+        return false;
+    }
+    const currentParts = currentVersion.split('.').map(Number);
+    const minimumParts = minimumVersion.split('.').map(Number);
+    for (let i = 0; i < Math.max(currentParts.length, minimumParts.length); i += 1) {
+        const currentPart = currentParts[i] ?? 0;
+        const minimumPart = minimumParts[i] ?? 0;
+        if (currentPart > minimumPart)
+            return true;
+        if (currentPart < minimumPart)
+            return false;
+    }
+    return true;
+}
+function extractOpenClawVersion(value) {
+    const match = value.match(/\b(\d{4}\.\d+\.\d+)\b/);
+    return match ? match[1] : null;
+}
 function isPathSourceUpdateSkip(output) {
     return /Skipping\s+"?rol-websocket-channel"?\s+\(source:\s*path\)/i.test(output);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rol-websocket-channel",
-  "version": "1.7.3",
+  "version": "1.7.4",
   "description": "Unified OpenClaw plugin: MQTT Channel + Admin Bridge for remote management",
   "license": "MIT",
   "author": "nixgnehc",

package/src/admin/methods/pairing.ts

@@ -114,11 +114,24 @@ async function exchangePairKey(
     headers.Authorization = auth;
   }
 
-  const response = await fetch(endpoint, {
-    method: 'POST',
-    headers,
-    body: JSON.stringify({ key })
-  });
+  let response: Response;
+  try {
+    response = await fetch(endpoint, {
+      method: 'POST',
+      headers,
+      body: JSON.stringify({ key })
+    });
+  } catch (error) {
+    throw new JsonRpcException(
+      JSON_RPC_ERRORS.internalError,
+      `pair exchange request failed: ${error instanceof Error ? error.message : String(error)}`,
+      {
+        code: 'PAIR_EXCHANGE_REQUEST_FAILED',
+        endpoint,
+        cause: describeErrorCause(error)
+      }
+    );
+  }
 
   const rawText = await response.text();
   const payload = tryParseJson(rawText);
@@ -135,9 +148,31 @@ async function exchangePairKey(
     );
   }
 
+  ensurePairExchangeSucceeded(payload, endpoint, response.status);
+
   return normalizePairingPayload(payload, endpoint, existingMqttUrl);
 }
 
+function ensurePairExchangeSucceeded(raw: unknown, endpoint: string, status: number): void {
+  if (!isRecord(raw) || raw.success !== false) {
+    return;
+  }
+
+  const serviceMessage = pickString(raw.message) ?? pickString(raw.msg);
+  throw new JsonRpcException(
+    JSON_RPC_ERRORS.internalError,
+    `pair exchange failed${serviceMessage ? `: ${serviceMessage}` : ''}`,
+    {
+      code: 'PAIR_EXCHANGE_FAILED',
+      endpoint,
+      status,
+      serviceCode: raw.code,
+      success: false,
+      ...(serviceMessage ? { serviceMessage } : {})
+    }
+  );
+}
+
 function normalizePairingPayload(
   raw: unknown,
   endpoint: string,
@@ -448,6 +483,33 @@ function isRecord(value: unknown): value is Record<string, any> {
   return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
 }
 
+function describeErrorCause(error: unknown): Record<string, unknown> {
+  const detail: Record<string, unknown> = {};
+  if (error instanceof Error) {
+    detail.name = error.name;
+    detail.message = error.message;
+  } else {
+    detail.message = String(error);
+  }
+
+  const cause = (error as { cause?: unknown } | null | undefined)?.cause;
+  if (isRecord(cause)) {
+    const causeDetail: Record<string, unknown> = {};
+    for (const key of ['name', 'message', 'code', 'errno', 'syscall', 'hostname', 'address', 'port']) {
+      const value = cause[key];
+      if (['string', 'number', 'boolean'].includes(typeof value)) {
+        causeDetail[key] = value;
+      }
+    }
+
+    if (Object.keys(causeDetail).length > 0) {
+      detail.cause = causeDetail;
+    }
+  }
+
+  return detail;
+}
+
 function throwPairingError(code: string, message: string, debug?: PairingPayloadDebug): never {
   throw new JsonRpcException(JSON_RPC_ERRORS.invalidParams, message, {
     code,

package/src/admin/methods/system.ts

@@ -11,6 +11,7 @@ const execFileAsync = promisify(execFile);
 const UPDATE_COMMAND_TIMEOUT_MS = 10 * 60 * 1000;
 const UPDATE_COMMAND_MAX_BUFFER = 10 * 1024 * 1024;
 const CHANNEL_FALLBACK_VERSION = '1.5.9';
+const MIN_OPENCLAW_PLUGIN_UPDATE_VERSION = '2026.5.6';
 
 export const ping: MethodHandler = async (): Promise<JsonValue> => {
   return {
@@ -81,6 +82,19 @@ export const doctorFix: MethodHandler = async (_params, context: MethodContext):
 };
 
 export const pluginSelfUpdate: MethodHandler = async (_params, context: MethodContext): Promise<JsonValue> => {
+  const versionCheck = await checkOpenClawVersionForPluginUpdate(context);
+  if (!versionCheck.supported) {
+    return {
+      ok: false,
+      action: 'pluginSelfUpdate',
+      plugin: 'rol-websocket-channel',
+      skipped: true,
+      reason: versionCheck.reason,
+      message: versionCheck.message,
+      restartRecommended: false
+    };
+  }
+
   const result = await runOpenClawCommand(
     ['plugins', 'update', 'rol-websocket-channel'],
     context,
@@ -110,6 +124,61 @@ export const pluginSelfUpdate: MethodHandler = async (_params, context: MethodCo
   };
 };
 
+type PluginUpdateVersionCheck =
+  | {
+      supported: true;
+      currentVersion: string;
+      output: string;
+    }
+  | {
+      supported: false;
+      reason: string;
+      message: string;
+      currentVersion: string | null;
+      output: string;
+    };
+
+async function checkOpenClawVersionForPluginUpdate(context: MethodContext): Promise<PluginUpdateVersionCheck> {
+  try {
+    const result = await runOpenClawCommand(['--version'], context, 'pluginSelfUpdate.versionCheck');
+    const output = `${result.stdout}\n${result.stderr}`.trim();
+    const currentVersion = extractOpenClawVersion(output);
+    if (!currentVersion) {
+      return {
+        supported: false,
+        reason: 'openclaw-version-unreadable',
+        message: `Unable to detect OpenClaw version. Please install or upgrade OpenClaw to ${MIN_OPENCLAW_PLUGIN_UPDATE_VERSION} or newer before updating rol-websocket-channel.`,
+        currentVersion: null,
+        output
+      };
+    }
+
+    if (!isOpenClawVersionAtLeast(currentVersion, MIN_OPENCLAW_PLUGIN_UPDATE_VERSION)) {
+      return {
+        supported: false,
+        reason: 'openclaw-version-too-old',
+        message: `OpenClaw ${currentVersion} is too old for rol-websocket-channel self update. Please install or upgrade OpenClaw to ${MIN_OPENCLAW_PLUGIN_UPDATE_VERSION} or newer.`,
+        currentVersion,
+        output
+      };
+    }
+
+    return {
+      supported: true,
+      currentVersion,
+      output
+    };
+  } catch (error) {
+    return {
+      supported: false,
+      reason: 'openclaw-version-check-failed',
+      message: `Unable to check OpenClaw version. Please install or upgrade OpenClaw to ${MIN_OPENCLAW_PLUGIN_UPDATE_VERSION} or newer before updating rol-websocket-channel.`,
+      currentVersion: null,
+      output: error instanceof Error ? error.message : String(error)
+    };
+  }
+}
+
 export const currentVersion: MethodHandler = async (_params, context: MethodContext): Promise<JsonValue> => {
   const [channelPackage, registryInfo] = await Promise.all([
     readJsonFile<{ name?: string; version?: string }>(path.join(context.projectRoot, 'package.json')),
@@ -140,6 +209,34 @@ export const currentVersion: MethodHandler = async (_params, context: MethodCont
 };
 
 export const logs: MethodHandler = async (params: any, context: MethodContext): Promise<JsonValue> => {
+  const limit = 10;
+  const maxBytes = normalizePositiveInteger(params?.maxBytes, 250000);
+
+  try {
+    const result = await runOpenClawCommand(
+      ['logs', '--json', '--limit', String(limit), '--max-bytes', String(maxBytes)],
+      context,
+      'logs'
+    );
+    return {
+      ok: true,
+      source: 'openclaw logs',
+      nextOffset: null,
+      lines: parseOpenClawLogOutput(result.stdout).slice(-limit).reverse()
+    };
+  } catch (officialError) {
+    console.error(
+      `[system] openclaw logs failed, falling back to local file scan: ${officialError instanceof Error ? officialError.message : String(officialError)}`
+    );
+    return await readLocalLogFiles(context, limit, maxBytes);
+  }
+};
+
+async function readLocalLogFiles(
+  context: MethodContext,
+  limit: number,
+  maxBytes: number
+): Promise<JsonValue> {
   try {
     // 根据实际情况可能需要调整，这里默认尝试 project root 或 user home 下的 .openclaw/logs
     // 很多时候全局日志位于 ~/.openclaw/logs/gateway.log 或工程目录下的 .openclaw 文件夹中
@@ -201,8 +298,6 @@ export const logs: MethodHandler = async (params: any, context: MethodContext):
       return { ok: false, error: `No .log files found in directory: ${logDir}` };
     }
 
-    const limit = 10;
-    const maxBytes = params?.maxBytes ?? 250000;
     let offset: number | undefined = undefined;
 
     // 获取所有候选日志的详细信息并排序（对应 ls -t）
@@ -267,7 +362,34 @@ export const logs: MethodHandler = async (params: any, context: MethodContext):
       error: error instanceof Error ? error.message : String(error)
     };
   }
-};
+}
+
+function parseOpenClawLogOutput(output: string): JsonValue[] {
+  return output
+    .split(/\r?\n/)
+    .map((line) => line.trim())
+    .filter((line) => line.length > 0)
+    .map((line) => {
+      try {
+        return JSON.parse(line) as JsonValue;
+      } catch {
+        return line;
+      }
+    })
+    .filter((entry) => !(isJsonObject(entry) && entry.type === 'meta'));
+}
+
+function normalizePositiveInteger(value: unknown, fallback: number): number {
+  if (typeof value !== 'number' || !Number.isFinite(value) || value <= 0) {
+    return fallback;
+  }
+
+  return Math.floor(value);
+}
+
+function isJsonObject(value: JsonValue): value is { [key: string]: JsonValue } {
+  return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
+}
 
 async function runOpenClawCommand(
   args: string[],
@@ -432,6 +554,30 @@ function normalizeVersion(value: string | undefined): string {
   return value.trim().replace(/^v/i, '');
 }
 
+function isOpenClawVersionAtLeast(current: string, minimum: string): boolean {
+  const currentVersion = extractOpenClawVersion(current);
+  const minimumVersion = extractOpenClawVersion(minimum);
+  if (!currentVersion || !minimumVersion) {
+    return false;
+  }
+
+  const currentParts = currentVersion.split('.').map(Number);
+  const minimumParts = minimumVersion.split('.').map(Number);
+  for (let i = 0; i < Math.max(currentParts.length, minimumParts.length); i += 1) {
+    const currentPart = currentParts[i] ?? 0;
+    const minimumPart = minimumParts[i] ?? 0;
+    if (currentPart > minimumPart) return true;
+    if (currentPart < minimumPart) return false;
+  }
+
+  return true;
+}
+
+function extractOpenClawVersion(value: string): string | null {
+  const match = value.match(/\b(\d{4}\.\d+\.\d+)\b/);
+  return match ? match[1] : null;
+}
+
 function isPathSourceUpdateSkip(output: string): boolean {
   return /Skipping\s+"?rol-websocket-channel"?\s+\(source:\s*path\)/i.test(output);
 }