@coclaw/openclaw-coclaw 0.1.4 → 0.1.6

package/index.js

@@ -117,8 +117,8 @@ const plugin = {
 				}
 
 				try {
-					const serverUrl = options.server ?? api.pluginConfig?.serverUrl;
 					if (action === 'bind') {
+						const serverUrl = options.server ?? api.pluginConfig?.serverUrl;
 						const result = await bindBot({
 							code: positionals[0],
 							serverUrl,
@@ -128,7 +128,7 @@ const plugin = {
 					}
 
 					if (action === 'unbind') {
-						const result = await unbindBot({ serverUrl });
+						const result = await unbindBot({ serverUrl: options.server });
 						await stopRealtimeBridge();
 						return { text: unbindOk(result) };
 					}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coclaw/openclaw-coclaw",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "type": "module",
   "license": "Apache-2.0",
   "description": "OpenClaw CoClaw channel plugin for remote chat",

package/src/cli-registrar.js

@@ -8,7 +8,7 @@ import {
 
 function resolveServerUrl(opts, config) {
 	return opts?.server
-		?? config?.plugins?.entries?.['coclaw']?.config?.serverUrl
+		?? config?.plugins?.entries?.['openclaw-coclaw']?.config?.serverUrl
 		?? process.env.COCLAW_SERVER_URL;
 }
 
@@ -69,8 +69,7 @@ export function registerCoclawCli({ program, config, logger }, deps = {}) {
 		.option('--server <url>', 'CoClaw server URL')
 		.action(async (opts) => {
 			try {
-				const serverUrl = resolveServerUrl(opts, config);
-				const result = await unbindBot({ serverUrl });
+				const result = await unbindBot({ serverUrl: opts?.server });
 				/* c8 ignore next */
 				console.log(unbindOk(result));
 				await notifyGateway('coclaw.stopBridge');
@@ -80,8 +79,10 @@ export function registerCoclawCli({ program, config, logger }, deps = {}) {
 					process.exitCode = 1;
 					return;
 				}
+				/* c8 ignore start -- 防御性兜底，unbindBot 当前仅抛 NOT_BOUND */
 				console.error(`Error: ${resolveErrorMessage(err)}`);
 				process.exitCode = 1;
 			}
+			/* c8 ignore stop */
 		});
 }

package/src/cli.js

@@ -98,8 +98,10 @@ export async function main(argv = process.argv.slice(2), deps = {}) {
 				console.error(notBound());
 				return 1;
 			}
+			/* c8 ignore start -- 防御性兜底，unbindBot 当前仅抛 NOT_BOUND */
 			throw err;
 		}
+		/* c8 ignore stop */
 	}
 
 	throw new Error(`unknown command: ${command}`);

package/src/common/bot-binding.js

@@ -1,7 +1,7 @@
 import { bindWithServer, unbindWithServer } from '../api.js';
 import { clearConfig, readConfig, writeConfig } from '../config.js';
 
-const DEFAULT_SERVER_URL = 'http://127.0.0.1:3000';
+const DEFAULT_SERVER_URL = 'https://im.coclaw.net';
 
 export async function bindBot({ code, serverUrl }) {
 	if (!code) {
@@ -50,27 +50,27 @@ export async function unbindBot({ serverUrl }) {
 		throw err;
 	}
 
-	/* c8 ignore next */
-	const baseUrl = serverUrl ?? config.serverUrl ?? process.env.COCLAW_SERVER_URL ?? DEFAULT_SERVER_URL;
+	const baseUrl = serverUrl ?? config.serverUrl;
+
+	// 用户主动解绑：无论 server 通知成功与否，都清理本地绑定
 	let data = null;
-	let alreadyServerUnbound = false;
-	try {
-		data = await unbindWithServer({
-			baseUrl,
-			token: config.token,
-		});
-	}
-	catch (err) {
-		if (err?.response?.data?.code !== 'UNAUTHORIZED') {
-			throw err;
+	let serverError = null;
+	if (baseUrl) {
+		try {
+			data = await unbindWithServer({
+				baseUrl,
+				token: config.token,
+			});
+		}
+		catch (err) {
+			serverError = err;
 		}
-		alreadyServerUnbound = true;
 	}
 
 	await clearConfig();
 
 	return {
 		botId: data?.botId ?? config.botId,
-		alreadyServerUnbound,
+		serverError,
 	};
 }

package/src/common/messages.js

@@ -5,10 +5,10 @@ export function bindOk({ botId, rebound }) {
 	return `OK. Bot (${botId}) ${action} to CoClaw.`;
 }
 
-export function unbindOk({ botId, alreadyServerUnbound }) {
+export function unbindOk({ botId, serverError }) {
 	const id = botId ?? 'unknown';
-	const tag = alreadyServerUnbound
-		? ' (server side already cleared, local config removed)'
+	const tag = serverError
+		? ' (server notification failed; you can unbind the orphan bot in the CoClaw app)'
 		: '';
 	return `OK. Bot (${id}) unbound from CoClaw.${tag}`;
 }

package/src/realtime-bridge.js

@@ -6,7 +6,6 @@ import nodePath from 'node:path';
 import { clearConfig, getBindingsPath, readConfig } from './config.js';
 import { getRuntime } from './runtime.js';
 
-const DEFAULT_SERVER_URL = 'http://127.0.0.1:3000';
 const DEFAULT_GATEWAY_WS_URL = 'ws://127.0.0.1:18789';
 const RECONNECT_MS = 10_000;
 const CONNECT_TIMEOUT_MS = 10_000;
@@ -410,7 +409,11 @@ async function connectIfNeeded() {
 		return;
 	}
 
-	const baseUrl = currentPluginConfig?.serverUrl ?? cfg.serverUrl ?? process.env.COCLAW_SERVER_URL ?? DEFAULT_SERVER_URL;
+	const baseUrl = cfg.serverUrl;
+	if (!baseUrl) {
+		currentLogger.warn?.(`[coclaw] realtime bridge skip connect: missing serverUrl in ${bindingsPath}`);
+		return;
+	}
 	const target = toServerWsUrl(baseUrl, cfg.token);
 	const WebSocketCtor = globalThis.WebSocket;
 	if (!WebSocketCtor) {