@@ -1415,6 +1536,9 @@ function app() {
// Containers op deze host, ook die Server Up niet zelf beheert
hostContainers: { containers: [], managed: 0, total: 0, running: 0 },
+ // Koppelbare apps en het info-venster in de installatiemodal
+ connectApps: [], sharedNetwork: 'serverup', fieldInfo: null,
+
// Backups en updatestatus per stack
bkStack: '', bkList: [], bkSettings: {},
stackUpd: {}, checkingUpd: false,
@@ -1929,6 +2053,36 @@ function app() {
this.loadNetworks();
},
+ // ββ Apps onderling koppelen ββββββββββββββββββββββββββββββββββββββββββββββ
+ async loadConnectApps() {
+ const d = await this.rpc('/api/apps/connectable');
+ this.connectApps = d.apps || [];
+ this.sharedNetwork = d.shared_network || 'serverup';
+ if (this.install && this.install.connect_apps === undefined) {
+ this.install.connect_apps = d.connect_default !== false;
+ }
+ },
+ // Adressen van al geΓ―nstalleerde apps die bij dit veld passen. Een veld met
+ // {"connect": {"app": "mosquitto", "scheme": "mqtt", "port": 1883}} levert
+ // mqtt://:1883 op voor elke geΓ―nstalleerde Mosquitto.
+ connectTargets(f) {
+ const c = f.connect || {};
+ const uit = [];
+ for (const app of this.connectApps) {
+ if (c.app && app.source !== c.app) continue;
+ for (const ct of app.containers) {
+ const schema = c.scheme ? c.scheme + '://' : '';
+ const poort = c.port ? ':' + c.port : '';
+ const pad = c.path || '';
+ uit.push({
+ value: schema + ct.name + poort + pad,
+ label: app.name + ' β ' + ct.name + (c.port ? ' :' + c.port : ''),
+ });
+ }
+ }
+ return uit;
+ },
+
// Cryptografisch willekeurige waarde voor admin-tokens en wachtwoorden.
// Lokaal gegenereerd, dus het geheim gaat niet heen en weer over het net.
randomSecret(bytes = 24) {
@@ -2028,7 +2182,9 @@ function app() {
network: '', ip: ''
};
this.modal = 'install';
+ this.fieldInfo = null;
if (!this.netList.length) await this.loadNetworks();
+ await this.loadConnectApps();
const d = await this.rpc('/api/store/preview', { stack: this.install.stack, repo_id: rid });
this.install.loading = false;
if (!d.ok) { this.toast(d.msg || 'Preview faalde', 'er'); this.modal = null; return; }
@@ -2042,6 +2198,13 @@ function app() {
else init[f.name] = '';
});
if (init.service_name !== undefined && !init.service_name) init.service_name = this.install.instance;
+ // Wijst een veld naar een andere app en staat die al geΓ―nstalleerd,
+ // vul dan meteen het juiste adres in.
+ for (const f of (d.fields || [])) {
+ if (!f.connect) continue;
+ const doelen = this.connectTargets(f);
+ if (doelen.length) init[f.name] = doelen[0].value;
+ }
this.install.values = init;
this.install.preview_files = d.preview_files || {};
} else {
@@ -2083,6 +2246,7 @@ function app() {
instance: this.install.instance || this.install.stack,
};
if (this.install.network) { body.network = this.install.network; body.ip = this.install.ip; }
+ body.connect_apps = this.install.connect_apps !== false;
if (this.install.format === 'boilerplate') body.values = this.install.values;
else { body.env_overrides = this.install.envOverrides; body.image_tags = this.install.imageTags; }
const d = await this.rpc('/api/store/install', body);
diff --git a/server-up/translations/en.json b/server-up/translations/en.json
index f6db6f5..a8e689a 100644
--- a/server-up/translations/en.json
+++ b/server-up/translations/en.json
@@ -246,5 +246,12 @@
"of_which_managed": "of which {n} via Server Up",
"other_containers": "Other containers",
"other_containers_hint": "These containers run on this host but do not belong to a stack managed by Server Up β started manually, for example, or from before you began using Server Up. They do count towards the dashboard figures.",
- "this_app": "this app"
+ "this_app": "this app",
+ "advanced_options": "Advanced options",
+ "what_does_this_do": "What does this setting do?",
+ "default_value": "Default",
+ "enter_manually": "Enter manuallyβ¦",
+ "no_connectable_app": "No {app} is installed yet. Install it first, or enter the address manually.",
+ "connect_apps": "Connect to other apps",
+ "connect_apps_hint": "Put this stack on the shared network '{net}' so it can reach other apps by name and vice versa. Without this, every stack stands alone."
}
diff --git a/server-up/translations/nl.json b/server-up/translations/nl.json
index c27b43f..79f0aab 100644
--- a/server-up/translations/nl.json
+++ b/server-up/translations/nl.json
@@ -246,5 +246,12 @@
"of_which_managed": "waarvan {n} via Server Up",
"other_containers": "Overige containers",
"other_containers_hint": "Deze containers draaien op deze host maar horen niet bij een stack die Server Up beheert β bijvoorbeeld handmatig gestart of van vΓ³Γ³r je Server Up ging gebruiken. Ze tellen wel mee in de cijfers op het dashboard.",
- "this_app": "deze app"
+ "this_app": "deze app",
+ "advanced_options": "Geavanceerde opties",
+ "what_does_this_do": "Wat doet deze instelling?",
+ "default_value": "Standaard",
+ "enter_manually": "Handmatig invullenβ¦",
+ "no_connectable_app": "Er is nog geen {app} geΓ―nstalleerd. Installeer die eerst, of vul het adres handmatig in.",
+ "connect_apps": "Verbinden met andere apps",
+ "connect_apps_hint": "Zet deze stack op het gedeelde netwerk '{net}', zodat hij andere apps op hun naam kan bereiken en andersom. Zonder dit staat elke stack op zichzelf."
}
diff --git a/tests/test_connect.py b/tests/test_connect.py
new file mode 100644
index 0000000..4189680
--- /dev/null
+++ b/tests/test_connect.py
@@ -0,0 +1,142 @@
+"""Apps onderling koppelen, geavanceerde velden en de uitleg per veld."""
+import sys
+import tempfile
+from pathlib import Path
+
+import pytest
+import yaml
+
+WORTEL = Path(__file__).resolve().parent.parent
+sys.path.insert(0, str(WORTEL / "server-up"))
+
+from core import boilerplates as bp
+from core import compose_transform as ct
+
+from conftest import login
+
+BASIS = """\
+services:
+ web:
+ image: nginx
+ ports:
+ - "8080:80"
+ db:
+ image: postgres
+"""
+
+
+# ββ Gedeeld netwerk ββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
+
+def test_gedeeld_netwerk_komt_bij_elke_service():
+ """Zonder gedeeld netwerk zit elke stack in zijn eigen compose-netwerk en
+ kan geen enkele app een andere op naam bereiken."""
+ doc = yaml.safe_load(ct.add_shared_network(BASIS, "serverup"))
+ for naam, svc in doc["services"].items():
+ assert "serverup" in svc["networks"], naam
+ assert doc["networks"]["serverup"] == {"external": True}
+
+
+def test_gedeeld_netwerk_naast_een_eigen_ip():
+ """Een stack met een macvlan-adres moet het gedeelde netwerk erbij krijgen,
+ niet in plaats daarvan."""
+ met_ip = ct.to_dedicated_ip(BASIS, "lan", "192.168.1.240")
+ doc = yaml.safe_load(ct.add_shared_network(met_ip, "serverup"))
+ web = doc["services"]["web"]["networks"]
+ assert "lan" in web and "serverup" in web
+ assert web["lan"] == {"ipv4_address": "192.168.1.240"}
+ assert doc["networks"]["lan"]["external"] is True
+ assert doc["networks"]["serverup"]["external"] is True
+
+
+def test_gedeeld_netwerk_is_idempotent():
+ een = ct.add_shared_network(BASIS, "serverup")
+ twee = ct.add_shared_network(een, "serverup")
+ doc = yaml.safe_load(twee)
+ assert doc["services"]["web"]["networks"].count("serverup") == 1
+
+
+def test_gedeeld_netwerk_bij_ongeldige_yaml():
+ with pytest.raises(ct.TransformError):
+ ct.add_shared_network("dit: [is geen: yaml", "serverup")
+
+
+# ββ Veldopties βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
+
+def _veld(app: str, naam: str) -> dict:
+ return next(f for f in bp.fields(WORTEL / "apps" / app) if f["name"] == naam)
+
+
+def test_koppelveld_wordt_doorgegeven():
+ f = _veld("zigbee2mqtt", "mqtt_server")
+ assert f["connect"] == {"app": "mosquitto", "scheme": "mqtt", "port": 1883}
+ assert f["help"], "koppelveld hoort uitleg te hebben"
+
+
+def test_open_webui_wijst_naar_ollama():
+ f = _veld("open-webui", "ollama_url")
+ assert f["connect"]["app"] == "ollama"
+ assert f["connect"]["port"] == 11434
+
+
+def test_geavanceerd_veld_wordt_gemarkeerd():
+ assert _veld("zigbee2mqtt", "usb_device")["advanced"] is True
+ assert _veld("zigbee2mqtt", "mqtt_server")["advanced"] is False
+
+
+def test_gewone_velden_blijven_zichtbaar():
+ """De basisvelden mogen niet per ongeluk achter het uitklapmenu verdwijnen."""
+ for app in ("zigbee2mqtt", "immich", "frigate", "ollama"):
+ velden = {f["name"]: f for f in bp.fields(WORTEL / "apps" / app)}
+ assert velden["service_name"]["advanced"] is False
+ if "port" in velden:
+ assert velden["port"]["advanced"] is False
+
+
+def test_elke_app_houdt_zichtbare_velden_over():
+ """Een app waarvan alles geavanceerd is, zou een leeg formulier tonen."""
+ for d in sorted((WORTEL / "apps").iterdir()):
+ if not d.is_dir():
+ continue
+ velden = [f for f in bp.fields(d) if not f.get("is_group_toggle")]
+ zichtbaar = [f for f in velden if not f["advanced"]]
+ assert zichtbaar, f"{d.name}: alle velden staan als geavanceerd gemarkeerd"
+
+
+def test_koppelvelden_verwijzen_naar_bestaande_apps():
+ """Een connect-veld dat naar een app verwijst die niet bestaat, levert een
+ lege keuzelijst op zonder dat iemand snapt waarom."""
+ apps = {d.name for d in (WORTEL / "apps").iterdir() if d.is_dir()}
+ for d in sorted((WORTEL / "apps").iterdir()):
+ if not d.is_dir():
+ continue
+ for f in bp.fields(d):
+ doel = (f.get("connect") or {}).get("app")
+ if doel:
+ assert doel in apps, f"{d.name}/{f['name']} verwijst naar '{doel}'"
+
+
+# ββ Endpoint βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
+
+def test_connectable_endpoint(client, env, monkeypatch):
+ from core import docker
+ import json as _json
+ login(client)
+ stack = env["lib"] / "mosquitto"
+ stack.mkdir(parents=True)
+ (stack / "docker-compose.yml").write_text("services:\n a:\n image: x\n")
+ (stack / ".serverup.json").write_text(_json.dumps(
+ {"source": "mosquitto", "name": "Mosquitto MQTT"}))
+ monkeypatch.setattr(docker, "compose_ps",
+ lambda d, name=None: [{"name": "mosquitto", "service": "a",
+ "ports": "1883/tcp", "running": True}])
+
+ d = client.get("/api/apps/connectable").get_json()
+ assert d["shared_network"] == "serverup"
+ app = next(a for a in d["apps"] if a["stack"] == "mosquitto")
+ assert app["source"] == "mosquitto"
+ assert app["containers"][0]["name"] == "mosquitto"
+
+
+def test_connectable_zonder_stacks(client):
+ login(client)
+ assert client.get("/api/apps/connectable").get_json()["apps"] == []