reroute-js 0.26.0 → 0.27.0

package/README.md

@@ -1,6 +1,6 @@
 # Reroute
 
-Reroute is a dead-simple file-based routing framework for building full-stack React apps on top of Bun and Elysia.
+Reroute is a feature-rich file-based routing framework for building fullstack React apps on top of Bun and Elysia.
 
 ## 📚 Table of Contents
 
@@ -48,6 +48,10 @@ Reroute is a dead-simple file-based routing framework for building full-stack Re
   - [CLI Preview](#cli-preview)
   - [URLs & Meta Tags](#urls--meta-tags)
   - [Default Template](#default-template)
+- [📊 OpenTelemetry](#-opentelemetry-optional)
+  - [Server Telemetry](#server-telemetry)
+  - [Custom Instrumentation](#custom-instrumentation)
+  - [Reroute SSR Tracing](#reroute-ssr-tracing)
 - [📖 Learn More](#-learn-more)
 - [📝 License](#-license)
 
@@ -1477,7 +1481,7 @@ If no `[og].tsx` exists for a route, uses built-in template with:
 - Avatar and siteName from config
 - Clean black card design
 
-## 📊 OpenTelemetry (Optional)
+## 📊 OpenTelemetry
 
 ### Server Telemetry
 
@@ -1487,7 +1491,8 @@ Track HTTP requests, errors, and system metrics.
 
 ```bash
 # Server telemetry packages
-bun add @opentelemetry/api \
+bun add source-map \
+  @opentelemetry/api \
   @opentelemetry/api-logs \
   @opentelemetry/exporter-logs-otlp-proto \
   @opentelemetry/exporter-metrics-otlp-proto \
@@ -1496,7 +1501,8 @@ bun add @opentelemetry/api \
   @opentelemetry/sdk-logs \
   @opentelemetry/sdk-metrics \
   @opentelemetry/sdk-trace-node \
-  @opentelemetry/semantic-conventions
+  @opentelemetry/semantic-conventions \
+  
 ```
 
 **Configuration** in `reroute.config.ts`:
@@ -1518,7 +1524,7 @@ export default defineConfig({
     // Browser telemetry proxy (avoids CORS and ad blockers)
     proxy: {
       enabled: true,              // Default when proxy is an object
-      pathname: '/api/telemetry', // Default
+      pathname: '/__reroute/telemetry', // Default
       verbose: false,             // Log proxy requests
     },
     
@@ -1527,7 +1533,7 @@ export default defineConfig({
       enabled: true,
       serviceName: 'my-app-browser',
       environment: process.env.NODE_ENV || 'development',
-      otlpEndpoint: '/api/telemetry',  // Must match proxy.pathname
+      otlpEndpoint: '/__reroute/telemetry',  // Must match proxy.pathname
       enableConsoleCapture: true,
     },
   },
@@ -1578,8 +1584,6 @@ import { TelemetryProvider } from 'reroute-js/telemetry/react/react';
 </TelemetryProvider>
 ```
 
-See [examples/landing](./examples/landing) for a complete example.
-
 ### Custom Instrumentation
 
 Create custom spans for API calls, database queries, or any operation:

package/cli/bin.d.ts

@@ -1,5 +1,5 @@
 /**
- * reroute-js v0.26.0
+ * reroute-js v0.27.0
  *
  * @license MIT
  * @copyright 2025 stewones <hi@stewan.io>

package/cli/bin.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 // @bun
 /**
- * reroute-js v0.26.0
+ * reroute-js v0.27.0
  *
  * @license MIT
  * @copyright 2025 stewones <hi@stewan.io>
@@ -48,7 +48,7 @@ async function getVersionString() {
 }
 async function getVersion() {
   if (true) {
-    return "0.26.0";
+    return "0.27.0";
   }
   const possiblePaths = [
     path.join(import.meta.dir, "../../../../package.json"),
@@ -66,7 +66,7 @@ async function getVersion() {
 }
 async function getCommit() {
   if (true) {
-    return "fb2b396";
+    return "f0b4a6d";
   }
   return "dev";
 }
@@ -500,6 +500,13 @@ var init_content = __esm(() => {
   init_metadata();
 });
 
+// packages/telemetry/src/server/context.ts
+import { AsyncLocalStorage } from "node:async_hooks";
+var contextStorage;
+var init_context = __esm(() => {
+  contextStorage = new AsyncLocalStorage;
+});
+
 // packages/telemetry/src/server/instrumentation.ts
 import { context, SpanStatusCode, trace } from "@opentelemetry/api";
 function isOtelAvailable() {
@@ -599,13 +606,38 @@ async function withParentSpan(parentSpan, fn) {
   const ctx = trace.setSpan(context.active(), parentSpan);
   return context.with(ctx, fn);
 }
+function getTraceContextForInjection(span) {
+  if (!(isOtelAvailable() && span))
+    return;
+  try {
+    const { propagation } = __require("@opentelemetry/api");
+    const carrier = {};
+    const ctx = trace.setSpan(context.active(), span);
+    propagation.inject(ctx, carrier);
+    return {
+      traceparent: carrier.traceparent,
+      tracestate: carrier.tracestate
+    };
+  } catch (error) {
+    console.error("[telemetry] Failed to get trace context for injection:", error);
+    return;
+  }
+}
 var otelAvailable, noopSpan;
 var init_instrumentation = __esm(() => {
   noopSpan = new NoopSpan;
 });
 
+// packages/telemetry/src/server/sourcemap.ts
+import { SourceMapConsumer } from "source-map";
+var sourcemapCache;
+var init_sourcemap = __esm(() => {
+  sourcemapCache = new Map;
+});
+
 // packages/telemetry/src/server/plugin.ts
 import {
+  context as context2,
   metrics,
   SpanStatusCode as SpanStatusCode2,
   trace as trace2
@@ -634,12 +666,17 @@ import {
 import { ATTR_HOST_NAME } from "@opentelemetry/semantic-conventions/incubating";
 var init_plugin = __esm(() => {
   init_core();
+  init_context();
+  init_instrumentation();
+  init_sourcemap();
 });
 
 // packages/telemetry/src/server/index.ts
 var init_server = __esm(() => {
+  init_context();
   init_instrumentation();
   init_plugin();
+  init_sourcemap();
 });
 
 // packages/telemetry/server.ts
@@ -2475,13 +2512,26 @@ function createTelemetryConfigScript(browserTelemetryConfig) {
     return "";
   }
 }
-function createDataScript(ssrData, errorMsg, pathname, browserTelemetryConfig) {
+function createTraceContextScript(traceContext) {
+  if (!traceContext?.traceparent || typeof traceContext.traceparent !== "string") {
+    return "";
+  }
+  try {
+    const contextJson = escapeJsonForScript(JSON.stringify(traceContext));
+    return `<script>(function(){try{var w=(typeof window!=='undefined'?window:globalThis);w.__REROUTE_TRACE_CONTEXT__=${contextJson};}catch(e){}})();</script>`;
+  } catch (error) {
+    console.error("[reroute] Failed to serialize trace context:", error);
+    return "";
+  }
+}
+function createDataScript(ssrData, errorMsg, pathname, browserTelemetryConfig, traceContext) {
   let script = "";
   script += createContentCaptureScript();
   if (pathname) {
     script += createSSRExportsScript(pathname);
   }
   script += createTelemetryConfigScript(browserTelemetryConfig);
+  script += createTraceContextScript(traceContext);
   if (ssrData && Object.keys(ssrData).length > 0) {
     try {
       const duplicatedData = duplicateQueryParamData(ssrData);
@@ -2704,10 +2754,10 @@ function generateCollectionScripts(byCollectionForSSR) {
   } catch {}
   return "";
 }
-function generateHydrationScripts(ssrData, isWatchMode, ssrError, collectionScripts = "", preloadScript = "", bundleUrl = "", pathname = "", browserTelemetryConfig) {
+function generateHydrationScripts(ssrData, isWatchMode, ssrError, collectionScripts = "", preloadScript = "", bundleUrl = "", pathname = "", browserTelemetryConfig, traceContext) {
   let scripts = preloadScript;
   scripts += collectionScripts;
-  scripts += createDataScript(ssrData, isWatchMode ? ssrError : undefined, pathname, browserTelemetryConfig);
+  scripts += createDataScript(ssrData, isWatchMode ? ssrError : undefined, pathname, browserTelemetryConfig, traceContext);
   scripts += createFeedsScript();
   scripts += createLlmsScript();
   if (bundleUrl) {
@@ -2764,6 +2814,36 @@ var init_lib = __esm(() => {
   init_styles();
 });
 
+// packages/core/src/ssr/lib/serialize.ts
+var exports_serialize = {};
+__export(exports_serialize, {
+  serializeBrowserTelemetryConfig: () => serializeBrowserTelemetryConfig
+});
+function serializeBrowserTelemetryConfig(config) {
+  if (!config)
+    return;
+  const serialized = {};
+  for (const [key, value] of Object.entries(config)) {
+    if (key === "ignoreRoutes" && Array.isArray(value)) {
+      serialized[key] = value.map((pattern) => {
+        if (typeof pattern === "string") {
+          return { type: "string", value: pattern };
+        }
+        if (pattern instanceof RegExp) {
+          return { type: "regex", value: pattern.source, flags: pattern.flags };
+        }
+        if (typeof pattern === "function") {
+          return { type: "function", value: pattern.toString() };
+        }
+        return pattern;
+      });
+    } else {
+      serialized[key] = value;
+    }
+  }
+  return serialized;
+}
+
 // packages/core/src/ssr/render.ts
 import dedent from "dedent";
 import { cloneElement } from "react";
@@ -2815,9 +2895,12 @@ async function renderSSRDocument(options) {
   });
   const collectionScripts = generateCollectionScripts(setup2.byCollectionForSSR);
   const config = await loadConfig(cwd);
-  const browserTelemetryConfig = config.telemetry?.browser;
+  const browserTelemetryConfigRaw = config.telemetry?.browser;
+  const { serializeBrowserTelemetryConfig: serializeBrowserTelemetryConfig2 } = await Promise.resolve().then(() => exports_serialize);
+  const browserTelemetryConfig = serializeBrowserTelemetryConfig2(browserTelemetryConfigRaw);
+  const traceContext = getTraceContextForInjection(options.parentSpan);
   const hydrationScript = await withSpan("ssr.generate.scripts", async (span) => {
-    const script = generateHydrationScripts(setup2.ssrData, isWatchMode, setup2.ssrError, collectionScripts, setup2.preloadHydrationScript, bundleUrl, pathname, browserTelemetryConfig);
+    const script = generateHydrationScripts(setup2.ssrData, isWatchMode, setup2.ssrError, collectionScripts, setup2.preloadHydrationScript, bundleUrl, pathname, browserTelemetryConfig, traceContext);
     span.setAttribute("reroute.scripts.size", script.length);
     return script;
   });
@@ -4829,7 +4912,10 @@ async function renderSSRDocumentStream(options) {
     headWithLang = headWithLang.replace(/<meta\s+name\s*=\s*['"]description['"][^>]*>/i, "");
   }
   const config = await loadConfig(cwd);
-  const browserTelemetryConfig = config.telemetry?.browser;
+  const browserTelemetryConfigRaw = config.telemetry?.browser;
+  const { serializeBrowserTelemetryConfig: serializeBrowserTelemetryConfig2 } = await Promise.resolve().then(() => exports_serialize);
+  const browserTelemetryConfig = serializeBrowserTelemetryConfig2(browserTelemetryConfigRaw);
+  const traceContext = getTraceContextForInjection(options.parentSpan);
   streamSSRContent(writer, encoder, {
     rootComponent,
     pathname,
@@ -4850,6 +4936,7 @@ async function renderSSRDocumentStream(options) {
     byCollectionForSSR: setup2.byCollectionForSSR,
     preloadHydrationScript: setup2.preloadHydrationScript,
     browserTelemetryConfig,
+    traceContext,
     parentSpan: options.parentSpan
   });
   if (debug)
@@ -4954,7 +5041,7 @@ function buildStreamingScripts(ctx) {
       ssrDataSnapshot[key] = value;
     }
   }
-  const dataScript = createDataScript(ssrDataSnapshot, ctx.isWatchMode ? ctx.ssrError : undefined, ctx.pathname, ctx.browserTelemetryConfig);
+  const dataScript = createDataScript(ssrDataSnapshot, ctx.isWatchMode ? ctx.ssrError : undefined, ctx.pathname, ctx.browserTelemetryConfig, ctx.traceContext);
   const feedsScript = createFeedsScript();
   const llmsScript = createLlmsScript();
   let allScripts = dataScript + feedsScript + llmsScript + collectionScripts + ctx.preloadHydrationScript;
@@ -6774,7 +6861,15 @@ async function buildEntrypointBundle(cwd, args = []) {
       "import.meta.env.MODE": isProd ? '"production"' : '"development"',
       ...envDefines
     },
-    ...isProd ? { drop: ["console", "debugger"] } : {}
+    ...isProd ? {
+      drop: [
+        "console.log",
+        "console.debug",
+        "console.info",
+        "console.warn",
+        "debugger"
+      ]
+    } : {}
   });
   if (!result.success) {
     console.error("[reroute/gen] Entrypoint build failed:");
@@ -80776,12 +80871,12 @@ var require_lcd = __commonJS((exports, module) => {
       }
       return flipped;
     }
-    function Draw(context2, elements) {
-      context2.clearRect(this.X, this.Y, this.Width, this.Height);
-      context2.save();
+    function Draw(context4, elements) {
+      context4.clearRect(this.X, this.Y, this.Width, this.Height);
+      context4.save();
       var elementWidth = this.CalcElementDimensions().Width;
-      context2.translate(this.X, this.Y);
-      context2.translate(this.Padding, this.Padding);
+      context4.translate(this.X, this.Y);
+      context4.translate(this.Padding, this.Padding);
       for (var i = 0;i < elements.length; i++) {
         var element = elements[i];
         for (var s = 0;s < this.Points.length; s++) {
@@ -80789,28 +80884,28 @@ var require_lcd = __commonJS((exports, module) => {
           var stroke = element & 1 << s ? this.StrokeLight : this.StrokeDark;
           if (stroke == this.StrokeDark)
             continue;
-          context2.lineWidth = this.StrokeWidth;
-          context2.strokeStyle = stroke;
-          context2.fillStyle = color;
-          context2.moveTo(0, 0);
-          context2.beginPath();
-          context2.moveTo(this.Points[s][0].x, this.Points[s][0].y);
+          context4.lineWidth = this.StrokeWidth;
+          context4.strokeStyle = stroke;
+          context4.fillStyle = color;
+          context4.moveTo(0, 0);
+          context4.beginPath();
+          context4.moveTo(this.Points[s][0].x, this.Points[s][0].y);
           var maxX = 0;
           for (var p = 1;p < this.Points[s].length; p++) {
             if (this.Points[s][p].x > maxX)
               maxX = this.Points[s][p].x;
-            context2.lineTo(Math.round(this.Points[s][p].x), Math.round(this.Points[s][p].y));
+            context4.lineTo(Math.round(this.Points[s][p].x), Math.round(this.Points[s][p].y));
           }
-          context2.closePath();
-          context2.fill();
-          context2.stroke();
+          context4.closePath();
+          context4.fill();
+          context4.stroke();
           if (this.StrokeWidth > 0) {
-            context2.stroke();
+            context4.stroke();
           }
         }
-        context2.translate(elementWidth + this.Spacing, 0);
+        context4.translate(elementWidth + this.Spacing, 0);
       }
-      context2.restore();
+      context4.restore();
     }
     function CalcPoints() {
       var w = this.ElementWidth, h = this.ElementHeight, sw = this.SegmentWidth * w, si = this.SegmentInterval * w, bw = this.BevelWidth * sw, ib = this.SideBevelEnabled ? 1 : 0, sf = sw * 0.8, slope = h / w, sqrt2 = Math.SQRT2, sqrt3 = Math.sqrt(3);
@@ -96849,11 +96944,11 @@ var require_lodash = __commonJS((exports, module) => {
     function unicodeWords(string) {
       return string.match(reUnicodeWord) || [];
     }
-    var runInContext = function runInContext(context2) {
-      context2 = context2 == null ? root : _.defaults(root.Object(), context2, _.pick(root, contextProps));
-      var { Array: Array2, Date: Date2, Error: Error2, Function: Function2, Math: Math2, Object: Object2, RegExp: RegExp2, String: String2, TypeError: TypeError2 } = context2;
+    var runInContext = function runInContext(context4) {
+      context4 = context4 == null ? root : _.defaults(root.Object(), context4, _.pick(root, contextProps));
+      var { Array: Array2, Date: Date2, Error: Error2, Function: Function2, Math: Math2, Object: Object2, RegExp: RegExp2, String: String2, TypeError: TypeError2 } = context4;
       var arrayProto = Array2.prototype, funcProto = Function2.prototype, objectProto = Object2.prototype;
-      var coreJsData = context2["__core-js_shared__"];
+      var coreJsData = context4["__core-js_shared__"];
       var funcToString = funcProto.toString;
       var hasOwnProperty = objectProto.hasOwnProperty;
       var idCounter = 0;
@@ -96865,7 +96960,7 @@ var require_lodash = __commonJS((exports, module) => {
       var objectCtorString = funcToString.call(Object2);
       var oldDash = root._;
       var reIsNative = RegExp2("^" + funcToString.call(hasOwnProperty).replace(reRegExpChar, "\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, "$1.*?") + "$");
-      var Buffer2 = moduleExports ? context2.Buffer : undefined2, Symbol2 = context2.Symbol, Uint8Array2 = context2.Uint8Array, allocUnsafe = Buffer2 ? Buffer2.allocUnsafe : undefined2, getPrototype = overArg(Object2.getPrototypeOf, Object2), objectCreate = Object2.create, propertyIsEnumerable = objectProto.propertyIsEnumerable, splice = arrayProto.splice, spreadableSymbol = Symbol2 ? Symbol2.isConcatSpreadable : undefined2, symIterator = Symbol2 ? Symbol2.iterator : undefined2, symToStringTag = Symbol2 ? Symbol2.toStringTag : undefined2;
+      var Buffer2 = moduleExports ? context4.Buffer : undefined2, Symbol2 = context4.Symbol, Uint8Array2 = context4.Uint8Array, allocUnsafe = Buffer2 ? Buffer2.allocUnsafe : undefined2, getPrototype = overArg(Object2.getPrototypeOf, Object2), objectCreate = Object2.create, propertyIsEnumerable = objectProto.propertyIsEnumerable, splice = arrayProto.splice, spreadableSymbol = Symbol2 ? Symbol2.isConcatSpreadable : undefined2, symIterator = Symbol2 ? Symbol2.iterator : undefined2, symToStringTag = Symbol2 ? Symbol2.toStringTag : undefined2;
       var defineProperty = function() {
         try {
           var func = getNative(Object2, "defineProperty");
@@ -96873,9 +96968,9 @@ var require_lodash = __commonJS((exports, module) => {
           return func;
         } catch (e) {}
       }();
-      var ctxClearTimeout = context2.clearTimeout !== root.clearTimeout && context2.clearTimeout, ctxNow = Date2 && Date2.now !== root.Date.now && Date2.now, ctxSetTimeout = context2.setTimeout !== root.setTimeout && context2.setTimeout;
-      var { ceil: nativeCeil, floor: nativeFloor } = Math2, nativeGetSymbols = Object2.getOwnPropertySymbols, nativeIsBuffer = Buffer2 ? Buffer2.isBuffer : undefined2, nativeIsFinite = context2.isFinite, nativeJoin = arrayProto.join, nativeKeys = overArg(Object2.keys, Object2), nativeMax = Math2.max, nativeMin = Math2.min, nativeNow = Date2.now, nativeParseInt = context2.parseInt, nativeRandom = Math2.random, nativeReverse = arrayProto.reverse;
-      var DataView = getNative(context2, "DataView"), Map2 = getNative(context2, "Map"), Promise2 = getNative(context2, "Promise"), Set2 = getNative(context2, "Set"), WeakMap2 = getNative(context2, "WeakMap"), nativeCreate = getNative(Object2, "create");
+      var ctxClearTimeout = context4.clearTimeout !== root.clearTimeout && context4.clearTimeout, ctxNow = Date2 && Date2.now !== root.Date.now && Date2.now, ctxSetTimeout = context4.setTimeout !== root.setTimeout && context4.setTimeout;
+      var { ceil: nativeCeil, floor: nativeFloor } = Math2, nativeGetSymbols = Object2.getOwnPropertySymbols, nativeIsBuffer = Buffer2 ? Buffer2.isBuffer : undefined2, nativeIsFinite = context4.isFinite, nativeJoin = arrayProto.join, nativeKeys = overArg(Object2.keys, Object2), nativeMax = Math2.max, nativeMin = Math2.min, nativeNow = Date2.now, nativeParseInt = context4.parseInt, nativeRandom = Math2.random, nativeReverse = arrayProto.reverse;
+      var DataView = getNative(context4, "DataView"), Map2 = getNative(context4, "Map"), Promise2 = getNative(context4, "Promise"), Set2 = getNative(context4, "Set"), WeakMap2 = getNative(context4, "WeakMap"), nativeCreate = getNative(Object2, "create");
       var metaMap = WeakMap2 && new WeakMap2;
       var realNames = {};
       var dataViewCtorString = toSource(DataView), mapCtorString = toSource(Map2), promiseCtorString = toSource(Promise2), setCtorString = toSource(Set2), weakMapCtorString = toSource(WeakMap2);
@@ -102492,6 +102587,7 @@ async function buildBundle(cwd, buildArgs) {
     entrypoints: [join13(cwd, ".reroute/entry.ts")],
     target: "bun",
     outdir: join13(cwd, "dist"),
+    sourcemap: "external",
     ...getCommonBuildOptions(),
     external: ["sharp", ...buildArgs.externalArgs],
     naming: getNamingConfig({
@@ -105175,7 +105271,7 @@ async function getVersionString2() {
 }
 async function getVersion2() {
   if (true) {
-    return "0.26.0";
+    return "0.27.0";
   }
   const possiblePaths = [
     path3.join(import.meta.dir, "../../../package.json"),
@@ -105192,10 +105288,10 @@ async function getVersion2() {
 }
 async function getCommit2() {
   if (true) {
-    return "fb2b396";
+    return "f0b4a6d";
   }
   return "dev";
 }
 main();
 
-//# debugId=1E1F2750332E540264756E2164756E21
+//# debugId=5DDD55BE309F0B0C64756E2164756E21