@makerbi/remodex 1.5.4 → 2.0.0

package/src/secure-transport.js

@@ -37,9 +37,13 @@ function createBridgeSecureTransport({
   sessionId,
   relayUrl,
   deviceState,
+  displayName = "",
   onTrustedPhoneUpdate = null,
+  onSecureSessionReady = null,
+  persistTrustedPhone = true,
 }) {
   let currentDeviceState = deviceState;
+  const bridgeDisplayName = normalizeNonEmptyString(displayName);
   let pendingHandshake = null;
   let activeSession = null;
   let liveSendWireMessage = null;
@@ -61,6 +65,7 @@ function createBridgeSecureTransport({
       macDeviceId: currentDeviceState.macDeviceId,
       macIdentityPublicKey: currentDeviceState.macIdentityPublicKey,
       expiresAt: currentPairingExpiresAt,
+      displayName: bridgeDisplayName,
     };
   }
 
@@ -259,6 +264,7 @@ function createBridgeSecureTransport({
       expiresAtForTranscript,
       macSignature,
       clientNonce: clientNonceBase64,
+      displayName: bridgeDisplayName,
     });
   }
 
@@ -346,6 +352,7 @@ function createBridgeSecureTransport({
       nextOutboundCounter: 0,
       isResumed: false,
       sendWireMessage: liveSendWireMessage,
+      firstOutboundSeq: nextBridgeOutboundSeq,
     };
 
     nextKeyEpoch = pendingHandshake.keyEpoch + 1;
@@ -361,7 +368,8 @@ function createBridgeSecureTransport({
       currentDeviceState = rememberTrustedPhone(
         currentDeviceState,
         pendingHandshake.phoneDeviceId,
-        pendingHandshake.phoneIdentityPublicKey
+        pendingHandshake.phoneIdentityPublicKey,
+        { persist: persistTrustedPhone }
       );
       if (previousTrustedPhonePublicKey !== pendingHandshake.phoneIdentityPublicKey) {
         onTrustedPhoneUpdate?.(currentDeviceState, {
@@ -372,9 +380,16 @@ function createBridgeSecureTransport({
     }
     if (pendingHandshake.handshakeMode === HANDSHAKE_MODE_QR_BOOTSTRAP) {
       resetOutboundReplayState();
+      activeSession.firstOutboundSeq = nextBridgeOutboundSeq;
     }
 
+    const completedHandshakeMode = pendingHandshake.handshakeMode;
     pendingHandshake = null;
+    onSecureSessionReady?.({
+      phoneDeviceId: activeSession.phoneDeviceId,
+      handshakeMode: completedHandshakeMode,
+      keyEpoch: activeSession.keyEpoch,
+    });
     sendControlMessage({
       kind: "secureReady",
       sessionId,
@@ -396,7 +411,9 @@ function createBridgeSecureTransport({
 
     const lastAppliedBridgeOutboundSeq = Number(message.lastAppliedBridgeOutboundSeq) || 0;
     lastRelayedBridgeOutboundSeq = lastAppliedBridgeOutboundSeq;
-    const missingEntries = replayableOutboundEntries(lastAppliedBridgeOutboundSeq);
+    const missingEntries = replayableOutboundEntries(lastAppliedBridgeOutboundSeq, {
+      includeCurrentSessionEntries: true,
+    });
     activeSession.isResumed = true;
     for (const entry of missingEntries) {
       if (!sendBufferedEntry(entry, activeSession.sendWireMessage)) {
@@ -465,15 +482,22 @@ function createBridgeSecureTransport({
   }
 
   function trimOutboundBuffer() {
+    let removeCount = 0;
+    let removedBytes = 0;
     while (
-      outboundBuffer.length > MAX_BRIDGE_OUTBOUND_MESSAGES
-      || outboundBufferBytes > MAX_BRIDGE_OUTBOUND_BYTES
+      (outboundBuffer.length - removeCount) > MAX_BRIDGE_OUTBOUND_MESSAGES
+      || (outboundBufferBytes - removedBytes) > MAX_BRIDGE_OUTBOUND_BYTES
     ) {
-      const removed = outboundBuffer.shift();
-      if (!removed) {
+      const entry = outboundBuffer[removeCount];
+      if (!entry) {
         break;
       }
-      outboundBufferBytes = Math.max(0, outboundBufferBytes - removed.sizeBytes);
+      removedBytes += entry.sizeBytes;
+      removeCount += 1;
+    }
+    if (removeCount > 0) {
+      outboundBuffer.splice(0, removeCount);
+      outboundBufferBytes = Math.max(0, outboundBufferBytes - removedBytes);
     }
   }
 
@@ -505,10 +529,21 @@ function createBridgeSecureTransport({
     return sendWireMessage(JSON.stringify(envelope)) !== false;
   }
 
-  function replayableOutboundEntries(lastAppliedBridgeOutboundSeq) {
-    return outboundBuffer.filter(
-      (entry) => entry.bridgeOutboundSeq > lastAppliedBridgeOutboundSeq
-    );
+  function replayableOutboundEntries(
+    lastAppliedBridgeOutboundSeq,
+    { includeCurrentSessionEntries = false } = {}
+  ) {
+    return outboundBuffer.filter((entry) => {
+      if (entry.bridgeOutboundSeq > lastAppliedBridgeOutboundSeq) {
+        return true;
+      }
+
+      // Stale cursors from a previous Mac/session must not suppress responses
+      // produced after this secure channel became active, including initialize.
+      return includeCurrentSessionEntries
+        && activeSession
+        && entry.bridgeOutboundSeq >= activeSession.firstOutboundSeq;
+    });
   }
 
   // Replays from the last phone ack instead of local socket writes, so a relay
@@ -542,7 +577,7 @@ function debugSecureLog(message) {
 
 function shortId(value) {
   const normalized = normalizeNonEmptyString(value);
-  return normalized ? normalized.slice(0, 8) : "none";
+  return normalized ? createHash("sha256").update(normalized).digest("hex").slice(0, 8) : "none";
 }
 
 function shortFingerprint(publicKeyBase64) {