Compare commits
20 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
876048f60e | ||
|
4ffb6f82b9 | ||
|
a68b7c6463 | ||
|
73c5da01f9 | ||
|
f225acc752 | ||
|
13dd1dbd44 | ||
|
f5a34df9e5 | ||
|
5e448e8041 | ||
|
7bffb76749 | ||
|
dd89c5f650 | ||
|
ac3298c40e | ||
|
708c652d21 | ||
|
fd5ff20743 | ||
|
87449641f6 | ||
|
731cd207dd | ||
|
a5489de212 | ||
|
c0d4448dc1 | ||
|
0d43e181c8 | ||
|
f60068b01f | ||
|
4d484c5023 |
1
docs
Symbolic link
1
docs
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
octoprint_tailscale_funnel/octoprint_tailscale_funnel/docs
|
@@ -1,7 +1,6 @@
|
|||||||
include README.md
|
include README.md
|
||||||
include LICENSE
|
include LICENSE
|
||||||
include requirements.txt
|
|
||||||
include setup.py
|
include setup.py
|
||||||
recursive-include static *
|
recursive-include octoprint_tailscale_funnel/static *
|
||||||
recursive-include templates *
|
recursive-include octoprint_tailscale_funnel/templates *
|
||||||
recursive-include tests *
|
recursive-include tests *
|
@@ -2,6 +2,8 @@
|
|||||||
|
|
||||||
This plugin makes your OctoPrint instance accessible from anywhere via Tailscale Funnel, without needing to configure port forwarding, dynamic DNS, or complex firewall settings.
|
This plugin makes your OctoPrint instance accessible from anywhere via Tailscale Funnel, without needing to configure port forwarding, dynamic DNS, or complex firewall settings.
|
||||||
|
|
||||||
|
Disclaimer: *This plugin was partially vibe-coded*.
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
* Enable/disable Tailscale Funnel access directly from OctoPrint's settings
|
* Enable/disable Tailscale Funnel access directly from OctoPrint's settings
|
||||||
@@ -9,6 +11,10 @@ This plugin makes your OctoPrint instance accessible from anywhere via Tailscale
|
|||||||
* Display the public URL for accessing OctoPrint remotely
|
* Display the public URL for accessing OctoPrint remotely
|
||||||
* Configure the port to expose via Funnel
|
* Configure the port to expose via Funnel
|
||||||
|
|
||||||
|
## Screenshot
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
## Requirements
|
## Requirements
|
||||||
|
|
||||||
* OctoPrint 1.3.0 or higher
|
* OctoPrint 1.3.0 or higher
|
||||||
|
@@ -91,7 +91,7 @@ class TailscaleFunnelPlugin(octoprint.plugin.StartupPlugin,
|
|||||||
|
|
||||||
def get_assets(self):
|
def get_assets(self):
|
||||||
return dict(
|
return dict(
|
||||||
js=["js/tailscale_funnel.js"],
|
js=["js/tailscale_funnel.js", "js/tailscale_funnel_navbar.js"],
|
||||||
css=["css/tailscale_funnel.css"],
|
css=["css/tailscale_funnel.css"],
|
||||||
less=["less/tailscale_funnel.less"]
|
less=["less/tailscale_funnel.less"]
|
||||||
)
|
)
|
||||||
@@ -100,7 +100,8 @@ class TailscaleFunnelPlugin(octoprint.plugin.StartupPlugin,
|
|||||||
|
|
||||||
def get_template_configs(self):
|
def get_template_configs(self):
|
||||||
return [
|
return [
|
||||||
dict(type="settings", custom_bindings=True, template="tailscale_funnel_settings.jinja2")
|
dict(type="settings", custom_bindings=True, template="tailscale_funnel_settings.jinja2"),
|
||||||
|
dict(type="navbar", name="Funnel", custom_bindings=False, template="tailscale_funnel_navbar.jinja2")
|
||||||
]
|
]
|
||||||
|
|
||||||
##~~ BlueprintPlugin mixin
|
##~~ BlueprintPlugin mixin
|
||||||
|
Binary file not shown.
After Width: | Height: | Size: 36 KiB |
@@ -39,3 +39,14 @@
|
|||||||
border-color: #faebcc;
|
border-color: #faebcc;
|
||||||
color: #8a6d3b;
|
color: #8a6d3b;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Navbar Button Farbkennung */
|
||||||
|
#navbar_plugin_tailscale_funnel > a.tsf-enabled {
|
||||||
|
background-color: #5cb85c;
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
#navbar_plugin_tailscale_funnel > a.tsf-disabled {
|
||||||
|
background-color: #777;
|
||||||
|
color: #fff;
|
||||||
|
}
|
@@ -0,0 +1,105 @@
|
|||||||
|
$(function() {
|
||||||
|
var lastEnabled = null;
|
||||||
|
|
||||||
|
function refreshNavbarStatus() {
|
||||||
|
var $status = $("#tsf_nav_status");
|
||||||
|
var $openLi = $("#tsf_nav_open_li");
|
||||||
|
var $open = $("#tsf_nav_open");
|
||||||
|
var $toggleText = $("#tsf_nav_toggle_text");
|
||||||
|
var $btn = $("#navbar_plugin_tailscale_funnel > a");
|
||||||
|
if ($status.length === 0) return;
|
||||||
|
$status.text("Checking...");
|
||||||
|
$.ajax({
|
||||||
|
url: PLUGIN_BASEURL + "tailscale_funnel/status",
|
||||||
|
type: "GET",
|
||||||
|
dataType: "json",
|
||||||
|
success: function(resp) {
|
||||||
|
if (resp && resp.status === "success") {
|
||||||
|
var enabled = !!(resp.data && resp.data.funnel_enabled);
|
||||||
|
var url = resp.data && resp.data.public_url ? resp.data.public_url : "";
|
||||||
|
$status.text(enabled ? "Enabled" : "Disabled");
|
||||||
|
$toggleText.text(enabled ? "Disable" : "Enable");
|
||||||
|
$btn.toggleClass('tsf-enabled', enabled).toggleClass('tsf-disabled', !enabled);
|
||||||
|
lastEnabled = enabled;
|
||||||
|
if (enabled && url) {
|
||||||
|
$open.attr("href", url);
|
||||||
|
$openLi.removeClass("hidden");
|
||||||
|
} else {
|
||||||
|
$open.attr("href", "#");
|
||||||
|
$openLi.addClass("hidden");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
$status.text("Error");
|
||||||
|
$toggleText.text("Enable");
|
||||||
|
$btn.removeClass('tsf-enabled tsf-disabled');
|
||||||
|
$openLi.addClass("hidden");
|
||||||
|
}
|
||||||
|
},
|
||||||
|
error: function() {
|
||||||
|
$status.text("Error");
|
||||||
|
$toggleText.text("Enable");
|
||||||
|
$btn.removeClass('tsf-enabled tsf-disabled');
|
||||||
|
$openLi.addClass("hidden");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Refresh when dropdown opens, and on click of Refresh
|
||||||
|
$(document).on('show.bs.dropdown', '#navbar_plugin_tailscale_funnel', refreshNavbarStatus);
|
||||||
|
$(document).on('click', '#tsf_nav_refresh', function(e) {
|
||||||
|
e.preventDefault();
|
||||||
|
refreshNavbarStatus();
|
||||||
|
});
|
||||||
|
|
||||||
|
$(document).on('click', '#tsf_nav_toggle', function(e) {
|
||||||
|
e.preventDefault();
|
||||||
|
var enable = !(lastEnabled === true);
|
||||||
|
// Optional simpler confirm: nur beim Aktivieren
|
||||||
|
if (enable) {
|
||||||
|
var c = window.confirm("Enabling Funnel will make your OctoPrint instance accessible from the public internet. Continue?");
|
||||||
|
if (!c) return;
|
||||||
|
}
|
||||||
|
var action = enable ? 'enable' : 'disable';
|
||||||
|
var $status = $("#tsf_nav_status");
|
||||||
|
var $toggleText = $("#tsf_nav_toggle_text");
|
||||||
|
var $btn = $("#navbar_plugin_tailscale_funnel > a");
|
||||||
|
$status.text(enable ? 'Enabling...' : 'Disabling...');
|
||||||
|
$.ajax({
|
||||||
|
url: PLUGIN_BASEURL + 'tailscale_funnel/' + action,
|
||||||
|
type: 'POST',
|
||||||
|
dataType: 'json',
|
||||||
|
success: function(resp) {
|
||||||
|
if (resp && resp.status === 'success') {
|
||||||
|
if (enable) {
|
||||||
|
$status.text('Enabled');
|
||||||
|
$toggleText.text('Disable');
|
||||||
|
$btn.addClass('tsf-enabled').removeClass('tsf-disabled');
|
||||||
|
var url = resp.data && resp.data.public_url ? resp.data.public_url : '';
|
||||||
|
if (url) {
|
||||||
|
$("#tsf_nav_open").attr('href', url);
|
||||||
|
$("#tsf_nav_open_li").removeClass('hidden');
|
||||||
|
}
|
||||||
|
lastEnabled = true;
|
||||||
|
} else {
|
||||||
|
$status.text('Disabled');
|
||||||
|
$toggleText.text('Enable');
|
||||||
|
$btn.addClass('tsf-disabled').removeClass('tsf-enabled');
|
||||||
|
$("#tsf_nav_open").attr('href', '#');
|
||||||
|
$("#tsf_nav_open_li").addClass('hidden');
|
||||||
|
lastEnabled = false;
|
||||||
|
}
|
||||||
|
// Finaler Abgleich mit Backendstatus
|
||||||
|
setTimeout(refreshNavbarStatus, 250);
|
||||||
|
} else {
|
||||||
|
$status.text('Error');
|
||||||
|
$btn.removeClass('tsf-enabled tsf-disabled');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
error: function() {
|
||||||
|
$status.text('Error');
|
||||||
|
$btn.removeClass('tsf-enabled tsf-disabled');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@@ -0,0 +1,14 @@
|
|||||||
|
<li id="navbar_plugin_tailscale_funnel" class="dropdown">
|
||||||
|
<a class="dropdown-toggle" href="#" data-toggle="dropdown" title="Tailscale Funnel">
|
||||||
|
<i class="fas fa-share-square"></i>
|
||||||
|
<span class="visible-lg">Funnel</span>
|
||||||
|
</a>
|
||||||
|
<ul class="dropdown-menu">
|
||||||
|
<li class="disabled"><a href="#"><strong>Status:</strong> <span id="tsf_nav_status">Checking...</span></a></li>
|
||||||
|
<li id="tsf_nav_open_li" class="hidden"><a id="tsf_nav_open" href="#" target="_blank" rel="noopener"><i class="fas fa-external-link-alt"></i> Open</a></li>
|
||||||
|
<li><a id="tsf_nav_toggle" href="#"><i class="fas fa-toggle-on"></i> <span id="tsf_nav_toggle_text">Enable</span></a></li>
|
||||||
|
<li class="divider"></li>
|
||||||
|
<li><a id="tsf_nav_refresh" href="#"><i class="fas fa-sync"></i> Refresh</a></li>
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
|
|
@@ -1 +1,2 @@
|
|||||||
|
# Runtime dependency for installation via OctoPrint's Plugin Manager
|
||||||
OctoPrint>=1.3.0
|
OctoPrint>=1.3.0
|
@@ -14,7 +14,7 @@ plugin_package = "octoprint_tailscale_funnel"
|
|||||||
plugin_name = "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
|
# The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
|
||||||
plugin_version = "0.1.6.1"
|
plugin_version = "0.1.6.3"
|
||||||
|
|
||||||
# The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
|
# The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
|
||||||
# module
|
# module
|
||||||
@@ -88,7 +88,18 @@ setup_parameters = octoprint_setuptools.create_plugin_setup_parameters(
|
|||||||
)
|
)
|
||||||
|
|
||||||
if len(additional_setup_parameters):
|
if len(additional_setup_parameters):
|
||||||
|
try:
|
||||||
from octoprint.util import dict_merge
|
from octoprint.util import dict_merge
|
||||||
|
except Exception:
|
||||||
|
# Fallback to allow building without the octoprint package installed
|
||||||
|
def dict_merge(a, b):
|
||||||
|
result = dict(a)
|
||||||
|
for k, v in b.items():
|
||||||
|
if k in result and isinstance(result[k], dict) and isinstance(v, dict):
|
||||||
|
result[k] = dict_merge(result[k], v)
|
||||||
|
else:
|
||||||
|
result[k] = v
|
||||||
|
return result
|
||||||
setup_parameters = dict_merge(setup_parameters, additional_setup_parameters)
|
setup_parameters = dict_merge(setup_parameters, additional_setup_parameters)
|
||||||
|
|
||||||
setup(**setup_parameters)
|
setup(**setup_parameters)
|
@@ -1,4 +1,4 @@
|
|||||||
{
|
{
|
||||||
"version": "0.1.6.1"
|
"version": "0.1.6.3"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
7
requirements.txt
Normal file
7
requirements.txt
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
setuptools>=68
|
||||||
|
wheel>=0.41
|
||||||
|
build>=1.0
|
||||||
|
packaging>=23
|
||||||
|
# Kompatible verfügbare Version laut Index
|
||||||
|
octoprint_setuptools==1.0.3
|
||||||
|
|
147
scripts/build_plugin.sh
Executable file
147
scripts/build_plugin.sh
Executable file
@@ -0,0 +1,147 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
# Usage: scripts/build_plugin.sh [VERSION]
|
||||||
|
# - Läuft im Projekt-.venv
|
||||||
|
# - Optional: VERSION (z.B. 0.1.6.4). Wenn gesetzt, wird setup.py gepatcht.
|
||||||
|
# - Baut wheel + sdist und erstellt zusätzlich ein "normales" ZIP der sdist-Struktur.
|
||||||
|
|
||||||
|
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. && pwd)"
|
||||||
|
PLUGIN_DIR="$ROOT_DIR/octoprint_tailscale_funnel"
|
||||||
|
DIST_DIR="$PLUGIN_DIR/dist"
|
||||||
|
VENV_DIR="$ROOT_DIR/.venv"
|
||||||
|
|
||||||
|
VERSION_INPUT="${1:-}"
|
||||||
|
|
||||||
|
echo "Project root: $ROOT_DIR"
|
||||||
|
echo "Plugin dir: $PLUGIN_DIR"
|
||||||
|
echo "Venv dir: $VENV_DIR"
|
||||||
|
|
||||||
|
# Ensure venv
|
||||||
|
if [[ ! -x "$VENV_DIR/bin/python" ]]; then
|
||||||
|
echo "Creating venv at $VENV_DIR"
|
||||||
|
python3 -m venv "$VENV_DIR"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -f "$ROOT_DIR/requirements.txt" ]]; then
|
||||||
|
"$VENV_DIR/bin/pip" install -q --upgrade pip
|
||||||
|
"$VENV_DIR/bin/pip" install -q -r "$ROOT_DIR/requirements.txt"
|
||||||
|
else
|
||||||
|
"$VENV_DIR/bin/pip" install -q --upgrade pip setuptools wheel build packaging octoprint_setuptools
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Optional: bump version
|
||||||
|
if [[ -n "$VERSION_INPUT" ]]; then
|
||||||
|
echo "Setting version to $VERSION_INPUT"
|
||||||
|
"$VENV_DIR/bin/python" - "$VERSION_INPUT" "$PLUGIN_DIR/setup.py" <<'PY'
|
||||||
|
import sys, re, pathlib
|
||||||
|
ver = sys.argv[1]
|
||||||
|
setup_path = pathlib.Path(sys.argv[2])
|
||||||
|
text = setup_path.read_text()
|
||||||
|
new_text = re.sub(r'^(plugin_version\s*=\s*")([^"]*)(")', lambda m: m.group(1) + ver + m.group(3), text, flags=re.M)
|
||||||
|
setup_path.write_text(new_text)
|
||||||
|
print("Updated version to", ver)
|
||||||
|
PY
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Clean dist
|
||||||
|
mkdir -p "$DIST_DIR"
|
||||||
|
rm -f "$DIST_DIR"/*
|
||||||
|
|
||||||
|
# Build wheel + sdist
|
||||||
|
echo "Building (wheel + sdist)..."
|
||||||
|
"$VENV_DIR/bin/python" -m build --no-isolation "$PLUGIN_DIR"
|
||||||
|
|
||||||
|
# Create additional plain ZIP from sdist content (flat source zip)
|
||||||
|
SDIST_TGZ=$(ls -1 "$DIST_DIR"/*.tar.gz | tail -n1 || true)
|
||||||
|
if [[ -n "$SDIST_TGZ" ]]; then
|
||||||
|
echo "Creating plain ZIP from sdist: $SDIST_TGZ"
|
||||||
|
TMP_DIR="$(mktemp -d)"
|
||||||
|
tar -xzf "$SDIST_TGZ" -C "$TMP_DIR"
|
||||||
|
SRC_DIR="$(find "$TMP_DIR" -maxdepth 1 -type d -name 'octoprint_tailscale_funnel-*' | head -n1)"
|
||||||
|
if [[ -n "$SRC_DIR" ]]; then
|
||||||
|
ZIP_NAME="$(basename "$SRC_DIR").zip"
|
||||||
|
(cd "$SRC_DIR" && zip -rq "$DIST_DIR/$ZIP_NAME" .)
|
||||||
|
echo "Created: $DIST_DIR/$ZIP_NAME"
|
||||||
|
else
|
||||||
|
echo "WARN: Could not find extracted sdist directory to zip"
|
||||||
|
fi
|
||||||
|
rm -rf "$TMP_DIR"
|
||||||
|
else
|
||||||
|
echo "WARN: No sdist .tar.gz found, skipping plain ZIP creation"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Artifacts in $DIST_DIR:"
|
||||||
|
ls -lah "$DIST_DIR"
|
||||||
|
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
# Usage: scripts/build_plugin.sh [VERSION]
|
||||||
|
# - Läuft im Projekt-.venv
|
||||||
|
# - Optional: VERSION (z.B. 0.1.6.4). Wenn gesetzt, wird setup.py gepatcht.
|
||||||
|
# - Baut wheel + sdist und erstellt zusätzlich ein "normales" ZIP der sdist-Struktur.
|
||||||
|
|
||||||
|
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. && pwd)"
|
||||||
|
PLUGIN_DIR="$ROOT_DIR/octoprint_tailscale_funnel"
|
||||||
|
DIST_DIR="$PLUGIN_DIR/dist"
|
||||||
|
VENV_DIR="$ROOT_DIR/.venv"
|
||||||
|
|
||||||
|
VERSION_INPUT="${1:-}"
|
||||||
|
|
||||||
|
echo "Project root: $ROOT_DIR"
|
||||||
|
echo "Plugin dir: $PLUGIN_DIR"
|
||||||
|
echo "Venv dir: $VENV_DIR"
|
||||||
|
|
||||||
|
# Ensure venv
|
||||||
|
if [[ ! -x "$VENV_DIR/bin/python" ]]; then
|
||||||
|
echo "Creating venv at $VENV_DIR"
|
||||||
|
python3 -m venv "$VENV_DIR"
|
||||||
|
fi
|
||||||
|
|
||||||
|
"$VENV_DIR/bin/pip" install -q --upgrade pip setuptools wheel build packaging octoprint_setuptools
|
||||||
|
|
||||||
|
# Optional: bump version
|
||||||
|
if [[ -n "$VERSION_INPUT" ]]; then
|
||||||
|
echo "Setting version to $VERSION_INPUT"
|
||||||
|
"$VENV_DIR/bin/python" - "$VERSION_INPUT" "$PLUGIN_DIR/setup.py" <<'PY'
|
||||||
|
import sys, re, pathlib
|
||||||
|
ver = sys.argv[1]
|
||||||
|
setup_path = pathlib.Path(sys.argv[2])
|
||||||
|
text = setup_path.read_text()
|
||||||
|
new_text = re.sub(r'^(plugin_version\s*=\s*")([^"]*)(")', lambda m: m.group(1) + ver + m.group(3), text, flags=re.M)
|
||||||
|
setup_path.write_text(new_text)
|
||||||
|
print("Updated version to", ver)
|
||||||
|
PY
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Clean dist
|
||||||
|
mkdir -p "$DIST_DIR"
|
||||||
|
rm -f "$DIST_DIR"/*
|
||||||
|
|
||||||
|
# Build wheel + sdist
|
||||||
|
echo "Building (wheel + sdist)..."
|
||||||
|
"$VENV_DIR/bin/python" -m build --no-isolation "$PLUGIN_DIR"
|
||||||
|
|
||||||
|
# Create additional plain ZIP from sdist content (flat source zip)
|
||||||
|
SDIST_TGZ=$(ls -1 "$DIST_DIR"/*.tar.gz | tail -n1 || true)
|
||||||
|
if [[ -n "$SDIST_TGZ" ]]; then
|
||||||
|
echo "Creating plain ZIP from sdist: $SDIST_TGZ"
|
||||||
|
TMP_DIR="$(mktemp -d)"
|
||||||
|
tar -xzf "$SDIST_TGZ" -C "$TMP_DIR"
|
||||||
|
SRC_DIR="$(find "$TMP_DIR" -maxdepth 1 -type d -name 'octoprint_tailscale_funnel-*' | head -n1)"
|
||||||
|
if [[ -n "$SRC_DIR" ]]; then
|
||||||
|
ZIP_NAME="$(basename "$SRC_DIR").zip"
|
||||||
|
(cd "$SRC_DIR" && zip -rq "$DIST_DIR/$ZIP_NAME" .)
|
||||||
|
echo "Created: $DIST_DIR/$ZIP_NAME"
|
||||||
|
else
|
||||||
|
echo "WARN: Could not find extracted sdist directory to zip"
|
||||||
|
fi
|
||||||
|
rm -rf "$TMP_DIR"
|
||||||
|
else
|
||||||
|
echo "WARN: No sdist .tar.gz found, skipping plain ZIP creation"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Artifacts in $DIST_DIR:"
|
||||||
|
ls -lah "$DIST_DIR"
|
||||||
|
|
177
scripts/release_gitea.sh
Normal file → Executable file
177
scripts/release_gitea.sh
Normal file → Executable file
@@ -1,6 +1,92 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
|
# Usage: scripts/release_gitea.sh <version> [--draft] [--prerelease]
|
||||||
|
# Requires: GITEA_TOKEN, GITEA_BASE (e.g. https://gitea.elpatron.me), OWNER (e.g. elpatron), REPO (e.g. octo-funnel)
|
||||||
|
|
||||||
|
if [[ $# -lt 1 ]]; then
|
||||||
|
echo "Usage: $0 <version> [--draft] [--prerelease]" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
VERSION="$1"
|
||||||
|
shift || true
|
||||||
|
DRAFT=false
|
||||||
|
PRERELEASE=false
|
||||||
|
for arg in "$@"; do
|
||||||
|
case "$arg" in
|
||||||
|
--draft) DRAFT=true ;;
|
||||||
|
--prerelease) PRERELEASE=true ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
: "${GITEA_TOKEN:?Set GITEA_TOKEN}"
|
||||||
|
: "${GITEA_BASE:?Set GITEA_BASE (e.g. https://gitea.elpatron.me)}"
|
||||||
|
: "${OWNER:?Set OWNER (e.g. elpatron)}"
|
||||||
|
: "${REPO:?Set REPO (e.g. octo-funnel)}"
|
||||||
|
|
||||||
|
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. && pwd)"
|
||||||
|
DIST_DIR="$ROOT_DIR/octoprint_tailscale_funnel/dist"
|
||||||
|
|
||||||
|
TAG="v${VERSION}"
|
||||||
|
|
||||||
|
echo "Creating git tag ${TAG} and pushing..."
|
||||||
|
git tag -f "${TAG}"
|
||||||
|
git push -f origin "${TAG}"
|
||||||
|
|
||||||
|
echo "Creating Gitea release ${TAG}..."
|
||||||
|
BODY=$(cat <<EOF
|
||||||
|
Release ${TAG}
|
||||||
|
|
||||||
|
Changes:
|
||||||
|
- Navbar: Statusanzeige, Toggle, Farbkennung
|
||||||
|
- Build-Skript & Quick-Build Docs
|
||||||
|
- Version ${VERSION}
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
|
||||||
|
CREATE_PAYLOAD=$(jq -n \
|
||||||
|
--arg tag_name "${TAG}" \
|
||||||
|
--arg name "${TAG}" \
|
||||||
|
--arg body "${BODY}" \
|
||||||
|
--argjson draft ${DRAFT} \
|
||||||
|
--argjson prerelease ${PRERELEASE} \
|
||||||
|
'{tag_name:$tag_name, name:$name, body:$body, draft:$draft, prerelease:$prerelease}')
|
||||||
|
|
||||||
|
RELEASE_JSON=$(curl -sS -X POST "${GITEA_BASE}/api/v1/repos/${OWNER}/${REPO}/releases" \
|
||||||
|
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||||
|
-H 'Content-Type: application/json' \
|
||||||
|
-d "${CREATE_PAYLOAD}")
|
||||||
|
|
||||||
|
UPLOAD_URL=$(echo "$RELEASE_JSON" | jq -r .upload_url)
|
||||||
|
ID=$(echo "$RELEASE_JSON" | jq -r .id)
|
||||||
|
|
||||||
|
if [[ -z "$ID" || "$ID" == "null" ]]; then
|
||||||
|
echo "Failed to create release: $RELEASE_JSON" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Release created: ID=$ID"
|
||||||
|
|
||||||
|
function upload_asset() {
|
||||||
|
local file="$1"
|
||||||
|
local name
|
||||||
|
name=$(basename "$file")
|
||||||
|
echo "Uploading asset: $name"
|
||||||
|
curl -sS -X POST "${GITEA_BASE}/api/v1/repos/${OWNER}/${REPO}/releases/${ID}/assets?name=${name}" \
|
||||||
|
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||||
|
-H 'Content-Type: application/octet-stream' \
|
||||||
|
--data-binary @"$file" > /dev/null
|
||||||
|
}
|
||||||
|
|
||||||
|
upload_asset "$DIST_DIR/octoprint_tailscale_funnel-${VERSION}-py3-none-any.whl"
|
||||||
|
upload_asset "$DIST_DIR/octoprint_tailscale_funnel-${VERSION}.tar.gz"
|
||||||
|
upload_asset "$DIST_DIR/octoprint_tailscale_funnel-${VERSION}.zip"
|
||||||
|
|
||||||
|
echo "Release ${TAG} created and assets uploaded."
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
# Load .env if present
|
# Load .env if present
|
||||||
if [ -f "$(dirname "$0")/../.env" ]; then
|
if [ -f "$(dirname "$0")/../.env" ]; then
|
||||||
set -a
|
set -a
|
||||||
@@ -44,54 +130,36 @@ if [ -z "$TOKEN" ]; then
|
|||||||
echo "GITEA_API_TOKEN not set (in .env)." >&2; exit 1
|
echo "GITEA_API_TOKEN not set (in .env)." >&2; exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Derive asset name early for later use
|
||||||
|
ASSET_NAME="$(basename "$ASSET_PATH")"
|
||||||
|
|
||||||
BODY="Tailscale Funnel Plugin ${TAG}\n\nAutomated release."
|
BODY="Tailscale Funnel Plugin ${TAG}\n\nAutomated release."
|
||||||
if [ -n "$BODY_FILE" ] && [ -f "$BODY_FILE" ]; then
|
if [ -n "$BODY_FILE" ] && [ -f "$BODY_FILE" ]; then
|
||||||
BODY=$(cat "$BODY_FILE")
|
BODY=$(cat "$BODY_FILE")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Build JSON payload via python (robust quoting)
|
# Try to fetch existing release by tag first
|
||||||
create_payload=$(REL_TAG="$TAG" REL_NAME="$NAME" REL_BODY_TXT="$BODY" python3 - <<'PY'
|
get_resp=$(curl -sS -H "Authorization: token ${TOKEN}" "${API_URL}/repos/${OWNER}/${REPO}/releases/tags/${TAG}" || true)
|
||||||
import json, os
|
rel_id=$(echo "$get_resp" | jq -r '.id // empty')
|
||||||
payload = {
|
|
||||||
"tag_name": os.environ["REL_TAG"],
|
|
||||||
"name": os.environ["REL_NAME"],
|
|
||||||
"body": os.environ["REL_BODY_TXT"],
|
|
||||||
"draft": False,
|
|
||||||
"prerelease": False
|
|
||||||
}
|
|
||||||
print(json.dumps(payload))
|
|
||||||
PY
|
|
||||||
)
|
|
||||||
|
|
||||||
create_resp=$(curl -sS -X POST \
|
if [ -z "$rel_id" ]; then
|
||||||
|
# Build minimal JSON payload (use existing tag)
|
||||||
|
create_payload=$(jq -n --arg tag "$TAG" --arg name "$NAME" --arg body "$BODY" '{tag_name:$tag, name:$name, body:$body, draft:false, prerelease:false}')
|
||||||
|
|
||||||
|
create_resp=$(curl -sS -X POST \
|
||||||
-H 'Content-Type: application/json' \
|
-H 'Content-Type: application/json' \
|
||||||
-H "Authorization: token ${TOKEN}" \
|
-H "Authorization: token ${TOKEN}" \
|
||||||
-d "$create_payload" \
|
-d "$create_payload" \
|
||||||
"${API_URL}/repos/${OWNER}/${REPO}/releases" || true)
|
"${API_URL}/repos/${OWNER}/${REPO}/releases" || true)
|
||||||
|
|
||||||
# Extract id; if missing, fetch by tag
|
# Extract id from create response
|
||||||
rel_id=$(python3 - <<'PY'
|
rel_id=$(echo "$create_resp" | jq -r '.id // empty')
|
||||||
import sys, json
|
fi
|
||||||
data=sys.stdin.read().strip()
|
|
||||||
if not data:
|
|
||||||
print("")
|
|
||||||
else:
|
|
||||||
try:
|
|
||||||
obj=json.loads(data)
|
|
||||||
print(obj.get('id',''))
|
|
||||||
except Exception:
|
|
||||||
print("")
|
|
||||||
PY
|
|
||||||
<<<"$create_resp")
|
|
||||||
|
|
||||||
|
# Fallback: search releases list for matching tag if still empty
|
||||||
if [ -z "$rel_id" ]; then
|
if [ -z "$rel_id" ]; then
|
||||||
get_resp=$(curl -sS -H "Authorization: token ${TOKEN}" "${API_URL}/repos/${OWNER}/${REPO}/releases/tags/${TAG}")
|
list_resp=$(curl -sS -H "Authorization: token ${TOKEN}" "${API_URL}/repos/${OWNER}/${REPO}/releases?limit=100")
|
||||||
rel_id=$(python3 - <<'PY'
|
rel_id=$(echo "$list_resp" | jq -r --arg tag "$TAG" '[.[] | select(.tag_name==$tag)][0].id // empty')
|
||||||
import sys, json
|
|
||||||
obj=json.loads(sys.stdin.read())
|
|
||||||
print(obj.get('id',''))
|
|
||||||
PY
|
|
||||||
<<<"$get_resp")
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$rel_id" ]; then
|
if [ -z "$rel_id" ]; then
|
||||||
@@ -100,37 +168,18 @@ if [ -z "$rel_id" ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Delete existing asset with same name (if any)
|
# Check if asset exists (skip upload if present)
|
||||||
assets_json=$(curl -sS -H "Authorization: token ${TOKEN}" "${API_URL}/repos/${OWNER}/${REPO}/releases/${rel_id}/assets")
|
assets_json=$(curl -sS -H "Authorization: token ${TOKEN}" "${API_URL}/repos/${OWNER}/${REPO}/releases/${rel_id}/assets")
|
||||||
asset_id=$(python3 - <<'PY'
|
asset_exists=$(echo "$assets_json" | jq -r --arg name "$ASSET_NAME" 'any(.[]; .name==$name)')
|
||||||
import sys, json, os
|
|
||||||
name=os.environ['ASSET_NAME']
|
|
||||||
try:
|
|
||||||
arr=json.loads(sys.stdin.read())
|
|
||||||
for a in arr:
|
|
||||||
if a.get('name')==name:
|
|
||||||
print(a.get('id',''))
|
|
||||||
break
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
PY
|
|
||||||
ASSET_NAME="$(basename "$ASSET_PATH")" <<<"$assets_json")
|
|
||||||
|
|
||||||
if [ -n "$asset_id" ]; then
|
if [ "$asset_exists" = "true" ]; then
|
||||||
curl -sS -X DELETE -H "Authorization: token ${TOKEN}" "${API_URL}/repos/${OWNER}/${REPO}/releases/${rel_id}/assets/${asset_id}" >/dev/null || true
|
echo "Asset already exists, skipping upload: ${ASSET_NAME}"
|
||||||
|
else
|
||||||
|
echo "Uploading asset: ${ASSET_NAME}"
|
||||||
|
upload_resp=$(curl -sS -H "Authorization: token ${TOKEN}" -F attachment=@"${ASSET_PATH}" "${API_URL}/repos/${OWNER}/${REPO}/releases/${rel_id}/assets?name=${ASSET_NAME}")
|
||||||
|
html_url=$(echo "$upload_resp" | jq -r '.browser_download_url // empty')
|
||||||
|
echo "Asset uploaded: ${html_url}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Upload asset
|
echo "Release ${TAG} ready (id=${rel_id})."
|
||||||
upload_resp=$(curl -sS -H "Authorization: token ${TOKEN}" -F attachment=@"${ASSET_PATH}" "${API_URL}/repos/${OWNER}/${REPO}/releases/${rel_id}/assets?name=$(basename "$ASSET_PATH")")
|
|
||||||
|
|
||||||
html_url=$(python3 - <<'PY'
|
|
||||||
import sys, json
|
|
||||||
try:
|
|
||||||
print(json.loads(sys.stdin.read()).get('browser_download_url',''))
|
|
||||||
except Exception:
|
|
||||||
print("")
|
|
||||||
PY
|
|
||||||
<<<"$upload_resp")
|
|
||||||
|
|
||||||
echo "Release ${TAG} created (id=${rel_id}). Asset uploaded: ${html_url}"
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user