rol-websocket-channel 1.5.1 → 1.5.2

package/dist/index.js

@@ -12,6 +12,21 @@ let pluginRuntime = null;
 export function getPluginRuntime() {
     return pluginRuntime;
 }
+export function formatCliErrorPayload(error) {
+    const data = error?.data;
+    const dataObject = data && typeof data === "object" && !Array.isArray(data)
+        ? data
+        : {};
+    const code = dataObject.code ?? error?.code;
+    return {
+        ok: false,
+        error: {
+            message: error instanceof Error ? error.message : String(error),
+            ...dataObject,
+            ...(code === undefined ? {} : { code }),
+        },
+    };
+}
 // ============================================
 // 4. 插件主体定义
 // ============================================
@@ -554,13 +569,7 @@ function registerAdminBridgeCli(api) {
             }
             catch (error) {
                 process.exitCode = 1;
-                process.stderr.write(JSON.stringify({
-                    ok: false,
-                    error: {
-                        message: error instanceof Error ? error.message : String(error),
-                        code: error?.data?.code,
-                    },
-                }, null, 2) + "\n");
+                process.stderr.write(JSON.stringify(formatCliErrorPayload(error), null, 2) + "\n");
             }
         });
         const mem9 = root

package/dist/src/admin/cli-manifest.test.js

@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import { readFileSync } from 'node:fs';
 import test from 'node:test';
-import register from '../../index.js';
+import register, { formatCliErrorPayload } from '../../index.js';
 const manifest = JSON.parse(readFileSync(new URL('../../openclaw.plugin.json', import.meta.url), 'utf8'));
 test('manifest declares OpenClaw 2026 command ownership for admin bridge CLI', () => {
     assert.deepEqual(manifest.activation?.onCommands, ['admin-bridge', 'rol-websocket-channel']);
@@ -60,3 +60,26 @@ test('runtime CLI registrar exposes admin-bridge and rol-websocket-channel comma
     assert.equal(commands[0], 'admin-bridge');
     assert.equal(aliases[0], 'rol-websocket-channel');
 });
+test('CLI error formatter preserves diagnostic data for pairing failures', () => {
+    const error = new Error('mqttUrl is missing from pairing payload');
+    error.data = {
+        code: 'PAIR_CHANNEL_CONFIG_INVALID',
+        debug: {
+            rootKeys: ['channel'],
+            channelConfigKeys: ['mqtt_topic'],
+            hasExistingMqttUrl: false
+        }
+    };
+    assert.deepEqual(formatCliErrorPayload(error), {
+        ok: false,
+        error: {
+            message: 'mqttUrl is missing from pairing payload',
+            code: 'PAIR_CHANNEL_CONFIG_INVALID',
+            debug: {
+                rootKeys: ['channel'],
+                channelConfigKeys: ['mqtt_topic'],
+                hasExistingMqttUrl: false
+            }
+        }
+    });
+});

package/index.ts

@@ -38,6 +38,28 @@ export function getPluginRuntime(): any {
   return pluginRuntime;
 }
 
+export function formatCliErrorPayload(error: unknown): {
+  ok: false;
+  error: Record<string, unknown>;
+} {
+  const data = (error as { data?: unknown } | null | undefined)?.data;
+  const dataObject =
+    data && typeof data === "object" && !Array.isArray(data)
+      ? (data as Record<string, unknown>)
+      : {};
+  const code =
+    dataObject.code ?? (error as { code?: unknown } | null | undefined)?.code;
+
+  return {
+    ok: false,
+    error: {
+      message: error instanceof Error ? error.message : String(error),
+      ...dataObject,
+      ...(code === undefined ? {} : { code }),
+    },
+  };
+}
+
 // ============================================
 // 4. 插件主体定义
 // ============================================
@@ -725,18 +747,7 @@ function registerAdminBridgeCli(api: any) {
             } catch (error) {
               process.exitCode = 1;
               process.stderr.write(
-                JSON.stringify(
-                  {
-                    ok: false,
-                    error: {
-                      message:
-                        error instanceof Error ? error.message : String(error),
-                      code: (error as any)?.data?.code,
-                    },
-                  },
-                  null,
-                  2,
-                ) + "\n",
+                JSON.stringify(formatCliErrorPayload(error), null, 2) + "\n",
               );
             }
           },

package/package.json

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

package/src/admin/cli-manifest.test.ts

@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import { readFileSync } from 'node:fs';
 import test from 'node:test';
-import register from '../../index.js';
+import register, { formatCliErrorPayload } from '../../index.js';
 
 const manifest = JSON.parse(readFileSync(new URL('../../openclaw.plugin.json', import.meta.url), 'utf8'));
 
@@ -65,3 +65,30 @@ test('runtime CLI registrar exposes admin-bridge and rol-websocket-channel comma
   assert.equal(commands[0], 'admin-bridge');
   assert.equal(aliases[0], 'rol-websocket-channel');
 });
+
+test('CLI error formatter preserves diagnostic data for pairing failures', () => {
+  const error = new Error('mqttUrl is missing from pairing payload') as Error & {
+    data: Record<string, unknown>;
+  };
+  error.data = {
+    code: 'PAIR_CHANNEL_CONFIG_INVALID',
+    debug: {
+      rootKeys: ['channel'],
+      channelConfigKeys: ['mqtt_topic'],
+      hasExistingMqttUrl: false
+    }
+  };
+
+  assert.deepEqual(formatCliErrorPayload(error), {
+    ok: false,
+    error: {
+      message: 'mqttUrl is missing from pairing payload',
+      code: 'PAIR_CHANNEL_CONFIG_INVALID',
+      debug: {
+        rootKeys: ['channel'],
+        channelConfigKeys: ['mqtt_topic'],
+        hasExistingMqttUrl: false
+      }
+    }
+  });
+});