rol-websocket-channel 1.0.7 → 1.0.8

package/package.json

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

package/src/admin/methods/pairing.ts

@@ -9,7 +9,7 @@ import type { JsonValue, MethodContext } from '../types.ts';
 const execFileAsync = promisify(execFile);
 
 const DEFAULT_PLUGIN_ID = 'rol-websocket-channel';
-const DEFAULT_PAIR_ENDPOINT = 'http://api.deotaland.local/api-core-bot/front/agent/agent/key/query';
+const DEFAULT_PRODUCTION_BASE_URL = 'https://api.deotaland.ai';
 const GATEWAY_SERVICE = 'openclaw-gateway.service';
 
 interface PairingCommandOptions {
@@ -106,8 +106,7 @@ async function exchangePairKey(
   authOverride?: string,
   existingMqttUrl?: string | null
 ): Promise<PairingPayload> {
-  const endpoint = pickString(endpointOverride)
-    ?? DEFAULT_PAIR_ENDPOINT;
+  const endpoint = buildPairEndpoint(endpointOverride);
   const auth = pickString(authOverride);
 
   const headers: Record<string, string> = {
@@ -151,8 +150,6 @@ function normalizePairingPayload(
   const apiCoreBotValue = isRecord(root.apiCoreBot) ? root.apiCoreBot : {};
   const channelValue = isRecord(root.channel) ? root.channel : {};
 
-  const apiCoreBotBaseUrl = pickString(apiCoreBotValue.baseUrl)
-    ?? deriveBaseUrl(endpoint);
   const apiCoreBotAuthToken = pickString(apiCoreBotValue.authToken)
     ?? pickString(root.authToken)
     ?? pickString(root.token);
@@ -185,7 +182,6 @@ function normalizePairingPayload(
       ...(rawValue ? { rawValue } : {})
     },
     apiCoreBot: {
-      baseUrl: apiCoreBotBaseUrl,
       ...(apiCoreBotAuthToken ? { authToken: apiCoreBotAuthToken } : {})
     },
     channel: {
@@ -225,7 +221,7 @@ function applyPairingConfig(config: OpenClawConfig, key: string, payload: Pairin
       },
       apiCoreBot: {
         ...(isRecord(existingPluginConfig.apiCoreBot) ? existingPluginConfig.apiCoreBot : {}),
-        ...payload.apiCoreBot
+        ...(payload.apiCoreBot.authToken ? { authToken: payload.apiCoreBot.authToken } : {})
       }
     }
   };
@@ -276,10 +272,14 @@ function tryParseJson(raw: string): unknown {
   }
 }
 
-function deriveBaseUrl(endpoint: string): string {
-  const marker = '/front/';
-  const markerIndex = endpoint.indexOf(marker);
-  return markerIndex >= 0 ? endpoint.slice(0, markerIndex) : endpoint.replace(/\/+$/, '');
+function buildPairEndpoint(endpointOverride?: string): string {
+  const override = pickString(endpointOverride);
+  if (override) {
+    return override;
+  }
+
+  const baseUrl = getDeotalandApiBaseUrl();
+  return `${baseUrl}/api-core-bot/front/agent/agent/key/query`;
 }
 
 function resolveExistingMqttUrl(config: OpenClawConfig): string | null {
@@ -325,6 +325,11 @@ function pickString(value: unknown): string | null {
   return trimmed.length > 0 ? trimmed : null;
 }
 
+function getDeotalandApiBaseUrl(): string {
+  const configured = pickString(process.env.DEOTALAND_API_BASE_URL);
+  return (configured ?? DEFAULT_PRODUCTION_BASE_URL).replace(/\/+$/, '');
+}
+
 function isRecord(value: unknown): value is Record<string, any> {
   return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
 }