reroute-js 0.34.0 → 0.34.2

package/elysia/index.js

@@ -1,5 +1,5 @@
 /**
- * reroute-js v0.34.0
+ * reroute-js v0.34.2
  *
  * @license MIT
  * @copyright 2025 stewones <hi@stewan.io>
@@ -4930,25 +4930,12 @@ var init_core = __esm(() => {
 
 // packages/elysia/src/plugin.ts
 init_core();
+import { existsSync as existsSync3 } from "node:fs";
 import { pathToFileURL as pathToFileURL8 } from "node:url";
 import { createElement as createElement2 } from "react";
 
-// packages/elysia/src/libs/assets.ts
-import { existsSync } from "node:fs";
-function resolveClientDir(cwd, assets) {
-  if (assets.startsWith("/")) {
-    return assets;
-  }
-  const rerouteAssetsPath = `${cwd}/.reroute/assets`;
-  if (existsSync(rerouteAssetsPath)) {
-    return `${cwd}/.reroute`;
-  }
-  const devPath = `${cwd.replace(/\/$/, "")}/${assets.replace(/^\.\//, "")}`;
-  return devPath;
-}
-
 // packages/elysia/src/libs/image.ts
-import { existsSync as existsSync2 } from "node:fs";
+import { existsSync } from "node:fs";
 import { join as join2 } from "node:path";
 import sharp from "sharp";
 var imageCache = new Map;
@@ -4994,7 +4981,7 @@ async function loadFromDiskCache(cacheKey) {
   try {
     const cachePath = join2(diskCacheDir, `${cacheKey}.json`);
     const imagePath = join2(diskCacheDir, `${cacheKey}.img`);
-    if (!(existsSync2(cachePath) && existsSync2(imagePath))) {
+    if (!(existsSync(cachePath) && existsSync(imagePath))) {
       return null;
     }
     const metadata3 = JSON.parse(await Bun.file(cachePath).text());
@@ -5420,7 +5407,7 @@ function registerContentRoutes(app, cwd, collectionCache, directive, maxAge, isW
 
 // packages/elysia/src/routes/image.ts
 init_core();
-import { existsSync as existsSync3 } from "node:fs";
+import { existsSync as existsSync2 } from "node:fs";
 import { join as join3 } from "node:path";
 function parseNumericParam(value) {
   if (!value)
@@ -5473,7 +5460,7 @@ function registerImageRoutes(app, options) {
     if (!normalizedPath.startsWith(clientDir2)) {
       return { error: "Access denied" };
     }
-    if (!existsSync3(imagePath)) {
+    if (!existsSync2(imagePath)) {
       return { error: "Image not found" };
     }
     if (!isImageFile(imagePath)) {
@@ -6289,8 +6276,8 @@ import { NotFoundError as NotFoundError6 } from "elysia";
 async function tryLoadPrebuiltCollection(cwd, collection, slug, meta) {
   try {
     const jsPath = `${cwd}/.reroute/collections/${collection}.js`;
-    const { existsSync: existsSync4 } = await import("node:fs");
-    if (existsSync4(jsPath)) {
+    const { existsSync: existsSync3 } = await import("node:fs");
+    if (existsSync3(jsPath)) {
       try {
         const mod = await import(jsPath);
         const items = mod.items || [];
@@ -6423,7 +6410,7 @@ async function loadOgImageFromRoute(_cwd, clientDir, pathname, isWatchMode) {
       }
     }
     const { pathToFileURL: pathToFileURL8 } = await import("node:url");
-    const { existsSync: existsSync4 } = await import("node:fs");
+    const { existsSync: existsSync3 } = await import("node:fs");
     const pathnameOnly = pathname.split("?")[0];
     const cleanPath = pathnameOnly === "/" ? "index" : pathnameOnly.replace(/^\//, "").replace(/\/$/, "");
     const possiblePaths = [
@@ -6433,7 +6420,7 @@ async function loadOgImageFromRoute(_cwd, clientDir, pathname, isWatchMode) {
       `${clientDir}/routes/${cleanPath}/index.ts`
     ];
     for (const routePath of possiblePaths) {
-      if (existsSync4(routePath)) {
+      if (existsSync3(routePath)) {
         const routeMod = await import(pathToFileURL8(routePath).href + (isWatchMode ? `?t=${Date.now()}` : ""));
         return {
           meta: routeMod.meta,
@@ -6514,7 +6501,7 @@ function registerOGRoutes(app, options) {
     let fonts;
     if (ogConfig2.fonts && ogConfig2.fonts.length > 0) {
       const { join: join4, dirname } = await import("node:path");
-      const { existsSync: existsSync4 } = await import("node:fs");
+      const { existsSync: existsSync3 } = await import("node:fs");
       const loadedFonts = [];
       const isCompiledBinary = typeof Bun !== "undefined" && process.argv[0]?.endsWith(process.argv[1]);
       const baseDir = isCompiledBinary ? dirname(process.argv[1]) : cwd2;
@@ -6530,7 +6517,7 @@ function registerOGRoutes(app, options) {
           ];
           let loaded = false;
           for (const fontPath of possiblePaths) {
-            if (existsSync4(fontPath)) {
+            if (existsSync3(fontPath)) {
               const fontFile = Bun.file(fontPath);
               const data = await fontFile.arrayBuffer();
               loadedFonts.push({
@@ -7586,6 +7573,7 @@ function registerSSRRoutes(app, options) {
   for (const path2 of allRoutes) {
     app.get(path2, handleSSR);
   }
+  app.get("*", handleSSR);
   return app;
 }
 
@@ -7608,11 +7596,9 @@ function isOtelAvailable4() {
 }
 function registerStaticRoutes(app, options) {
   const {
-    clientDir,
-    prefix,
+    staticAssetsDir,
     maxAge,
     directive,
-    indexHTML,
     staticHeaders = {},
     shouldIgnore,
     fileCache,
@@ -7635,18 +7621,9 @@ function registerStaticRoutes(app, options) {
     }
     currentSpan?.setAttributes(attrs);
   }
-  async function resolveFilePath(filePath, indexHTML2) {
-    let actualFilePath = filePath;
-    let exists = await Bun.file(actualFilePath).exists();
-    if (!exists && indexHTML2) {
-      actualFilePath = join(filePath, "index.html");
-      exists = await Bun.file(actualFilePath).exists();
-    }
-    return { path: actualFilePath, exists };
-  }
-  app.get(`${prefix}/*`, async function serveStaticFile({ params, headers }) {
+  app.get("/assets/*", async function serveStaticFile({ params, headers }) {
     const requestPath = params["*"];
-    const filePath = join(clientDir, requestPath);
+    const filePath = join(staticAssetsDir, requestPath);
     try {
       const acceptEncoding = headers["accept-encoding"] ?? "";
       const encoding = getEncoding(acceptEncoding);
@@ -7658,20 +7635,20 @@ function registerStaticRoutes(app, options) {
         response2.headers.set("Reroute-Cache", "HIT");
         return response2;
       }
-      const { path: actualFilePath, exists } = await resolveFilePath(filePath, indexHTML);
+      const exists = await Bun.file(filePath).exists();
       if (!exists) {
         setOtelAttributes(404, false, requestPath, undefined, "file_not_exists");
         throw new NotFoundError12;
       }
-      if (shouldIgnore(actualFilePath)) {
+      if (shouldIgnore(filePath)) {
         setOtelAttributes(404, false, requestPath, undefined, "file_ignored");
         throw new NotFoundError12;
       }
-      const contentBuf = await Bun.file(actualFilePath).arrayBuffer();
+      const contentBuf = await Bun.file(filePath).arrayBuffer();
       const content2 = new Uint8Array(contentBuf);
-      const contentType = getMimeType(actualFilePath);
+      const contentType = getMimeType(filePath);
       const { body, extraHeaders } = compression2 ? gzipIfAccepted(content2, contentType, acceptEncoding) : { body: content2, extraHeaders: {} };
-      const cacheControl = getAssetCacheControl(actualFilePath, contentType, maxAge, directive, isWatchMode);
+      const cacheControl = getAssetCacheControl(filePath, contentType, maxAge, directive, isWatchMode);
       const response = new Response(body, {
         headers: {
           "Content-Type": contentType,
@@ -7708,7 +7685,7 @@ function registerStaticRoutes(app, options) {
 }
 
 // packages/elysia/src/plugin.ts
-var reroute = (options = {}) => async (app) => {
+var reroute = () => async (app) => {
   const cwd = typeof process !== "undefined" && typeof process.cwd === "function" ? process.cwd() : "/";
   app.onRequest(({ request }) => {
     if (request.method === "HEAD") {
@@ -7721,54 +7698,45 @@ var reroute = (options = {}) => async (app) => {
   const globalConfig = await loadConfig(cwd);
   let rootComponent;
   const globalApp = globalThis.__REROUTE_APP_COMPONENT__;
-  if (options.app) {
-    if (typeof options.app === "string") {
-      const appPath = options.app.startsWith("/") ? options.app : `${cwd}/${options.app.replace(/^\.\//, "")}`;
-      const AppModule = await import(`${pathToFileURL8(appPath).href}?t=${Date.now()}`);
-      rootComponent = createElement2(AppModule.default);
-    } else {
-      rootComponent = options.app;
-    }
-  } else if (globalApp) {
+  if (globalApp) {
     rootComponent = createElement2(globalApp);
-  } else if (globalConfig.options?.app) {
-    const appPath = globalConfig.options.app.startsWith("/") ? globalConfig.options.app : `${cwd}/${globalConfig.options.app.replace(/^\.\//, "")}`;
+  } else if (globalConfig.app?.src) {
+    const appPath = globalConfig.app.src.startsWith("/") ? globalConfig.app.src : `${cwd}/${globalConfig.app.src.replace(/^\.\//, "")}`;
     const AppModule = await import(`${pathToFileURL8(appPath).href}?t=${Date.now()}`);
     rootComponent = createElement2(AppModule.default);
   }
   if (!rootComponent) {
     console.warn("[reroute] No app component provided. SSR routes will not be registered.");
   }
-  const ssrHead = options.head ?? globalConfig.options?.head ?? "";
-  const ssrLang = options.lang ?? globalConfig.options?.lang ?? "en";
-  const ssrAppId = options.appId ?? globalConfig.options?.appId ?? "root";
-  const assets = options.assets ?? globalConfig.options?.assets ?? "src/client";
-  let prefix = options.prefix ?? globalConfig.options?.prefix ?? "/";
-  const ignorePatterns = options.ignorePatterns ?? globalConfig.options?.ignorePatterns ?? [
+  const ssrHead = globalConfig.app?.head ?? "";
+  const ssrLang = globalConfig.app?.lang ?? "en";
+  const ssrAppId = globalConfig.app?.appId ?? "root";
+  const staticAssetsDir = existsSync3(`${cwd}/.reroute/assets`) ? `${cwd}/.reroute/assets` : `${cwd}/src/client/assets`;
+  const staticConfig = globalConfig.static ?? {};
+  const ignorePatterns = staticConfig.ignorePatterns ?? [
     ".DS_Store",
     ".git",
-    ".env",
-    "index.html",
-    /favicon\.ico/,
-    /\.well-known/
+    ".env"
   ];
-  const staticHeaders = options.staticHeaders ?? globalConfig.options?.staticHeaders;
-  const maxAge = options.maxAge ?? globalConfig.options?.maxAge ?? 3600;
-  const directive = options.directive ?? globalConfig.options?.directive ?? "public";
-  const indexHTML = options.indexHTML ?? globalConfig.options?.indexHTML ?? true;
-  const compression2 = options.compression ?? globalConfig.options?.compression ?? true;
-  const debug = options.debug ?? globalConfig.options?.debug ?? false;
-  const imageMaxAge = options.imageMaxAge ?? globalConfig.options?.imageMaxAge ?? 31536000;
-  const imageAllowedDomains = options.imageAllowedDomains ?? globalConfig.options?.imageAllowedDomains ?? [];
-  const imageMaxWidth = options.imageMaxWidth ?? globalConfig.options?.imageMaxWidth ?? 3840;
-  const imageMaxHeight = options.imageMaxHeight ?? globalConfig.options?.imageMaxHeight ?? 2160;
-  const bundleMaxAge = options.bundleMaxAge ?? globalConfig.options?.bundleMaxAge ?? 3600;
-  const streamingEnabled = options.streaming?.enabled ?? globalConfig.streaming?.enabled ?? false;
-  const baseUrl = globalConfig.options?.baseUrl;
-  const autoCanonical = globalConfig.options?.autoCanonical;
+  const staticHeaders = staticConfig.headers;
+  const maxAge = globalConfig.app?.maxAge ?? 3600;
+  const directive = globalConfig.app?.directive ?? "public";
+  const staticMaxAge = staticConfig.maxAge ?? maxAge;
+  const staticDirective = staticConfig.directive ?? directive;
+  const compression2 = globalConfig.app?.compression ?? true;
+  const debug = globalConfig.app?.debug ?? false;
+  const imageConfig = globalConfig.image ?? {};
+  const imageMaxAge = imageConfig.maxAge ?? 31536000;
+  const imageAllowedDomains = imageConfig.allowedDomains ?? [];
+  const imageMaxWidth = imageConfig.maxWidth ?? 3840;
+  const imageMaxHeight = imageConfig.maxHeight ?? 2160;
+  const bundleMaxAge = globalConfig.app?.bundleMaxAge ?? 3600;
+  const streamingEnabled = globalConfig.streaming?.enabled ?? false;
+  const baseUrl = globalConfig.app?.baseUrl;
+  const autoCanonical = globalConfig.app?.autoCanonical;
   const sitemapConfig = globalConfig.sitemap;
   const sitemapEnabled = sitemapConfig?.enabled === true;
-  const sitemapBaseUrl = options.sitemapBaseUrl ?? sitemapConfig?.baseUrl;
+  const sitemapBaseUrl = sitemapConfig?.baseUrl;
   const rssConfig = globalConfig.rss;
   const rssEnabled = rssConfig?.enabled === true;
   const rssBaseUrl = rssConfig?.baseUrl;
@@ -7778,8 +7746,6 @@ var reroute = (options = {}) => async (app) => {
   const llmsEnabled = llmsConfig?.enabled === true;
   const robotsConfig = globalConfig.robots;
   const robotsEnabled = robotsConfig?.enabled === true;
-  if (prefix === "/")
-    prefix = "";
   const fileCache = new LRUCache(100);
   const dataCache = new LRUCache(100);
   const collectionCache = new LRUCache(50);
@@ -7821,7 +7787,7 @@ var reroute = (options = {}) => async (app) => {
       }
     }
   };
-  const clientDir = resolveClientDir(cwd, assets);
+  const clientDir = existsSync3(`${cwd}/.reroute/assets`) ? `${cwd}/.reroute` : `${cwd}/src/client`;
   const shouldIgnore = !ignorePatterns.length ? () => false : (file) => ignorePatterns.find((pattern) => typeof pattern === "string" ? file.includes(pattern) : pattern.test(file));
   const isWatchMode = Array.isArray(process.execArgv) && process.execArgv.includes("--watch") || Array.isArray(process.argv) && process.argv.includes("--watch");
   const dataCacheControl = `${directive}, max-age=${maxAge}`;
@@ -7907,6 +7873,16 @@ var reroute = (options = {}) => async (app) => {
     maxHeight: imageMaxHeight,
     compression: compression2
   });
+  registerStaticRoutes(app, {
+    staticAssetsDir,
+    maxAge: staticMaxAge,
+    directive: staticDirective,
+    staticHeaders,
+    shouldIgnore,
+    fileCache,
+    isWatchMode,
+    compression: compression2
+  });
   if (rootComponent) {
     try {
       const collections2 = await discoverCollections(clientDir);
@@ -8034,18 +8010,6 @@ var reroute = (options = {}) => async (app) => {
       throw error;
     }
   }
-  registerStaticRoutes(app, {
-    clientDir,
-    prefix,
-    maxAge,
-    directive,
-    indexHTML,
-    staticHeaders,
-    shouldIgnore,
-    fileCache,
-    isWatchMode,
-    compression: compression2
-  });
   app.onError(({ set, error }) => {
     if ("status" in error && error.status === 404) {
       set.status = 404;
@@ -8061,4 +8025,4 @@ export {
   reroute
 };
 
-//# debugId=29E28F45EF65D91064756E2164756E21
+//# debugId=203F5F1F5634A54D64756E2164756E21