@dytsou/shorten-url 2.4.4 → 2.4.6

package/src/lib/worker-handler.js

@@ -0,0 +1,122 @@
+import { fetchFrontendAsset, isFrontendAssetPath } from "./assets.js";
+import { createFlagRoutes } from "./flag-routes.js";
+import { createFlagshipAdapter } from "./flagship.js";
+import { endpointsFromFrontend } from "./endpoints.js";
+import { createShortener } from "./shortener.js";
+import { createRuntimeConfig } from "./runtime-config.js";
+
+const API_DOC_PATHS = new Set(["/api/", "/api/index.html", "/api/openapi.yaml"]);
+const ABOUT_DOC_PATHS = new Set(["/about", "/about.html"]);
+
+async function handleEarlyRequest({ request, requestURL, env, shortener, flagRoutes }) {
+  if (request.method === "OPTIONS") {
+    return new Response(null, { status: 204, headers: shortener.htmlHeaders() });
+  }
+
+  const settingsResponse = flagRoutes.handleSettings(request, requestURL.pathname);
+  if (settingsResponse) return settingsResponse;
+
+  if (request.method === "POST") {
+    return shortener.handleShorten(request, requestURL, {
+      apiPath: requestURL.pathname,
+      allowedApiPaths: ["/", "/shorten"],
+    });
+  }
+
+  if (request.method !== "GET" && request.method !== "HEAD") return null;
+  if (requestURL.pathname === "/api") {
+    return Response.redirect(new URL(`/api/${requestURL.search}`, requestURL), 308);
+  }
+  if (requestURL.pathname === "/about/") {
+    return Response.redirect(new URL(`/about${requestURL.search}`, requestURL), 308);
+  }
+  if (ABOUT_DOC_PATHS.has(requestURL.pathname)) {
+    return fetchFrontendAsset(env, request, "/about");
+  }
+  if (API_DOC_PATHS.has(requestURL.pathname)) {
+    return fetchFrontendAsset(env, request, requestURL.pathname);
+  }
+  return null;
+}
+
+async function handlePageRequest({
+  request,
+  requestURL,
+  env,
+  shortener,
+  flagRoutes,
+  homePath = "/",
+  rootResponse,
+}) {
+  const path = requestURL.pathname.split("/")[1] || "";
+  const variantResponse = await flagRoutes.evaluateShortening(request, requestURL.pathname, () =>
+    fetchFrontendAsset(env, request, "/")
+  );
+  if (variantResponse) return variantResponse;
+  if (requestURL.pathname === homePath) return fetchFrontendAsset(env, request, "/");
+  if (requestURL.pathname === "/" && homePath !== "/" && rootResponse) {
+    return rootResponse();
+  }
+  if (requestURL.pathname === "/favicon.ico") {
+    return Response.redirect(new URL("/favicon.svg", request.url), 302);
+  }
+  if (isFrontendAssetPath(requestURL.pathname)) {
+    return fetchFrontendAsset(env, request, requestURL.pathname);
+  }
+  if (
+    requestURL.pathname === "/api" ||
+    requestURL.pathname.startsWith("/api/") ||
+    requestURL.pathname === "/shorten" ||
+    requestURL.pathname.startsWith("/shorten/")
+  ) {
+    return shortener.jsonResponse({ status: 404, message: "API route not found" }, 404);
+  }
+  return shortener.handleShortUrlRedirect(path, requestURL.search);
+}
+
+/**
+ * Compose the shared Worker request handler.
+ *
+ * Entrypoints provide only configuration overrides; route behavior lives here
+ * so the production and example Workers cannot silently diverge.
+ */
+export function createWorkerHandler({
+  config: fixedConfig,
+  configOverrides = {},
+  flagshipAdapter,
+  verifyToken,
+} = {}) {
+  return async function workerHandler(request, env = {}) {
+    const config = fixedConfig || createRuntimeConfig(env, configOverrides);
+    const requestURL = new URL(request.url);
+    const endpoints = endpointsFromFrontend(config.frontend);
+    const shortener = createShortener({
+      worker: {
+        ...config.worker,
+        safe_browsing_api_key: env.SAFE_BROWSING_API_KEY ?? config.worker.safe_browsing_api_key,
+      },
+      endpoints,
+      kv: env.LINKS,
+      env,
+    });
+    const flagRoutes = createFlagRoutes({
+      prefix: "/settings",
+      shorteningPath: "/",
+      pageUrl: endpoints.shortenPage,
+      shortener,
+      env,
+      adapter: flagshipAdapter || createFlagshipAdapter(env),
+      verifyToken,
+    });
+
+    const earlyResponse = await handleEarlyRequest({
+      request,
+      requestURL,
+      env,
+      shortener,
+      flagRoutes,
+    });
+    if (earlyResponse) return earlyResponse;
+    return handlePageRequest({ request, requestURL, env, shortener, flagRoutes });
+  };
+}

package/src/worker.js

@@ -1,69 +1,6 @@
-/**
- * URL Shortener - Cloudflare Worker
- *
- * Configuration is imported from `config/config.js`.
- * Requires a KV namespace bound as `LINKS`.
- *
- * Routes:
- *   OPTIONS *                -> CORS preflight
- *   POST    /                -> create short URL (protected by Cloudflare Access / WARP)
- *   GET     /                -> serve the shortener frontend
- *   GET     /<key>           -> redirect a stored short link
- */
-
-import { createShortener } from "./lib/shortener.js";
-import { endpointsFromFrontend } from "./lib/endpoints.js";
 import { withFetchObservability } from "./lib/observability.js";
-import config from "../config/config.js";
-
-function getEndpoints() {
-  return endpointsFromFrontend(config.frontend);
-}
-
-async function fetchHandler(request, env) {
-  const workerConfig = {
-    ...config.worker,
-    safe_browsing_api_key:
-      env.SAFE_BROWSING_API_KEY ?? config.worker.safe_browsing_api_key,
-  };
-  const shortener = createShortener({
-    worker: workerConfig,
-    endpoints: getEndpoints(),
-    kv: env.LINKS,
-  });
-
-  const requestURL = new URL(request.url);
-  const [, path] = requestURL.pathname.split("/");
-  const params = requestURL.search;
-
-  if (request.method === "OPTIONS") {
-    return new Response(null, { status: 204, headers: shortener.htmlHeaders() });
-  }
-  if (
-    (request.method === "GET" || request.method === "HEAD") &&
-    (requestURL.pathname === "/api" || requestURL.pathname.startsWith("/api/"))
-  ) {
-    if (
-      requestURL.pathname !== "/api/" &&
-      /^\/api(?:\/api)*\/?$/.test(requestURL.pathname)
-    ) {
-      return Response.redirect(new URL("/api/", requestURL), 308);
-    }
+import { createWorkerHandler } from "./lib/worker-handler.js";
 
-    const assetURL = new URL(
-      `${requestURL.pathname.slice(1)}${requestURL.search}`,
-      config.frontend.url,
-    );
-    return fetch(new Request(assetURL, { method: request.method }));
-  }
-  if (request.method === "POST") {
-    return shortener.handleShorten(request, requestURL, {
-      apiPath: requestURL.pathname,
-      allowedApiPaths: ["/"],
-    });
-  }
-  if (!path) return shortener.fetchHostedPage(getEndpoints().shortenPage);
-  return shortener.handleShortUrlRedirect(path, params);
-}
+export const workerFetchHandler = createWorkerHandler();
 
-export default withFetchObservability(fetchHandler);
+export default withFetchObservability(workerFetchHandler);