openclaw-app 1.0.7 → 1.0.9

package/README.md

@@ -90,7 +90,7 @@ openclaw gateway --port 18789
 
 ### 5. Verify
 
-Open the Control UI at http://127.0.0.1:18789/ and navigate to the **OpenClaw Mobile** channel page. You should see:
+Open the Control UI at http://127.0.0.1:18789/ and navigate to the **OpenClaw App** channel page. You should see:
 
 - **Running**: Yes
 - **Configured**: Yes

package/index.ts

@@ -1,5 +1,5 @@
 /**
- * OpenClaw Mobile Channel Plugin
+ * OpenClaw App Channel Plugin
  *
  * Registers "openclaw-app" channel that bridges Gateway <-> CF Worker relay <-> Mobile App.
  * Plugin runs inside the Gateway process, connects outbound to the relay.
@@ -241,6 +241,11 @@ interface RelayState {
      * so multiple users can be active simultaneously without key collisions.
      */
     e2eSessions: Map<string, E2EState>;
+    /** Previous E2E states kept for decrypting offline-buffered messages
+     *  that were encrypted with the old key before the app reconnected. */
+    prevE2eSessions: Map<string, E2EState>;
+    /** Buffered pending_flush payloads waiting for the new E2E handshake to complete. */
+    pendingFlushQueue: Map<string, string[]>;
     relayToken: string;
 }
 
@@ -261,6 +266,8 @@ function getRelayState(accountId: string): RelayState {
             statusSink: null,
             gatewayCtx: null,
             e2eSessions: new Map(),
+            prevE2eSessions: new Map(),
+            pendingFlushQueue: new Map(),
             relayToken: "",
         };
         relayStates.set(accountId, state);
@@ -363,9 +370,9 @@ const channel = {
     id: CHANNEL_ID,
     meta: {
         id: CHANNEL_ID,
-        label: "OpenClaw Mobile",
-        selectionLabel: "OpenClaw Mobile App",
-        blurb: "Chat via the OpenClaw Mobile app through a relay.",
+        label: "OpenClaw App",
+        selectionLabel: "OpenClaw App App",
+        blurb: "Chat via the OpenClaw App app through a relay.",
         detailLabel: "Mobile App",
         aliases: ["mobile"],
     },
@@ -555,8 +562,9 @@ function cleanupRelay(state: RelayState) {
         try { state.ws.close(); } catch {}
         state.ws = null;
     }
-    // Clear all per-session E2E states — new handshakes needed on reconnect
     state.e2eSessions.clear();
+    state.prevE2eSessions.clear();
+    state.pendingFlushQueue.clear();
 }
 
 function connectRelay(ctx: any, account: ResolvedAccount) {
@@ -646,6 +654,41 @@ function scheduleReconnect(ctx: any, account: ResolvedAccount) {
     }, RECONNECT_DELAY);
 }
 
+async function processPendingFlush(
+    ctx: any, accountId: string, state: RelayState, sessionKey: string, messages: string[]
+): Promise<void> {
+    const oldE2E = state.prevE2eSessions.get(sessionKey);
+    const newE2E = state.e2eSessions.get(sessionKey);
+    if (!oldE2E?.ready) {
+        ctx.log?.warn?.(`[${CHANNEL_ID}] [${accountId}] [E2E] pending_flush: no old key for session ${sessionKey}, dropping ${messages.length} message(s)`);
+        return;
+    }
+    if (!newE2E?.ready) {
+        ctx.log?.info?.(`[${CHANNEL_ID}] [${accountId}] [E2E] pending_flush: new E2E not ready, queueing for session ${sessionKey}`);
+        state.pendingFlushQueue.set(sessionKey, messages);
+        return;
+    }
+    ctx.log?.info?.(`[${CHANNEL_ID}] [${accountId}] [E2E] pending_flush: re-encrypting ${messages.length} message(s) for session ${sessionKey}`);
+    for (const raw of messages) {
+        try {
+            const parsed = JSON.parse(raw);
+            if (parsed.type !== "encrypted" || !parsed.nonce || !parsed.ct) {
+                if (!parsed.sessionKey) parsed.sessionKey = sessionKey;
+                state.ws?.send(JSON.stringify(parsed));
+                continue;
+            }
+            const plaintext = await e2eDecrypt(oldE2E, parsed.nonce, parsed.ct);
+            const reEncrypted = JSON.parse(await e2eEncrypt(newE2E, plaintext));
+            reEncrypted.sessionKey = sessionKey;
+            state.ws?.send(JSON.stringify(reEncrypted));
+        } catch (e) {
+            ctx.log?.warn?.(`[${CHANNEL_ID}] [${accountId}] [E2E] pending_flush: failed to re-encrypt: ${e}`);
+        }
+    }
+    state.prevE2eSessions.delete(sessionKey);
+    state.pendingFlushQueue.delete(sessionKey);
+}
+
 async function handleRelayMessage(ctx: any, accountId: string, state: RelayState, raw: string): Promise<void> {
     // Skip ping/pong
     if (raw === "ping" || raw === "pong") return;
@@ -663,13 +706,14 @@ async function handleRelayMessage(ctx: any, accountId: string, state: RelayState
             ctx.log?.warn?.(`[${CHANNEL_ID}] [${accountId}] [E2E] peer_joined missing sessionKey, ignoring`);
             return;
         }
-        // Always restart E2E when peer_joined arrives — the app may have
-        // reconnected with a fresh _e2eReadyCompleter and is waiting for a
-        // new handshake even if we still hold an old session state.
-        if (state.e2eSessions.has(sessionKey)) {
-            ctx.log?.info?.(`[${CHANNEL_ID}] [${accountId}] [E2E] Session ${sessionKey} reconnected, resetting E2E state`);
-            state.e2eSessions.delete(sessionKey);
+        // Preserve old E2E state for decrypting offline-buffered messages,
+        // then create a fresh state for the new handshake.
+        const oldE2E = state.e2eSessions.get(sessionKey);
+        if (oldE2E?.ready) {
+            state.prevE2eSessions.set(sessionKey, oldE2E);
+            ctx.log?.info?.(`[${CHANNEL_ID}] [${accountId}] [E2E] Session ${sessionKey} reconnected, old key preserved for pending_flush`);
         }
+        state.e2eSessions.delete(sessionKey);
         ctx.log?.info?.(`[${CHANNEL_ID}] [${accountId}] [E2E] App session joined (${sessionKey}), sending handshake`);
         const sessionE2E = makeE2EState();
         state.e2eSessions.set(sessionKey, sessionE2E);
@@ -700,6 +744,18 @@ async function handleRelayMessage(ctx: any, accountId: string, state: RelayState
         return;
     }
 
+    // Relay forwards buffered offline messages for re-encryption.
+    if (msg.type === "pending_flush") {
+        const sessionKey = msg.sessionKey as string | undefined;
+        const messages = msg.messages as string[] | undefined;
+        if (!sessionKey || !messages || messages.length === 0) {
+            ctx.log?.info?.(`[${CHANNEL_ID}] [${accountId}] [E2E] pending_flush: nothing to flush`);
+            return;
+        }
+        await processPendingFlush(ctx, accountId, state, sessionKey, messages);
+        return;
+    }
+
     // App의 handshake 응답 수신 — ECDH 완성
     if (msg.type === "handshake") {
         const sessionKey = msg.sessionKey as string | undefined;
@@ -780,6 +836,13 @@ async function handleRelayMessage(ctx: any, accountId: string, state: RelayState
         }
         await e2eHandleHandshake(sessionE2E, peerPubKey);
         ctx.log?.info?.(`[${CHANNEL_ID}] [${accountId}] [E2E] Session ${sessionKey} handshake complete`);
+
+        // Process any queued pending_flush that arrived before this handshake completed
+        const queued = state.pendingFlushQueue.get(sessionKey);
+        if (queued && queued.length > 0) {
+            ctx.log?.info?.(`[${CHANNEL_ID}] [${accountId}] [E2E] Processing queued pending_flush for session ${sessionKey}`);
+            await processPendingFlush(ctx, accountId, state, sessionKey, queued);
+        }
         return;
     }
 
@@ -879,7 +942,7 @@ async function handleInbound(ctx: any, accountId: string, msg: any) {
         );
 
         const body = runtime.channel.reply.formatInboundEnvelope({
-            channel: "OpenClaw Mobile",
+            channel: "OpenClaw App",
             from: `${senderName} (mobile)`,
             body: text,
             chatType: "direct",

package/openclaw.plugin.json

@@ -1,8 +1,8 @@
 {
     "id": "openclaw-app",
     "name": "OpenClaw App",
-    "version": "1.0.7",
-    "description": "Mobile app channel for OpenClaw — chat via the OpenClaw Mobile app through a Cloudflare Worker relay.",
+    "version": "1.0.9",
+    "description": "Mobile app channel for OpenClaw — chat via the OpenClaw App app through a Cloudflare Worker relay.",
     "channels": [
         "openclaw-app"
     ],

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "openclaw-app",
-    "version": "1.0.7",
-    "description": "OpenClaw Mobile channel plugin — relay bridge for the OpenClaw Mobile app",
+    "version": "1.0.9",
+    "description": "OpenClaw App channel plugin — relay bridge for the OpenClaw App app",
     "main": "index.ts",
     "type": "module",
     "openclaw": {