Skip to content

Periodical external pathfinding scores merge - #449

Merged
joostjager merged 3 commits into
lightningdevkit:mainfrom
joostjager:import-scores
Oct 23, 2025
Merged

Periodical external pathfinding scores merge#449
joostjager merged 3 commits into
lightningdevkit:mainfrom
joostjager:import-scores

Conversation

@joostjager

@joostjagerjoostjager commented Jan 29, 2025

Copy link
Copy Markdown
Contributor

Fixes#313

Depends on lightningdevkit/rust-lightning#3562

Export functionality in #458

@joostjagerjoostjager changed the title Import scoresPeriodical external score mergeJan 30, 2025
@joostjager
joostjagerforce-pushed the import-scores branch 2 times, most recently from e0b7070 to 58acc12CompareJanuary 30, 2025 13:31
Comment threadsrc/config.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 3 times, most recently from 5858404 to fdf2b5dCompareJanuary 30, 2025 14:04
@joostjager
joostjager marked this pull request as ready for review January 31, 2025 08:53
Comment threadCargo.toml Outdated
@tnulltnull added this to the 0.6 milestone Jan 31, 2025

@tnulltnull left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Did a first pass, already looks pretty good!

Comment threadCargo.toml Outdated
Comment threadsrc/builder.rs
Comment threadsrc/builder.rs Outdated
Comment threadsrc/config.rs Outdated
Comment threadsrc/config.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 2 times, most recently from 5a42ff9 to 0cf5774CompareFebruary 1, 2025 17:04
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 3 times, most recently from 619c9c9 to 6ded8afCompareFebruary 3, 2025 10:01
Comment threadsrc/builder.rs Outdated
Comment threadsrc/lib.rs
Comment threadsrc/scoring.rs
Comment threadsrc/lib.rs Outdated
Comment threadsrc/config.rs Outdated
Comment threadsrc/builder.rs Outdated
Comment threadsrc/builder.rs Outdated
Comment threadsrc/io/utils.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/lib.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 5 times, most recently from 7bf68af to 14167ebCompareFebruary 4, 2025 12:33
@joostjager
joostjager requested a review from tnullFebruary 4, 2025 14:43
@joostjagerjoostjager changed the title Periodical external score mergePeriodical external pathfinding scores mergeFeb 5, 2025
Comment threadsrc/builder.rs Outdated
Comment threadsrc/builder.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs
async fn sync_external_scores(
logger: &Logger, scorer: &Mutex<CombinedScorer<Arc<Graph>, Arc<Logger>>>,
node_metrics: &RwLock<NodeMetrics>, kv_store: Arc<DynStore>, url: &String,
) -> () {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this return a Result?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so - this function cannot fail?

Comment threadsrc/scoring.rs Outdated
match body {
Err(e) => {
log_error!(logger, "Failed to read external scores update: {}", e);
return;

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's avoid these explicit returns if possible.

@joostjagerjoostjagerFeb 7, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, not necessary. I wanted to exit the parent function with these returns, but just letting it run would have the same result.

In this current revision I now have a few real ones, after unwrapping the matches a bit.

@joostjager

Copy link
Copy Markdown
ContributorAuthor

Comments addressed. Now need to decide in lightningdevkit/rust-lightning#3562 how to read the combined scorer from disk (with local and merged data), and apply that in this PR.

Comment threadsrc/builder.rs
Comment threadsrc/builder.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs
) -> () {
let response = tokio::time::timeout(
Duration::from_secs(EXTERNAL_PATHFINDING_SCORES_SYNC_TIMEOUT_SECS),
reqwest::get(url),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should create a reqwest client instead of doing reqwest::get, otherwise it needs to redo TLS and everything each time

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should create a reqwest client instead of doing reqwest::get, otherwise it needs to redo TLS and everything each time

Right, but establishing a new connection once an hour is reasonable? And probably preferable compared to keep a connection open if we only use it once an hour?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah yeah true

@joostjager

Copy link
Copy Markdown
ContributorAuthor

This has been parked, but I suppose with the new develop branch we can merge this after a rebase.

@tnull

Copy link
Copy Markdown
Collaborator

This has been parked, but I suppose with the new develop branch we can merge this after a rebase.

Yes, please rebase!

@tnull

tnull commented Oct 7, 2025

Copy link
Copy Markdown
Collaborator

Gentle ping @joostjager

@joostjager

Copy link
Copy Markdown
ContributorAuthor

Rebased

@tnulltnull left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two minor comments, otherwise should look good.

Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
@tnull

Copy link
Copy Markdown
Collaborator

@joostjager Feel free to squash the fixup. More detailed/verbose commit messages would also be appreciated.

Save external pathfinding scores in a cache so that they will be
available immediately after a node restart. Otherwise there might be a
time window where new scores need to be downloaded still and the node
operates on local data only.
@joostjager

Copy link
Copy Markdown
ContributorAuthor

Squashed without changes.

@joostjager
joostjager merged commit 9d71d3a into lightningdevkit:mainOct 23, 2025
8 of 15 checks passed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Allow to download and import a scorer from a binary file

3 participants

@joostjager@tnull@benthecarman
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Periodical external pathfinding scores merge by joostjager · Pull Request #449 · lightningdevkit/ldk-node · GitHub
Skip to content

Periodical external pathfinding scores merge - #449

Merged
joostjager merged 3 commits into
lightningdevkit:mainfrom
joostjager:import-scores
Oct 23, 2025
Merged

Periodical external pathfinding scores merge#449
joostjager merged 3 commits into
lightningdevkit:mainfrom
joostjager:import-scores

Conversation

@joostjager

@joostjagerjoostjager commented Jan 29, 2025

Copy link
Copy Markdown
Contributor

Fixes#313

Depends on lightningdevkit/rust-lightning#3562

Export functionality in #458

@joostjagerjoostjager changed the title Import scoresPeriodical external score mergeJan 30, 2025
@joostjager
joostjagerforce-pushed the import-scores branch 2 times, most recently from e0b7070 to 58acc12CompareJanuary 30, 2025 13:31
Comment threadsrc/config.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 3 times, most recently from 5858404 to fdf2b5dCompareJanuary 30, 2025 14:04
@joostjager
joostjager marked this pull request as ready for review January 31, 2025 08:53
Comment threadCargo.toml Outdated
@tnulltnull added this to the 0.6 milestone Jan 31, 2025

@tnulltnull left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Did a first pass, already looks pretty good!

Comment threadCargo.toml Outdated
Comment threadsrc/builder.rs
Comment threadsrc/builder.rs Outdated
Comment threadsrc/config.rs Outdated
Comment threadsrc/config.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 2 times, most recently from 5a42ff9 to 0cf5774CompareFebruary 1, 2025 17:04
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 3 times, most recently from 619c9c9 to 6ded8afCompareFebruary 3, 2025 10:01
Comment threadsrc/builder.rs Outdated
Comment threadsrc/lib.rs
Comment threadsrc/scoring.rs
Comment threadsrc/lib.rs Outdated
Comment threadsrc/config.rs Outdated
Comment threadsrc/builder.rs Outdated
Comment threadsrc/builder.rs Outdated
Comment threadsrc/io/utils.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/lib.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 5 times, most recently from 7bf68af to 14167ebCompareFebruary 4, 2025 12:33
@joostjager
joostjager requested a review from tnullFebruary 4, 2025 14:43
@joostjagerjoostjager changed the title Periodical external score mergePeriodical external pathfinding scores mergeFeb 5, 2025
Comment threadsrc/builder.rs Outdated
Comment threadsrc/builder.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs
async fn sync_external_scores(
logger: &Logger, scorer: &Mutex<CombinedScorer<Arc<Graph>, Arc<Logger>>>,
node_metrics: &RwLock<NodeMetrics>, kv_store: Arc<DynStore>, url: &String,
) -> () {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this return a Result?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so - this function cannot fail?

Comment threadsrc/scoring.rs Outdated
match body {
Err(e) => {
log_error!(logger, "Failed to read external scores update: {}", e);
return;

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's avoid these explicit returns if possible.

@joostjagerjoostjagerFeb 7, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, not necessary. I wanted to exit the parent function with these returns, but just letting it run would have the same result.

In this current revision I now have a few real ones, after unwrapping the matches a bit.

@joostjager

Copy link
Copy Markdown
ContributorAuthor

Comments addressed. Now need to decide in lightningdevkit/rust-lightning#3562 how to read the combined scorer from disk (with local and merged data), and apply that in this PR.

Comment threadsrc/builder.rs
Comment threadsrc/builder.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs
) -> () {
let response = tokio::time::timeout(
Duration::from_secs(EXTERNAL_PATHFINDING_SCORES_SYNC_TIMEOUT_SECS),
reqwest::get(url),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should create a reqwest client instead of doing reqwest::get, otherwise it needs to redo TLS and everything each time

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should create a reqwest client instead of doing reqwest::get, otherwise it needs to redo TLS and everything each time

Right, but establishing a new connection once an hour is reasonable? And probably preferable compared to keep a connection open if we only use it once an hour?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah yeah true

@joostjager

Copy link
Copy Markdown
ContributorAuthor

This has been parked, but I suppose with the new develop branch we can merge this after a rebase.

@tnull

Copy link
Copy Markdown
Collaborator

This has been parked, but I suppose with the new develop branch we can merge this after a rebase.

Yes, please rebase!

@tnull

tnull commented Oct 7, 2025

Copy link
Copy Markdown
Collaborator

Gentle ping @joostjager

@joostjager

Copy link
Copy Markdown
ContributorAuthor

Rebased

@tnulltnull left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two minor comments, otherwise should look good.

Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
@tnull

Copy link
Copy Markdown
Collaborator

@joostjager Feel free to squash the fixup. More detailed/verbose commit messages would also be appreciated.

Save external pathfinding scores in a cache so that they will be
available immediately after a node restart. Otherwise there might be a
time window where new scores need to be downloaded still and the node
operates on local data only.
@joostjager

Copy link
Copy Markdown
ContributorAuthor

Squashed without changes.

@joostjager
joostjager merged commit 9d71d3a into lightningdevkit:mainOct 23, 2025
8 of 15 checks passed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Allow to download and import a scorer from a binary file

3 participants

@joostjager@tnull@benthecarman
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Periodical external pathfinding scores merge by joostjager · Pull Request #449 · lightningdevkit/ldk-node · GitHub
Skip to content

Periodical external pathfinding scores merge - #449

Merged
joostjager merged 3 commits into
lightningdevkit:mainfrom
joostjager:import-scores
Oct 23, 2025
Merged

Periodical external pathfinding scores merge#449
joostjager merged 3 commits into
lightningdevkit:mainfrom
joostjager:import-scores

Conversation

@joostjager

@joostjagerjoostjager commented Jan 29, 2025

Copy link
Copy Markdown
Contributor

Fixes#313

Depends on lightningdevkit/rust-lightning#3562

Export functionality in #458

@joostjagerjoostjager changed the title Import scoresPeriodical external score mergeJan 30, 2025
@joostjager
joostjagerforce-pushed the import-scores branch 2 times, most recently from e0b7070 to 58acc12CompareJanuary 30, 2025 13:31
Comment threadsrc/config.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 3 times, most recently from 5858404 to fdf2b5dCompareJanuary 30, 2025 14:04
@joostjager
joostjager marked this pull request as ready for review January 31, 2025 08:53
Comment threadCargo.toml Outdated
@tnulltnull added this to the 0.6 milestone Jan 31, 2025

@tnulltnull left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Did a first pass, already looks pretty good!

Comment threadCargo.toml Outdated
Comment threadsrc/builder.rs
Comment threadsrc/builder.rs Outdated
Comment threadsrc/config.rs Outdated
Comment threadsrc/config.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 2 times, most recently from 5a42ff9 to 0cf5774CompareFebruary 1, 2025 17:04
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 3 times, most recently from 619c9c9 to 6ded8afCompareFebruary 3, 2025 10:01
Comment threadsrc/builder.rs Outdated
Comment threadsrc/lib.rs
Comment threadsrc/scoring.rs
Comment threadsrc/lib.rs Outdated
Comment threadsrc/config.rs Outdated
Comment threadsrc/builder.rs Outdated
Comment threadsrc/builder.rs Outdated
Comment threadsrc/io/utils.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/lib.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 5 times, most recently from 7bf68af to 14167ebCompareFebruary 4, 2025 12:33
@joostjager
joostjager requested a review from tnullFebruary 4, 2025 14:43
@joostjagerjoostjager changed the title Periodical external score mergePeriodical external pathfinding scores mergeFeb 5, 2025
Comment threadsrc/builder.rs Outdated
Comment threadsrc/builder.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs
async fn sync_external_scores(
logger: &Logger, scorer: &Mutex<CombinedScorer<Arc<Graph>, Arc<Logger>>>,
node_metrics: &RwLock<NodeMetrics>, kv_store: Arc<DynStore>, url: &String,
) -> () {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this return a Result?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so - this function cannot fail?

Comment threadsrc/scoring.rs Outdated
match body {
Err(e) => {
log_error!(logger, "Failed to read external scores update: {}", e);
return;

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's avoid these explicit returns if possible.

@joostjagerjoostjagerFeb 7, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, not necessary. I wanted to exit the parent function with these returns, but just letting it run would have the same result.

In this current revision I now have a few real ones, after unwrapping the matches a bit.

@joostjager

Copy link
Copy Markdown
ContributorAuthor

Comments addressed. Now need to decide in lightningdevkit/rust-lightning#3562 how to read the combined scorer from disk (with local and merged data), and apply that in this PR.

Comment threadsrc/builder.rs
Comment threadsrc/builder.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs
) -> () {
let response = tokio::time::timeout(
Duration::from_secs(EXTERNAL_PATHFINDING_SCORES_SYNC_TIMEOUT_SECS),
reqwest::get(url),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should create a reqwest client instead of doing reqwest::get, otherwise it needs to redo TLS and everything each time

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should create a reqwest client instead of doing reqwest::get, otherwise it needs to redo TLS and everything each time

Right, but establishing a new connection once an hour is reasonable? And probably preferable compared to keep a connection open if we only use it once an hour?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah yeah true

@joostjager

Copy link
Copy Markdown
ContributorAuthor

This has been parked, but I suppose with the new develop branch we can merge this after a rebase.

@tnull

Copy link
Copy Markdown
Collaborator

This has been parked, but I suppose with the new develop branch we can merge this after a rebase.

Yes, please rebase!

@tnull

tnull commented Oct 7, 2025

Copy link
Copy Markdown
Collaborator

Gentle ping @joostjager

@joostjager

Copy link
Copy Markdown
ContributorAuthor

Rebased

@tnulltnull left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two minor comments, otherwise should look good.

Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
@tnull

Copy link
Copy Markdown
Collaborator

@joostjager Feel free to squash the fixup. More detailed/verbose commit messages would also be appreciated.

Save external pathfinding scores in a cache so that they will be
available immediately after a node restart. Otherwise there might be a
time window where new scores need to be downloaded still and the node
operates on local data only.
@joostjager

Copy link
Copy Markdown
ContributorAuthor

Squashed without changes.

@joostjager
joostjager merged commit 9d71d3a into lightningdevkit:mainOct 23, 2025
8 of 15 checks passed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Allow to download and import a scorer from a binary file

3 participants

@joostjager@tnull@benthecarman
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Periodical external pathfinding scores merge by joostjager · Pull Request #449 · lightningdevkit/ldk-node · GitHub
Skip to content

Periodical external pathfinding scores merge - #449

Merged
joostjager merged 3 commits into
lightningdevkit:mainfrom
joostjager:import-scores
Oct 23, 2025
Merged

Periodical external pathfinding scores merge#449
joostjager merged 3 commits into
lightningdevkit:mainfrom
joostjager:import-scores

Conversation

@joostjager

@joostjagerjoostjager commented Jan 29, 2025

Copy link
Copy Markdown
Contributor

Fixes#313

Depends on lightningdevkit/rust-lightning#3562

Export functionality in #458

@joostjagerjoostjager changed the title Import scoresPeriodical external score mergeJan 30, 2025
@joostjager
joostjagerforce-pushed the import-scores branch 2 times, most recently from e0b7070 to 58acc12CompareJanuary 30, 2025 13:31
Comment threadsrc/config.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 3 times, most recently from 5858404 to fdf2b5dCompareJanuary 30, 2025 14:04
@joostjager
joostjager marked this pull request as ready for review January 31, 2025 08:53
Comment threadCargo.toml Outdated
@tnulltnull added this to the 0.6 milestone Jan 31, 2025

@tnulltnull left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Did a first pass, already looks pretty good!

Comment threadCargo.toml Outdated
Comment threadsrc/builder.rs
Comment threadsrc/builder.rs Outdated
Comment threadsrc/config.rs Outdated
Comment threadsrc/config.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 2 times, most recently from 5a42ff9 to 0cf5774CompareFebruary 1, 2025 17:04
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 3 times, most recently from 619c9c9 to 6ded8afCompareFebruary 3, 2025 10:01
Comment threadsrc/builder.rs Outdated
Comment threadsrc/lib.rs
Comment threadsrc/scoring.rs
Comment threadsrc/lib.rs Outdated
Comment threadsrc/config.rs Outdated
Comment threadsrc/builder.rs Outdated
Comment threadsrc/builder.rs Outdated
Comment threadsrc/io/utils.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/lib.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 5 times, most recently from 7bf68af to 14167ebCompareFebruary 4, 2025 12:33
@joostjager
joostjager requested a review from tnullFebruary 4, 2025 14:43
@joostjagerjoostjager changed the title Periodical external score mergePeriodical external pathfinding scores mergeFeb 5, 2025
Comment threadsrc/builder.rs Outdated
Comment threadsrc/builder.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs
async fn sync_external_scores(
logger: &Logger, scorer: &Mutex<CombinedScorer<Arc<Graph>, Arc<Logger>>>,
node_metrics: &RwLock<NodeMetrics>, kv_store: Arc<DynStore>, url: &String,
) -> () {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this return a Result?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so - this function cannot fail?

Comment threadsrc/scoring.rs Outdated
match body {
Err(e) => {
log_error!(logger, "Failed to read external scores update: {}", e);
return;

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's avoid these explicit returns if possible.

@joostjagerjoostjagerFeb 7, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, not necessary. I wanted to exit the parent function with these returns, but just letting it run would have the same result.

In this current revision I now have a few real ones, after unwrapping the matches a bit.

@joostjager

Copy link
Copy Markdown
ContributorAuthor

Comments addressed. Now need to decide in lightningdevkit/rust-lightning#3562 how to read the combined scorer from disk (with local and merged data), and apply that in this PR.

Comment threadsrc/builder.rs
Comment threadsrc/builder.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs
) -> () {
let response = tokio::time::timeout(
Duration::from_secs(EXTERNAL_PATHFINDING_SCORES_SYNC_TIMEOUT_SECS),
reqwest::get(url),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should create a reqwest client instead of doing reqwest::get, otherwise it needs to redo TLS and everything each time

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should create a reqwest client instead of doing reqwest::get, otherwise it needs to redo TLS and everything each time

Right, but establishing a new connection once an hour is reasonable? And probably preferable compared to keep a connection open if we only use it once an hour?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah yeah true

@joostjager

Copy link
Copy Markdown
ContributorAuthor

This has been parked, but I suppose with the new develop branch we can merge this after a rebase.

@tnull

Copy link
Copy Markdown
Collaborator

This has been parked, but I suppose with the new develop branch we can merge this after a rebase.

Yes, please rebase!

@tnull

tnull commented Oct 7, 2025

Copy link
Copy Markdown
Collaborator

Gentle ping @joostjager

@joostjager

Copy link
Copy Markdown
ContributorAuthor

Rebased

@tnulltnull left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two minor comments, otherwise should look good.

Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
@tnull

Copy link
Copy Markdown
Collaborator

@joostjager Feel free to squash the fixup. More detailed/verbose commit messages would also be appreciated.

Save external pathfinding scores in a cache so that they will be
available immediately after a node restart. Otherwise there might be a
time window where new scores need to be downloaded still and the node
operates on local data only.
@joostjager

Copy link
Copy Markdown
ContributorAuthor

Squashed without changes.

@joostjager
joostjager merged commit 9d71d3a into lightningdevkit:mainOct 23, 2025
8 of 15 checks passed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Allow to download and import a scorer from a binary file

3 participants

@joostjager@tnull@benthecarman
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Periodical external pathfinding scores merge by joostjager · Pull Request #449 · lightningdevkit/ldk-node · GitHub
Skip to content

Periodical external pathfinding scores merge - #449

Merged
joostjager merged 3 commits into
lightningdevkit:mainfrom
joostjager:import-scores
Oct 23, 2025
Merged

Periodical external pathfinding scores merge#449
joostjager merged 3 commits into
lightningdevkit:mainfrom
joostjager:import-scores

Conversation

@joostjager

@joostjagerjoostjager commented Jan 29, 2025

Copy link
Copy Markdown
Contributor

Fixes#313

Depends on lightningdevkit/rust-lightning#3562

Export functionality in #458

@joostjagerjoostjager changed the title Import scoresPeriodical external score mergeJan 30, 2025
@joostjager
joostjagerforce-pushed the import-scores branch 2 times, most recently from e0b7070 to 58acc12CompareJanuary 30, 2025 13:31
Comment threadsrc/config.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 3 times, most recently from 5858404 to fdf2b5dCompareJanuary 30, 2025 14:04
@joostjager
joostjager marked this pull request as ready for review January 31, 2025 08:53
Comment threadCargo.toml Outdated
@tnulltnull added this to the 0.6 milestone Jan 31, 2025

@tnulltnull left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Did a first pass, already looks pretty good!

Comment threadCargo.toml Outdated
Comment threadsrc/builder.rs
Comment threadsrc/builder.rs Outdated
Comment threadsrc/config.rs Outdated
Comment threadsrc/config.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 2 times, most recently from 5a42ff9 to 0cf5774CompareFebruary 1, 2025 17:04
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 3 times, most recently from 619c9c9 to 6ded8afCompareFebruary 3, 2025 10:01
Comment threadsrc/builder.rs Outdated
Comment threadsrc/lib.rs
Comment threadsrc/scoring.rs
Comment threadsrc/lib.rs Outdated
Comment threadsrc/config.rs Outdated
Comment threadsrc/builder.rs Outdated
Comment threadsrc/builder.rs Outdated
Comment threadsrc/io/utils.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/lib.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 5 times, most recently from 7bf68af to 14167ebCompareFebruary 4, 2025 12:33
@joostjager
joostjager requested a review from tnullFebruary 4, 2025 14:43
@joostjagerjoostjager changed the title Periodical external score mergePeriodical external pathfinding scores mergeFeb 5, 2025
Comment threadsrc/builder.rs Outdated
Comment threadsrc/builder.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs
async fn sync_external_scores(
logger: &Logger, scorer: &Mutex<CombinedScorer<Arc<Graph>, Arc<Logger>>>,
node_metrics: &RwLock<NodeMetrics>, kv_store: Arc<DynStore>, url: &String,
) -> () {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this return a Result?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so - this function cannot fail?

Comment threadsrc/scoring.rs Outdated
match body {
Err(e) => {
log_error!(logger, "Failed to read external scores update: {}", e);
return;

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's avoid these explicit returns if possible.

@joostjagerjoostjagerFeb 7, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, not necessary. I wanted to exit the parent function with these returns, but just letting it run would have the same result.

In this current revision I now have a few real ones, after unwrapping the matches a bit.

@joostjager

Copy link
Copy Markdown
ContributorAuthor

Comments addressed. Now need to decide in lightningdevkit/rust-lightning#3562 how to read the combined scorer from disk (with local and merged data), and apply that in this PR.

Comment threadsrc/builder.rs
Comment threadsrc/builder.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs
) -> () {
let response = tokio::time::timeout(
Duration::from_secs(EXTERNAL_PATHFINDING_SCORES_SYNC_TIMEOUT_SECS),
reqwest::get(url),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should create a reqwest client instead of doing reqwest::get, otherwise it needs to redo TLS and everything each time

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should create a reqwest client instead of doing reqwest::get, otherwise it needs to redo TLS and everything each time

Right, but establishing a new connection once an hour is reasonable? And probably preferable compared to keep a connection open if we only use it once an hour?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah yeah true

@joostjager

Copy link
Copy Markdown
ContributorAuthor

This has been parked, but I suppose with the new develop branch we can merge this after a rebase.

@tnull

Copy link
Copy Markdown
Collaborator

This has been parked, but I suppose with the new develop branch we can merge this after a rebase.

Yes, please rebase!

@tnull

tnull commented Oct 7, 2025

Copy link
Copy Markdown
Collaborator

Gentle ping @joostjager

@joostjager

Copy link
Copy Markdown
ContributorAuthor

Rebased

@tnulltnull left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two minor comments, otherwise should look good.

Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
@tnull

Copy link
Copy Markdown
Collaborator

@joostjager Feel free to squash the fixup. More detailed/verbose commit messages would also be appreciated.

Save external pathfinding scores in a cache so that they will be
available immediately after a node restart. Otherwise there might be a
time window where new scores need to be downloaded still and the node
operates on local data only.
@joostjager

Copy link
Copy Markdown
ContributorAuthor

Squashed without changes.

@joostjager
joostjager merged commit 9d71d3a into lightningdevkit:mainOct 23, 2025
8 of 15 checks passed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Allow to download and import a scorer from a binary file

3 participants

@joostjager@tnull@benthecarman
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Periodical external pathfinding scores merge by joostjager · Pull Request #449 · lightningdevkit/ldk-node · GitHub
Skip to content

Periodical external pathfinding scores merge - #449

Merged
joostjager merged 3 commits into
lightningdevkit:mainfrom
joostjager:import-scores
Oct 23, 2025
Merged

Periodical external pathfinding scores merge#449
joostjager merged 3 commits into
lightningdevkit:mainfrom
joostjager:import-scores

Conversation

@joostjager

@joostjagerjoostjager commented Jan 29, 2025

Copy link
Copy Markdown
Contributor

Fixes#313

Depends on lightningdevkit/rust-lightning#3562

Export functionality in #458

@joostjagerjoostjager changed the title Import scoresPeriodical external score mergeJan 30, 2025
@joostjager
joostjagerforce-pushed the import-scores branch 2 times, most recently from e0b7070 to 58acc12CompareJanuary 30, 2025 13:31
Comment threadsrc/config.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 3 times, most recently from 5858404 to fdf2b5dCompareJanuary 30, 2025 14:04
@joostjager
joostjager marked this pull request as ready for review January 31, 2025 08:53
Comment threadCargo.toml Outdated
@tnulltnull added this to the 0.6 milestone Jan 31, 2025

@tnulltnull left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Did a first pass, already looks pretty good!

Comment threadCargo.toml Outdated
Comment threadsrc/builder.rs
Comment threadsrc/builder.rs Outdated
Comment threadsrc/config.rs Outdated
Comment threadsrc/config.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 2 times, most recently from 5a42ff9 to 0cf5774CompareFebruary 1, 2025 17:04
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 3 times, most recently from 619c9c9 to 6ded8afCompareFebruary 3, 2025 10:01
Comment threadsrc/builder.rs Outdated
Comment threadsrc/lib.rs
Comment threadsrc/scoring.rs
Comment threadsrc/lib.rs Outdated
Comment threadsrc/config.rs Outdated
Comment threadsrc/builder.rs Outdated
Comment threadsrc/builder.rs Outdated
Comment threadsrc/io/utils.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/lib.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 5 times, most recently from 7bf68af to 14167ebCompareFebruary 4, 2025 12:33
@joostjager
joostjager requested a review from tnullFebruary 4, 2025 14:43
@joostjagerjoostjager changed the title Periodical external score mergePeriodical external pathfinding scores mergeFeb 5, 2025
Comment threadsrc/builder.rs Outdated
Comment threadsrc/builder.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs
async fn sync_external_scores(
logger: &Logger, scorer: &Mutex<CombinedScorer<Arc<Graph>, Arc<Logger>>>,
node_metrics: &RwLock<NodeMetrics>, kv_store: Arc<DynStore>, url: &String,
) -> () {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this return a Result?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so - this function cannot fail?

Comment threadsrc/scoring.rs Outdated
match body {
Err(e) => {
log_error!(logger, "Failed to read external scores update: {}", e);
return;

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's avoid these explicit returns if possible.

@joostjagerjoostjagerFeb 7, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, not necessary. I wanted to exit the parent function with these returns, but just letting it run would have the same result.

In this current revision I now have a few real ones, after unwrapping the matches a bit.

@joostjager

Copy link
Copy Markdown
ContributorAuthor

Comments addressed. Now need to decide in lightningdevkit/rust-lightning#3562 how to read the combined scorer from disk (with local and merged data), and apply that in this PR.

Comment threadsrc/builder.rs
Comment threadsrc/builder.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs
) -> () {
let response = tokio::time::timeout(
Duration::from_secs(EXTERNAL_PATHFINDING_SCORES_SYNC_TIMEOUT_SECS),
reqwest::get(url),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should create a reqwest client instead of doing reqwest::get, otherwise it needs to redo TLS and everything each time

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should create a reqwest client instead of doing reqwest::get, otherwise it needs to redo TLS and everything each time

Right, but establishing a new connection once an hour is reasonable? And probably preferable compared to keep a connection open if we only use it once an hour?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah yeah true

@joostjager

Copy link
Copy Markdown
ContributorAuthor

This has been parked, but I suppose with the new develop branch we can merge this after a rebase.

@tnull

Copy link
Copy Markdown
Collaborator

This has been parked, but I suppose with the new develop branch we can merge this after a rebase.

Yes, please rebase!

@tnull

tnull commented Oct 7, 2025

Copy link
Copy Markdown
Collaborator

Gentle ping @joostjager

@joostjager

Copy link
Copy Markdown
ContributorAuthor

Rebased

@tnulltnull left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two minor comments, otherwise should look good.

Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
@tnull

Copy link
Copy Markdown
Collaborator

@joostjager Feel free to squash the fixup. More detailed/verbose commit messages would also be appreciated.

Save external pathfinding scores in a cache so that they will be
available immediately after a node restart. Otherwise there might be a
time window where new scores need to be downloaded still and the node
operates on local data only.
@joostjager

Copy link
Copy Markdown
ContributorAuthor

Squashed without changes.

@joostjager
joostjager merged commit 9d71d3a into lightningdevkit:mainOct 23, 2025
8 of 15 checks passed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Allow to download and import a scorer from a binary file

3 participants

@joostjager@tnull@benthecarman
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); Periodical external pathfinding scores merge by joostjager · Pull Request #449 · lightningdevkit/ldk-node · GitHub
Skip to content

Periodical external pathfinding scores merge - #449

Merged
joostjager merged 3 commits into
lightningdevkit:mainfrom
joostjager:import-scores
Oct 23, 2025
Merged

Periodical external pathfinding scores merge#449
joostjager merged 3 commits into
lightningdevkit:mainfrom
joostjager:import-scores

Conversation

@joostjager

@joostjagerjoostjager commented Jan 29, 2025

Copy link
Copy Markdown
Contributor

Fixes#313

Depends on lightningdevkit/rust-lightning#3562

Export functionality in #458

@joostjagerjoostjager changed the title Import scoresPeriodical external score mergeJan 30, 2025
@joostjager
joostjagerforce-pushed the import-scores branch 2 times, most recently from e0b7070 to 58acc12CompareJanuary 30, 2025 13:31
Comment threadsrc/config.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 3 times, most recently from 5858404 to fdf2b5dCompareJanuary 30, 2025 14:04
@joostjager
joostjager marked this pull request as ready for review January 31, 2025 08:53
Comment threadCargo.toml Outdated
@tnulltnull added this to the 0.6 milestone Jan 31, 2025

@tnulltnull left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Did a first pass, already looks pretty good!

Comment threadCargo.toml Outdated
Comment threadsrc/builder.rs
Comment threadsrc/builder.rs Outdated
Comment threadsrc/config.rs Outdated
Comment threadsrc/config.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 2 times, most recently from 5a42ff9 to 0cf5774CompareFebruary 1, 2025 17:04
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 3 times, most recently from 619c9c9 to 6ded8afCompareFebruary 3, 2025 10:01
Comment threadsrc/builder.rs Outdated
Comment threadsrc/lib.rs
Comment threadsrc/scoring.rs
Comment threadsrc/lib.rs Outdated
Comment threadsrc/config.rs Outdated
Comment threadsrc/builder.rs Outdated
Comment threadsrc/builder.rs Outdated
Comment threadsrc/io/utils.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/lib.rs Outdated
@joostjager
joostjagerforce-pushed the import-scores branch 5 times, most recently from 7bf68af to 14167ebCompareFebruary 4, 2025 12:33
@joostjager
joostjager requested a review from tnullFebruary 4, 2025 14:43
@joostjagerjoostjager changed the title Periodical external score mergePeriodical external pathfinding scores mergeFeb 5, 2025
Comment threadsrc/builder.rs Outdated
Comment threadsrc/builder.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/lib.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs
async fn sync_external_scores(
logger: &Logger, scorer: &Mutex<CombinedScorer<Arc<Graph>, Arc<Logger>>>,
node_metrics: &RwLock<NodeMetrics>, kv_store: Arc<DynStore>, url: &String,
) -> () {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this return a Result?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so - this function cannot fail?

Comment threadsrc/scoring.rs Outdated
match body {
Err(e) => {
log_error!(logger, "Failed to read external scores update: {}", e);
return;

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's avoid these explicit returns if possible.

@joostjagerjoostjagerFeb 7, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, not necessary. I wanted to exit the parent function with these returns, but just letting it run would have the same result.

In this current revision I now have a few real ones, after unwrapping the matches a bit.

@joostjager

Copy link
Copy Markdown
ContributorAuthor

Comments addressed. Now need to decide in lightningdevkit/rust-lightning#3562 how to read the combined scorer from disk (with local and merged data), and apply that in this PR.

Comment threadsrc/builder.rs
Comment threadsrc/builder.rs Outdated
Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs
) -> () {
let response = tokio::time::timeout(
Duration::from_secs(EXTERNAL_PATHFINDING_SCORES_SYNC_TIMEOUT_SECS),
reqwest::get(url),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should create a reqwest client instead of doing reqwest::get, otherwise it needs to redo TLS and everything each time

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should create a reqwest client instead of doing reqwest::get, otherwise it needs to redo TLS and everything each time

Right, but establishing a new connection once an hour is reasonable? And probably preferable compared to keep a connection open if we only use it once an hour?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah yeah true

@joostjager

Copy link
Copy Markdown
ContributorAuthor

This has been parked, but I suppose with the new develop branch we can merge this after a rebase.

@tnull

Copy link
Copy Markdown
Collaborator

This has been parked, but I suppose with the new develop branch we can merge this after a rebase.

Yes, please rebase!

@tnull

tnull commented Oct 7, 2025

Copy link
Copy Markdown
Collaborator

Gentle ping @joostjager

@joostjager

Copy link
Copy Markdown
ContributorAuthor

Rebased

@tnulltnull left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two minor comments, otherwise should look good.

Comment threadsrc/scoring.rs Outdated
Comment threadsrc/scoring.rs Outdated
@tnull

Copy link
Copy Markdown
Collaborator

@joostjager Feel free to squash the fixup. More detailed/verbose commit messages would also be appreciated.

Save external pathfinding scores in a cache so that they will be
available immediately after a node restart. Otherwise there might be a
time window where new scores need to be downloaded still and the node
operates on local data only.
@joostjager

Copy link
Copy Markdown
ContributorAuthor

Squashed without changes.

@joostjager
joostjager merged commit 9d71d3a into lightningdevkit:mainOct 23, 2025
8 of 15 checks passed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Allow to download and import a scorer from a binary file

3 participants

@joostjager@tnull@benthecarman