posthog-js-lite 2.5.0 → 2.6.1

package/lib/index.d.ts

@@ -44,7 +44,10 @@ declare type PostHogFetchOptions = {
     body?: string;
     signal?: AbortSignal;
 };
-declare type PosthogCaptureOptions = {
+declare type PostHogCaptureOptions = {
+    /** If provided overrides the auto-generated event ID */
+    uuid?: string;
+    /** If provided overrides the auto-generated timestamp */
     timestamp?: Date;
     disableGeoip?: boolean;
 };
@@ -113,9 +116,9 @@ declare abstract class PostHogCoreStateless {
     private captureMode;
     private removeDebugCallback?;
     private debugMode;
-    private pendingPromises;
     private disableGeoip;
     private _optoutOverride;
+    private pendingPromises;
     protected _events: SimpleEventEmitter;
     protected _flushTimer?: any;
     protected _retryOptions: RetriableOptions;
@@ -133,20 +136,21 @@ declare abstract class PostHogCoreStateless {
     on(event: string, cb: (...args: any[]) => void): () => void;
     debug(enabled?: boolean): void;
     private buildPayload;
+    protected addPendingPromise(promise: Promise<any>): void;
     /***
      *** 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
      ***/
@@ -163,7 +167,7 @@ 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;
@@ -201,20 +205,20 @@ 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/index.esm.js

@@ -207,26 +207,6 @@ function retriable(fn, props) {
         });
     });
 }
-// https://stackoverflow.com/a/8809472
-function generateUUID(globalThis) {
-    // Public Domain/MIT
-    var d = new Date().getTime(); //Timestamp
-    var d2 = (globalThis && globalThis.performance && globalThis.performance.now && globalThis.performance.now() * 1000) || 0; //Time in microseconds since page-load or 0 if unsupported
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-        var r = Math.random() * 16; //random number between 0 and 16
-        if (d > 0) {
-            //Use timestamp until depleted
-            r = (d + r) % 16 | 0;
-            d = Math.floor(d / 16);
-        }
-        else {
-            //Use microseconds since page-load if supported
-            r = (d2 + r) % 16 | 0;
-            d2 = Math.floor(d2 / 16);
-        }
-        return (c === 'x' ? r : (r & 0x3) | 0x8).toString(16);
-    });
-}
 function currentTimestamp() {
     return new Date().getTime();
 }
@@ -701,6 +681,401 @@ var SimpleEventEmitter = /** @class */ (function () {
     return SimpleEventEmitter;
 }());
 
+/**
+ * uuidv7: An experimental implementation of the proposed UUID Version 7
+ *
+ * @license Apache-2.0
+ * @copyright 2021-2023 LiosK
+ * @packageDocumentation
+ */
+var DIGITS = "0123456789abcdef";
+/** Represents a UUID as a 16-byte byte array. */
+var UUID = /** @class */ (function () {
+    /** @param bytes - The 16-byte byte array representation. */
+    function UUID(bytes) {
+        this.bytes = bytes;
+    }
+    /**
+     * Creates an object from the internal representation, a 16-byte byte array
+     * containing the binary UUID representation in the big-endian byte order.
+     *
+     * This method does NOT shallow-copy the argument, and thus the created object
+     * holds the reference to the underlying buffer.
+     *
+     * @throws TypeError if the length of the argument is not 16.
+     */
+    UUID.ofInner = function (bytes) {
+        if (bytes.length !== 16) {
+            throw new TypeError("not 128-bit length");
+        }
+        else {
+            return new UUID(bytes);
+        }
+    };
+    /**
+     * Builds a byte array from UUIDv7 field values.
+     *
+     * @param unixTsMs - A 48-bit `unix_ts_ms` field value.
+     * @param randA - A 12-bit `rand_a` field value.
+     * @param randBHi - The higher 30 bits of 62-bit `rand_b` field value.
+     * @param randBLo - The lower 32 bits of 62-bit `rand_b` field value.
+     * @throws RangeError if any field value is out of the specified range.
+     */
+    UUID.fromFieldsV7 = function (unixTsMs, randA, randBHi, randBLo) {
+        if (!Number.isInteger(unixTsMs) ||
+            !Number.isInteger(randA) ||
+            !Number.isInteger(randBHi) ||
+            !Number.isInteger(randBLo) ||
+            unixTsMs < 0 ||
+            randA < 0 ||
+            randBHi < 0 ||
+            randBLo < 0 ||
+            unixTsMs > 281474976710655 ||
+            randA > 0xfff ||
+            randBHi > 1073741823 ||
+            randBLo > 4294967295) {
+            throw new RangeError("invalid field value");
+        }
+        var bytes = new Uint8Array(16);
+        bytes[0] = unixTsMs / Math.pow(2, 40);
+        bytes[1] = unixTsMs / Math.pow(2, 32);
+        bytes[2] = unixTsMs / Math.pow(2, 24);
+        bytes[3] = unixTsMs / Math.pow(2, 16);
+        bytes[4] = unixTsMs / Math.pow(2, 8);
+        bytes[5] = unixTsMs;
+        bytes[6] = 0x70 | (randA >>> 8);
+        bytes[7] = randA;
+        bytes[8] = 0x80 | (randBHi >>> 24);
+        bytes[9] = randBHi >>> 16;
+        bytes[10] = randBHi >>> 8;
+        bytes[11] = randBHi;
+        bytes[12] = randBLo >>> 24;
+        bytes[13] = randBLo >>> 16;
+        bytes[14] = randBLo >>> 8;
+        bytes[15] = randBLo;
+        return new UUID(bytes);
+    };
+    /**
+     * Builds a byte array from a string representation.
+     *
+     * This method accepts the following formats:
+     *
+     * - 32-digit hexadecimal format without hyphens: `0189dcd553117d408db09496a2eef37b`
+     * - 8-4-4-4-12 hyphenated format: `0189dcd5-5311-7d40-8db0-9496a2eef37b`
+     * - Hyphenated format with surrounding braces: `{0189dcd5-5311-7d40-8db0-9496a2eef37b}`
+     * - RFC 4122 URN format: `urn:uuid:0189dcd5-5311-7d40-8db0-9496a2eef37b`
+     *
+     * Leading and trailing whitespaces represents an error.
+     *
+     * @throws SyntaxError if the argument could not parse as a valid UUID string.
+     */
+    UUID.parse = function (uuid) {
+        var _a, _b, _c, _d;
+        var hex = undefined;
+        switch (uuid.length) {
+            case 32:
+                hex = (_a = /^[0-9a-f]{32}$/i.exec(uuid)) === null || _a === void 0 ? void 0 : _a[0];
+                break;
+            case 36:
+                hex =
+                    (_b = /^([0-9a-f]{8})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{12})$/i
+                        .exec(uuid)) === null || _b === void 0 ? void 0 : _b.slice(1, 6).join("");
+                break;
+            case 38:
+                hex =
+                    (_c = /^\{([0-9a-f]{8})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{12})\}$/i
+                        .exec(uuid)) === null || _c === void 0 ? void 0 : _c.slice(1, 6).join("");
+                break;
+            case 45:
+                hex =
+                    (_d = /^urn:uuid:([0-9a-f]{8})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{12})$/i
+                        .exec(uuid)) === null || _d === void 0 ? void 0 : _d.slice(1, 6).join("");
+                break;
+        }
+        if (hex) {
+            var inner = new Uint8Array(16);
+            for (var i = 0; i < 16; i += 4) {
+                var n = parseInt(hex.substring(2 * i, 2 * i + 8), 16);
+                inner[i + 0] = n >>> 24;
+                inner[i + 1] = n >>> 16;
+                inner[i + 2] = n >>> 8;
+                inner[i + 3] = n;
+            }
+            return new UUID(inner);
+        }
+        else {
+            throw new SyntaxError("could not parse UUID string");
+        }
+    };
+    /**
+     * @returns The 8-4-4-4-12 canonical hexadecimal string representation
+     * (`0189dcd5-5311-7d40-8db0-9496a2eef37b`).
+     */
+    UUID.prototype.toString = function () {
+        var text = "";
+        for (var i = 0; i < this.bytes.length; i++) {
+            text += DIGITS.charAt(this.bytes[i] >>> 4);
+            text += DIGITS.charAt(this.bytes[i] & 0xf);
+            if (i === 3 || i === 5 || i === 7 || i === 9) {
+                text += "-";
+            }
+        }
+        return text;
+    };
+    /**
+     * @returns The 32-digit hexadecimal representation without hyphens
+     * (`0189dcd553117d408db09496a2eef37b`).
+     */
+    UUID.prototype.toHex = function () {
+        var text = "";
+        for (var i = 0; i < this.bytes.length; i++) {
+            text += DIGITS.charAt(this.bytes[i] >>> 4);
+            text += DIGITS.charAt(this.bytes[i] & 0xf);
+        }
+        return text;
+    };
+    /** @returns The 8-4-4-4-12 canonical hexadecimal string representation. */
+    UUID.prototype.toJSON = function () {
+        return this.toString();
+    };
+    /**
+     * Reports the variant field value of the UUID or, if appropriate, "NIL" or
+     * "MAX".
+     *
+     * For convenience, this method reports "NIL" or "MAX" if `this` represents
+     * the Nil or Max UUID, although the Nil and Max UUIDs are technically
+     * subsumed under the variants `0b0` and `0b111`, respectively.
+     */
+    UUID.prototype.getVariant = function () {
+        var n = this.bytes[8] >>> 4;
+        if (n < 0) {
+            throw new Error("unreachable");
+        }
+        else if (n <= 7) {
+            return this.bytes.every(function (e) { return e === 0; }) ? "NIL" : "VAR_0";
+        }
+        else if (n <= 11) {
+            return "VAR_10";
+        }
+        else if (n <= 13) {
+            return "VAR_110";
+        }
+        else if (n <= 15) {
+            return this.bytes.every(function (e) { return e === 0xff; }) ? "MAX" : "VAR_RESERVED";
+        }
+        else {
+            throw new Error("unreachable");
+        }
+    };
+    /**
+     * Returns the version field value of the UUID or `undefined` if the UUID does
+     * not have the variant field value of `0b10`.
+     */
+    UUID.prototype.getVersion = function () {
+        return this.getVariant() === "VAR_10" ? this.bytes[6] >>> 4 : undefined;
+    };
+    /** Creates an object from `this`. */
+    UUID.prototype.clone = function () {
+        return new UUID(this.bytes.slice(0));
+    };
+    /** Returns true if `this` is equivalent to `other`. */
+    UUID.prototype.equals = function (other) {
+        return this.compareTo(other) === 0;
+    };
+    /**
+     * Returns a negative integer, zero, or positive integer if `this` is less
+     * than, equal to, or greater than `other`, respectively.
+     */
+    UUID.prototype.compareTo = function (other) {
+        for (var i = 0; i < 16; i++) {
+            var diff = this.bytes[i] - other.bytes[i];
+            if (diff !== 0) {
+                return Math.sign(diff);
+            }
+        }
+        return 0;
+    };
+    return UUID;
+}());
+/**
+ * Encapsulates the monotonic counter state.
+ *
+ * This class provides APIs to utilize a separate counter state from that of the
+ * global generator used by {@link uuidv7} and {@link uuidv7obj}. In addition to
+ * the default {@link generate} method, this class has {@link generateOrAbort}
+ * that is useful to absolutely guarantee the monotonically increasing order of
+ * generated UUIDs. See their respective documentation for details.
+ */
+var V7Generator = /** @class */ (function () {
+    /**
+     * Creates a generator object with the default random number generator, or
+     * with the specified one if passed as an argument. The specified random
+     * number generator should be cryptographically strong and securely seeded.
+     */
+    function V7Generator(randomNumberGenerator) {
+        this.timestamp = 0;
+        this.counter = 0;
+        this.random = randomNumberGenerator !== null && randomNumberGenerator !== void 0 ? randomNumberGenerator : getDefaultRandom();
+    }
+    /**
+     * Generates a new UUIDv7 object from the current timestamp, or resets the
+     * generator upon significant timestamp rollback.
+     *
+     * This method returns a monotonically increasing UUID by reusing the previous
+     * timestamp even if the up-to-date timestamp is smaller than the immediately
+     * preceding UUID's. However, when such a clock rollback is considered
+     * significant (i.e., by more than ten seconds), this method resets the
+     * generator and returns a new UUID based on the given timestamp, breaking the
+     * increasing order of UUIDs.
+     *
+     * See {@link generateOrAbort} for the other mode of generation and
+     * {@link generateOrResetCore} for the low-level primitive.
+     */
+    V7Generator.prototype.generate = function () {
+        return this.generateOrResetCore(Date.now(), 10000);
+    };
+    /**
+     * Generates a new UUIDv7 object from the current timestamp, or returns
+     * `undefined` upon significant timestamp rollback.
+     *
+     * This method returns a monotonically increasing UUID by reusing the previous
+     * timestamp even if the up-to-date timestamp is smaller than the immediately
+     * preceding UUID's. However, when such a clock rollback is considered
+     * significant (i.e., by more than ten seconds), this method aborts and
+     * returns `undefined` immediately.
+     *
+     * See {@link generate} for the other mode of generation and
+     * {@link generateOrAbortCore} for the low-level primitive.
+     */
+    V7Generator.prototype.generateOrAbort = function () {
+        return this.generateOrAbortCore(Date.now(), 10000);
+    };
+    /**
+     * Generates a new UUIDv7 object from the `unixTsMs` passed, or resets the
+     * generator upon significant timestamp rollback.
+     *
+     * This method is equivalent to {@link generate} except that it takes a custom
+     * timestamp and clock rollback allowance.
+     *
+     * @param rollbackAllowance - The amount of `unixTsMs` rollback that is
+     * considered significant. A suggested value is `10_000` (milliseconds).
+     * @throws RangeError if `unixTsMs` is not a 48-bit positive integer.
+     */
+    V7Generator.prototype.generateOrResetCore = function (unixTsMs, rollbackAllowance) {
+        var value = this.generateOrAbortCore(unixTsMs, rollbackAllowance);
+        if (value === undefined) {
+            // reset state and resume
+            this.timestamp = 0;
+            value = this.generateOrAbortCore(unixTsMs, rollbackAllowance);
+        }
+        return value;
+    };
+    /**
+     * Generates a new UUIDv7 object from the `unixTsMs` passed, or returns
+     * `undefined` upon significant timestamp rollback.
+     *
+     * This method is equivalent to {@link generateOrAbort} except that it takes a
+     * custom timestamp and clock rollback allowance.
+     *
+     * @param rollbackAllowance - The amount of `unixTsMs` rollback that is
+     * considered significant. A suggested value is `10_000` (milliseconds).
+     * @throws RangeError if `unixTsMs` is not a 48-bit positive integer.
+     */
+    V7Generator.prototype.generateOrAbortCore = function (unixTsMs, rollbackAllowance) {
+        var MAX_COUNTER = 4398046511103;
+        if (!Number.isInteger(unixTsMs) ||
+            unixTsMs < 1 ||
+            unixTsMs > 281474976710655) {
+            throw new RangeError("`unixTsMs` must be a 48-bit positive integer");
+        }
+        else if (rollbackAllowance < 0 || rollbackAllowance > 281474976710655) {
+            throw new RangeError("`rollbackAllowance` out of reasonable range");
+        }
+        if (unixTsMs > this.timestamp) {
+            this.timestamp = unixTsMs;
+            this.resetCounter();
+        }
+        else if (unixTsMs + rollbackAllowance >= this.timestamp) {
+            // go on with previous timestamp if new one is not much smaller
+            this.counter++;
+            if (this.counter > MAX_COUNTER) {
+                // increment timestamp at counter overflow
+                this.timestamp++;
+                this.resetCounter();
+            }
+        }
+        else {
+            // abort if clock went backwards to unbearable extent
+            return undefined;
+        }
+        return UUID.fromFieldsV7(this.timestamp, Math.trunc(this.counter / Math.pow(2, 30)), this.counter & (Math.pow(2, 30) - 1), this.random.nextUint32());
+    };
+    /** Initializes the counter at a 42-bit random integer. */
+    V7Generator.prototype.resetCounter = function () {
+        this.counter =
+            this.random.nextUint32() * 0x400 + (this.random.nextUint32() & 0x3ff);
+    };
+    /**
+     * Generates a new UUIDv4 object utilizing the random number generator inside.
+     *
+     * @internal
+     */
+    V7Generator.prototype.generateV4 = function () {
+        var bytes = new Uint8Array(Uint32Array.of(this.random.nextUint32(), this.random.nextUint32(), this.random.nextUint32(), this.random.nextUint32()).buffer);
+        bytes[6] = 0x40 | (bytes[6] >>> 4);
+        bytes[8] = 0x80 | (bytes[8] >>> 2);
+        return UUID.ofInner(bytes);
+    };
+    return V7Generator;
+}());
+/** Returns the default random number generator available in the environment. */
+var getDefaultRandom = function () {
+    // detect Web Crypto API
+    if (typeof crypto !== "undefined" &&
+        typeof crypto.getRandomValues !== "undefined") {
+        return new BufferedCryptoRandom();
+    }
+    else {
+        // fall back on Math.random() unless the flag is set to true
+        if (typeof UUIDV7_DENY_WEAK_RNG !== "undefined" && UUIDV7_DENY_WEAK_RNG) {
+            throw new Error("no cryptographically strong RNG available");
+        }
+        return {
+            nextUint32: function () { return Math.trunc(Math.random() * 65536) * 65536 +
+                Math.trunc(Math.random() * 65536); },
+        };
+    }
+};
+/**
+ * Wraps `crypto.getRandomValues()` to enable buffering; this uses a small
+ * buffer by default to avoid both unbearable throughput decline in some
+ * environments and the waste of time and space for unused values.
+ */
+var BufferedCryptoRandom = /** @class */ (function () {
+    function BufferedCryptoRandom() {
+        this.buffer = new Uint32Array(8);
+        this.cursor = 0xffff;
+    }
+    BufferedCryptoRandom.prototype.nextUint32 = function () {
+        if (this.cursor >= this.buffer.length) {
+            crypto.getRandomValues(this.buffer);
+            this.cursor = 0;
+        }
+        return this.buffer[this.cursor++];
+    };
+    return BufferedCryptoRandom;
+}());
+var defaultGenerator;
+/**
+ * Generates a UUIDv7 string.
+ *
+ * @returns The 8-4-4-4-12 canonical hexadecimal string representation
+ * ("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx").
+ */
+var uuidv7 = function () { return uuidv7obj().toString(); };
+/** Generates a UUIDv7 object. */
+var uuidv7obj = function () { return (defaultGenerator || (defaultGenerator = new V7Generator())).generate(); };
+
 var PostHogFetchHttpError = /** @class */ (function (_super) {
     __extends(PostHogFetchHttpError, _super);
     function PostHogFetchHttpError(response) {
@@ -731,8 +1106,8 @@ var PostHogCoreStateless = /** @class */ (function () {
     function PostHogCoreStateless(apiKey, options) {
         var _a, _b, _c, _d, _e;
         this.debugMode = false;
-        this.pendingPromises = {};
         this.disableGeoip = true;
+        this.pendingPromises = {};
         // internal
         this._events = new SimpleEventEmitter();
         assert(apiKey, "You must pass your PostHog project's api key.");
@@ -790,6 +1165,14 @@ var PostHogCoreStateless = /** @class */ (function () {
             properties: __assign(__assign({}, (payload.properties || {})), this.getCommonEventProperties()),
         };
     };
+    PostHogCoreStateless.prototype.addPendingPromise = function (promise) {
+        var _this = this;
+        var promiseUUID = uuidv7();
+        this.pendingPromises[promiseUUID] = promise;
+        promise.finally(function () {
+            delete _this.pendingPromises[promiseUUID];
+        });
+    };
     /***
      *** TRACKING
      ***/
@@ -840,6 +1223,7 @@ var PostHogCoreStateless = /** @class */ (function () {
         if (extraPayload === void 0) { extraPayload = {}; }
         return __awaiter(this, void 0, void 0, function () {
             var url, fetchOptions;
+            var _this = this;
             return __generator(this, function (_a) {
                 url = "".concat(this.host, "/decide/?v=3");
                 fetchOptions = {
@@ -850,7 +1234,7 @@ var PostHogCoreStateless = /** @class */ (function () {
                 return [2 /*return*/, this.fetchWithRetry(url, fetchOptions)
                         .then(function (response) { return response.json(); })
                         .catch(function (error) {
-                        console.error('Error fetching feature flags', error);
+                        _this._events.emit('error', error);
                         return undefined;
                     })];
             });
@@ -984,10 +1368,10 @@ var PostHogCoreStateless = /** @class */ (function () {
         var _this = this;
         var _a;
         if (this.optedOut) {
-            this._events.emit(type, "Library is disabled. Not sending event. To re-enable, call posthog.enable()");
+            this._events.emit(type, "Library is disabled. Not sending event. To re-enable, call posthog.optIn()");
             return;
         }
-        var message = __assign(__assign({}, _message), { type: type, library: this.getLibraryId(), library_version: this.getLibraryVersion(), timestamp: (options === null || options === void 0 ? void 0 : options.timestamp) ? options === null || options === void 0 ? void 0 : options.timestamp : currentISOTime() });
+        var message = __assign(__assign({}, _message), { type: type, library: this.getLibraryId(), library_version: this.getLibraryVersion(), timestamp: (options === null || options === void 0 ? void 0 : options.timestamp) ? options === null || options === void 0 ? void 0 : options.timestamp : currentISOTime(), uuid: (options === null || options === void 0 ? void 0 : options.uuid) ? options.uuid : uuidv7() });
         var addGeoipDisableProperty = (_a = options === null || options === void 0 ? void 0 : options.disableGeoip) !== null && _a !== void 0 ? _a : this.disableGeoip;
         if (addGeoipDisableProperty) {
             if (!message.properties) {
@@ -1037,14 +1421,11 @@ var PostHogCoreStateless = /** @class */ (function () {
             batch: messages,
             sent_at: currentISOTime(),
         };
-        var promiseUUID = generateUUID();
         var done = function (err) {
             if (err) {
                 _this._events.emit('error', err);
             }
             callback === null || callback === void 0 ? void 0 : callback(err, messages);
-            // remove promise from pendingPromises
-            delete _this.pendingPromises[promiseUUID];
             _this._events.emit('flush', messages);
         };
         // Don't set the user agent if we're not on a browser. The latest spec allows
@@ -1070,12 +1451,11 @@ var PostHogCoreStateless = /** @class */ (function () {
                 body: payload,
             };
         var requestPromise = this.fetchWithRetry(url, fetchOptions);
-        this.pendingPromises[promiseUUID] = requestPromise;
-        requestPromise
+        this.addPendingPromise(requestPromise
             .then(function () { return done(); })
             .catch(function (err) {
             done(err);
-        });
+        }));
     };
     PostHogCoreStateless.prototype.fetchWithRetry = function (url, options, retryOptions) {
         var _a;
@@ -1129,7 +1509,7 @@ var PostHogCoreStateless = /** @class */ (function () {
                         clearTimeout(this._flushTimer);
                         _a.label = 1;
                     case 1:
-                        _a.trys.push([1, 4, , 5]);
+                        _a.trys.push([1, 5, , 6]);
                         return [4 /*yield*/, this.flushAsync()];
                     case 2:
                         _a.sent();
@@ -1137,18 +1517,31 @@ var PostHogCoreStateless = /** @class */ (function () {
                                 return x.catch(function () {
                                     // ignore errors as we are shutting down and can't deal with them anyways.
                                 });
-                            }))];
+                            }))
+                            // flush again to make sure we send all events, some of which might've been added
+                            // while we were waiting for the pending promises to resolve
+                            // For example, see sendFeatureFlags in posthog-node/src/posthog-node.ts::capture
+                        ];
                     case 3:
                         _a.sent();
-                        return [3 /*break*/, 5];
+                        // flush again to make sure we send all events, some of which might've been added
+                        // while we were waiting for the pending promises to resolve
+                        // For example, see sendFeatureFlags in posthog-node/src/posthog-node.ts::capture
+                        return [4 /*yield*/, this.flushAsync()];
                     case 4:
+                        // flush again to make sure we send all events, some of which might've been added
+                        // while we were waiting for the pending promises to resolve
+                        // For example, see sendFeatureFlags in posthog-node/src/posthog-node.ts::capture
+                        _a.sent();
+                        return [3 /*break*/, 6];
+                    case 5:
                         e_2 = _a.sent();
                         if (!isPostHogFetchError(e_2)) {
                             throw e_2;
                         }
                         console.error('Error while shutting down PostHog', e_2);
-                        return [3 /*break*/, 5];
-                    case 5: return [2 /*return*/];
+                        return [3 /*break*/, 6];
+                    case 6: return [2 /*return*/];
                 }
             });
         });
@@ -1243,7 +1636,7 @@ var PostHogCore = /** @class */ (function (_super) {
         var sessionId = this.getPersistedProperty(PostHogPersistedProperty.SessionId);
         var sessionTimestamp = this.getPersistedProperty(PostHogPersistedProperty.SessionLastTimestamp) || 0;
         if (!sessionId || Date.now() - sessionTimestamp > this._sessionExpirationTimeSeconds * 1000) {
-            sessionId = generateUUID(globalThis);
+            sessionId = uuidv7();
             this.setPersistedProperty(PostHogPersistedProperty.SessionId, sessionId);
         }
         this.setPersistedProperty(PostHogPersistedProperty.SessionLastTimestamp, Date.now());
@@ -1255,7 +1648,7 @@ var PostHogCore = /** @class */ (function (_super) {
     PostHogCore.prototype.getAnonymousId = function () {
         var anonId = this.getPersistedProperty(PostHogPersistedProperty.AnonymousId);
         if (!anonId) {
-            anonId = generateUUID(globalThis);
+            anonId = uuidv7();
             this.setPersistedProperty(PostHogPersistedProperty.AnonymousId, anonId);
         }
         return anonId;
@@ -1578,7 +1971,7 @@ var PostHogCore = /** @class */ (function (_super) {
     return PostHogCore;
 }(PostHogCoreStateless));
 
-var version = "2.5.0";
+var version = "2.6.1";
 
 function getContext(window) {
   var context = {};