openclaw-channel-basicops 0.1.5 → 0.1.6

package/dist/basicops-mcp.js

@@ -1,37 +1,26 @@
-// Minimal BasicOps MCP-over-SSE client (ported from skills/basicops-mcp/scripts/basicops_mcp.py)
+// Minimal BasicOps MCP-over-SSE client
 //
-// Notes:
-// - This intentionally keeps things simple: each tool call performs an SSE handshake
-//   to obtain a message endpoint, then POSTs a single JSON-RPC request.
-// - For production we may want connection reuse, retries, and token refresh.
+// Correct transport (BasicOps):
+// - GET the SSE URL (text/event-stream) with Bearer token
+// - Read until we receive a "data: <endpoint>" line
+// - POST JSON-RPC to that endpoint
+//
+// This client is intentionally simple: one call opens one SSE stream.
 const DEFAULT_SSE_URL = "https://app.basicops.com/mcp/sse";
 const DEFAULT_PROTOCOL_VERSION = "2024-11-05";
-async function handshake(opts) {
-    const initPayload = {
-        jsonrpc: "2.0",
-        id: 1,
-        method: "initialize",
-        params: {
-            protocolVersion: opts.protocolVersion,
-            capabilities: {},
-            clientInfo: { name: "OpenClaw", version: "0.1" },
-        },
-    };
+async function getMessageEndpoint(opts) {
     const res = await fetch(opts.baseUrl, {
-        method: "POST",
+        method: "GET",
         headers: {
             Authorization: `Bearer ${opts.accessToken}`,
             Accept: "text/event-stream",
-            "Content-Type": "application/json",
             "Cache-Control": "no-cache",
         },
-        body: JSON.stringify(initPayload),
     });
     if (!res.ok || !res.body) {
         const body = await res.text().catch(() => "");
-        throw new Error(`MCP handshake failed (${res.status}): ${body}`);
+        throw new Error(`MCP SSE connect failed (${res.status}): ${body}`);
     }
-    // Read SSE lines until we see the first `data: ...` line (endpoint)
     const reader = res.body.getReader();
     const decoder = new TextDecoder();
     let buf = "";
@@ -41,13 +30,12 @@ async function handshake(opts) {
         if (done)
             break;
         buf += decoder.decode(value, { stream: true });
-        // SSE lines end with \n. We'll parse line-by-line.
         let idx;
         while ((idx = buf.indexOf("\n")) !== -1) {
             const line = buf.slice(0, idx).trimEnd();
             buf = buf.slice(idx + 1);
-            if (line.startsWith("data: ")) {
-                let endpoint = line.slice("data: ".length).trim();
+            if (line.startsWith("data:")) {
+                let endpoint = line.slice("data:".length).trim();
                 if (!endpoint)
                     continue;
                 if (endpoint.startsWith("/"))
@@ -56,16 +44,48 @@ async function handshake(opts) {
             }
         }
     }
-    throw new Error("MCP handshake failed: no endpoint returned");
+    throw new Error("MCP SSE connect failed: no endpoint returned");
+}
+async function postJsonRpc(opts) {
+    const res = await fetch(opts.endpoint, {
+        method: "POST",
+        headers: {
+            Authorization: `Bearer ${opts.accessToken}`,
+            Accept: "application/json",
+            "Content-Type": "application/json",
+        },
+        body: JSON.stringify(opts.payload),
+    });
+    const raw = await res.text().catch(() => "");
+    if (!res.ok)
+        throw new Error(`MCP POST failed (${res.status}): ${raw}`);
+    try {
+        return raw ? JSON.parse(raw) : {};
+    }
+    catch {
+        throw new Error(`MCP returned non-JSON: ${raw.slice(0, 400)}`);
+    }
 }
 export async function callMcpTool(opts) {
     const baseUrl = opts.mcp.baseUrl || DEFAULT_SSE_URL;
     const accessToken = opts.mcp.accessToken;
     const protocolVersion = opts.mcp.protocolVersion || DEFAULT_PROTOCOL_VERSION;
     if (!accessToken) {
-        throw new Error("Missing BasicOps MCP access token (channels.basicops.accounts.<id>.mcp.accessToken)");
+        throw new Error("Missing BasicOps MCP access token (plugins.entries.basicops.config.accounts.<id>.mcp.accessToken)");
     }
-    const endpoint = await handshake({ baseUrl, accessToken, protocolVersion });
+    const endpoint = await getMessageEndpoint({ baseUrl, accessToken });
+    // Initialize (some MCP servers require this before tools/call)
+    const initPayload = {
+        jsonrpc: "2.0",
+        id: 1,
+        method: "initialize",
+        params: {
+            protocolVersion,
+            capabilities: {},
+            clientInfo: { name: "openclaw-channel-basicops", version: "0.1" },
+        },
+    };
+    await postJsonRpc({ endpoint, accessToken, payload: initPayload });
     const payload = {
         jsonrpc: "2.0",
         id: opts.requestId ?? 2,
@@ -75,34 +95,5 @@ export async function callMcpTool(opts) {
             arguments: opts.args ?? {},
         },
     };
-    const res = await fetch(endpoint, {
-        method: "POST",
-        headers: {
-            Authorization: `Bearer ${accessToken}`,
-            Accept: "application/json",
-            "Content-Type": "application/json",
-        },
-        body: JSON.stringify(payload),
-    });
-    const raw = await res.text().catch(() => "");
-    if (!res.ok) {
-        throw new Error(`MCP tool call failed (${res.status}): ${raw}`);
-    }
-    let json;
-    try {
-        json = raw ? JSON.parse(raw) : {};
-    }
-    catch {
-        throw new Error(`MCP tool call returned non-JSON: ${raw.slice(0, 400)}`);
-    }
-    // BasicOps MCP may return { result: { isError: true, content: [...] } }
-    const isError = Boolean(json?.result?.isError);
-    if (isError) {
-        const content = json?.result?.content;
-        const text = Array.isArray(content)
-            ? content.map((c) => (c && typeof c === "object" ? c.text : "")).join(" ")
-            : "";
-        throw new Error(`MCP tool error: ${text || "(unknown)"}`);
-    }
-    return json;
+    return postJsonRpc({ endpoint, accessToken, payload });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-channel-basicops",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "BasicOps messaging channel connector for OpenClaw (webhooks inbound + MCP outbound)",
   "type": "module",
   "main": "./dist/index.js",