rol-websocket-channel 1.3.6 → 1.3.8

package/dist/src/admin/lib/paths.js

@@ -1,12 +1,14 @@
+import fs from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { JsonRpcException, JSON_RPC_ERRORS } from '../jsonrpc.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 export function getProjectRoot() {
-    // __dirname 是 /path/to/rol-websocket-channel/src/admin/lib
-    // 需要返回 /path/to/rol-websocket-channel
-    const root = path.resolve(__dirname, '..', '..', '..');
+    let root = path.resolve(__dirname, '..', '..', '..');
+    if (path.basename(root) === 'dist') {
+        root = path.dirname(root);
+    }
     console.log('[paths] __dirname:', __dirname);
     console.log('[paths] getProjectRoot:', root);
     return root;
@@ -16,26 +18,58 @@ export function getOpenClawRoot() {
         console.log('[paths] getOpenClawRoot from env:', process.env.OPENCLAW_HOME);
         return path.resolve(process.env.OPENCLAW_HOME);
     }
-    // 插件在 ~/.openclaw/extensions/rol-websocket-channel
-    // 需要返回 ~/.openclaw
     const projectRoot = getProjectRoot();
+    const configuredRoot = findNearestOpenClawConfigRoot(projectRoot);
+    if (configuredRoot) {
+        console.log('[paths] getOpenClawRoot from discovered openclaw.json:', configuredRoot);
+        return configuredRoot;
+    }
+    const openclawDir = findAncestorNamed(projectRoot, '.openclaw');
+    if (openclawDir) {
+        console.log('[paths] getOpenClawRoot from .openclaw ancestor:', openclawDir);
+        return openclawDir;
+    }
     const parentDir = path.dirname(projectRoot);
     const parentName = path.basename(parentDir);
     console.log('[paths] projectRoot:', projectRoot);
     console.log('[paths] parentDir:', parentDir);
     console.log('[paths] parentName:', parentName);
     if (parentName === 'extensions') {
-        // parentDir 是 ~/.openclaw/extensions
-        // 返回 ~/.openclaw
         const openclawRoot = path.dirname(parentDir);
         console.log('[paths] getOpenClawRoot (extensions):', openclawRoot);
         return openclawRoot;
     }
-    // 兜底：假设插件在 openclaw 根目录的子目录
     const fallbackRoot = path.resolve(projectRoot, '..');
     console.log('[paths] getOpenClawRoot (fallback):', fallbackRoot);
     return fallbackRoot;
 }
+function findNearestOpenClawConfigRoot(startDir) {
+    for (const dir of walkAncestors(startDir)) {
+        if (fs.existsSync(path.join(dir, 'openclaw.json'))) {
+            return dir;
+        }
+    }
+    return null;
+}
+function findAncestorNamed(startDir, name) {
+    for (const dir of walkAncestors(startDir)) {
+        if (path.basename(dir) === name) {
+            return dir;
+        }
+    }
+    return null;
+}
+function* walkAncestors(startDir) {
+    let current = path.resolve(startDir);
+    while (true) {
+        yield current;
+        const parent = path.dirname(current);
+        if (parent === current) {
+            return;
+        }
+        current = parent;
+    }
+}
 export function ensureInside(parentDir, targetPath) {
     const parent = path.resolve(parentDir);
     const target = path.resolve(targetPath);

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

@@ -15,7 +15,6 @@ export async function pairWithKey(options, context) {
     }
     const configPath = path.join(context.openclawRoot, 'openclaw.json');
     const config = await loadConfig(configPath);
-    ensurePluginInstalled(config);
     const existingMqttUrl = resolveExistingMqttUrl(config);
     const endpoint = buildPairEndpoint(options.endpoint, config);
     const payload = await exchangePairKey(key, endpoint, options.auth, existingMqttUrl);
@@ -43,14 +42,6 @@ async function loadConfig(configPath) {
     }
     return await readJsonFile(configPath);
 }
-function ensurePluginInstalled(config) {
-    const allowed = Array.isArray(config.plugins?.allow) ? config.plugins.allow : [];
-    const installs = config.plugins?.installs;
-    const hasInstallRecord = Boolean(installs && typeof installs === 'object' && DEFAULT_PLUGIN_ID in installs);
-    if (!allowed.includes(DEFAULT_PLUGIN_ID) && !hasInstallRecord) {
-        throwPairingError('PAIR_PLUGIN_NOT_INSTALLED', `plugin not installed or not allowed: ${DEFAULT_PLUGIN_ID}`);
-    }
-}
 async function exchangePairKey(key, endpoint, authOverride, existingMqttUrl) {
     const auth = pickString(authOverride);
     const headers = {

package/package.json

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

package/src/admin/lib/paths.ts

@@ -1,3 +1,4 @@
+import fs from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 
@@ -7,9 +8,11 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 export function getProjectRoot(): string {
-  // __dirname 是 /path/to/rol-websocket-channel/src/admin/lib
-  // 需要返回 /path/to/rol-websocket-channel
-  const root = path.resolve(__dirname, '..', '..', '..');
+  let root = path.resolve(__dirname, '..', '..', '..');
+  if (path.basename(root) === 'dist') {
+    root = path.dirname(root);
+  }
+
   console.log('[paths] __dirname:', __dirname);
   console.log('[paths] getProjectRoot:', root);
   return root;
@@ -21,9 +24,19 @@ export function getOpenClawRoot(): string {
     return path.resolve(process.env.OPENCLAW_HOME);
   }
 
-  // 插件在 ~/.openclaw/extensions/rol-websocket-channel
-  // 需要返回 ~/.openclaw
   const projectRoot = getProjectRoot();
+  const configuredRoot = findNearestOpenClawConfigRoot(projectRoot);
+  if (configuredRoot) {
+    console.log('[paths] getOpenClawRoot from discovered openclaw.json:', configuredRoot);
+    return configuredRoot;
+  }
+
+  const openclawDir = findAncestorNamed(projectRoot, '.openclaw');
+  if (openclawDir) {
+    console.log('[paths] getOpenClawRoot from .openclaw ancestor:', openclawDir);
+    return openclawDir;
+  }
+
   const parentDir = path.dirname(projectRoot);
   const parentName = path.basename(parentDir);
 
@@ -32,19 +45,48 @@ export function getOpenClawRoot(): string {
   console.log('[paths] parentName:', parentName);
 
   if (parentName === 'extensions') {
-    // parentDir 是 ~/.openclaw/extensions
-    // 返回 ~/.openclaw
     const openclawRoot = path.dirname(parentDir);
     console.log('[paths] getOpenClawRoot (extensions):', openclawRoot);
     return openclawRoot;
   }
 
-  // 兜底：假设插件在 openclaw 根目录的子目录
   const fallbackRoot = path.resolve(projectRoot, '..');
   console.log('[paths] getOpenClawRoot (fallback):', fallbackRoot);
   return fallbackRoot;
 }
 
+function findNearestOpenClawConfigRoot(startDir: string): string | null {
+  for (const dir of walkAncestors(startDir)) {
+    if (fs.existsSync(path.join(dir, 'openclaw.json'))) {
+      return dir;
+    }
+  }
+
+  return null;
+}
+
+function findAncestorNamed(startDir: string, name: string): string | null {
+  for (const dir of walkAncestors(startDir)) {
+    if (path.basename(dir) === name) {
+      return dir;
+    }
+  }
+
+  return null;
+}
+
+function* walkAncestors(startDir: string): Generator<string> {
+  let current = path.resolve(startDir);
+  while (true) {
+    yield current;
+    const parent = path.dirname(current);
+    if (parent === current) {
+      return;
+    }
+    current = parent;
+  }
+}
+
 export function ensureInside(parentDir: string, targetPath: string): string {
   const parent = path.resolve(parentDir);
   const target = path.resolve(targetPath);

package/src/admin/methods/pairing.ts

@@ -57,7 +57,6 @@ export async function pairWithKey(
 
   const configPath = path.join(context.openclawRoot, 'openclaw.json');
   const config = await loadConfig(configPath);
-  ensurePluginInstalled(config);
 
   const existingMqttUrl = resolveExistingMqttUrl(config);
   const endpoint = buildPairEndpoint(options.endpoint, config);
@@ -90,19 +89,6 @@ async function loadConfig(configPath: string): Promise<OpenClawConfig> {
   return await readJsonFile<OpenClawConfig>(configPath);
 }
 
-function ensurePluginInstalled(config: OpenClawConfig): void {
-  const allowed = Array.isArray(config.plugins?.allow) ? config.plugins.allow : [];
-  const installs = config.plugins?.installs;
-  const hasInstallRecord = Boolean(installs && typeof installs === 'object' && DEFAULT_PLUGIN_ID in installs);
-
-  if (!allowed.includes(DEFAULT_PLUGIN_ID) && !hasInstallRecord) {
-    throwPairingError(
-      'PAIR_PLUGIN_NOT_INSTALLED',
-      `plugin not installed or not allowed: ${DEFAULT_PLUGIN_ID}`
-    );
-  }
-}
-
 async function exchangePairKey(
   key: string,
   endpoint: string,