@clawroom/openclaw 0.2.0 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawroom/openclaw",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "OpenClaw channel plugin for the Claw Room task marketplace",
   "type": "module",
   "license": "MIT",

package/src/channel.ts

@@ -2,7 +2,7 @@ import type { ChannelPlugin } from "openclaw/plugin-sdk/core";
 import type { OpenClawConfig } from "openclaw/plugin-sdk/core";
 import { collectSkills } from "./skill-reporter.js";
 import { getClawroomRuntime } from "./runtime.js";
-import { ClawroomWsClient } from "./ws-client.js";
+import { ClawroomClient } from "./client.js";
 import { setupTaskExecutor } from "./task-executor.js";
 
 // ── Config resolution ────────────────────────────────────────────────
@@ -54,9 +54,9 @@ function resolveClawroomAccount(opts: {
   };
 }
 
-// ── Persistent WS client per gateway lifecycle ───────────────────────
+// ── Persistent client per gateway lifecycle ───────────────────────
 
-let activeClient: ClawroomWsClient | null = null;
+let activeClient: ClawroomClient | null = null;
 
 // ── Channel plugin definition ────────────────────────────────────────
 
@@ -103,8 +103,8 @@ export const clawroomPlugin: ChannelPlugin<ResolvedClawroomAccount> = {
     deliveryMode: "direct",
 
     sendText: async ({ to, text }) => {
-      // Outbound messages are task results sent via the WS client.
-      // The task-executor sends results directly through ws.send();
+      // Outbound messages are task results sent via HTTP.
+      // The task-executor sends results directly through client.send();
       // this adapter exists for completeness if openclaw routing tries
       // to deliver a reply through the channel outbound path.
       if (activeClient) {
@@ -137,7 +137,7 @@ export const clawroomPlugin: ChannelPlugin<ResolvedClawroomAccount> = {
       const deviceId = resolveDeviceId(ctx);
       const log = ctx.log ?? undefined;
 
-      const client = new ClawroomWsClient({
+      const client = new ClawroomClient({
         endpoint: account.endpoint,
         token: account.token,
         deviceId,
@@ -169,7 +169,7 @@ export const clawroomPlugin: ChannelPlugin<ResolvedClawroomAccount> = {
         });
       };
 
-      // Wire up WS events to OpenClaw health status
+      // Wire up SSE events to OpenClaw health status
       client.onWelcome(() => publishConnected());
       client.onTask(() => {
         // Any server message = update lastEventAt so gateway knows we're alive
@@ -208,7 +208,7 @@ export const clawroomPlugin: ChannelPlugin<ResolvedClawroomAccount> = {
         });
       });
 
-      setupTaskExecutor({ ws: client, runtime, log });
+      setupTaskExecutor({ client: client, runtime, log });
       client.connect();
       activeClient = client;
 

package/src/{ws-client.ts → client.ts}

@@ -34,7 +34,7 @@ type WelcomeCallback = (agentId: string) => void;
 type FatalCallback = (reason: string) => void;
 type ModeChangeCallback = (mode: "sse" | "polling") => void;
 
-export type ClawroomWsClientOptions = {
+export type ClawroomClientOptions = {
   endpoint: string;
   token: string;
   deviceId: string;
@@ -55,8 +55,7 @@ export type ClawroomWsClientOptions = {
  * Agent→Server actions always use HTTP POST:
  *   /api/agents/heartbeat, /complete, /fail, /progress, /claim
  */
-export class ClawroomWsClient {
-  private eventSource: EventSource | null = null;
+export class ClawroomClient {
   private heartbeatTimer: ReturnType<typeof setInterval> | null = null;
   private pollTimer: ReturnType<typeof setInterval> | null = null;
   private reconnectAttempt = 0;
@@ -77,9 +76,9 @@ export class ClawroomWsClient {
   private fatalCallbacks: FatalCallback[] = [];
   private modeChangeCallbacks: ModeChangeCallback[] = [];
 
-  constructor(private readonly options: ClawroomWsClientOptions) {
+  constructor(private readonly options: ClawroomClientOptions) {
     // Derive HTTP base from endpoint
-    // wss://clawroom.site9.ai/ws/agent → https://clawroom.site9.ai/api/agents
+    // Legacy: wss://host/ws/agent → https://clawroom.site9.ai/api/agents
     // https://clawroom.site9.ai/api/agents/stream → https://clawroom.site9.ai/api/agents
     const ep = options.endpoint;
     if (ep.includes("/api/agents")) {
@@ -116,7 +115,7 @@ export class ClawroomWsClient {
   get isAlive(): boolean { return !this.stopped; }
   get isConnected(): boolean {
     if (this.mode === "polling") return true;
-    return this.eventSource?.readyState === EventSource.OPEN;
+    return this.sseAbort !== null && !this.sseAbort.signal.aborted;
   }
   get isFatal(): boolean { return false; }
   get currentMode(): "sse" | "polling" { return this.mode; }
@@ -145,53 +144,77 @@ export class ClawroomWsClient {
     if (this.heartbeatTimer) { clearInterval(this.heartbeatTimer); this.heartbeatTimer = null; }
   }
 
-  // ── SSE Connection ──────────────────────────────────────────────
+  // ── SSE Connection (fetch-based, works in Node.js) ───────────────
+
+  private sseAbort: AbortController | null = null;
 
   private doConnectSSE(): void {
     this.destroySSE();
     const { token, deviceId, skills } = this.options;
-    const params = new URLSearchParams({
-      token,
-      deviceId,
-      skills: skills.join(","),
-    });
+    const params = new URLSearchParams({ token, deviceId, skills: skills.join(",") });
     const url = `${this.httpBase}/stream?${params}`;
 
     this.options.log?.info?.(`[clawroom] SSE connecting to ${this.httpBase}/stream`);
 
-    try {
-      this.eventSource = new EventSource(url);
-    } catch {
-      this.triggerReconnect("EventSource creation failed");
-      return;
-    }
+    this.sseAbort = new AbortController();
+    const signal = this.sseAbort.signal;
+
+    fetch(url, {
+      headers: { "Accept": "text/event-stream", "Authorization": `Bearer ${token}` },
+      signal,
+    }).then(async (res) => {
+      if (!res.ok || !res.body) {
+        if (res.status === 401) {
+          this.stopped = true;
+          this.stopHeartbeat();
+          this.stopPolling();
+          for (const cb of this.fatalCallbacks) cb("Unauthorized");
+          return;
+        }
+        throw new Error(`HTTP ${res.status}`);
+      }
 
-    this.eventSource.onopen = () => {
       this.options.log?.info?.("[clawroom] SSE connected");
       this.reconnectAttempt = 0;
       this.consecutiveSseFails = 0;
-
-      if (this.mode === "polling") {
-        this.switchToSSE();
+      if (this.mode === "polling") this.switchToSSE();
+
+      const reader = res.body.getReader();
+      const decoder = new TextDecoder();
+      let buffer = "";
+
+      while (true) {
+        const { done, value } = await reader.read();
+        if (done) break;
+
+        buffer += decoder.decode(value, { stream: true });
+        const lines = buffer.split("\n");
+        buffer = lines.pop() ?? "";
+
+        for (const line of lines) {
+          if (line.startsWith("data: ")) {
+            this.handleMessage(line.slice(6));
+          }
+          // Ignore comments (: keepalive) and empty lines
+        }
       }
-    };
-
-    this.eventSource.onmessage = (event) => {
-      this.handleMessage(event.data);
-    };
 
-    this.eventSource.onerror = () => {
-      this.options.log?.info?.("[clawroom] SSE error/disconnected");
-      this.destroySSE();
+      // Stream ended
+      this.options.log?.info?.("[clawroom] SSE stream ended");
+      for (const cb of this.disconnectCallbacks) cb();
+      this.triggerReconnect("stream ended");
+    }).catch((err) => {
+      if (signal.aborted) return;
+      this.options.log?.warn?.(`[clawroom] SSE error: ${err}`);
       for (const cb of this.disconnectCallbacks) cb();
       this.triggerReconnect("SSE error");
-    };
+    });
   }
 
   private destroySSE(): void {
-    if (this.eventSource) {
-      try { this.eventSource.close(); } catch {}
-      this.eventSource = null;
+    if (this.sseAbort) {
+      try { this.sseAbort.abort(); } catch {}
+      this.sseAbort = null;
     }
   }
 

package/src/task-executor.ts

@@ -1,6 +1,6 @@
 import type { ServerClaimAck, ServerTask, AgentResultFile } from "@clawroom/sdk";
 import type { PluginRuntime } from "openclaw/plugin-sdk/core";
-import type { ClawroomWsClient } from "./ws-client.js";
+import type { ClawroomClient } from "./client.js";
 import fs from "node:fs";
 import path from "node:path";
 
@@ -18,7 +18,7 @@ const MAX_FILE_SIZE = 10 * 1024 * 1024;
  * Claiming is triggered externally (by the owner via Dashboard).
  */
 export function setupTaskExecutor(opts: {
-  ws: ClawroomWsClient;
+  client: ClawroomClient;
   runtime: PluginRuntime;
   log?: {
     info?: (...args: unknown[]) => void;
@@ -26,19 +26,19 @@ export function setupTaskExecutor(opts: {
     error?: (...args: unknown[]) => void;
   };
 }): void {
-  const { ws, runtime, log } = opts;
+  const { client, runtime, log } = opts;
 
   // Track received tasks (from broadcast or server push after claim)
   const knownTasks = new Map<string, ServerTask>();
 
   // New task received — store it for potential execution
-  ws.onTask((task: ServerTask) => {
+  client.onTask((task: ServerTask) => {
     log?.info?.(`[clawroom:executor] received task ${task.taskId}: ${task.title}`);
     knownTasks.set(task.taskId, task);
   });
 
   // Task list on connect — store all
-  ws.onTaskList((tasks: ServerTask[]) => {
+  client.onTaskList((tasks: ServerTask[]) => {
     log?.info?.(`[clawroom:executor] ${tasks.length} open task(s) available`);
     for (const t of tasks) {
       log?.info?.(`[clawroom:executor]   - ${t.taskId}: ${t.title}`);
@@ -47,7 +47,7 @@ export function setupTaskExecutor(opts: {
   });
 
   // Claim ack — either from plugin-initiated claim or Dashboard-initiated claim
-  ws.onClaimAck((ack: ServerClaimAck) => {
+  client.onClaimAck((ack: ServerClaimAck) => {
     if (!ack.ok) {
       log?.warn?.(
         `[clawroom:executor] claim rejected for ${ack.taskId}: ${ack.reason ?? "unknown"}`,
@@ -67,7 +67,7 @@ export function setupTaskExecutor(opts: {
     }
 
     log?.info?.(`[clawroom:executor] executing task ${task.taskId}`);
-    void executeTask({ ws, runtime, task, log });
+    void executeTask({ client, runtime, task, log });
   });
 }
 
@@ -76,7 +76,7 @@ export function setupTaskExecutor(opts: {
  * result back to the ClawRoom server.
  */
 async function executeTask(opts: {
-  ws: ClawroomWsClient;
+  client: ClawroomClient;
   runtime: PluginRuntime;
   task: ServerTask;
   log?: {
@@ -84,7 +84,7 @@ async function executeTask(opts: {
     error?: (...args: unknown[]) => void;
   };
 }): Promise<void> {
-  const { ws, runtime, task, log } = opts;
+  const { client, runtime, task, log } = opts;
   const sessionKey = `clawroom:task:${task.taskId}`;
 
   const agentMessage = buildAgentMessage(task);
@@ -116,7 +116,7 @@ async function executeTask(opts: {
       log?.error?.(
         `[clawroom:executor] subagent error for task ${task.taskId}: ${waitResult.error}`,
       );
-      ws.send({
+      client.send({
         type: "agent.fail",
         taskId: task.taskId,
         reason: waitResult.error ?? "Agent execution failed",
@@ -126,7 +126,7 @@ async function executeTask(opts: {
 
     if (waitResult.status === "timeout") {
       log?.error?.(`[clawroom:executor] subagent timeout for task ${task.taskId}`);
-      ws.send({
+      client.send({
         type: "agent.fail",
         taskId: task.taskId,
         reason: "Agent execution timed out",
@@ -155,7 +155,7 @@ async function executeTask(opts: {
       .trim();
 
     log?.info?.(`[clawroom:executor] task ${task.taskId} completed${files.length > 0 ? ` (with ${files.length} file(s))` : ""}`);
-    ws.send({
+    client.send({
       type: "agent.complete",
       taskId: task.taskId,
       output,
@@ -169,7 +169,7 @@ async function executeTask(opts: {
   } catch (err) {
     const reason = err instanceof Error ? err.message : String(err);
     log?.error?.(`[clawroom:executor] unexpected error for task ${task.taskId}: ${reason}`);
-    ws.send({
+    client.send({
       type: "agent.release",
       taskId: task.taskId,
       reason,