evlog 2.9.0 → 2.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +27 -1
- package/dist/{_drain-C9Nr-6Wc.mjs → _drain-YH8ERc5l.mjs} +7 -2
- package/dist/_drain-YH8ERc5l.mjs.map +1 -0
- package/dist/{_http-C2UoHWgm.mjs → _http-C_2wbJw3.mjs} +9 -20
- package/dist/_http-C_2wbJw3.mjs.map +1 -0
- package/dist/{_severity-BLiOKoxh.mjs → _severity-BZhz3f9e.mjs} +1 -1
- package/dist/{_severity-BLiOKoxh.mjs.map → _severity-BZhz3f9e.mjs.map} +1 -1
- package/dist/adapters/axiom.d.mts +1 -1
- package/dist/adapters/axiom.d.mts.map +1 -1
- package/dist/adapters/axiom.mjs +4 -4
- package/dist/adapters/axiom.mjs.map +1 -1
- package/dist/adapters/better-stack.d.mts +1 -1
- package/dist/adapters/better-stack.d.mts.map +1 -1
- package/dist/adapters/better-stack.mjs +4 -4
- package/dist/adapters/better-stack.mjs.map +1 -1
- package/dist/adapters/datadog.d.mts +86 -0
- package/dist/adapters/datadog.d.mts.map +1 -0
- package/dist/adapters/datadog.mjs +172 -0
- package/dist/adapters/datadog.mjs.map +1 -0
- package/dist/adapters/fs.d.mts +1 -1
- package/dist/adapters/fs.d.mts.map +1 -1
- package/dist/adapters/fs.mjs +1 -1
- package/dist/adapters/hyperdx.d.mts +65 -0
- package/dist/adapters/hyperdx.d.mts.map +1 -0
- package/dist/adapters/hyperdx.mjs +93 -0
- package/dist/adapters/hyperdx.mjs.map +1 -0
- package/dist/adapters/otlp.d.mts +1 -1
- package/dist/adapters/otlp.d.mts.map +1 -1
- package/dist/adapters/otlp.mjs +5 -5
- package/dist/adapters/otlp.mjs.map +1 -1
- package/dist/adapters/posthog.d.mts +1 -1
- package/dist/adapters/posthog.d.mts.map +1 -1
- package/dist/adapters/posthog.mjs +6 -6
- package/dist/adapters/posthog.mjs.map +1 -1
- package/dist/adapters/sentry.d.mts +1 -1
- package/dist/adapters/sentry.d.mts.map +1 -1
- package/dist/adapters/sentry.mjs +5 -5
- package/dist/adapters/sentry.mjs.map +1 -1
- package/dist/ai/index.d.mts +1 -1
- package/dist/browser.d.mts +3 -1
- package/dist/browser.d.mts.map +1 -1
- package/dist/browser.mjs +2 -2
- package/dist/browser.mjs.map +1 -1
- package/dist/elysia/index.d.mts +2 -2
- package/dist/elysia/index.mjs +1 -1
- package/dist/enrichers.d.mts +1 -1
- package/dist/{error-BjaGNgoo.d.mts → error-plrBYLQk.d.mts} +7 -2
- package/dist/error-plrBYLQk.d.mts.map +1 -0
- package/dist/error.d.mts +1 -1
- package/dist/error.mjs +15 -0
- package/dist/error.mjs.map +1 -1
- package/dist/{errors-BBJmxg3d.d.mts → errors-bPoj9UZk.d.mts} +2 -2
- package/dist/{errors-BBJmxg3d.d.mts.map → errors-bPoj9UZk.d.mts.map} +1 -1
- package/dist/{errors-BJRXUfMg.mjs → errors-gH4C9KSC.mjs} +1 -1
- package/dist/{errors-BJRXUfMg.mjs.map → errors-gH4C9KSC.mjs.map} +1 -1
- package/dist/express/index.d.mts +2 -2
- package/dist/express/index.mjs +2 -2
- package/dist/fastify/index.d.mts +2 -2
- package/dist/fastify/index.d.mts.map +1 -1
- package/dist/fastify/index.mjs +2 -2
- package/dist/{headers-DmzJ3sQ-.mjs → headers-BSi3UHKL.mjs} +3 -3
- package/dist/{headers-DmzJ3sQ-.mjs.map → headers-BSi3UHKL.mjs.map} +1 -1
- package/dist/hono/index.d.mts +2 -2
- package/dist/hono/index.mjs +1 -1
- package/dist/index.d.mts +5 -5
- package/dist/{logger-3ZE3g6GW.d.mts → logger-CG1eop2_.d.mts} +13 -3
- package/dist/logger-CG1eop2_.d.mts.map +1 -0
- package/dist/logger.d.mts +2 -2
- package/dist/logger.mjs +18 -2
- package/dist/logger.mjs.map +1 -1
- package/dist/{middleware-B9uwQ5B4.d.mts → middleware-DojmTj9Y.d.mts} +2 -2
- package/dist/{middleware-B9uwQ5B4.d.mts.map → middleware-DojmTj9Y.d.mts.map} +1 -1
- package/dist/nestjs/index.d.mts +2 -2
- package/dist/nestjs/index.mjs +2 -2
- package/dist/next/client.d.mts +3 -3
- package/dist/next/client.d.mts.map +1 -1
- package/dist/next/index.d.mts +4 -4
- package/dist/next/index.d.mts.map +1 -1
- package/dist/next/index.mjs +3 -2
- package/dist/next/index.mjs.map +1 -1
- package/dist/next/instrumentation.d.mts +75 -0
- package/dist/next/instrumentation.d.mts.map +1 -0
- package/dist/next/instrumentation.mjs +108 -0
- package/dist/next/instrumentation.mjs.map +1 -0
- package/dist/nitro/errorHandler.d.mts +2 -2
- package/dist/nitro/errorHandler.mjs +2 -2
- package/dist/nitro/module.d.mts +2 -2
- package/dist/nitro/plugin.d.mts +2 -2
- package/dist/nitro/plugin.mjs +4 -8
- package/dist/nitro/plugin.mjs.map +1 -1
- package/dist/nitro/v3/errorHandler.d.mts +2 -2
- package/dist/nitro/v3/errorHandler.mjs +2 -2
- package/dist/nitro/v3/index.d.mts +3 -1
- package/dist/nitro/v3/index.mjs +3 -1
- package/dist/nitro/v3/middleware.d.mts +11 -3
- package/dist/nitro/v3/middleware.d.mts.map +1 -1
- package/dist/nitro/v3/middleware.mjs +1 -21
- package/dist/nitro/v3/middleware.mjs.map +1 -1
- package/dist/nitro/v3/module.d.mts +1 -1
- package/dist/nitro/v3/plugin.d.mts +2 -2
- package/dist/nitro/v3/plugin.mjs +5 -5
- package/dist/nitro/v3/plugin.mjs.map +1 -1
- package/dist/nitro/v3/useLogger.d.mts +1 -1
- package/dist/{nitro-BbTINVdZ.d.mts → nitro-CfGx0wDJ.d.mts} +2 -3
- package/dist/nitro-CfGx0wDJ.d.mts.map +1 -0
- package/dist/{nitro-OmT_M4Pb.mjs → nitro-Dpq5ZmcM.mjs} +2 -2
- package/dist/{nitro-OmT_M4Pb.mjs.map → nitro-Dpq5ZmcM.mjs.map} +1 -1
- package/dist/nitroConfigBridge-fidbf-Y_.mjs +92 -0
- package/dist/nitroConfigBridge-fidbf-Y_.mjs.map +1 -0
- package/dist/nuxt/module.d.mts +6 -5
- package/dist/nuxt/module.d.mts.map +1 -1
- package/dist/nuxt/module.mjs +5 -3
- package/dist/nuxt/module.mjs.map +1 -1
- package/dist/{parseError-DO1qtmGL.d.mts → parseError-B_qXj8x4.d.mts} +2 -2
- package/dist/parseError-B_qXj8x4.d.mts.map +1 -0
- package/dist/react-router/index.d.mts +4 -4
- package/dist/react-router/index.d.mts.map +1 -1
- package/dist/react-router/index.mjs +2 -2
- package/dist/{routes-CGPmbzCZ.mjs → routes-CE3_c-iZ.mjs} +1 -1
- package/dist/{routes-CGPmbzCZ.mjs.map → routes-CE3_c-iZ.mjs.map} +1 -1
- package/dist/runtime/client/log.d.mts +1 -1
- package/dist/runtime/client/log.d.mts.map +1 -1
- package/dist/runtime/client/log.mjs +3 -1
- package/dist/runtime/client/log.mjs.map +1 -1
- package/dist/runtime/server/routes/_evlog/ingest.post.d.mts +2 -2
- package/dist/runtime/server/useLogger.d.mts +1 -1
- package/dist/runtime/utils/parseError.d.mts +2 -2
- package/dist/runtime/utils/parseError.mjs +1 -1
- package/dist/{source-location-DRvDDqfq.mjs → source-location-B1VVgXkh.mjs} +1 -1
- package/dist/{source-location-DRvDDqfq.mjs.map → source-location-B1VVgXkh.mjs.map} +1 -1
- package/dist/{storage-DsueXspk.mjs → storage-B6NPh8rV.mjs} +1 -1
- package/dist/{storage-DsueXspk.mjs.map → storage-B6NPh8rV.mjs.map} +1 -1
- package/dist/sveltekit/index.d.mts +2 -2
- package/dist/sveltekit/index.mjs +4 -4
- package/dist/toolkit.d.mts +3 -3
- package/dist/toolkit.mjs +4 -4
- package/dist/{types-BpsDbwHU.d.mts → types-v_JkG_D7.d.mts} +11 -1
- package/dist/types-v_JkG_D7.d.mts.map +1 -0
- package/dist/types.d.mts +1 -1
- package/dist/{useLogger-C_8vgz0g.d.mts → useLogger-TjKH37BO.d.mts} +2 -2
- package/dist/{useLogger-C_8vgz0g.d.mts.map → useLogger-TjKH37BO.d.mts.map} +1 -1
- package/dist/utils.d.mts +1 -1
- package/dist/vite/index.d.mts +1 -1
- package/dist/vite/index.mjs +1 -1
- package/dist/workers.d.mts +1 -1
- package/package.json +49 -19
- package/dist/_drain-C9Nr-6Wc.mjs.map +0 -1
- package/dist/_http-C2UoHWgm.mjs.map +0 -1
- package/dist/error-BjaGNgoo.d.mts.map +0 -1
- package/dist/logger-3ZE3g6GW.d.mts.map +0 -1
- package/dist/nitro-BbTINVdZ.d.mts.map +0 -1
- package/dist/parseError-DO1qtmGL.d.mts.map +0 -1
- package/dist/types-BpsDbwHU.d.mts.map +0 -1
package/dist/next/index.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.mjs","names":[],"sources":["../../src/next/storage.ts","../../src/next/handler.ts","../../src/next/middleware.ts","../../src/next/index.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks'\nimport type { RequestLogger } from '../types'\n\nexport const evlogStorage = new AsyncLocalStorage<RequestLogger>()\n\n/**\n * Get the current request-scoped logger.\n * Must be called inside a `withEvlog()` wrapper.\n *\n * @throws {Error} if called outside of `withEvlog()` context\n *\n * @example\n * ```ts\n * export const POST = withEvlog(async (request) => {\n * const log = useLogger()\n * log.set({ user: { id: '123' } })\n * return Response.json({ ok: true })\n * })\n * ```\n */\nexport function useLogger<T extends object = Record<string, unknown>>(): RequestLogger<T> {\n const logger = evlogStorage.getStore()\n if (!logger) {\n throw new Error(\n '[evlog] useLogger() was called outside of a withEvlog() context. '\n + 'Wrap your route handler or server action with withEvlog().',\n )\n }\n return logger as RequestLogger<T>\n}\n","import type { DrainContext, EnrichContext, TailSamplingContext, WideEvent } from '../types'\nimport { createRequestLogger, getGlobalDrain, initLogger, isEnabled } from '../logger'\nimport { filterSafeHeaders } from '../utils'\nimport { shouldLog, getServiceForPath } from '../shared/routes'\nimport { EvlogError } from '../error'\nimport type { NextEvlogOptions } from './types'\nimport { evlogStorage } from './storage'\n\ninterface WithEvlogState {\n initialized: boolean\n options: NextEvlogOptions\n}\n\nconst state: WithEvlogState = {\n initialized: false,\n options: {},\n}\n\nexport function configureHandler(options: NextEvlogOptions): void {\n state.options = options\n state.initialized = true\n\n // Don't pass drain to initLogger — the global drain fires inside emitWideEvent\n // which doesn't have request/header context. Instead, we call drain ourselves\n // in callEnrichAndDrain after enrich, with full context.\n initLogger({\n enabled: options.enabled,\n env: {\n service: options.service,\n ...options.env,\n },\n pretty: options.pretty,\n silent: options.silent,\n sampling: options.sampling,\n stringify: options.stringify,\n _suppressDrainWarning: true,\n })\n}\n\nfunction extractRequestInfo(request: Request): { method: string, path: string, headers: Record<string, string> } {\n const { method } = request\n const url = new URL(request.url, 'http://localhost')\n const path = url.pathname\n\n const headers: Record<string, string> = {}\n request.headers.forEach((value, key) => {\n headers[key] = value\n })\n\n return { method, path, headers: filterSafeHeaders(headers) }\n}\n\nasync function callEnrichAndDrain(\n emittedEvent: WideEvent | null,\n requestInfo: { method: string, path: string, requestId: string },\n headers: Record<string, string>,\n responseStatus?: number,\n): Promise<void> {\n if (!emittedEvent) return\n\n const { enrich } = state.options\n const drain = state.options.drain ?? getGlobalDrain()\n\n const run = async () => {\n if (enrich) {\n const enrichCtx: EnrichContext = {\n event: emittedEvent,\n request: requestInfo,\n headers,\n response: { status: responseStatus },\n }\n try {\n await enrich(enrichCtx)\n } catch (err) {\n console.error('[evlog] enrich failed:', err)\n }\n }\n\n if (drain) {\n const drainCtx: DrainContext = {\n event: emittedEvent,\n request: requestInfo,\n headers,\n }\n try {\n await drain(drainCtx)\n } catch (err) {\n console.error('[evlog] drain failed:', err)\n }\n }\n }\n\n // Use next/server after() if available to run enrich+drain after response\n try {\n const { after } = await import('next/server')\n if (typeof after === 'function') {\n after(run)\n return\n }\n } catch {\n // next/server not available or after() not exported — run inline\n }\n\n // Fallback: fire-and-forget (enrich still awaited for correctness)\n run().catch(() => {})\n}\n\n/**\n * Wrap a Next.js route handler or server action with evlog request-scoped logging.\n *\n * @example\n * ```ts\n * // Route handler\n * export const POST = withEvlog(async (request: NextRequest) => {\n * const log = useLogger()\n * log.set({ user: { id: '123' } })\n * return Response.json({ success: true })\n * })\n *\n * // Server action\n * export const checkout = withEvlog(async (formData: FormData) => {\n * const log = useLogger()\n * log.set({ action: 'checkout' })\n * })\n * ```\n */\nexport function createWithEvlog(options: NextEvlogOptions) {\n configureHandler(options)\n\n return function withEvlog<TArgs extends unknown[], TReturn>(\n handler: (...args: TArgs) => TReturn,\n ): (...args: TArgs) => Promise<Awaited<TReturn>> {\n return async (...args: TArgs): Promise<Awaited<TReturn>> => {\n if (!isEnabled()) {\n return await handler(...args) as Awaited<TReturn>\n }\n\n // Extract request info from first argument if it's a Request\n const [firstArg] = args\n const isRequest = firstArg instanceof Request\n\n let method = 'UNKNOWN'\n let path = '/'\n let headers: Record<string, string> = {}\n let requestId = crypto.randomUUID()\n\n if (isRequest) {\n ({ method, path, headers } = extractRequestInfo(firstArg))\n\n // Reuse request-id from middleware if present\n const middlewareRequestId = firstArg.headers.get('x-request-id')\n if (middlewareRequestId) requestId = middlewareRequestId\n }\n\n // Check include/exclude patterns\n if (!shouldLog(path, state.options.include, state.options.exclude)) {\n return await handler(...args) as Awaited<TReturn>\n }\n\n const logger = createRequestLogger({ method, path, requestId }, { _deferDrain: true })\n\n // Apply route-based service configuration\n const routeService = getServiceForPath(path, state.options.routes)\n if (routeService) {\n logger.set({ service: routeService })\n }\n\n // Apply start time from middleware if present\n if (isRequest) {\n const startHeader = firstArg.headers.get('x-evlog-start')\n if (startHeader) {\n logger.set({ middlewareStart: Number(startHeader) })\n }\n }\n\n try {\n const result = await evlogStorage.run(logger, () => handler(...args))\n\n // Extract response status\n let { status } = { status: 200 }\n if (result instanceof Response) {\n ({ status } = result)\n }\n logger.set({ status })\n\n // Build tail sampling context and call keep callback\n let forceKeep = false\n if (state.options.keep) {\n try {\n const tailCtx: TailSamplingContext = {\n status,\n path,\n method,\n context: logger.getContext(),\n shouldKeep: false,\n }\n await state.options.keep(tailCtx)\n forceKeep = tailCtx.shouldKeep ?? false\n } catch (err) {\n console.error('[evlog] keep callback failed:', err)\n }\n }\n\n const emittedEvent = logger.emit({ _forceKeep: forceKeep })\n await callEnrichAndDrain(emittedEvent, { method, path, requestId }, headers, status)\n\n return result as Awaited<TReturn>\n } catch (error) {\n logger.error(error instanceof Error ? error : new Error(String(error)))\n\n const errorStatus = (error as { status?: number }).status\n ?? (error as { statusCode?: number }).statusCode\n ?? 500\n logger.set({ status: errorStatus })\n\n // Build tail sampling context and call keep callback\n let forceKeep = false\n if (state.options.keep) {\n try {\n const tailCtx: TailSamplingContext = {\n status: errorStatus,\n path,\n method,\n context: logger.getContext(),\n shouldKeep: false,\n }\n await state.options.keep(tailCtx)\n forceKeep = tailCtx.shouldKeep ?? false\n } catch (err) {\n console.error('[evlog] keep callback failed:', err)\n }\n }\n\n const emittedEvent = logger.emit({ _forceKeep: forceKeep })\n await callEnrichAndDrain(emittedEvent, { method, path, requestId }, headers, errorStatus)\n\n // Return structured JSON response for EvlogErrors (like H3 does for Nuxt)\n if (isRequest && error instanceof EvlogError) {\n return Response.json(error.toJSON(), { status: error.status }) as Awaited<TReturn>\n }\n\n throw error\n }\n }\n }\n}\n","import { shouldLog } from '../shared/routes'\nimport type { EvlogMiddlewareConfig } from './types'\n\ntype NextRequest = {\n nextUrl: { pathname: string }\n headers: { get(name: string): string | null }\n}\n\ntype NextResponse = {\n headers: { set(name: string, value: string): void }\n}\n\ntype NextResponseStatic = {\n next(options?: { request?: { headers: Headers } }): NextResponse\n}\n\n/**\n * Create an evlog middleware for Next.js.\n * Sets `x-request-id` and `x-evlog-start` headers so `withEvlog()` can reuse them\n * for timing consistency across the middleware -> handler chain.\n *\n * @example\n * ```ts\n * // middleware.ts\n * import { evlogMiddleware } from 'evlog/next'\n * export const middleware = evlogMiddleware()\n * export const config = { matcher: ['/api/:path*'] }\n * ```\n */\nexport function evlogMiddleware(config?: EvlogMiddlewareConfig) {\n return async (request: NextRequest) => {\n const path = request.nextUrl.pathname\n\n // Check include/exclude patterns\n if (!shouldLog(path, config?.include, config?.exclude)) {\n const { NextResponse: nextResponse } = await import('next/server') as { NextResponse: NextResponseStatic }\n return nextResponse.next()\n }\n\n // Generate or reuse request ID\n const existingId = request.headers.get('x-request-id')\n const requestId = existingId || crypto.randomUUID()\n\n // Forward modified headers to the route handler\n const requestHeaders = new Headers(request.headers as HeadersInit)\n\n requestHeaders.set('x-request-id', requestId)\n requestHeaders.set('x-evlog-start', String(Date.now()))\n\n const { NextResponse: nextResponse } = await import('next/server') as { NextResponse: NextResponseStatic }\n const response = nextResponse.next({\n request: { headers: requestHeaders },\n })\n\n // Also set on response for downstream consumers\n response.headers.set('x-request-id', requestId)\n\n return response\n }\n}\n","import { log } from '../logger'\nimport { createError, createEvlogError } from '../error'\nimport type { NextEvlogOptions } from './types'\nimport { createWithEvlog } from './handler'\nimport { useLogger } from './storage'\n\nexport type { NextEvlogOptions, EvlogMiddlewareConfig } from './types'\n\nexport { evlogMiddleware } from './middleware'\nexport { useLogger } from './storage'\nexport { log } from '../logger'\nexport { createError, createEvlogError } from '../error'\n\n/**\n * Create an evlog instance configured for Next.js.\n * Returns all helpers needed for server-side logging.\n *\n * @example\n * ```ts\n * // lib/evlog.ts\n * import { createEvlog } from 'evlog/next'\n * import { createAxiomDrain } from 'evlog/axiom'\n * import { createDrainPipeline } from 'evlog/pipeline'\n *\n * const pipeline = createDrainPipeline({ batch: { size: 50 } })\n *\n * export const { withEvlog, useLogger, log, createEvlogError } = createEvlog({\n * service: 'my-app',\n * sampling: {\n * rates: { info: 10 },\n * keep: [{ status: 400 }, { duration: 1000 }],\n * },\n * drain: pipeline(createAxiomDrain({\n * dataset: 'logs',\n * token: process.env.AXIOM_TOKEN!,\n * })),\n * enrich: (ctx) => {\n * ctx.event.deploymentId = process.env.VERCEL_DEPLOYMENT_ID\n * },\n * })\n * ```\n */\nexport function createEvlog(options: NextEvlogOptions = {}) {\n const withEvlog = createWithEvlog(options)\n\n return {\n withEvlog,\n useLogger,\n log,\n createError,\n createEvlogError,\n }\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.mjs","names":[],"sources":["../../src/next/storage.ts","../../src/next/handler.ts","../../src/next/middleware.ts","../../src/next/index.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks'\nimport type { RequestLogger } from '../types'\n\nexport const evlogStorage = new AsyncLocalStorage<RequestLogger>()\n\n/**\n * Get the current request-scoped logger.\n * Must be called inside a `withEvlog()` wrapper.\n *\n * @throws {Error} if called outside of `withEvlog()` context\n *\n * @example\n * ```ts\n * export const POST = withEvlog(async (request) => {\n * const log = useLogger()\n * log.set({ user: { id: '123' } })\n * return Response.json({ ok: true })\n * })\n * ```\n */\nexport function useLogger<T extends object = Record<string, unknown>>(): RequestLogger<T> {\n const logger = evlogStorage.getStore()\n if (!logger) {\n throw new Error(\n '[evlog] useLogger() was called outside of a withEvlog() context. '\n + 'Wrap your route handler or server action with withEvlog().',\n )\n }\n return logger as RequestLogger<T>\n}\n","import type { DrainContext, EnrichContext, TailSamplingContext, WideEvent } from '../types'\nimport { createRequestLogger, getGlobalDrain, initLogger, isEnabled, isLoggerLocked } from '../logger'\nimport { filterSafeHeaders } from '../utils'\nimport { shouldLog, getServiceForPath } from '../shared/routes'\nimport { EvlogError } from '../error'\nimport type { NextEvlogOptions } from './types'\nimport { evlogStorage } from './storage'\n\ninterface WithEvlogState {\n initialized: boolean\n options: NextEvlogOptions\n}\n\nconst state: WithEvlogState = {\n initialized: false,\n options: {},\n}\n\nexport function configureHandler(options: NextEvlogOptions): void {\n state.options = options\n state.initialized = true\n\n // Skip if instrumentation register() already configured the logger.\n // Re-initializing would wipe the global drain.\n if (isLoggerLocked()) return\n\n // Don't pass drain to initLogger — the global drain fires inside emitWideEvent\n // which doesn't have request/header context. Instead, we call drain ourselves\n // in callEnrichAndDrain after enrich, with full context.\n initLogger({\n enabled: options.enabled,\n env: {\n service: options.service,\n ...options.env,\n },\n pretty: options.pretty,\n silent: options.silent,\n sampling: options.sampling,\n stringify: options.stringify,\n _suppressDrainWarning: true,\n })\n}\n\nfunction extractRequestInfo(request: Request): { method: string, path: string, headers: Record<string, string> } {\n const { method } = request\n const url = new URL(request.url, 'http://localhost')\n const path = url.pathname\n\n const headers: Record<string, string> = {}\n request.headers.forEach((value, key) => {\n headers[key] = value\n })\n\n return { method, path, headers: filterSafeHeaders(headers) }\n}\n\nasync function callEnrichAndDrain(\n emittedEvent: WideEvent | null,\n requestInfo: { method: string, path: string, requestId: string },\n headers: Record<string, string>,\n responseStatus?: number,\n): Promise<void> {\n if (!emittedEvent) return\n\n const { enrich } = state.options\n const drain = state.options.drain ?? getGlobalDrain()\n\n const run = async () => {\n if (enrich) {\n const enrichCtx: EnrichContext = {\n event: emittedEvent,\n request: requestInfo,\n headers,\n response: { status: responseStatus },\n }\n try {\n await enrich(enrichCtx)\n } catch (err) {\n console.error('[evlog] enrich failed:', err)\n }\n }\n\n if (drain) {\n const drainCtx: DrainContext = {\n event: emittedEvent,\n request: requestInfo,\n headers,\n }\n try {\n await drain(drainCtx)\n } catch (err) {\n console.error('[evlog] drain failed:', err)\n }\n }\n }\n\n // Use next/server after() if available to run enrich+drain after response\n try {\n const { after } = await import('next/server')\n if (typeof after === 'function') {\n after(run)\n return\n }\n } catch {\n // next/server not available or after() not exported — run inline\n }\n\n // Fallback: fire-and-forget (enrich still awaited for correctness)\n run().catch(() => {})\n}\n\n/**\n * Wrap a Next.js route handler or server action with evlog request-scoped logging.\n *\n * @example\n * ```ts\n * // Route handler\n * export const POST = withEvlog(async (request: NextRequest) => {\n * const log = useLogger()\n * log.set({ user: { id: '123' } })\n * return Response.json({ success: true })\n * })\n *\n * // Server action\n * export const checkout = withEvlog(async (formData: FormData) => {\n * const log = useLogger()\n * log.set({ action: 'checkout' })\n * })\n * ```\n */\nexport function createWithEvlog(options: NextEvlogOptions) {\n configureHandler(options)\n\n return function withEvlog<TArgs extends unknown[], TReturn>(\n handler: (...args: TArgs) => TReturn,\n ): (...args: TArgs) => Promise<Awaited<TReturn>> {\n return async (...args: TArgs): Promise<Awaited<TReturn>> => {\n if (!isEnabled()) {\n return await handler(...args) as Awaited<TReturn>\n }\n\n // Extract request info from first argument if it's a Request\n const [firstArg] = args\n const isRequest = firstArg instanceof Request\n\n let method = 'UNKNOWN'\n let path = '/'\n let headers: Record<string, string> = {}\n let requestId = crypto.randomUUID()\n\n if (isRequest) {\n ({ method, path, headers } = extractRequestInfo(firstArg))\n\n // Reuse request-id from middleware if present\n const middlewareRequestId = firstArg.headers.get('x-request-id')\n if (middlewareRequestId) requestId = middlewareRequestId\n }\n\n // Check include/exclude patterns\n if (!shouldLog(path, state.options.include, state.options.exclude)) {\n return await handler(...args) as Awaited<TReturn>\n }\n\n const logger = createRequestLogger({ method, path, requestId }, { _deferDrain: true })\n\n // Apply route-based service configuration\n const routeService = getServiceForPath(path, state.options.routes)\n if (routeService) {\n logger.set({ service: routeService })\n }\n\n // Apply start time from middleware if present\n if (isRequest) {\n const startHeader = firstArg.headers.get('x-evlog-start')\n if (startHeader) {\n logger.set({ middlewareStart: Number(startHeader) })\n }\n }\n\n try {\n const result = await evlogStorage.run(logger, () => handler(...args))\n\n // Extract response status\n let { status } = { status: 200 }\n if (result instanceof Response) {\n ({ status } = result)\n }\n logger.set({ status })\n\n // Build tail sampling context and call keep callback\n let forceKeep = false\n if (state.options.keep) {\n try {\n const tailCtx: TailSamplingContext = {\n status,\n path,\n method,\n context: logger.getContext(),\n shouldKeep: false,\n }\n await state.options.keep(tailCtx)\n forceKeep = tailCtx.shouldKeep ?? false\n } catch (err) {\n console.error('[evlog] keep callback failed:', err)\n }\n }\n\n const emittedEvent = logger.emit({ _forceKeep: forceKeep })\n await callEnrichAndDrain(emittedEvent, { method, path, requestId }, headers, status)\n\n return result as Awaited<TReturn>\n } catch (error) {\n logger.error(error instanceof Error ? error : new Error(String(error)))\n\n const errorStatus = (error as { status?: number }).status\n ?? (error as { statusCode?: number }).statusCode\n ?? 500\n logger.set({ status: errorStatus })\n\n // Build tail sampling context and call keep callback\n let forceKeep = false\n if (state.options.keep) {\n try {\n const tailCtx: TailSamplingContext = {\n status: errorStatus,\n path,\n method,\n context: logger.getContext(),\n shouldKeep: false,\n }\n await state.options.keep(tailCtx)\n forceKeep = tailCtx.shouldKeep ?? false\n } catch (err) {\n console.error('[evlog] keep callback failed:', err)\n }\n }\n\n const emittedEvent = logger.emit({ _forceKeep: forceKeep })\n await callEnrichAndDrain(emittedEvent, { method, path, requestId }, headers, errorStatus)\n\n // Return structured JSON response for EvlogErrors (like H3 does for Nuxt)\n if (isRequest && error instanceof EvlogError) {\n return Response.json(error.toJSON(), { status: error.status }) as Awaited<TReturn>\n }\n\n throw error\n }\n }\n }\n}\n","import { shouldLog } from '../shared/routes'\nimport type { EvlogMiddlewareConfig } from './types'\n\ntype NextRequest = {\n nextUrl: { pathname: string }\n headers: { get(name: string): string | null }\n}\n\ntype NextResponse = {\n headers: { set(name: string, value: string): void }\n}\n\ntype NextResponseStatic = {\n next(options?: { request?: { headers: Headers } }): NextResponse\n}\n\n/**\n * Create an evlog middleware for Next.js.\n * Sets `x-request-id` and `x-evlog-start` headers so `withEvlog()` can reuse them\n * for timing consistency across the middleware -> handler chain.\n *\n * @example\n * ```ts\n * // middleware.ts\n * import { evlogMiddleware } from 'evlog/next'\n * export const middleware = evlogMiddleware()\n * export const config = { matcher: ['/api/:path*'] }\n * ```\n */\nexport function evlogMiddleware(config?: EvlogMiddlewareConfig) {\n return async (request: NextRequest) => {\n const path = request.nextUrl.pathname\n\n // Check include/exclude patterns\n if (!shouldLog(path, config?.include, config?.exclude)) {\n const { NextResponse: nextResponse } = await import('next/server') as { NextResponse: NextResponseStatic }\n return nextResponse.next()\n }\n\n // Generate or reuse request ID\n const existingId = request.headers.get('x-request-id')\n const requestId = existingId || crypto.randomUUID()\n\n // Forward modified headers to the route handler\n const requestHeaders = new Headers(request.headers as HeadersInit)\n\n requestHeaders.set('x-request-id', requestId)\n requestHeaders.set('x-evlog-start', String(Date.now()))\n\n const { NextResponse: nextResponse } = await import('next/server') as { NextResponse: NextResponseStatic }\n const response = nextResponse.next({\n request: { headers: requestHeaders },\n })\n\n // Also set on response for downstream consumers\n response.headers.set('x-request-id', requestId)\n\n return response\n }\n}\n","import { log } from '../logger'\nimport { createError, createEvlogError } from '../error'\nimport type { NextEvlogOptions } from './types'\nimport { createWithEvlog } from './handler'\nimport { useLogger } from './storage'\n\nexport type { NextEvlogOptions, EvlogMiddlewareConfig } from './types'\n\nexport { evlogMiddleware } from './middleware'\nexport { useLogger } from './storage'\nexport { log } from '../logger'\nexport { createError, createEvlogError } from '../error'\n\n/**\n * Create an evlog instance configured for Next.js.\n * Returns all helpers needed for server-side logging.\n *\n * @example\n * ```ts\n * // lib/evlog.ts\n * import { createEvlog } from 'evlog/next'\n * import { createAxiomDrain } from 'evlog/axiom'\n * import { createDrainPipeline } from 'evlog/pipeline'\n *\n * const pipeline = createDrainPipeline({ batch: { size: 50 } })\n *\n * export const { withEvlog, useLogger, log, createEvlogError } = createEvlog({\n * service: 'my-app',\n * sampling: {\n * rates: { info: 10 },\n * keep: [{ status: 400 }, { duration: 1000 }],\n * },\n * drain: pipeline(createAxiomDrain({\n * dataset: 'logs',\n * token: process.env.AXIOM_TOKEN!,\n * })),\n * enrich: (ctx) => {\n * ctx.event.deploymentId = process.env.VERCEL_DEPLOYMENT_ID\n * },\n * })\n * ```\n */\nexport function createEvlog(options: NextEvlogOptions = {}) {\n const withEvlog = createWithEvlog(options)\n\n return {\n withEvlog,\n useLogger,\n log,\n createError,\n createEvlogError,\n }\n}\n"],"mappings":"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"}
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
import { a as EnvironmentContext, r as DrainContext, y as SamplingConfig } from "../types-v_JkG_D7.mjs";
|
|
2
|
+
|
|
3
|
+
//#region src/next/instrumentation.d.ts
|
|
4
|
+
/** Request payload passed to Next.js `onRequestError` (App Router). */
|
|
5
|
+
interface NextInstrumentationRequest {
|
|
6
|
+
path: string;
|
|
7
|
+
method: string;
|
|
8
|
+
headers: Record<string, string>;
|
|
9
|
+
}
|
|
10
|
+
/** Routing context passed to Next.js `onRequestError`. */
|
|
11
|
+
interface NextInstrumentationErrorContext {
|
|
12
|
+
routerKind: string;
|
|
13
|
+
routePath: string;
|
|
14
|
+
routeType: string;
|
|
15
|
+
renderSource: string;
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* What `lib/evlog.ts` should export for use with {@link defineNodeInstrumentation}
|
|
19
|
+
* (typically the return values of `createInstrumentation()`).
|
|
20
|
+
*/
|
|
21
|
+
interface NodeInstrumentationModule {
|
|
22
|
+
register: () => void | Promise<void>;
|
|
23
|
+
onRequestError: (error: {
|
|
24
|
+
digest?: string;
|
|
25
|
+
} & Error, request: NextInstrumentationRequest, context: NextInstrumentationErrorContext) => void | Promise<void>;
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* Root `instrumentation.ts` entry: load your real config only in the Node.js runtime so Edge
|
|
29
|
+
* bundles never pull Node-only drains/adapters. Caches the dynamic `import()` so `register` and
|
|
30
|
+
* repeated `onRequestError` calls share one module instance (avoids re-importing on every error).
|
|
31
|
+
*
|
|
32
|
+
* @example
|
|
33
|
+
* ```ts
|
|
34
|
+
* // instrumentation.ts
|
|
35
|
+
* import { defineNodeInstrumentation } from 'evlog/next/instrumentation'
|
|
36
|
+
*
|
|
37
|
+
* export const { register, onRequestError } = defineNodeInstrumentation(() => import('./lib/evlog'))
|
|
38
|
+
* ```
|
|
39
|
+
*/
|
|
40
|
+
declare function defineNodeInstrumentation(loader: () => Promise<NodeInstrumentationModule>): {
|
|
41
|
+
register(): Promise<void>;
|
|
42
|
+
onRequestError(error: {
|
|
43
|
+
digest?: string;
|
|
44
|
+
} & Error, request: NextInstrumentationRequest, context: NextInstrumentationErrorContext): Promise<void>;
|
|
45
|
+
};
|
|
46
|
+
interface InstrumentationOptions {
|
|
47
|
+
/** Enable or disable all logging globally. @default true */
|
|
48
|
+
enabled?: boolean;
|
|
49
|
+
/** Service name for all logged events. */
|
|
50
|
+
service?: string;
|
|
51
|
+
/** Environment context overrides. */
|
|
52
|
+
env?: Partial<EnvironmentContext>;
|
|
53
|
+
/** Enable pretty printing. @default true in development */
|
|
54
|
+
pretty?: boolean;
|
|
55
|
+
/** Suppress built-in console output. @default false */
|
|
56
|
+
silent?: boolean;
|
|
57
|
+
/** Sampling configuration for filtering logs. */
|
|
58
|
+
sampling?: SamplingConfig;
|
|
59
|
+
/** When pretty is disabled, emit JSON strings or raw objects. @default true */
|
|
60
|
+
stringify?: boolean;
|
|
61
|
+
/** Drain callback called with every emitted event. */
|
|
62
|
+
drain?: (ctx: DrainContext) => void | Promise<void>;
|
|
63
|
+
/** Capture stdout/stderr output as log events (Node.js only). */
|
|
64
|
+
captureOutput?: boolean;
|
|
65
|
+
}
|
|
66
|
+
interface InstrumentationResult {
|
|
67
|
+
register: () => void;
|
|
68
|
+
onRequestError: (error: {
|
|
69
|
+
digest?: string;
|
|
70
|
+
} & Error, request: NextInstrumentationRequest, context: NextInstrumentationErrorContext) => void;
|
|
71
|
+
}
|
|
72
|
+
declare function createInstrumentation(options?: InstrumentationOptions): InstrumentationResult;
|
|
73
|
+
//#endregion
|
|
74
|
+
export { InstrumentationOptions, NextInstrumentationErrorContext, NextInstrumentationRequest, NodeInstrumentationModule, createInstrumentation, defineNodeInstrumentation };
|
|
75
|
+
//# sourceMappingURL=instrumentation.d.mts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"instrumentation.d.mts","names":[],"sources":["../../src/next/instrumentation.ts"],"mappings":";;;;UAIiB,0BAAA;EACf,IAAA;EACA,MAAA;EACA,OAAA,EAAS,MAAA;AAAA;;UAIM,+BAAA;EACf,UAAA;EACA,SAAA;EACA,SAAA;EACA,YAAA;AAAA;;;;;UAOe,yBAAA;EACf,QAAA,eAAuB,OAAA;EACvB,cAAA,GACE,KAAA;IAAS,MAAA;EAAA,IAAoB,KAAA,EAC7B,OAAA,EAAS,0BAAA,EACT,OAAA,EAAS,+BAAA,YACC,OAAA;AAAA;;;;;;;;;;;;;;iBAgBE,yBAAA,CAA0B,MAAA,QAAc,OAAA,CAAQ,yBAAA;;;IAejD,MAAA;EAAA,IAAoB,KAAA,EAAK,OAAA,EACzB,0BAAA,EAA0B,OAAA,EAC1B,+BAAA,GAA+B,OAAA;AAAA;AAAA,UAS7B,sBAAA;EA1CI;EA4CnB,OAAA;EA5Bc;EA8Bd,OAAA;;EAEA,GAAA,GAAM,OAAA,CAAQ,kBAAA;EAhCwC;EAkCtD,MAAA;EAnBiC;EAqBjC,MAAA;EAnBa;EAqBb,QAAA,GAAW,cAAA;EArBiC;EAuB5C,SAAA;EAxCsD;EA0CtD,KAAA,IAAS,GAAA,EAAK,YAAA,YAAwB,OAAA;EA1CE;EA4CxC,aAAA;AAAA;AAAA,UAGQ,qBAAA;EACR,QAAA;EACA,cAAA,GACE,KAAA;IAAS,MAAA;EAAA,IAAoB,KAAA,EAC7B,OAAA,EAAS,0BAAA,EACT,OAAA,EAAS,+BAAA;AAAA;AAAA,iBAMG,qBAAA,CAAsB,OAAA,GAAS,sBAAA,GAA8B,qBAAA"}
|
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
import { initLogger, lockLogger, log as _log } from "../logger.mjs";
|
|
2
|
+
//#region src/next/instrumentation.ts
|
|
3
|
+
/**
|
|
4
|
+
* Root `instrumentation.ts` entry: load your real config only in the Node.js runtime so Edge
|
|
5
|
+
* bundles never pull Node-only drains/adapters. Caches the dynamic `import()` so `register` and
|
|
6
|
+
* repeated `onRequestError` calls share one module instance (avoids re-importing on every error).
|
|
7
|
+
*
|
|
8
|
+
* @example
|
|
9
|
+
* ```ts
|
|
10
|
+
* // instrumentation.ts
|
|
11
|
+
* import { defineNodeInstrumentation } from 'evlog/next/instrumentation'
|
|
12
|
+
*
|
|
13
|
+
* export const { register, onRequestError } = defineNodeInstrumentation(() => import('./lib/evlog'))
|
|
14
|
+
* ```
|
|
15
|
+
*/
|
|
16
|
+
function defineNodeInstrumentation(loader) {
|
|
17
|
+
let cached;
|
|
18
|
+
function load() {
|
|
19
|
+
cached ??= loader();
|
|
20
|
+
return cached;
|
|
21
|
+
}
|
|
22
|
+
return {
|
|
23
|
+
async register() {
|
|
24
|
+
if (process.env.NEXT_RUNTIME !== "nodejs") return;
|
|
25
|
+
await (await load()).register();
|
|
26
|
+
},
|
|
27
|
+
async onRequestError(error, request, context) {
|
|
28
|
+
if (process.env.NEXT_RUNTIME !== "nodejs") return;
|
|
29
|
+
await (await load()).onRequestError(error, request, context);
|
|
30
|
+
}
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
let patching = false;
|
|
34
|
+
function createInstrumentation(options = {}) {
|
|
35
|
+
let registered = false;
|
|
36
|
+
function register() {
|
|
37
|
+
if (registered) return;
|
|
38
|
+
registered = true;
|
|
39
|
+
initLogger({
|
|
40
|
+
enabled: options.enabled,
|
|
41
|
+
env: {
|
|
42
|
+
service: options.service,
|
|
43
|
+
...options.env
|
|
44
|
+
},
|
|
45
|
+
pretty: options.pretty,
|
|
46
|
+
silent: options.silent,
|
|
47
|
+
sampling: options.sampling,
|
|
48
|
+
stringify: options.stringify,
|
|
49
|
+
drain: options.drain
|
|
50
|
+
});
|
|
51
|
+
lockLogger();
|
|
52
|
+
if (options.captureOutput && process.env.NEXT_RUNTIME === "nodejs") patchOutput();
|
|
53
|
+
}
|
|
54
|
+
function patchOutput() {
|
|
55
|
+
const proc = globalThis.process;
|
|
56
|
+
const originalStdoutWrite = proc.stdout.write.bind(proc.stdout);
|
|
57
|
+
const originalStderrWrite = proc.stderr.write.bind(proc.stderr);
|
|
58
|
+
proc.stdout.write = function(chunk, ...args) {
|
|
59
|
+
if (!patching) {
|
|
60
|
+
patching = true;
|
|
61
|
+
try {
|
|
62
|
+
_log.info({
|
|
63
|
+
source: "stdout",
|
|
64
|
+
message: String(chunk).trimEnd()
|
|
65
|
+
});
|
|
66
|
+
} finally {
|
|
67
|
+
patching = false;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
return originalStdoutWrite(chunk, ...args);
|
|
71
|
+
};
|
|
72
|
+
proc.stderr.write = function(chunk, ...args) {
|
|
73
|
+
if (!patching) {
|
|
74
|
+
patching = true;
|
|
75
|
+
try {
|
|
76
|
+
_log.error({
|
|
77
|
+
source: "stderr",
|
|
78
|
+
message: String(chunk).trimEnd()
|
|
79
|
+
});
|
|
80
|
+
} finally {
|
|
81
|
+
patching = false;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
return originalStderrWrite(chunk, ...args);
|
|
85
|
+
};
|
|
86
|
+
}
|
|
87
|
+
function onRequestError(error, request, context) {
|
|
88
|
+
_log.error({
|
|
89
|
+
message: error.message,
|
|
90
|
+
digest: error.digest,
|
|
91
|
+
stack: error.stack,
|
|
92
|
+
path: request.path,
|
|
93
|
+
method: request.method,
|
|
94
|
+
routerKind: context.routerKind,
|
|
95
|
+
routePath: context.routePath,
|
|
96
|
+
routeType: context.routeType,
|
|
97
|
+
renderSource: context.renderSource
|
|
98
|
+
});
|
|
99
|
+
}
|
|
100
|
+
return {
|
|
101
|
+
register,
|
|
102
|
+
onRequestError
|
|
103
|
+
};
|
|
104
|
+
}
|
|
105
|
+
//#endregion
|
|
106
|
+
export { createInstrumentation, defineNodeInstrumentation };
|
|
107
|
+
|
|
108
|
+
//# sourceMappingURL=instrumentation.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"instrumentation.mjs","names":[],"sources":["../../src/next/instrumentation.ts"],"sourcesContent":["import type { DrainContext, EnvironmentContext, SamplingConfig } from '../types'\nimport { initLogger, log, lockLogger } from '../logger'\n\n/** Request payload passed to Next.js `onRequestError` (App Router). */\nexport interface NextInstrumentationRequest {\n path: string\n method: string\n headers: Record<string, string>\n}\n\n/** Routing context passed to Next.js `onRequestError`. */\nexport interface NextInstrumentationErrorContext {\n routerKind: string\n routePath: string\n routeType: string\n renderSource: string\n}\n\n/**\n * What `lib/evlog.ts` should export for use with {@link defineNodeInstrumentation}\n * (typically the return values of `createInstrumentation()`).\n */\nexport interface NodeInstrumentationModule {\n register: () => void | Promise<void>\n onRequestError: (\n error: { digest?: string } & Error,\n request: NextInstrumentationRequest,\n context: NextInstrumentationErrorContext,\n ) => void | Promise<void>\n}\n\n/**\n * Root `instrumentation.ts` entry: load your real config only in the Node.js runtime so Edge\n * bundles never pull Node-only drains/adapters. Caches the dynamic `import()` so `register` and\n * repeated `onRequestError` calls share one module instance (avoids re-importing on every error).\n *\n * @example\n * ```ts\n * // instrumentation.ts\n * import { defineNodeInstrumentation } from 'evlog/next/instrumentation'\n *\n * export const { register, onRequestError } = defineNodeInstrumentation(() => import('./lib/evlog'))\n * ```\n */\nexport function defineNodeInstrumentation(loader: () => Promise<NodeInstrumentationModule>) {\n let cached: Promise<NodeInstrumentationModule> | undefined\n\n function load(): Promise<NodeInstrumentationModule> {\n cached ??= loader()\n return cached\n }\n\n return {\n async register() {\n if (process.env.NEXT_RUNTIME !== 'nodejs') return\n const mod = await load()\n await mod.register()\n },\n async onRequestError(\n error: { digest?: string } & Error,\n request: NextInstrumentationRequest,\n context: NextInstrumentationErrorContext,\n ) {\n if (process.env.NEXT_RUNTIME !== 'nodejs') return\n const mod = await load()\n await mod.onRequestError(error, request, context)\n },\n }\n}\n\nexport interface InstrumentationOptions {\n /** Enable or disable all logging globally. @default true */\n enabled?: boolean\n /** Service name for all logged events. */\n service?: string\n /** Environment context overrides. */\n env?: Partial<EnvironmentContext>\n /** Enable pretty printing. @default true in development */\n pretty?: boolean\n /** Suppress built-in console output. @default false */\n silent?: boolean\n /** Sampling configuration for filtering logs. */\n sampling?: SamplingConfig\n /** When pretty is disabled, emit JSON strings or raw objects. @default true */\n stringify?: boolean\n /** Drain callback called with every emitted event. */\n drain?: (ctx: DrainContext) => void | Promise<void>\n /** Capture stdout/stderr output as log events (Node.js only). */\n captureOutput?: boolean\n}\n\ninterface InstrumentationResult {\n register: () => void\n onRequestError: (\n error: { digest?: string } & Error,\n request: NextInstrumentationRequest,\n context: NextInstrumentationErrorContext,\n ) => void\n}\n\nlet patching = false\n\nexport function createInstrumentation(options: InstrumentationOptions = {}): InstrumentationResult {\n let registered = false\n\n function register(): void {\n if (registered) return\n registered = true\n\n initLogger({\n enabled: options.enabled,\n env: {\n service: options.service,\n ...options.env,\n },\n pretty: options.pretty,\n silent: options.silent,\n sampling: options.sampling,\n stringify: options.stringify,\n drain: options.drain,\n })\n lockLogger()\n\n if (options.captureOutput && process.env.NEXT_RUNTIME === 'nodejs') {\n patchOutput()\n }\n }\n\n function patchOutput(): void {\n const proc = globalThis.process\n const originalStdoutWrite = proc.stdout.write.bind(proc.stdout)\n const originalStderrWrite = proc.stderr.write.bind(proc.stderr)\n\n proc.stdout.write = function(chunk: unknown, ...args: unknown[]): boolean {\n if (!patching) {\n patching = true\n try {\n log.info({ source: 'stdout', message: String(chunk).trimEnd() })\n } finally {\n patching = false\n }\n }\n return originalStdoutWrite(chunk, ...args as [])\n } as typeof process.stdout.write\n\n proc.stderr.write = function(chunk: unknown, ...args: unknown[]): boolean {\n if (!patching) {\n patching = true\n try {\n log.error({ source: 'stderr', message: String(chunk).trimEnd() })\n } finally {\n patching = false\n }\n }\n return originalStderrWrite(chunk, ...args as [])\n } as typeof process.stderr.write\n }\n\n function onRequestError(\n error: { digest?: string } & Error,\n request: { path: string; method: string; headers: Record<string, string> },\n context: { routerKind: string; routePath: string; routeType: string; renderSource: string },\n ): void {\n log.error({\n message: error.message,\n digest: error.digest,\n stack: error.stack,\n path: request.path,\n method: request.method,\n routerKind: context.routerKind,\n routePath: context.routePath,\n routeType: context.routeType,\n renderSource: context.renderSource,\n })\n }\n\n return { register, onRequestError }\n}\n"],"mappings":";;;;;;;;;;;;;;;AA4CA,SAAgB,0BAA0B,QAAkD;CAC1F,IAAI;CAEJ,SAAS,OAA2C;AAClD,aAAW,QAAQ;AACnB,SAAO;;AAGT,QAAO;EACL,MAAM,WAAW;AACf,OAAI,QAAQ,IAAI,iBAAiB,SAAU;AAE3C,UADY,MAAM,MAAM,EACd,UAAU;;EAEtB,MAAM,eACJ,OACA,SACA,SACA;AACA,OAAI,QAAQ,IAAI,iBAAiB,SAAU;AAE3C,UADY,MAAM,MAAM,EACd,eAAe,OAAO,SAAS,QAAQ;;EAEpD;;AAiCH,IAAI,WAAW;AAEf,SAAgB,sBAAsB,UAAkC,EAAE,EAAyB;CACjG,IAAI,aAAa;CAEjB,SAAS,WAAiB;AACxB,MAAI,WAAY;AAChB,eAAa;AAEb,aAAW;GACT,SAAS,QAAQ;GACjB,KAAK;IACH,SAAS,QAAQ;IACjB,GAAG,QAAQ;IACZ;GACD,QAAQ,QAAQ;GAChB,QAAQ,QAAQ;GAChB,UAAU,QAAQ;GAClB,WAAW,QAAQ;GACnB,OAAO,QAAQ;GAChB,CAAC;AACF,cAAY;AAEZ,MAAI,QAAQ,iBAAiB,QAAQ,IAAI,iBAAiB,SACxD,cAAa;;CAIjB,SAAS,cAAoB;EAC3B,MAAM,OAAO,WAAW;EACxB,MAAM,sBAAsB,KAAK,OAAO,MAAM,KAAK,KAAK,OAAO;EAC/D,MAAM,sBAAsB,KAAK,OAAO,MAAM,KAAK,KAAK,OAAO;AAE/D,OAAK,OAAO,QAAQ,SAAS,OAAgB,GAAG,MAA0B;AACxE,OAAI,CAAC,UAAU;AACb,eAAW;AACX,QAAI;AACF,UAAI,KAAK;MAAE,QAAQ;MAAU,SAAS,OAAO,MAAM,CAAC,SAAS;MAAE,CAAC;cACxD;AACR,gBAAW;;;AAGf,UAAO,oBAAoB,OAAO,GAAG,KAAW;;AAGlD,OAAK,OAAO,QAAQ,SAAS,OAAgB,GAAG,MAA0B;AACxE,OAAI,CAAC,UAAU;AACb,eAAW;AACX,QAAI;AACF,UAAI,MAAM;MAAE,QAAQ;MAAU,SAAS,OAAO,MAAM,CAAC,SAAS;MAAE,CAAC;cACzD;AACR,gBAAW;;;AAGf,UAAO,oBAAoB,OAAO,GAAG,KAAW;;;CAIpD,SAAS,eACP,OACA,SACA,SACM;AACN,OAAI,MAAM;GACR,SAAS,MAAM;GACf,QAAQ,MAAM;GACd,OAAO,MAAM;GACb,MAAM,QAAQ;GACd,QAAQ,QAAQ;GAChB,YAAY,QAAQ;GACpB,WAAW,QAAQ;GACnB,WAAW,QAAQ;GACnB,cAAc,QAAQ;GACvB,CAAC;;AAGJ,QAAO;EAAE;EAAU;EAAgB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import * as nitropack from "nitropack";
|
|
1
|
+
import * as _$nitropack from "nitropack";
|
|
2
2
|
|
|
3
3
|
//#region src/nitro/errorHandler.d.ts
|
|
4
4
|
/**
|
|
@@ -9,7 +9,7 @@ import * as nitropack from "nitropack";
|
|
|
9
9
|
* For non-EvlogError, it preserves Nitro's default response shape while
|
|
10
10
|
* sanitizing internal error details in production for 5xx errors.
|
|
11
11
|
*/
|
|
12
|
-
declare const _default: nitropack.NitroErrorHandler;
|
|
12
|
+
declare const _default: _$nitropack.NitroErrorHandler;
|
|
13
13
|
//#endregion
|
|
14
14
|
export { _default as default };
|
|
15
15
|
//# sourceMappingURL=errorHandler.d.mts.map
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { t as extractErrorStatus } from "../errors-
|
|
2
|
-
import { n as serializeEvlogErrorResponse, t as resolveEvlogError } from "../nitro-
|
|
1
|
+
import { t as extractErrorStatus } from "../errors-gH4C9KSC.mjs";
|
|
2
|
+
import { n as serializeEvlogErrorResponse, t as resolveEvlogError } from "../nitro-Dpq5ZmcM.mjs";
|
|
3
3
|
import { getRequestURL, send, setResponseHeader, setResponseStatus } from "h3";
|
|
4
4
|
import { defineNitroErrorHandler } from "nitropack/runtime/internal/error/utils";
|
|
5
5
|
//#region src/nitro/errorHandler.ts
|
package/dist/nitro/module.d.mts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { t as useLogger } from "../useLogger-
|
|
2
|
-
import { t as NitroModuleOptions } from "../nitro-
|
|
1
|
+
import { t as useLogger } from "../useLogger-TjKH37BO.mjs";
|
|
2
|
+
import { t as NitroModuleOptions } from "../nitro-CfGx0wDJ.mjs";
|
|
3
3
|
import { Nitro } from "nitropack";
|
|
4
4
|
|
|
5
5
|
//#region src/nitro/module.d.ts
|
package/dist/nitro/plugin.d.mts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import * as nitropack from "nitropack";
|
|
1
|
+
import * as _$nitropack from "nitropack";
|
|
2
2
|
|
|
3
3
|
//#region src/nitro/plugin.d.ts
|
|
4
|
-
declare const _default: nitropack.NitroAppPlugin;
|
|
4
|
+
declare const _default: _$nitropack.NitroAppPlugin;
|
|
5
5
|
//#endregion
|
|
6
6
|
export { _default as default };
|
|
7
7
|
//# sourceMappingURL=plugin.d.mts.map
|
package/dist/nitro/plugin.mjs
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { filterSafeHeaders } from "../utils.mjs";
|
|
2
2
|
import { createRequestLogger, initLogger, isEnabled } from "../logger.mjs";
|
|
3
|
-
import { t as extractErrorStatus } from "../errors-
|
|
4
|
-
import { n as shouldLog, t as getServiceForPath } from "../routes-
|
|
3
|
+
import { t as extractErrorStatus } from "../errors-gH4C9KSC.mjs";
|
|
4
|
+
import { n as shouldLog, t as getServiceForPath } from "../routes-CE3_c-iZ.mjs";
|
|
5
|
+
import { n as resolveEvlogConfigForNitroPlugin } from "../nitroConfigBridge-fidbf-Y_.mjs";
|
|
5
6
|
import { defineNitroPlugin } from "nitropack/runtime/internal/plugin";
|
|
6
7
|
import { getHeaders } from "h3";
|
|
7
8
|
//#region src/nitro/plugin.ts
|
|
@@ -64,12 +65,7 @@ async function callEnrichAndDrain(nitroApp, emittedEvent, event) {
|
|
|
64
65
|
else await drainPromise;
|
|
65
66
|
}
|
|
66
67
|
var plugin_default = defineNitroPlugin(async (nitroApp) => {
|
|
67
|
-
|
|
68
|
-
if (process.env.__EVLOG_CONFIG) evlogConfig = JSON.parse(process.env.__EVLOG_CONFIG);
|
|
69
|
-
else try {
|
|
70
|
-
const { useRuntimeConfig } = await import("nitropack/runtime/internal/config");
|
|
71
|
-
evlogConfig = useRuntimeConfig().evlog;
|
|
72
|
-
} catch {}
|
|
68
|
+
const evlogConfig = await resolveEvlogConfigForNitroPlugin();
|
|
73
69
|
initLogger({
|
|
74
70
|
enabled: evlogConfig?.enabled,
|
|
75
71
|
env: evlogConfig?.env,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.mjs","names":[],"sources":["../../src/nitro/plugin.ts"],"sourcesContent":["import type { NitroApp } from 'nitropack/types'\n// Import from specific subpaths to avoid the barrel 'nitropack/runtime' which\n// re-exports from internal/app.mjs — that file imports #nitro-internal-virtual/*\n// modules that only exist inside rollup builds and crash when loaded externally\n// (nitropack dev loads plugins outside the bundle via Worker threads).\nimport { defineNitroPlugin } from 'nitropack/runtime/internal/plugin'\nimport { getHeaders } from 'h3'\nimport { createRequestLogger, initLogger, isEnabled } from '../logger'\nimport { shouldLog, getServiceForPath, extractErrorStatus } from '../nitro'\nimport type { EvlogConfig } from '../nitro'\nimport type { EnrichContext, RequestLogger, ServerEvent, TailSamplingContext, WideEvent } from '../types'\nimport { filterSafeHeaders } from '../utils'\n\nfunction getSafeHeaders(event: ServerEvent): Record<string, string> {\n const allHeaders = getHeaders(event as Parameters<typeof getHeaders>[0])\n return filterSafeHeaders(allHeaders)\n}\n\nfunction getSafeResponseHeaders(event: ServerEvent): Record<string, string> | undefined {\n const headers: Record<string, string> = {}\n const nodeRes = event.node?.res as { getHeaders?: () => Record<string, unknown> } | undefined\n\n if (nodeRes?.getHeaders) {\n for (const [key, value] of Object.entries(nodeRes.getHeaders())) {\n if (value === undefined) continue\n headers[key] = Array.isArray(value) ? value.join(', ') : String(value)\n }\n }\n\n if (event.response?.headers) {\n event.response.headers.forEach((value, key) => {\n headers[key] = value\n })\n }\n\n if (Object.keys(headers).length === 0) return undefined\n return filterSafeHeaders(headers)\n}\n\nfunction getResponseStatus(event: ServerEvent): number {\n // Node.js style\n if (event.node?.res?.statusCode) {\n return event.node.res.statusCode\n }\n\n // Web Standard\n if (event.response?.status) {\n return event.response.status\n }\n\n // Context-based\n if (typeof event.context.status === 'number') {\n return event.context.status\n }\n\n return 200\n}\n\nfunction buildHookContext(event: ServerEvent): Omit<EnrichContext, 'event'> {\n const responseHeaders = getSafeResponseHeaders(event)\n return {\n request: { method: event.method, path: event.path },\n headers: getSafeHeaders(event),\n response: {\n status: getResponseStatus(event),\n headers: responseHeaders,\n },\n }\n}\n\nasync function callEnrichAndDrain(\n nitroApp: NitroApp,\n emittedEvent: WideEvent | null,\n event: ServerEvent,\n): Promise<void> {\n if (!emittedEvent) return\n\n const hookContext = buildHookContext(event)\n\n try {\n await nitroApp.hooks.callHook('evlog:enrich', { event: emittedEvent, ...hookContext })\n } catch (err) {\n console.error('[evlog] enrich failed:', err)\n }\n\n const drainPromise = nitroApp.hooks.callHook('evlog:drain', {\n event: emittedEvent,\n request: hookContext.request,\n headers: hookContext.headers,\n }).catch((err) => {\n console.error('[evlog] drain failed:', err)\n })\n\n // Use waitUntil if available (Cloudflare Workers, Vercel Edge, etc.)\n // This keeps the runtime alive for background work without blocking the response\n const waitUntilCtx = event.context.cloudflare?.context ?? event.context\n if (typeof waitUntilCtx?.waitUntil === 'function') {\n waitUntilCtx.waitUntil(drainPromise)\n } else {\n // Fallback: await drain to prevent lost logs in serverless environments\n // (e.g. Vercel Fluid Compute). On the normal path this runs from\n // afterResponse (response already sent); on the error path it may run\n // before the error response is finalized.\n await drainPromise\n }\n}\n\nexport default defineNitroPlugin(async (nitroApp) => {\n // Config resolution: process.env bridge first (always set by the module),\n // then lazy useRuntimeConfig() for production builds where env may not persist.\n let evlogConfig: EvlogConfig | undefined\n if (process.env.__EVLOG_CONFIG) {\n evlogConfig = JSON.parse(process.env.__EVLOG_CONFIG)\n } else {\n try {\n // nitropack/runtime/internal/config imports virtual modules —\n // only works inside rollup-bundled output (production builds).\n const { useRuntimeConfig } = await import('nitropack/runtime/internal/config')\n evlogConfig = (useRuntimeConfig() as Record<string, any>).evlog\n } catch {\n // Expected in dev mode — virtual modules unavailable outside rollup\n }\n }\n\n initLogger({\n enabled: evlogConfig?.enabled,\n env: evlogConfig?.env,\n pretty: evlogConfig?.pretty,\n silent: evlogConfig?.silent,\n sampling: evlogConfig?.sampling,\n _suppressDrainWarning: true,\n })\n\n if (!isEnabled()) return\n\n nitroApp.hooks.hook('request', (event) => {\n const e = event as ServerEvent\n\n // Evaluate route filtering but always create the logger so that server\n // middleware (which runs for every request) can call useLogger(event)\n // without throwing. Filtering is enforced at emit time instead.\n e.context._evlogShouldEmit = shouldLog(e.path, evlogConfig?.include, evlogConfig?.exclude)\n\n // Store start time for duration calculation in tail sampling\n e.context._evlogStartTime = Date.now()\n\n let requestIdOverride: string | undefined = undefined\n if (globalThis.navigator?.userAgent === 'Cloudflare-Workers') {\n const cfRay = getSafeHeaders(e)?.['cf-ray']\n if (cfRay) requestIdOverride = cfRay\n }\n\n const requestLog = createRequestLogger({\n method: e.method,\n path: e.path,\n requestId: requestIdOverride || e.context.requestId || crypto.randomUUID(),\n }, { _deferDrain: true })\n\n // Apply route-based service configuration if a matching route is found\n const routeService = getServiceForPath(e.path, evlogConfig?.routes)\n if (routeService) {\n requestLog.set({ service: routeService })\n }\n\n e.context.log = requestLog\n })\n\n nitroApp.hooks.hook('error', async (error, { event }) => {\n const e = event as ServerEvent | undefined\n if (!e) return\n if (!e.context._evlogShouldEmit) return\n\n const requestLog = e.context.log as RequestLogger | undefined\n if (requestLog) {\n requestLog.error(error as Error)\n\n const errorStatus = extractErrorStatus(error)\n requestLog.set({ status: errorStatus })\n\n // Build tail sampling context\n const startTime = e.context._evlogStartTime as number | undefined\n const durationMs = startTime ? Date.now() - startTime : undefined\n\n const tailCtx: TailSamplingContext = {\n status: errorStatus,\n duration: durationMs,\n path: e.path,\n method: e.method,\n context: requestLog.getContext(),\n shouldKeep: false,\n }\n\n // Call evlog:emit:keep hook\n await nitroApp.hooks.callHook('evlog:emit:keep', tailCtx)\n\n e.context._evlogEmitted = true\n\n const emittedEvent = requestLog.emit({ _forceKeep: tailCtx.shouldKeep })\n await callEnrichAndDrain(nitroApp, emittedEvent, e)\n }\n })\n\n nitroApp.hooks.hook('afterResponse', async (event) => {\n const e = event as ServerEvent\n // Skip if already emitted by error hook or route was filtered out\n if (e.context._evlogEmitted || !e.context._evlogShouldEmit) return\n\n const requestLog = e.context.log as RequestLogger | undefined\n if (requestLog) {\n const status = getResponseStatus(e)\n requestLog.set({ status })\n\n const startTime = e.context._evlogStartTime as number | undefined\n const durationMs = startTime ? Date.now() - startTime : undefined\n\n const tailCtx: TailSamplingContext = {\n status,\n duration: durationMs,\n path: e.path,\n method: e.method,\n context: requestLog.getContext(),\n shouldKeep: false,\n }\n\n await nitroApp.hooks.callHook('evlog:emit:keep', tailCtx)\n\n const emittedEvent = requestLog.emit({ _forceKeep: tailCtx.shouldKeep })\n await callEnrichAndDrain(nitroApp, emittedEvent, e)\n }\n })\n})\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"plugin.mjs","names":[],"sources":["../../src/nitro/plugin.ts"],"sourcesContent":["import type { NitroApp } from 'nitropack/types'\n// Import from specific subpaths to avoid the barrel 'nitropack/runtime' which\n// re-exports from internal/app.mjs — that file imports #nitro-internal-virtual/*\n// modules that only exist inside rollup builds and crash when loaded externally\n// (nitropack dev loads plugins outside the bundle via Worker threads).\nimport { defineNitroPlugin } from 'nitropack/runtime/internal/plugin'\nimport { getHeaders } from 'h3'\nimport { createRequestLogger, initLogger, isEnabled } from '../logger'\nimport { shouldLog, getServiceForPath, extractErrorStatus } from '../nitro'\nimport { resolveEvlogConfigForNitroPlugin } from '../shared/nitroConfigBridge'\nimport type { EnrichContext, RequestLogger, ServerEvent, TailSamplingContext, WideEvent } from '../types'\nimport { filterSafeHeaders } from '../utils'\n\nfunction getSafeHeaders(event: ServerEvent): Record<string, string> {\n const allHeaders = getHeaders(event as Parameters<typeof getHeaders>[0])\n return filterSafeHeaders(allHeaders)\n}\n\nfunction getSafeResponseHeaders(event: ServerEvent): Record<string, string> | undefined {\n const headers: Record<string, string> = {}\n const nodeRes = event.node?.res as { getHeaders?: () => Record<string, unknown> } | undefined\n\n if (nodeRes?.getHeaders) {\n for (const [key, value] of Object.entries(nodeRes.getHeaders())) {\n if (value === undefined) continue\n headers[key] = Array.isArray(value) ? value.join(', ') : String(value)\n }\n }\n\n if (event.response?.headers) {\n event.response.headers.forEach((value, key) => {\n headers[key] = value\n })\n }\n\n if (Object.keys(headers).length === 0) return undefined\n return filterSafeHeaders(headers)\n}\n\nfunction getResponseStatus(event: ServerEvent): number {\n // Node.js style\n if (event.node?.res?.statusCode) {\n return event.node.res.statusCode\n }\n\n // Web Standard\n if (event.response?.status) {\n return event.response.status\n }\n\n // Context-based\n if (typeof event.context.status === 'number') {\n return event.context.status\n }\n\n return 200\n}\n\nfunction buildHookContext(event: ServerEvent): Omit<EnrichContext, 'event'> {\n const responseHeaders = getSafeResponseHeaders(event)\n return {\n request: { method: event.method, path: event.path },\n headers: getSafeHeaders(event),\n response: {\n status: getResponseStatus(event),\n headers: responseHeaders,\n },\n }\n}\n\nasync function callEnrichAndDrain(\n nitroApp: NitroApp,\n emittedEvent: WideEvent | null,\n event: ServerEvent,\n): Promise<void> {\n if (!emittedEvent) return\n\n const hookContext = buildHookContext(event)\n\n try {\n await nitroApp.hooks.callHook('evlog:enrich', { event: emittedEvent, ...hookContext })\n } catch (err) {\n console.error('[evlog] enrich failed:', err)\n }\n\n const drainPromise = nitroApp.hooks.callHook('evlog:drain', {\n event: emittedEvent,\n request: hookContext.request,\n headers: hookContext.headers,\n }).catch((err) => {\n console.error('[evlog] drain failed:', err)\n })\n\n // Use waitUntil if available (Cloudflare Workers, Vercel Edge, etc.)\n // This keeps the runtime alive for background work without blocking the response\n const waitUntilCtx = event.context.cloudflare?.context ?? event.context\n if (typeof waitUntilCtx?.waitUntil === 'function') {\n waitUntilCtx.waitUntil(drainPromise)\n } else {\n // Fallback: await drain to prevent lost logs in serverless environments\n // (e.g. Vercel Fluid Compute). On the normal path this runs from\n // afterResponse (response already sent); on the error path it may run\n // before the error response is finalized.\n await drainPromise\n }\n}\n\nexport default defineNitroPlugin(async (nitroApp) => {\n const evlogConfig = await resolveEvlogConfigForNitroPlugin()\n\n initLogger({\n enabled: evlogConfig?.enabled,\n env: evlogConfig?.env,\n pretty: evlogConfig?.pretty,\n silent: evlogConfig?.silent,\n sampling: evlogConfig?.sampling,\n _suppressDrainWarning: true,\n })\n\n if (!isEnabled()) return\n\n nitroApp.hooks.hook('request', (event) => {\n const e = event as ServerEvent\n\n // Evaluate route filtering but always create the logger so that server\n // middleware (which runs for every request) can call useLogger(event)\n // without throwing. Filtering is enforced at emit time instead.\n e.context._evlogShouldEmit = shouldLog(e.path, evlogConfig?.include, evlogConfig?.exclude)\n\n // Store start time for duration calculation in tail sampling\n e.context._evlogStartTime = Date.now()\n\n let requestIdOverride: string | undefined = undefined\n if (globalThis.navigator?.userAgent === 'Cloudflare-Workers') {\n const cfRay = getSafeHeaders(e)?.['cf-ray']\n if (cfRay) requestIdOverride = cfRay\n }\n\n const requestLog = createRequestLogger({\n method: e.method,\n path: e.path,\n requestId: requestIdOverride || e.context.requestId || crypto.randomUUID(),\n }, { _deferDrain: true })\n\n // Apply route-based service configuration if a matching route is found\n const routeService = getServiceForPath(e.path, evlogConfig?.routes)\n if (routeService) {\n requestLog.set({ service: routeService })\n }\n\n e.context.log = requestLog\n })\n\n nitroApp.hooks.hook('error', async (error, { event }) => {\n const e = event as ServerEvent | undefined\n if (!e) return\n if (!e.context._evlogShouldEmit) return\n\n const requestLog = e.context.log as RequestLogger | undefined\n if (requestLog) {\n requestLog.error(error as Error)\n\n const errorStatus = extractErrorStatus(error)\n requestLog.set({ status: errorStatus })\n\n // Build tail sampling context\n const startTime = e.context._evlogStartTime as number | undefined\n const durationMs = startTime ? Date.now() - startTime : undefined\n\n const tailCtx: TailSamplingContext = {\n status: errorStatus,\n duration: durationMs,\n path: e.path,\n method: e.method,\n context: requestLog.getContext(),\n shouldKeep: false,\n }\n\n // Call evlog:emit:keep hook\n await nitroApp.hooks.callHook('evlog:emit:keep', tailCtx)\n\n e.context._evlogEmitted = true\n\n const emittedEvent = requestLog.emit({ _forceKeep: tailCtx.shouldKeep })\n await callEnrichAndDrain(nitroApp, emittedEvent, e)\n }\n })\n\n nitroApp.hooks.hook('afterResponse', async (event) => {\n const e = event as ServerEvent\n // Skip if already emitted by error hook or route was filtered out\n if (e.context._evlogEmitted || !e.context._evlogShouldEmit) return\n\n const requestLog = e.context.log as RequestLogger | undefined\n if (requestLog) {\n const status = getResponseStatus(e)\n requestLog.set({ status })\n\n const startTime = e.context._evlogStartTime as number | undefined\n const durationMs = startTime ? Date.now() - startTime : undefined\n\n const tailCtx: TailSamplingContext = {\n status,\n duration: durationMs,\n path: e.path,\n method: e.method,\n context: requestLog.getContext(),\n shouldKeep: false,\n }\n\n await nitroApp.hooks.callHook('evlog:emit:keep', tailCtx)\n\n const emittedEvent = requestLog.emit({ _forceKeep: tailCtx.shouldKeep })\n await callEnrichAndDrain(nitroApp, emittedEvent, e)\n }\n })\n})\n"],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import * as nitro_types0 from "nitro/types";
|
|
1
|
+
import * as _$nitro_types0 from "nitro/types";
|
|
2
2
|
|
|
3
3
|
//#region src/nitro-v3/errorHandler.d.ts
|
|
4
4
|
/**
|
|
@@ -18,7 +18,7 @@ import * as nitro_types0 from "nitro/types";
|
|
|
18
18
|
* })
|
|
19
19
|
* ```
|
|
20
20
|
*/
|
|
21
|
-
declare const _default: nitro_types0.NitroErrorHandler;
|
|
21
|
+
declare const _default: _$nitro_types0.NitroErrorHandler;
|
|
22
22
|
//#endregion
|
|
23
23
|
export { _default as default };
|
|
24
24
|
//# sourceMappingURL=errorHandler.d.mts.map
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { t as extractErrorStatus } from "../../errors-
|
|
2
|
-
import { n as serializeEvlogErrorResponse, t as resolveEvlogError } from "../../nitro-
|
|
1
|
+
import { t as extractErrorStatus } from "../../errors-gH4C9KSC.mjs";
|
|
2
|
+
import { n as serializeEvlogErrorResponse, t as resolveEvlogError } from "../../nitro-Dpq5ZmcM.mjs";
|
|
3
3
|
import { t as parseURL } from "../../dist-BFn8qsRC.mjs";
|
|
4
4
|
import { defineErrorHandler } from "nitro";
|
|
5
5
|
//#region src/nitro-v3/errorHandler.ts
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import { n as createError, t as EvlogError } from "../../error-plrBYLQk.mjs";
|
|
2
|
+
import { t as parseError } from "../../parseError-B_qXj8x4.mjs";
|
|
1
3
|
import evlog from "./module.mjs";
|
|
2
4
|
import { useLogger } from "./useLogger.mjs";
|
|
3
5
|
import { evlogErrorHandler } from "./middleware.mjs";
|
|
4
|
-
export { evlog as default, evlogErrorHandler, useLogger };
|
|
6
|
+
export { EvlogError, createError, createError as createEvlogError, evlog as default, evlogErrorHandler, parseError, useLogger };
|
package/dist/nitro/v3/index.mjs
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import { EvlogError, createError } from "../../error.mjs";
|
|
2
|
+
import { parseError } from "../../runtime/utils/parseError.mjs";
|
|
1
3
|
import evlog from "./module.mjs";
|
|
2
4
|
import { useLogger } from "./useLogger.mjs";
|
|
3
5
|
import { evlogErrorHandler } from "./middleware.mjs";
|
|
4
|
-
export { evlog as default, evlogErrorHandler, useLogger };
|
|
6
|
+
export { EvlogError, createError, createError as createEvlogError, evlog as default, evlogErrorHandler, parseError, useLogger };
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { RequestServerResult } from "@tanstack/start-client-core";
|
|
2
|
+
|
|
1
3
|
//#region src/nitro-v3/middleware.d.ts
|
|
2
4
|
/**
|
|
3
5
|
* Server middleware handler that catches EvlogError and returns a structured JSON response.
|
|
@@ -19,9 +21,15 @@
|
|
|
19
21
|
* })
|
|
20
22
|
* ```
|
|
21
23
|
*/
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
24
|
+
/**
|
|
25
|
+
* TanStack's `RequestServerNextFn` may return synchronously or as a `Promise`, and uses a
|
|
26
|
+
* typed `options` argument. A rest-args `any[]` signature keeps `RequestServerNextFn`
|
|
27
|
+
* assignable under `strictFunctionTypes`. The return type matches `createMiddleware().server()`.
|
|
28
|
+
*/
|
|
29
|
+
type EvlogServerMiddlewareNext = (...args: any[]) => unknown | Promise<unknown>;
|
|
30
|
+
declare function evlogErrorHandler(nextOrOptions: EvlogServerMiddlewareNext | {
|
|
31
|
+
next: EvlogServerMiddlewareNext;
|
|
32
|
+
}): Promise<RequestServerResult<any, any, any> | Response>;
|
|
25
33
|
//#endregion
|
|
26
34
|
export { evlogErrorHandler };
|
|
27
35
|
//# sourceMappingURL=middleware.d.mts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.d.mts","names":[],"sources":["../../../src/nitro-v3/middleware.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"middleware.d.mts","names":[],"sources":["../../../src/nitro-v3/middleware.ts"],"mappings":";;;;;AAAsE;;;;;AAgCtE;;;;;;;;;;;;;;;;;;KAFK,yBAAA,OAAgC,IAAA,sBAA0B,OAAA;AAAA,iBAEzC,iBAAA,CACpB,aAAA,EAAe,yBAAA;EAA8B,IAAA,EAAM,yBAAA;AAAA,IAClD,OAAA,CAAQ,mBAAA,kBAAqC,QAAA"}
|
|
@@ -1,29 +1,9 @@
|
|
|
1
1
|
import { EvlogError } from "../../error.mjs";
|
|
2
2
|
//#region src/nitro-v3/middleware.ts
|
|
3
|
-
/**
|
|
4
|
-
* Server middleware handler that catches EvlogError and returns a structured JSON response.
|
|
5
|
-
*
|
|
6
|
-
* Frameworks like TanStack Start catch thrown errors before Nitro's error handler,
|
|
7
|
-
* stripping the `data` field (containing `why`, `fix`, `link`). This middleware
|
|
8
|
-
* intercepts EvlogErrors first, attaches them to the wide event, and throws a
|
|
9
|
-
* `Response` that the framework passes through directly.
|
|
10
|
-
*
|
|
11
|
-
* @example TanStack Start
|
|
12
|
-
* ```ts
|
|
13
|
-
* import { createMiddleware } from '@tanstack/react-start'
|
|
14
|
-
* import { evlogErrorHandler } from 'evlog/nitro/v3'
|
|
15
|
-
*
|
|
16
|
-
* const evlogMiddleware = createMiddleware().server(evlogErrorHandler)
|
|
17
|
-
*
|
|
18
|
-
* export const Route = createRootRoute({
|
|
19
|
-
* server: { middleware: [evlogMiddleware] },
|
|
20
|
-
* })
|
|
21
|
-
* ```
|
|
22
|
-
*/
|
|
23
3
|
async function evlogErrorHandler(nextOrOptions) {
|
|
24
4
|
const next = typeof nextOrOptions === "function" ? nextOrOptions : nextOrOptions.next;
|
|
25
5
|
try {
|
|
26
|
-
return await next();
|
|
6
|
+
return await Promise.resolve(next());
|
|
27
7
|
} catch (error) {
|
|
28
8
|
if (error instanceof EvlogError || error && typeof error === "object" && error.name === "EvlogError") {
|
|
29
9
|
const evlogError = error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.mjs","names":[],"sources":["../../../src/nitro-v3/middleware.ts"],"sourcesContent":["import type {
|
|
1
|
+
{"version":3,"file":"middleware.mjs","names":[],"sources":["../../../src/nitro-v3/middleware.ts"],"sourcesContent":["import type { RequestServerResult } from '@tanstack/start-client-core'\nimport type { RequestLogger } from '../types'\nimport { EvlogError } from '../error'\n\n/**\n * Server middleware handler that catches EvlogError and returns a structured JSON response.\n *\n * Frameworks like TanStack Start catch thrown errors before Nitro's error handler,\n * stripping the `data` field (containing `why`, `fix`, `link`). This middleware\n * intercepts EvlogErrors first, attaches them to the wide event, and throws a\n * `Response` that the framework passes through directly.\n *\n * @example TanStack Start\n * ```ts\n * import { createMiddleware } from '@tanstack/react-start'\n * import { evlogErrorHandler } from 'evlog/nitro/v3'\n *\n * const evlogMiddleware = createMiddleware().server(evlogErrorHandler)\n *\n * export const Route = createRootRoute({\n * server: { middleware: [evlogMiddleware] },\n * })\n * ```\n */\n\n/**\n * TanStack's `RequestServerNextFn` may return synchronously or as a `Promise`, and uses a\n * typed `options` argument. A rest-args `any[]` signature keeps `RequestServerNextFn`\n * assignable under `strictFunctionTypes`. The return type matches `createMiddleware().server()`.\n */\ntype EvlogServerMiddlewareNext = (...args: any[]) => unknown | Promise<unknown>\n\nexport async function evlogErrorHandler(\n nextOrOptions: EvlogServerMiddlewareNext | { next: EvlogServerMiddlewareNext },\n): Promise<RequestServerResult<any, any, any> | Response> {\n const next = typeof nextOrOptions === 'function' ? nextOrOptions : nextOrOptions.next\n try {\n return (await Promise.resolve(next())) as RequestServerResult<any, any, any>\n } catch (error: unknown) {\n if (error instanceof EvlogError || (error && typeof error === 'object' && (error as Error).name === 'EvlogError')) {\n const evlogError = error as EvlogError\n\n try {\n const { useRequest } = await import('nitro/context')\n const req = useRequest()\n const log = req.context?.log as RequestLogger | undefined\n log?.error(evlogError)\n } catch {\n // ignore\n }\n\n // Throw as Response so frameworks (TanStack Start, SolidStart, etc.) pass it through\n throw new Response(JSON.stringify(evlogError.toJSON()), {\n status: evlogError.status || 500,\n headers: { 'Content-Type': 'application/json' },\n })\n }\n throw error\n }\n}\n"],"mappings":";;AAgCA,eAAsB,kBACpB,eACwD;CACxD,MAAM,OAAO,OAAO,kBAAkB,aAAa,gBAAgB,cAAc;AACjF,KAAI;AACF,SAAQ,MAAM,QAAQ,QAAQ,MAAM,CAAC;UAC9B,OAAgB;AACvB,MAAI,iBAAiB,cAAe,SAAS,OAAO,UAAU,YAAa,MAAgB,SAAS,cAAe;GACjH,MAAM,aAAa;AAEnB,OAAI;IACF,MAAM,EAAE,eAAe,MAAM,OAAO;AAGpC,KAFY,YAAY,CACR,SAAS,MACpB,MAAM,WAAW;WAChB;AAKR,SAAM,IAAI,SAAS,KAAK,UAAU,WAAW,QAAQ,CAAC,EAAE;IACtD,QAAQ,WAAW,UAAU;IAC7B,SAAS,EAAE,gBAAgB,oBAAoB;IAChD,CAAC;;AAEJ,QAAM"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import * as nitro_types0 from "nitro/types";
|
|
1
|
+
import * as _$nitro_types0 from "nitro/types";
|
|
2
2
|
|
|
3
3
|
//#region src/nitro-v3/plugin.d.ts
|
|
4
4
|
/**
|
|
@@ -10,7 +10,7 @@ import * as nitro_types0 from "nitro/types";
|
|
|
10
10
|
* export { default } from 'evlog/nitro/v3'
|
|
11
11
|
* ```
|
|
12
12
|
*/
|
|
13
|
-
declare const _default: nitro_types0.NitroAppPlugin;
|
|
13
|
+
declare const _default: _$nitro_types0.NitroAppPlugin;
|
|
14
14
|
//#endregion
|
|
15
15
|
export { _default as default };
|
|
16
16
|
//# sourceMappingURL=plugin.d.mts.map
|
package/dist/nitro/v3/plugin.mjs
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { filterSafeHeaders } from "../../utils.mjs";
|
|
2
2
|
import { createRequestLogger, initLogger, isEnabled } from "../../logger.mjs";
|
|
3
|
-
import { t as extractErrorStatus } from "../../errors-
|
|
4
|
-
import { n as shouldLog, t as getServiceForPath } from "../../routes-
|
|
3
|
+
import { t as extractErrorStatus } from "../../errors-gH4C9KSC.mjs";
|
|
4
|
+
import { n as shouldLog, t as getServiceForPath } from "../../routes-CE3_c-iZ.mjs";
|
|
5
|
+
import { n as resolveEvlogConfigForNitroPlugin } from "../../nitroConfigBridge-fidbf-Y_.mjs";
|
|
5
6
|
import { t as parseURL } from "../../dist-BFn8qsRC.mjs";
|
|
6
7
|
import { definePlugin } from "nitro";
|
|
7
|
-
import { useRuntimeConfig } from "nitro/runtime-config";
|
|
8
8
|
//#region src/nitro-v3/plugin.ts
|
|
9
9
|
function getContext(event) {
|
|
10
10
|
if (!event.req.context) event.req.context = {};
|
|
@@ -80,8 +80,8 @@ async function callEnrichAndDrain(hooks, emittedEvent, event, res) {
|
|
|
80
80
|
* export { default } from 'evlog/nitro/v3'
|
|
81
81
|
* ```
|
|
82
82
|
*/
|
|
83
|
-
var plugin_default = definePlugin((nitroApp) => {
|
|
84
|
-
const evlogConfig =
|
|
83
|
+
var plugin_default = definePlugin(async (nitroApp) => {
|
|
84
|
+
const evlogConfig = await resolveEvlogConfigForNitroPlugin();
|
|
85
85
|
initLogger({
|
|
86
86
|
enabled: evlogConfig?.enabled,
|
|
87
87
|
env: evlogConfig?.env,
|