Keep PostgreSQL out of Netlify proxy bundle

Author: shaply

proxy.ts

@@ -1,16 +1,41 @@
 import { NextResponse, type NextRequest } from "next/server";
 import { getSlugFromHost } from "@/lib/clientAuthUtils";
 import { ORGANIZATION_NOT_FOUND_PATH } from "@/lib/organizationRoutes";
-import { OrganizationsService } from "@/lib/services/OrganizationService";
 
 export async function proxy(request: NextRequest) {
   const slug = getSlugFromHost(request.headers.get("host") ?? undefined);
   // Loopback also supports test sessions with an explicit active organization.
-  if (
-    slug === "servicestart" ||
-    (await OrganizationsService.findBySlug(slug))
-  ) {
-    return NextResponse.next();
+  if (slug === "servicestart") return NextResponse.next();
+
+  // Netlify bundles this proxy for its edge runtime. Resolve through the public
+  // server API so PostgreSQL and its Node dependencies stay in the server bundle.
+  const lookupUrl = request.nextUrl.clone();
+  lookupUrl.pathname = "/api/organizationConfig";
+  lookupUrl.search = "";
+  lookupUrl.searchParams.set("organizationSlug", slug);
+  lookupUrl.searchParams.set("keys", "tagline");
+  let lookup: Response;
+  try {
+    lookup = await fetch(lookupUrl, {
+      cache: "no-store",
+      signal: AbortSignal.timeout(5000),
+    });
+  } catch {
+    return new NextResponse(
+      "Organization lookup is unavailable. Please try again.",
+      {
+        status: 503,
+      },
+    );
+  }
+  if (lookup.ok) return NextResponse.next();
+  if (lookup.status !== 404) {
+    return new NextResponse(
+      "Organization lookup is unavailable. Please try again.",
+      {
+        status: 503,
+      },
+    );
   }
   // Set the status before React starts streaming. Keep the original tenant URL.
   const destination = request.nextUrl.clone();

tests/unit/proxy.test.ts

@@ -1,10 +1,44 @@
 // @vitest-environment node
-import { expect, it } from "vitest";
+import { afterEach, beforeEach, expect, it, vi } from "vitest";
 import { NextRequest } from "next/server";
 import { unstable_doesMiddlewareMatch } from "next/experimental/testing/server";
 import { config, proxy } from "@/proxy";
+import { app } from "@/lib/app";
 import { createOrganization } from "@/tests/unit/testUtils";
 
+// Stub only HTTP transport; tenant resolution still runs through the real API and DB.
+beforeEach(() => {
+  vi.stubGlobal("fetch", (url: URL, init?: RequestInit) =>
+    app.request(url.href, init),
+  );
+});
+afterEach(() => vi.unstubAllGlobals());
+
+it("does not report a missing tenant when its lookup API is unavailable", async () => {
+  vi.stubGlobal("fetch", () =>
+    Promise.resolve(new Response(null, { status: 500 })),
+  );
+  const response = await proxy(
+    new NextRequest("http://unavailable.lvh.me/login", {
+      headers: { host: "unavailable.lvh.me" },
+    }),
+  );
+  expect(response.status).toBe(503);
+  expect(response.headers.get("x-middleware-rewrite")).toBeNull();
+});
+
+it("returns a service error when the tenant lookup cannot connect", async () => {
+  vi.stubGlobal("fetch", () =>
+    Promise.reject(new TypeError("Connection failed")),
+  );
+  const response = await proxy(
+    new NextRequest("http://unavailable.lvh.me/login", {
+      headers: { host: "unavailable.lvh.me" },
+    }),
+  );
+  expect(response.status).toBe(503);
+});
+
 it("admits existing tenant auth pages", async () => {
   await createOrganization("existing-tenant");
   const response = await proxy(