Gateway link: handle trailing slash in gateway_public_url; bump 0.4.7
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
name: Moltbot Assistant
|
||||
version: "0.4.6"
|
||||
version: "0.4.7"
|
||||
slug: moltbot_assistant
|
||||
description: Run Moltbot Assistant (Clawdbot-compatible) as a Home Assistant add-on.
|
||||
url: https://github.com/techartdev/MoltBotHomeAssistant
|
||||
@@ -39,6 +39,7 @@ options:
|
||||
gateway_token: ""
|
||||
|
||||
# Public base URL for opening the Gateway Web UI in a new tab (not embedded).
|
||||
# Recommended: NO trailing slash.
|
||||
# Example: "https://example.duckdns.org:12345" or "http://192.168.1.10:18789"
|
||||
gateway_public_url: ""
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@ http {
|
||||
<div class="card">
|
||||
<h2 style="margin:0 0 8px 0">Moltbot Assistant</h2>
|
||||
<div class="row" style="margin-bottom:6px">
|
||||
<a class="btn" href="__GATEWAY_PUBLIC_URL__/?token=__GATEWAY_TOKEN__" target="_blank" rel="noopener noreferrer">Open Gateway Web UI</a>
|
||||
<a class="btn" href="__GATEWAY_PUBLIC_URL____GW_PUBLIC_URL_PATH__?token=__GATEWAY_TOKEN__" target="_blank" rel="noopener noreferrer">Open Gateway Web UI</a>
|
||||
<a class="btn secondary" href="./terminal/" target="_self">Open Terminal (full page)</a>
|
||||
</div>
|
||||
<div class="muted">
|
||||
|
||||
@@ -299,8 +299,12 @@ tpl = Path('/etc/nginx/nginx.conf.tpl').read_text()
|
||||
token = os.environ.get('GW_TOKEN','')
|
||||
public_url = os.environ.get('GW_PUBLIC_URL','')
|
||||
|
||||
# Normalize gateway_public_url for building the link: ensure there is exactly one slash
|
||||
# between base URL and path. We keep the displayed base as-is, but compute a safe suffix.
|
||||
# If base ends with '/', use empty suffix. Otherwise use '/'.
|
||||
conf = tpl.replace('__GATEWAY_TOKEN__', token)
|
||||
conf = conf.replace('__GATEWAY_PUBLIC_URL__', public_url)
|
||||
conf = conf.replace('__GW_PUBLIC_URL_PATH__', '' if public_url.endswith('/') else '/')
|
||||
|
||||
Path('/etc/nginx/nginx.conf').write_text(conf)
|
||||
PY
|
||||
|
||||
Reference in New Issue
Block a user