@nextlytics/core 0.3.0-canary.80 → 0.3.0

package/dist/index.d.ts

@@ -1,8 +1,8 @@
-export { Nextlytics } from './server.js';
-export { getNextlyticsProps } from './pages-router.js';
+export { Nextlytics, NextlyticsServer } from './server.js';
 export { NextlyticsClient, NextlyticsContext, useNextlytics } from './client.js';
+export { getNextlyticsProps } from './pages-router.js';
 export { loggingBackend } from './backends/logging.js';
-export { AnonymousUserResult, BackendConfigEntry, BackendWithConfig, ClientAction, ClientContext, ClientRequest, JavascriptTemplate, NextlyticsBackend, NextlyticsBackendFactory, NextlyticsClientContext, NextlyticsConfig, NextlyticsEvent, NextlyticsPlugin, NextlyticsPluginFactory, NextlyticsResult, NextlyticsServerSide, PageViewDelivery, PagesRouterContext, RequestContext, ServerEventContext, UserContext } from './types.js';
+export { AnonymousUserResult, BackendConfigEntry, BackendWithConfig, ClientContext, IngestPolicy, NextlyticsBackend, NextlyticsBackendFactory, NextlyticsConfig, NextlyticsEvent, NextlyticsPlugin, NextlyticsPluginFactory, NextlyticsResult, NextlyticsServerSide, RequestContext, ServerEventContext, UserContext } from './types.js';
 import 'react/jsx-runtime';
 import 'react';
 import 'next/dist/server/web/spec-extension/cookies';

package/dist/index.js

@@ -20,19 +20,21 @@ var index_exports = {};
 __export(index_exports, {
   Nextlytics: () => import_server.Nextlytics,
   NextlyticsClient: () => import_client.NextlyticsClient,
+  NextlyticsServer: () => import_server.NextlyticsServer,
   getNextlyticsProps: () => import_pages_router.getNextlyticsProps,
   loggingBackend: () => import_logging.loggingBackend,
   useNextlytics: () => import_client.useNextlytics
 });
 module.exports = __toCommonJS(index_exports);
 var import_server = require("./server");
-var import_pages_router = require("./pages-router");
 var import_client = require("./client");
+var import_pages_router = require("./pages-router");
 var import_logging = require("./backends/logging");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Nextlytics,
   NextlyticsClient,
+  NextlyticsServer,
   getNextlyticsProps,
   loggingBackend,
   useNextlytics

package/dist/middleware.d.ts

@@ -1,9 +1,10 @@
 import { NextMiddleware } from 'next/server';
+import { NextlyticsEvent, RequestContext, IngestPolicy, DispatchResult } from './types.js';
 import { NextlyticsConfigWithDefaults } from './config-helpers.js';
-import { DispatchEvent, UpdateEvent } from './api-handler.js';
-import './types.js';
 import 'next/dist/server/web/spec-extension/cookies';
 
+type DispatchEvent = (event: NextlyticsEvent, ctx: RequestContext, policyFilter?: IngestPolicy) => DispatchResult;
+type UpdateEvent = (eventId: string, patch: Partial<NextlyticsEvent>, ctx: RequestContext) => Promise<void>;
 declare function createNextlyticsMiddleware(config: NextlyticsConfigWithDefaults, dispatchEvent: DispatchEvent, updateEvent: UpdateEvent): NextMiddleware;
 
 export { createNextlyticsMiddleware };

package/dist/middleware.js

@@ -25,7 +25,29 @@ var import_server = require("next/server");
 var import_server_component_context = require("./server-component-context");
 var import_uitils = require("./uitils");
 var import_anonymous_user = require("./anonymous-user");
-var import_api_handler = require("./api-handler");
+function isBackendWithConfig(entry) {
+  return typeof entry === "object" && entry !== null && "backend" in entry;
+}
+function resolveBackends(config, ctx) {
+  const entries = config.backends || [];
+  return entries.map((entry) => {
+    if (isBackendWithConfig(entry)) {
+      const backend2 = typeof entry.backend === "function" ? entry.backend(ctx) : entry.backend;
+      return backend2 ? { backend: backend2, ingestPolicy: entry.ingestPolicy ?? "immediate" } : null;
+    }
+    const backend = typeof entry === "function" ? entry(ctx) : entry;
+    return backend ? { backend, ingestPolicy: "immediate" } : null;
+  }).filter((b) => b !== null);
+}
+function collectTemplates(backends) {
+  const templates = {};
+  for (const { backend } of backends) {
+    if (backend.getClientSideTemplates) {
+      Object.assign(templates, backend.getClientSideTemplates());
+    }
+  }
+  return templates;
+}
 function createRequestContext(request) {
   return {
     headers: request.headers,
@@ -37,57 +59,29 @@ function createNextlyticsMiddleware(config, dispatchEvent, updateEvent) {
   return async (request) => {
     const pathname = request.nextUrl.pathname;
     const reqInfo = (0, import_uitils.getRequestInfo)(request);
-    const middlewareDebug = config.debug || process.env.NEXTLYTICS_MIDDLEWARE_DEBUG === "true";
-    if (middlewareDebug) {
-      const headers = request.headers;
-      const debugHeaders = {};
-      headers.forEach((value, key) => {
-        debugHeaders[key] = value;
-      });
-      console.log("[Nextlytics][middleware]", {
-        url: request.url,
-        pathname,
-        search: request.nextUrl.search,
-        method: request.method,
-        nextVersion: (0, import_uitils.getNextVersion)(),
-        destination: request.destination,
-        referrer: request.referrer,
-        mode: request.mode,
-        cache: request.cache,
-        redirect: request.redirect,
-        integrity: request.integrity,
-        isPrefetch: reqInfo.isPrefetch,
-        isRsc: reqInfo.isRsc,
-        isPageNavigation: reqInfo.isPageNavigation,
-        isStaticFile: reqInfo.isStaticFile,
-        isNextjsInternal: reqInfo.isNextjsInternal,
-        headers: debugHeaders
-      });
-    }
     if (pathname === eventEndpoint) {
       if (request.method === "POST") {
-        return (0, import_api_handler.handleEventPost)(request, config, dispatchEvent, updateEvent);
+        return handleEventPost(request, config, dispatchEvent, updateEvent);
       }
       return Response.json({ error: "Method not allowed" }, { status: 405 });
     }
     if (reqInfo.isNextjsInternal || reqInfo.isPrefetch || reqInfo.isStaticFile) {
       return import_server.NextResponse.next();
     }
-    if (!reqInfo.isPageNavigation && !config.isApiPath(pathname)) {
-      return import_server.NextResponse.next();
-    }
     const pageRenderId = (0, import_uitils.generateId)();
     const serverContext = (0, import_uitils.createServerContext)(request);
     const response = import_server.NextResponse.next();
     const ctx = createRequestContext(request);
-    response.cookies.set(import_server_component_context.LAST_PAGE_RENDER_ID_COOKIE, pageRenderId, { path: "/" });
     const { anonId } = await (0, import_anonymous_user.resolveAnonymousUser)({ ctx, serverContext, config, response });
+    const backends = resolveBackends(config, ctx);
+    const templates = collectTemplates(backends);
     if (config.excludePaths?.(pathname)) {
       (0, import_server_component_context.serializeServerComponentContext)(response, {
         pageRenderId,
         pathname: request.nextUrl.pathname,
         search: request.nextUrl.search,
-        scripts: []
+        scripts: [],
+        templates
       });
       return response;
     }
@@ -97,11 +91,12 @@ function createNextlyticsMiddleware(config, dispatchEvent, updateEvent) {
         pageRenderId,
         pathname: request.nextUrl.pathname,
         search: request.nextUrl.search,
-        scripts: []
+        scripts: [],
+        templates
       });
       return response;
     }
-    const userContext = await (0, import_api_handler.getUserContext)(config, ctx);
+    const userContext = await getUserContext(config, ctx);
     const pageViewEvent = createPageViewEvent(
       pageRenderId,
       serverContext,
@@ -109,7 +104,7 @@ function createNextlyticsMiddleware(config, dispatchEvent, updateEvent) {
       userContext,
       anonId
     );
-    const { clientActions, completion } = dispatchEvent(pageViewEvent, ctx, "on-request");
+    const { clientActions, completion } = dispatchEvent(pageViewEvent, ctx, "immediate");
     const actions = await clientActions;
     const scripts = actions.items.filter(
       (i) => i.type === "script-template"
@@ -119,7 +114,8 @@ function createNextlyticsMiddleware(config, dispatchEvent, updateEvent) {
       pageRenderId,
       pathname: request.nextUrl.pathname,
       search: request.nextUrl.search,
-      scripts
+      scripts,
+      templates
     });
     return response;
   };
@@ -127,7 +123,6 @@ function createNextlyticsMiddleware(config, dispatchEvent, updateEvent) {
 function createPageViewEvent(pageRenderId, serverContext, isApiPath, userContext, anonymousUserId) {
   const eventType = isApiPath ? "apiCall" : "pageView";
   return {
-    origin: "server",
     collectedAt: serverContext.collectedAt.toISOString(),
     eventId: pageRenderId,
     type: eventType,
@@ -137,6 +132,99 @@ function createPageViewEvent(pageRenderId, serverContext, isApiPath, userContext
     properties: {}
   };
 }
+async function getUserContext(config, ctx) {
+  if (!config.callbacks.getUser) return void 0;
+  try {
+    return await config.callbacks.getUser(ctx) || void 0;
+  } catch {
+    return void 0;
+  }
+}
+function reconstructServerContext(apiCallContext, clientInit) {
+  const searchParams = {};
+  if (clientInit.search) {
+    const params = new URLSearchParams(clientInit.search);
+    params.forEach((value, key) => {
+      if (!searchParams[key]) searchParams[key] = [];
+      searchParams[key].push(value);
+    });
+  }
+  return {
+    ...apiCallContext,
+    // Override with client-provided values
+    host: clientInit.host || apiCallContext.host,
+    path: clientInit.path || apiCallContext.path,
+    search: Object.keys(searchParams).length > 0 ? searchParams : apiCallContext.search,
+    method: "GET"
+    // Page loads are always GET
+  };
+}
+async function handleEventPost(request, config, dispatchEvent, updateEvent) {
+  const pageRenderId = request.headers.get(import_server_component_context.headers.pageRenderId);
+  if (!pageRenderId) {
+    return Response.json({ error: "Missing page render ID" }, { status: 400 });
+  }
+  let body;
+  try {
+    body = await request.json();
+  } catch {
+    return Response.json({ error: "Invalid JSON" }, { status: 400 });
+  }
+  const { type, payload } = body;
+  const ctx = createRequestContext(request);
+  const apiCallServerContext = (0, import_uitils.createServerContext)(request);
+  const userContext = await getUserContext(config, ctx);
+  if (type === "client-init") {
+    const clientContext = payload;
+    const serverContext = reconstructServerContext(apiCallServerContext, clientContext);
+    const { anonId: anonymousUserId } = await (0, import_anonymous_user.resolveAnonymousUser)({
+      ctx,
+      serverContext,
+      config
+    });
+    const event = {
+      eventId: pageRenderId,
+      type: "pageView",
+      collectedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      anonymousUserId,
+      serverContext,
+      clientContext,
+      userContext,
+      properties: {}
+    };
+    const { clientActions, completion } = dispatchEvent(event, ctx, "on-client-event");
+    const actions = await clientActions;
+    (0, import_server.after)(() => completion);
+    (0, import_server.after)(() => updateEvent(pageRenderId, { clientContext, userContext, anonymousUserId }, ctx));
+    const scripts = actions.items.filter((i) => i.type === "script-template");
+    return Response.json({ ok: true, scripts: scripts.length > 0 ? scripts : void 0 });
+  } else if (type === "client-event") {
+    const clientContext = payload.clientContext || void 0;
+    const serverContext = clientContext ? reconstructServerContext(apiCallServerContext, clientContext) : apiCallServerContext;
+    const { anonId: anonymousUserId } = await (0, import_anonymous_user.resolveAnonymousUser)({
+      ctx,
+      serverContext,
+      config
+    });
+    const event = {
+      eventId: (0, import_uitils.generateId)(),
+      parentEventId: pageRenderId,
+      type: payload.name || type,
+      collectedAt: payload.collectedAt || (/* @__PURE__ */ new Date()).toISOString(),
+      anonymousUserId,
+      serverContext,
+      clientContext,
+      userContext,
+      properties: payload.props || {}
+    };
+    const { clientActions, completion } = dispatchEvent(event, ctx);
+    const actions = await clientActions;
+    (0, import_server.after)(() => completion);
+    const scripts = actions.items.filter((i) => i.type === "script-template");
+    return Response.json({ ok: true, scripts: scripts.length > 0 ? scripts : void 0 });
+  }
+  return Response.json({ ok: true });
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createNextlyticsMiddleware

package/dist/pages-router.d.ts

@@ -5,16 +5,41 @@ import './types.js';
 import 'next/dist/server/web/spec-extension/cookies';
 import 'next/server';
 
-type PagesRouterContext = {
+type ContextWithHeaders = {
     req: {
         headers: Record<string, string | string[] | undefined>;
-        cookies?: Record<string, string>;
     };
 };
 /**
- * Get Nextlytics props for Pages Router _app.tsx.
- * Reads context from headers set by middleware.
+ * Extract Nextlytics context from Pages Router context (getServerSideProps or getInitialProps).
+ * Use this in _app.tsx with getInitialProps to pass context to NextlyticsClient.
+ *
+ * @example
+ * ```tsx
+ * // pages/_app.tsx
+ * import type { AppContext, AppProps } from 'next/app'
+ * import { NextlyticsClient, getNextlyticsProps, type NextlyticsContext } from '@nextlytics/core'
+ *
+ * type MyAppProps = AppProps & { nextlyticsCtx: NextlyticsContext }
+ *
+ * function MyApp({ Component, pageProps, nextlyticsCtx }: MyAppProps) {
+ *   return (
+ *     <NextlyticsClient ctx={nextlyticsCtx}>
+ *       <Component {...pageProps} />
+ *     </NextlyticsClient>
+ *   )
+ * }
+ *
+ * MyApp.getInitialProps = async (appContext: AppContext) => {
+ *   return {
+ *     pageProps: appContext.Component.getInitialProps
+ *       ? await appContext.Component.getInitialProps(appContext.ctx)
+ *       : {},
+ *     nextlyticsCtx: getNextlyticsProps(appContext.ctx),
+ *   }
+ * }
+ * ```
  */
-declare function getNextlyticsProps(ctx: PagesRouterContext): NextlyticsContext;
+declare function getNextlyticsProps(ctx: ContextWithHeaders): NextlyticsContext;
 
-export { type PagesRouterContext, getNextlyticsProps };
+export { getNextlyticsProps };

package/dist/pages-router.js

@@ -35,7 +35,8 @@ function getNextlyticsProps(ctx) {
   }
   return {
     requestId: context.pageRenderId,
-    scripts: context.scripts
+    scripts: context.scripts,
+    templates: context.templates
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/server-component-context.d.ts

@@ -1,15 +1,14 @@
 import { NextResponse } from 'next/server';
-import { TemplatizedScriptInsertion } from './types.js';
+import { TemplatizedScriptInsertion, JavascriptTemplate } from './types.js';
 import 'next/dist/server/web/spec-extension/cookies';
 
-declare const headerNames: {
-    readonly pathname: "x-nl-pathname";
-    readonly search: "x-nl-search";
-    readonly pageRenderId: "x-nl-page-render-id";
-    readonly isSoftNavigation: "x-nl-is-soft-nav";
-    readonly scripts: "x-nl-scripts";
+declare const headerKeys: {
+    readonly pathname: "x-nc-pathname";
+    readonly search: "x-nc-search";
+    readonly pageRenderId: "x-nc-page-render-id";
+    readonly scripts: "x-nc-scripts";
+    readonly templates: "x-nc-templates";
 };
-declare const LAST_PAGE_RENDER_ID_COOKIE = "last-page-render-id";
 /** Context passed from middleware to server components via headers */
 type ServerComponentContext = {
     /** Unique page render ID (event ID) */
@@ -18,12 +17,14 @@ type ServerComponentContext = {
     pathname: string;
     /** Query string */
     search: string;
-    /** Script actions to execute on client (params only, templates come from config) */
+    /** Script actions to execute on client */
     scripts: TemplatizedScriptInsertion<unknown>[];
+    /** Template definitions for scripts */
+    templates: Record<string, JavascriptTemplate>;
 };
 /** Serialize context to response headers (called in middleware) */
 declare function serializeServerComponentContext(response: NextResponse, ctx: ServerComponentContext): void;
 /** Restore context from request headers (called in server components) */
 declare function restoreServerComponentContext(headersList: Headers): ServerComponentContext | null;
 
-export { LAST_PAGE_RENDER_ID_COOKIE, type ServerComponentContext, headerNames, restoreServerComponentContext, serializeServerComponentContext };
+export { type ServerComponentContext, headerKeys as headers, restoreServerComponentContext, serializeServerComponentContext };

package/dist/server-component-context.js

@@ -18,31 +18,32 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var server_component_context_exports = {};
 __export(server_component_context_exports, {
-  LAST_PAGE_RENDER_ID_COOKIE: () => LAST_PAGE_RENDER_ID_COOKIE,
-  headerNames: () => headerNames,
+  headers: () => headerKeys,
   restoreServerComponentContext: () => restoreServerComponentContext,
   serializeServerComponentContext: () => serializeServerComponentContext
 });
 module.exports = __toCommonJS(server_component_context_exports);
-const HEADER_PREFIX = "x-nl-";
-const headerNames = {
+const HEADER_PREFIX = "x-nc-";
+const headerKeys = {
   pathname: `${HEADER_PREFIX}pathname`,
   search: `${HEADER_PREFIX}search`,
   pageRenderId: `${HEADER_PREFIX}page-render-id`,
-  isSoftNavigation: `${HEADER_PREFIX}is-soft-nav`,
-  scripts: `${HEADER_PREFIX}scripts`
+  scripts: `${HEADER_PREFIX}scripts`,
+  templates: `${HEADER_PREFIX}templates`
 };
-const LAST_PAGE_RENDER_ID_COOKIE = "last-page-render-id";
 function serializeServerComponentContext(response, ctx) {
-  response.headers.set(headerNames.pageRenderId, ctx.pageRenderId);
-  response.headers.set(headerNames.pathname, ctx.pathname);
-  response.headers.set(headerNames.search, ctx.search);
+  response.headers.set(headerKeys.pageRenderId, ctx.pageRenderId);
+  response.headers.set(headerKeys.pathname, ctx.pathname);
+  response.headers.set(headerKeys.search, ctx.search);
   if (ctx.scripts.length > 0) {
     const scriptParts = ctx.scripts.filter((item) => item.type === "script-template").map((s) => `${s.templateId}=${JSON.stringify(s.params)}`);
     if (scriptParts.length > 0) {
-      response.headers.set(headerNames.scripts, scriptParts.join(";"));
+      response.headers.set(headerKeys.scripts, scriptParts.join(";"));
     }
   }
+  if (Object.keys(ctx.templates).length > 0) {
+    response.headers.set(headerKeys.templates, JSON.stringify(ctx.templates));
+  }
 }
 function parseScriptsHeader(header) {
   const scripts = [];
@@ -61,25 +62,34 @@ function parseScriptsHeader(header) {
   return scripts;
 }
 function restoreServerComponentContext(headersList) {
-  const pageRenderId = headersList.get(headerNames.pageRenderId);
+  const pageRenderId = headersList.get(headerKeys.pageRenderId);
   if (!pageRenderId) {
     return null;
   }
-  const pathname = headersList.get(headerNames.pathname) || "";
-  const search = headersList.get(headerNames.search) || "";
-  const scriptsHeader = headersList.get(headerNames.scripts);
+  const pathname = headersList.get(headerKeys.pathname) || "";
+  const search = headersList.get(headerKeys.search) || "";
+  const scriptsHeader = headersList.get(headerKeys.scripts);
   const scripts = scriptsHeader ? parseScriptsHeader(scriptsHeader) : [];
+  let templates = {};
+  const templatesHeader = headersList.get(headerKeys.templates);
+  if (templatesHeader) {
+    try {
+      templates = JSON.parse(templatesHeader);
+    } catch {
+      console.warn("[Nextlytics] Failed to parse templates header");
+    }
+  }
   return {
     pageRenderId,
     pathname,
     search,
-    scripts
+    scripts,
+    templates
   };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  LAST_PAGE_RENDER_ID_COOKIE,
-  headerNames,
+  headers,
   restoreServerComponentContext,
   serializeServerComponentContext
 });

package/dist/server.d.ts

@@ -1,8 +1,13 @@
+import * as react_jsx_runtime from 'react/jsx-runtime';
+import { ReactNode } from 'react';
 import { NextlyticsConfig, NextlyticsResult, RequestContext } from './types.js';
 import 'next/dist/server/web/spec-extension/cookies';
 import 'next/server';
 
 declare function createRequestContext(): Promise<RequestContext>;
+declare function NextlyticsServer({ children }: {
+    children: ReactNode;
+}): Promise<react_jsx_runtime.JSX.Element>;
 declare function Nextlytics(userConfig: NextlyticsConfig): NextlyticsResult;
 
-export { Nextlytics, createRequestContext };
+export { Nextlytics, NextlyticsServer, createRequestContext };

package/dist/server.js

@@ -19,6 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var server_exports = {};
 __export(server_exports, {
   Nextlytics: () => Nextlytics,
+  NextlyticsServer: () => NextlyticsServer,
   createRequestContext: () => createRequestContext
 });
 module.exports = __toCommonJS(server_exports);
@@ -28,6 +29,7 @@ var import_headers2 = require("./headers");
 var import_server_component_context = require("./server-component-context");
 var import_anonymous_user = require("./anonymous-user");
 var import_client = require("./client");
+var import_handlers = require("./handlers");
 var import_config_helpers = require("./config-helpers");
 var import_middleware = require("./middleware");
 var import_uitils = require("./uitils");
@@ -39,17 +41,11 @@ function resolveBackends(config, ctx, policyFilter) {
   return entries.map((entry) => {
     if (isBackendWithConfig(entry)) {
       const backend2 = typeof entry.backend === "function" ? entry.backend(ctx) : entry.backend;
-      return backend2 ? { backend: backend2, pageViewDelivery: entry.pageViewDelivery ?? "on-request" } : null;
+      return backend2 ? { backend: backend2, ingestPolicy: entry.ingestPolicy ?? "immediate" } : null;
     }
     const backend = typeof entry === "function" ? entry(ctx) : entry;
-    return backend ? { backend, pageViewDelivery: "on-request" } : null;
-  }).filter((b) => b !== null).filter((b) => {
-    if (!policyFilter) return true;
-    if (policyFilter === "client-actions") {
-      return b.pageViewDelivery === "on-page-load" || b.backend.returnsClientActions;
-    }
-    return b.pageViewDelivery === policyFilter;
-  });
+    return backend ? { backend, ingestPolicy: "immediate" } : null;
+  }).filter((b) => b !== null).filter((b) => !policyFilter || b.ingestPolicy === policyFilter);
 }
 function resolvePlugins(config, ctx) {
   const plugins = config.plugins || [];
@@ -79,15 +75,16 @@ async function createRequestContext() {
     headers: _headers
   };
 }
-function collectTemplates(config, ctx) {
-  const templates = {};
-  const backends = resolveBackends(config, ctx);
-  for (const { backend } of backends) {
-    if (backend.getClientSideTemplates) {
-      Object.assign(templates, backend.getClientSideTemplates());
-    }
+async function NextlyticsServer({ children }) {
+  const headersList = await (0, import_headers.headers)();
+  const ctx = (0, import_server_component_context.restoreServerComponentContext)(headersList);
+  if (!ctx) {
+    console.warn(
+      "[Nextlytics] nextlyticsMiddleware should be added in order for NextlyticsServer to work"
+    );
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children });
   }
-  return templates;
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_client.NextlyticsClient, { requestId: ctx.pageRenderId, scripts: ctx.scripts, templates: ctx.templates, children });
 }
 function Nextlytics(userConfig) {
   const config = (0, import_config_helpers.withDefaults)(userConfig);
@@ -139,7 +136,7 @@ function Nextlytics(userConfig) {
     return { clientActions, completion };
   };
   const updateEventInternal = async (eventId, patch, ctx) => {
-    const resolved = resolveBackends(config, ctx, "on-request").filter(
+    const resolved = resolveBackends(config, ctx, "immediate").filter(
       ({ backend }) => backend.supportsUpdates
     );
     const results = await Promise.all(
@@ -173,21 +170,11 @@ function Nextlytics(userConfig) {
     return updateEventInternal(eventId, patch, ctx);
   };
   const middleware = (0, import_middleware.createNextlyticsMiddleware)(config, dispatchEventInternal, updateEventInternal);
-  async function Server({ children }) {
-    const headersList = await (0, import_headers.headers)();
-    const ctx = (0, import_server_component_context.restoreServerComponentContext)(headersList);
-    if (!ctx) {
-      console.warn("[Nextlytics] nextlyticsMiddleware should be added in order for Server to work");
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children });
-    }
-    const requestCtx = await createRequestContext();
-    const templates = collectTemplates(config, requestCtx);
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_client.NextlyticsClient, { ctx: { requestId: ctx.pageRenderId, scripts: ctx.scripts, templates }, children });
-  }
+  const handlers = (0, import_handlers.createHandlers)();
   const analytics = async () => {
     const headersList = await (0, import_headers.headers)();
     const cookieStore = await (0, import_headers.cookies)();
-    const pageRenderId = headersList.get(import_server_component_context.headerNames.pageRenderId);
+    const pageRenderId = headersList.get(import_server_component_context.headers.pageRenderId);
     const serverContext = createServerContextFromHeaders(headersList);
     const ctx = { headers: headersList, cookies: cookieStore };
     const { anonId: anonymousUserId } = await (0, import_anonymous_user.resolveAnonymousUser)({ ctx, serverContext, config });
@@ -205,7 +192,6 @@ function Nextlytics(userConfig) {
           return { ok: false };
         }
         const event = {
-          origin: "server",
           eventId: (0, import_uitils.generateId)(),
           parentEventId: pageRenderId,
           type: eventName,
@@ -220,13 +206,7 @@ function Nextlytics(userConfig) {
       }
     };
   };
-  return {
-    middleware,
-    analytics,
-    dispatchEvent,
-    updateEvent,
-    NextlyticsServer: Server
-  };
+  return { middleware, handlers, analytics, dispatchEvent, updateEvent };
 }
 function createServerContextFromHeaders(headersList) {
   const rawHeaders = {};
@@ -234,8 +214,8 @@ function createServerContextFromHeaders(headersList) {
     rawHeaders[key] = value;
   });
   const requestHeaders = (0, import_headers2.removeSensitiveHeaders)(rawHeaders);
-  const pathname = headersList.get(import_server_component_context.headerNames.pathname) || "";
-  const search = headersList.get(import_server_component_context.headerNames.search) || "";
+  const pathname = headersList.get(import_server_component_context.headers.pathname) || "";
+  const search = headersList.get(import_server_component_context.headers.search) || "";
   const searchParams = {};
   if (search) {
     const params = new URLSearchParams(search);
@@ -260,5 +240,6 @@ function createServerContextFromHeaders(headersList) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Nextlytics,
+  NextlyticsServer,
   createRequestContext
 });