openclaw-mobile 1.1.1 → 1.1.3

package/index.ts

@@ -576,7 +576,17 @@ async function handleRelayMessage(ctx: any, accountId: string, state: RelayState
             ctx.log?.info?.(`[${CHANNEL_ID}] [${accountId}] [E2E] Session ${sessionKey} reconnected, resetting E2E state`);
         }
 
-        await initiateHandshake(ctx, state, sessionKey, accountId);
+        const sessionE2E = makeE2EState();
+        state.e2eSessions.set(sessionKey, sessionE2E);
+
+        const handshakeMsg = await e2eInit(sessionE2E);
+
+        // sessionKey를 포함시켜 relay가 올바른 app으로 라우팅하도록 함
+        const handshakeWithSession = JSON.stringify({ ...JSON.parse(handshakeMsg), sessionKey });
+
+        if (state.ws?.readyState === WebSocket.OPEN) {
+            state.ws.send(handshakeWithSession);
+        }
         return;
     }
 
@@ -591,15 +601,21 @@ async function handleRelayMessage(ctx: any, accountId: string, state: RelayState
         let sessionE2E = state.e2eSessions.get(sessionKey);
         if (!sessionE2E) {
             // peer_joined 없이 app이 먼저 handshake를 보낸 경우 (예: plugin 재연결)
-            await initiateHandshake(ctx, state, sessionKey, accountId);
-            ctx.log?.info?.(`[${CHANNEL_ID}] [${accountId}] [E2E] Session ${sessionKey} — sent handshake (reactive, no prior peer_joined)`);
-            sessionE2E = state.e2eSessions.get(sessionKey); // Re-fetch after initiation
+            // 새 세션을 만들고 plugin의 pubkey를 먼저 전송한 후 ECDH 완성
+            sessionE2E = makeE2EState();
+            state.e2eSessions.set(sessionKey, sessionE2E);
+            const handshakeMsg = await e2eInit(sessionE2E);
+            const handshakeWithSession = JSON.stringify({ ...JSON.parse(handshakeMsg), sessionKey });
+            if (state.ws?.readyState === WebSocket.OPEN) {
+                state.ws.send(handshakeWithSession);
+                ctx.log?.info?.(`[${CHANNEL_ID}] [${accountId}] [E2E] Session ${sessionKey} — sent handshake (reactive, no prior peer_joined)`);
+            }
         }
-        if (sessionE2E?.ready) {
+        if (sessionE2E.ready) {
             ctx.log?.info?.(`[${CHANNEL_ID}] [${accountId}] [E2E] Session ${sessionKey} already ready, ignoring duplicate handshake`);
             return;
         }
-        if (!sessionE2E?.localKeyPair) {
+        if (!sessionE2E.localKeyPair) {
             ctx.log?.warn?.(`[${CHANNEL_ID}] [${accountId}] [E2E] Session ${sessionKey} has no local keypair yet, dropping handshake`);
             return;
         }
@@ -622,9 +638,9 @@ async function handleRelayMessage(ctx: any, accountId: string, state: RelayState
         }
         const plaintext = await e2eDecrypt(sessionE2E, msg.nonce, msg.ct);
         ctx.log?.info?.(`[${CHANNEL_ID}] [${accountId}] [E2E] Session ${sessionKey} decrypted: ${plaintext.slice(0, 200)}`);
-
         const innerMsg = JSON.parse(plaintext);
-        innerMsg._connSessionKey = sessionKey;
+        innerMsg._connSessionKey = sessionKey; // routing key
+        if (!innerMsg.sessionKey) innerMsg.sessionKey = sessionKey;
         await handleInbound(ctx, accountId, innerMsg);
         return;
     }
@@ -634,18 +650,6 @@ async function handleRelayMessage(ctx: any, accountId: string, state: RelayState
     await handleInbound(ctx, accountId, msg);
 }
 
-async function initiateHandshake(ctx: any, state: RelayState, sessionKey: string, accountId: string): Promise<void> {
-    const sessionE2E = makeE2EState();
-    state.e2eSessions.set(sessionKey, sessionE2E);
-
-    const handshakeMsg = await e2eInit(sessionE2E);
-    const handshakeWithSession = JSON.stringify({ ...JSON.parse(handshakeMsg), sessionKey });
-
-    if (state.ws?.readyState === WebSocket.OPEN) {
-        state.ws.send(handshakeWithSession);
-    }
-}
-
 async function handleInbound(ctx: any, accountId: string, msg: any) {
     ctx.log?.info?.(`[${CHANNEL_ID}] [${accountId}] handleInbound: type=${msg.type} content=${String(msg.content ?? "").slice(0, 100)}`);
 
@@ -679,7 +683,7 @@ async function handleInbound(ctx: any, accountId: string, msg: any) {
 
         let sessionKey: string;
         const appSessionKey = msg.sessionKey ? String(msg.sessionKey) : null;
-        const routingSessionKey = msg._connSessionKey ? String(msg._connSessionKey) : appSessionKey;
+        const connSessionKey = msg._connSessionKey ? String(msg._connSessionKey) : appSessionKey;
 
         if (appSessionKey) {
             const mainKey = route.mainSessionKey as string;
@@ -689,7 +693,6 @@ async function handleInbound(ctx: any, accountId: string, msg: any) {
         } else {
             sessionKey = route.mainSessionKey;
         }
-
         const from = `${CHANNEL_ID}:${senderId}`;
         const to = `user:${senderId}`;
 
@@ -753,32 +756,40 @@ async function handleInbound(ctx: any, accountId: string, msg: any) {
                     const chunkMode = runtime.channel.text.resolveChunkMode(cfg, CHANNEL_ID, accountId);
                     const chunks = runtime.channel.text.chunkMarkdownTextWithMode(replyText, textLimit, chunkMode);
 
-                    // Since routingSessionKey maps 1:1 to the App's session ID:
-                    const sessionE2E = routingSessionKey ? relayState.e2eSessions.get(routingSessionKey) : undefined;
                     const replySessionKey = appSessionKey ?? sessionKey;
+                    const routingSessionKey = connSessionKey ?? sessionKey;
+                    const sessionE2E = relayState.e2eSessions.get(routingSessionKey);
 
                     for (const chunk of chunks.length > 0 ? chunks : [replyText]) {
                         if (!chunk) continue;
-                        const plainMsg = JSON.stringify({
-                            type: "message",
-                            role: "assistant",
-                            content: chunk,
-                            sessionKey: replySessionKey,
-                        });
-
-                        let outMsg = sessionE2E?.ready
-                            ? await e2eEncrypt(sessionE2E, plainMsg)
-                            : plainMsg;
-
-                        try {
-                            const parsedOut = JSON.parse(outMsg);
-                            parsedOut.sessionKey = routingSessionKey;
-                            outMsg = JSON.stringify(parsedOut);
-                        } catch { }
+
+                        let outMsg;
+                        if (sessionE2E?.ready) {
+                            const plainMsg = JSON.stringify({
+                                type: "message",
+                                role: "assistant",
+                                content: chunk,
+                                sessionKey: replySessionKey,
+                            });
+                            outMsg = await e2eEncrypt(sessionE2E, plainMsg);
+                            try {
+                                const parsedOut = JSON.parse(outMsg);
+                                parsedOut.sessionKey = routingSessionKey;
+                                outMsg = JSON.stringify(parsedOut);
+                            } catch { }
+                        } else {
+                            outMsg = JSON.stringify({
+                                type: "message",
+                                role: "assistant",
+                                content: chunk,
+                                appSessionKey: replySessionKey,
+                                sessionKey: routingSessionKey,
+                            });
+                        }
 
                         relayState.ws.send(outMsg);
                     }
-                    ctx.log?.info?.(`[${CHANNEL_ID}] [${accountId}] Reply delivered (${replyText.length} chars) to routingSessionKey=${routingSessionKey}`);
+                    ctx.log?.info?.(`[${CHANNEL_ID}] [${accountId}] Reply delivered (${replyText.length} chars) to sessionKey=${replySessionKey}`);
                 },
                 onError: (err: any, info: any) => {
                     ctx.log?.error?.(`[${CHANNEL_ID}] [${accountId}] Reply dispatch error (${info?.kind}): ${err}`);

package/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
     "id": "openclaw-mobile",
     "name": "OpenClaw Mobile",
-    "version": "1.1.1",
+    "version": "1.1.3",
     "description": "Mobile app channel for OpenClaw — chat via the OpenClaw Mobile app through a Cloudflare Worker relay.",
     "channels": [
         "openclaw-mobile"

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "openclaw-mobile",
-    "version": "1.1.1",
+    "version": "1.1.3",
     "description": "OpenClaw Mobile channel plugin — relay bridge for the OpenClaw Mobile app",
     "main": "index.ts",
     "type": "module",
@@ -28,4 +28,4 @@
             "optional": true
         }
     }
-}
+}