elpatron/octo-funnel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Activity

v0.1.6.1: UI: Link-Button statt Copy, Disable idempotent; build artifacts updated

Browse Source
This commit is contained in:
Markus F.J. Busche
2025-09-20 17:48:54 +02:00
parent f3aa92cd87
commit 547cad7a21
6 changed files with 215 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
octoprint_tailscale_funnel/octoprint_tailscale_funnel/static/js/tailscale_funnel.js
View File

@@ -11,6 +11,13 @@ $(function() {
self.tailscaleInstalled = ko.observable(true);
self.tailscaleRunning = ko.observable(true);
// Computed URL used across UI and copy handler
self.currentUrl = ko.pureComputed(function() {
var url = (typeof self.publicUrl === 'function') ? self.publicUrl() : self.publicUrl;
if (!url || url === "Not available") return "";
return ("" + url).trim();
});
// Button states
self.refreshInProgress = ko.observable(false);
self.toggleInProgress = ko.observable(false);
@@ -126,38 +133,39 @@ $(function() {
});
};
// Copy URL to clipboard
self.copyUrlToClipboard = function() {
if (self.publicUrl() && self.publicUrl() !== "Not available") {
navigator.clipboard.writeText(self.publicUrl()).then(function() {
// Copy URL to clipboard (robust, event-safe)
self.copyUrlToClipboard = function(_, event) {
if (event && event.stopPropagation) event.stopPropagation();
var url = self.currentUrl();
if (!url) return;
(navigator.clipboard && navigator.clipboard.writeText ? navigator.clipboard.writeText(url) : Promise.reject()).then(function() {
new PNotify({
title: "Copied to Clipboard",
text: "Public URL copied to clipboard",
type: "success"
});
}, function() {
// Fallback for older browsers
var textArea = document.createElement("textarea");
textArea.value = url;
document.body.appendChild(textArea);
textArea.select();
try {
document.execCommand("copy");
new PNotify({
title: "Copied to Clipboard",
text: "Public URL copied to clipboard",
type: "success"
});
}, function() {
// Fallback for older browsers
var textArea = document.createElement("textarea");
textArea.value = self.publicUrl();
document.body.appendChild(textArea);
textArea.select();
try {
document.execCommand("copy");
new PNotify({
title: "Copied to Clipboard",
text: "Public URL copied to clipboard",
type: "success"
});
} catch (err) {
new PNotify({
title: "Copy Failed",
text: "Failed to copy URL to clipboard",
type: "error"
});
}
document.body.removeChild(textArea);
});
}
} catch (err) {
new PNotify({
title: "Copy Failed",
text: "Failed to copy URL to clipboard",
type: "error"
});
}
document.body.removeChild(textArea);
});
};
// Handle messages from the backend

50
octoprint_tailscale_funnel/octoprint_tailscale_funnel/tailscale_interface.py
View File

@@ -2,6 +2,7 @@
from __future__ import absolute_import
import subprocess
import time
import json
import re
@@ -201,22 +202,49 @@ class TailscaleInterface:
if not self.is_tailscale_installed():
raise TailscaleNotInstalledError("Tailscale is not installed")
# Try new CLI first, then legacy
cmds = [
# Newer: turn off serve mapping and remove funnel config
"tailscale serve --http={p} off".format(p=port),
# Execute multiple disable attempts tolerantly (idempotent)
commands = [
# Try to disable funnel first (new + legacy)
"tailscale funnel reset",
# Legacy
"tailscale funnel {p} off".format(p=port),
# Then disable serve mappings (newer variants)
"tailscale serve --http={p} off".format(p=port),
"tailscale serve --https={p} off".format(p=port),
]
result = self._run_first_success(cmds)
if result["success"]:
# Double-check disabled
any_succeeded = False
for cmd in commands:
res = self._run_first_success([cmd])
if res and res.get("success"):
any_succeeded = True
else:
# Treat "not enabled"/"no such" errors as harmless for idempotency
err = (res or {}).get("error") or ""
if isinstance(err, str) and (
"not enabled" in err.lower()
or "no handlers" in err.lower()
or "no such" in err.lower()
or "not found" in err.lower()
or "already off" in err.lower()
):
any_succeeded = True
# Poll for a short time until status reflects disabled
for _ in range(6): # ~3.0s total
try:
return not self.is_funnel_enabled()
if not self.is_funnel_enabled():
return True
except Exception:
return True
return False
# If status check fails, assume disabled if we attempted commands
if any_succeeded:
return True
time.sleep(0.5)
# Final status check
try:
return not self.is_funnel_enabled()
except Exception:
return any_succeeded
def get_public_url(self):
"""

6
octoprint_tailscale_funnel/octoprint_tailscale_funnel/templates/tailscale_funnel_settings.jinja2
View File

@@ -34,9 +34,9 @@
<span id="tailscale_funnel_url" class="input-xlarge uneditable-input" data-bind="text: publicUrl">
Not available
</span>
<button id="tailscale_funnel_copy_url_btn" class="btn" type="button" data-bind="click: copyUrlToClipboard, enable: publicUrl() && publicUrl() !== 'Not available'">
<i class="fas fa-copy"></i> Copy
</button>
<a id="tailscale_funnel_open_url_btn" class="btn" target="_blank" rel="noopener" data-bind="attr: { href: currentUrl }, visible: currentUrl()">
<i class="fas fa-external-link-alt"></i> Open
</a>
</div>
<span class="help-block">Public URL for accessing your OctoPrint instance</span>
</div>

2
octoprint_tailscale_funnel/setup.py
View File

@@ -14,7 +14,7 @@ plugin_package = "octoprint_tailscale_funnel"
plugin_name = "OctoPrint-Tailscale-Funnel"
# The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
plugin_version = "0.1.5"
plugin_version = "0.1.6.1"
# The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
# module

2
octoprint_tailscale_funnel/update.json
View File

@@ -1,4 +1,4 @@
{
"version": "0.1.5"
"version": "0.1.6.1"
}