@ethora/chat-component-rn 26.7.7 → 26.7.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (170) hide show
  1. package/lib/commonjs/components/MainComponents/ChatRoom.js +17 -8
  2. package/lib/commonjs/components/MainComponents/ChatRoom.js.map +1 -1
  3. package/lib/commonjs/components/MainComponents/MediaMessage.js +8 -5
  4. package/lib/commonjs/components/MainComponents/MediaMessage.js.map +1 -1
  5. package/lib/commonjs/components/MainComponents/MessageContainer.js +5 -1
  6. package/lib/commonjs/components/MainComponents/MessageContainer.js.map +1 -1
  7. package/lib/commonjs/components/MainComponents/MessageList.js +2 -1
  8. package/lib/commonjs/components/MainComponents/MessageList.js.map +1 -1
  9. package/lib/commonjs/components/Modals/FilePreviewModal/FilePreviewModal.js +51 -12
  10. package/lib/commonjs/components/Modals/FilePreviewModal/FilePreviewModal.js.map +1 -1
  11. package/lib/commonjs/components/RoomComponents/styled/LastMessageFile.js +12 -1
  12. package/lib/commonjs/components/RoomComponents/styled/LastMessageFile.js.map +1 -1
  13. package/lib/commonjs/components/RoomComponents/styled/LastMessagePhoto.js +13 -2
  14. package/lib/commonjs/components/RoomComponents/styled/LastMessagePhoto.js.map +1 -1
  15. package/lib/commonjs/components/RoomComponents/styled/LastMessageVideo.js +13 -2
  16. package/lib/commonjs/components/RoomComponents/styled/LastMessageVideo.js.map +1 -1
  17. package/lib/commonjs/components/styled/MessageImage.js +3 -1
  18. package/lib/commonjs/components/styled/MessageImage.js.map +1 -1
  19. package/lib/commonjs/components/styled/UnsupportedType.js +14 -4
  20. package/lib/commonjs/components/styled/UnsupportedType.js.map +1 -1
  21. package/lib/commonjs/components/styled/VideoMessage.js +3 -1
  22. package/lib/commonjs/components/styled/VideoMessage.js.map +1 -1
  23. package/lib/commonjs/context/xmppProvider.js +46 -31
  24. package/lib/commonjs/context/xmppProvider.js.map +1 -1
  25. package/lib/commonjs/helpers/createMessageFromXml.js +19 -1
  26. package/lib/commonjs/helpers/createMessageFromXml.js.map +1 -1
  27. package/lib/commonjs/helpers/getDisplayFileName.js +79 -0
  28. package/lib/commonjs/helpers/getDisplayFileName.js.map +1 -0
  29. package/lib/commonjs/helpers/getServerReadTimestamp.js +125 -0
  30. package/lib/commonjs/helpers/getServerReadTimestamp.js.map +1 -0
  31. package/lib/commonjs/helpers/initXmppRooms.js +9 -7
  32. package/lib/commonjs/helpers/initXmppRooms.js.map +1 -1
  33. package/lib/commonjs/helpers/isOwnMessage.js +75 -0
  34. package/lib/commonjs/helpers/isOwnMessage.js.map +1 -0
  35. package/lib/commonjs/helpers/mimeToExtension.js +6 -14
  36. package/lib/commonjs/helpers/mimeToExtension.js.map +1 -1
  37. package/lib/commonjs/hooks/useChatRoomFocus.js +17 -8
  38. package/lib/commonjs/hooks/useChatRoomFocus.js.map +1 -1
  39. package/lib/commonjs/hooks/useChatWrapperInit.js +12 -7
  40. package/lib/commonjs/hooks/useChatWrapperInit.js.map +1 -1
  41. package/lib/commonjs/networking/stanzaHandlers.js +20 -2
  42. package/lib/commonjs/networking/stanzaHandlers.js.map +1 -1
  43. package/lib/commonjs/networking/xmpp/flushLastViewedToPrivateStore.js +45 -11
  44. package/lib/commonjs/networking/xmpp/flushLastViewedToPrivateStore.js.map +1 -1
  45. package/lib/commonjs/networking/xmppClient.js +36 -2
  46. package/lib/commonjs/networking/xmppClient.js.map +1 -1
  47. package/lib/commonjs/roomStore/index.js +35 -2
  48. package/lib/commonjs/roomStore/index.js.map +1 -1
  49. package/lib/commonjs/roomStore/persistence.js +200 -11
  50. package/lib/commonjs/roomStore/persistence.js.map +1 -1
  51. package/lib/commonjs/roomStore/roomsSlice.js +83 -6
  52. package/lib/commonjs/roomStore/roomsSlice.js.map +1 -1
  53. package/lib/module/components/MainComponents/ChatRoom.js +17 -8
  54. package/lib/module/components/MainComponents/ChatRoom.js.map +1 -1
  55. package/lib/module/components/MainComponents/MediaMessage.js +9 -6
  56. package/lib/module/components/MainComponents/MediaMessage.js.map +1 -1
  57. package/lib/module/components/MainComponents/MessageContainer.js +5 -1
  58. package/lib/module/components/MainComponents/MessageContainer.js.map +1 -1
  59. package/lib/module/components/MainComponents/MessageList.js +2 -1
  60. package/lib/module/components/MainComponents/MessageList.js.map +1 -1
  61. package/lib/module/components/Modals/FilePreviewModal/FilePreviewModal.js +52 -13
  62. package/lib/module/components/Modals/FilePreviewModal/FilePreviewModal.js.map +1 -1
  63. package/lib/module/components/RoomComponents/styled/LastMessageFile.js +12 -1
  64. package/lib/module/components/RoomComponents/styled/LastMessageFile.js.map +1 -1
  65. package/lib/module/components/RoomComponents/styled/LastMessagePhoto.js +13 -2
  66. package/lib/module/components/RoomComponents/styled/LastMessagePhoto.js.map +1 -1
  67. package/lib/module/components/RoomComponents/styled/LastMessageVideo.js +13 -2
  68. package/lib/module/components/RoomComponents/styled/LastMessageVideo.js.map +1 -1
  69. package/lib/module/components/styled/MessageImage.js +3 -1
  70. package/lib/module/components/styled/MessageImage.js.map +1 -1
  71. package/lib/module/components/styled/UnsupportedType.js +14 -4
  72. package/lib/module/components/styled/UnsupportedType.js.map +1 -1
  73. package/lib/module/components/styled/VideoMessage.js +3 -1
  74. package/lib/module/components/styled/VideoMessage.js.map +1 -1
  75. package/lib/module/context/xmppProvider.js +47 -32
  76. package/lib/module/context/xmppProvider.js.map +1 -1
  77. package/lib/module/helpers/createMessageFromXml.js +19 -1
  78. package/lib/module/helpers/createMessageFromXml.js.map +1 -1
  79. package/lib/module/helpers/getDisplayFileName.js +73 -0
  80. package/lib/module/helpers/getDisplayFileName.js.map +1 -0
  81. package/lib/module/helpers/getServerReadTimestamp.js +120 -0
  82. package/lib/module/helpers/getServerReadTimestamp.js.map +1 -0
  83. package/lib/module/helpers/initXmppRooms.js +9 -7
  84. package/lib/module/helpers/initXmppRooms.js.map +1 -1
  85. package/lib/module/helpers/isOwnMessage.js +70 -0
  86. package/lib/module/helpers/isOwnMessage.js.map +1 -0
  87. package/lib/module/helpers/mimeToExtension.js +6 -13
  88. package/lib/module/helpers/mimeToExtension.js.map +1 -1
  89. package/lib/module/hooks/useChatRoomFocus.js +17 -8
  90. package/lib/module/hooks/useChatRoomFocus.js.map +1 -1
  91. package/lib/module/hooks/useChatWrapperInit.js +12 -7
  92. package/lib/module/hooks/useChatWrapperInit.js.map +1 -1
  93. package/lib/module/networking/stanzaHandlers.js +20 -2
  94. package/lib/module/networking/stanzaHandlers.js.map +1 -1
  95. package/lib/module/networking/xmpp/flushLastViewedToPrivateStore.js +45 -11
  96. package/lib/module/networking/xmpp/flushLastViewedToPrivateStore.js.map +1 -1
  97. package/lib/module/networking/xmppClient.js +36 -2
  98. package/lib/module/networking/xmppClient.js.map +1 -1
  99. package/lib/module/roomStore/index.js +37 -4
  100. package/lib/module/roomStore/index.js.map +1 -1
  101. package/lib/module/roomStore/persistence.js +197 -11
  102. package/lib/module/roomStore/persistence.js.map +1 -1
  103. package/lib/module/roomStore/roomsSlice.js +83 -6
  104. package/lib/module/roomStore/roomsSlice.js.map +1 -1
  105. package/lib/typescript/components/MainComponents/ChatRoom.d.ts.map +1 -1
  106. package/lib/typescript/components/MainComponents/MediaMessage.d.ts.map +1 -1
  107. package/lib/typescript/components/MainComponents/MessageContainer.d.ts.map +1 -1
  108. package/lib/typescript/components/MainComponents/MessageList.d.ts.map +1 -1
  109. package/lib/typescript/components/Modals/FilePreviewModal/FilePreviewModal.d.ts.map +1 -1
  110. package/lib/typescript/components/RoomComponents/styled/LastMessageFile.d.ts +1 -1
  111. package/lib/typescript/components/RoomComponents/styled/LastMessageFile.d.ts.map +1 -1
  112. package/lib/typescript/components/RoomComponents/styled/LastMessagePhoto.d.ts +1 -1
  113. package/lib/typescript/components/RoomComponents/styled/LastMessagePhoto.d.ts.map +1 -1
  114. package/lib/typescript/components/RoomComponents/styled/LastMessageVideo.d.ts +1 -1
  115. package/lib/typescript/components/RoomComponents/styled/LastMessageVideo.d.ts.map +1 -1
  116. package/lib/typescript/components/styled/MessageImage.d.ts +6 -0
  117. package/lib/typescript/components/styled/MessageImage.d.ts.map +1 -1
  118. package/lib/typescript/components/styled/UnsupportedType.d.ts.map +1 -1
  119. package/lib/typescript/components/styled/VideoMessage.d.ts +6 -0
  120. package/lib/typescript/components/styled/VideoMessage.d.ts.map +1 -1
  121. package/lib/typescript/context/xmppProvider.d.ts.map +1 -1
  122. package/lib/typescript/helpers/createMessageFromXml.d.ts.map +1 -1
  123. package/lib/typescript/helpers/getDisplayFileName.d.ts +49 -0
  124. package/lib/typescript/helpers/getDisplayFileName.d.ts.map +1 -0
  125. package/lib/typescript/helpers/getServerReadTimestamp.d.ts +69 -0
  126. package/lib/typescript/helpers/getServerReadTimestamp.d.ts.map +1 -0
  127. package/lib/typescript/helpers/initXmppRooms.d.ts.map +1 -1
  128. package/lib/typescript/helpers/isOwnMessage.d.ts +36 -0
  129. package/lib/typescript/helpers/isOwnMessage.d.ts.map +1 -0
  130. package/lib/typescript/helpers/mimeToExtension.d.ts +0 -15
  131. package/lib/typescript/helpers/mimeToExtension.d.ts.map +1 -1
  132. package/lib/typescript/hooks/useChatRoomFocus.d.ts +4 -1
  133. package/lib/typescript/hooks/useChatRoomFocus.d.ts.map +1 -1
  134. package/lib/typescript/hooks/useChatWrapperInit.d.ts.map +1 -1
  135. package/lib/typescript/networking/stanzaHandlers.d.ts.map +1 -1
  136. package/lib/typescript/networking/xmpp/flushLastViewedToPrivateStore.d.ts +9 -2
  137. package/lib/typescript/networking/xmpp/flushLastViewedToPrivateStore.d.ts.map +1 -1
  138. package/lib/typescript/networking/xmppClient.d.ts.map +1 -1
  139. package/lib/typescript/roomStore/index.d.ts.map +1 -1
  140. package/lib/typescript/roomStore/persistence.d.ts +18 -1
  141. package/lib/typescript/roomStore/persistence.d.ts.map +1 -1
  142. package/lib/typescript/roomStore/roomsSlice.d.ts +13 -1
  143. package/lib/typescript/roomStore/roomsSlice.d.ts.map +1 -1
  144. package/package.json +1 -1
  145. package/src/components/MainComponents/ChatRoom.tsx +21 -10
  146. package/src/components/MainComponents/MediaMessage.tsx +8 -5
  147. package/src/components/MainComponents/MessageContainer.tsx +5 -1
  148. package/src/components/MainComponents/MessageList.tsx +2 -1
  149. package/src/components/Modals/FilePreviewModal/FilePreviewModal.tsx +63 -26
  150. package/src/components/RoomComponents/styled/LastMessageFile.tsx +14 -2
  151. package/src/components/RoomComponents/styled/LastMessagePhoto.tsx +14 -2
  152. package/src/components/RoomComponents/styled/LastMessageVideo.tsx +14 -2
  153. package/src/components/styled/MessageImage.tsx +8 -1
  154. package/src/components/styled/UnsupportedType.tsx +14 -4
  155. package/src/components/styled/VideoMessage.tsx +8 -1
  156. package/src/context/xmppProvider.tsx +47 -24
  157. package/src/helpers/createMessageFromXml.ts +20 -1
  158. package/src/helpers/getDisplayFileName.ts +87 -0
  159. package/src/helpers/getServerReadTimestamp.ts +120 -0
  160. package/src/helpers/initXmppRooms.tsx +9 -9
  161. package/src/helpers/isOwnMessage.ts +90 -0
  162. package/src/helpers/mimeToExtension.ts +6 -22
  163. package/src/hooks/useChatRoomFocus.ts +14 -5
  164. package/src/hooks/useChatWrapperInit.ts +12 -7
  165. package/src/networking/stanzaHandlers.ts +20 -6
  166. package/src/networking/xmpp/flushLastViewedToPrivateStore.ts +65 -18
  167. package/src/networking/xmppClient.ts +41 -2
  168. package/src/roomStore/index.ts +40 -4
  169. package/src/roomStore/persistence.ts +197 -7
  170. package/src/roomStore/roomsSlice.ts +84 -6
@@ -1 +1 @@
1
- {"version":3,"names":["React","useEffect","useState","isSecureFileUrl","requestFileTokenRecovery","Image","Pressable","StyleSheet","View","useDispatch","setActiveFile","setActiveModal","MODAL_TYPES","PlayIcon","defaultMediaDims","fitMediaDimensions","jsx","_jsx","jsxs","_jsxs","PlayBadge","style","styles","overlay","pointerEvents","children","playButton","width","height","PosterVideo","previewURL","onOpen","onPosterError","dims","setDims","active","getSize","w","h","onPress","wrapper","accessibilityRole","accessibilityLabel","source","uri","video","resizeMode","onError","PlaceholderVideo","CustomMessageVideo","fileName","fileURL","mimetype","dispatch","posterFailed","setPosterFailed","handleOpen","FILE_PREVIEW","create","borderRadius","overflow","backgroundColor","absoluteFill","justifyContent","alignItems"],"sourceRoot":"../../../../src","sources":["components/styled/VideoMessage.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["React","useEffect","useState","isSecureFileUrl","requestFileTokenRecovery","Image","Pressable","StyleSheet","View","useDispatch","setActiveFile","setActiveModal","MODAL_TYPES","PlayIcon","defaultMediaDims","fitMediaDimensions","jsx","_jsx","jsxs","_jsxs","PlayBadge","style","styles","overlay","pointerEvents","children","playButton","width","height","PosterVideo","previewURL","onOpen","onPosterError","dims","setDims","active","getSize","w","h","onPress","wrapper","accessibilityRole","accessibilityLabel","source","uri","video","resizeMode","onError","PlaceholderVideo","CustomMessageVideo","fileName","originalName","fileURL","mimetype","dispatch","posterFailed","setPosterFailed","handleOpen","FILE_PREVIEW","create","borderRadius","overflow","backgroundColor","absoluteFill","justifyContent","alignItems"],"sourceRoot":"../../../../src","sources":["components/styled/VideoMessage.tsx"],"mappings":"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","ignoreList":[]}
@@ -14,7 +14,8 @@ import { allRoomPresences } from '../networking/xmpp/allRoomPresences.xmpp';
14
14
  import { pushSubscriptionService } from '../services/pushSubscriptionService';
15
15
  import { store } from '../roomStore';
16
16
  import { logout, setStoreClient, setConfig } from '../roomStore/chatSettingsSlice';
17
- import { setLogoutState, setVisibleRoom, clearVisibleRoom, setLastViewedTimestamp, deleteRoomMessage, msgSortableMs, setUnreadSyncing } from '../roomStore/roomsSlice';
17
+ import { setLogoutState, setVisibleRoom, clearVisibleRoom, setLastViewedTimestamp, deleteRoomMessage, setUnreadSyncing } from '../roomStore/roomsSlice';
18
+ import { getServerReadTimestamp } from '../helpers/getServerReadTimestamp';
18
19
  import { runHistoryPreloadScheduler } from '../helpers/historyPreloadScheduler';
19
20
  import { updateMessagesTillLast } from '../helpers/updateMessagesTillLast';
20
21
  import { secureUserStorage } from '../helpers/secureUserStorage';
@@ -537,17 +538,28 @@ export const XmppProvider = ({
537
538
  // Mark the open room "not visible" while backgrounded so messages
538
539
  // that arrive (or MAM-replay on reconnect) count as unread instead
539
540
  // of being silently treated as read — the "mounted == visible ==
540
- // read" gap. Stamp lastViewed=now as the read baseline, clear
541
- // visibility, then flush that marker to the server private store.
542
- // Restored on the next 'active' transition above. Handled here in
543
- // the provider so consumers using the component as a package get
544
- // correct unread without reaching into the chat store themselves.
541
+ // read" gap. Stamp lastViewed=<newest server-acked message>, not
542
+ // Date.now(), as the read baseline: a device clock running ahead
543
+ // would otherwise write a future marker that the forward-only
544
+ // private-store merge can never correct again (bug #38). Then
545
+ // clear visibility and flush that marker to the server private
546
+ // store. Restored on the next 'active' transition above. Handled
547
+ // here in the provider so consumers using the component as a
548
+ // package get correct unread without reaching into the chat store
549
+ // themselves.
545
550
  visibleBeforeBackground = visibleRoomJID;
546
551
  if (visibleRoomJID) {
547
- store.dispatch(setLastViewedTimestamp({
548
- chatJID: visibleRoomJID,
549
- timestamp: Date.now()
550
- }));
552
+ const readTs = getServerReadTimestamp(rooms?.[visibleRoomJID], state.roomHeapSlice);
553
+ // Nothing to anchor to yet (no known messages, no prior marker)
554
+ // - skip the local stamp rather than fall back to the device
555
+ // clock. The flush below still runs so the visibility clear
556
+ // isn't blocked on this.
557
+ if (readTs > 0) {
558
+ store.dispatch(setLastViewedTimestamp({
559
+ chatJID: visibleRoomJID,
560
+ timestamp: readTs
561
+ }));
562
+ }
551
563
  // Drop the "New messages" divider for the room we're leaving so it
552
564
  // doesn't linger when the user comes back (mirrors ChatRoom's
553
565
  // unmount cleanup, which never runs while the pane stays mounted).
@@ -573,11 +585,11 @@ export const XmppProvider = ({
573
585
  // "shown" from "hidden", so the unread middleware would keep the open
574
586
  // room's badge at 0 and messages arriving while you're elsewhere look
575
587
  // already-read. When the host passes `isVisible`, mirror the AppState
576
- // background/foreground handling: hidden → stamp lastViewed=now + clear
577
- // room visibility (so later messages count) + flush; shown → restore
578
- // visibility for the open room. Doing it here means consumers never
579
- // touch the chat store themselves. (Undefined = host unmounts on hide,
580
- // nothing to do.)
588
+ // background/foreground handling: hidden → stamp lastViewed=<newest
589
+ // server-acked message> + clear room visibility (so later messages
590
+ // count) + flush; shown → restore visibility for the open room. Doing
591
+ // it here means consumers never touch the chat store themselves.
592
+ // (Undefined = host unmounts on hide, nothing to do.)
581
593
  // -----------------------------------------------------------
582
594
  const chatWasVisibleRef = useRef(false);
583
595
  useEffect(() => {
@@ -597,10 +609,16 @@ export const XmppProvider = ({
597
609
  }
598
610
  } else {
599
611
  if (wasVisible && activeRoomJID) {
600
- store.dispatch(setLastViewedTimestamp({
601
- chatJID: activeRoomJID,
602
- timestamp: Date.now()
603
- }));
612
+ // Never Date.now(): a fast device clock would write a future
613
+ // marker that the forward-only private-store merge could then
614
+ // never correct (bug #38).
615
+ const readTs = getServerReadTimestamp(rooms?.[activeRoomJID], state.roomHeapSlice);
616
+ if (readTs > 0) {
617
+ store.dispatch(setLastViewedTimestamp({
618
+ chatJID: activeRoomJID,
619
+ timestamp: readTs
620
+ }));
621
+ }
604
622
  // Drop the "New messages" divider so it's gone when the user
605
623
  // returns to the chat (mirrors ChatRoom's unmount cleanup).
606
624
  store.dispatch(deleteRoomMessage({
@@ -637,24 +655,21 @@ export const XmppProvider = ({
637
655
  return;
638
656
  }
639
657
  lastMessagesRef = room.messages;
640
- let newest = 0;
641
- const list = room.messages || [];
642
- for (const m of list) {
643
- if (!m || m.id === 'delimiter-new') {
644
- continue;
645
- }
646
- const ms = msgSortableMs(m);
647
- if (ms > newest) {
648
- newest = ms;
649
- }
650
- }
651
- if (newest <= lastStampedMs) {
658
+
659
+ // getServerReadTimestamp (not a hand-rolled scan + Date.now()):
660
+ // it excludes pending/optimistic messages, which carry the DEVICE
661
+ // send time via `date` until the server echoes them back - a
662
+ // manual scan without that exclusion could pick up a pending
663
+ // message's device timestamp here and write a future marker the
664
+ // same way a raw Date.now() would (bug #38).
665
+ const newest = getServerReadTimestamp(room, s.roomHeapSlice);
666
+ if (!newest || newest <= lastStampedMs) {
652
667
  return;
653
668
  }
654
669
  lastStampedMs = newest;
655
670
  store.dispatch(setLastViewedTimestamp({
656
671
  chatJID: jid,
657
- timestamp: Date.now()
672
+ timestamp: newest
658
673
  }));
659
674
  if (flushTimer) {
660
675
  clearTimeout(flushTimer);
@@ -1 +1 @@
1
- {"version":3,"names":["React","createContext","useCallback","useContext","useEffect","useMemo","useRef","useState","AppState","DeviceEventEmitter","NetInfo","VideoCallOverlay","XmppClient","refreshAuthTokensQuietly","buildXmppClientKey","getGlobalXmppClient","getReusableXmppClientByKey","isXmppClientReusable","setGlobalXmppClient","withXmppClientInitLock","applyResolvedUserToStore","refreshUserCredentialsForXmpp","resolveInitBeforeLoadUser","ensureScopedChatCache","getRooms","prefetchRoomsViaRest","allRoomPresences","pushSubscriptionService","store","logout","setStoreClient","setConfig","setLogoutState","setVisibleRoom","clearVisibleRoom","setLastViewedTimestamp","deleteRoomMessage","msgSortableMs","setUnreadSyncing","runHistoryPreloadScheduler","updateMessagesTillLast","secureUserStorage","clearPersistedState","pushLog","devPushLog","jsx","_jsx","jsxs","_jsxs","XmppContext","LOGOUT_EVENT","subscribeAllRoomsForPush","client","reason","rooms","Object","keys","getState","length","nick","jid","getLocal","subscribeToRooms","then","catch","e","XmppProvider","children","config","isVisible","setClient","providerBootstrapStatus","setProviderBootstrapStatus","initMode","initBeforeLoad","lastCredsRef","completedBootstrapKeyRef","inflightBootstrapKeyRef","credentialsProvider","refreshTokens","enabled","rotated","force","xmppPassword","rotatedUser","chatSettingStore","user","username","xmppUsername","defaultWallet","walletAddress","password","fresh","err","u","jwtLogin","token","userLogin","customLogin","initBeforeLoadAuth","myEndpoint","initializeClient","xmppSettings","settings","key","reusable","current","created","prevGlobal","close","newClient","setCredentialsProvider","waitForOnline","console","error","setOnOnline","underlying","finally","getChatsPrivateStoreRequestStanza","abortController","AbortController","cancelled","MAX_BOOTSTRAP_ATTEMPTS","bootstrapAttempt","BOOTSTRAP_BUDGET_MS","reachedReady","budgetTimer","setTimeout","abort","dispatch","clearBudget","clearTimeout","run","explicitUser","appId","baseUrl","devServer","join","mode","clearStoreBeforeInit","remove","undefined","resolved","signal","hasResolved","xmppPasswordPresent","connectPassword","restRoomsPromise","c","getRoomsStanza","roomCount","qos","historyQoS","activeRoomJID","defaultRoomJids","defaultRooms","map","r","filter","Boolean","selectedRoomJid","concurrency","stagedPreloadConcurrency","pageSize","stagedPreloadFirstPassSize","roomLimit","preloadTopKRooms","warn","aborted","backoff","Math","min","message","status","response","data","id","setInterval","currentState","suppressReconnect","forceReconnect","ensureStreamAlive","clearInterval","visibleBeforeBackground","suspendInBackground","keepAliveInBackground","sub","addEventListener","next","isSuspended","resume","roomJID","suspend","state","visibleRoomJID","chatJID","timestamp","Date","now","messageId","flushLastViewedToPrivateStoreStanza","chatWasVisibleRef","wasVisible","lastMessagesRef","lastStampedMs","flushTimer","advance","s","room","messages","newest","list","m","ms","unsub","subscribe","reachable","isConnected","isInternetReachable","addListener","disconnect","Provider","value","useXmppClient","context","Error","candidates","live","find","emitXmppLogout","emit"],"sourceRoot":"../../../src","sources":["context/xmppProvider.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["React","createContext","useCallback","useContext","useEffect","useMemo","useRef","useState","AppState","DeviceEventEmitter","NetInfo","VideoCallOverlay","XmppClient","refreshAuthTokensQuietly","buildXmppClientKey","getGlobalXmppClient","getReusableXmppClientByKey","isXmppClientReusable","setGlobalXmppClient","withXmppClientInitLock","applyResolvedUserToStore","refreshUserCredentialsForXmpp","resolveInitBeforeLoadUser","ensureScopedChatCache","getRooms","prefetchRoomsViaRest","allRoomPresences","pushSubscriptionService","store","logout","setStoreClient","setConfig","setLogoutState","setVisibleRoom","clearVisibleRoom","setLastViewedTimestamp","deleteRoomMessage","setUnreadSyncing","getServerReadTimestamp","runHistoryPreloadScheduler","updateMessagesTillLast","secureUserStorage","clearPersistedState","pushLog","devPushLog","jsx","_jsx","jsxs","_jsxs","XmppContext","LOGOUT_EVENT","subscribeAllRoomsForPush","client","reason","rooms","Object","keys","getState","length","nick","jid","getLocal","subscribeToRooms","then","catch","e","XmppProvider","children","config","isVisible","setClient","providerBootstrapStatus","setProviderBootstrapStatus","initMode","initBeforeLoad","lastCredsRef","completedBootstrapKeyRef","inflightBootstrapKeyRef","credentialsProvider","refreshTokens","enabled","rotated","force","xmppPassword","rotatedUser","chatSettingStore","user","username","xmppUsername","defaultWallet","walletAddress","password","fresh","err","u","jwtLogin","token","userLogin","customLogin","initBeforeLoadAuth","myEndpoint","initializeClient","xmppSettings","settings","key","reusable","current","created","prevGlobal","close","newClient","setCredentialsProvider","waitForOnline","console","error","setOnOnline","underlying","finally","getChatsPrivateStoreRequestStanza","abortController","AbortController","cancelled","MAX_BOOTSTRAP_ATTEMPTS","bootstrapAttempt","BOOTSTRAP_BUDGET_MS","reachedReady","budgetTimer","setTimeout","abort","dispatch","clearBudget","clearTimeout","run","explicitUser","appId","baseUrl","devServer","join","mode","clearStoreBeforeInit","remove","undefined","resolved","signal","hasResolved","xmppPasswordPresent","connectPassword","restRoomsPromise","c","getRoomsStanza","roomCount","qos","historyQoS","activeRoomJID","defaultRoomJids","defaultRooms","map","r","filter","Boolean","selectedRoomJid","concurrency","stagedPreloadConcurrency","pageSize","stagedPreloadFirstPassSize","roomLimit","preloadTopKRooms","warn","aborted","backoff","Math","min","message","status","response","data","id","setInterval","currentState","suppressReconnect","forceReconnect","ensureStreamAlive","clearInterval","visibleBeforeBackground","suspendInBackground","keepAliveInBackground","sub","addEventListener","next","isSuspended","resume","roomJID","suspend","state","visibleRoomJID","readTs","roomHeapSlice","chatJID","timestamp","messageId","flushLastViewedToPrivateStoreStanza","chatWasVisibleRef","wasVisible","lastMessagesRef","lastStampedMs","flushTimer","advance","s","room","messages","newest","unsub","subscribe","reachable","isConnected","isInternetReachable","addListener","disconnect","Provider","value","useXmppClient","context","Error","candidates","live","find","emitXmppLogout","emit"],"sourceRoot":"../../../src","sources":["context/xmppProvider.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAEVC,aAAa,EACbC,WAAW,EACXC,UAAU,EACVC,SAAS,EACTC,OAAO,EACPC,MAAM,EACNC,QAAQ,QACH,OAAO;AACd,SAASC,QAAQ,EAAEC,kBAAkB,QAAQ,cAAc;AAC3D,OAAOC,OAAO,MAAM,iCAAiC;AACrD,SAASC,gBAAgB,QAAQ,2CAA2C;AAC5E,OAAOC,UAAU,MAEV,0BAA0B;AACjC,SAASC,wBAAwB,QAAQ,2BAA2B;AAOpE,SACEC,kBAAkB,EAClBC,mBAAmB,EACnBC,0BAA0B,EAC1BC,oBAAoB,EACpBC,mBAAmB,EACnBC,sBAAsB,QACjB,yBAAyB;AAChC,SACEC,wBAAwB,EACxBC,6BAA6B,EAC7BC,yBAAyB,QACpB,sCAAsC;AAC7C,SAASC,qBAAqB,QAAQ,kCAAkC;AACxE,SAASC,QAAQ,IAAIC,oBAAoB,QAAQ,sCAAsC;AACvF,SAASC,gBAAgB,QAAQ,0CAA0C;AAC3E,SAASC,uBAAuB,QAAQ,qCAAqC;AAC7E,SAASC,KAAK,QAAQ,cAAc;AACpC,SAASC,MAAM,EAAEC,cAAc,EAAEC,SAAS,QAAQ,gCAAgC;AAClF,SACEC,cAAc,EACdC,cAAc,EACdC,gBAAgB,EAChBC,sBAAsB,EACtBC,iBAAiB,EACjBC,gBAAgB,QACX,yBAAyB;AAChC,SAASC,sBAAsB,QAAQ,mCAAmC;AAC1E,SAASC,0BAA0B,QAAQ,oCAAoC;AAC/E,SAASC,sBAAsB,QAAQ,mCAAmC;AAC1E,SAASC,iBAAiB,QAAQ,8BAA8B;AAChE,SAASC,mBAAmB,QAAQ,0BAA0B;AAC9D,SAASC,OAAO,IAAIC,UAAU,QAAQ,oBAAoB;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAkB3D,MAAMC,WAAW,gBAAGhD,aAAa,CAAyB,IAAI,CAAC;AAW/D,MAAMiD,YAAY,GAAG,oBAAoB;AAEzC,MAAMC,wBAAwB,GAAGA,CAACC,MAAW,EAAEC,MAAc,KAAK;EAChE,MAAMC,KAAK,GAAGC,MAAM,CAACC,IAAI,CAAC5B,KAAK,CAAC6B,QAAQ,CAAC,CAAC,CAACH,KAAK,CAACA,KAAK,IAAI,CAAC,CAAC,CAAC;EAC7D,IAAI,CAACF,MAAM,IAAI,CAACE,KAAK,CAACI,MAAM,EAAE;IAAC;EAAO;EACtC,MAAMC,IAAI,GAAGP,MAAM,CAACQ,GAAG,EAAEC,QAAQ,CAAC,CAAC;EACnClC,uBAAuB,CACpBmC,gBAAgB,CAACV,MAAM,EAAEE,KAAK,EAAEK,IAAI,CAAC,CACrCI,IAAI,CAAC,MAAMnB,UAAU,CAAC,MAAM,EAAE,GAAGS,MAAM,mBAAmBC,KAAK,CAACI,MAAM,QAAQ,CAAC,CAAC,CAChFM,KAAK,CAAEC,CAAC,IAAKrB,UAAU,CAAC,MAAM,EAAE,GAAGS,MAAM,2BAA2B,EAAEY,CAAC,CAAC,CAAC;AAC9E,CAAC;AAED,OAAO,MAAMC,YAAyC,GAAGA,CAAC;EAAEC,QAAQ;EAAEC,MAAM;EAAEC;AAAU,CAAC,KAAK;EAC5F,MAAM,CAACjB,MAAM,EAAEkB,SAAS,CAAC,GAAG/D,QAAQ,CAAoB,IAAI,CAAC;EAC7D,MAAM,CAACgE,uBAAuB,EAAEC,0BAA0B,CAAC,GACzDjE,QAAQ,CAA0B,MAAM,CAAC;;EAE3C;EACA;EACA,MAAMkE,QAA6B,GAAGL,MAAM,EAAEM,cAAc,GAAG,UAAU,GAAG,MAAM;EAElF,MAAMC,YAAY,GAAGrE,MAAM,CAAkF,IAAI,CAAC;EAClH,MAAMsE,wBAAwB,GAAGtE,MAAM,CAAS,EAAE,CAAC;EACnD,MAAMuE,uBAAuB,GAAGvE,MAAM,CAAS,EAAE,CAAC;;EAElD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,MAAMwE,mBAAmB,GAAGzE,OAAO,CAA0B,MAAM;IACjE,OAAO,YAAY;MACjB;MACA;MACA;MACA;MACA;MACA;MACA;MACA,IAAI+D,MAAM,EAAEW,aAAa,EAAEC,OAAO,EAAE;QAClC,MAAMC,OAAO,GAAG,MAAMpE,wBAAwB,CAAC;UAAEqE,KAAK,EAAE;QAAK,CAAC,CAAC;QAE/D,IAAID,OAAO,EAAEE,YAAY,EAAE;UACzB,MAAMC,WAAW,GAAGxD,KAAK,CAAC6B,QAAQ,CAAC,CAAC,CAAC4B,gBAAgB,CAACC,IAAI;UAC1D,OAAO;YACLC,QAAQ,EACNH,WAAW,EAAEI,YAAY,IACzBJ,WAAW,EAAEK,aAAa,EAAEC,aAAa,IACzC,EAAE;YACJC,QAAQ,EAAEV,OAAO,CAACE;UACpB,CAAC;QACH;MACF;;MAEA;MACA;MACA;MACA;MACA,MAAMS,KAAK,GAAG,MAAMvE,6BAA6B,CAAC+C,MAAM,CAAC,CAACJ,KAAK,CAC5D6B,GAAG,IAAK;QACPjD,UAAU,CAAC,MAAM,EAAE,uCAAuC,EAAEiD,GAAG,CAAC;QAChE,OAAO,IAAI;MACb,CACF,CAAC;MACD,IAAID,KAAK,EAAE;QACTxE,wBAAwB,CAACwE,KAAK,CAAC;QAC/B,OAAO;UACLL,QAAQ,EACNK,KAAK,CAACJ,YAAY,IAClBI,KAAK,CAACH,aAAa,EAAEC,aAAa,IAClC,EAAE;UACJC,QAAQ,EAAEC,KAAK,CAACT,YAAY,IAAI;QAClC,CAAC;MACH;;MAEA;MACA;MACA;MACA;MACA;MACA;MACA,MAAMW,CAAC,GAAGlE,KAAK,CAAC6B,QAAQ,CAAC,CAAC,CAAC4B,gBAAgB,CAACC,IAAI;MAChD,OAAO;QACLC,QAAQ,EAAEO,CAAC,EAAEN,YAAY,IAAIM,CAAC,EAAEL,aAAa,EAAEC,aAAa,IAAI,EAAE;QAClEC,QAAQ,EAAEG,CAAC,EAAEX,YAAY,IAAI;MAC/B,CAAC;IACH,CAAC;EACH,CAAC,EAAE,CACDf,MAAM,EAAE2B,QAAQ,EAAEf,OAAO,EACzBZ,MAAM,EAAE2B,QAAQ,EAAEC,KAAK,EACvB5B,MAAM,EAAEW,aAAa,EAAEC,OAAO,EAC9BZ,MAAM,EAAE6B,SAAS,EAAEjB,OAAO,EAC1BZ,MAAM,EAAE8B,WAAW,EAAElB,OAAO,EAC5BZ,MAAM,EAAE+B,kBAAkB,EAAEC,UAAU,CACvC,CAAC;EAEF,MAAMC,gBAAgB,GAAGnG,WAAW,CAClC,OACEqF,QAAgB,EAChBI,QAAgB,EAChBW,YAAoC,KACZ;IACxB,MAAMC,QAAQ,GAAGD,YAAY,IAAIlC,MAAM,EAAEkC,YAAY;IACrD,MAAME,GAAG,GAAG1F,kBAAkB,CAACyE,QAAQ,EAAEgB,QAAQ,CAAC;;IAElD;IACA,MAAME,QAAQ,GAAGzF,0BAA0B,CAACwF,GAAG,CAAC;IAChD,IAAIC,QAAQ,EAAE;MACZnC,SAAS,CAACmC,QAAQ,CAAC;MACnB9B,YAAY,CAAC+B,OAAO,GAAG;QAAEnB,QAAQ;QAAEI,QAAQ;QAAEY;MAAS,CAAC;MACvD,OAAOE,QAAQ;IACjB;;IAEA;IACA,IAAIrD,MAAM,IAAInC,oBAAoB,CAACmC,MAAM,CAAC,EAAE;MAC1CuB,YAAY,CAAC+B,OAAO,GAAG;QAAEnB,QAAQ;QAAEI,QAAQ;QAAEY;MAAS,CAAC;MACvD,OAAOnD,MAAM;IACf;;IAEA;IACA;IACA,MAAMuD,OAAO,GAAG,MAAMxF,sBAAsB,CAACqF,GAAG,EAAE,YAAY;MAC5D,MAAMI,UAAU,GAAG7F,mBAAmB,CAAC,CAAC;MACxC,IAAI6F,UAAU,EAAE;QACd,IAAI;UAAE,MAAMA,UAAU,CAACC,KAAK,CAAC,CAAC;QAAE,CAAC,CAAC,MAAM,CAAC;MAC3C;MACA,MAAMC,SAAS,GAAG,IAAIlG,UAAU,CAAC2E,QAAQ,EAAEI,QAAQ,EAAEY,QAAQ,CAAC;MAC9D;MACA;MACA;MACA;MACA;MACAO,SAAS,CAACC,sBAAsB,CAACjC,mBAAmB,CAAC;MACrD5D,mBAAmB,CAAC4F,SAAS,EAAEN,GAAG,CAAC;MACnC,MAAMM,SAAS,CAACE,aAAa,CAAC,CAAC,CAAChD,KAAK,CAAE6B,GAAG,IAAK;QAC7CoB,OAAO,CAACC,KAAK,CAAC,gCAAgC,EAAErB,GAAG,CAAC;QACpD,MAAMA,GAAG;MACX,CAAC,CAAC;MACF,OAAOiB,SAAS;IAClB,CAAC,CAAC;;IAEF;IACA;IACAH,OAAO,CAACI,sBAAsB,CAACjC,mBAAmB,CAAC;;IAEnD;IACA;IACA;IACA;IACA;IACA;IACA6B,OAAO,CAACQ,WAAW,CAAC,MAAM;MACxB,MAAMC,UAAU,GAAIT,OAAO,CAASvD,MAAM;MAC1C,IAAI,CAACgE,UAAU,EAAE;QAAC;MAAO;MACzB1F,gBAAgB,CAAC0F,UAAU,CAAC,CACzBpD,KAAK,CAAEC,CAAC,IACPrB,UAAU,CAAC,MAAM,EAAE,4CAA4C,EAAEqB,CAAC,CACpE,CAAC,CACAoD,OAAO,CAAC,MAAMlE,wBAAwB,CAACiE,UAAU,EAAE,WAAW,CAAC,CAAC;MACnE;MACA;MACA;MACAT,OAAO,CACJW,iCAAiC,CAAC,CAAC,CACnCtD,KAAK,CAAEC,CAAU,IAChBrB,UAAU,CAAC,MAAM,EAAE,wCAAwC,EAAEqB,CAAC,CAChE,CAAC;MACH;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA,MAAMX,KAAK,GAAG1B,KAAK,CAAC6B,QAAQ,CAAC,CAAC,CAACH,KAAK,EAAEA,KAAK,IAAI,CAAC,CAAC;MACjDd,sBAAsB,CAACc,KAAK,EAAEqD,OAAO,CAAC,CAAC3C,KAAK,CAAEC,CAAU,IACtDrB,UAAU,CAAC,MAAM,EAAE,yCAAyC,EAAEqB,CAAC,CACjE,CAAC;IACH,CAAC,CAAC;IAEFK,SAAS,CAACqC,OAAO,CAAC;IAClBhC,YAAY,CAAC+B,OAAO,GAAG;MAAEnB,QAAQ;MAAEI,QAAQ;MAAEY;IAAS,CAAC;IACvD,OAAOI,OAAO;EAChB,CAAC,EACD,CAACvD,MAAM,EAAEgB,MAAM,EAAEkC,YAAY,EAAExB,mBAAmB,CACpD,CAAC;;EAED;EACA;EACA;EACA1E,SAAS,CAAC,MAAM;IACd,IAAI,CAACgE,MAAM,EAAEM,cAAc,EAAE;MAC3BF,0BAA0B,CAAC,MAAM,CAAC;MAClC;IACF;IAEA,MAAM+C,eAAe,GAAG,IAAIC,eAAe,CAAC,CAAC;IAC7C,IAAIC,SAAS,GAAG,KAAK;IACrB;IACA;IACA;IACA;IACA;IACA,MAAMC,sBAAsB,GAAG,CAAC;IAChC,IAAIC,gBAAgB,GAAG,CAAC;IACxB;IACA;IACA,MAAMC,mBAAmB,GAAG,KAAK;IACjC,IAAIC,YAAY,GAAG,KAAK;IACxB,IAAIC,WAAiD,GAAGC,UAAU,CAAC,MAAM;MACvE,IAAIN,SAAS,IAAII,YAAY,EAAE;QAAC;MAAO;MACvCjF,UAAU,CAAC,MAAM,EAAE,+CAA+C,CAAC;MACnE2E,eAAe,CAACS,KAAK,CAAC,CAAC;MACvBnD,uBAAuB,CAAC6B,OAAO,GAAG,EAAE;MACpC9E,KAAK,CAACqG,QAAQ,CAAC5F,gBAAgB,CAAC,KAAK,CAAC,CAAC;MACvCmC,0BAA0B,CAAC,QAAQ,CAAC;IACtC,CAAC,EAAEoD,mBAAmB,CAAC;IACvB,MAAMM,WAAW,GAAGA,CAAA,KAAM;MACxB,IAAIJ,WAAW,EAAE;QACfK,YAAY,CAACL,WAAW,CAAC;QACzBA,WAAW,GAAG,IAAI;MACpB;IACF,CAAC;IAED,MAAMM,GAAG,GAAG,MAAAA,CAAA,KAAY;MACtB;MACA,MAAMC,YAAY,GAAGjE,MAAM,EAAE6B,SAAS,EAAEjB,OAAO,GAAGZ,MAAM,EAAE6B,SAAS,EAAEX,IAAI,GAAG,IAAI;MAChF,MAAMkB,GAAG,GAAG,CACVpC,MAAM,EAAEkE,KAAK,IAAI,EAAE,EACnBlE,MAAM,EAAEmE,OAAO,IAAI,EAAE,EACrBF,YAAY,EAAE5C,aAAa,EAAEC,aAAa,IAAI,EAAE,EAChD2C,YAAY,EAAE7C,YAAY,IAAI,EAAE,EAChC6C,YAAY,EAAErC,KAAK,GAAG,GAAG,GAAG,GAAG,EAC/B5B,MAAM,EAAE2B,QAAQ,EAAEf,OAAO,GAAGZ,MAAM,EAAE2B,QAAQ,EAAEC,KAAK,IAAI,EAAE,GAAG,EAAE,EAC9D5B,MAAM,EAAEkC,YAAY,EAAEkC,SAAS,IAAI,EAAE,CACtC,CAACC,IAAI,CAAC,GAAG,CAAC;MAEX,IAAI7D,wBAAwB,CAAC8B,OAAO,KAAKF,GAAG,EAAE;QAC5C5D,UAAU,CAAC,IAAI,EAAE,qDAAqD,CAAC;QACvE;MACF;MACA,IAAIiC,uBAAuB,CAAC6B,OAAO,KAAKF,GAAG,EAAE;QAC3C5D,UAAU,CAAC,IAAI,EAAE,6CAA6C,CAAC;QAC/D;MACF;MACAiC,uBAAuB,CAAC6B,OAAO,GAAGF,GAAG;MACrChC,0BAA0B,CAAC,SAAS,CAAC;MACrC5C,KAAK,CAACqG,QAAQ,CAAC5F,gBAAgB,CAAC,IAAI,CAAC,CAAC;MACtCO,UAAU,CAAC,IAAI,EAAE,yBAAyB,EAAE;QAC1C0F,KAAK,EAAElE,MAAM,EAAEkE,KAAK;QACpBC,OAAO,EAAEnE,MAAM,EAAEmE,OAAO;QACxBG,IAAI,EACFtE,MAAM,EAAE2B,QAAQ,EAAEf,OAAO,GAAG,KAAK,GACjCZ,MAAM,EAAE6B,SAAS,EAAEjB,OAAO,GAAG,WAAW,GACxCZ,MAAM,EAAE8B,WAAW,EAAElB,OAAO,GAAG,aAAa,GAAG;MACnD,CAAC,CAAC;MAEF,IAAI;QACF,IAAIZ,MAAM,EAAEuE,oBAAoB,EAAE;UAChC/F,UAAU,CAAC,IAAI,EAAE,sCAAsC,CAAC;UACxDhB,KAAK,CAACqG,QAAQ,CAACjG,cAAc,CAAC,CAAC,CAAC;UAChCJ,KAAK,CAACqG,QAAQ,CAACpG,MAAM,CAAC,CAAC,CAAC;UACxB,MAAMY,iBAAiB,CAAC,CAAC,CAACmG,MAAM,CAAC,CAAC,CAAC5E,KAAK,CAAC,MAAM6E,SAAS,CAAC;QAC3D;QAEA,MAAMtH,qBAAqB,CAAC6C,MAAM,CAAC;QACnCxB,UAAU,CAAC,IAAI,EAAE,2CAA2C,CAAC;QAE7D,MAAMkG,QAAqB,GAAG,MAAMxH,yBAAyB,CAAC;UAC5D8C,MAAM;UACN2E,MAAM,EAAExB,eAAe,CAACwB;QAC1B,CAAC,CAAC;QACF,IAAItB,SAAS,EAAE;UAAC;QAAO;QAEvB,IAAI,CAACqB,QAAQ,IAAI,CAACA,QAAQ,CAAC3D,YAAY,IAAI,CAAC2D,QAAQ,CAACtD,YAAY,EAAE;UACjE5C,UAAU,CAAC,OAAO,EAAE,qCAAqC,EAAE;YACzDoG,WAAW,EAAE,CAAC,CAACF,QAAQ;YACvBtD,YAAY,EAAEsD,QAAQ,EAAEtD,YAAY;YACpCyD,mBAAmB,EAAE,CAAC,CAACH,QAAQ,EAAE3D;UACnC,CAAC,CAAC;UACFX,0BAA0B,CAAC,QAAQ,CAAC;UACpCK,uBAAuB,CAAC6B,OAAO,GAAG,EAAE;UACpC9E,KAAK,CAACqG,QAAQ,CAAC5F,gBAAgB,CAAC,KAAK,CAAC,CAAC;UACvC;QACF;QAEAO,UAAU,CAAC,IAAI,EAAE,kCAAkCkG,QAAQ,CAACtD,YAAY,GAAG,CAAC;QAC5EpE,wBAAwB,CAAC0H,QAAQ,CAAC;QAElC,IAAI1E,MAAM,EAAE;UACVxC,KAAK,CAACqG,QAAQ,CAAClG,SAAS,CAACqC,MAAM,CAAC,CAAC;QACnC;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA,IAAI8E,eAAe,GAAGJ,QAAQ,CAAC3D,YAAY;QAC3C,IAAIf,MAAM,EAAEW,aAAa,EAAEC,OAAO,IAAI,CAACZ,MAAM,EAAE2B,QAAQ,EAAEf,OAAO,EAAE;UAChE,MAAMC,OAAO,GAAG,MAAMpE,wBAAwB,CAAC;YAAEqE,KAAK,EAAE;UAAK,CAAC,CAAC;UAC/D,IAAIuC,SAAS,EAAE;YAAC;UAAO;UACvB,IAAIxC,OAAO,EAAEE,YAAY,EAAE;YACzB+D,eAAe,GAAGjE,OAAO,CAACE,YAAY;UACxC;QACF;;QAEA;QACA;QACA;QACA;QACA;QACA,MAAMgE,gBAAgB,GAAG1H,oBAAoB,CAAC,CAAC,CAACuC,KAAK,CAAC,MAAM6E,SAAS,CAAC;QAEtE,MAAMO,CAAC,GAAG,MAAM/C,gBAAgB,CAC9ByC,QAAQ,CAACtD,YAAY,EACrB0D,eAAe,EACf9E,MAAM,EAAEkC,YACV,CAAC;QACD,IAAImB,SAAS,EAAE;UAAC;QAAO;QACvB7E,UAAU,CAAC,IAAI,EAAE,sDAAsD,CAAC;QAExE,MAAMwG,CAAC,CAACpC,aAAa,CAAC,CAAC;QACvB,IAAIS,SAAS,EAAE;UAAC;QAAO;QACvB7E,UAAU,CAAC,MAAM,EAAE,6BAA6B,CAAC;QAEjD,IAAI;UACF,MAAMwG,CAAC,CAACC,cAAc,CAAC,CAAC;UACxBzG,UAAU,CAAC,MAAM,EAAE,mCAAmC,CAAC;QACzD,CAAC,CAAC,OAAOqB,CAAC,EAAE;UACVrB,UAAU,CAAC,MAAM,EAAE,uCAAuC,EAAEqB,CAAC,CAAC;QAChE;QACA,IAAI;UACF,MAAMmF,CAAC,CAAC9B,iCAAiC,CAAC,CAAC;UAC3C1E,UAAU,CAAC,MAAM,EAAE,iCAAiC,CAAC;QACvD,CAAC,CAAC,OAAOqB,CAAC,EAAE;UACVrB,UAAU,CAAC,MAAM,EAAE,qCAAqC,EAAEqB,CAAC,CAAC;QAC9D;QACA;QACA;QACA;QACA,IAAI;UACF,MAAMkF,gBAAgB;QACxB,CAAC,CAAC,MAAM,CAAC;QACT,IAAI;UACF,MAAMG,SAAS,GAAG/F,MAAM,CAACC,IAAI,CAAC5B,KAAK,CAAC6B,QAAQ,CAAC,CAAC,CAACH,KAAK,CAACA,KAAK,IAAI,CAAC,CAAC,CAAC,CAACI,MAAM;UACxEd,UAAU,CAAC,MAAM,EAAE,2BAA2B0G,SAAS,sBAAsB,CAAC;UAC9E,MAAM5H,gBAAgB,CAAE0H,CAAC,CAAShG,MAAM,CAAC;UACzCR,UAAU,CAAC,MAAM,EAAE,qCAAqC,CAAC;QAC3D,CAAC,CAAC,OAAOqB,CAAC,EAAE;UACVrB,UAAU,CAAC,MAAM,EAAE,yCAAyC,EAAEqB,CAAC,CAAC;QAClE;QACAd,wBAAwB,CAAEiG,CAAC,CAAShG,MAAM,EAAE,gBAAgB,CAAC;QAE7DxB,KAAK,CAACqG,QAAQ,CAACnG,cAAc,CAACsH,CAAC,CAAC,CAAC;QACjCxE,wBAAwB,CAAC8B,OAAO,GAAGF,GAAG;QACtC3B,uBAAuB,CAAC6B,OAAO,GAAG,EAAE;QACpCmB,YAAY,GAAG,IAAI;QACnBK,WAAW,CAAC,CAAC;QACb1D,0BAA0B,CAAC,OAAO,CAAC;QACnC5B,UAAU,CAAC,IAAI,EAAE,uBAAuB,CAAC;;QAEzC;QACA,MAAM2G,GAAG,GAAGnF,MAAM,EAAEoF,UAAU;QAC9B,MAAMC,aAAa,GAAG7H,KAAK,CAAC6B,QAAQ,CAAC,CAAC,CAACH,KAAK,CAACmG,aAAa,IAAI,IAAI;QAClE,MAAMC,eAAe,GAClBtF,MAAM,EAAEuF,YAAY,EAAYC,GAAG,CAAEC,CAAC,IACrC,OAAOA,CAAC,KAAK,QAAQ,GAAGA,CAAC,GAAGA,CAAC,EAAEjG,GACjC,CAAC,CAACkG,MAAM,CAACC,OAAO,CAAC,IAAI,EAAE;QACzBxH,0BAA0B,CAAC;UACzBa,MAAM,EAAEgG,CAAC;UACTL,MAAM,EAAExB,eAAe,CAACwB,MAAM;UAC9BiB,eAAe,EAAEP,aAAa;UAC9BC,eAAe;UACfO,WAAW,EAAEV,GAAG,EAAEW,wBAAwB;UAC1CC,QAAQ,EAAEZ,GAAG,EAAEa,0BAA0B;UACzCC,SAAS,EAAEd,GAAG,EAAEe;QAClB,CAAC,CAAC,CAACtG,KAAK,CAAE6B,GAAG,IAAKoB,OAAO,CAACsD,IAAI,CAAC,kCAAkC,EAAE1E,GAAG,CAAC,CAAC;MAC1E,CAAC,CAAC,OAAOqB,KAAU,EAAE;QACnB,IAAIO,SAAS,IAAIF,eAAe,CAACwB,MAAM,CAACyB,OAAO,EAAE;UAAC;QAAO;QACzD7C,gBAAgB,IAAI,CAAC;QACrB;QACA;QACA;QACA;QACA;QACA,IAAIA,gBAAgB,GAAGD,sBAAsB,EAAE;UAC7C,MAAM+C,OAAO,GAAGC,IAAI,CAACC,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,KAAKhD,gBAAgB,GAAG,CAAC,CAAC,CAAC;UAClE/E,UAAU,CACR,IAAI,EACJ,2BAA2B+E,gBAAgB,YAAYT,KAAK,EAAE0D,OAAO,kBAAkBH,OAAO,IAChG,CAAC;UACD5F,uBAAuB,CAAC6B,OAAO,GAAG,EAAE;UACpCqB,UAAU,CAAC,MAAM;YACf,IAAI,CAACN,SAAS,IAAI,CAACF,eAAe,CAACwB,MAAM,CAACyB,OAAO,EAAE;cACjDpC,GAAG,CAAC,CAAC;YACP;UACF,CAAC,EAAEqC,OAAO,CAAC;UACX;QACF;QACA7H,UAAU,CAAC,OAAO,EAAE,6CAA6C,EAAE;UACjEgI,OAAO,EAAE1D,KAAK,EAAE0D,OAAO;UACvBC,MAAM,EAAE3D,KAAK,EAAE4D,QAAQ,EAAED,MAAM;UAC/BE,IAAI,EAAE7D,KAAK,EAAE4D,QAAQ,EAAEC;QACzB,CAAC,CAAC;QACFlG,uBAAuB,CAAC6B,OAAO,GAAG,EAAE;QACpCwB,WAAW,CAAC,CAAC;QACbtG,KAAK,CAACqG,QAAQ,CAAC5F,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACvCmC,0BAA0B,CAAC,QAAQ,CAAC;MACtC;IACF,CAAC;IAED4D,GAAG,CAAC,CAAC;IAEL,OAAO,MAAM;MACXX,SAAS,GAAG,IAAI;MAChBS,WAAW,CAAC,CAAC;MACbX,eAAe,CAACS,KAAK,CAAC,CAAC;MACvB;MACA;MACA;MACA;MACA;MACAnD,uBAAuB,CAAC6B,OAAO,GAAG,EAAE;IACtC,CAAC;IACD;IACA;IACA;IACA;IACA;IACA;IACA;EACF,CAAC,EAAE,CACDtC,MAAM,EAAEM,cAAc,EACtBN,MAAM,EAAEkE,KAAK,EACblE,MAAM,EAAEmE,OAAO,EACfnE,MAAM,EAAE6B,SAAS,EAAEjB,OAAO,EAC1BZ,MAAM,EAAE6B,SAAS,EAAEX,IAAI,EAAEG,aAAa,EAAEC,aAAa,EACrDtB,MAAM,EAAE6B,SAAS,EAAEX,IAAI,EAAEE,YAAY,EACrCpB,MAAM,EAAE6B,SAAS,EAAEX,IAAI,EAAEU,KAAK,EAC9B5B,MAAM,EAAE2B,QAAQ,EAAEf,OAAO,EACzBZ,MAAM,EAAE2B,QAAQ,EAAEC,KAAK,EACvB5B,MAAM,EAAEkC,YAAY,EAAEkC,SAAS,CAChC,CAAC;;EAEF;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACApI,SAAS,CAAC,MAAM;IACd,IAAI,CAACgD,MAAM,EAAE;MAAC;IAAO;IACrB,MAAM4H,EAAE,GAAGC,WAAW,CAAC,MAAM;MAC3B;MACA;MACA;MACA;MACA;MACA;MACA,IAAIzK,QAAQ,CAAC0K,YAAY,KAAK,YAAY,EAAE;QAAC;MAAO;MACpD,IAAI9H,MAAM,CAAC+H,iBAAiB,EAAE;QAAC;MAAO;MACtC,IAAI/H,MAAM,CAACyH,MAAM,KAAK,QAAQ,EAAE;QAC9BjI,UAAU,CAAC,IAAI,EAAE,oBAAoBQ,MAAM,CAACyH,MAAM,mBAAmB,CAAC;QACtEzH,MAAM,CAACgI,cAAc,CAAC,CAAC;MACzB,CAAC,MAAM;QACLhI,MAAM,CAACiI,iBAAiB,GAAG,CAAC;MAC9B;IACF,CAAC,EAAE,KAAK,CAAC;IACT,OAAO,MAAMC,aAAa,CAACN,EAAE,CAAC;EAChC,CAAC,EAAE,CAAC5H,MAAM,CAAC,CAAC;;EAEZ;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACAhD,SAAS,CAAC,MAAM;IACd;IACA;IACA;IACA,IAAImL,uBAAsC,GAAG,IAAI;IACjD,MAAMC,mBAAmB,GAAG,CAACpH,MAAM,EAAEkC,YAAY,EAAEmF,qBAAqB;IACxE,MAAMC,GAAG,GAAGlL,QAAQ,CAACmL,gBAAgB,CAAC,QAAQ,EAAGC,IAAI,IAAK;MACxD,MAAMxC,CAAC,GAAGhG,MAAM;MAChB,IAAIwI,IAAI,KAAK,QAAQ,EAAE;QACrB,IAAIxC,CAAC,EAAEyC,WAAW,EAAE;UAClBjJ,UAAU,CAAC,IAAI,EAAE,iDAAiD,CAAC;UACnEwG,CAAC,CAAC0C,MAAM,CAAC,CAAC;QACZ;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA,IAAI1C,CAAC,KAAKA,CAAC,CAACyB,MAAM,KAAK,SAAS,IAAIzB,CAAC,CAACyB,MAAM,KAAK,OAAO,CAAC,EAAE;UACzDjI,UAAU,CAAC,IAAI,EAAE,2BAA2BwG,CAAC,CAACyB,MAAM,mBAAmB,CAAC;UACxEzB,CAAC,CAACgC,cAAc,CAAC,CAAC;QACpB;QACA;QACA;QACA;QACA;QACA,IAAIG,uBAAuB,EAAE;UAC3B3J,KAAK,CAACqG,QAAQ,CAAChG,cAAc,CAAC;YAAE8J,OAAO,EAAER;UAAwB,CAAC,CAAC,CAAC;UACpEA,uBAAuB,GAAG,IAAI;QAChC;QACA;MACF;MACA;MACA,IAAI,CAACnC,CAAC,EAAE;QAAC;MAAO;MAChB,IAAIwC,IAAI,KAAK,YAAY,IAAIJ,mBAAmB,EAAE;QAChDpC,CAAC,CAAC4C,OAAO,CAAC,CAAC,CAAChI,KAAK,CAAC,MAAM6E,SAAS,CAAC;MACpC;MACA,MAAMoD,KAAK,GAAGrK,KAAK,CAAC6B,QAAQ,CAAC,CAAC;MAC9B,MAAMH,KAAK,GAAG2I,KAAK,CAAC3I,KAAK,EAAEA,KAAK;MAChC,MAAM4I,cAAc,GAAGD,KAAK,CAAC3I,KAAK,EAAE4I,cAAc,IAAI,IAAI;MAC1D;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACAX,uBAAuB,GAAGW,cAAc;MACxC,IAAIA,cAAc,EAAE;QAClB,MAAMC,MAAM,GAAG7J,sBAAsB,CACnCgB,KAAK,GAAG4I,cAAc,CAAC,EACvBD,KAAK,CAACG,aACR,CAAC;QACD;QACA;QACA;QACA;QACA,IAAID,MAAM,GAAG,CAAC,EAAE;UACdvK,KAAK,CAACqG,QAAQ,CACZ9F,sBAAsB,CAAC;YAAEkK,OAAO,EAAEH,cAAc;YAAEI,SAAS,EAAEH;UAAO,CAAC,CACvE,CAAC;QACH;QACA;QACA;QACA;QACAvK,KAAK,CAACqG,QAAQ,CACZ7F,iBAAiB,CAAC;UAAE2J,OAAO,EAAEG,cAAc;UAAEK,SAAS,EAAE;QAAgB,CAAC,CAC3E,CAAC;QACD3K,KAAK,CAACqG,QAAQ,CAAC/F,gBAAgB,CAAC,CAAC,CAAC;MACpC;MACA;MACA;MACAkH,CAAC,CAACoD,mCAAmC,CAAClJ,KAAK,EAAE;QAAE4I;MAAe,CAAC,CAAC,CAAClI,KAAK,CACpE,MAAM,CAAC,CACT,CAAC;IACH,CAAC,CAAC;IACF,OAAO,MAAM0H,GAAG,CAAC9C,MAAM,CAAC,CAAC;EAC3B,CAAC,EAAE,CAACxF,MAAM,EAAEgB,MAAM,EAAEkC,YAAY,EAAEmF,qBAAqB,CAAC,CAAC;;EAEzD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,MAAMgB,iBAAiB,GAAGnM,MAAM,CAAC,KAAK,CAAC;EACvCF,SAAS,CAAC,MAAM;IACd,IAAI,OAAOiE,SAAS,KAAK,SAAS,EAAE;MAAC;IAAO;IAC5C,MAAM4H,KAAK,GAAGrK,KAAK,CAAC6B,QAAQ,CAAC,CAAC;IAC9B,MAAMH,KAAK,GAAG2I,KAAK,CAAC3I,KAAK,EAAEA,KAAK;IAChC,MAAMmG,aAAa,GAAGwC,KAAK,CAAC3I,KAAK,EAAEmG,aAAa,IAAI,IAAI;IACxD,MAAMiD,UAAU,GAAGD,iBAAiB,CAAC/F,OAAO;IAC5C+F,iBAAiB,CAAC/F,OAAO,GAAGrC,SAAS;IACrC,IAAIA,SAAS,EAAE;MACb,IAAIoF,aAAa,EAAE;QACjB7H,KAAK,CAACqG,QAAQ,CAAChG,cAAc,CAAC;UAAE8J,OAAO,EAAEtC;QAAc,CAAC,CAAC,CAAC;MAC5D;IACF,CAAC,MAAM;MACL,IAAIiD,UAAU,IAAIjD,aAAa,EAAE;QAC/B;QACA;QACA;QACA,MAAM0C,MAAM,GAAG7J,sBAAsB,CACnCgB,KAAK,GAAGmG,aAAa,CAAC,EACtBwC,KAAK,CAACG,aACR,CAAC;QACD,IAAID,MAAM,GAAG,CAAC,EAAE;UACdvK,KAAK,CAACqG,QAAQ,CACZ9F,sBAAsB,CAAC;YAAEkK,OAAO,EAAE5C,aAAa;YAAE6C,SAAS,EAAEH;UAAO,CAAC,CACtE,CAAC;QACH;QACA;QACA;QACAvK,KAAK,CAACqG,QAAQ,CACZ7F,iBAAiB,CAAC;UAAE2J,OAAO,EAAEtC,aAAa;UAAE8C,SAAS,EAAE;QAAgB,CAAC,CAC1E,CAAC;MACH;MAEA3K,KAAK,CAACqG,QAAQ,CAAC/F,gBAAgB,CAAC,CAAC,CAAC;MAClC,IAAIwK,UAAU,IAAItJ,MAAM,EAAEoJ,mCAAmC,EAAE;QAC7DpJ,MAAM,CACHoJ,mCAAmC,CAAClJ,KAAK,EAAE;UAAE4I,cAAc,EAAEzC;QAAc,CAAC,CAAC,CAC7EzF,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;MACpB;IACF;EACF,CAAC,EAAE,CAACK,SAAS,EAAEjB,MAAM,CAAC,CAAC;EAEvBhD,SAAS,CAAC,MAAM;IACd,IAAIiE,SAAS,KAAK,IAAI,EAAE;MAAC;IAAO;IAChC,IAAIsI,eAAoB,GAAG,IAAI;IAC/B,IAAIC,aAAa,GAAG,CAAC;IACrB,IAAIC,UAAgD,GAAG,IAAI;IAE3D,MAAMC,OAAO,GAAGA,CAAA,KAAM;MACpB,MAAMC,CAAC,GAAGnL,KAAK,CAAC6B,QAAQ,CAAC,CAAC;MAC1B,MAAMG,GAAG,GAAGmJ,CAAC,CAACzJ,KAAK,EAAEmG,aAAa;MAClC,IAAI,CAAC7F,GAAG,EAAE;QAAC;MAAO;MAClB,MAAMoJ,IAAI,GAAGD,CAAC,CAACzJ,KAAK,EAAEA,KAAK,GAAGM,GAAG,CAAC;MAClC,IAAI,CAACoJ,IAAI,EAAE;QAAC;MAAO;MACnB,IAAIA,IAAI,CAACC,QAAQ,KAAKN,eAAe,EAAE;QAAC;MAAO;MAC/CA,eAAe,GAAGK,IAAI,CAACC,QAAQ;;MAE/B;MACA;MACA;MACA;MACA;MACA;MACA,MAAMC,MAAM,GAAG5K,sBAAsB,CAAC0K,IAAI,EAAED,CAAC,CAACX,aAAa,CAAC;MAC5D,IAAI,CAACc,MAAM,IAAIA,MAAM,IAAIN,aAAa,EAAE;QAAC;MAAO;MAChDA,aAAa,GAAGM,MAAM;MAEtBtL,KAAK,CAACqG,QAAQ,CACZ9F,sBAAsB,CAAC;QAAEkK,OAAO,EAAEzI,GAAG;QAAE0I,SAAS,EAAEY;MAAO,CAAC,CAC5D,CAAC;MAED,IAAIL,UAAU,EAAE;QAAC1E,YAAY,CAAC0E,UAAU,CAAC;MAAC;MAC1C,IAAIzJ,MAAM,EAAEoJ,mCAAmC,EAAE;QAC/CK,UAAU,GAAG9E,UAAU,CAAC,MAAM;UAC5B3E,MAAM,CACHoJ,mCAAmC,CAAC5K,KAAK,CAAC6B,QAAQ,CAAC,CAAC,CAACH,KAAK,EAAEA,KAAK,EAAE;YAClE4I,cAAc,EAAEtI;UAClB,CAAC,CAAC,CACDI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;QACpB,CAAC,EAAE,IAAI,CAAC;MACV;IACF,CAAC;IAED8I,OAAO,CAAC,CAAC;IACT,MAAMK,KAAK,GAAGvL,KAAK,CAACwL,SAAS,CAACN,OAAO,CAAC;IACtC,OAAO,MAAM;MACXK,KAAK,CAAC,CAAC;MACP,IAAIN,UAAU,EAAE;QAAC1E,YAAY,CAAC0E,UAAU,CAAC;MAAC;IAC5C,CAAC;EACH,CAAC,EAAE,CAACxI,SAAS,EAAEjB,MAAM,CAAC,CAAC;;EAEvB;EACA;EACA;EACA;EACA;EACA;EACA;EACAhD,SAAS,CAAC,MAAM;IACd,IAAI,CAACgD,MAAM,EAAE;MAAC;IAAO;IACrB,MAAM+J,KAAK,GAAGzM,OAAO,CAACiL,gBAAgB,CAAEM,KAAK,IAAK;MAChD;MACA,MAAMoB,SAAS,GACb,CAAC,CAACpB,KAAK,EAAEqB,WAAW,IAAIrB,KAAK,EAAEsB,mBAAmB,KAAK,KAAK;MAC9D,IAAI,CAACF,SAAS,EAAE;QAAC;MAAO;MACxB;MACA;MACA;MACA;MACA;MACA;MACA,IAAIjK,MAAM,CAACyH,MAAM,KAAK,SAAS,IAAIzH,MAAM,CAACyH,MAAM,KAAK,OAAO,EAAE;QAC5DjI,UAAU,CAAC,IAAI,EAAE,+BAA+BQ,MAAM,CAACyH,MAAM,mBAAmB,CAAC;QACjFzH,MAAM,CAACgI,cAAc,CAAC,CAAC;MACzB,CAAC,MAAM,IAAIhI,MAAM,CAACyH,MAAM,KAAK,QAAQ,EAAE;QACrCzH,MAAM,CAACiI,iBAAiB,GAAG,CAAC;MAC9B;IACF,CAAC,CAAC;IACF,OAAO,MAAM8B,KAAK,CAAC,CAAC;EACtB,CAAC,EAAE,CAAC/J,MAAM,CAAC,CAAC;;EAEZ;EACA;EACA;EACA;EACA;EACAhD,SAAS,CAAC,MAAM;IACd,MAAMsL,GAAG,GAAGjL,kBAAkB,CAAC+M,WAAW,CAAC,uBAAuB,EAAE,MAAM;MACxE5I,wBAAwB,CAAC8B,OAAO,GAAG,EAAE;MACrC7B,uBAAuB,CAAC6B,OAAO,GAAG,EAAE;MACpClC,0BAA0B,CAAC,MAAM,CAAC;IACpC,CAAC,CAAC;IACF,OAAO,MAAMkH,GAAG,CAAC9C,MAAM,CAAC,CAAC;EAC3B,CAAC,EAAE,EAAE,CAAC;;EAEN;EACA;EACA;EACAxI,SAAS,CAAC,MAAM;IACd,MAAMsL,GAAG,GAAGjL,kBAAkB,CAAC+M,WAAW,CAACtK,YAAY,EAAE,YAAY;MACnE,IAAI;QACF,IAAIE,MAAM,EAAE;UACV,MAAMA,MAAM,CAACqK,UAAU,CAAC;YAAEtC,iBAAiB,EAAE;UAAK,CAAC,CAAC;QACtD;MACF,CAAC,CAAC,OAAOlH,CAAC,EAAE;QACVgD,OAAO,CAACsD,IAAI,CAAC,0BAA0B,EAAEtG,CAAC,CAAC;MAC7C;MACA/C,mBAAmB,CAAC,IAAI,CAAC;MACzBoD,SAAS,CAAC,IAAI,CAAC;MACfM,wBAAwB,CAAC8B,OAAO,GAAG,EAAE;MACrC7B,uBAAuB,CAAC6B,OAAO,GAAG,EAAE;MACpClC,0BAA0B,CAAC,MAAM,CAAC;MAClC,MAAM9B,mBAAmB,CAAC,CAAC;IAC7B,CAAC,CAAC;IACF,OAAO,MAAMgJ,GAAG,CAAC9C,MAAM,CAAC,CAAC;EAC3B,CAAC,EAAE,CAACxF,MAAM,CAAC,CAAC;EAEZ,oBACEJ,KAAA,CAACC,WAAW,CAACyK,QAAQ;IACnBC,KAAK,EAAE;MACLvK,MAAM;MACNmB,uBAAuB;MACvBE,QAAQ;MACR4B,gBAAgB;MAChB/B;IACF,CAAE;IAAAH,QAAA,GAEDA,QAAQ,eAMTrB,IAAA,CAACnC,gBAAgB,IAAE,CAAC;EAAA,CACA,CAAC;AAE3B,CAAC;AAED,OAAO,MAAMiN,aAAa,GAAGA,CAAA,KAAM;EACjC,MAAMC,OAAO,GAAG1N,UAAU,CAAC8C,WAAW,CAAC;EACvC,IAAI,CAAC4K,OAAO,EAAE;IACZ,MAAM,IAAIC,KAAK,CAAC,mDAAmD,CAAC;EACtE;EACA,IAAI,CAACD,OAAO,CAACzK,MAAM,EAAE;IACnB,MAAM2K,UAAgD,GAAG,CACvDhN,mBAAmB,CAAC,CAAC,EACrBa,KAAK,CAAC6B,QAAQ,CAAC,CAAC,EAAE4B,gBAAgB,EAAEjC,MAAM,CAC3C;IACD,MAAM4K,IAAI,GAAGD,UAAU,CAACE,IAAI,CACzB7E,CAAC,IAAKA,CAAC,IAAKA,CAAC,CAASyB,MAAM,KAAK,QACpC,CAAC;IACD,IAAImD,IAAI,EAAE;MACR,OAAO;QAAE,GAAGH,OAAO;QAAEzK,MAAM,EAAE4K;MAAK,CAAC;IACrC;EACF;EACA,OAAOH,OAAO;AAChB,CAAC;;AAED;AACA,OAAO,SAASK,cAAcA,CAAA,EAAG;EAC/BzN,kBAAkB,CAAC0N,IAAI,CAACjL,YAAY,CAAC;AACvC","ignoreList":[]}
@@ -82,6 +82,24 @@ export const createMessageFromXml = async (arg, bodyEl, positionalId, positional
82
82
  const fullName = (merged.fullName || '').toString().trim();
83
83
  const senderJID = (merged.senderJID || '').toString();
84
84
  const senderLocal = senderJID.includes('@') ? senderJID.split('@')[0] : senderJID;
85
+
86
+ // Bug #41 root cause: the resource of the MUC `from` (room@conference/
87
+ // occupant-id) is the SAME field getDataFromXml uses to derive
88
+ // `user.id` for live messages and for the wrapped MAM convention
89
+ // (getHistory.xmpp.ts) - it's stamped by the server itself when the
90
+ // sender joined the room, so it's always present and always correct.
91
+ // The positional convention (onMessageHistory's MAM catch-up path)
92
+ // never called getDataFromXml, so it fell back to splitting the
93
+ // sender-supplied `<data senderJID>` attr on '@' instead - usually the
94
+ // same value, but WRONG (picks up the room's own id, not the
95
+ // sender's) whenever senderJID is absent from the stanza, and simply a
96
+ // different derivation than the live path even when it happens to
97
+ // agree. Prefer the resource-of-`from` here too so every path that
98
+ // reaches this function resolves the same sender identity the same
99
+ // way, instead of MAM catch-up rows needing a later correction once
100
+ // the "official" fetch lands.
101
+ const xmppFrom = (merged.xmppFrom || '').toString();
102
+ const fromResource = xmppFrom.includes('/') ? xmppFrom.split('/')[1] : '';
85
103
  const composed = [firstName, lastName].filter(Boolean).join(' ').trim();
86
104
  const existingName = String(merged?.user?.name || '').trim();
87
105
  const resolvedName = existingName || composed || fullName || senderLocal || merged?.user?.id || '';
@@ -89,7 +107,7 @@ export const createMessageFromXml = async (arg, bodyEl, positionalId, positional
89
107
  ...merged,
90
108
  user: {
91
109
  ...(merged.user || {}),
92
- id: merged?.user?.id || senderLocal,
110
+ id: merged?.user?.id || fromResource || senderLocal,
93
111
  name: resolvedName,
94
112
  firstName: firstName || merged?.user?.firstName,
95
113
  lastName: lastName || merged?.user?.lastName
@@ -1 +1 @@
1
- {"version":3,"names":["createMessageFromXml","arg","bodyEl","positionalId","positionalFrom","positionalDeleted","console","log","id","body","date","user","name","roomJid","isPositional","undefined","inner","outerExtras","bodyText","getText","text","split","xmppFrom","deleted","data","merged","isDeleted","numericPart","exec","String","Date","slice","toISOString","now","firstName","senderFirstName","toString","trim","lastName","senderLastName","fullName","senderJID","senderLocal","includes","composed","filter","Boolean","join","existingName","resolvedName","message"],"sourceRoot":"../../../src","sources":["helpers/createMessageFromXml.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["createMessageFromXml","arg","bodyEl","positionalId","positionalFrom","positionalDeleted","console","log","id","body","date","user","name","roomJid","isPositional","undefined","inner","outerExtras","bodyText","getText","text","split","xmppFrom","deleted","data","merged","isDeleted","numericPart","exec","String","Date","slice","toISOString","now","firstName","senderFirstName","toString","trim","lastName","senderLastName","fullName","senderJID","senderLocal","includes","fromResource","composed","filter","Boolean","join","existingName","resolvedName","message"],"sourceRoot":"../../../src","sources":["helpers/createMessageFromXml.ts"],"mappings":"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","ignoreList":[]}
@@ -0,0 +1,73 @@
1
+ "use strict";
2
+
3
+ import { ensureFilenameHasExtension, filenameFromUrl } from './mimeToExtension';
4
+ /**
5
+ * Picks the best human-readable filename for a chat attachment - the
6
+ * single source of truth for every place a file name is rendered in the
7
+ * UI, saved to disk, shared, or downloaded.
8
+ *
9
+ * Priority: `originalName` (the sender's own file name, e.g. "test1.pdf")
10
+ * beats `fileName` (the server's stored/hashed name, e.g.
11
+ * "3f9a1c...c2.pdf") beats the last path segment of `location`. The
12
+ * stored hash name is only a fallback of last resort.
13
+ *
14
+ * Bug #40: display and save/share/download logic used to prefer the
15
+ * stored hash name over the original one, so an attachment sent as
16
+ * "test1.pdf" showed up (and got saved to the phone) as something like
17
+ * "3f9a1c...c2.pdf" - both directions (web -> RN and RN -> RN).
18
+ *
19
+ * Always returns a non-empty string with a valid extension: if the
20
+ * chosen candidate has no extension (a hash name can be `<hex>` with no
21
+ * extension at all, or `<hex>.<ext>`), one is appended from `mimetype`
22
+ * (or `.bin` as a last resort when the mime is unknown/missing too).
23
+ */
24
+ export function getDisplayFileName(options) {
25
+ const candidate = options.originalName && options.originalName.trim() || options.fileName && options.fileName.trim() || filenameFromUrl(options.location) || '';
26
+ return ensureFilenameHasExtension(candidate, options.mimetype);
27
+ }
28
+
29
+ /**
30
+ * Makes a display name safe to use as an actual path segment when
31
+ * saving/sharing a file to the device: strips path separators (so an
32
+ * odd/hostile server-provided name can't escape the target directory)
33
+ * and control characters. Keeps the rest of the name - including the
34
+ * extension - intact.
35
+ */
36
+ export function sanitizeFileNameForPath(name) {
37
+ const cleaned = (name || '').replace(/[\/\\]/g, '_')
38
+ // eslint-disable-next-line no-control-regex
39
+ .replace(/[\x00-\x1f\x7f]/g, '').trim();
40
+ return cleaned || 'file';
41
+ }
42
+
43
+ /**
44
+ * Resolves a filename that is safe to write into a target directory:
45
+ * sanitizes it, then - if `exists` reports a collision - inserts
46
+ * " (1)", " (2)", ... before the extension until a free name is found,
47
+ * so saving two different attachments that share a display name never
48
+ * silently overwrites the first one.
49
+ *
50
+ * `exists` is injected so callers can back it with whatever existence
51
+ * check makes sense for their storage API (expo-file-system,
52
+ * StorageAccessFramework directory listing, ...) - this function stays
53
+ * pure and easy to unit test.
54
+ */
55
+ export async function getUniqueFileName(name, exists) {
56
+ const safeName = sanitizeFileNameForPath(name);
57
+ if (!(await exists(safeName))) {
58
+ return safeName;
59
+ }
60
+ const dotIndex = safeName.lastIndexOf('.');
61
+ const base = dotIndex > 0 ? safeName.slice(0, dotIndex) : safeName;
62
+ const ext = dotIndex > 0 ? safeName.slice(dotIndex) : '';
63
+ // 999 collisions is already a pathological case; fall back to a
64
+ // timestamp suffix rather than looping forever.
65
+ for (let i = 1; i < 1000; i += 1) {
66
+ const candidate = `${base} (${i})${ext}`;
67
+ if (!(await exists(candidate))) {
68
+ return candidate;
69
+ }
70
+ }
71
+ return `${base} (${Date.now()})${ext}`;
72
+ }
73
+ //# sourceMappingURL=getDisplayFileName.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"names":["ensureFilenameHasExtension","filenameFromUrl","getDisplayFileName","options","candidate","originalName","trim","fileName","location","mimetype","sanitizeFileNameForPath","name","cleaned","replace","getUniqueFileName","exists","safeName","dotIndex","lastIndexOf","base","slice","ext","i","Date","now"],"sourceRoot":"../../../src","sources":["helpers/getDisplayFileName.ts"],"mappings":";;AAAA,SAASA,0BAA0B,EAAEC,eAAe,QAAQ,mBAAmB;AAS/E;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,kBAAkBA,CAACC,OAA+B,EAAU;EAC1E,MAAMC,SAAS,GACZD,OAAO,CAACE,YAAY,IAAIF,OAAO,CAACE,YAAY,CAACC,IAAI,CAAC,CAAC,IACnDH,OAAO,CAACI,QAAQ,IAAIJ,OAAO,CAACI,QAAQ,CAACD,IAAI,CAAC,CAAE,IAC7CL,eAAe,CAACE,OAAO,CAACK,QAAQ,CAAC,IACjC,EAAE;EACJ,OAAOR,0BAA0B,CAACI,SAAS,EAAED,OAAO,CAACM,QAAQ,CAAC;AAChE;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,uBAAuBA,CAACC,IAAY,EAAU;EAC5D,MAAMC,OAAO,GAAG,CAACD,IAAI,IAAI,EAAE,EACxBE,OAAO,CAAC,SAAS,EAAE,GAAG;EACvB;EAAA,CACCA,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAC/BP,IAAI,CAAC,CAAC;EACT,OAAOM,OAAO,IAAI,MAAM;AAC1B;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,eAAeE,iBAAiBA,CACrCH,IAAY,EACZI,MAAmD,EAClC;EACjB,MAAMC,QAAQ,GAAGN,uBAAuB,CAACC,IAAI,CAAC;EAC9C,IAAI,EAAE,MAAMI,MAAM,CAACC,QAAQ,CAAC,CAAC,EAAE;IAC7B,OAAOA,QAAQ;EACjB;EACA,MAAMC,QAAQ,GAAGD,QAAQ,CAACE,WAAW,CAAC,GAAG,CAAC;EAC1C,MAAMC,IAAI,GAAGF,QAAQ,GAAG,CAAC,GAAGD,QAAQ,CAACI,KAAK,CAAC,CAAC,EAAEH,QAAQ,CAAC,GAAGD,QAAQ;EAClE,MAAMK,GAAG,GAAGJ,QAAQ,GAAG,CAAC,GAAGD,QAAQ,CAACI,KAAK,CAACH,QAAQ,CAAC,GAAG,EAAE;EACxD;EACA;EACA,KAAK,IAAIK,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAG,IAAI,EAAEA,CAAC,IAAI,CAAC,EAAE;IAChC,MAAMlB,SAAS,GAAG,GAAGe,IAAI,KAAKG,CAAC,IAAID,GAAG,EAAE;IACxC,IAAI,EAAE,MAAMN,MAAM,CAACX,SAAS,CAAC,CAAC,EAAE;MAC9B,OAAOA,SAAS;IAClB;EACF;EACA,OAAO,GAAGe,IAAI,KAAKI,IAAI,CAACC,GAAG,CAAC,CAAC,IAAIH,GAAG,EAAE;AACxC","ignoreList":[]}
@@ -0,0 +1,120 @@
1
+ "use strict";
2
+
3
+ import { msgSortableMs } from '../roomStore/roomsSlice';
4
+
5
+ // A stored/stamped read marker more than this far past the newest
6
+ // message we actually know about for a room is not "the user is a
7
+ // little ahead" - it's a leftover from a device whose clock was wrong
8
+ // when it stamped the marker (bug #38). Generous on purpose: this value
9
+ // only controls when we're willing to treat an existing marker as
10
+ // corrupt and self-heal it, never how far off a legitimate new write can
11
+ // be, so a false positive here just means a bad value survives one extra
12
+ // cycle, not that a good value gets rejected.
13
+ export const FUTURE_READ_MARKER_TOLERANCE_MS = 5 * 60 * 1000;
14
+ /**
15
+ * Resolve the "read up to here" marker for `room` using SERVER time,
16
+ * never the device clock.
17
+ *
18
+ * Bug #38: if the device clock is ahead when the user leaves a room, a
19
+ * `Date.now()` read marker lands in the future. The private-store merge
20
+ * (flushLastViewedToPrivateStore.ts) is forward-only ("if (prevNum >=
21
+ * ts) continue"), so once a future marker is written, no later
22
+ * *correct* write can ever replace it - the room's unread count is
23
+ * stuck wrong forever, on every device, from that point on. Anchoring
24
+ * to the newest SERVER-acknowledged message's own timestamp instead
25
+ * means the marker we write can never be ahead of what the server
26
+ * itself has recorded for the room.
27
+ *
28
+ * "Server-acknowledged" excludes:
29
+ * - a message still marked `pending` (the optimistic bubble shown
30
+ * while a send is in flight - it carries the DEVICE send time via
31
+ * `date`, not a server timestamp, until the server echoes it back
32
+ * and insertMessageWithDelimiter flips `pending` off);
33
+ * - a message id present in `heapState.messageHeap` (queued retry -
34
+ * used for offline media sends, see roomHeapSlice.ts) or
35
+ * `heapState.failedMessages` (a send that never reached the server
36
+ * at all).
37
+ *
38
+ * `msgSortableMs` (roomsSlice.ts) reads the server-assigned microsecond
39
+ * timestamp encoded in the first 13 digits of the message id - the same
40
+ * source already used for message ordering and unread counting - so
41
+ * this stays consistent with the rest of the read/unread pipeline.
42
+ *
43
+ * Falls back to the room's existing `lastViewedTimestamp` (so leaving
44
+ * an empty or never-scrolled room doesn't regress the marker), then to
45
+ * `0` when there's truly nothing to anchor to yet (a brand new room
46
+ * with no history and no prior marker). Callers should treat `0` as
47
+ * "skip the write" rather than substituting a device-clock guess.
48
+ */
49
+ export function getServerReadTimestamp(room, heapState) {
50
+ if (!room) {
51
+ return 0;
52
+ }
53
+ const heapIds = new Set((heapState?.messageHeap || []).filter(m => m && m.id != null).map(m => String(m.id)));
54
+ const failedIds = new Set(Object.keys(heapState?.failedMessages || {}));
55
+ let newest = 0;
56
+ const messages = room.messages || [];
57
+ for (const m of messages) {
58
+ if (!m || !m.id) {
59
+ continue;
60
+ }
61
+ const id = String(m.id);
62
+ if (id === 'delimiter-new' || id === 'delimiter-new-local') {
63
+ continue;
64
+ }
65
+ if (m.pending) {
66
+ continue;
67
+ }
68
+ if (heapIds.has(id) || failedIds.has(id)) {
69
+ continue;
70
+ }
71
+ const ts = msgSortableMs(m);
72
+ if (ts > newest) {
73
+ newest = ts;
74
+ }
75
+ }
76
+ if (newest > 0) {
77
+ return newest;
78
+ }
79
+ if (room.lastViewedTimestamp && room.lastViewedTimestamp > 0) {
80
+ return room.lastViewedTimestamp;
81
+ }
82
+ return 0;
83
+ }
84
+
85
+ /**
86
+ * Is `marker` a leftover from a device whose clock was wrong when it
87
+ * stamped a read marker (bug #38)?
88
+ *
89
+ * TWO independent signals must agree before we're willing to throw a
90
+ * stored marker away, because "waive the forward-only guard" is a
91
+ * destructive operation:
92
+ *
93
+ * 1. it sits well past the newest message we know the room has, AND
94
+ * 2. it sits well past real time.
95
+ *
96
+ * Signal 1 alone is NOT enough, and that is the whole point of this
97
+ * function: a device whose local cache for a room is simply stale (very
98
+ * common - any room whose history hasn't been synced yet this session)
99
+ * sees a perfectly legitimate marker written by another device that HAS
100
+ * seen newer messages, and would happily "heal" it backwards, resurrecting
101
+ * already-read messages as unread on every device. A real timestamp can
102
+ * never be ahead of real time, so requiring signal 2 as well means a
103
+ * stale cache on its own can no longer trigger the self-heal.
104
+ *
105
+ * Signal 2 alone is not used either: it would let a device whose own
106
+ * clock is running SLOW mistake every correct marker for a corrupt one.
107
+ */
108
+ export function isCorruptFutureReadMarker(marker, newestAckedMs) {
109
+ if (!Number.isFinite(marker) || marker <= 0) {
110
+ return false;
111
+ }
112
+ if (!(newestAckedMs > 0)) {
113
+ return false;
114
+ }
115
+ if (marker <= newestAckedMs + FUTURE_READ_MARKER_TOLERANCE_MS) {
116
+ return false;
117
+ }
118
+ return marker > Date.now() + FUTURE_READ_MARKER_TOLERANCE_MS;
119
+ }
120
+ //# sourceMappingURL=getServerReadTimestamp.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"names":["msgSortableMs","FUTURE_READ_MARKER_TOLERANCE_MS","getServerReadTimestamp","room","heapState","heapIds","Set","messageHeap","filter","m","id","map","String","failedIds","Object","keys","failedMessages","newest","messages","pending","has","ts","lastViewedTimestamp","isCorruptFutureReadMarker","marker","newestAckedMs","Number","isFinite","Date","now"],"sourceRoot":"../../../src","sources":["helpers/getServerReadTimestamp.ts"],"mappings":";;AACA,SAASA,aAAa,QAAQ,yBAAyB;;AAEvD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,+BAA+B,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI;AAS5D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,sBAAsBA,CACpCC,IAA6C,EAC7CC,SAAyC,EACjC;EACR,IAAI,CAACD,IAAI,EAAE;IAAC,OAAO,CAAC;EAAC;EAErB,MAAME,OAAO,GAAG,IAAIC,GAAG,CACrB,CAACF,SAAS,EAAEG,WAAW,IAAI,EAAE,EAC1BC,MAAM,CAAEC,CAAC,IAAKA,CAAC,IAAIA,CAAC,CAACC,EAAE,IAAI,IAAI,CAAC,CAChCC,GAAG,CAAEF,CAAC,IAAKG,MAAM,CAACH,CAAC,CAACC,EAAE,CAAC,CAC5B,CAAC;EACD,MAAMG,SAAS,GAAG,IAAIP,GAAG,CAACQ,MAAM,CAACC,IAAI,CAACX,SAAS,EAAEY,cAAc,IAAI,CAAC,CAAC,CAAC,CAAC;EAEvE,IAAIC,MAAM,GAAG,CAAC;EACd,MAAMC,QAAQ,GAAGf,IAAI,CAACe,QAAQ,IAAI,EAAE;EACpC,KAAK,MAAMT,CAAC,IAAIS,QAAQ,EAAE;IACxB,IAAI,CAACT,CAAC,IAAI,CAACA,CAAC,CAACC,EAAE,EAAE;MAAC;IAAS;IAC3B,MAAMA,EAAE,GAAGE,MAAM,CAACH,CAAC,CAACC,EAAE,CAAC;IACvB,IAAIA,EAAE,KAAK,eAAe,IAAIA,EAAE,KAAK,qBAAqB,EAAE;MAAC;IAAS;IACtE,IAAKD,CAAC,CAASU,OAAO,EAAE;MAAC;IAAS;IAClC,IAAId,OAAO,CAACe,GAAG,CAACV,EAAE,CAAC,IAAIG,SAAS,CAACO,GAAG,CAACV,EAAE,CAAC,EAAE;MAAC;IAAS;IAEpD,MAAMW,EAAE,GAAGrB,aAAa,CAACS,CAAC,CAAC;IAC3B,IAAIY,EAAE,GAAGJ,MAAM,EAAE;MAACA,MAAM,GAAGI,EAAE;IAAC;EAChC;EAEA,IAAIJ,MAAM,GAAG,CAAC,EAAE;IAAC,OAAOA,MAAM;EAAC;EAC/B,IAAId,IAAI,CAACmB,mBAAmB,IAAInB,IAAI,CAACmB,mBAAmB,GAAG,CAAC,EAAE;IAC5D,OAAOnB,IAAI,CAACmB,mBAAmB;EACjC;EACA,OAAO,CAAC;AACV;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,yBAAyBA,CACvCC,MAAc,EACdC,aAAqB,EACZ;EACT,IAAI,CAACC,MAAM,CAACC,QAAQ,CAACH,MAAM,CAAC,IAAIA,MAAM,IAAI,CAAC,EAAE;IAAC,OAAO,KAAK;EAAC;EAC3D,IAAI,EAAEC,aAAa,GAAG,CAAC,CAAC,EAAE;IAAC,OAAO,KAAK;EAAC;EACxC,IAAID,MAAM,IAAIC,aAAa,GAAGxB,+BAA+B,EAAE;IAAC,OAAO,KAAK;EAAC;EAC7E,OAAOuB,MAAM,GAAGI,IAAI,CAACC,GAAG,CAAC,CAAC,GAAG5B,+BAA+B;AAC9D","ignoreList":[]}
@@ -1,7 +1,6 @@
1
1
  "use strict";
2
2
 
3
3
  import { setCurrentRoom, setIsLoading } from '../roomStore/roomsSlice';
4
- import { updatedChatLastTimestamps } from './updatedChatLastTimestamps';
5
4
  import { initRoomsPresence } from './initRoomsPresence';
6
5
  import { store } from '../roomStore';
7
6
  import { refreshAuthTokensQuietly } from '../networking/authRefresh';
@@ -40,13 +39,16 @@ const initXmppRooms = async (user, config, xmmpClient, rooms, roomJID) => {
40
39
  console.log(res);
41
40
  }
42
41
 
43
- //@ts-ignore
44
- const roomTimestampObject = await xmmpClient.getChatsPrivateStoreRequestStanza();
45
- updatedChatLastTimestamps(roomTimestampObject, store.dispatch);
42
+ // getChatsPrivateStoreRequestStanza hydrates redux itself
43
+ // (dispatch(applyPrivateStoreMarkers(...)) internally, clamped +
44
+ // forward-only) - do not also apply the raw return value here. That
45
+ // used to double-dispatch via updatedChatLastTimestamps' unconditional
46
+ // setLastViewedTimestamp, which has neither the forward-only guard
47
+ // nor the future-marker clamp, so it could silently re-clobber a
48
+ // value the clamp had just corrected (bug #38).
49
+ await xmmpClient.getChatsPrivateStoreRequestStanza();
46
50
  } else {
47
- //@ts-ignore
48
- const roomTimestampObject = await xmmpClient.getChatsPrivateStoreRequestStanza();
49
- updatedChatLastTimestamps(roomTimestampObject, store.dispatch);
51
+ await xmmpClient.getChatsPrivateStoreRequestStanza();
50
52
  }
51
53
  if (config?.refreshTokens?.enabled) {
52
54
  // Was a bare call to the consumer-supplied refreshFunction, i.e. a
@@ -1 +1 @@
1
- {"version":3,"names":["setCurrentRoom","setIsLoading","updatedChatLastTimestamps","initRoomsPresence","store","refreshAuthTokensQuietly","initXmppRooms","user","config","xmmpClient","rooms","roomJID","dispatch","defaultWallet","walletAddress","console","log","Object","keys","length","newArch","res","getRoomsStanza","roomTimestampObject","getChatsPrivateStoreRequestStanza","refreshTokens","enabled","error","loading"],"sourceRoot":"../../../src","sources":["helpers/initXmppRooms.tsx"],"mappings":";;AAAA,SAASA,cAAc,EAAEC,YAAY,QAAQ,yBAAyB;AACtE,SAASC,yBAAyB,QAAQ,6BAA6B;AACvE,SAASC,iBAAiB,QAAQ,qBAAqB;AAGvD,SAASC,KAAK,QAAQ,cAAc;AACpC,SAASC,wBAAwB,QAAQ,2BAA2B;AAEpE,MAAMC,aAAa,GAAG,MAAAA,CACpBC,IAAU,EACVC,MAAe,EACfC,UAAsB,EACtBC,KAAgC,EAChCC,OAAgB,KACb;EACH,IAAIA,OAAO,EAAE;IACXP,KAAK,CAACQ,QAAQ,CAACZ,cAAc,CAAC;MAAEW,OAAO,EAAEA;IAAQ,CAAC,CAAC,CAAC;EACtD;EAEA,IAAI;IACF,IAAI,CAACJ,IAAI,CAACM,aAAa,IAAI,CAACN,IAAI,CAACM,aAAa,CAACC,aAAa,EAAE;MAC5DC,OAAO,CAACC,GAAG,CAAC,gBAAgB,CAAC;MAC7B;IACF;IAEA,IAAI,CAACP,UAAU,EAAE;MACfM,OAAO,CAACC,GAAG,CAAC,iCAAiC,CAAC;MAE9C,IAAIN,KAAK,IAAIO,MAAM,CAACC,IAAI,CAACR,KAAK,CAAC,CAACS,MAAM,GAAG,CAAC,EAAE;QAC1C,MAAMhB,iBAAiB,CAACM,UAAU,EAAEC,KAAK,CAAC;MAC5C,CAAC,MAAM;QACL,IAAIF,MAAM,EAAEY,OAAO,EAAE;UACnB;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;QACF;QACA,MAAMC,GAAG,GAAG,MAAOZ,UAAU,CAAuBa,cAAc,CAAC,CAAC;QACpEP,OAAO,CAACC,GAAG,CAACK,GAAG,CAAC;MAClB;;MAEA;MACA,MAAME,mBAAqD,GACzD,MAAOd,UAAU,CAAuBe,iCAAiC,CAAC,CAAC;MAC7EtB,yBAAyB,CAACqB,mBAAmB,EAAEnB,KAAK,CAACQ,QAAQ,CAAC;IAChE,CAAC,MAAM;MACL;MACA,MAAMW,mBAAqD,GACzD,MAAMd,UAAU,CAACe,iCAAiC,CAAC,CAAC;MACtDtB,yBAAyB,CAACqB,mBAAmB,EAAEnB,KAAK,CAACQ,QAAQ,CAAC;IAChE;IAEA,IAAIJ,MAAM,EAAEiB,aAAa,EAAEC,OAAO,EAAE;MAClC;MACA;MACA;MACArB,wBAAwB,CAAC,CAAC;IAC5B;EACF,CAAC,CAAC,OAAOsB,KAAK,EAAE;IACdZ,OAAO,CAACY,KAAK,CAACA,KAAK,CAAC;EACtB,CAAC,SAAS;IACRvB,KAAK,CAACQ,QAAQ,CAACX,YAAY,CAAC;MAAE2B,OAAO,EAAE;IAAM,CAAC,CAAC,CAAC;EAClD;AACF,CAAC;AAED,eAAetB,aAAa","ignoreList":[]}
1
+ {"version":3,"names":["setCurrentRoom","setIsLoading","initRoomsPresence","store","refreshAuthTokensQuietly","initXmppRooms","user","config","xmmpClient","rooms","roomJID","dispatch","defaultWallet","walletAddress","console","log","Object","keys","length","newArch","res","getRoomsStanza","getChatsPrivateStoreRequestStanza","refreshTokens","enabled","error","loading"],"sourceRoot":"../../../src","sources":["helpers/initXmppRooms.tsx"],"mappings":";;AAAA,SAASA,cAAc,EAAEC,YAAY,QAAQ,yBAAyB;AACtE,SAASC,iBAAiB,QAAQ,qBAAqB;AAGvD,SAASC,KAAK,QAAQ,cAAc;AACpC,SAASC,wBAAwB,QAAQ,2BAA2B;AAEpE,MAAMC,aAAa,GAAG,MAAAA,CACpBC,IAAU,EACVC,MAAe,EACfC,UAAsB,EACtBC,KAAgC,EAChCC,OAAgB,KACb;EACH,IAAIA,OAAO,EAAE;IACXP,KAAK,CAACQ,QAAQ,CAACX,cAAc,CAAC;MAAEU,OAAO,EAAEA;IAAQ,CAAC,CAAC,CAAC;EACtD;EAEA,IAAI;IACF,IAAI,CAACJ,IAAI,CAACM,aAAa,IAAI,CAACN,IAAI,CAACM,aAAa,CAACC,aAAa,EAAE;MAC5DC,OAAO,CAACC,GAAG,CAAC,gBAAgB,CAAC;MAC7B;IACF;IAEA,IAAI,CAACP,UAAU,EAAE;MACfM,OAAO,CAACC,GAAG,CAAC,iCAAiC,CAAC;MAE9C,IAAIN,KAAK,IAAIO,MAAM,CAACC,IAAI,CAACR,KAAK,CAAC,CAACS,MAAM,GAAG,CAAC,EAAE;QAC1C,MAAMhB,iBAAiB,CAACM,UAAU,EAAEC,KAAK,CAAC;MAC5C,CAAC,MAAM;QACL,IAAIF,MAAM,EAAEY,OAAO,EAAE;UACnB;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;QACF;QACA,MAAMC,GAAG,GAAG,MAAOZ,UAAU,CAAuBa,cAAc,CAAC,CAAC;QACpEP,OAAO,CAACC,GAAG,CAACK,GAAG,CAAC;MAClB;;MAEA;MACA;MACA;MACA;MACA;MACA;MACA;MACA,MAAOZ,UAAU,CAAuBc,iCAAiC,CAAC,CAAC;IAC7E,CAAC,MAAM;MACL,MAAMd,UAAU,CAACc,iCAAiC,CAAC,CAAC;IACtD;IAEA,IAAIf,MAAM,EAAEgB,aAAa,EAAEC,OAAO,EAAE;MAClC;MACA;MACA;MACApB,wBAAwB,CAAC,CAAC;IAC5B;EACF,CAAC,CAAC,OAAOqB,KAAK,EAAE;IACdX,OAAO,CAACW,KAAK,CAACA,KAAK,CAAC;EACtB,CAAC,SAAS;IACRtB,KAAK,CAACQ,QAAQ,CAACV,YAAY,CAAC;MAAEyB,OAAO,EAAE;IAAM,CAAC,CAAC,CAAC;EAClD;AACF,CAAC;AAED,eAAerB,aAAa","ignoreList":[]}