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

network: cache the location details, and stop waiting on a catch that never fires

Browse Source 
The version and the short invite of a node do not change while the web UI is
open, but the dialog asked the core again on every open, showing "Loading..."
each time. They are now cached by node id.

The two .catch() handlers could not do what they were written for:
rsJsonApiRequest never rejects, it resolves undefined when a request fails. They
only ever ran by accident, when reading .body of that undefined threw a
TypeError inside the .then. The failure is now read off the resolved value,
where it actually is.
This commit is contained in:
jolavillette 2026-08-13 13:38:49 +02:00
parent 38684d7f0c
commit db36a05a74
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
webui-src/app/network/network_details_tab.js
View File

@ -51,6 +51,11 @@ const ConfirmRemove = () => {
};
};
// Version and short invite of a node do not change while the web UI is open,
// and the dialog is reopened often. Cached by node id so that reopening it
// paints filled in, instead of showing "Loading..." and asking the core again.
const locationDetailsCache = {};
const LocationDetails = () => {
let activeTab = 'details';
let version = 'Loading...';
@ -58,26 +63,32 @@ const LocationDetails = () => {
return {
oninit: (vnode) => {
rs.rsJsonApiRequest('/rsGossipDiscovery/getPeerVersion', { id: vnode.attrs.loc.id })
const nodeId = vnode.attrs.loc.id;
const cached = locationDetailsCache[nodeId];
if (cached) {
version = cached.version;
retroshareId = cached.retroshareId;
return;
}
locationDetailsCache[nodeId] = { version, retroshareId };
// rsJsonApiRequest never rejects: it resolves undefined when the request
// fails, so the failure has to be read off the resolved value rather than
// waited for in a catch.
rs.rsJsonApiRequest('/rsGossipDiscovery/getPeerVersion', { id: nodeId })
.then((response) => {
version = response.body && response.body.retval
version = response && response.body && response.body.retval
? response.body.version || 'Unknown'
: 'Unknown';
m.redraw();
})
.catch(() => {
version = 'Unavailable';
: 'Unavailable';
locationDetailsCache[nodeId].version = version;
m.redraw();
});
rs.rsJsonApiRequest('/rsPeers/getShortInvite', { sslId: vnode.attrs.loc.id })
rs.rsJsonApiRequest('/rsPeers/getShortInvite', { sslId: nodeId })
.then((response) => {
retroshareId = response.body && response.body.retval
retroshareId = response && response.body && response.body.retval
? cleanRetroshareId(response.body.invite) || 'Unavailable'
: 'Unavailable';
m.redraw();
})
.catch(() => {
retroshareId = 'Unavailable';
locationDetailsCache[nodeId].retroshareId = retroshareId;
m.redraw();
});
},