The_Great_Archive/RSNewWebUI
1
0
Fork 0
mirror of https://github.com/RetroShare/RSNewWebUI.git synced 2026-09-14 11:05:47 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed. History preloading now uses the queue from network_data.js, limiting it to three simultaneous requests. Repeated calls share the active preload.

Browse Source
This commit is contained in:
defnax 2026-09-09 20:10:06 +02:00
parent efb4028c78
commit bfccebc673
2 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webui-src/app/network/network_data.js
View File

@ -18,7 +18,7 @@ const GPG_DETAILS_TTL_MS = 5 * 60 * 1000;
let refreshInFlight = null;
let refreshedAt = 0;
function runQueued(tasks, concurrency) {
function runQueued(tasks, concurrency = SWEEP_CONCURRENCY) {
return new Promise((resolve) => {
let next = 0;
let finished = 0;
@ -52,6 +52,7 @@ async function loadOnlineIds() {
const Data = {
gpgDetails: {},
runQueued,
};
// A remembered friend is a placeholder shown while the core catches up with an

46
webui-src/app/network/network_state.js
View File

@ -216,9 +216,12 @@ function isSystemMsg(msg) {
);
}
let historyPreloadInFlight = null;
function preloadNetworkChatHistory() {
if (historyPreloadInFlight) return historyPreloadInFlight;
const gpgIds = Object.keys(Data.gpgDetails || {});
gpgIds.forEach((gpgId) => {
const tasks = gpgIds.map((gpgId) => async () => {
if (!gpgId || gpgId === '0000000000000000') return;
const friend = Data.gpgDetails[gpgId];
@ -226,29 +229,34 @@ function preloadNetworkChatHistory() {
((friend && friend.locations) || []).map((location) => location.id).filter(Boolean)
));
Promise.all(sslIds.map((sslId) => new Promise((resolve) => {
rs.rsJsonApiRequest(
// Each queued friend loads its locations sequentially, keeping the total
// number of history requests within the network queue's concurrency limit.
const messageGroups = [];
for (const sslId of sslIds) {
await rs.rsJsonApiRequest(
'/rsHistory/getMessages',
{ chatPeerId: directChatId(sslId), loadCount: 20 },
(msgData, success) => resolve(
(msgData, success) => messageGroups.push(
success && msgData && Array.isArray(msgData.msgs) ? msgData.msgs : []
)
).catch(() => resolve([]));
}))).then((messageGroups) => {
const userMsgs = messageGroups.flat().filter(
(message) => !message.isSystem && !isSystemMsg(message.message || message.msg)
).sort(
(a, b) => (a.sendTime || a.recvTime || 0) - (b.sendTime || b.recvTime || 0)
);
if (userMsgs.length === 0) return;
const last = userMsgs[userMsgs.length - 1];
State.chatHistoryMap[gpgId] = {
lastMsg: last.message || last.msg || '',
lastTime: last.sendTime || last.recvTime || Math.floor(Date.now() / 1000),
};
m.redraw();
});
).catch(() => {});
}
const userMsgs = messageGroups.flat().filter(
(message) => !message.isSystem && !isSystemMsg(message.message || message.msg)
).sort(
(a, b) => (a.sendTime || a.recvTime || 0) - (b.sendTime || b.recvTime || 0)
);
if (userMsgs.length === 0) return;
const last = userMsgs[userMsgs.length - 1];
State.chatHistoryMap[gpgId] = {
lastMsg: last.message || last.msg || '',
lastTime: last.sendTime || last.recvTime || Math.floor(Date.now() / 1000),
};
m.redraw();
});
historyPreloadInFlight = Data.runQueued(tasks)
.finally(() => { historyPreloadInFlight = null; });
return historyPreloadInFlight;
}
function receiveDirectChatMessage(chatMessage) {