centralize peer sync response delivery

Author: smichea

src/services/peerJsManager.js

@@ -146,6 +146,7 @@ import {
   createSyncResponseForRequest,
   findRepoConversation,
   getNormalizedSyncResponseMessages,
+  getSyncResponseDeliveryType,
   isValidSyncChainRequestMessage,
   isValidSyncRequestMessage,
   isValidSyncResponseMessage
@@ -1046,25 +1047,12 @@ function handleSyncRequest(msg, fromPeerId) {
     return;
   }
 
-  // Get conversation messages
-  const conversationsMap = get(conversations);
-  const conversation = findRepoConversation(conversationsMap, repoFullName, msg.conversationId);
-
-  const response = createSyncResponseForRequest(msg, conversation);
-  if (response.error === 'Conversation not found') {
-    console.warn('[PeerJS] Conversation not found:', msg.conversationId);
-    sendMessageToPeer(fromPeerId, response);
-    return;
-  }
-
-  if (response.type === 'sync_needs_chain') {
-    console.warn('[PeerJS] Hash not found in conversation:', msg.lastHash);
-    sendMessageToPeer(fromPeerId, response);
-    return;
-  }
-
-  console.log('[PeerJS] Sending', response.messages.length, 'messages after hash:', msg.lastHash);
-  sendMessageToPeer(fromPeerId, response);
+  const response = createSyncResponseForRequest(msg, getSyncConversation(msg.conversationId));
+  sendSyncResponse(fromPeerId, response, {
+    conversation_not_found: () => console.warn('[PeerJS] Conversation not found:', msg.conversationId),
+    sync_needs_chain: () => console.warn('[PeerJS] Hash not found in conversation:', msg.lastHash),
+    messages: () => console.log('[PeerJS] Sending', response.messages.length, 'messages after hash:', msg.lastHash)
+  });
 }
 
 // Handle sync request with hash chain
@@ -1076,25 +1064,22 @@ function handleSyncRequestWithChain(msg, fromPeerId) {
     return;
   }
 
-  // Get conversation messages
-  const conversationsMap = get(conversations);
-  const conversation = findRepoConversation(conversationsMap, repoFullName, msg.conversationId);
-
-  const response = createSyncResponseForChainRequest(msg, conversation);
-  if (response.error === 'Conversation not found') {
-    console.warn('[PeerJS] Conversation not found:', msg.conversationId);
-    sendMessageToPeer(fromPeerId, response);
-    return;
-  }
+  const response = createSyncResponseForChainRequest(msg, getSyncConversation(msg.conversationId));
+  sendSyncResponse(fromPeerId, response, {
+    conversation_not_found: () => console.warn('[PeerJS] Conversation not found:', msg.conversationId),
+    full_sync: () => console.warn('[PeerJS] No common ancestor found with peer'),
+    messages: () => console.log('[PeerJS] Found common ancestor:', response.commonAncestor, 'sending', response.messages.length, 'messages')
+  });
+}
 
-  if (response.fullSync) {
-    console.warn('[PeerJS] No common ancestor found with peer');
-    sendMessageToPeer(fromPeerId, response);
-    return;
-  }
+function getSyncConversation(conversationId) {
+  return findRepoConversation(get(conversations), repoFullName, conversationId);
+}
 
-  console.log('[PeerJS] Found common ancestor:', response.commonAncestor, 'sending', response.messages.length, 'messages');
-  sendMessageToPeer(fromPeerId, response);
+function sendSyncResponse(peerId, response, deliveryHandlers) {
+  const deliveryType = getSyncResponseDeliveryType(response);
+  deliveryHandlers[deliveryType]?.();
+  sendMessageToPeer(peerId, response);
 }
 
 // Handle sync response

src/utils/peerSync.js

@@ -137,3 +137,19 @@ export function getNormalizedSyncResponseMessages(message) {
 
   return normalizeSyncMessages(message.messages);
 }
+
+export function getSyncResponseDeliveryType(response) {
+  if (response?.error === 'Conversation not found') {
+    return 'conversation_not_found';
+  }
+
+  if (response?.type === 'sync_needs_chain') {
+    return 'sync_needs_chain';
+  }
+
+  if (response?.fullSync) {
+    return 'full_sync';
+  }
+
+  return 'messages';
+}

test/e2e/api/peer-sync.spec.js

@@ -11,6 +11,7 @@ import {
   createSyncResponseFromHashChain,
   findRepoConversation,
   getNormalizedSyncResponseMessages,
+  getSyncResponseDeliveryType,
   isValidSyncChainRequestMessage,
   isValidSyncRequestMessage,
   isValidSyncResponseMessage,
@@ -169,3 +170,10 @@ test('getNormalizedSyncResponseMessages validates and normalizes response payloa
     { conversationId: 'conversation-a', messages: [{ sender: 'alice', content: 'hello' }] }
   )).toHaveLength(1);
 });
+
+test('getSyncResponseDeliveryType classifies sync responses for peer delivery logs', () => {
+  expect(getSyncResponseDeliveryType({ error: 'Conversation not found' })).toBe('conversation_not_found');
+  expect(getSyncResponseDeliveryType({ type: 'sync_needs_chain' })).toBe('sync_needs_chain');
+  expect(getSyncResponseDeliveryType({ fullSync: true })).toBe('full_sync');
+  expect(getSyncResponseDeliveryType({ messages: [] })).toBe('messages');
+});

test/e2e/api/sidebar-chats-source.spec.js

@@ -257,13 +257,16 @@ test('peerJsManager delegates sync protocol shaping to utilities', async () => {
   expect(source).toContain('isValidSyncRequestMessage(msg)');
   expect(source).toContain('isValidSyncChainRequestMessage(msg)');
   expect(source).toContain('isValidSyncResponseMessage(msg)');
-  expect(source).toContain('findRepoConversation(conversationsMap, repoFullName, msg.conversationId)');
-  expect(source).toContain('createSyncResponseForRequest(msg, conversation)');
-  expect(source).toContain('createSyncResponseForChainRequest(msg, conversation)');
+  expect(source).toContain('findRepoConversation(get(conversations), repoFullName, conversationId)');
+  expect(source).toContain('createSyncResponseForRequest(msg, getSyncConversation(msg.conversationId))');
+  expect(source).toContain('createSyncResponseForChainRequest(msg, getSyncConversation(msg.conversationId))');
   expect(source).toContain('getNormalizedSyncResponseMessages(msg)');
+  expect(source).toContain('getSyncResponseDeliveryType(response)');
+  expect(source).toContain('sendSyncResponse(fromPeerId, response');
   expect(utilitySource).toContain('export function createSyncResponseAfterHash');
   expect(utilitySource).toContain('export function createSyncResponseForRequest');
   expect(utilitySource).toContain('export function createSyncChainRequestForNeed');
+  expect(utilitySource).toContain('export function getSyncResponseDeliveryType');
   expect(utilitySource).toContain('export function normalizeSyncMessages');
   expect(source).not.toContain('getRecentHashes');
   expect(source).not.toContain('findCommonAncestor');

test/e2e/ui/login.spec.js

@@ -81,6 +81,8 @@ test('renders the login screen for a fresh browser session', async ({ page }) =>
   expect(consoleMessages.some(message => message.includes('Switched back to camera'))).toBe(false);
   expect(consoleMessages.some(message => message.includes('Started screen sharing'))).toBe(false);
   expect(consoleMessages.some(message => message.includes('No common ancestor found with peer'))).toBe(false);
+  expect(consoleMessages.some(message => message.includes('Invalid sync chain request format'))).toBe(false);
+  expect(consoleMessages.some(message => message.includes('Found common ancestor'))).toBe(false);
   expect(consoleMessages.some(message => message.includes('Notified leader of conversation update'))).toBe(false);
   expect(consoleMessages.some(message => message.includes('Received committed messages notification'))).toBe(false);
   expect(consoleMessages.some(message => message.includes('Requesting sync with hash chain'))).toBe(false);