silgi 0.50.2 → 0.50.4

package/dist/adapters/_fetch-adapter.d.mts

@@ -2,7 +2,7 @@ import { WrapHandlerOptions } from "../core/handler.mjs";
 
 //#region src/adapters/_fetch-adapter.d.ts
 interface FetchAdapterConfig<TCtx extends Record<string, unknown>> extends WrapHandlerOptions {
-  /** Route prefix to strip. Default: "/api/rpc" */
+  /** Route prefix to strip. Default: "/api" */
   prefix?: string;
   /** Context factory — receives the Request (or framework event via eventMap). */
   context?: (req: Request) => TCtx | Promise<TCtx>;
@@ -12,6 +12,7 @@ interface FetchAdapterConfig<TCtx extends Record<string, unknown>> extends WrapH
  * (SvelteKit RequestEvent, SolidStart event), use this extended config.
  */
 interface FetchAdapterConfigWithEvent<TCtx extends Record<string, unknown>, TEvent = any> extends WrapHandlerOptions {
+  /** Route prefix to strip. Default: "/api" */
   prefix?: string;
   /** Context factory — receives the framework event, not raw Request. */
   context?: (event: TEvent) => TCtx | Promise<TCtx>;

package/dist/adapters/astro.mjs

@@ -5,13 +5,13 @@ import { createFetchAdapter } from "./_fetch-adapter.mjs";
 *
 * @example
 * ```ts
-* // src/pages/api/rpc/[...path].ts
+* // src/pages/api/[...path].ts
 * import { createHandler } from "silgi/astro"
 * import { appRouter } from "~/server/rpc"
 *
 * const handler = createHandler(appRouter, {
-*   prefix: "/api/rpc",
 *   context: (req) => ({ db: getDB() }),
+*   analytics: true,
 * })
 *
 * export const GET = handler
@@ -24,7 +24,7 @@ import { createFetchAdapter } from "./_fetch-adapter.mjs";
 * Astro passes { request, params } — we extract request and delegate.
 */
 function createHandler(router, options = {}) {
-	const handler = createFetchAdapter(router, options, "/api/rpc");
+	const handler = createFetchAdapter(router, options, "/api");
 	return ({ request }) => handler(request);
 }
 //#endregion

package/dist/adapters/express.mjs

@@ -11,7 +11,7 @@ import { iteratorToEventStream } from "../core/sse.mjs";
 * import { createHandler } from "silgi/express"
 *
 * const app = express()
-* app.use("/rpc", createHandler(appRouter, {
+* app.use("/api", createHandler(appRouter, {
 *   context: (req) => ({ db: getDB(), user: req.user }),
 * }))
 * app.listen(3000)

package/dist/adapters/nextjs.mjs

@@ -5,12 +5,13 @@ import { createFetchAdapter } from "./_fetch-adapter.mjs";
 *
 * @example
 * ```ts
-* // app/api/rpc/[...path]/route.ts
+* // app/api/[...path]/route.ts
 * import { createHandler } from "silgi/nextjs"
 * import { appRouter } from "~/server/rpc"
 *
 * const handler = createHandler(appRouter, {
 *   context: (req) => ({ db: getDB() }),
+*   analytics: true,
 * })
 *
 * export { handler as GET, handler as POST }
@@ -23,7 +24,7 @@ import { createFetchAdapter } from "./_fetch-adapter.mjs";
 * including content negotiation (JSON, MessagePack, devalue).
 */
 function createHandler(router, options = {}) {
-	return createFetchAdapter(router, options, "/api/rpc");
+	return createFetchAdapter(router, options, "/api");
 }
 //#endregion
 export { createHandler };

package/dist/adapters/remix.mjs

@@ -5,13 +5,13 @@ import { createFetchAdapter } from "./_fetch-adapter.mjs";
 *
 * @example
 * ```ts
-* // app/routes/rpc.$.tsx
+* // app/routes/api.$.tsx
 * import { createHandler } from "silgi/remix"
 * import { appRouter } from "~/server/rpc"
 *
 * const handler = createHandler(appRouter, {
-*   prefix: "/rpc",
 *   context: (req) => ({ db: getDB() }),
+*   analytics: true,
 * })
 *
 * export const action = handler
@@ -23,7 +23,7 @@ import { createFetchAdapter } from "./_fetch-adapter.mjs";
 * Remix passes { request, params } — we extract request and delegate.
 */
 function createHandler(router, options = {}) {
-	const handler = createFetchAdapter(router, options, "/rpc");
+	const handler = createFetchAdapter(router, options, "/api");
 	return ({ request }) => handler(request);
 }
 //#endregion

package/dist/adapters/solidstart.mjs

@@ -5,13 +5,13 @@ import { createEventFetchAdapter } from "./_fetch-adapter.mjs";
 *
 * @example
 * ```ts
-* // src/routes/api/rpc/[...path].ts
+* // src/routes/api/[...path].ts
 * import { createHandler } from "silgi/solidstart"
 * import { appRouter } from "~/server/rpc"
 *
 * const handler = createHandler(appRouter, {
-*   prefix: "/api/rpc",
 *   context: (event) => ({ db: getDB() }),
+*   analytics: true,
 * })
 *
 * export const GET = handler
@@ -23,7 +23,7 @@ import { createEventFetchAdapter } from "./_fetch-adapter.mjs";
 * SolidStart uses Fetch API events — uses Silgi's handler().
 */
 function createHandler(router, options = {}) {
-	return createEventFetchAdapter(router, options, "/api/rpc", (event) => event.request ?? event);
+	return createEventFetchAdapter(router, options, "/api", (event) => event.request ?? event);
 }
 //#endregion
 export { createHandler };

package/dist/adapters/sveltekit.mjs

@@ -5,12 +5,13 @@ import { createEventFetchAdapter } from "./_fetch-adapter.mjs";
 *
 * @example
 * ```ts
-* // src/routes/api/rpc/[...path]/+server.ts
+* // src/routes/api/[...path]/+server.ts
 * import { createHandler } from "silgi/sveltekit"
 * import { appRouter } from "$lib/server/rpc"
 *
 * const handler = createHandler(appRouter, {
 *   context: (event) => ({ db: getDB(), user: event.locals.user }),
+*   analytics: true,
 * })
 *
 * export const GET = handler
@@ -24,7 +25,7 @@ import { createEventFetchAdapter } from "./_fetch-adapter.mjs";
 * The handler uses Silgi's handler() for full protocol support.
 */
 function createHandler(router, options = {}) {
-	return createEventFetchAdapter(router, options, "/api/rpc", (event) => event.request);
+	return createEventFetchAdapter(router, options, "/api", (event) => event.request);
 }
 //#endregion
 export { createHandler };

package/dist/plugins/analytics/routes.mjs

@@ -69,8 +69,9 @@ document.getElementById('f').onsubmit=function(e){
 e.preventDefault();
 var t=document.getElementById('t').value.trim();
 if(!t)return;
-document.cookie='silgi-auth='+encodeURIComponent(t)+';path=/api/analytics;samesite=strict';
-fetch('/api/analytics/stats',{headers:{'cookie':'silgi-auth='+encodeURIComponent(t)}}).then(function(){
+var base=location.pathname.replace(/\/$/,'');
+document.cookie='silgi-auth='+encodeURIComponent(t)+';path='+base+';samesite=strict';
+fetch(base+'/stats',{headers:{'cookie':'silgi-auth='+encodeURIComponent(t)}}).then(function(){
 location.reload();
 }).catch(function(){location.reload()});
 };

package/dist/plugins/analytics/utils.mjs

@@ -45,12 +45,28 @@ function isTrackedRequestPath(pathname) {
 	const normalized = pathname.startsWith("/") ? pathname.slice(1) : pathname;
 	return normalized === "api" || normalized.startsWith("api/") || normalized === "graphql" || normalized.startsWith("graphql/");
 }
-function isAnalyticsPath(pathname) {
-	return pathname === "api/analytics" || pathname.startsWith("api/analytics/");
+/**
+* Normalize an incoming path to its analytics sub-path.
+*
+* Returns the sub-path after `analytics/` (e.g. `'stats'`, `'requests/5'`),
+* an empty string for the dashboard root, or `null` if this isn't an
+* analytics path at all.
+*
+* Accepts both `api/analytics*` (mounted under an `/api` RPC prefix) and
+* bare `analytics*` (mounted at a prefix that already ends with `/api`),
+* so the dashboard works regardless of adapter prefix configuration.
+*/
+function normalizeAnalyticsPath(pathname) {
+	const p = pathname.endsWith("/") ? pathname.slice(0, -1) : pathname;
+	if (p === "api/analytics") return "";
+	if (p.startsWith("api/analytics/")) return p.slice(14);
+	if (p === "analytics") return "";
+	if (p.startsWith("analytics/")) return p.slice(10);
+	return null;
 }
 /** Helper to safely cast unknown to Record. */
 function asRecord(value) {
 	return value && typeof value === "object" ? value : null;
 }
 //#endregion
-export { asRecord, isAnalyticsPath, isTrackedRequestPath, matchesPathPrefix, redactHeaderValue, round, safeStringify, sanitizeHeaders };
+export { asRecord, isTrackedRequestPath, matchesPathPrefix, normalizeAnalyticsPath, redactHeaderValue, round, safeStringify, sanitizeHeaders };

package/dist/plugins/analytics.mjs

@@ -3,7 +3,7 @@ import { SilgiError, toSilgiError } from "../core/error.mjs";
 import { analyticsTraceMap } from "../core/trace-map.mjs";
 import { parseUrlPathname } from "../core/url.mjs";
 import { generateRequestId } from "./analytics/request-id.mjs";
-import { isAnalyticsPath, isTrackedRequestPath, round, sanitizeHeaders } from "./analytics/utils.mjs";
+import { isTrackedRequestPath, normalizeAnalyticsPath, round, sanitizeHeaders } from "./analytics/utils.mjs";
 import { RequestAccumulator } from "./analytics/accumulator.mjs";
 import { AnalyticsCollector } from "./analytics/collector.mjs";
 import { errorToMarkdown, requestToMarkdown } from "./analytics/export.mjs";
@@ -96,12 +96,14 @@ function wrapWithAnalytics(handler, options = {}) {
 	});
 	return async (request) => {
 		const pathname = parseUrlPathname(request.url);
-		if (isAnalyticsPath(pathname)) {
+		const analyticsSub = normalizeAnalyticsPath(pathname);
+		if (analyticsSub !== null) {
+			const canonical = analyticsSub === "" ? "api/analytics" : `api/analytics/${analyticsSub}`;
 			if (auth) {
 				const authResult = checkAnalyticsAuth(request, auth);
-				if (!(authResult instanceof Promise ? await authResult : authResult)) return analyticsAuthResponse(pathname);
+				if (!(authResult instanceof Promise ? await authResult : authResult)) return analyticsAuthResponse(canonical);
 			}
-			return serveAnalyticsRoute(pathname, request, collector, dashboardHtml);
+			return serveAnalyticsRoute(canonical, request, collector, dashboardHtml);
 		}
 		if (!isTrackedRequestPath(pathname) || collector.isIgnored(pathname)) return handler(request);
 		const incomingTraceId = request.headers.get("x-trace-id");