bridge fix

Caddyfile

@@ -1,49 +1,41 @@
 {
-	# we’re behind cloudflare tunnel; terminate tls there
+  auto_https off
-	auto_https off
 }
 
-:8550 {
+# short domain (http-only on :8550)
-	# route by host header to each backend
+http://{$SHORT_DOMAIN}:8550 {
+  log {
+    output stdout
+    format console
+  }
 
-	@paste host {env.PASTE_DOMAIN}
+  @shorten path /shorten
-	handle @paste {
+  handle @shorten {
-		reverse_proxy privatebin:8080
+    header {
-	}
+      Access-Control-Allow-Origin https://{$PASTE_DOMAIN}
+      Access-Control-Allow-Methods GET, OPTIONS
+      Access-Control-Allow-Headers *
+      Cache-Control no-store
+    }
+    reverse_proxy http://shlink-adapter:3000
+  }
 
-	@files host {env.FILES_DOMAIN}
+  @shortenPre method OPTIONS path /shorten
-	handle @files {
+  respond @shortenPre 204
-		reverse_proxy lufi:8081
-	}
 
-	@short host {env.SHORT_DOMAIN}
+  # everything else → shlink ui/api
-	handle @short {
+  handle {
-		reverse_proxy shlink:8080
+    reverse_proxy http://shlink:8080
-	}
+  }
-
+}
-	# adapter endpoint on the short domain
+
-	@shorten {
+# paste domain (http-only)
-		host {env.SHORT_DOMAIN}
+http://{$PASTE_DOMAIN}:8550 {
-		path /shorten
+  reverse_proxy http://privatebin:8080
-	}
+}
-	handle @shorten {
+
-		header {
+# files domain (http-only)
-			Access-Control-Allow-Origin https://{env.PASTE_DOMAIN}
+http://{$FILES_DOMAIN}:8550 {
-			Access-Control-Allow-Methods GET, OPTIONS
+  reverse_proxy http://lufi:8081
-			Access-Control-Allow-Headers *
-			Cache-Control no-store
-		}
-		reverse_proxy shlink-adapter:3000
-	}
-
-	# preflight for /shorten
-	@shortenPre {
-		host {env.SHORT_DOMAIN}
-		method OPTIONS
-		path /shorten
-	}
-	respond @shortenPre 204
-
-	respond "unauthorized domain" 404
 }
 

docker-compose.yml

@@ -95,9 +95,18 @@ services:
           shlink-db:
             condition: service_healthy
 
+    shlink-adapter:
+      build: ./shlink-adapter
+      restart: unless-stopped
+      environment:
+        SHLINK_BASE: "http://shlink:8080"
+        SHLINK_API_KEY: "${SHLINK_API_KEY}"
+      networks:
+        - proxy 
+
 networks:
     proxy:
-        external: false
+      driver: bridge
 
 volumes:
     privatebin-data:

privatebin.conf.php

@@ -73,7 +73,7 @@ urlshortener = "https://{env.SHORT_DOMAIN}/shorten?link="
 ; (optional) Whether to shorten the URL by default when a new document is created.
 ; If set to true, the "Shorten URL" functionality will be automatically called.
 ; This only works if the "urlshortener" option is set.
-; shortenbydefault = false
+shortenbydefault = true
 
 ; (optional) Let users create a QR code for sharing the document URL with one click.
 ; It works both when a new document is created and when you view a document.
@@ -184,4 +184,4 @@ class = Filesystem
 ; Either form below works. Pick ONE (uncommented). Here we use the conventional form:
 dir = PATH "data"
 ; Alternative explicit absolute path (also valid):
-; dir = "/srv/data"
+; dir = "/srv/data"

shlink-adapter/Dockerfile

@@ -0,0 +1,10 @@
+FROM oven/bun
+
+WORKDIR /app
+
+RUN ls /app > /app/temp.txt
+COPY server.js .
+
+EXPOSE 3000
+
+CMD ["bun", "run", "server.js"]

shlink-adapter/server.js

@@ -0,0 +1,52 @@
+import http from "http";
+
+const base = process.env.SHLINK_BASE ?? "";
+const key  = process.env.SHLINK_API_KEY ?? "";
+
+const server = http.createServer(async (req, res) => {
+  try {
+    const u = new URL(req.url ?? "/", "http://local/");
+    if (req.method === "OPTIONS" && u.pathname === "/shorten") {
+      res.writeHead(204); res.end(); return;
+    }
+    
+    if (u.pathname === "/" || u.pathname === "") {
+	res.writeHead(200); res.end("Ok"); return;
+    }
+
+    if (req.method !== "GET" || u.pathname !== "/shorten") {
+      res.writeHead(404); res.end("not found"); return;
+    }
+
+    const longUrl =
+      u.searchParams.get("link") ??
+      u.searchParams.get("url") ??
+      u.searchParams.get("longUrl");
+
+    if (!longUrl) { res.writeHead(400); res.end("missing url"); return; }
+
+    // shlink v3 rest api: create short url
+    const r = await fetch(`${base}/rest/v3/short-urls`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "Accept": "application/json",
+        "X-Api-Key": key
+      },
+      body: JSON.stringify({ longUrl })
+    });
+
+    if (!r.ok) {
+      const txt = await r.text();
+      res.writeHead(502); res.end(`shlink error: ${txt}`); return;
+    }
+    const data = await r.json();
+    res.writeHead(200, { "Content-Type": "text/plain; charset=utf-8" });
+    res.end((data.shortUrl ?? "") + "\n");
+  } catch {
+    res.writeHead(500); res.end("internal error");
+  }
+});
+
+server.listen(3000);
+