mirror of
https://github.com/TriliumNext/Notes.git
synced 2025-07-29 11:02:28 +08:00
scan only one port instead of 10, https://github.com/zadam/trilium/issues/1503
This commit is contained in:
parent
2d814af7f1
commit
1c75ea89ad
@ -13,7 +13,7 @@
|
||||
|
||||
<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">
|
||||
<p>
|
||||
@ -64,4 +64,4 @@
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
</html>
|
||||
|
@ -53,34 +53,32 @@ class TriliumServerFacade {
|
||||
async triggerSearchForTrilium() {
|
||||
this.setTriliumSearch({ status: 'searching' });
|
||||
|
||||
const startingPort = await this.getStartingPort();
|
||||
try {
|
||||
const port = await this.getPort();
|
||||
|
||||
for (let testedPort = startingPort; testedPort < startingPort + 10; testedPort++) {
|
||||
try {
|
||||
console.debug('Trying port ' + testedPort);
|
||||
console.debug('Trying port ' + port);
|
||||
|
||||
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') {
|
||||
this.setTriliumSearchWithVersionCheck(json, {
|
||||
status: 'found-desktop',
|
||||
port: testedPort,
|
||||
url: 'http://127.0.0.1:' + testedPort
|
||||
});
|
||||
if (json.appName === 'trilium') {
|
||||
this.setTriliumSearchWithVersionCheck(json, {
|
||||
status: 'found-desktop',
|
||||
port: port,
|
||||
url: 'http://127.0.0.1:' + port
|
||||
});
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
catch (error) {
|
||||
// continue
|
||||
return;
|
||||
}
|
||||
}
|
||||
catch (error) {
|
||||
// continue
|
||||
}
|
||||
|
||||
const {triliumServerUrl} = await browser.storage.sync.get("triliumServerUrl");
|
||||
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");
|
||||
|
||||
if (triliumDesktopPort) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user