posthog-node 3.5.0 → 3.6.1

package/lib/posthog-core/src/index.d.ts

@@ -1,4 +1,4 @@
-import { PostHogFetchOptions, PostHogFetchResponse, PostHogAutocaptureElement, PostHogDecideResponse, PosthogCoreOptions, PostHogEventProperties, PostHogPersistedProperty, PosthogCaptureOptions, JsonType } from './types';
+import { PostHogFetchOptions, PostHogFetchResponse, PostHogAutocaptureElement, PostHogDecideResponse, PosthogCoreOptions, PostHogEventProperties, PostHogPersistedProperty, PostHogCaptureOptions, JsonType } from './types';
 import { RetriableOptions } from './utils';
 export * as utils from './utils';
 import { LZString } from './lz-string';
@@ -36,17 +36,17 @@ export declare abstract class PostHogCoreStateless {
     /***
      *** TRACKING
      ***/
-    protected identifyStateless(distinctId: string, properties?: PostHogEventProperties, options?: PosthogCaptureOptions): this;
+    protected identifyStateless(distinctId: string, properties?: PostHogEventProperties, options?: PostHogCaptureOptions): this;
     protected captureStateless(distinctId: string, event: string, properties?: {
         [key: string]: any;
-    }, options?: PosthogCaptureOptions): this;
+    }, options?: PostHogCaptureOptions): this;
     protected aliasStateless(alias: string, distinctId: string, properties?: {
         [key: string]: any;
-    }, options?: PosthogCaptureOptions): this;
+    }, options?: PostHogCaptureOptions): this;
     /***
      *** GROUPS
      ***/
-    protected groupIdentifyStateless(groupType: string, groupKey: string | number, groupProperties?: PostHogEventProperties, options?: PosthogCaptureOptions, distinctId?: string, eventProperties?: PostHogEventProperties): this;
+    protected groupIdentifyStateless(groupType: string, groupKey: string | number, groupProperties?: PostHogEventProperties, options?: PostHogCaptureOptions, distinctId?: string, eventProperties?: PostHogEventProperties): this;
     /***
      *** FEATURE FLAGS
      ***/
@@ -63,7 +63,7 @@ export declare abstract class PostHogCoreStateless {
     /***
      *** QUEUEING AND FLUSHING
      ***/
-    protected enqueue(type: string, _message: any, options?: PosthogCaptureOptions): void;
+    protected enqueue(type: string, _message: any, options?: PostHogCaptureOptions): void;
     flushAsync(): Promise<any>;
     flush(callback?: (err?: any, data?: any) => void): void;
     private fetchWithRetry;
@@ -101,20 +101,20 @@ export declare abstract class PostHogCore extends PostHogCoreStateless {
     /***
      *** TRACKING
      ***/
-    identify(distinctId?: string, properties?: PostHogEventProperties, options?: PosthogCaptureOptions): this;
+    identify(distinctId?: string, properties?: PostHogEventProperties, options?: PostHogCaptureOptions): this;
     capture(event: string, properties?: {
         [key: string]: any;
-    }, options?: PosthogCaptureOptions): this;
+    }, options?: PostHogCaptureOptions): this;
     alias(alias: string): this;
-    autocapture(eventType: string, elements: PostHogAutocaptureElement[], properties?: PostHogEventProperties, options?: PosthogCaptureOptions): this;
+    autocapture(eventType: string, elements: PostHogAutocaptureElement[], properties?: PostHogEventProperties, options?: PostHogCaptureOptions): this;
     /***
      *** GROUPS
      ***/
     groups(groups: {
         [type: string]: string | number;
     }): this;
-    group(groupType: string, groupKey: string | number, groupProperties?: PostHogEventProperties, options?: PosthogCaptureOptions): this;
-    groupIdentify(groupType: string, groupKey: string | number, groupProperties?: PostHogEventProperties, options?: PosthogCaptureOptions): this;
+    group(groupType: string, groupKey: string | number, groupProperties?: PostHogEventProperties, options?: PostHogCaptureOptions): this;
+    groupIdentify(groupType: string, groupKey: string | number, groupProperties?: PostHogEventProperties, options?: PostHogCaptureOptions): this;
     /***
      * PROPERTIES
      ***/

package/lib/posthog-core/src/types.d.ts

@@ -45,7 +45,10 @@ export declare type PostHogFetchOptions = {
     body?: string;
     signal?: AbortSignal;
 };
-export declare type PosthogCaptureOptions = {
+export declare type PostHogCaptureOptions = {
+    /** If provided overrides the auto-generated event ID */
+    uuid?: string;
+    /** If provided overrides the auto-generated timestamp */
     timestamp?: Date;
     disableGeoip?: boolean;
 };

package/lib/posthog-node/src/posthog-node.d.ts

@@ -1,5 +1,5 @@
 import { JsonType, PosthogCoreOptions, PostHogCoreStateless, PostHogFetchOptions, PostHogFetchResponse, PosthogFlagsAndPayloadsResponse, PostHogPersistedProperty } from '../../posthog-core/src';
-import { EventMessageV1, GroupIdentifyMessage, IdentifyMessageV1, PostHogNodeV1 } from './types';
+import { EventMessage, GroupIdentifyMessage, IdentifyMessage, PostHogNodeV1 } from './types';
 export declare type PostHogOptions = PosthogCoreOptions & {
     persistence?: 'memory';
     personalApiKey?: string;
@@ -24,8 +24,8 @@ export declare class PostHog extends PostHogCoreStateless implements PostHogNode
     enable(): void;
     disable(): void;
     debug(enabled?: boolean): void;
-    capture({ distinctId, event, properties, groups, sendFeatureFlags, timestamp, disableGeoip }: EventMessageV1): void;
-    identify({ distinctId, properties, disableGeoip }: IdentifyMessageV1): void;
+    capture({ distinctId, event, properties, groups, sendFeatureFlags, timestamp, disableGeoip, uuid, }: EventMessage): void;
+    identify({ distinctId, properties, disableGeoip }: IdentifyMessage): void;
     alias(data: {
         distinctId: string;
         alias: string;

package/lib/posthog-node/src/types.d.ts

@@ -1,14 +1,15 @@
 import { JsonType } from '../../posthog-core/src';
-export interface IdentifyMessageV1 {
+export interface IdentifyMessage {
     distinctId: string;
     properties?: Record<string | number, any>;
     disableGeoip?: boolean;
 }
-export interface EventMessageV1 extends IdentifyMessageV1 {
+export interface EventMessage extends IdentifyMessage {
     event: string;
     groups?: Record<string, string | number>;
     sendFeatureFlags?: boolean;
     timestamp?: Date;
+    uuid?: string;
 }
 export interface GroupIdentifyMessage {
     groupType: string;
@@ -67,7 +68,7 @@ export declare type PostHogNodeV1 = {
      * @param groups OPTIONAL | object of what groups are related to this event, example: { company: 'id:5' }. Can be used to analyze companies instead of users.
      * @param sendFeatureFlags OPTIONAL | Used with experiments. Determines whether to send feature flag values with the event.
      */
-    capture({ distinctId, event, properties, groups, sendFeatureFlags }: EventMessageV1): void;
+    capture({ distinctId, event, properties, groups, sendFeatureFlags }: EventMessage): void;
     /**
      * @description Identify lets you add metadata on your users so you can more easily identify who they are in PostHog,
      * and even do things like segment users by these properties.
@@ -75,7 +76,7 @@ export declare type PostHogNodeV1 = {
      * @param distinctId which uniquely identifies your user
      * @param properties with a dict with any key: value pairs
      */
-    identify({ distinctId, properties }: IdentifyMessageV1): void;
+    identify({ distinctId, properties }: IdentifyMessage): void;
     /**
      * @description To marry up whatever a user does before they sign up or log in with what they do after you need to make an alias call.
      * This will allow you to answer questions like "Which marketing channels leads to users churning after a month?"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "posthog-node",
-  "version": "3.5.0",
+  "version": "3.6.1",
   "description": "PostHog Node.js integration",
   "repository": {
     "type": "git",

package/src/feature-flags.ts

@@ -532,13 +532,9 @@ function matchProperty(
       }
     }
     case 'is_date_after':
-    case 'is_date_before':
-    case 'is_relative_date_before':
-    case 'is_relative_date_after': {
-      let parsedDate = null
-      if (['is_relative_date_before', 'is_relative_date_after'].includes(operator)) {
-        parsedDate = relativeDateParseForFeatureFlagMatching(String(value))
-      } else {
+    case 'is_date_before': {
+      let parsedDate = relativeDateParseForFeatureFlagMatching(String(value))
+      if (parsedDate == null) {
         parsedDate = convertToDateTime(value)
       }
 
@@ -546,7 +542,7 @@ function matchProperty(
         throw new InconclusiveMatchError(`Invalid date: ${value}`)
       }
       const overrideDate = convertToDateTime(overrideValue)
-      if (['is_date_before', 'is_relative_date_before'].includes(operator)) {
+      if (['is_date_before'].includes(operator)) {
         return overrideDate < parsedDate
       }
       return overrideDate > parsedDate
@@ -691,7 +687,7 @@ function convertToDateTime(value: string | number | (string | number)[] | Date):
 }
 
 function relativeDateParseForFeatureFlagMatching(value: string): Date | null {
-  const regex = /^(?<number>[0-9]+)(?<interval>[a-z])$/
+  const regex = /^-?(?<number>[0-9]+)(?<interval>[a-z])$/
   const match = value.match(regex)
   const parsedDt = new Date(new Date().toISOString())
 

package/src/posthog-node.ts

@@ -10,7 +10,7 @@ import {
   PostHogPersistedProperty,
 } from '../../posthog-core/src'
 import { PostHogMemoryStorage } from '../../posthog-core/src/storage-memory'
-import { EventMessageV1, GroupIdentifyMessage, IdentifyMessageV1, PostHogNodeV1 } from './types'
+import { EventMessage, GroupIdentifyMessage, IdentifyMessage, PostHogNodeV1 } from './types'
 import { FeatureFlagsPoller } from './feature-flags'
 import fetch from './fetch'
 
@@ -100,9 +100,18 @@ export class PostHog extends PostHogCoreStateless implements PostHogNodeV1 {
     this.featureFlagsPoller?.debug(enabled)
   }
 
-  capture({ distinctId, event, properties, groups, sendFeatureFlags, timestamp, disableGeoip }: EventMessageV1): void {
-    const _capture = (props: EventMessageV1['properties']): void => {
-      super.captureStateless(distinctId, event, props, { timestamp, disableGeoip })
+  capture({
+    distinctId,
+    event,
+    properties,
+    groups,
+    sendFeatureFlags,
+    timestamp,
+    disableGeoip,
+    uuid,
+  }: EventMessage): void {
+    const _capture = (props: EventMessage['properties']): void => {
+      super.captureStateless(distinctId, event, props, { timestamp, disableGeoip, uuid })
     }
 
     // :TRICKY: If we flush, or need to shut down, to not lose events we want this promise to resolve before we flush
@@ -155,7 +164,7 @@ export class PostHog extends PostHogCoreStateless implements PostHogNodeV1 {
     this.addPendingPromise(capturePromise)
   }
 
-  identify({ distinctId, properties, disableGeoip }: IdentifyMessageV1): void {
+  identify({ distinctId, properties, disableGeoip }: IdentifyMessage): void {
     // Catch properties passed as $set and move them to the top level
     const personProperties = properties?.$set || properties
 
@@ -451,7 +460,7 @@ export class PostHog extends PostHogCoreStateless implements PostHogNodeV1 {
     personProperties?: Record<string, string>,
     groupProperties?: Record<string, Record<string, string>>
   ): { allPersonProperties: Record<string, string>; allGroupProperties: Record<string, Record<string, string>> } {
-    const allPersonProperties = { $current_distinct_id: distinctId, ...(personProperties || {}) }
+    const allPersonProperties = { distinct_id: distinctId, ...(personProperties || {}) }
 
     const allGroupProperties: Record<string, Record<string, string>> = {}
     if (groups) {

package/src/types.ts

@@ -1,16 +1,17 @@
 import { JsonType } from '../../posthog-core/src'
 
-export interface IdentifyMessageV1 {
+export interface IdentifyMessage {
   distinctId: string
   properties?: Record<string | number, any>
   disableGeoip?: boolean
 }
 
-export interface EventMessageV1 extends IdentifyMessageV1 {
+export interface EventMessage extends IdentifyMessage {
   event: string
   groups?: Record<string, string | number> // Mapping of group type to group id
   sendFeatureFlags?: boolean
   timestamp?: Date
+  uuid?: string
 }
 
 export interface GroupIdentifyMessage {
@@ -75,7 +76,7 @@ export type PostHogNodeV1 = {
    * @param groups OPTIONAL | object of what groups are related to this event, example: { company: 'id:5' }. Can be used to analyze companies instead of users.
    * @param sendFeatureFlags OPTIONAL | Used with experiments. Determines whether to send feature flag values with the event.
    */
-  capture({ distinctId, event, properties, groups, sendFeatureFlags }: EventMessageV1): void
+  capture({ distinctId, event, properties, groups, sendFeatureFlags }: EventMessage): void
 
   /**
    * @description Identify lets you add metadata on your users so you can more easily identify who they are in PostHog,
@@ -84,7 +85,7 @@ export type PostHogNodeV1 = {
    * @param distinctId which uniquely identifies your user
    * @param properties with a dict with any key: value pairs
    */
-  identify({ distinctId, properties }: IdentifyMessageV1): void
+  identify({ distinctId, properties }: IdentifyMessage): void
 
   /**
    * @description To marry up whatever a user does before they sign up or log in with what they do after you need to make an alias call.

package/test/extensions/sentry-integration.spec.ts

@@ -146,6 +146,7 @@ describe('PostHogSentryIntegration', () => {
         library: 'posthog-node',
         library_version: '1.2.3',
         timestamp: expect.any(String),
+        uuid: expect.any(String),
       },
     ])
   })

package/test/feature-flags.spec.ts

@@ -354,7 +354,7 @@ describe('local evaluation', () => {
           distinct_id: 'some-distinct-id_outside_rollout?',
           groups: {},
           person_properties: {
-            $current_distinct_id: 'some-distinct-id_outside_rollout?',
+            distinct_id: 'some-distinct-id_outside_rollout?',
             region: 'USA',
             email: 'a@b.com',
           },
@@ -376,7 +376,7 @@ describe('local evaluation', () => {
           token: 'TEST_API_KEY',
           distinct_id: 'some-distinct-id',
           groups: {},
-          person_properties: { $current_distinct_id: 'some-distinct-id', doesnt_matter: '1' },
+          person_properties: { distinct_id: 'some-distinct-id', doesnt_matter: '1' },
           group_properties: {},
           geoip_disable: true,
         }),
@@ -2054,7 +2054,7 @@ describe('match properties', () => {
   it('with relative date operators', () => {
     jest.setSystemTime(new Date('2022-05-01'))
 
-    const property_a = { key: 'key', value: '6h', operator: 'is_relative_date_before' }
+    const property_a = { key: 'key', value: '-6h', operator: 'is_date_before' }
     expect(matchProperty(property_a, { key: '2022-03-01' })).toBe(true)
     expect(matchProperty(property_a, { key: '2022-04-30' })).toBe(true)
 
@@ -2073,58 +2073,53 @@ describe('match properties', () => {
     // however js understands numbers as date offsets from utc epoch
     expect(() => matchProperty(property_a, { key: 1 })).not.toThrow(InconclusiveMatchError)
 
-    const property_b = { key: 'key', value: '1h', operator: 'is_relative_date_after' }
+    const property_b = { key: 'key', value: '1h', operator: 'is_date_after' }
     expect(matchProperty(property_b, { key: '2022-05-02' })).toBe(true)
     expect(matchProperty(property_b, { key: '2022-05-30' })).toBe(true)
     expect(matchProperty(property_b, { key: new Date(2022, 4, 30) })).toBe(true)
     expect(matchProperty(property_b, { key: new Date('2022-05-30') })).toBe(true)
     expect(matchProperty(property_b, { key: '2022-04-30' })).toBe(false)
 
-    // # Invalid flag property
-    const property_c = { key: 'key', value: 1234, operator: 'is_relative_date_after' }
-    expect(() => matchProperty(property_c, { key: '2022-05-30' })).toThrow(InconclusiveMatchError)
-    expect(() => matchProperty(property_c, { key: 1 })).toThrow(InconclusiveMatchError)
-
     // # Try all possible relative dates
-    const property_e = { key: 'key', value: '1h', operator: 'is_relative_date_before' }
+    const property_e = { key: 'key', value: '1h', operator: 'is_date_before' }
     expect(matchProperty(property_e, { key: '2022-05-01 00:00:00' })).toBe(false)
     expect(matchProperty(property_e, { key: '2022-04-30 22:00:00' })).toBe(true)
 
-    const property_f = { key: 'key', value: '1d', operator: 'is_relative_date_before' }
+    const property_f = { key: 'key', value: '-1d', operator: 'is_date_before' }
     expect(matchProperty(property_f, { key: '2022-04-29 23:59:00 GMT' })).toBe(true)
     expect(matchProperty(property_f, { key: '2022-04-30 00:00:01 GMT' })).toBe(false)
 
-    const property_g = { key: 'key', value: '1w', operator: 'is_relative_date_before' }
+    const property_g = { key: 'key', value: '1w', operator: 'is_date_before' }
     expect(matchProperty(property_g, { key: '2022-04-23 00:00:00 GMT' })).toBe(true)
     expect(matchProperty(property_g, { key: '2022-04-24 00:00:00 GMT' })).toBe(false)
     expect(matchProperty(property_g, { key: '2022-04-24 00:00:01 GMT' })).toBe(false)
 
-    const property_h = { key: 'key', value: '1m', operator: 'is_relative_date_before' }
+    const property_h = { key: 'key', value: '1m', operator: 'is_date_before' }
     expect(matchProperty(property_h, { key: '2022-03-01 00:00:00 GMT' })).toBe(true)
     expect(matchProperty(property_h, { key: '2022-04-05 00:00:00 GMT' })).toBe(false)
 
-    const property_i = { key: 'key', value: '1y', operator: 'is_relative_date_before' }
+    const property_i = { key: 'key', value: '-1y', operator: 'is_date_before' }
     expect(matchProperty(property_i, { key: '2021-04-28 00:00:00 GMT' })).toBe(true)
     expect(matchProperty(property_i, { key: '2021-05-01 00:00:01 GMT' })).toBe(false)
 
-    const property_j = { key: 'key', value: '122h', operator: 'is_relative_date_after' }
+    const property_j = { key: 'key', value: '122h', operator: 'is_date_after' }
     expect(matchProperty(property_j, { key: '2022-05-01 00:00:00 GMT' })).toBe(true)
     expect(matchProperty(property_j, { key: '2022-04-23 01:00:00 GMT' })).toBe(false)
 
-    const property_k = { key: 'key', value: '2d', operator: 'is_relative_date_after' }
+    const property_k = { key: 'key', value: '2d', operator: 'is_date_after' }
     expect(matchProperty(property_k, { key: '2022-05-01 00:00:00 GMT' })).toBe(true)
     expect(matchProperty(property_k, { key: '2022-04-29 00:00:01 GMT' })).toBe(true)
     expect(matchProperty(property_k, { key: '2022-04-29 00:00:00 GMT' })).toBe(false)
 
-    const property_l = { key: 'key', value: '02w', operator: 'is_relative_date_after' }
+    const property_l = { key: 'key', value: '02w', operator: 'is_date_after' }
     expect(matchProperty(property_l, { key: '2022-05-01 00:00:00 GMT' })).toBe(true)
     expect(matchProperty(property_l, { key: '2022-04-16 00:00:00 GMT' })).toBe(false)
 
-    const property_m = { key: 'key', value: '1m', operator: 'is_relative_date_after' }
+    const property_m = { key: 'key', value: '-1m', operator: 'is_date_after' }
     expect(matchProperty(property_m, { key: '2022-04-01 00:00:01 GMT' })).toBe(true)
     expect(matchProperty(property_m, { key: '2022-04-01 00:00:00 GMT' })).toBe(false)
 
-    const property_n = { key: 'key', value: '1y', operator: 'is_relative_date_after' }
+    const property_n = { key: 'key', value: '1y', operator: 'is_date_after' }
     expect(matchProperty(property_n, { key: '2022-05-01 00:00:00 GMT' })).toBe(true)
     expect(matchProperty(property_n, { key: '2021-05-01 00:00:01 GMT' })).toBe(true)
     expect(matchProperty(property_n, { key: '2021-05-01 00:00:00 GMT' })).toBe(false)

package/test/posthog-node.spec.ts

@@ -4,6 +4,7 @@ jest.mock('../src/fetch')
 import fetch from '../src/fetch'
 import { anyDecideCall, anyLocalEvalCall, apiImplementation } from './feature-flags.spec'
 import { waitForPromises, wait } from '../../posthog-core/test/test-utils/test-utils'
+import { generateUUID } from 'posthog-core/src/utils'
 
 jest.mock('../package.json', () => ({ version: '1.2.3' }))
 
@@ -66,6 +67,7 @@ describe('PostHog Node.js', () => {
             $lib: 'posthog-node',
             $lib_version: '1.2.3',
           },
+          uuid: expect.any(String),
           timestamp: expect.any(String),
           type: 'capture',
           library: 'posthog-node',
@@ -185,6 +187,24 @@ describe('PostHog Node.js', () => {
           distinct_id: '123',
           timestamp: '2021-02-03T00:00:00.000Z',
           event: 'custom-time',
+          uuid: expect.any(String),
+        },
+      ])
+    })
+
+    it('should allow overriding uuid', async () => {
+      expect(mockedFetch).toHaveBeenCalledTimes(0)
+      const uuid = generateUUID()
+      posthog.capture({ event: 'custom-time', distinctId: '123', uuid })
+      await waitForPromises()
+      jest.runOnlyPendingTimers()
+      const batchEvents = getLastBatchEvents()
+      expect(batchEvents).toMatchObject([
+        {
+          distinct_id: '123',
+          timestamp: expect.any(String),
+          event: 'custom-time',
+          uuid: uuid,
         },
       ])
     })
@@ -1015,7 +1035,7 @@ describe('PostHog Node.js', () => {
             distinct_id: 'some_id',
             groups: { company: 'id:5', instance: 'app.posthog.com' },
             person_properties: {
-              $current_distinct_id: 'some_id',
+              distinct_id: 'some_id',
               x1: 'y1',
             },
             group_properties: {
@@ -1031,7 +1051,7 @@ describe('PostHog Node.js', () => {
 
       await posthog.getFeatureFlag('random_key', 'some_id', {
         groups: { company: 'id:5', instance: 'app.posthog.com' },
-        personProperties: { $current_distinct_id: 'override' },
+        personProperties: { distinct_id: 'override' },
         groupProperties: { company: { $group_key: 'group_override' } },
       })
       jest.runOnlyPendingTimers()
@@ -1044,7 +1064,7 @@ describe('PostHog Node.js', () => {
             distinct_id: 'some_id',
             groups: { company: 'id:5', instance: 'app.posthog.com' },
             person_properties: {
-              $current_distinct_id: 'override',
+              distinct_id: 'override',
             },
             group_properties: {
               company: { $group_key: 'group_override' },
@@ -1074,7 +1094,7 @@ describe('PostHog Node.js', () => {
             distinct_id: 'some_id',
             groups: {},
             person_properties: {
-              $current_distinct_id: 'some_id',
+              distinct_id: 'some_id',
             },
             group_properties: {},
             geoip_disable: true,
@@ -1098,7 +1118,7 @@ describe('PostHog Node.js', () => {
             distinct_id: 'some_id',
             groups: { company: 'id:5' },
             person_properties: {
-              $current_distinct_id: 'some_id',
+              distinct_id: 'some_id',
             },
             group_properties: { company: { $group_key: 'id:5' } },
             geoip_disable: true,
@@ -1118,7 +1138,7 @@ describe('PostHog Node.js', () => {
             distinct_id: 'some_id',
             groups: {},
             person_properties: {
-              $current_distinct_id: 'some_id',
+              distinct_id: 'some_id',
             },
             group_properties: {},
             geoip_disable: true,
@@ -1139,7 +1159,7 @@ describe('PostHog Node.js', () => {
             distinct_id: 'some_id',
             groups: {},
             person_properties: {
-              $current_distinct_id: 'some_id',
+              distinct_id: 'some_id',
             },
             group_properties: {},
             geoip_disable: true,