@amplitude/analytics-browser 0.5.0 → 0.6.1

package/lib/cjs/config.d.ts

@@ -1,4 +1,4 @@
-import { Event, BrowserOptions, BrowserConfig as IBrowserConfig, Storage, TrackingOptions, TransportType, UserSession } from '@amplitude/analytics-types';
+import { Event, BrowserOptions, BrowserConfig as IBrowserConfig, Storage, TrackingOptions, TransportType, UserSession, SessionManager as ISessionManager } from '@amplitude/analytics-types';
 import { Config, MemoryStorage } from '@amplitude/analytics-core';
 import { FetchTransport } from './transports/fetch';
 import { XHRTransport } from './transports/xhr';
@@ -10,10 +10,6 @@ export declare const getDefaultConfig: () => {
     cookieStorage: MemoryStorage<UserSession>;
     disableCookies: boolean;
     domain: string;
-    includeGclid: boolean;
-    includeFbclid: boolean;
-    includeReferrer: boolean;
-    includeUtm: boolean;
     sessionTimeout: number;
     storageProvider: MemoryStorage<Event[]>;
     trackingOptions: {
@@ -39,19 +35,23 @@ export declare class BrowserConfig extends Config implements IBrowserConfig {
     cookieSameSite: string;
     cookieSecure: boolean;
     cookieStorage: Storage<UserSession>;
-    deviceId?: string;
     disableCookies: boolean;
     domain: string;
-    includeGclid: boolean;
-    includeFbclid: boolean;
-    includeReferrer: boolean;
-    includeUtm: boolean;
     partnerId?: string;
-    sessionId?: number;
     sessionTimeout: number;
     trackingOptions: TrackingOptions;
-    userId?: string;
+    sessionManager: ISessionManager;
     constructor(apiKey: string, userId?: string, options?: BrowserOptions);
+    get deviceId(): string | undefined;
+    set deviceId(deviceId: string | undefined);
+    get userId(): string | undefined;
+    set userId(userId: string | undefined);
+    get sessionId(): number | undefined;
+    set sessionId(sessionId: number | undefined);
+    get optOut(): boolean;
+    set optOut(optOut: boolean);
+    get lastEventTime(): number | undefined;
+    set lastEventTime(lastEventTime: number | undefined);
 }
 export declare const useBrowserConfig: (apiKey: string, userId?: string | undefined, options?: BrowserOptions | undefined) => IBrowserConfig;
 export declare const createCookieStorage: (overrides?: BrowserOptions | undefined, baseConfig?: {
@@ -61,10 +61,6 @@ export declare const createCookieStorage: (overrides?: BrowserOptions | undefine
     cookieStorage: MemoryStorage<UserSession>;
     disableCookies: boolean;
     domain: string;
-    includeGclid: boolean;
-    includeFbclid: boolean;
-    includeReferrer: boolean;
-    includeUtm: boolean;
     sessionTimeout: number;
     storageProvider: MemoryStorage<Event[]>;
     trackingOptions: {
@@ -84,8 +80,8 @@ export declare const createCookieStorage: (overrides?: BrowserOptions | undefine
     };
     transportProvider: FetchTransport;
 }) => Storage<UserSession>;
+export declare const createFlexibleStorage: <T>(options: BrowserOptions) => Storage<T>;
 export declare const createEventsStorage: (overrides?: BrowserOptions | undefined) => Storage<Event[]>;
 export declare const createDeviceId: (idFromCookies?: string | undefined, idFromOptions?: string | undefined, idFromQueryParams?: string | undefined) => string;
-export declare const createSessionId: (idFromCookies: number | undefined, idFromOptions: number | undefined, lastEventTime: number | undefined, sessionTimeout: number) => number;
 export declare const createTransport: (transport?: TransportType | undefined) => FetchTransport | XHRTransport | SendBeaconTransport;
 //# sourceMappingURL=config.d.ts.map

package/lib/cjs/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,cAAc,EACd,aAAa,IAAI,cAAc,EAC/B,OAAO,EACP,eAAe,EACf,aAAa,EACb,WAAW,EACZ,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAQ,MAAM,2BAA2B,CAAC;AAGxE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAIpD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6B3B,CAAC;AAEH,qBAAa,aAAc,SAAQ,MAAO,YAAW,cAAc;IACjE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,OAAO,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,eAAe,EAAE,OAAO,CAAC;IACzB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,eAAe,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;gBAEJ,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc;CA4BtE;AAED,eAAO,MAAM,gBAAgB,WAAY,MAAM,wEAA8C,cAmB5F,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BAkB/B,CAAC;AAEF,eAAO,MAAM,mBAAmB,8DAS/B,CAAC;AAEF,eAAO,MAAM,cAAc,4HAE1B,CAAC;AAEF,eAAO,MAAM,eAAe,4HAA6E,MAAM,WAK9G,CAAC;AAEF,eAAO,MAAM,eAAe,gGAQ3B,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,cAAc,EACd,aAAa,IAAI,cAAc,EAC/B,OAAO,EACP,eAAe,EACf,aAAa,EACb,WAAW,EACX,cAAc,IAAI,eAAe,EAClC,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAQ,MAAM,2BAA2B,CAAC;AAGxE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAIpD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAG/D,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;CAyB3B,CAAC;AAEH,qBAAa,aAAc,SAAQ,MAAO,YAAW,cAAc;IACjE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IACpC,cAAc,EAAE,OAAO,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,eAAe,CAAC;IACjC,cAAc,EAAE,eAAe,CAAC;gBAEpB,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc;IA8BrE,IAAI,QAAQ,IAIW,MAAM,GAAG,SAAS,CAFxC;IAED,IAAI,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAExC;IAED,IAAI,MAAM,IAIS,MAAM,GAAG,SAAS,CAFpC;IAED,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAEpC;IAED,IAAI,SAAS,IAIY,MAAM,GAAG,SAAS,CAF1C;IAED,IAAI,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,EAE1C;IAED,IAAI,MAAM,IAIS,OAAO,CAFzB;IAED,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,EAEzB;IAED,IAAI,aAAa,IAIgB,MAAM,GAAG,SAAS,CAFlD;IAED,IAAI,aAAa,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,EAElD;CACF;AAED,eAAO,MAAM,gBAAgB,WAAY,MAAM,wEAA8C,cAmB5F,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;0BAO/B,CAAC;AAEF,eAAO,MAAM,qBAAqB,eAAgB,cAAc,eAc/D,CAAC;AAEF,eAAO,MAAM,mBAAmB,8DAS/B,CAAC;AAEF,eAAO,MAAM,cAAc,4HAE1B,CAAC;AAEF,eAAO,MAAM,eAAe,gGAQ3B,CAAC"}

package/lib/cjs/config.js

@@ -1,15 +1,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTransport = exports.createSessionId = exports.createDeviceId = exports.createEventsStorage = exports.createCookieStorage = exports.useBrowserConfig = exports.BrowserConfig = exports.getDefaultConfig = void 0;
+exports.createTransport = exports.createDeviceId = exports.createEventsStorage = exports.createFlexibleStorage = exports.createCookieStorage = exports.useBrowserConfig = exports.BrowserConfig = exports.getDefaultConfig = void 0;
 var tslib_1 = require("tslib");
 var analytics_types_1 = require("@amplitude/analytics-types");
 var analytics_core_1 = require("@amplitude/analytics-core");
 var cookie_1 = require("./storage/cookie");
 var fetch_1 = require("./transports/fetch");
 var local_storage_1 = require("./storage/local-storage");
-var session_manager_1 = require("./session-manager");
+var cookie_name_1 = require("./utils/cookie-name");
 var query_params_1 = require("./utils/query-params");
 var xhr_1 = require("./transports/xhr");
 var send_beacon_1 = require("./transports/send-beacon");
+var session_manager_1 = require("./session-manager");
 var getDefaultConfig = function () { return ({
     cookieExpiration: 365,
     cookieSameSite: 'Lax',
@@ -17,10 +18,6 @@ var getDefaultConfig = function () { return ({
     cookieStorage: new analytics_core_1.MemoryStorage(),
     disableCookies: false,
     domain: '',
-    includeGclid: true,
-    includeFbclid: true,
-    includeReferrer: true,
-    includeUtm: true,
     sessionTimeout: 30 * 60 * 1000,
     storageProvider: new analytics_core_1.MemoryStorage(),
     trackingOptions: {
@@ -44,41 +41,94 @@ exports.getDefaultConfig = getDefaultConfig;
 var BrowserConfig = /** @class */ (function (_super) {
     (0, tslib_1.__extends)(BrowserConfig, _super);
     function BrowserConfig(apiKey, userId, options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         var _this = this;
         var defaultConfig = (0, exports.getDefaultConfig)();
-        _this = _super.call(this, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, options), { apiKey: apiKey, optOut: Boolean(options === null || options === void 0 ? void 0 : options.optOut), storageProvider: (_a = options === null || options === void 0 ? void 0 : options.storageProvider) !== null && _a !== void 0 ? _a : defaultConfig.storageProvider, transportProvider: (_b = options === null || options === void 0 ? void 0 : options.transportProvider) !== null && _b !== void 0 ? _b : defaultConfig.transportProvider })) || this;
+        _this = _super.call(this, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, options), { apiKey: apiKey, storageProvider: (_a = options === null || options === void 0 ? void 0 : options.storageProvider) !== null && _a !== void 0 ? _a : defaultConfig.storageProvider, transportProvider: (_b = options === null || options === void 0 ? void 0 : options.transportProvider) !== null && _b !== void 0 ? _b : defaultConfig.transportProvider })) || this;
+        _this.cookieStorage = (_c = options === null || options === void 0 ? void 0 : options.cookieStorage) !== null && _c !== void 0 ? _c : defaultConfig.cookieStorage;
+        _this.sessionTimeout = (_d = options === null || options === void 0 ? void 0 : options.sessionTimeout) !== null && _d !== void 0 ? _d : defaultConfig.sessionTimeout;
+        _this.sessionManager = new session_manager_1.SessionManager(_this.cookieStorage, {
+            apiKey: apiKey,
+            sessionTimeout: _this.sessionTimeout,
+        });
         _this.appVersion = options === null || options === void 0 ? void 0 : options.appVersion;
-        _this.cookieExpiration = (_c = options === null || options === void 0 ? void 0 : options.cookieExpiration) !== null && _c !== void 0 ? _c : defaultConfig.cookieExpiration;
-        _this.cookieSameSite = (_d = options === null || options === void 0 ? void 0 : options.cookieSameSite) !== null && _d !== void 0 ? _d : defaultConfig.cookieSameSite;
-        _this.cookieSecure = (_e = options === null || options === void 0 ? void 0 : options.cookieSecure) !== null && _e !== void 0 ? _e : defaultConfig.cookieSecure;
-        _this.cookieStorage = (_f = options === null || options === void 0 ? void 0 : options.cookieStorage) !== null && _f !== void 0 ? _f : defaultConfig.cookieStorage;
+        _this.cookieExpiration = (_e = options === null || options === void 0 ? void 0 : options.cookieExpiration) !== null && _e !== void 0 ? _e : defaultConfig.cookieExpiration;
+        _this.cookieSameSite = (_f = options === null || options === void 0 ? void 0 : options.cookieSameSite) !== null && _f !== void 0 ? _f : defaultConfig.cookieSameSite;
+        _this.cookieSecure = (_g = options === null || options === void 0 ? void 0 : options.cookieSecure) !== null && _g !== void 0 ? _g : defaultConfig.cookieSecure;
         _this.deviceId = options === null || options === void 0 ? void 0 : options.deviceId;
-        _this.disableCookies = (_g = options === null || options === void 0 ? void 0 : options.disableCookies) !== null && _g !== void 0 ? _g : defaultConfig.disableCookies;
-        _this.domain = (_h = options === null || options === void 0 ? void 0 : options.domain) !== null && _h !== void 0 ? _h : defaultConfig.domain;
-        _this.includeGclid = (_j = options === null || options === void 0 ? void 0 : options.includeGclid) !== null && _j !== void 0 ? _j : defaultConfig.includeGclid;
-        _this.includeFbclid = (_k = options === null || options === void 0 ? void 0 : options.includeFbclid) !== null && _k !== void 0 ? _k : defaultConfig.includeFbclid;
-        _this.includeReferrer = (_l = options === null || options === void 0 ? void 0 : options.includeReferrer) !== null && _l !== void 0 ? _l : defaultConfig.includeReferrer;
-        _this.includeUtm = (_m = options === null || options === void 0 ? void 0 : options.includeUtm) !== null && _m !== void 0 ? _m : defaultConfig.includeUtm;
+        _this.disableCookies = (_h = options === null || options === void 0 ? void 0 : options.disableCookies) !== null && _h !== void 0 ? _h : defaultConfig.disableCookies;
+        _this.domain = (_j = options === null || options === void 0 ? void 0 : options.domain) !== null && _j !== void 0 ? _j : defaultConfig.domain;
+        _this.lastEventTime = (_k = _this.lastEventTime) !== null && _k !== void 0 ? _k : options === null || options === void 0 ? void 0 : options.lastEventTime;
+        _this.optOut = Boolean(options === null || options === void 0 ? void 0 : options.optOut);
         _this.partnerId = options === null || options === void 0 ? void 0 : options.partnerId;
         _this.sessionId = options === null || options === void 0 ? void 0 : options.sessionId;
-        _this.sessionTimeout = (_o = options === null || options === void 0 ? void 0 : options.sessionTimeout) !== null && _o !== void 0 ? _o : defaultConfig.sessionTimeout;
-        _this.trackingOptions = (_p = options === null || options === void 0 ? void 0 : options.trackingOptions) !== null && _p !== void 0 ? _p : defaultConfig.trackingOptions;
+        _this.trackingOptions = (_l = options === null || options === void 0 ? void 0 : options.trackingOptions) !== null && _l !== void 0 ? _l : defaultConfig.trackingOptions;
         _this.userId = userId;
         return _this;
     }
+    Object.defineProperty(BrowserConfig.prototype, "deviceId", {
+        get: function () {
+            return this.sessionManager.getDeviceId();
+        },
+        set: function (deviceId) {
+            this.sessionManager.setDeviceId(deviceId);
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(BrowserConfig.prototype, "userId", {
+        get: function () {
+            return this.sessionManager.getUserId();
+        },
+        set: function (userId) {
+            this.sessionManager.setUserId(userId);
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(BrowserConfig.prototype, "sessionId", {
+        get: function () {
+            return this.sessionManager.getSessionId();
+        },
+        set: function (sessionId) {
+            this.sessionManager.setSessionId(sessionId);
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(BrowserConfig.prototype, "optOut", {
+        get: function () {
+            return this.sessionManager.getOptOut();
+        },
+        set: function (optOut) {
+            var _a;
+            (_a = this.sessionManager) === null || _a === void 0 ? void 0 : _a.setOptOut(Boolean(optOut));
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(BrowserConfig.prototype, "lastEventTime", {
+        get: function () {
+            return this.sessionManager.getLastEventTime();
+        },
+        set: function (lastEventTime) {
+            this.sessionManager.setLastEventTime(lastEventTime);
+        },
+        enumerable: false,
+        configurable: true
+    });
     return BrowserConfig;
 }(analytics_core_1.Config));
 exports.BrowserConfig = BrowserConfig;
 var useBrowserConfig = function (apiKey, userId, options) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     var defaultConfig = (0, exports.getDefaultConfig)();
     var cookieStorage = (0, exports.createCookieStorage)(options);
-    var cookieName = (0, session_manager_1.getCookieName)(apiKey);
+    var cookieName = (0, cookie_name_1.getCookieName)(apiKey);
     var cookies = cookieStorage.get(cookieName);
     var queryParams = (0, query_params_1.getQueryParams)();
     var sessionTimeout = (_a = options === null || options === void 0 ? void 0 : options.sessionTimeout) !== null && _a !== void 0 ? _a : defaultConfig.sessionTimeout;
-    return new BrowserConfig(apiKey, userId !== null && userId !== void 0 ? userId : cookies === null || cookies === void 0 ? void 0 : cookies.userId, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, options), { cookieStorage: cookieStorage, sessionTimeout: sessionTimeout, deviceId: (0, exports.createDeviceId)(cookies === null || cookies === void 0 ? void 0 : cookies.deviceId, options === null || options === void 0 ? void 0 : options.deviceId, queryParams.deviceId), optOut: (_b = options === null || options === void 0 ? void 0 : options.optOut) !== null && _b !== void 0 ? _b : Boolean(cookies === null || cookies === void 0 ? void 0 : cookies.optOut), sessionId: (0, exports.createSessionId)(cookies === null || cookies === void 0 ? void 0 : cookies.sessionId, options === null || options === void 0 ? void 0 : options.sessionId, cookies === null || cookies === void 0 ? void 0 : cookies.lastEventTime, sessionTimeout), storageProvider: (0, exports.createEventsStorage)(options), trackingOptions: (0, tslib_1.__assign)((0, tslib_1.__assign)({}, defaultConfig.trackingOptions), options === null || options === void 0 ? void 0 : options.trackingOptions), transportProvider: (_c = options === null || options === void 0 ? void 0 : options.transportProvider) !== null && _c !== void 0 ? _c : (0, exports.createTransport)(options === null || options === void 0 ? void 0 : options.transport) }));
+    return new BrowserConfig(apiKey, userId !== null && userId !== void 0 ? userId : cookies === null || cookies === void 0 ? void 0 : cookies.userId, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, options), { cookieStorage: cookieStorage, sessionTimeout: sessionTimeout, deviceId: (0, exports.createDeviceId)(cookies === null || cookies === void 0 ? void 0 : cookies.deviceId, options === null || options === void 0 ? void 0 : options.deviceId, queryParams.deviceId), optOut: (_b = options === null || options === void 0 ? void 0 : options.optOut) !== null && _b !== void 0 ? _b : Boolean(cookies === null || cookies === void 0 ? void 0 : cookies.optOut), sessionId: (_d = (_c = cookieStorage.get(cookieName)) === null || _c === void 0 ? void 0 : _c.sessionId) !== null && _d !== void 0 ? _d : options === null || options === void 0 ? void 0 : options.sessionId, storageProvider: (0, exports.createEventsStorage)(options), trackingOptions: (0, tslib_1.__assign)((0, tslib_1.__assign)({}, defaultConfig.trackingOptions), options === null || options === void 0 ? void 0 : options.trackingOptions), transportProvider: (_e = options === null || options === void 0 ? void 0 : options.transportProvider) !== null && _e !== void 0 ? _e : (0, exports.createTransport)(options === null || options === void 0 ? void 0 : options.transport) }));
 };
 exports.useBrowserConfig = useBrowserConfig;
 var createCookieStorage = function (overrides, baseConfig) {
@@ -86,22 +136,27 @@ var createCookieStorage = function (overrides, baseConfig) {
     var options = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, baseConfig), overrides);
     var cookieStorage = overrides === null || overrides === void 0 ? void 0 : overrides.cookieStorage;
     if (!cookieStorage || !cookieStorage.isEnabled()) {
-        cookieStorage = new cookie_1.CookieStorage({
-            domain: options.domain,
-            expirationDays: options.cookieExpiration,
-            sameSite: options.cookieSameSite,
-            secure: options.cookieSecure,
-        });
-        if (options.disableCookies || !cookieStorage.isEnabled()) {
-            cookieStorage = new local_storage_1.LocalStorage();
-            if (!cookieStorage.isEnabled()) {
-                cookieStorage = new analytics_core_1.MemoryStorage();
-            }
-        }
+        return (0, exports.createFlexibleStorage)(options);
     }
     return cookieStorage;
 };
 exports.createCookieStorage = createCookieStorage;
+var createFlexibleStorage = function (options) {
+    var storage = new cookie_1.CookieStorage({
+        domain: options.domain,
+        expirationDays: options.cookieExpiration,
+        sameSite: options.cookieSameSite,
+        secure: options.cookieSecure,
+    });
+    if (options.disableCookies || !storage.isEnabled()) {
+        storage = new local_storage_1.LocalStorage();
+        if (!storage.isEnabled()) {
+            storage = new analytics_core_1.MemoryStorage();
+        }
+    }
+    return storage;
+};
+exports.createFlexibleStorage = createFlexibleStorage;
 var createEventsStorage = function (overrides) {
     var eventsStorage = overrides === null || overrides === void 0 ? void 0 : overrides.storageProvider;
     if (!eventsStorage || !eventsStorage.isEnabled()) {
@@ -117,16 +172,6 @@ var createDeviceId = function (idFromCookies, idFromOptions, idFromQueryParams)
     return idFromOptions || idFromQueryParams || idFromCookies || (0, analytics_core_1.UUID)();
 };
 exports.createDeviceId = createDeviceId;
-var createSessionId = function (idFromCookies, idFromOptions, lastEventTime, sessionTimeout) {
-    if (idFromCookies === void 0) { idFromCookies = 0; }
-    if (idFromOptions === void 0) { idFromOptions = 0; }
-    if (lastEventTime === void 0) { lastEventTime = 0; }
-    if (idFromCookies && Date.now() - lastEventTime < sessionTimeout) {
-        return idFromCookies;
-    }
-    return idFromOptions ? idFromOptions : Date.now();
-};
-exports.createSessionId = createSessionId;
 var createTransport = function (transport) {
     if (transport === analytics_types_1.TransportType.XHR) {
         return new xhr_1.XHRTransport();

package/lib/cjs/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Event,\n  BrowserOptions,\n  BrowserConfig as IBrowserConfig,\n  Storage,\n  TrackingOptions,\n  TransportType,\n  UserSession,\n} from '@amplitude/analytics-types';\nimport { Config, MemoryStorage, UUID } from '@amplitude/analytics-core';\n\nimport { CookieStorage } from './storage/cookie';\nimport { FetchTransport } from './transports/fetch';\nimport { LocalStorage } from './storage/local-storage';\nimport { getCookieName } from './session-manager';\nimport { getQueryParams } from './utils/query-params';\nimport { XHRTransport } from './transports/xhr';\nimport { SendBeaconTransport } from './transports/send-beacon';\n\nexport const getDefaultConfig = () => ({\n  cookieExpiration: 365,\n  cookieSameSite: 'Lax',\n  cookieSecure: false,\n  cookieStorage: new MemoryStorage<UserSession>(),\n  disableCookies: false,\n  domain: '',\n  includeGclid: true,\n  includeFbclid: true,\n  includeReferrer: true,\n  includeUtm: true,\n  sessionTimeout: 30 * 60 * 1000,\n  storageProvider: new MemoryStorage<Event[]>(),\n  trackingOptions: {\n    city: true,\n    country: true,\n    carrier: true,\n    deviceManufacturer: true,\n    deviceModel: true,\n    dma: true,\n    ipAddress: true,\n    language: true,\n    osName: true,\n    osVersion: true,\n    platform: true,\n    region: true,\n    versionName: true,\n  },\n  transportProvider: new FetchTransport(),\n});\n\nexport class BrowserConfig extends Config implements IBrowserConfig {\n  appVersion?: string;\n  cookieExpiration: number;\n  cookieSameSite: string;\n  cookieSecure: boolean;\n  cookieStorage: Storage<UserSession>;\n  deviceId?: string;\n  disableCookies: boolean;\n  domain: string;\n  includeGclid: boolean;\n  includeFbclid: boolean;\n  includeReferrer: boolean;\n  includeUtm: boolean;\n  partnerId?: string;\n  sessionId?: number;\n  sessionTimeout: number;\n  trackingOptions: TrackingOptions;\n  userId?: string;\n\n  constructor(apiKey: string, userId?: string, options?: BrowserOptions) {\n    const defaultConfig = getDefaultConfig();\n    super({\n      ...options,\n      apiKey,\n      optOut: Boolean(options?.optOut),\n      storageProvider: options?.storageProvider ?? defaultConfig.storageProvider,\n      transportProvider: options?.transportProvider ?? defaultConfig.transportProvider,\n    });\n\n    this.appVersion = options?.appVersion;\n    this.cookieExpiration = options?.cookieExpiration ?? defaultConfig.cookieExpiration;\n    this.cookieSameSite = options?.cookieSameSite ?? defaultConfig.cookieSameSite;\n    this.cookieSecure = options?.cookieSecure ?? defaultConfig.cookieSecure;\n    this.cookieStorage = options?.cookieStorage ?? defaultConfig.cookieStorage;\n    this.deviceId = options?.deviceId;\n    this.disableCookies = options?.disableCookies ?? defaultConfig.disableCookies;\n    this.domain = options?.domain ?? defaultConfig.domain;\n    this.includeGclid = options?.includeGclid ?? defaultConfig.includeGclid;\n    this.includeFbclid = options?.includeFbclid ?? defaultConfig.includeFbclid;\n    this.includeReferrer = options?.includeReferrer ?? defaultConfig.includeReferrer;\n    this.includeUtm = options?.includeUtm ?? defaultConfig.includeUtm;\n    this.partnerId = options?.partnerId;\n    this.sessionId = options?.sessionId;\n    this.sessionTimeout = options?.sessionTimeout ?? defaultConfig.sessionTimeout;\n    this.trackingOptions = options?.trackingOptions ?? defaultConfig.trackingOptions;\n    this.userId = userId;\n  }\n}\n\nexport const useBrowserConfig = (apiKey: string, userId?: string, options?: BrowserOptions): IBrowserConfig => {\n  const defaultConfig = getDefaultConfig();\n  const cookieStorage = createCookieStorage(options);\n  const cookieName = getCookieName(apiKey);\n  const cookies = cookieStorage.get(cookieName);\n  const queryParams = getQueryParams();\n  const sessionTimeout = options?.sessionTimeout ?? defaultConfig.sessionTimeout;\n\n  return new BrowserConfig(apiKey, userId ?? cookies?.userId, {\n    ...options,\n    cookieStorage,\n    sessionTimeout,\n    deviceId: createDeviceId(cookies?.deviceId, options?.deviceId, queryParams.deviceId),\n    optOut: options?.optOut ?? Boolean(cookies?.optOut),\n    sessionId: createSessionId(cookies?.sessionId, options?.sessionId, cookies?.lastEventTime, sessionTimeout),\n    storageProvider: createEventsStorage(options),\n    trackingOptions: { ...defaultConfig.trackingOptions, ...options?.trackingOptions },\n    transportProvider: options?.transportProvider ?? createTransport(options?.transport),\n  });\n};\n\nexport const createCookieStorage = (overrides?: BrowserOptions, baseConfig = getDefaultConfig()) => {\n  const options = { ...baseConfig, ...overrides };\n  let cookieStorage = overrides?.cookieStorage;\n  if (!cookieStorage || !cookieStorage.isEnabled()) {\n    cookieStorage = new CookieStorage({\n      domain: options.domain,\n      expirationDays: options.cookieExpiration,\n      sameSite: options.cookieSameSite,\n      secure: options.cookieSecure,\n    });\n    if (options.disableCookies || !cookieStorage.isEnabled()) {\n      cookieStorage = new LocalStorage();\n      if (!cookieStorage.isEnabled()) {\n        cookieStorage = new MemoryStorage();\n      }\n    }\n  }\n  return cookieStorage;\n};\n\nexport const createEventsStorage = (overrides?: BrowserOptions) => {\n  let eventsStorage = overrides?.storageProvider;\n  if (!eventsStorage || !eventsStorage.isEnabled()) {\n    eventsStorage = new LocalStorage();\n    if (!eventsStorage.isEnabled()) {\n      eventsStorage = new MemoryStorage();\n    }\n  }\n  return eventsStorage;\n};\n\nexport const createDeviceId = (idFromCookies?: string, idFromOptions?: string, idFromQueryParams?: string) => {\n  return idFromOptions || idFromQueryParams || idFromCookies || UUID();\n};\n\nexport const createSessionId = (idFromCookies = 0, idFromOptions = 0, lastEventTime = 0, sessionTimeout: number) => {\n  if (idFromCookies && Date.now() - lastEventTime < sessionTimeout) {\n    return idFromCookies;\n  }\n  return idFromOptions ? idFromOptions : Date.now();\n};\n\nexport const createTransport = (transport?: TransportType) => {\n  if (transport === TransportType.XHR) {\n    return new XHRTransport();\n  }\n  if (transport === TransportType.SendBeacon) {\n    return new SendBeaconTransport();\n  }\n  return getDefaultConfig().transportProvider;\n};\n"]}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Event,\n  BrowserOptions,\n  BrowserConfig as IBrowserConfig,\n  Storage,\n  TrackingOptions,\n  TransportType,\n  UserSession,\n  SessionManager as ISessionManager,\n} from '@amplitude/analytics-types';\nimport { Config, MemoryStorage, UUID } from '@amplitude/analytics-core';\n\nimport { CookieStorage } from './storage/cookie';\nimport { FetchTransport } from './transports/fetch';\nimport { LocalStorage } from './storage/local-storage';\nimport { getCookieName } from './utils/cookie-name';\nimport { getQueryParams } from './utils/query-params';\nimport { XHRTransport } from './transports/xhr';\nimport { SendBeaconTransport } from './transports/send-beacon';\nimport { SessionManager } from './session-manager';\n\nexport const getDefaultConfig = () => ({\n  cookieExpiration: 365,\n  cookieSameSite: 'Lax',\n  cookieSecure: false,\n  cookieStorage: new MemoryStorage<UserSession>(),\n  disableCookies: false,\n  domain: '',\n  sessionTimeout: 30 * 60 * 1000,\n  storageProvider: new MemoryStorage<Event[]>(),\n  trackingOptions: {\n    city: true,\n    country: true,\n    carrier: true,\n    deviceManufacturer: true,\n    deviceModel: true,\n    dma: true,\n    ipAddress: true,\n    language: true,\n    osName: true,\n    osVersion: true,\n    platform: true,\n    region: true,\n    versionName: true,\n  },\n  transportProvider: new FetchTransport(),\n});\n\nexport class BrowserConfig extends Config implements IBrowserConfig {\n  appVersion?: string;\n  cookieExpiration: number;\n  cookieSameSite: string;\n  cookieSecure: boolean;\n  cookieStorage: Storage<UserSession>;\n  disableCookies: boolean;\n  domain: string;\n  partnerId?: string;\n  sessionTimeout: number;\n  trackingOptions: TrackingOptions;\n  sessionManager: ISessionManager;\n\n  constructor(apiKey: string, userId?: string, options?: BrowserOptions) {\n    const defaultConfig = getDefaultConfig();\n    super({\n      ...options,\n      apiKey,\n      storageProvider: options?.storageProvider ?? defaultConfig.storageProvider,\n      transportProvider: options?.transportProvider ?? defaultConfig.transportProvider,\n    });\n    this.cookieStorage = options?.cookieStorage ?? defaultConfig.cookieStorage;\n    this.sessionTimeout = options?.sessionTimeout ?? defaultConfig.sessionTimeout;\n    this.sessionManager = new SessionManager(this.cookieStorage, {\n      apiKey,\n      sessionTimeout: this.sessionTimeout,\n    });\n\n    this.appVersion = options?.appVersion;\n    this.cookieExpiration = options?.cookieExpiration ?? defaultConfig.cookieExpiration;\n    this.cookieSameSite = options?.cookieSameSite ?? defaultConfig.cookieSameSite;\n    this.cookieSecure = options?.cookieSecure ?? defaultConfig.cookieSecure;\n    this.deviceId = options?.deviceId;\n    this.disableCookies = options?.disableCookies ?? defaultConfig.disableCookies;\n    this.domain = options?.domain ?? defaultConfig.domain;\n    this.lastEventTime = this.lastEventTime ?? options?.lastEventTime;\n    this.optOut = Boolean(options?.optOut);\n    this.partnerId = options?.partnerId;\n    this.sessionId = options?.sessionId;\n    this.trackingOptions = options?.trackingOptions ?? defaultConfig.trackingOptions;\n    this.userId = userId;\n  }\n\n  get deviceId() {\n    return this.sessionManager.getDeviceId();\n  }\n\n  set deviceId(deviceId: string | undefined) {\n    this.sessionManager.setDeviceId(deviceId);\n  }\n\n  get userId() {\n    return this.sessionManager.getUserId();\n  }\n\n  set userId(userId: string | undefined) {\n    this.sessionManager.setUserId(userId);\n  }\n\n  get sessionId() {\n    return this.sessionManager.getSessionId();\n  }\n\n  set sessionId(sessionId: number | undefined) {\n    this.sessionManager.setSessionId(sessionId);\n  }\n\n  get optOut() {\n    return this.sessionManager.getOptOut();\n  }\n\n  set optOut(optOut: boolean) {\n    this.sessionManager?.setOptOut(Boolean(optOut));\n  }\n\n  get lastEventTime() {\n    return this.sessionManager.getLastEventTime();\n  }\n\n  set lastEventTime(lastEventTime: number | undefined) {\n    this.sessionManager.setLastEventTime(lastEventTime);\n  }\n}\n\nexport const useBrowserConfig = (apiKey: string, userId?: string, options?: BrowserOptions): IBrowserConfig => {\n  const defaultConfig = getDefaultConfig();\n  const cookieStorage = createCookieStorage(options);\n  const cookieName = getCookieName(apiKey);\n  const cookies = cookieStorage.get(cookieName);\n  const queryParams = getQueryParams();\n  const sessionTimeout = options?.sessionTimeout ?? defaultConfig.sessionTimeout;\n\n  return new BrowserConfig(apiKey, userId ?? cookies?.userId, {\n    ...options,\n    cookieStorage,\n    sessionTimeout,\n    deviceId: createDeviceId(cookies?.deviceId, options?.deviceId, queryParams.deviceId),\n    optOut: options?.optOut ?? Boolean(cookies?.optOut),\n    sessionId: cookieStorage.get(cookieName)?.sessionId ?? options?.sessionId,\n    storageProvider: createEventsStorage(options),\n    trackingOptions: { ...defaultConfig.trackingOptions, ...options?.trackingOptions },\n    transportProvider: options?.transportProvider ?? createTransport(options?.transport),\n  });\n};\n\nexport const createCookieStorage = (overrides?: BrowserOptions, baseConfig = getDefaultConfig()) => {\n  const options = { ...baseConfig, ...overrides };\n  const cookieStorage = overrides?.cookieStorage;\n  if (!cookieStorage || !cookieStorage.isEnabled()) {\n    return createFlexibleStorage<UserSession>(options);\n  }\n  return cookieStorage;\n};\n\nexport const createFlexibleStorage = <T>(options: BrowserOptions): Storage<T> => {\n  let storage: Storage<T> = new CookieStorage({\n    domain: options.domain,\n    expirationDays: options.cookieExpiration,\n    sameSite: options.cookieSameSite,\n    secure: options.cookieSecure,\n  });\n  if (options.disableCookies || !storage.isEnabled()) {\n    storage = new LocalStorage();\n    if (!storage.isEnabled()) {\n      storage = new MemoryStorage();\n    }\n  }\n  return storage;\n};\n\nexport const createEventsStorage = (overrides?: BrowserOptions) => {\n  let eventsStorage = overrides?.storageProvider;\n  if (!eventsStorage || !eventsStorage.isEnabled()) {\n    eventsStorage = new LocalStorage();\n    if (!eventsStorage.isEnabled()) {\n      eventsStorage = new MemoryStorage();\n    }\n  }\n  return eventsStorage;\n};\n\nexport const createDeviceId = (idFromCookies?: string, idFromOptions?: string, idFromQueryParams?: string) => {\n  return idFromOptions || idFromQueryParams || idFromCookies || UUID();\n};\n\nexport const createTransport = (transport?: TransportType) => {\n  if (transport === TransportType.XHR) {\n    return new XHRTransport();\n  }\n  if (transport === TransportType.SendBeacon) {\n    return new SendBeaconTransport();\n  }\n  return getDefaultConfig().transportProvider;\n};\n"]}

package/lib/cjs/cookie-migration/index.js

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decode = exports.parseTime = exports.parseOldCookies = void 0;
 var tslib_1 = require("tslib");
-var session_manager_1 = require("../session-manager");
+var cookie_name_1 = require("../utils/cookie-name");
 var local_storage_1 = require("../storage/local-storage");
 var cookie_1 = require("../storage/cookie");
 var parseOldCookies = function (apiKey, options) {
@@ -14,7 +14,7 @@ var parseOldCookies = function (apiKey, options) {
             optOut: false,
         };
     }
-    var oldCookieName = (0, session_manager_1.getOldCookieName)(apiKey);
+    var oldCookieName = (0, cookie_name_1.getOldCookieName)(apiKey);
     var cookies = storage.getRaw(oldCookieName);
     if (!cookies) {
         return {

package/lib/cjs/cookie-migration/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cookie-migration/index.ts"],"names":[],"mappings":";;;AACA,sDAAsD;AACtD,0DAAwD;AACxD,4CAAkD;AAE3C,IAAM,eAAe,GAAG,UAAC,MAAc,EAAE,OAAwB;IACtE,IAAI,OAAO,GAAoB,IAAI,sBAAa,EAAU,CAAC;IAC3D,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,KAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,CAAA,EAAE;QACnD,OAAO,GAAG,IAAI,4BAAY,EAAU,CAAC;KACtC;IACD,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE;QACxB,OAAO;YACL,MAAM,EAAE,KAAK;SACd,CAAC;KACH;IAED,IAAM,aAAa,GAAG,IAAA,kCAAgB,EAAC,MAAM,CAAC,CAAC;IAC/C,IAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAE9C,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO;YACL,MAAM,EAAE,KAAK;SACd,CAAC;KACH;IAED,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IACxB,IAAA,KAAA,oBAAuD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,IAAA,EAAxE,QAAQ,QAAA,EAAE,MAAM,QAAA,EAAE,MAAM,QAAA,EAAE,SAAS,QAAA,EAAE,aAAa,QAAsB,CAAC;IAChF,OAAO;QACL,QAAQ,UAAA;QACR,MAAM,EAAE,IAAA,cAAM,EAAC,MAAM,CAAC;QACtB,SAAS,EAAE,IAAA,iBAAS,EAAC,SAAS,CAAC;QAC/B,aAAa,EAAE,IAAA,iBAAS,EAAC,aAAa,CAAC;QACvC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC;KACxB,CAAC;AACJ,CAAC,CAAC;AA7BW,QAAA,eAAe,mBA6B1B;AAEK,IAAM,SAAS,GAAG,UAAC,GAAW;IACnC,IAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAClC,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE;QAClB,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AANW,QAAA,SAAS,aAMpB;AAEK,IAAM,MAAM,GAAG,UAAC,KAAc;IACnC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE;QAC9B,OAAO,SAAS,CAAC;KAClB;IACD,IAAI;QACF,OAAO,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KAChD;IAAC,WAAM;QACN,OAAO,SAAS,CAAC;KAClB;AACH,CAAC,CAAC;AATW,QAAA,MAAM,UASjB","sourcesContent":["import { BrowserOptions, Storage, UserSession } from '@amplitude/analytics-types';\nimport { getOldCookieName } from '../session-manager';\nimport { LocalStorage } from '../storage/local-storage';\nimport { CookieStorage } from '../storage/cookie';\n\nexport const parseOldCookies = (apiKey: string, options?: BrowserOptions): UserSession => {\n  let storage: Storage<string> = new CookieStorage<string>();\n  if (!storage.isEnabled() || options?.disableCookies) {\n    storage = new LocalStorage<string>();\n  }\n  if (!storage.isEnabled()) {\n    return {\n      optOut: false,\n    };\n  }\n\n  const oldCookieName = getOldCookieName(apiKey);\n  const cookies = storage.getRaw(oldCookieName);\n\n  if (!cookies) {\n    return {\n      optOut: false,\n    };\n  }\n\n  storage.remove(oldCookieName);\n  const [deviceId, userId, optOut, sessionId, lastEventTime] = cookies.split('.');\n  return {\n    deviceId,\n    userId: decode(userId),\n    sessionId: parseTime(sessionId),\n    lastEventTime: parseTime(lastEventTime),\n    optOut: Boolean(optOut),\n  };\n};\n\nexport const parseTime = (num: string) => {\n  const integer = parseInt(num, 32);\n  if (isNaN(integer)) {\n    return undefined;\n  }\n  return integer;\n};\n\nexport const decode = (value?: string): string | undefined => {\n  if (!atob || !escape || !value) {\n    return undefined;\n  }\n  try {\n    return decodeURIComponent(escape(atob(value)));\n  } catch {\n    return undefined;\n  }\n};\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cookie-migration/index.ts"],"names":[],"mappings":";;;AACA,oDAAwD;AACxD,0DAAwD;AACxD,4CAAkD;AAE3C,IAAM,eAAe,GAAG,UAAC,MAAc,EAAE,OAAwB;IACtE,IAAI,OAAO,GAAoB,IAAI,sBAAa,EAAU,CAAC;IAC3D,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,KAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,CAAA,EAAE;QACnD,OAAO,GAAG,IAAI,4BAAY,EAAU,CAAC;KACtC;IACD,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE;QACxB,OAAO;YACL,MAAM,EAAE,KAAK;SACd,CAAC;KACH;IAED,IAAM,aAAa,GAAG,IAAA,8BAAgB,EAAC,MAAM,CAAC,CAAC;IAC/C,IAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAE9C,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO;YACL,MAAM,EAAE,KAAK;SACd,CAAC;KACH;IAED,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IACxB,IAAA,KAAA,oBAAuD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,IAAA,EAAxE,QAAQ,QAAA,EAAE,MAAM,QAAA,EAAE,MAAM,QAAA,EAAE,SAAS,QAAA,EAAE,aAAa,QAAsB,CAAC;IAChF,OAAO;QACL,QAAQ,UAAA;QACR,MAAM,EAAE,IAAA,cAAM,EAAC,MAAM,CAAC;QACtB,SAAS,EAAE,IAAA,iBAAS,EAAC,SAAS,CAAC;QAC/B,aAAa,EAAE,IAAA,iBAAS,EAAC,aAAa,CAAC;QACvC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC;KACxB,CAAC;AACJ,CAAC,CAAC;AA7BW,QAAA,eAAe,mBA6B1B;AAEK,IAAM,SAAS,GAAG,UAAC,GAAW;IACnC,IAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAClC,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE;QAClB,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AANW,QAAA,SAAS,aAMpB;AAEK,IAAM,MAAM,GAAG,UAAC,KAAc;IACnC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE;QAC9B,OAAO,SAAS,CAAC;KAClB;IACD,IAAI;QACF,OAAO,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KAChD;IAAC,WAAM;QACN,OAAO,SAAS,CAAC;KAClB;AACH,CAAC,CAAC;AATW,QAAA,MAAM,UASjB","sourcesContent":["import { BrowserOptions, Storage, UserSession } from '@amplitude/analytics-types';\nimport { getOldCookieName } from '../utils/cookie-name';\nimport { LocalStorage } from '../storage/local-storage';\nimport { CookieStorage } from '../storage/cookie';\n\nexport const parseOldCookies = (apiKey: string, options?: BrowserOptions): UserSession => {\n  let storage: Storage<string> = new CookieStorage<string>();\n  if (!storage.isEnabled() || options?.disableCookies) {\n    storage = new LocalStorage<string>();\n  }\n  if (!storage.isEnabled()) {\n    return {\n      optOut: false,\n    };\n  }\n\n  const oldCookieName = getOldCookieName(apiKey);\n  const cookies = storage.getRaw(oldCookieName);\n\n  if (!cookies) {\n    return {\n      optOut: false,\n    };\n  }\n\n  storage.remove(oldCookieName);\n  const [deviceId, userId, optOut, sessionId, lastEventTime] = cookies.split('.');\n  return {\n    deviceId,\n    userId: decode(userId),\n    sessionId: parseTime(sessionId),\n    lastEventTime: parseTime(lastEventTime),\n    optOut: Boolean(optOut),\n  };\n};\n\nexport const parseTime = (num: string) => {\n  const integer = parseInt(num, 32);\n  if (isNaN(integer)) {\n    return undefined;\n  }\n  return integer;\n};\n\nexport const decode = (value?: string): string | undefined => {\n  if (!atob || !escape || !value) {\n    return undefined;\n  }\n  try {\n    return decodeURIComponent(escape(atob(value)));\n  } catch {\n    return undefined;\n  }\n};\n"]}

package/lib/cjs/plugins/context.d.ts

@@ -10,5 +10,6 @@ export declare class Context implements BeforePlugin {
     constructor();
     setup(config: BrowserConfig): Promise<undefined>;
     execute(context: Event): Promise<Event>;
+    isSessionValid(): boolean;
 }
 //# sourceMappingURL=context.d.ts.map

package/lib/cjs/plugins/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/plugins/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAC5F,OAAO,QAAQ,MAAM,yBAAyB,CAAC;AAS/C,qBAAa,OAAQ,YAAW,YAAY;IAC1C,IAAI,SAAa;IACjB,IAAI,oBAA8B;IAKlC,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,SAAK;IACZ,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC;IAC3B,OAAO,SAA6B;;IAWpC,KAAK,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;IAKhD,OAAO,CAAC,OAAO,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;CAiCxC"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/plugins/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAC5F,OAAO,QAAQ,MAAM,yBAAyB,CAAC;AAQ/C,qBAAa,OAAQ,YAAW,YAAY;IAC1C,IAAI,SAAa;IACjB,IAAI,oBAA8B;IAKlC,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,SAAK;IACZ,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC;IAC3B,OAAO,SAA6B;;IAWpC,KAAK,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;IAMhD,OAAO,CAAC,OAAO,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAuCvC,cAAc;CAKf"}

package/lib/cjs/plugins/context.js

@@ -6,7 +6,6 @@ var ua_parser_js_1 = (0, tslib_1.__importDefault)(require("@amplitude/ua-parser-
 var analytics_core_1 = require("@amplitude/analytics-core");
 var language_1 = require("../utils/language");
 var version_1 = require("../version");
-var session_manager_1 = require("../session-manager");
 var BROWSER_PLATFORM = 'Web';
 var IP_ADDRESS = '$remote';
 var Context = /** @class */ (function () {
@@ -27,18 +26,27 @@ var Context = /** @class */ (function () {
         return Promise.resolve(undefined);
     };
     Context.prototype.execute = function (context) {
-        var _this = this;
-        return new Promise(function (resolve) {
-            var time = new Date().getTime();
-            var osName = _this.uaResult.browser.name;
-            var osVersion = _this.uaResult.browser.version;
-            var deviceModel = _this.uaResult.device.model || _this.uaResult.os.name;
-            var deviceVendor = _this.uaResult.device.vendor;
-            (0, session_manager_1.checkSessionExpiry)(_this.config);
-            (0, session_manager_1.updateCookies)(_this.config, time);
-            var contextEvent = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({ user_id: _this.config.userId, device_id: _this.config.deviceId, session_id: _this.config.sessionId, time: time }, (_this.config.appVersion && { app_version: _this.config.appVersion })), (_this.config.trackingOptions.platform && { platform: BROWSER_PLATFORM })), (_this.config.trackingOptions.osName && { os_name: osName })), (_this.config.trackingOptions.osVersion && { os_version: osVersion })), (_this.config.trackingOptions.deviceManufacturer && { device_manufacturer: deviceVendor })), (_this.config.trackingOptions.deviceModel && { device_model: deviceModel })), (_this.config.trackingOptions.language && { language: (0, language_1.getLanguage)() })), (_this.config.trackingOptions.ipAddress && { ip: IP_ADDRESS })), { insert_id: (0, analytics_core_1.UUID)(), partner_id: _this.config.partnerId, plan: _this.config.plan }), context), { event_id: _this.eventId++, library: _this.library });
-            return resolve(contextEvent);
-        });
+        /**
+         * Manages user session triggered by new events
+         */
+        if (!this.isSessionValid()) {
+            // Creates new session
+            this.config.sessionId = Date.now();
+        } // else use previously creates session
+        // Updates last event time to extend time-based session
+        this.config.lastEventTime = Date.now();
+        var time = new Date().getTime();
+        var osName = this.uaResult.browser.name;
+        var osVersion = this.uaResult.browser.version;
+        var deviceModel = this.uaResult.device.model || this.uaResult.os.name;
+        var deviceVendor = this.uaResult.device.vendor;
+        var event = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({ user_id: this.config.userId, device_id: this.config.deviceId, session_id: this.config.sessionId, time: time }, (this.config.appVersion && { app_version: this.config.appVersion })), (this.config.trackingOptions.platform && { platform: BROWSER_PLATFORM })), (this.config.trackingOptions.osName && { os_name: osName })), (this.config.trackingOptions.osVersion && { os_version: osVersion })), (this.config.trackingOptions.deviceManufacturer && { device_manufacturer: deviceVendor })), (this.config.trackingOptions.deviceModel && { device_model: deviceModel })), (this.config.trackingOptions.language && { language: (0, language_1.getLanguage)() })), (this.config.trackingOptions.ipAddress && { ip: IP_ADDRESS })), { insert_id: (0, analytics_core_1.UUID)(), partner_id: this.config.partnerId, plan: this.config.plan }), context), { event_id: this.eventId++, library: this.library });
+        return Promise.resolve(event);
+    };
+    Context.prototype.isSessionValid = function () {
+        var lastEventTime = this.config.lastEventTime || Date.now();
+        var timeSinceLastEvent = Date.now() - lastEventTime;
+        return timeSinceLastEvent < this.config.sessionTimeout;
     };
     return Context;
 }());

package/lib/cjs/plugins/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/plugins/context.ts"],"names":[],"mappings":"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","sourcesContent":["import { BeforePlugin, BrowserConfig, Event, PluginType } from '@amplitude/analytics-types';\nimport UAParser from '@amplitude/ua-parser-js';\nimport { UUID } from '@amplitude/analytics-core';\nimport { getLanguage } from '../utils/language';\nimport { VERSION } from '../version';\nimport { checkSessionExpiry, updateCookies } from '../session-manager';\n\nconst BROWSER_PLATFORM = 'Web';\nconst IP_ADDRESS = '$remote';\n\nexport class Context implements BeforePlugin {\n  name = 'context';\n  type = PluginType.BEFORE as const;\n\n  // this.config is defined in setup() which will always be called first\n  // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n  // @ts-ignore\n  config: BrowserConfig;\n  eventId = 0;\n  uaResult: UAParser.IResult;\n  library = `amplitude-ts/${VERSION}`;\n\n  constructor() {\n    let agent: string | undefined;\n    /* istanbul ignore else */\n    if (typeof navigator !== 'undefined') {\n      agent = navigator.userAgent;\n    }\n    this.uaResult = new UAParser(agent).getResult();\n  }\n\n  setup(config: BrowserConfig): Promise<undefined> {\n    this.config = config;\n    return Promise.resolve(undefined);\n  }\n\n  execute(context: Event): Promise<Event> {\n    return new Promise((resolve) => {\n      const time = new Date().getTime();\n      const osName = this.uaResult.browser.name;\n      const osVersion = this.uaResult.browser.version;\n      const deviceModel = this.uaResult.device.model || this.uaResult.os.name;\n      const deviceVendor = this.uaResult.device.vendor;\n\n      checkSessionExpiry(this.config);\n      updateCookies(this.config, time);\n      const contextEvent: Event = {\n        user_id: this.config.userId,\n        device_id: this.config.deviceId,\n        session_id: this.config.sessionId,\n        time,\n        ...(this.config.appVersion && { app_version: this.config.appVersion }),\n        ...(this.config.trackingOptions.platform && { platform: BROWSER_PLATFORM }),\n        ...(this.config.trackingOptions.osName && { os_name: osName }),\n        ...(this.config.trackingOptions.osVersion && { os_version: osVersion }),\n        ...(this.config.trackingOptions.deviceManufacturer && { device_manufacturer: deviceVendor }),\n        ...(this.config.trackingOptions.deviceModel && { device_model: deviceModel }),\n        ...(this.config.trackingOptions.language && { language: getLanguage() }),\n        ...(this.config.trackingOptions.ipAddress && { ip: IP_ADDRESS }),\n        insert_id: UUID(),\n        partner_id: this.config.partnerId,\n        plan: this.config.plan,\n        ...context,\n        event_id: this.eventId++,\n        library: this.library,\n      };\n      return resolve(contextEvent);\n    });\n  }\n}\n"]}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/plugins/context.ts"],"names":[],"mappings":"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","sourcesContent":["import { BeforePlugin, BrowserConfig, Event, PluginType } from '@amplitude/analytics-types';\nimport UAParser from '@amplitude/ua-parser-js';\nimport { UUID } from '@amplitude/analytics-core';\nimport { getLanguage } from '../utils/language';\nimport { VERSION } from '../version';\n\nconst BROWSER_PLATFORM = 'Web';\nconst IP_ADDRESS = '$remote';\n\nexport class Context implements BeforePlugin {\n  name = 'context';\n  type = PluginType.BEFORE as const;\n\n  // this.config is defined in setup() which will always be called first\n  // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n  // @ts-ignore\n  config: BrowserConfig;\n  eventId = 0;\n  uaResult: UAParser.IResult;\n  library = `amplitude-ts/${VERSION}`;\n\n  constructor() {\n    let agent: string | undefined;\n    /* istanbul ignore else */\n    if (typeof navigator !== 'undefined') {\n      agent = navigator.userAgent;\n    }\n    this.uaResult = new UAParser(agent).getResult();\n  }\n\n  setup(config: BrowserConfig): Promise<undefined> {\n    this.config = config;\n\n    return Promise.resolve(undefined);\n  }\n\n  execute(context: Event): Promise<Event> {\n    /**\n     * Manages user session triggered by new events\n     */\n    if (!this.isSessionValid()) {\n      // Creates new session\n      this.config.sessionId = Date.now();\n    } // else use previously creates session\n    // Updates last event time to extend time-based session\n    this.config.lastEventTime = Date.now();\n    const time = new Date().getTime();\n    const osName = this.uaResult.browser.name;\n    const osVersion = this.uaResult.browser.version;\n    const deviceModel = this.uaResult.device.model || this.uaResult.os.name;\n    const deviceVendor = this.uaResult.device.vendor;\n    const event: Event = {\n      user_id: this.config.userId,\n      device_id: this.config.deviceId,\n      session_id: this.config.sessionId,\n      time,\n      ...(this.config.appVersion && { app_version: this.config.appVersion }),\n      ...(this.config.trackingOptions.platform && { platform: BROWSER_PLATFORM }),\n      ...(this.config.trackingOptions.osName && { os_name: osName }),\n      ...(this.config.trackingOptions.osVersion && { os_version: osVersion }),\n      ...(this.config.trackingOptions.deviceManufacturer && { device_manufacturer: deviceVendor }),\n      ...(this.config.trackingOptions.deviceModel && { device_model: deviceModel }),\n      ...(this.config.trackingOptions.language && { language: getLanguage() }),\n      ...(this.config.trackingOptions.ipAddress && { ip: IP_ADDRESS }),\n      insert_id: UUID(),\n      partner_id: this.config.partnerId,\n      plan: this.config.plan,\n      ...context,\n      event_id: this.eventId++,\n      library: this.library,\n    };\n\n    return Promise.resolve(event);\n  }\n\n  isSessionValid() {\n    const lastEventTime = this.config.lastEventTime || Date.now();\n    const timeSinceLastEvent = Date.now() - lastEventTime;\n    return timeSinceLastEvent < this.config.sessionTimeout;\n  }\n}\n"]}

package/lib/cjs/session-manager.d.ts

@@ -1,6 +1,20 @@
-import { BrowserConfig } from '@amplitude/analytics-types';
-export declare const updateCookies: (config: BrowserConfig, lastEventTime?: number | undefined) => void;
-export declare const checkSessionExpiry: (config: BrowserConfig) => void;
-export declare const getCookieName: (apiKey: string, limit?: number) => string;
-export declare const getOldCookieName: (apiKey: string) => string;
+import { UserSession, Storage, SessionManager as ISessionManager, SessionManagerOptions } from '@amplitude/analytics-types';
+export declare class SessionManager implements ISessionManager {
+    private storage;
+    storageKey: string;
+    sessionTimeout: number;
+    cache: UserSession;
+    constructor(storage: Storage<UserSession>, options: SessionManagerOptions);
+    setSession(session: Partial<UserSession>): void;
+    getSessionId(): number | undefined;
+    setSessionId(sessionId: number): void;
+    getDeviceId(): string | undefined;
+    setDeviceId(deviceId: string): void;
+    getUserId(): string | undefined;
+    setUserId(userId: string): void;
+    getLastEventTime(): number | undefined;
+    setLastEventTime(lastEventTime: number): void;
+    getOptOut(): boolean;
+    setOptOut(optOut: boolean): void;
+}
 //# sourceMappingURL=session-manager.d.ts.map

package/lib/cjs/session-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../../src/session-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAG3D,eAAO,MAAM,aAAa,WAAY,aAAa,6CASlD,CAAC;AAEF,eAAO,MAAM,kBAAkB,WAAY,aAAa,SAQvD,CAAC;AAEF,eAAO,MAAM,aAAa,WAAY,MAAM,2BAE3C,CAAC;AAEF,eAAO,MAAM,gBAAgB,WAAY,MAAM,WAE9C,CAAC"}
+{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../../src/session-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,OAAO,EACP,cAAc,IAAI,eAAe,EACjC,qBAAqB,EACtB,MAAM,4BAA4B,CAAC;AAGpC,qBAAa,cAAe,YAAW,eAAe;IAKxC,OAAO,CAAC,OAAO;IAJ3B,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,WAAW,CAAC;gBAEC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,qBAAqB;IAQjF,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC;IAKxC,YAAY;IAKZ,YAAY,CAAC,SAAS,EAAE,MAAM;IAI9B,WAAW,IAAI,MAAM,GAAG,SAAS;IAIjC,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAInC,SAAS,IAAI,MAAM,GAAG,SAAS;IAI/B,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAI/B,gBAAgB;IAIhB,gBAAgB,CAAC,aAAa,EAAE,MAAM;IAItC,SAAS,IAAI,OAAO;IAIpB,SAAS,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI;CAGjC"}

package/lib/cjs/session-manager.js

@@ -1,36 +1,54 @@
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOldCookieName = exports.getCookieName = exports.checkSessionExpiry = exports.updateCookies = void 0;
-var analytics_core_1 = require("@amplitude/analytics-core");
-var updateCookies = function (config, lastEventTime) {
-    var _a;
-    var cookieName = (0, exports.getCookieName)(config.apiKey);
-    config.cookieStorage.set(cookieName, {
-        userId: config.userId,
-        deviceId: config.deviceId,
-        sessionId: config.sessionId,
-        lastEventTime: lastEventTime !== null && lastEventTime !== void 0 ? lastEventTime : (_a = config.cookieStorage.get(cookieName)) === null || _a === void 0 ? void 0 : _a.lastEventTime,
-        optOut: Boolean(config.optOut),
-    });
-};
-exports.updateCookies = updateCookies;
-var checkSessionExpiry = function (config) {
-    var _a;
-    var cookieName = (0, exports.getCookieName)(config.apiKey);
-    var lastEventTime = (_a = config.cookieStorage.get(cookieName)) === null || _a === void 0 ? void 0 : _a.lastEventTime;
-    var now = Date.now();
-    if (lastEventTime && now - lastEventTime >= config.sessionTimeout) {
-        config.sessionId = now;
-        (0, exports.updateCookies)(config);
+exports.SessionManager = void 0;
+var tslib_1 = require("tslib");
+var cookie_name_1 = require("./utils/cookie-name");
+var SessionManager = /** @class */ (function () {
+    function SessionManager(storage, options) {
+        var _a;
+        this.storage = storage;
+        this.storageKey = (0, cookie_name_1.getCookieName)(options.apiKey);
+        this.sessionTimeout = options.sessionTimeout;
+        this.cache = (_a = this.storage.get(this.storageKey)) !== null && _a !== void 0 ? _a : {
+            optOut: false,
+        };
     }
-};
-exports.checkSessionExpiry = checkSessionExpiry;
-var getCookieName = function (apiKey, limit) {
-    if (limit === void 0) { limit = 10; }
-    return "".concat(analytics_core_1.AMPLITUDE_PREFIX, "_").concat(apiKey.substring(0, limit));
-};
-exports.getCookieName = getCookieName;
-var getOldCookieName = function (apiKey) {
-    return "".concat(analytics_core_1.AMPLITUDE_PREFIX.toLowerCase(), "_").concat(apiKey.substring(0, 6));
-};
-exports.getOldCookieName = getOldCookieName;
+    SessionManager.prototype.setSession = function (session) {
+        this.cache = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, this.cache), session);
+        this.storage.set(this.storageKey, this.cache);
+    };
+    SessionManager.prototype.getSessionId = function () {
+        var _a;
+        // Note: always read directly from storage
+        return (_a = this.storage.get(this.storageKey)) === null || _a === void 0 ? void 0 : _a.sessionId;
+    };
+    SessionManager.prototype.setSessionId = function (sessionId) {
+        this.setSession({ sessionId: sessionId });
+    };
+    SessionManager.prototype.getDeviceId = function () {
+        return this.cache.deviceId;
+    };
+    SessionManager.prototype.setDeviceId = function (deviceId) {
+        this.setSession({ deviceId: deviceId });
+    };
+    SessionManager.prototype.getUserId = function () {
+        return this.cache.userId;
+    };
+    SessionManager.prototype.setUserId = function (userId) {
+        this.setSession({ userId: userId });
+    };
+    SessionManager.prototype.getLastEventTime = function () {
+        return this.cache.lastEventTime;
+    };
+    SessionManager.prototype.setLastEventTime = function (lastEventTime) {
+        this.setSession({ lastEventTime: lastEventTime });
+    };
+    SessionManager.prototype.getOptOut = function () {
+        return this.cache.optOut;
+    };
+    SessionManager.prototype.setOptOut = function (optOut) {
+        this.setSession({ optOut: optOut });
+    };
+    return SessionManager;
+}());
+exports.SessionManager = SessionManager;
 //# sourceMappingURL=session-manager.js.map