@neomanex/analytics-nuxt 1.0.2 → 1.0.3

package/dist/module.mjs

@@ -1,4 +1,4 @@
-import { defineNuxtModule, createResolver, addServerHandler, addPlugin, addImports, addTypeTemplate } from '@nuxt/kit';
+import { defineNuxtModule, createResolver, addServerHandler, addServerPlugin, addPlugin, addImports, addTypeTemplate } from '@nuxt/kit';
 import { defu } from 'defu';
 
 const module = defineNuxtModule({
@@ -48,6 +48,7 @@ const module = defineNuxtModule({
       route: "/api/_analytics",
       handler: resolver.resolve("./runtime/server/api/_analytics.post")
     });
+    addServerPlugin(resolver.resolve("./runtime/server/plugins/correlation-meta"));
     addPlugin({
       src: resolver.resolve("./runtime/plugin.server"),
       mode: "server"

package/dist/runtime/client.js

@@ -25,10 +25,19 @@ export class AnalyticsClient {
         event_type: eventType,
         timestamp: (/* @__PURE__ */ new Date()).toISOString(),
         source: this.config.source,
+        correlation_id: options?.correlation_id,
         metadata: metadata ?? void 0,
         account_id: options?.account_id,
-        user_id: options?.user_id
+        user_id: options?.user_id,
+        client_ip: options?.client_ip,
+        user_agent: options?.user_agent,
+        referer: options?.referer,
+        accept_language: options?.accept_language
       };
+      if (event.metadata?.correlation_id) {
+        const { correlation_id: _, ...rest } = event.metadata;
+        event.metadata = Object.keys(rest).length > 0 ? rest : void 0;
+      }
       if (this.queue.length >= this.config.maxQueueSize) {
         this.handleQueueOverflow(event);
         return;
@@ -72,17 +81,28 @@ export class AnalyticsClient {
   get queueLength() {
     return this.queue.length;
   }
+  /**
+   * Get the configured batch endpoint path (for sendBeacon usage).
+   */
+  get batchEndpointUrl() {
+    return this.config.batchEndpoint;
+  }
   /**
    * Build an event payload for sendBeacon usage (browser page.leave).
    * Returns the JSON string to send via navigator.sendBeacon.
    */
-  buildBeaconPayload(eventType, metadata) {
+  buildBeaconPayload(eventType, metadata, options) {
     const event = {
       event_type: eventType,
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       source: this.config.source,
+      correlation_id: options?.correlation_id,
       metadata
     };
+    if (event.metadata?.correlation_id) {
+      const { correlation_id: _, ...rest } = event.metadata;
+      event.metadata = Object.keys(rest).length > 0 ? rest : void 0;
+    }
     return JSON.stringify({ events: [event] });
   }
   /**
@@ -114,7 +134,7 @@ export class AnalyticsClient {
    * Send a batch of events via ofetch.
    */
   async sendBatch(events) {
-    await $fetch("/api/v1/events/batch", {
+    await $fetch(this.config.batchEndpoint, {
       baseURL: this.config.apiUrl,
       method: "POST",
       body: { events }

package/dist/runtime/config.js

@@ -4,11 +4,13 @@ export const DEFAULT_MAX_QUEUE_SIZE = 1e3;
 export const DEFAULT_MAX_RETRIES = 3;
 export const DEFAULT_RETRY_DELAY = 1e3;
 export const DEFAULT_RETRY_BACKOFF_MULTIPLIER = 2;
+export const DEFAULT_BATCH_ENDPOINT = "/api/v1/events/batch";
 export const OVERFLOW_WARNING_DEBOUNCE_MS = 6e4;
 export function resolveConfig(config) {
   return {
     apiUrl: config.apiUrl,
     source: config.source,
+    batchEndpoint: config.batchEndpoint ?? DEFAULT_BATCH_ENDPOINT,
     flushInterval: config.flushInterval ?? DEFAULT_FLUSH_INTERVAL,
     flushSize: config.flushSize ?? DEFAULT_FLUSH_SIZE,
     maxQueueSize: config.maxQueueSize ?? DEFAULT_MAX_QUEUE_SIZE,

package/dist/runtime/plugin.client.js

@@ -37,7 +37,8 @@ export default defineNuxtPlugin(() => {
     client = getInstance();
   } catch {
     client = init({
-      apiUrl: "/api/_analytics",
+      apiUrl: "",
+      batchEndpoint: "/api/_analytics",
       source: publicConfig.source,
       flushInterval: 1e4,
       flushSize: 5
@@ -55,8 +56,9 @@ export default defineNuxtPlugin(() => {
       screen_height: window.screen.height,
       timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
       language: navigator.language,
-      correlation_id: correlationId,
       session_id: sessionId
+    }, {
+      correlation_id: correlationId
     });
     isFirstPageView = false;
   }
@@ -71,8 +73,9 @@ export default defineNuxtPlugin(() => {
         query: to.query,
         title: typeof document !== "undefined" ? document.title : void 0,
         from_path: from.path,
-        correlation_id: getCorrelationId(),
         session_id: sessionId
+      }, {
+        correlation_id: getCorrelationId()
       });
     });
   }
@@ -84,10 +87,11 @@ export default defineNuxtPlugin(() => {
         path: window.location.pathname,
         duration_ms: durationMs,
         scroll_depth_pct: getScrollDepthPct(),
-        correlation_id: getCorrelationId(),
         session_id: sessionId
+      }, {
+        correlation_id: getCorrelationId()
       });
-      navigator.sendBeacon("/api/_analytics", payload);
+      navigator.sendBeacon(client.batchEndpointUrl, payload);
     });
   }
   return {

package/dist/runtime/server/api/_analytics.post.js

@@ -33,19 +33,22 @@ export default defineEventHandler(async (event) => {
   const acceptLanguage = getRequestHeader(event, "accept-language");
   const origin = getRequestHeader(event, "origin");
   const correlationId = getRequestHeader(event, "x-correlation-id");
-  const enrichedEvents = body.events.map((evt) => ({
-    ...evt,
-    source: evt.source || analyticsConfig.source,
-    client_ip: clientIp,
-    user_agent: userAgent,
-    referer,
-    accept_language: acceptLanguage,
-    metadata: {
-      ...evt.metadata,
-      origin,
-      correlation_id: correlationId ?? evt.metadata?.correlation_id
-    }
-  }));
+  const enrichedEvents = body.events.map((evt) => {
+    const { correlation_id: metadataCorrelationId, ...restMetadata } = evt.metadata ?? {};
+    return {
+      ...evt,
+      source: evt.source || analyticsConfig.source,
+      correlation_id: correlationId ?? evt.correlation_id ?? metadataCorrelationId,
+      client_ip: clientIp,
+      user_agent: userAgent,
+      referer,
+      accept_language: acceptLanguage,
+      metadata: {
+        ...restMetadata,
+        origin
+      }
+    };
+  });
   try {
     const response = await $fetch("/api/v1/events/batch", {
       baseURL: analyticsConfig.apiUrl,

package/dist/runtime/server/middleware/page-visit.js

@@ -1,5 +1,5 @@
 import { defineEventHandler, getRequestHeader, setResponseHeader, useRuntimeConfig, getRequestURL } from "#imports";
-import { getInstance } from "../../client.js";
+import { getInstance, init } from "../../client.js";
 const EXCLUDED_PREFIXES = ["/api/", "/_nuxt/", "/__nuxt_error"];
 const EXCLUDED_EXACT = ["/favicon.ico", "/_health", "/healthz"];
 function extractClientIp(event) {
@@ -43,6 +43,7 @@ export default defineEventHandler((event) => {
   }
   const correlationId = generateCorrelationId();
   setResponseHeader(event, "X-Correlation-Id", correlationId);
+  event.context.correlationId = correlationId;
   const clientIp = extractClientIp(event);
   const userAgent = getRequestHeader(event, "user-agent");
   const referer = getRequestHeader(event, "referer");
@@ -51,16 +52,32 @@ export default defineEventHandler((event) => {
   url.searchParams.forEach((value, key) => {
     query[key] = value;
   });
+  let client;
+  try {
+    client = getInstance();
+  } catch {
+    try {
+      const analyticsApiConfig = config.analytics;
+      client = init({
+        apiUrl: analyticsApiConfig.apiUrl,
+        source: analyticsApiConfig.source,
+        flushInterval: 5e3,
+        flushSize: 20
+      });
+    } catch {
+      return;
+    }
+  }
   try {
-    const client = getInstance();
     client.track("page.visit", {
       path,
-      query: Object.keys(query).length > 0 ? query : void 0,
-      correlation_id: correlationId,
+      query: Object.keys(query).length > 0 ? query : void 0
+    }, {
       client_ip: clientIp,
       user_agent: userAgent,
       referer,
-      accept_language: acceptLanguage
+      accept_language: acceptLanguage,
+      correlation_id: correlationId
     });
   } catch {
   }

package/dist/runtime/server/plugins/correlation-meta.js

@@ -0,0 +1,9 @@
+import { defineNitroPlugin } from "#imports";
+export default defineNitroPlugin((nitroApp) => {
+  nitroApp.hooks.hook("render:html", (html, { event }) => {
+    const correlationId = event.context.correlationId;
+    if (correlationId) {
+      html.head.push(`<meta name="x-correlation-id" content="${correlationId}">`);
+    }
+  });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neomanex/analytics-nuxt",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Nuxt module for analytics tracking with SSR middleware, browser plugin, and server proxy",
   "license": "UNLICENSED",
   "type": "module",