@hasna/shortlinks 0.1.13 → 0.1.14

package/cloudflare/shortlinks.js

@@ -6,25 +6,32 @@ export default {
     }
 
     const incoming = new URL(request.url);
+    const proxyTo = (targetOrigin, marker) => {
+      const upstream = new URL(incoming.pathname + incoming.search, targetOrigin);
+      const headers = new Headers(request.headers);
+      headers.set("x-forwarded-host", incoming.host);
+      headers.set("x-shortlinks-worker", marker);
+
+      return fetch(upstream.toString(), {
+        method: request.method,
+        headers,
+        body: request.method === "GET" || request.method === "HEAD" ? undefined : request.body,
+        redirect: "manual"
+      });
+    };
+
     const reserved = (env.SHORTLINKS_RESERVED_PATH_PREFIXES || "a")
       .split(",")
       .map((value) => value.trim().toLowerCase())
       .filter(Boolean);
     const firstSegment = decodeURIComponent(incoming.pathname.replace(/^\/+/, "").split("/")[0] || "").toLowerCase();
     if (firstSegment && reserved.includes(firstSegment)) {
+      if (env.ATTACHMENTS_ORIGIN) {
+        return proxyTo(env.ATTACHMENTS_ORIGIN, "attachments");
+      }
       return new Response("Reserved path prefix", { status: 404 });
     }
 
-    const upstream = new URL(incoming.pathname + incoming.search, origin);
-    const headers = new Headers(request.headers);
-    headers.set("x-forwarded-host", incoming.host);
-    headers.set("x-shortlinks-worker", "cloudflare");
-
-    return fetch(upstream.toString(), {
-      method: request.method,
-      headers,
-      body: request.method === "GET" || request.method === "HEAD" ? undefined : request.body,
-      redirect: "manual"
-    });
+    return proxyTo(origin, "cloudflare");
   }
 };

package/cloudflare/wrangler.example.toml

@@ -4,4 +4,5 @@ compatibility_date = "2026-05-01"
 
 [vars]
 SHORTLINKS_ORIGIN = "https://shortlinks.example.com"
+ATTACHMENTS_ORIGIN = ""
 SHORTLINKS_RESERVED_PATH_PREFIXES = "a"

package/dist/cli/index.js

@@ -9585,26 +9585,33 @@ function generateWorkerScript() {
     }
 
     const incoming = new URL(request.url);
+    const proxyTo = (targetOrigin, marker) => {
+      const upstream = new URL(incoming.pathname + incoming.search, targetOrigin);
+      const headers = new Headers(request.headers);
+      headers.set("x-forwarded-host", incoming.host);
+      headers.set("x-shortlinks-worker", marker);
+
+      return fetch(upstream.toString(), {
+        method: request.method,
+        headers,
+        body: request.method === "GET" || request.method === "HEAD" ? undefined : request.body,
+        redirect: "manual"
+      });
+    };
+
     const reserved = (env.SHORTLINKS_RESERVED_PATH_PREFIXES || "a")
       .split(",")
       .map((value) => value.trim().toLowerCase())
       .filter(Boolean);
     const firstSegment = decodeURIComponent(incoming.pathname.replace(/^\\/+/, "").split("/")[0] || "").toLowerCase();
     if (firstSegment && reserved.includes(firstSegment)) {
+      if (env.ATTACHMENTS_ORIGIN) {
+        return proxyTo(env.ATTACHMENTS_ORIGIN, "attachments");
+      }
       return new Response("Reserved path prefix", { status: 404 });
     }
 
-    const upstream = new URL(incoming.pathname + incoming.search, origin);
-    const headers = new Headers(request.headers);
-    headers.set("x-forwarded-host", incoming.host);
-    headers.set("x-shortlinks-worker", "cloudflare");
-
-    return fetch(upstream.toString(), {
-      method: request.method,
-      headers,
-      body: request.method === "GET" || request.method === "HEAD" ? undefined : request.body,
-      redirect: "manual"
-    });
+    return proxyTo(origin, "cloudflare");
   }
 };
 `;
@@ -9622,6 +9629,7 @@ compatibility_date = "2026-05-01"
 
 [vars]
 SHORTLINKS_ORIGIN = "${options.origin || "https://shortlinks.example.com"}"
+ATTACHMENTS_ORIGIN = "${options.attachmentsOrigin || ""}"
 SHORTLINKS_RESERVED_PATH_PREFIXES = "a"
 `);
   return { workerPath, wranglerPath };
@@ -10134,9 +10142,14 @@ cfCmd.command("plan <hostname>").description("Print the Cloudflare setup plan").
     handleError(error);
   }
 });
-cfCmd.command("worker").description("Write Cloudflare Worker files").option("--out-dir <dir>", "Output directory", "cloudflare").option("--worker <name>", "Worker name", "shortlinks").option("--origin <url>", "Origin redirect server URL", process.env.SHORTLINKS_ORIGIN || "https://shortlinks.example.com").option("-j, --json", "Output JSON").action((opts) => {
+cfCmd.command("worker").description("Write Cloudflare Worker files").option("--out-dir <dir>", "Output directory", "cloudflare").option("--worker <name>", "Worker name", "shortlinks").option("--origin <url>", "Origin redirect server URL", process.env.SHORTLINKS_ORIGIN || "https://shortlinks.example.com").option("--attachments-origin <url>", "Origin URL for reserved attachment paths", process.env.ATTACHMENTS_ORIGIN).option("-j, --json", "Output JSON").action((opts) => {
   try {
-    const result = writeWorkerFiles({ outDir: opts.outDir, workerName: opts.worker, origin: opts.origin });
+    const result = writeWorkerFiles({
+      outDir: opts.outDir,
+      workerName: opts.worker,
+      origin: opts.origin,
+      attachmentsOrigin: opts.attachmentsOrigin
+    });
     print2(result, opts, () => {
       console.log(source_default.green(`Wrote ${result.workerPath}`));
       console.log(source_default.green(`Wrote ${result.wranglerPath}`));

package/dist/cloudflare.d.ts

@@ -32,6 +32,7 @@ export declare function writeWorkerFiles(options?: {
     outDir?: string;
     workerName?: string;
     origin?: string;
+    attachmentsOrigin?: string;
 }): {
     workerPath: string;
     wranglerPath: string;

package/dist/cloudflare.js

@@ -56,26 +56,33 @@ function generateWorkerScript() {
     }
 
     const incoming = new URL(request.url);
+    const proxyTo = (targetOrigin, marker) => {
+      const upstream = new URL(incoming.pathname + incoming.search, targetOrigin);
+      const headers = new Headers(request.headers);
+      headers.set("x-forwarded-host", incoming.host);
+      headers.set("x-shortlinks-worker", marker);
+
+      return fetch(upstream.toString(), {
+        method: request.method,
+        headers,
+        body: request.method === "GET" || request.method === "HEAD" ? undefined : request.body,
+        redirect: "manual"
+      });
+    };
+
     const reserved = (env.SHORTLINKS_RESERVED_PATH_PREFIXES || "a")
       .split(",")
       .map((value) => value.trim().toLowerCase())
       .filter(Boolean);
     const firstSegment = decodeURIComponent(incoming.pathname.replace(/^\\/+/, "").split("/")[0] || "").toLowerCase();
     if (firstSegment && reserved.includes(firstSegment)) {
+      if (env.ATTACHMENTS_ORIGIN) {
+        return proxyTo(env.ATTACHMENTS_ORIGIN, "attachments");
+      }
       return new Response("Reserved path prefix", { status: 404 });
     }
 
-    const upstream = new URL(incoming.pathname + incoming.search, origin);
-    const headers = new Headers(request.headers);
-    headers.set("x-forwarded-host", incoming.host);
-    headers.set("x-shortlinks-worker", "cloudflare");
-
-    return fetch(upstream.toString(), {
-      method: request.method,
-      headers,
-      body: request.method === "GET" || request.method === "HEAD" ? undefined : request.body,
-      redirect: "manual"
-    });
+    return proxyTo(origin, "cloudflare");
   }
 };
 `;
@@ -93,6 +100,7 @@ compatibility_date = "2026-05-01"
 
 [vars]
 SHORTLINKS_ORIGIN = "${options.origin || "https://shortlinks.example.com"}"
+ATTACHMENTS_ORIGIN = "${options.attachmentsOrigin || ""}"
 SHORTLINKS_RESERVED_PATH_PREFIXES = "a"
 `);
   return { workerPath, wranglerPath };

package/dist/index.js

@@ -6315,26 +6315,33 @@ function generateWorkerScript() {
     }
 
     const incoming = new URL(request.url);
+    const proxyTo = (targetOrigin, marker) => {
+      const upstream = new URL(incoming.pathname + incoming.search, targetOrigin);
+      const headers = new Headers(request.headers);
+      headers.set("x-forwarded-host", incoming.host);
+      headers.set("x-shortlinks-worker", marker);
+
+      return fetch(upstream.toString(), {
+        method: request.method,
+        headers,
+        body: request.method === "GET" || request.method === "HEAD" ? undefined : request.body,
+        redirect: "manual"
+      });
+    };
+
     const reserved = (env.SHORTLINKS_RESERVED_PATH_PREFIXES || "a")
       .split(",")
       .map((value) => value.trim().toLowerCase())
       .filter(Boolean);
     const firstSegment = decodeURIComponent(incoming.pathname.replace(/^\\/+/, "").split("/")[0] || "").toLowerCase();
     if (firstSegment && reserved.includes(firstSegment)) {
+      if (env.ATTACHMENTS_ORIGIN) {
+        return proxyTo(env.ATTACHMENTS_ORIGIN, "attachments");
+      }
       return new Response("Reserved path prefix", { status: 404 });
     }
 
-    const upstream = new URL(incoming.pathname + incoming.search, origin);
-    const headers = new Headers(request.headers);
-    headers.set("x-forwarded-host", incoming.host);
-    headers.set("x-shortlinks-worker", "cloudflare");
-
-    return fetch(upstream.toString(), {
-      method: request.method,
-      headers,
-      body: request.method === "GET" || request.method === "HEAD" ? undefined : request.body,
-      redirect: "manual"
-    });
+    return proxyTo(origin, "cloudflare");
   }
 };
 `;
@@ -6352,6 +6359,7 @@ compatibility_date = "2026-05-01"
 
 [vars]
 SHORTLINKS_ORIGIN = "${options.origin || "https://shortlinks.example.com"}"
+ATTACHMENTS_ORIGIN = "${options.attachmentsOrigin || ""}"
 SHORTLINKS_RESERVED_PATH_PREFIXES = "a"
 `);
   return { workerPath, wranglerPath };

package/infra/aws-ec2-user-data.sh

@@ -8,6 +8,7 @@ export RDS_SECRET_ID="${RDS_SECRET_ID:-}"
 export RDS_HOST="${RDS_HOST:-}"
 export RDS_USERNAME="${RDS_USERNAME:-}"
 export SHORTLINKS_DOMAIN="${SHORTLINKS_DOMAIN:-}"
+export ATTACHMENTS_ORIGIN="${ATTACHMENTS_ORIGIN:-}"
 
 : "${RDS_SECRET_ID:?Set RDS_SECRET_ID to the AWS Secrets Manager secret for the PostgreSQL database_url}"
 : "${SHORTLINKS_DOMAIN:?Set SHORTLINKS_DOMAIN to the public host served by Caddy}"
@@ -145,12 +146,32 @@ WantedBy=multi-user.target
 SERVICE
 
 install -d /etc/caddy
+if [ -n "${ATTACHMENTS_ORIGIN}" ]; then
+cat > /etc/caddy/Caddyfile <<CADDY
+${SHORTLINKS_DOMAIN} {
+  encode zstd gzip
+
+  handle /a/* {
+    reverse_proxy ${ATTACHMENTS_ORIGIN}
+  }
+
+  handle /api/* {
+    reverse_proxy ${ATTACHMENTS_ORIGIN}
+  }
+
+  handle {
+    reverse_proxy 127.0.0.1:8787
+  }
+}
+CADDY
+else
 cat > /etc/caddy/Caddyfile <<CADDY
 ${SHORTLINKS_DOMAIN} {
   encode zstd gzip
   reverse_proxy 127.0.0.1:8787
 }
 CADDY
+fi
 
 systemctl daemon-reload
 systemctl enable shortlinks.service caddy.service

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/shortlinks",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "CLI-only shortlink manager for custom domains, click tracking, Cloudflare setup, and repo-native storage sync",
   "type": "module",
   "main": "dist/index.js",