@jakuta-inc/worker-proxy 0.1.3 → 2.0.0

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-export type { WorkerProxyConfig, ProxyRequestParams, ProxyOutcome } from "./same-origin-proxy.js";
-export { handleProxyRequest } from "./same-origin-proxy.js";
+export type { WorkerProxyConfig, ProxyOutcome, ProxyHandler, ProxyError } from "./same-origin-proxy.js";
+export { ADMIN_API_BASE, createProxyHandler } from "./same-origin-proxy.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAClG,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,iBAAiB,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACxG,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC"}

package/dist/index.js

@@ -1,2 +1,2 @@
-export { handleProxyRequest } from "./same-origin-proxy.js";
+export { ADMIN_API_BASE, createProxyHandler } from "./same-origin-proxy.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC"}

package/dist/same-origin-proxy.d.ts

@@ -1,3 +1,4 @@
+export declare const ADMIN_API_BASE = "https://jakuta-admin-api.fly.dev";
 /**
  * @field ventureApiBase - Origin of the venture's Fly.io backend (e.g. "https://venoble-backend.fly.dev")
  * @field adminApiBase - Origin of the jakuta-admin API on Fly.io (e.g. "https://jakuta-admin-api.fly.dev")
@@ -6,15 +7,6 @@ export interface WorkerProxyConfig {
     ventureApiBase: string;
     adminApiBase: string;
 }
-/**
- * @field request - The incoming Cloudflare Worker request to evaluate for proxy routing
- * @field proxyConfig - Backend origins to proxy to
- */
-export interface ProxyRequestParams {
-    request: Request;
-    proxyConfig: WorkerProxyConfig;
-}
-/** Discriminated union: either the request was proxied or it should fall through to OpenNext. */
 export type ProxyOutcome = {
     readonly proxied: true;
     readonly proxiedResponse: Response;
@@ -22,15 +14,24 @@ export type ProxyOutcome = {
     readonly proxied: false;
 };
 /**
- * Evaluates an incoming request for proxy routing.
- *
- * /api/* requests proxy to the venture backend (path preserved).
- * /auth/* requests proxy to the jakuta-admin API (rewritten to /api/auth/*).
- * Everything else returns { proxied: false } so the caller can fall through
- * to OpenNext for frontend rendering.
- *
- * @param proxyRequest - The request and proxy config
- * @returns ProxyOutcome indicating whether the request was proxied
+ * @field kind - Discriminant tag for the error variant
+ * @field target - Full URL that the proxy attempted to reach
+ * @field backendName - Which backend was unreachable
+ */
+export type ProxyError = {
+    kind: "backend_unreachable";
+    target: string;
+    backendName: "venture" | "admin";
+};
+/**
+ * @field handleRequest - Route an incoming worker request through the proxy, returning a proxied response or fall-through signal
+ */
+export interface ProxyHandler {
+    handleRequest(workerRequest: Request): Promise<ProxyOutcome>;
+}
+/**
+ * @param proxyConfig - Backend origins to proxy to; bound once at Worker startup
+ * @returns ProxyHandler that routes /api/*, /auth/*, and /_proxy/health requests
  */
-export declare function handleProxyRequest(proxyRequest: ProxyRequestParams): Promise<ProxyOutcome>;
+export declare function createProxyHandler(proxyConfig: WorkerProxyConfig): ProxyHandler;
 //# sourceMappingURL=same-origin-proxy.d.ts.map

package/dist/same-origin-proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"same-origin-proxy.d.ts","sourceRoot":"","sources":["../src/same-origin-proxy.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,iBAAiB,CAAC;CAChC;AAED,iGAAiG;AACjG,MAAM,MAAM,YAAY,GACpB;IAAE,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,eAAe,EAAE,QAAQ,CAAA;CAAE,GAC9D;IAAE,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAA;CAAE,CAAC;AAEhC;;;;;;;;;;GAUG;AACH,wBAAsB,kBAAkB,CACtC,YAAY,EAAE,kBAAkB,GAC/B,OAAO,CAAC,YAAY,CAAC,CAyBvB"}
+{"version":3,"file":"same-origin-proxy.d.ts","sourceRoot":"","sources":["../src/same-origin-proxy.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,cAAc,qCAAqC,CAAC;AAEjE;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,MAAM,YAAY,GACpB;IAAE,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,eAAe,EAAE,QAAQ,CAAA;CAAE,GAC9D;IAAE,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAA;CAAE,CAAC;AAEhC;;;;GAIG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,qBAAqB,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,SAAS,GAAG,OAAO,CAAC;CAClC,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,aAAa,CAAC,aAAa,EAAE,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CAC9D;AAmFD;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,iBAAiB,GAAG,YAAY,CAiD/E"}

package/dist/same-origin-proxy.js

@@ -1,44 +1,100 @@
-/**
- * Evaluates an incoming request for proxy routing.
- *
- * /api/* requests proxy to the venture backend (path preserved).
- * /auth/* requests proxy to the jakuta-admin API (rewritten to /api/auth/*).
- * Everything else returns { proxied: false } so the caller can fall through
- * to OpenNext for frontend rendering.
- *
- * @param proxyRequest - The request and proxy config
- * @returns ProxyOutcome indicating whether the request was proxied
- */
-export async function handleProxyRequest(proxyRequest) {
-    const requestUrl = new URL(proxyRequest.request.url);
-    if (requestUrl.pathname.startsWith("/api/")) {
-        const proxiedResponse = await forwardToBackend({
-            originalRequest: proxyRequest.request,
-            originalUrl: requestUrl,
-            targetBase: proxyRequest.proxyConfig.ventureApiBase,
-            targetPath: requestUrl.pathname,
+export const ADMIN_API_BASE = "https://jakuta-admin-api.fly.dev";
+const HEALTH_TIMEOUT_MS = 5000;
+function stripTrailingSlash(originUrl) {
+    return originUrl.endsWith("/") ? originUrl.slice(0, -1) : originUrl;
+}
+function jsonErrorResponse(errorInput) {
+    return new Response(JSON.stringify(errorInput.errorBody), {
+        status: errorInput.httpStatus,
+        headers: { "content-type": "application/json" },
+    });
+}
+async function probeHealth(baseUrl) {
+    const probeUrl = new URL("/health", baseUrl).toString();
+    try {
+        const healthResponse = await fetch(probeUrl, {
+            signal: AbortSignal.timeout(HEALTH_TIMEOUT_MS),
         });
-        return { proxied: true, proxiedResponse };
+        return { status: healthResponse.ok ? "ok" : "error", probeUrl };
+    }
+    catch {
+        return { status: "error", probeUrl };
     }
-    if (requestUrl.pathname.startsWith("/auth/")) {
-        const adminPath = "/api" + requestUrl.pathname;
-        const proxiedResponse = await forwardToBackend({
-            originalRequest: proxyRequest.request,
-            originalUrl: requestUrl,
-            targetBase: proxyRequest.proxyConfig.adminApiBase,
-            targetPath: adminPath,
+}
+async function forwardToBackend(forwardInput) {
+    const targetUrl = new URL(forwardInput.targetPath + forwardInput.originalUrl.search, forwardInput.targetBase);
+    try {
+        return await fetch(new Request(targetUrl, {
+            method: forwardInput.originalRequest.method,
+            headers: forwardInput.originalRequest.headers,
+            body: forwardInput.originalRequest.body,
+            redirect: "manual",
+        }));
+    }
+    catch {
+        const proxyError = {
+            kind: "backend_unreachable",
+            target: targetUrl.toString(),
+            backendName: forwardInput.backendName,
+        };
+        return jsonErrorResponse({
+            httpStatus: 502,
+            errorBody: {
+                error: proxyError.kind,
+                target: proxyError.target,
+                backend: proxyError.backendName,
+                message: `Proxy couldn't reach the ${proxyError.backendName} backend at ${proxyError.target}. Check /_proxy/health to verify both backends are reachable.`,
+            },
         });
-        return { proxied: true, proxiedResponse };
     }
-    return { proxied: false };
 }
-async function forwardToBackend(forwardParams) {
-    const targetUrl = new URL(forwardParams.targetPath + forwardParams.originalUrl.search, forwardParams.targetBase);
-    return fetch(new Request(targetUrl, {
-        method: forwardParams.originalRequest.method,
-        headers: forwardParams.originalRequest.headers,
-        body: forwardParams.originalRequest.body,
-        redirect: "manual",
-    }));
+/**
+ * @param proxyConfig - Backend origins to proxy to; bound once at Worker startup
+ * @returns ProxyHandler that routes /api/*, /auth/*, and /_proxy/health requests
+ */
+export function createProxyHandler(proxyConfig) {
+    const ventureBase = stripTrailingSlash(proxyConfig.ventureApiBase);
+    const adminBase = stripTrailingSlash(proxyConfig.adminApiBase);
+    return {
+        async handleRequest(workerRequest) {
+            const requestUrl = new URL(workerRequest.url);
+            const pathname = requestUrl.pathname;
+            if (pathname === "/_proxy/health") {
+                const [venture, admin] = await Promise.all([
+                    probeHealth(ventureBase),
+                    probeHealth(adminBase),
+                ]);
+                const healthStatus = { venture, admin };
+                const allOk = venture.status === "ok" && admin.status === "ok";
+                const proxiedResponse = new Response(JSON.stringify(healthStatus), {
+                    status: allOk ? 200 : 503,
+                    headers: { "content-type": "application/json" },
+                });
+                return { proxied: true, proxiedResponse };
+            }
+            if (pathname === "/api" || pathname.startsWith("/api/")) {
+                const proxiedResponse = await forwardToBackend({
+                    originalRequest: workerRequest,
+                    originalUrl: requestUrl,
+                    targetBase: ventureBase,
+                    targetPath: pathname,
+                    backendName: "venture",
+                });
+                return { proxied: true, proxiedResponse };
+            }
+            if (pathname === "/auth" || pathname.startsWith("/auth/")) {
+                const adminPath = "/api" + pathname;
+                const proxiedResponse = await forwardToBackend({
+                    originalRequest: workerRequest,
+                    originalUrl: requestUrl,
+                    targetBase: adminBase,
+                    targetPath: adminPath,
+                    backendName: "admin",
+                });
+                return { proxied: true, proxiedResponse };
+            }
+            return { proxied: false };
+        },
+    };
 }
 //# sourceMappingURL=same-origin-proxy.js.map

package/dist/same-origin-proxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"same-origin-proxy.js","sourceRoot":"","sources":["../src/same-origin-proxy.ts"],"names":[],"mappings":"AAuBA;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,YAAgC;IAEhC,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAErD,IAAI,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5C,MAAM,eAAe,GAAG,MAAM,gBAAgB,CAAC;YAC7C,eAAe,EAAE,YAAY,CAAC,OAAO;YACrC,WAAW,EAAE,UAAU;YACvB,UAAU,EAAE,YAAY,CAAC,WAAW,CAAC,cAAc;YACnD,UAAU,EAAE,UAAU,CAAC,QAAQ;SAChC,CAAC,CAAC;QACH,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;IAC5C,CAAC;IAED,IAAI,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7C,MAAM,SAAS,GAAG,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC;QAC/C,MAAM,eAAe,GAAG,MAAM,gBAAgB,CAAC;YAC7C,eAAe,EAAE,YAAY,CAAC,OAAO;YACrC,WAAW,EAAE,UAAU;YACvB,UAAU,EAAE,YAAY,CAAC,WAAW,CAAC,YAAY;YACjD,UAAU,EAAE,SAAS;SACtB,CAAC,CAAC;QACH,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;IAC5C,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;AAC5B,CAAC;AASD,KAAK,UAAU,gBAAgB,CAAC,aAA4B;IAC1D,MAAM,SAAS,GAAG,IAAI,GAAG,CACvB,aAAa,CAAC,UAAU,GAAG,aAAa,CAAC,WAAW,CAAC,MAAM,EAC3D,aAAa,CAAC,UAAU,CACzB,CAAC;IAEF,OAAO,KAAK,CACV,IAAI,OAAO,CAAC,SAAS,EAAE;QACrB,MAAM,EAAE,aAAa,CAAC,eAAe,CAAC,MAAM;QAC5C,OAAO,EAAE,aAAa,CAAC,eAAe,CAAC,OAAO;QAC9C,IAAI,EAAE,aAAa,CAAC,eAAe,CAAC,IAAI;QACxC,QAAQ,EAAE,QAAQ;KACnB,CAAC,CACH,CAAC;AACJ,CAAC"}
+{"version":3,"file":"same-origin-proxy.js","sourceRoot":"","sources":["../src/same-origin-proxy.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jakuta-inc/worker-proxy",
-  "version": "0.1.3",
+  "version": "2.0.0",
   "description": "Same-origin reverse proxy for Jakuta admin panel Cloudflare Workers",
   "type": "module",
   "main": "dist/index.js",