fix in peers refresh
This commit is contained in:
Mateusz Gruszczyński
@@ -472,8 +472,8 @@ def torrent_peers(profile: dict, torrent_hash: str, retry_when_active: bool = Tr
|
|||||||
if not should_retry:
|
if not should_retry:
|
||||||
return []
|
return []
|
||||||
# Note: rTorrent can expose transfer counters before p.multicall catches up; short retries avoid a misleading empty peer table.
|
# Note: rTorrent can expose transfer counters before p.multicall catches up; short retries avoid a misleading empty peer table.
|
||||||
for _attempt in range(3):
|
for _attempt in range(10):
|
||||||
time.sleep(0.2)
|
time.sleep(0.3)
|
||||||
rows = _peer_rows(c, torrent_hash)
|
rows = _peer_rows(c, torrent_hash)
|
||||||
if rows:
|
if rows:
|
||||||
return _normalize_peer_rows(rows)
|
return _normalize_peer_rows(rows)
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
export const peerRefreshSource = " function setupPeersRefresh(tab=activeTab()){ clearInterval(peersRefreshTimer); peersRefreshTimer=null; if($('peersRefreshSelect')) $('peersRefreshSelect').value=String(peersRefreshSeconds||0); if(tab==='peers' && peersRefreshSeconds>0){ peersRefreshTimer=setInterval(()=>{ if(activeTab()==='peers' && selectedHash) loadDetails('peers',{silent:true}); }, peersRefreshSeconds*1000); } }\n function clearPeerEmptyRetry(){\n clearTimeout(peerEmptyRetryTimer);\n peerEmptyRetryTimer=null;\n peerEmptyRetryHash=null;\n peerEmptyRetryAttempts=0;\n }\n function peerActivityLooksActive(activity){\n return !!(activity && (Number(activity.peers_connected||0)>0 || Number(activity.up_rate||0)>0 || Number(activity.down_rate||0)>0));\n }\n function schedulePeerEmptyRetry(peers, activity){\n if((peers||[]).length || !peerActivityLooksActive(activity)){ clearPeerEmptyRetry(); return; }\n if(activeTab()!=='peers' || !selectedHash) return;\n const hash=selectedHash;\n if(peerEmptyRetryHash!==hash){ peerEmptyRetryHash=hash; peerEmptyRetryAttempts=0; }\n if(peerEmptyRetryTimer || peerEmptyRetryAttempts>=PEER_EMPTY_RETRY_MAX_ATTEMPTS) return;\n peerEmptyRetryAttempts+=1;\n peerEmptyRetryTimer=setTimeout(async()=>{\n peerEmptyRetryTimer=null;\n if(activeTab()!=='peers' || selectedHash!==hash) return;\n await loadDetails('peers',{silent:true});\n }, PEER_EMPTY_RETRY_SECONDS*1000);\n }\n function refreshPeersOnceForReverseDns(){\n // Note: Enabling reverse DNS immediately refreshes peers; pending hostnames then use their own follow-up loop.\n if(activeTab()==='peers' && selectedHash) loadDetails('peers');\n const modal=$('mobileDetailsModal');\n if(modal?.classList.contains('show') && selectedHash) openMobileDetails(selectedHash);\n }\n function syncMobileMode(){ const auto=window.matchMedia&&window.matchMedia(\"(max-width: 900px)\").matches; document.body.classList.toggle(\"mobile-mode\", auto || document.body.classList.contains(\"mobile-mode-manual\")); scheduleRender(true); }\n\n\n let automationRulesCache=[];\n let automationConditions=[];\n let automationEffects=[];\n";
|
export const peerRefreshSource = " function setupPeersRefresh(tab=activeTab()){ clearInterval(peersRefreshTimer); peersRefreshTimer=null; if($('peersRefreshSelect')) $('peersRefreshSelect').value=String(peersRefreshSeconds||0); if(tab==='peers' && peersRefreshSeconds>0){ peersRefreshTimer=setInterval(()=>{ if(activeTab()==='peers' && selectedHash) loadDetails('peers',{silent:true}); }, peersRefreshSeconds*1000); } }\n function setPeerRefreshNote(message=''){\n const note=$('peerRefreshNote');\n if(!note) return;\n const text=String(message||'').trim();\n note.innerHTML = text ? `<i class=\"fa-solid fa-arrows-rotate\"></i> ${esc(text)}` : '';\n note.classList.toggle('d-none', !text);\n }\n function clearPeerEmptyRetry(){\n clearTimeout(peerEmptyRetryTimer);\n peerEmptyRetryTimer=null;\n peerEmptyRetryHash=null;\n peerEmptyRetryAttempts=0;\n }\n function peerActivityLooksActive(activity){\n return !!(activity && (Number(activity.peers_connected||0)>0 || Number(activity.up_rate||0)>0 || Number(activity.down_rate||0)>0));\n }\n function schedulePeerEmptyRetry(peers, activity){\n if((peers||[]).length || !peerActivityLooksActive(activity)){ clearPeerEmptyRetry(); setPeerRefreshNote(); return; }\n if(activeTab()!=='peers' || !selectedHash) return;\n const hash=selectedHash;\n if(peerEmptyRetryHash!==hash){ peerEmptyRetryHash=hash; peerEmptyRetryAttempts=0; }\n if(peerEmptyRetryTimer || peerEmptyRetryAttempts>=PEER_EMPTY_RETRY_MAX_ATTEMPTS) return;\n peerEmptyRetryAttempts+=1;\n peerEmptyRetryTimer=setTimeout(async()=>{\n peerEmptyRetryTimer=null;\n if(activeTab()!=='peers' || selectedHash!==hash) return;\n await loadDetails('peers',{silent:true, backgroundRetry:true});\n }, PEER_EMPTY_RETRY_SECONDS*1000);\n }\n function refreshPeersOnceForReverseDns(){\n // Note: Enabling reverse DNS immediately refreshes peers; pending hostnames then use their own follow-up loop.\n if(activeTab()==='peers' && selectedHash) loadDetails('peers');\n const modal=$('mobileDetailsModal');\n if(modal?.classList.contains('show') && selectedHash) openMobileDetails(selectedHash);\n }\n function syncMobileMode(){ const auto=window.matchMedia&&window.matchMedia(\"(max-width: 900px)\").matches; document.body.classList.toggle(\"mobile-mode\", auto || document.body.classList.contains(\"mobile-mode-manual\")); scheduleRender(true); }\n\n\n let automationRulesCache=[];\n let automationConditions=[];\n let automationEffects=[];\n";
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -1 +1 @@
|
|||||||
export const torrentDetailsLoaderSource = " async function loadDetails(tab, options={}){\n const t=torrents.get(selectedHash);\n const silent = !!options.silent;\n if(tab !== 'files') clearFilesAutoRefresh();\n if(tab !== 'peers'){ clearReverseDnsPeerRefresh(); clearPeerEmptyRetry(); }\n if($('peersRefreshBox')) $('peersRefreshBox').classList.toggle('d-none', tab!=='peers');\n setupPeersRefresh(tab);\n if(!t) return;\n if(tab==='general') return renderGeneral();\n if(tab==='log'){\n $('detailPane').innerHTML=`<pre class=\"torrent-log-message\">${esc(t.message||'No logs')}</pre>`;\n return;\n }\n const pane=$('detailPane');\n const samePeerHash = tab==='peers' && pane?.dataset?.peersHash===selectedHash;\n const hasPeerContent = samePeerHash && pane?.dataset?.peersLoaded==='1';\n if(!silent && !hasPeerContent) pane.innerHTML=`<div class=\"loading-line\"><span class=\"spinner-border spinner-border-sm\"></span> Loading ${esc(tab)}...</div>`;\n try{\n const detailUrl = tab==='chunks' ? `/api/torrents/${encodeURIComponent(selectedHash)}/chunks?max_cells=${chunkMaxCellsForDensity()}` : `/api/torrents/${encodeURIComponent(selectedHash)}/${tab}`;\n const res=await fetch(detailUrl,{headers:{'Accept':'application/json'}});\n const text=await res.text();\n let json;\n try{\n json=JSON.parse(text);\n }catch(parseErr){\n throw new Error(`Invalid API response for ${tab}. HTTP ${res.status}`);\n }\n if(!res.ok || !json.ok) throw new Error(json.error||`HTTP ${res.status}`);\n if(tab!==activeTab()) return;\n if(tab==='files') renderFiles(json.files||[]);\n if(tab==='chunks') renderChunks(json.chunks||{});\n if(tab==='peers'){ pane.dataset.peersLoaded='1'; pane.dataset.peersHash=selectedHash; renderPeers(json.peers||[], json.peer_activity||null); }\n if(tab==='trackers') renderTrackers(json.trackers||[]);\n }catch(e){\n if(!silent) pane.innerHTML=`<div class=\"text-danger\">${esc(e.message)}</div>`;\n }\n }\n";
|
export const torrentDetailsLoaderSource = " async function loadDetails(tab, options={}){\n const t=torrents.get(selectedHash);\n const silent = !!options.silent;\n if(tab !== 'files') clearFilesAutoRefresh();\n if(tab !== 'peers'){ clearReverseDnsPeerRefresh(); clearPeerEmptyRetry(); setPeerRefreshNote(); }\n if($('peersRefreshBox')) $('peersRefreshBox').classList.toggle('d-none', tab!=='peers');\n setupPeersRefresh(tab);\n if(!t) return;\n if(tab==='general') return renderGeneral();\n if(tab==='log'){\n $('detailPane').innerHTML=`<pre class=\"torrent-log-message\">${esc(t.message||'No logs')}</pre>`;\n return;\n }\n const pane=$('detailPane');\n const requestSeq = tab==='peers' ? ++peerDetailsRequestSeq : 0;\n const samePeerHash = tab==='peers' && pane?.dataset?.peersHash===selectedHash;\n const hasPeerContent = samePeerHash && pane?.dataset?.peersLoaded==='1';\n if(!silent && !hasPeerContent) pane.innerHTML=`<div class=\"loading-line\"><span class=\"spinner-border spinner-border-sm\"></span> Loading ${esc(tab)}...</div>`;\n try{\n const detailUrl = tab==='chunks' ? `/api/torrents/${encodeURIComponent(selectedHash)}/chunks?max_cells=${chunkMaxCellsForDensity()}` : `/api/torrents/${encodeURIComponent(selectedHash)}/${tab}`;\n const res=await fetch(detailUrl,{headers:{'Accept':'application/json'}, cache: tab==='peers' ? 'no-store' : 'default'});\n const text=await res.text();\n let json;\n try{\n json=JSON.parse(text);\n }catch(parseErr){\n throw new Error(`Invalid API response for ${tab}. HTTP ${res.status}`);\n }\n if(!res.ok || !json.ok) throw new Error(json.error||`HTTP ${res.status}`);\n if(tab!==activeTab()) return;\n if(tab==='peers' && requestSeq < peerDetailsAppliedSeq) return;\n if(tab==='peers') peerDetailsAppliedSeq = requestSeq;\n if(tab==='files') renderFiles(json.files||[]);\n if(tab==='chunks') renderChunks(json.chunks||{});\n if(tab==='peers'){ pane.dataset.peersLoaded='1'; pane.dataset.peersHash=selectedHash; renderPeers(json.peers||[], json.peer_activity||null); }\n if(tab==='trackers') renderTrackers(json.trackers||[]);\n }catch(e){\n if(!silent) pane.innerHTML=`<div class=\"text-danger\">${esc(e.message)}</div>`;\n }\n }\n";
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
export const torrentPeerDetailsSource = " function peerBadges(p){\n const badges=[];\n if(p.encrypted) badges.push('<span class=\"badge text-bg-success\">enc</span>');\n if(p.incoming) badges.push('<span class=\"badge text-bg-info\">in</span>');\n if(p.snubbed) badges.push('<span class=\"badge text-bg-warning\">snub</span>');\n if(p.banned) badges.push('<span class=\"badge text-bg-danger\">ban</span>');\n return badges.join(' ') || '<span class=\"text-muted\">-</span>';\n }\n function peerHostCell(p){\n const host=String(p.host||'').trim();\n // Note: Hostnames use the available peer-table space instead of a fixed character-style cap.\n if(host) return `<span class=\"peer-host\" title=\"${esc(host)}\">${esc(host)}</span>`;\n if(p.host_pending) return '<span class=\"text-muted\">resolving</span>';\n return '<span class=\"text-muted\">-</span>';\n }\n function hasPendingReverseDns(peers){\n return reverseDnsEnabled && (peers||[]).some(p=>p && p.host_pending);\n }\n function clearReverseDnsPeerRefresh(){\n clearTimeout(reverseDnsRefreshTimer);\n reverseDnsRefreshTimer=null;\n reverseDnsRefreshInFlight=false;\n reverseDnsRefreshAttempts=0;\n reverseDnsRefreshHash=null;\n }\n function scheduleReverseDnsPeerRefresh(peers){\n // Note: PTR results are checked on a short independent loop, not on the manual/auto peers refresh interval.\n if(!hasPendingReverseDns(peers)){ clearReverseDnsPeerRefresh(); return; }\n if(activeTab()!=='peers' || !selectedHash) return;\n const hash=selectedHash;\n if(reverseDnsRefreshHash!==hash){ reverseDnsRefreshHash=hash; reverseDnsRefreshAttempts=0; }\n if(reverseDnsRefreshTimer || reverseDnsRefreshAttempts>=REVERSE_DNS_REFRESH_MAX_ATTEMPTS) return;\n reverseDnsRefreshAttempts+=1;\n reverseDnsRefreshTimer=setTimeout(async()=>{\n reverseDnsRefreshTimer=null;\n if(activeTab()!=='peers' || selectedHash!==hash) return;\n reverseDnsRefreshInFlight=true;\n try{ await loadDetails('peers',{silent:true}); }\n finally{ reverseDnsRefreshInFlight=false; }\n }, REVERSE_DNS_REFRESH_SECONDS*1000);\n }\n function renderPeers(peers, activity=null){\n const headers=['Flag','IP'];\n if(reverseDnsEnabled) headers.push('Host');\n headers.push('Country','City','Client','%','DL','UL','Port','Flags');\n const rows=(peers||[]).map(p=>{\n const row=[flag(p.country_iso),`<span class=\"peer-ip\">${esc(p.ip)}<a class=\"peer-ip-link\" href=\"https://ipinfo.io/${encodeURIComponent(p.ip||'')}\" target=\"_blank\" rel=\"noopener noreferrer\" title=\"Open IP info\"><i class=\"fa-solid fa-link\"></i></a></span>`];\n if(reverseDnsEnabled) row.push(peerHostCell(p));\n row.push(esc(p.country),esc(p.city),esc(p.client),progressBar(p.completed,'peer-progress peer-progress-wide'),esc(p.down_rate_h),esc(p.up_rate_h),esc(p.port),peerBadges(p));\n return row;\n });\n const activeEmpty = !(peers||[]).length && peerActivityLooksActive(activity);\n const note = activeEmpty ? '<div class=\"peer-refresh-note\"><i class=\"fa-solid fa-arrows-rotate\"></i> rTorrent reports active transfer; peer rows will refresh in the background.</div>' : '';\n $('detailPane').innerHTML=note+responsiveTable(headers,rows,reverseDnsEnabled ? 'peers-table peers-table-hosts' : 'peers-table');\n schedulePeerEmptyRetry(peers, activity);\n scheduleReverseDnsPeerRefresh(peers);\n }\n";
|
export const torrentPeerDetailsSource = " function peerBadges(p){\n const badges=[];\n if(p.encrypted) badges.push('<span class=\"badge text-bg-success\">enc</span>');\n if(p.incoming) badges.push('<span class=\"badge text-bg-info\">in</span>');\n if(p.snubbed) badges.push('<span class=\"badge text-bg-warning\">snub</span>');\n if(p.banned) badges.push('<span class=\"badge text-bg-danger\">ban</span>');\n return badges.join(' ') || '<span class=\"text-muted\">-</span>';\n }\n function peerHostCell(p){\n const host=String(p.host||'').trim();\n // Note: Hostnames use the available peer-table space instead of a fixed character-style cap.\n if(host) return `<span class=\"peer-host\" title=\"${esc(host)}\">${esc(host)}</span>`;\n if(p.host_pending) return '<span class=\"text-muted\">resolving</span>';\n return '<span class=\"text-muted\">-</span>';\n }\n function hasPendingReverseDns(peers){\n return reverseDnsEnabled && (peers||[]).some(p=>p && p.host_pending);\n }\n function clearReverseDnsPeerRefresh(){\n clearTimeout(reverseDnsRefreshTimer);\n reverseDnsRefreshTimer=null;\n reverseDnsRefreshInFlight=false;\n reverseDnsRefreshAttempts=0;\n reverseDnsRefreshHash=null;\n }\n function scheduleReverseDnsPeerRefresh(peers){\n // Note: PTR results are checked on a short independent loop, not on the manual/auto peers refresh interval.\n if(!hasPendingReverseDns(peers)){ clearReverseDnsPeerRefresh(); return; }\n if(activeTab()!=='peers' || !selectedHash) return;\n const hash=selectedHash;\n if(reverseDnsRefreshHash!==hash){ reverseDnsRefreshHash=hash; reverseDnsRefreshAttempts=0; }\n if(reverseDnsRefreshTimer || reverseDnsRefreshAttempts>=REVERSE_DNS_REFRESH_MAX_ATTEMPTS) return;\n reverseDnsRefreshAttempts+=1;\n reverseDnsRefreshTimer=setTimeout(async()=>{\n reverseDnsRefreshTimer=null;\n if(activeTab()!=='peers' || selectedHash!==hash) return;\n reverseDnsRefreshInFlight=true;\n try{ await loadDetails('peers',{silent:true}); }\n finally{ reverseDnsRefreshInFlight=false; }\n }, REVERSE_DNS_REFRESH_SECONDS*1000);\n }\n function renderPeers(peers, activity=null){\n const headers=['Flag','IP'];\n if(reverseDnsEnabled) headers.push('Host');\n headers.push('Country','City','Client','%','DL','UL','Port','Flags');\n const rows=(peers||[]).map(p=>{\n const row=[flag(p.country_iso),`<span class=\"peer-ip\">${esc(p.ip)}<a class=\"peer-ip-link\" href=\"https://ipinfo.io/${encodeURIComponent(p.ip||'')}\" target=\"_blank\" rel=\"noopener noreferrer\" title=\"Open IP info\"><i class=\"fa-solid fa-link\"></i></a></span>`];\n if(reverseDnsEnabled) row.push(peerHostCell(p));\n row.push(esc(p.country),esc(p.city),esc(p.client),progressBar(p.completed,'peer-progress peer-progress-wide'),esc(p.down_rate_h),esc(p.up_rate_h),esc(p.port),peerBadges(p));\n return row;\n });\n const activeEmpty = !(peers||[]).length && peerActivityLooksActive(activity);\n setPeerRefreshNote(activeEmpty ? 'rTorrent reports active transfer; peer rows refresh in the background.' : '');\n $('detailPane').innerHTML=responsiveTable(headers,rows,reverseDnsEnabled ? 'peers-table peers-table-hosts' : 'peers-table');\n schedulePeerEmptyRetry(peers, activity);\n scheduleReverseDnsPeerRefresh(peers);\n }\n";
|
||||||
|
|||||||
@@ -2599,11 +2599,12 @@ body.mobile-mode .mobile-filter-bar {
|
|||||||
|
|
||||||
.peer-refresh-note {
|
.peer-refresh-note {
|
||||||
align-items: center;
|
align-items: center;
|
||||||
display: flex;
|
|
||||||
gap: 0.5rem;
|
|
||||||
margin-bottom: 0.5rem;
|
|
||||||
color: var(--bs-secondary-color);
|
color: var(--bs-secondary-color);
|
||||||
|
display: inline-flex;
|
||||||
|
flex: 1 1 auto;
|
||||||
font-size: 0.875rem;
|
font-size: 0.875rem;
|
||||||
|
gap: 0.5rem;
|
||||||
|
min-width: 12rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.auth-page {
|
.auth-page {
|
||||||
|
|||||||
@@ -120,7 +120,7 @@
|
|||||||
<li class="nav-item"><button class="nav-link" data-tab="trackers"><i class="fa-solid fa-bullseye"></i> Trackers</button></li>
|
<li class="nav-item"><button class="nav-link" data-tab="trackers"><i class="fa-solid fa-bullseye"></i> Trackers</button></li>
|
||||||
<li class="nav-item"><button class="nav-link" data-tab="log"><i class="fa-solid fa-terminal"></i> Log</button></li>
|
<li class="nav-item"><button class="nav-link" data-tab="log"><i class="fa-solid fa-terminal"></i> Log</button></li>
|
||||||
</ul>
|
</ul>
|
||||||
<div id="peersRefreshBox" class="peers-refresh d-none"><label class="form-label mb-0 small">Peers auto refresh</label><select id="peersRefreshSelect" class="form-select form-select-sm"><option value="0">Off</option><option value="10">10s</option><option value="15">15s</option><option value="30">30s</option><option value="60">60s</option></select></div>
|
<div id="peersRefreshBox" class="peers-refresh d-none"><span id="peerRefreshNote" class="peer-refresh-note d-none" aria-live="polite"></span><label class="form-label mb-0 small">Peers auto refresh</label><select id="peersRefreshSelect" class="form-select form-select-sm"><option value="0">Off</option><option value="10">10s</option><option value="15">15s</option><option value="30">30s</option><option value="60">60s</option></select></div>
|
||||||
<div id="detailPane" class="detail-pane muted-pane">Select a torrent.</div>
|
<div id="detailPane" class="detail-pane muted-pane">Select a torrent.</div>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|||||||
Reference in New Issue
Block a user