Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-10-30 20:41:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

scan only one port instead of 10, https://github.com/zadam/trilium/issues/1503

Browse Source
This commit is contained in:
zadam 2020-12-31 00:48:23 +01:00
parent 2d814af7f1
commit 1c75ea89ad
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
options/options.html
View File

@ -13,7 +13,7 @@
<h2>Trilium desktop instance</h2> <h2>Trilium desktop instance</h2>
<p>Web clipper by default tries to find a running desktop instance on ports 37740 - 37749. If you configured your Trilium desktop app to run on a different port, you can specify it here (otherwise keep it empty).</p> <p>Web clipper by default tries to find a running desktop instance on port 37740. If you configured your Trilium desktop app to run on a different port, you can specify it here (otherwise keep it empty).</p>
<form id="trilium-desktop-setup-form"> <form id="trilium-desktop-setup-form">
<p> <p>

38
trilium_server_facade.js
View File

@ -53,34 +53,32 @@ class TriliumServerFacade {
async triggerSearchForTrilium() { async triggerSearchForTrilium() {
this.setTriliumSearch({ status: 'searching' }); this.setTriliumSearch({ status: 'searching' });
const startingPort = await this.getStartingPort(); try {
const port = await this.getPort();
for (let testedPort = startingPort; testedPort < startingPort + 10; testedPort++) { console.debug('Trying port ' + port);
try {
console.debug('Trying port ' + testedPort);
const resp = await fetch(`http://127.0.0.1:${testedPort}/api/clipper/handshake`); const resp = await fetch(`http://127.0.0.1:${port}/api/clipper/handshake`);
const text = await resp.text(); const text = await resp.text();
console.log("Received response:", text); console.log("Received response:", text);
const json = JSON.parse(text); const json = JSON.parse(text);
if (json.appName === 'trilium') { if (json.appName === 'trilium') {
this.setTriliumSearchWithVersionCheck(json, { this.setTriliumSearchWithVersionCheck(json, {
status: 'found-desktop', status: 'found-desktop',
port: testedPort, port: port,
url: 'http://127.0.0.1:' + testedPort url: 'http://127.0.0.1:' + port
}); });
return; return;
}
}
catch (error) {
// continue
} }
} }
catch (error) {
// continue
}
const {triliumServerUrl} = await browser.storage.sync.get("triliumServerUrl"); const {triliumServerUrl} = await browser.storage.sync.get("triliumServerUrl");
const {authToken} = await browser.storage.sync.get("authToken"); const {authToken} = await browser.storage.sync.get("authToken");
@ -136,7 +134,7 @@ class TriliumServerFacade {
}); });
} }
async getStartingPort() { async getPort() {
const {triliumDesktopPort} = await browser.storage.sync.get("triliumDesktopPort"); const {triliumDesktopPort} = await browser.storage.sync.get("triliumDesktopPort");
if (triliumDesktopPort) { if (triliumDesktopPort) {