posthog-node 5.30.7 → 5.31.0

package/dist/extensions/express.d.ts

@@ -10,6 +10,9 @@ interface MiddlewareError extends Error {
         statusCode?: number | string;
     };
 }
+export declare function setupExpressRequestContext(_posthog: PostHogBackendClient, app: {
+    use: (middleware: ExpressMiddleware) => unknown;
+}): void;
 export declare function setupExpressErrorHandler(_posthog: PostHogBackendClient, app: {
     use: (middleware: ExpressMiddleware | ExpressErrorMiddleware) => unknown;
 }): void;

package/dist/extensions/express.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"express.d.ts","sourceRoot":"","sources":["../../src/extensions/express.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAA;AAEhD,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAEhD,KAAK,iBAAiB,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,IAAI,KAAK,IAAI,CAAA;AAEhF,KAAK,sBAAsB,GAAG,CAC5B,KAAK,EAAE,eAAe,EACtB,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,KACnC,IAAI,CAAA;AAET,UAAU,eAAgB,SAAQ,KAAK;IACrC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACxB,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAC5B,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAC7B,MAAM,CAAC,EAAE;QACP,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAC7B,CAAA;CACF;AAED,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,oBAAoB,EAC9B,GAAG,EAAE;IACH,GAAG,EAAE,CAAC,UAAU,EAAE,iBAAiB,GAAG,sBAAsB,KAAK,OAAO,CAAA;CACzE,GACA,IAAI,CAEN"}
+{"version":3,"file":"express.d.ts","sourceRoot":"","sources":["../../src/extensions/express.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAA;AAGhD,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAGhD,KAAK,iBAAiB,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,IAAI,KAAK,IAAI,CAAA;AAEhF,KAAK,sBAAsB,GAAG,CAC5B,KAAK,EAAE,eAAe,EACtB,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,KACnC,IAAI,CAAA;AAET,UAAU,eAAgB,SAAQ,KAAK;IACrC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACxB,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAC5B,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAC7B,MAAM,CAAC,EAAE;QACP,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAC7B,CAAA;CACF;AA4BD,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,oBAAoB,EAC9B,GAAG,EAAE;IACH,GAAG,EAAE,CAAC,UAAU,EAAE,iBAAiB,KAAK,OAAO,CAAA;CAChD,GACA,IAAI,CAEN;AAQD,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,oBAAoB,EAC9B,GAAG,EAAE;IACH,GAAG,EAAE,CAAC,UAAU,EAAE,iBAAiB,GAAG,sBAAsB,KAAK,OAAO,CAAA;CACzE,GACA,IAAI,CAEN"}

package/dist/extensions/express.js

@@ -33,18 +33,53 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
+    setupExpressRequestContext: ()=>setupExpressRequestContext,
     setupExpressErrorHandler: ()=>setupExpressErrorHandler
 });
 const index_js_namespaceObject = require("./error-tracking/index.js");
 var index_js_default = /*#__PURE__*/ __webpack_require__.n(index_js_namespaceObject);
+const external_tracing_headers_js_namespaceObject = require("./tracing-headers.js");
+function getClientIp(req) {
+    const forwarded = (0, external_tracing_headers_js_namespaceObject.getFirstHeaderValue)(req.headers['x-forwarded-for']);
+    if (forwarded) {
+        const ip = forwarded.split(',')[0].trim();
+        if (ip) return ip;
+    }
+    return req.socket?.remoteAddress;
+}
+function buildRequestContextData(req) {
+    const { sessionId, distinctId } = (0, external_tracing_headers_js_namespaceObject.getPostHogTracingHeaderValues)(req.headers);
+    const properties = {};
+    (0, external_tracing_headers_js_namespaceObject.addProperty)(properties, '$current_url', req.originalUrl || req.url);
+    (0, external_tracing_headers_js_namespaceObject.addProperty)(properties, '$request_method', req.method);
+    (0, external_tracing_headers_js_namespaceObject.addProperty)(properties, '$request_path', req.path);
+    (0, external_tracing_headers_js_namespaceObject.addProperty)(properties, '$user_agent', (0, external_tracing_headers_js_namespaceObject.getFirstHeaderValue)(req.headers['user-agent']));
+    (0, external_tracing_headers_js_namespaceObject.addProperty)(properties, '$ip', getClientIp(req));
+    return {
+        ...void 0 !== sessionId ? {
+            sessionId
+        } : {},
+        ...void 0 !== distinctId ? {
+            distinctId
+        } : {},
+        properties
+    };
+}
+function setupExpressRequestContext(_posthog, app) {
+    app.use(posthogRequestContext(_posthog));
+}
+function posthogRequestContext(posthog) {
+    return (req, _res, next)=>{
+        posthog.withContext(buildRequestContextData(req), ()=>next());
+    };
+}
 function setupExpressErrorHandler(_posthog, app) {
     app.use(posthogErrorHandler(_posthog));
 }
 function posthogErrorHandler(posthog) {
     return (error, req, res, next)=>{
         if (index_js_default().isPreviouslyCapturedError(error)) return void next(error);
-        const sessionId = req.headers['x-posthog-session-id'];
-        const distinctId = req.headers['x-posthog-distinct-id'];
+        const contextData = buildRequestContextData(req);
         const syntheticException = new Error('Synthetic exception');
         const hint = {
             mechanism: {
@@ -53,23 +88,24 @@ function posthogErrorHandler(posthog) {
             },
             syntheticException
         };
-        posthog.addPendingPromise(index_js_default().buildEventMessage(error, hint, distinctId, {
-            $session_id: sessionId,
-            $current_url: req.url,
-            $request_method: req.method,
-            $request_path: req.path,
-            $user_agent: req.headers['user-agent'],
-            $response_status_code: res.statusCode,
-            $ip: req.headers['x-forwarded-for'] || req?.socket?.remoteAddress
-        }).then((msg)=>{
+        const additionalProperties = {
+            ...void 0 !== contextData.sessionId ? {
+                $session_id: contextData.sessionId
+            } : {},
+            ...contextData.properties || {},
+            $response_status_code: res.statusCode
+        };
+        posthog.addPendingPromise(index_js_default().buildEventMessage(error, hint, contextData.distinctId, additionalProperties).then((msg)=>{
             posthog.capture(msg);
         }));
         next(error);
     };
 }
 exports.setupExpressErrorHandler = __webpack_exports__.setupExpressErrorHandler;
+exports.setupExpressRequestContext = __webpack_exports__.setupExpressRequestContext;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
-    "setupExpressErrorHandler"
+    "setupExpressErrorHandler",
+    "setupExpressRequestContext"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/extensions/express.mjs

@@ -1,12 +1,46 @@
 import error_tracking from "./error-tracking/index.mjs";
+import { addProperty, getFirstHeaderValue, getPostHogTracingHeaderValues } from "./tracing-headers.mjs";
+function getClientIp(req) {
+    const forwarded = getFirstHeaderValue(req.headers['x-forwarded-for']);
+    if (forwarded) {
+        const ip = forwarded.split(',')[0].trim();
+        if (ip) return ip;
+    }
+    return req.socket?.remoteAddress;
+}
+function buildRequestContextData(req) {
+    const { sessionId, distinctId } = getPostHogTracingHeaderValues(req.headers);
+    const properties = {};
+    addProperty(properties, '$current_url', req.originalUrl || req.url);
+    addProperty(properties, '$request_method', req.method);
+    addProperty(properties, '$request_path', req.path);
+    addProperty(properties, '$user_agent', getFirstHeaderValue(req.headers['user-agent']));
+    addProperty(properties, '$ip', getClientIp(req));
+    return {
+        ...void 0 !== sessionId ? {
+            sessionId
+        } : {},
+        ...void 0 !== distinctId ? {
+            distinctId
+        } : {},
+        properties
+    };
+}
+function setupExpressRequestContext(_posthog, app) {
+    app.use(posthogRequestContext(_posthog));
+}
+function posthogRequestContext(posthog) {
+    return (req, _res, next)=>{
+        posthog.withContext(buildRequestContextData(req), ()=>next());
+    };
+}
 function setupExpressErrorHandler(_posthog, app) {
     app.use(posthogErrorHandler(_posthog));
 }
 function posthogErrorHandler(posthog) {
     return (error, req, res, next)=>{
         if (error_tracking.isPreviouslyCapturedError(error)) return void next(error);
-        const sessionId = req.headers['x-posthog-session-id'];
-        const distinctId = req.headers['x-posthog-distinct-id'];
+        const contextData = buildRequestContextData(req);
         const syntheticException = new Error('Synthetic exception');
         const hint = {
             mechanism: {
@@ -15,18 +49,17 @@ function posthogErrorHandler(posthog) {
             },
             syntheticException
         };
-        posthog.addPendingPromise(error_tracking.buildEventMessage(error, hint, distinctId, {
-            $session_id: sessionId,
-            $current_url: req.url,
-            $request_method: req.method,
-            $request_path: req.path,
-            $user_agent: req.headers['user-agent'],
-            $response_status_code: res.statusCode,
-            $ip: req.headers['x-forwarded-for'] || req?.socket?.remoteAddress
-        }).then((msg)=>{
+        const additionalProperties = {
+            ...void 0 !== contextData.sessionId ? {
+                $session_id: contextData.sessionId
+            } : {},
+            ...contextData.properties || {},
+            $response_status_code: res.statusCode
+        };
+        posthog.addPendingPromise(error_tracking.buildEventMessage(error, hint, contextData.distinctId, additionalProperties).then((msg)=>{
             posthog.capture(msg);
         }));
         next(error);
     };
 }
-export { setupExpressErrorHandler };
+export { setupExpressErrorHandler, setupExpressRequestContext };

package/dist/extensions/nestjs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nestjs.d.ts","sourceRoot":"","sources":["../../src/extensions/nestjs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAc,MAAM,MAAM,CAAA;AAI7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAA;AAGhD,UAAU,iBAAiB;IACzB,UAAU,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,CAAA;IACxB,WAAW,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,CAAA;CAC1B;AAED,UAAU,gBAAgB;IACxB,YAAY,IAAI,iBAAiB,CAAA;CAClC;AAED,UAAU,WAAW,CAAC,CAAC,GAAG,GAAG;IAC3B,MAAM,IAAI,UAAU,CAAC,CAAC,CAAC,CAAA;CACxB;AAED,UAAU,eAAe,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,GAAG;IACxC,SAAS,CAAC,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;CAC1E;AAED,MAAM,WAAW,uBAAuB;IACtC,+GAA+G;IAC/G,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAC5B;AAED,MAAM,WAAW,yBAAyB;IACxC,mGAAmG;IACnG,iBAAiB,CAAC,EAAE,OAAO,GAAG,uBAAuB,CAAA;CACtD;AAwBD,qBAAa,kBAAmB,YAAW,eAAe;IACxD,OAAO,CAAC,OAAO,CAAsB;IACrC,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,kBAAkB,CAAQ;gBAEtB,OAAO,EAAE,oBAAoB,EAAE,OAAO,CAAC,EAAE,yBAAyB;IAO9E,SAAS,CAAC,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC;CAiDzE"}
+{"version":3,"file":"nestjs.d.ts","sourceRoot":"","sources":["../../src/extensions/nestjs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAc,MAAM,MAAM,CAAA;AAK7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAA;AAGhD,UAAU,iBAAiB;IACzB,UAAU,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,CAAA;IACxB,WAAW,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,CAAA;CAC1B;AAED,UAAU,gBAAgB;IACxB,YAAY,IAAI,iBAAiB,CAAA;CAClC;AAED,UAAU,WAAW,CAAC,CAAC,GAAG,GAAG;IAC3B,MAAM,IAAI,UAAU,CAAC,CAAC,CAAC,CAAA;CACxB;AAED,UAAU,eAAe,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,GAAG;IACxC,SAAS,CAAC,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;CAC1E;AAED,MAAM,WAAW,uBAAuB;IACtC,+GAA+G;IAC/G,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAC5B;AAED,MAAM,WAAW,yBAAyB;IACxC,mGAAmG;IACnG,iBAAiB,CAAC,EAAE,OAAO,GAAG,uBAAuB,CAAA;CACtD;AAwBD,qBAAa,kBAAmB,YAAW,eAAe;IACxD,OAAO,CAAC,OAAO,CAAsB;IACrC,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,kBAAkB,CAAQ;gBAEtB,OAAO,EAAE,oBAAoB,EAAE,OAAO,CAAC,EAAE,yBAAyB;IAO9E,SAAS,CAAC,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC;CA+CzE"}

package/dist/extensions/nestjs.js

@@ -39,10 +39,11 @@ const external_rxjs_namespaceObject = require("rxjs");
 const operators_namespaceObject = require("rxjs/operators");
 const index_js_namespaceObject = require("./error-tracking/index.js");
 var index_js_default = /*#__PURE__*/ __webpack_require__.n(index_js_namespaceObject);
+const external_tracing_headers_js_namespaceObject = require("./tracing-headers.js");
 function getClientIp(headers, request) {
-    const forwarded = headers['x-forwarded-for'];
+    const forwarded = (0, external_tracing_headers_js_namespaceObject.getFirstHeaderValue)(headers['x-forwarded-for']);
     if (forwarded) {
-        const ip = String(forwarded).split(',')[0].trim();
+        const ip = forwarded.split(',')[0].trim();
         if (ip) return ip;
     }
     return request?.socket?.remoteAddress;
@@ -65,20 +66,21 @@ class PostHogInterceptor {
         const request = httpHost.getRequest();
         const response = httpHost.getResponse();
         const headers = request?.headers ?? {};
-        const sessionId = headers['x-posthog-session-id'];
-        const windowId = headers['x-posthog-window-id'];
-        const distinctId = headers['x-posthog-distinct-id'];
+        const { sessionId, distinctId } = (0, external_tracing_headers_js_namespaceObject.getPostHogTracingHeaderValues)(headers);
+        const properties = {};
+        (0, external_tracing_headers_js_namespaceObject.addProperty)(properties, '$current_url', request?.url);
+        (0, external_tracing_headers_js_namespaceObject.addProperty)(properties, '$request_method', request?.method);
+        (0, external_tracing_headers_js_namespaceObject.addProperty)(properties, '$request_path', request?.path ?? request?.url);
+        (0, external_tracing_headers_js_namespaceObject.addProperty)(properties, '$user_agent', (0, external_tracing_headers_js_namespaceObject.getFirstHeaderValue)(headers['user-agent']));
+        (0, external_tracing_headers_js_namespaceObject.addProperty)(properties, '$ip', getClientIp(headers, request));
         const contextData = {
-            sessionId,
-            distinctId,
-            properties: {
-                $current_url: request?.url,
-                $request_method: request?.method,
-                $request_path: request?.path ?? request?.url,
-                $window_id: windowId,
-                $user_agent: headers['user-agent'],
-                $ip: getClientIp(headers, request)
-            }
+            ...void 0 !== sessionId ? {
+                sessionId
+            } : {},
+            ...void 0 !== distinctId ? {
+                distinctId
+            } : {},
+            properties
         };
         this.posthog.enterContext(contextData);
         let source = next.handle();

package/dist/extensions/nestjs.mjs

@@ -1,10 +1,11 @@
 import { throwError } from "rxjs";
 import { catchError } from "rxjs/operators";
 import error_tracking from "./error-tracking/index.mjs";
+import { addProperty, getFirstHeaderValue, getPostHogTracingHeaderValues } from "./tracing-headers.mjs";
 function getClientIp(headers, request) {
-    const forwarded = headers['x-forwarded-for'];
+    const forwarded = getFirstHeaderValue(headers['x-forwarded-for']);
     if (forwarded) {
-        const ip = String(forwarded).split(',')[0].trim();
+        const ip = forwarded.split(',')[0].trim();
         if (ip) return ip;
     }
     return request?.socket?.remoteAddress;
@@ -27,20 +28,21 @@ class PostHogInterceptor {
         const request = httpHost.getRequest();
         const response = httpHost.getResponse();
         const headers = request?.headers ?? {};
-        const sessionId = headers['x-posthog-session-id'];
-        const windowId = headers['x-posthog-window-id'];
-        const distinctId = headers['x-posthog-distinct-id'];
+        const { sessionId, distinctId } = getPostHogTracingHeaderValues(headers);
+        const properties = {};
+        addProperty(properties, '$current_url', request?.url);
+        addProperty(properties, '$request_method', request?.method);
+        addProperty(properties, '$request_path', request?.path ?? request?.url);
+        addProperty(properties, '$user_agent', getFirstHeaderValue(headers['user-agent']));
+        addProperty(properties, '$ip', getClientIp(headers, request));
         const contextData = {
-            sessionId,
-            distinctId,
-            properties: {
-                $current_url: request?.url,
-                $request_method: request?.method,
-                $request_path: request?.path ?? request?.url,
-                $window_id: windowId,
-                $user_agent: headers['user-agent'],
-                $ip: getClientIp(headers, request)
-            }
+            ...void 0 !== sessionId ? {
+                sessionId
+            } : {},
+            ...void 0 !== distinctId ? {
+                distinctId
+            } : {},
+            properties
         };
         this.posthog.enterContext(contextData);
         let source = next.handle();

package/dist/extensions/tracing-headers.d.ts

@@ -0,0 +1,16 @@
+import type { IncomingHttpHeaders } from 'node:http';
+type HeaderValue = IncomingHttpHeaders[string];
+export declare const POSTHOG_TRACING_HEADERS: {
+    readonly sessionId: "x-posthog-session-id";
+    readonly distinctId: "x-posthog-distinct-id";
+};
+export interface PostHogTracingHeaderValues {
+    sessionId?: string;
+    distinctId?: string;
+}
+export declare function addProperty(properties: Record<string, any>, key: string, value: unknown): void;
+export declare function getFirstHeaderValue(value: HeaderValue): string | undefined;
+export declare function sanitizeTracingHeaderValue(value: HeaderValue): string | undefined;
+export declare function getPostHogTracingHeaderValues(headers?: IncomingHttpHeaders): PostHogTracingHeaderValues;
+export {};
+//# sourceMappingURL=tracing-headers.d.ts.map

package/dist/extensions/tracing-headers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tracing-headers.d.ts","sourceRoot":"","sources":["../../src/extensions/tracing-headers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAA;AAOpD,KAAK,WAAW,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAA;AAE9C,eAAO,MAAM,uBAAuB;;;CAG1B,CAAA;AAEV,MAAM,WAAW,0BAA0B;IACzC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAED,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAI9F;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,CAE1E;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,CAqBjF;AAED,wBAAgB,6BAA6B,CAAC,OAAO,CAAC,EAAE,mBAAmB,GAAG,0BAA0B,CAYvG"}

package/dist/extensions/tracing-headers.js

@@ -0,0 +1,85 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ('undefined' != typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    POSTHOG_TRACING_HEADERS: ()=>POSTHOG_TRACING_HEADERS,
+    addProperty: ()=>addProperty,
+    getFirstHeaderValue: ()=>getFirstHeaderValue,
+    getPostHogTracingHeaderValues: ()=>getPostHogTracingHeaderValues,
+    sanitizeTracingHeaderValue: ()=>sanitizeTracingHeaderValue
+});
+const TRACING_HEADER_MAX_LENGTH = 1000;
+const TRACING_HEADER_CONTROL_CHARS_REGEX = /[\x00-\x1f\x7f-\x9f]/g;
+const POSTHOG_TRACING_HEADERS = {
+    sessionId: 'x-posthog-session-id',
+    distinctId: 'x-posthog-distinct-id'
+};
+function addProperty(properties, key, value) {
+    if (null != value && '' !== value) properties[key] = value;
+}
+function getFirstHeaderValue(value) {
+    return Array.isArray(value) ? value[0] : value;
+}
+function sanitizeTracingHeaderValue(value) {
+    if (Array.isArray(value)) {
+        for (const item of value){
+            const sanitized = sanitizeTracingHeaderValue(item);
+            if (void 0 !== sanitized) return sanitized;
+        }
+        return;
+    }
+    if ('string' != typeof value) return;
+    const sanitized = value.replace(TRACING_HEADER_CONTROL_CHARS_REGEX, '').trim();
+    if (!sanitized) return;
+    return sanitized.length > TRACING_HEADER_MAX_LENGTH ? sanitized.slice(0, TRACING_HEADER_MAX_LENGTH) : sanitized;
+}
+function getPostHogTracingHeaderValues(headers) {
+    if (!headers) return {};
+    const sessionId = sanitizeTracingHeaderValue(headers[POSTHOG_TRACING_HEADERS.sessionId]);
+    const distinctId = sanitizeTracingHeaderValue(headers[POSTHOG_TRACING_HEADERS.distinctId]);
+    return {
+        ...void 0 !== sessionId ? {
+            sessionId
+        } : {},
+        ...void 0 !== distinctId ? {
+            distinctId
+        } : {}
+    };
+}
+exports.POSTHOG_TRACING_HEADERS = __webpack_exports__.POSTHOG_TRACING_HEADERS;
+exports.addProperty = __webpack_exports__.addProperty;
+exports.getFirstHeaderValue = __webpack_exports__.getFirstHeaderValue;
+exports.getPostHogTracingHeaderValues = __webpack_exports__.getPostHogTracingHeaderValues;
+exports.sanitizeTracingHeaderValue = __webpack_exports__.sanitizeTracingHeaderValue;
+for(var __webpack_i__ in __webpack_exports__)if (-1 === [
+    "POSTHOG_TRACING_HEADERS",
+    "addProperty",
+    "getFirstHeaderValue",
+    "getPostHogTracingHeaderValues",
+    "sanitizeTracingHeaderValue"
+].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/extensions/tracing-headers.mjs

@@ -0,0 +1,39 @@
+const TRACING_HEADER_MAX_LENGTH = 1000;
+const TRACING_HEADER_CONTROL_CHARS_REGEX = /[\x00-\x1f\x7f-\x9f]/g;
+const POSTHOG_TRACING_HEADERS = {
+    sessionId: 'x-posthog-session-id',
+    distinctId: 'x-posthog-distinct-id'
+};
+function addProperty(properties, key, value) {
+    if (null != value && '' !== value) properties[key] = value;
+}
+function getFirstHeaderValue(value) {
+    return Array.isArray(value) ? value[0] : value;
+}
+function sanitizeTracingHeaderValue(value) {
+    if (Array.isArray(value)) {
+        for (const item of value){
+            const sanitized = sanitizeTracingHeaderValue(item);
+            if (void 0 !== sanitized) return sanitized;
+        }
+        return;
+    }
+    if ('string' != typeof value) return;
+    const sanitized = value.replace(TRACING_HEADER_CONTROL_CHARS_REGEX, '').trim();
+    if (!sanitized) return;
+    return sanitized.length > TRACING_HEADER_MAX_LENGTH ? sanitized.slice(0, TRACING_HEADER_MAX_LENGTH) : sanitized;
+}
+function getPostHogTracingHeaderValues(headers) {
+    if (!headers) return {};
+    const sessionId = sanitizeTracingHeaderValue(headers[POSTHOG_TRACING_HEADERS.sessionId]);
+    const distinctId = sanitizeTracingHeaderValue(headers[POSTHOG_TRACING_HEADERS.distinctId]);
+    return {
+        ...void 0 !== sessionId ? {
+            sessionId
+        } : {},
+        ...void 0 !== distinctId ? {
+            distinctId
+        } : {}
+    };
+}
+export { POSTHOG_TRACING_HEADERS, addProperty, getFirstHeaderValue, getPostHogTracingHeaderValues, sanitizeTracingHeaderValue };

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "5.30.7";
+export declare const version = "5.31.0";
 //# sourceMappingURL=version.d.ts.map

package/dist/version.js

@@ -26,7 +26,7 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     version: ()=>version
 });
-const version = '5.30.7';
+const version = '5.31.0';
 exports.version = __webpack_exports__.version;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "version"

package/dist/version.mjs

@@ -1,2 +1,2 @@
-const version = '5.30.7';
+const version = '5.31.0';
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "posthog-node",
-  "version": "5.30.7",
+  "version": "5.31.0",
   "description": "PostHog Node.js integration",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
   "module": "dist/entrypoints/index.node.mjs",
   "types": "dist/entrypoints/index.node.d.ts",
   "dependencies": {
-    "@posthog/core": "1.27.8"
+    "@posthog/core": "1.27.9"
   },
   "devDependencies": {
     "@edge-runtime/jest-environment": "^4.0.0",

package/src/extensions/express.ts

@@ -1,7 +1,9 @@
 import ErrorTracking from './error-tracking'
 import { PostHogBackendClient } from '../client'
 import { ErrorTracking as CoreErrorTracking } from '@posthog/core'
+import { addProperty, getFirstHeaderValue, getPostHogTracingHeaderValues } from './tracing-headers'
 import type { Request, Response } from 'express'
+import type { ContextData } from './context/types'
 
 type ExpressMiddleware = (req: Request, res: Response, next: () => void) => void
 
@@ -21,6 +23,47 @@ interface MiddlewareError extends Error {
   }
 }
 
+function getClientIp(req: Request): string | undefined {
+  const forwarded = getFirstHeaderValue(req.headers['x-forwarded-for'])
+  if (forwarded) {
+    const ip = forwarded.split(',')[0].trim()
+    if (ip) return ip
+  }
+  return req.socket?.remoteAddress
+}
+
+function buildRequestContextData(req: Request): Partial<ContextData> {
+  const { sessionId, distinctId } = getPostHogTracingHeaderValues(req.headers)
+  const properties: Record<string, any> = {}
+
+  addProperty(properties, '$current_url', req.originalUrl || req.url)
+  addProperty(properties, '$request_method', req.method)
+  addProperty(properties, '$request_path', req.path)
+  addProperty(properties, '$user_agent', getFirstHeaderValue(req.headers['user-agent']))
+  addProperty(properties, '$ip', getClientIp(req))
+
+  return {
+    ...(sessionId !== undefined ? { sessionId } : {}),
+    ...(distinctId !== undefined ? { distinctId } : {}),
+    properties,
+  }
+}
+
+export function setupExpressRequestContext(
+  _posthog: PostHogBackendClient,
+  app: {
+    use: (middleware: ExpressMiddleware) => unknown
+  }
+): void {
+  app.use(posthogRequestContext(_posthog))
+}
+
+function posthogRequestContext(posthog: PostHogBackendClient): ExpressMiddleware {
+  return (req, _res, next): void => {
+    posthog.withContext(buildRequestContextData(req), () => next())
+  }
+}
+
 export function setupExpressErrorHandler(
   _posthog: PostHogBackendClient,
   app: {
@@ -37,21 +80,17 @@ function posthogErrorHandler(posthog: PostHogBackendClient): ExpressErrorMiddlew
       return
     }
 
-    const sessionId: string | undefined = req.headers['x-posthog-session-id'] as string | undefined
-    const distinctId: string | undefined = req.headers['x-posthog-distinct-id'] as string | undefined
+    const contextData = buildRequestContextData(req)
     const syntheticException = new Error('Synthetic exception')
     const hint: CoreErrorTracking.EventHint = { mechanism: { type: 'middleware', handled: false }, syntheticException }
+    const additionalProperties: Record<string, any> = {
+      ...(contextData.sessionId !== undefined ? { $session_id: contextData.sessionId } : {}),
+      ...(contextData.properties || {}),
+      $response_status_code: res.statusCode,
+    }
 
     posthog.addPendingPromise(
-      ErrorTracking.buildEventMessage(error, hint, distinctId, {
-        $session_id: sessionId,
-        $current_url: req.url,
-        $request_method: req.method,
-        $request_path: req.path,
-        $user_agent: req.headers['user-agent'],
-        $response_status_code: res.statusCode,
-        $ip: req.headers['x-forwarded-for'] || req?.socket?.remoteAddress,
-      }).then((msg) => {
+      ErrorTracking.buildEventMessage(error, hint, contextData.distinctId, additionalProperties).then((msg) => {
         posthog.capture(msg)
       })
     )

package/src/extensions/nestjs.ts

@@ -1,7 +1,9 @@
+import type { IncomingHttpHeaders } from 'node:http'
 import { Observable, throwError } from 'rxjs'
 import { catchError } from 'rxjs/operators'
 
 import ErrorTracking from './error-tracking'
+import { addProperty, getFirstHeaderValue, getPostHogTracingHeaderValues } from './tracing-headers'
 import { PostHogBackendClient } from '../client'
 
 // Local interfaces to avoid runtime dependency on @nestjs/common
@@ -32,10 +34,10 @@ export interface PostHogInterceptorOptions {
   captureExceptions?: boolean | ExceptionCaptureOptions
 }
 
-function getClientIp(headers: Record<string, any>, request: any): string | undefined {
-  const forwarded = headers['x-forwarded-for']
+function getClientIp(headers: IncomingHttpHeaders, request: any): string | undefined {
+  const forwarded = getFirstHeaderValue(headers['x-forwarded-for'])
   if (forwarded) {
-    const ip = String(forwarded).split(',')[0].trim()
+    const ip = forwarded.split(',')[0].trim()
     if (ip) return ip
   }
   return request?.socket?.remoteAddress
@@ -71,22 +73,20 @@ export class PostHogInterceptor implements NestInterceptor {
     const request = httpHost.getRequest()
     const response = httpHost.getResponse()
 
-    const headers = request?.headers ?? {}
-    const sessionId: string | undefined = headers['x-posthog-session-id']
-    const windowId: string | undefined = headers['x-posthog-window-id']
-    const distinctId: string | undefined = headers['x-posthog-distinct-id']
+    const headers = (request?.headers ?? {}) as IncomingHttpHeaders
+    const { sessionId, distinctId } = getPostHogTracingHeaderValues(headers)
+
+    const properties: Record<string, any> = {}
+    addProperty(properties, '$current_url', request?.url)
+    addProperty(properties, '$request_method', request?.method)
+    addProperty(properties, '$request_path', request?.path ?? request?.url)
+    addProperty(properties, '$user_agent', getFirstHeaderValue(headers['user-agent']))
+    addProperty(properties, '$ip', getClientIp(headers, request))
 
     const contextData = {
-      sessionId,
-      distinctId,
-      properties: {
-        $current_url: request?.url,
-        $request_method: request?.method,
-        $request_path: request?.path ?? request?.url,
-        $window_id: windowId,
-        $user_agent: headers['user-agent'],
-        $ip: getClientIp(headers, request),
-      },
+      ...(sessionId !== undefined ? { sessionId } : {}),
+      ...(distinctId !== undefined ? { distinctId } : {}),
+      properties,
     }
 
     // Use enterContext so the context propagates through RxJS Observable

package/src/extensions/tracing-headers.ts

@@ -0,0 +1,65 @@
+import type { IncomingHttpHeaders } from 'node:http'
+
+const TRACING_HEADER_MAX_LENGTH = 1000
+// Remove C0 controls, DEL, and C1 controls from PostHog tracing IDs only.
+// eslint-disable-next-line no-control-regex
+const TRACING_HEADER_CONTROL_CHARS_REGEX = /[\x00-\x1f\x7f-\x9f]/g
+
+type HeaderValue = IncomingHttpHeaders[string]
+
+export const POSTHOG_TRACING_HEADERS = {
+  sessionId: 'x-posthog-session-id',
+  distinctId: 'x-posthog-distinct-id',
+} as const
+
+export interface PostHogTracingHeaderValues {
+  sessionId?: string
+  distinctId?: string
+}
+
+export function addProperty(properties: Record<string, any>, key: string, value: unknown): void {
+  if (value !== undefined && value !== null && value !== '') {
+    properties[key] = value
+  }
+}
+
+export function getFirstHeaderValue(value: HeaderValue): string | undefined {
+  return Array.isArray(value) ? value[0] : value
+}
+
+export function sanitizeTracingHeaderValue(value: HeaderValue): string | undefined {
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      const sanitized = sanitizeTracingHeaderValue(item)
+      if (sanitized !== undefined) {
+        return sanitized
+      }
+    }
+    return undefined
+  }
+
+  if (typeof value !== 'string') {
+    return undefined
+  }
+
+  const sanitized = value.replace(TRACING_HEADER_CONTROL_CHARS_REGEX, '').trim()
+  if (!sanitized) {
+    return undefined
+  }
+
+  return sanitized.length > TRACING_HEADER_MAX_LENGTH ? sanitized.slice(0, TRACING_HEADER_MAX_LENGTH) : sanitized
+}
+
+export function getPostHogTracingHeaderValues(headers?: IncomingHttpHeaders): PostHogTracingHeaderValues {
+  if (!headers) {
+    return {}
+  }
+
+  const sessionId = sanitizeTracingHeaderValue(headers[POSTHOG_TRACING_HEADERS.sessionId])
+  const distinctId = sanitizeTracingHeaderValue(headers[POSTHOG_TRACING_HEADERS.distinctId])
+
+  return {
+    ...(sessionId !== undefined ? { sessionId } : {}),
+    ...(distinctId !== undefined ? { distinctId } : {}),
+  }
+}

package/src/version.ts

@@ -1 +1 @@
-export const version = '5.30.7'
+export const version = '5.31.0'