expo-openclaw-chat 0.2.1 → 0.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-openclaw-chat",
-  "version": "0.2.1",
+  "version": "0.2.4",
   "description": "Minimal chat SDK for Expo apps to connect to OpenClaw gateway",
   "main": "src/index.ts",
   "types": "src/index.ts",
@@ -20,11 +20,22 @@
     "@noble/hashes": "^2.0.0"
   },
   "peerDependencies": {
+    "@expo/vector-icons": ">=14.0.0",
+    "expo-image-manipulator": ">=12.0.0",
+    "expo-image-picker": ">=14.0.0",
     "expo-secure-store": ">=13.0.0",
     "react": ">=18.0.0",
-    "react-native": ">=0.72.0"
+    "react-native": ">=0.72.0",
+    "react-native-keyboard-controller": ">=1.12.0",
+    "react-native-safe-area-context": ">=4.0.0"
   },
   "peerDependenciesMeta": {
+    "expo-image-manipulator": {
+      "optional": true
+    },
+    "expo-image-picker": {
+      "optional": true
+    },
     "expo-secure-store": {
       "optional": true
     }
@@ -73,6 +84,6 @@
   "homepage": "https://github.com/brunobar79/expo-openclaw-chat",
   "repository": {
     "type": "git",
-    "url": "https://github.com/brunobar79/expo-openclaw-chat"
+    "url": "git+https://github.com/brunobar79/expo-openclaw-chat.git"
   }
 }

package/src/chat/engine.ts

@@ -199,10 +199,19 @@ export class ChatEngine {
         idempotencyKey: generateIdempotencyKey(),
       });
 
+      // Skip the placeholder if delta/complete events for this runId already
+      // arrived over the WS while we were awaiting chatSend — otherwise we'd
+      // append an empty bubble next to the already-rendered reply.
+      const alreadyHandled = this._messages.some(
+        (m) => m.runId === response.runId && m.role === "assistant",
+      );
+      if (alreadyHandled) {
+        return;
+      }
+
       this._activeRunId = response.runId;
       this._isStreaming = true;
 
-      // Add streaming placeholder
       const placeholder: UIMessage = {
         id: `asst-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 6)}`,
         role: "assistant",

package/src/core/client.ts

@@ -65,6 +65,8 @@ export interface GatewayClientOptions {
   platform?: string;
   /** Client ID for gateway registration (default: openclaw-ios) */
   clientId?: string;
+  /** Extra headers to include in the WebSocket upgrade request (React Native only) */
+  headers?: Record<string, string>;
 }
 
 // ─── Event Listener Types ───────────────────────────────────────────────────────
@@ -166,6 +168,10 @@ export class GatewayClient {
   // Pairing flow state
   private awaitingPairing = false;
 
+  // Connection protection: when true, disconnect() is a no-op.
+  // Set during connect(), cleared on hello-ok or connect failure.
+  private _connectInFlight = false;
+
   constructor(url: string, options: GatewayClientOptions = {}) {
     this.url = url;
     this.options = {
@@ -215,6 +221,7 @@ export class GatewayClient {
     }
 
     this.intentionalClose = false;
+    this._connectInFlight = true;
     this.setConnectionState("connecting");
 
     // Load device identity before opening WebSocket
@@ -231,6 +238,10 @@ export class GatewayClient {
    * Cleanly disconnect from the gateway.
    */
   disconnect(): void {
+    // Don't kill a connection that's mid-handshake (race with React effect cleanup)
+    if (this._connectInFlight) {
+      return;
+    }
     this.intentionalClose = true;
     this.awaitingPairing = false;
     this.clearReconnectTimer();
@@ -268,6 +279,32 @@ export class GatewayClient {
   ): Promise<T> {
     return new Promise<T>((resolve, reject) => {
       if (!this.ws || this._connectionState !== "connected") {
+        // If autoReconnect is enabled, wait up to 5s for reconnection
+        // instead of immediately rejecting. This prevents transient
+        // "Not connected" errors during WS flaps (e.g. group chat fan-out).
+        if (this.options.autoReconnect !== false && this._connectionState !== "disconnected") {
+          const waitTimeout = 5000;
+          let settled = false;
+          const unsub = this.onConnectionStateChange((state) => {
+            if (settled) return;
+            if (state === "connected") {
+              settled = true;
+              unsub();
+              this.request<T>(method, params, timeoutMs).then(resolve, reject);
+            } else if (state === "disconnected") {
+              settled = true;
+              unsub();
+              reject(new Error("Not connected"));
+            }
+          });
+          setTimeout(() => {
+            if (settled) return;
+            settled = true;
+            unsub();
+            reject(new Error("Not connected"));
+          }, waitTimeout);
+          return;
+        }
         return reject(new Error("Not connected"));
       }
 
@@ -507,7 +544,19 @@ export class GatewayClient {
     }
 
     try {
-      this.ws = new WebSocket(url);
+      const wsHeaders = this.options.headers;
+      if (wsHeaders && Object.keys(wsHeaders).length > 0) {
+        // React Native WebSocket accepts a 3rd argument for headers.
+        // Standard browser WebSocket does not, so we use a cast here.
+        const WS = WebSocket as unknown as new (
+          url: string,
+          protocols: null,
+          options: { headers: Record<string, string> },
+        ) => WebSocket;
+        this.ws = new WS(url, null, { headers: wsHeaders });
+      } else {
+        this.ws = new WebSocket(url);
+      }
     } catch (err) {
       this.handleConnectFailure(err as Error);
       return;
@@ -611,7 +660,6 @@ export class GatewayClient {
 
   private handleEvent(frame: EventFrame): void {
     const { event, payload, seq } = frame;
-
     // Sequence gap detection
     if (seq != null) {
       if (this.lastSeq >= 0 && seq > this.lastSeq + 1) {
@@ -642,15 +690,17 @@ export class GatewayClient {
         });
         break;
 
-      case GatewayEvents.CHAT:
+      case GatewayEvents.CHAT: {
+        const chatPayload = payload as ChatEventPayload;
         this.chatEventListeners.forEach((cb) => {
           try {
-            cb(payload as ChatEventPayload);
+            cb(chatPayload);
           } catch {
             // Ignore listener errors to avoid breaking event dispatch
           }
         });
         break;
+      }
 
       case GatewayEvents.AGENT:
         this.agentEventListeners.forEach((cb) => {
@@ -699,7 +749,6 @@ export class GatewayClient {
 
     if (payload.decision === "approved") {
       // Retry connect now that we're approved
-      console.log("[GatewayClient] Device approved, retrying connect...");
       this.sendConnectFrame();
     } else {
       // Rejected - fail the connection
@@ -714,6 +763,7 @@ export class GatewayClient {
   }
 
   private handleHelloOk(helloOk: HelloOk): void {
+    this._connectInFlight = false;
     this.helloOk = helloOk;
     this.reconnectAttempt = 0;
     this.lastSeq = -1;
@@ -770,9 +820,17 @@ export class GatewayClient {
       const signedAtMs = Date.now();
       const authToken = (auth.token as string) ?? (auth.deviceToken as string);
 
+      // Generate a random nonce if no challenge was received from the gateway.
+      // OpenClaw 2026.3.x requires the nonce field in all device connect params.
+      const nonce =
+        this.challengeNonce ??
+        Array.from(crypto.getRandomValues(new Uint8Array(16)))
+          .map((b) => b.toString(16).padStart(2, "0"))
+          .join("");
+
       // Build signature payload (matches Swift implementation)
       const payload = buildSignaturePayload({
-        nonce: this.challengeNonce ?? undefined,
+        nonce,
         deviceId: identity.deviceId,
         clientId,
         clientMode,
@@ -791,7 +849,7 @@ export class GatewayClient {
           publicKey,
           signature,
           signedAt: signedAtMs,
-          nonce: this.challengeNonce ?? undefined,
+          nonce,
         };
       }
     }
@@ -851,6 +909,7 @@ export class GatewayClient {
   }
 
   private handleConnectFailure(error: Error): void {
+    this._connectInFlight = false;
     if (this.connectPromiseReject) {
       this.connectPromiseReject(error);
       this.connectPromiseResolve = null;

package/src/createChat.tsx

@@ -69,7 +69,7 @@ export interface ChatInstance {
 export function createChat(config: CreateChatConfig): ChatInstance {
   const {
     gatewayUrl,
-    sessionKey = `chat-${Date.now().toString(36)}`,
+    sessionKey = `agent:main:chat-${Date.now().toString(36)}`,
     title,
     placeholder,
     showImagePicker,