@amplitude/analytics-browser 0.5.1 → 0.7.0

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

@@ -1,36 +1,51 @@
+var _this = this;
 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) {
-    var storage = new cookie_1.CookieStorage();
-    if (!storage.isEnabled() || (options === null || options === void 0 ? void 0 : options.disableCookies)) {
-        storage = new local_storage_1.LocalStorage();
-    }
-    if (!storage.isEnabled()) {
-        return {
-            optOut: false,
-        };
-    }
-    var oldCookieName = (0, session_manager_1.getOldCookieName)(apiKey);
-    var cookies = storage.getRaw(oldCookieName);
-    if (!cookies) {
-        return {
-            optOut: false,
-        };
-    }
-    storage.remove(oldCookieName);
-    var _a = (0, tslib_1.__read)(cookies.split('.'), 5), deviceId = _a[0], userId = _a[1], optOut = _a[2], sessionId = _a[3], lastEventTime = _a[4];
-    return {
-        deviceId: deviceId,
-        userId: (0, exports.decode)(userId),
-        sessionId: (0, exports.parseTime)(sessionId),
-        lastEventTime: (0, exports.parseTime)(lastEventTime),
-        optOut: Boolean(optOut),
-    };
-};
+var parseOldCookies = function (apiKey, options) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
+    var storage, oldCookieName, cookies, _a, deviceId, userId, optOut, sessionId, lastEventTime;
+    return (0, tslib_1.__generator)(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                storage = new cookie_1.CookieStorage();
+                return [4 /*yield*/, storage.isEnabled()];
+            case 1:
+                if (!(_b.sent()) || (options === null || options === void 0 ? void 0 : options.disableCookies)) {
+                    storage = new local_storage_1.LocalStorage();
+                }
+                return [4 /*yield*/, storage.isEnabled()];
+            case 2:
+                if (!(_b.sent())) {
+                    return [2 /*return*/, {
+                            optOut: false,
+                        }];
+                }
+                oldCookieName = (0, cookie_name_1.getOldCookieName)(apiKey);
+                return [4 /*yield*/, storage.getRaw(oldCookieName)];
+            case 3:
+                cookies = _b.sent();
+                if (!cookies) {
+                    return [2 /*return*/, {
+                            optOut: false,
+                        }];
+                }
+                return [4 /*yield*/, storage.remove(oldCookieName)];
+            case 4:
+                _b.sent();
+                _a = (0, tslib_1.__read)(cookies.split('.'), 5), deviceId = _a[0], userId = _a[1], optOut = _a[2], sessionId = _a[3], lastEventTime = _a[4];
+                return [2 /*return*/, {
+                        deviceId: deviceId,
+                        userId: (0, exports.decode)(userId),
+                        sessionId: (0, exports.parseTime)(sessionId),
+                        lastEventTime: (0, exports.parseTime)(lastEventTime),
+                        optOut: Boolean(optOut),
+                    }];
+        }
+    });
+}); };
 exports.parseOldCookies = parseOldCookies;
 var parseTime = function (num) {
     var integer = parseInt(num, 32);

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":"AAAA,iBAsDA;;;;AArDA,oDAAwD;AACxD,0DAAwD;AACxD,4CAAkD;AAE3C,IAAM,eAAe,GAAG,UAAO,MAAc,EAAE,OAAwB;;;;;gBACxE,OAAO,GAAoB,IAAI,sBAAa,EAAU,CAAC;gBACrD,qBAAM,OAAO,CAAC,SAAS,EAAE,EAAA;;gBAA/B,IAAI,CAAC,CAAC,SAAyB,CAAC,KAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,CAAA,EAAE;oBAC3D,OAAO,GAAG,IAAI,4BAAY,EAAU,CAAC;iBACtC;gBACK,qBAAM,OAAO,CAAC,SAAS,EAAE,EAAA;;gBAA/B,IAAI,CAAC,CAAC,SAAyB,CAAC,EAAE;oBAChC,sBAAO;4BACL,MAAM,EAAE,KAAK;yBACd,EAAC;iBACH;gBAEK,aAAa,GAAG,IAAA,8BAAgB,EAAC,MAAM,CAAC,CAAC;gBAC/B,qBAAM,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,EAAA;;gBAA7C,OAAO,GAAG,SAAmC;gBAEnD,IAAI,CAAC,OAAO,EAAE;oBACZ,sBAAO;4BACL,MAAM,EAAE,KAAK;yBACd,EAAC;iBACH;gBAED,qBAAM,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,EAAA;;gBAAnC,SAAmC,CAAC;gBAC9B,KAAA,oBAAuD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,IAAA,EAAxE,QAAQ,QAAA,EAAE,MAAM,QAAA,EAAE,MAAM,QAAA,EAAE,SAAS,QAAA,EAAE,aAAa,QAAA,CAAuB;gBAChF,sBAAO;wBACL,QAAQ,UAAA;wBACR,MAAM,EAAE,IAAA,cAAM,EAAC,MAAM,CAAC;wBACtB,SAAS,EAAE,IAAA,iBAAS,EAAC,SAAS,CAAC;wBAC/B,aAAa,EAAE,IAAA,iBAAS,EAAC,aAAa,CAAC;wBACvC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC;qBACxB,EAAC;;;KACH,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 = async (apiKey: string, options?: BrowserOptions): Promise<UserSession> => {\n  let storage: Storage<string> = new CookieStorage<string>();\n  if (!(await storage.isEnabled()) || options?.disableCookies) {\n    storage = new LocalStorage<string>();\n  }\n  if (!(await storage.isEnabled())) {\n    return {\n      optOut: false,\n    };\n  }\n\n  const oldCookieName = getOldCookieName(apiKey);\n  const cookies = await storage.getRaw(oldCookieName);\n\n  if (!cookies) {\n    return {\n      optOut: false,\n    };\n  }\n\n  await 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/index.d.ts

@@ -1,4 +1,4 @@
-export { add, getDeviceId, getSessionId, getUserId, groupIdentify, identify, init, logEvent, remove, revenue, setDeviceId, setGroup, setOptOut, setSessionId, setTransport, setUserId, track, } from './browser-client';
+export { add, flush, getDeviceId, getSessionId, getUserId, groupIdentify, identify, init, logEvent, remove, revenue, setDeviceId, setGroup, setOptOut, setSessionId, setTransport, setUserId, track, } from './browser-client';
 export { runQueuedFunctions } from './utils/snippet-helper';
 export { Revenue, Identify } from '@amplitude/analytics-core';
 export * as Types from '@amplitude/analytics-types';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EACH,WAAW,EACX,YAAY,EACZ,SAAS,EACT,aAAa,EACb,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,MAAM,EACN,OAAO,EACP,WAAW,EACX,QAAQ,EACR,SAAS,EACT,YAAY,EACZ,YAAY,EACZ,SAAS,EACT,KAAK,GACN,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,KAAK,MAAM,4BAA4B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EACH,KAAK,EACL,WAAW,EACX,YAAY,EACZ,SAAS,EACT,aAAa,EACb,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,MAAM,EACN,OAAO,EACP,WAAW,EACX,QAAQ,EACR,SAAS,EACT,YAAY,EACZ,YAAY,EACZ,SAAS,EACT,KAAK,GACN,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,KAAK,MAAM,4BAA4B,CAAC"}

package/lib/cjs/index.js

@@ -1,8 +1,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Types = exports.Identify = exports.Revenue = exports.runQueuedFunctions = exports.track = exports.setUserId = exports.setTransport = exports.setSessionId = exports.setOptOut = exports.setGroup = exports.setDeviceId = exports.revenue = exports.remove = exports.logEvent = exports.init = exports.identify = exports.groupIdentify = exports.getUserId = exports.getSessionId = exports.getDeviceId = exports.add = void 0;
+exports.Types = exports.Identify = exports.Revenue = exports.runQueuedFunctions = exports.track = exports.setUserId = exports.setTransport = exports.setSessionId = exports.setOptOut = exports.setGroup = exports.setDeviceId = exports.revenue = exports.remove = exports.logEvent = exports.init = exports.identify = exports.groupIdentify = exports.getUserId = exports.getSessionId = exports.getDeviceId = exports.flush = exports.add = void 0;
 var tslib_1 = require("tslib");
 var browser_client_1 = require("./browser-client");
 Object.defineProperty(exports, "add", { enumerable: true, get: function () { return browser_client_1.add; } });
+Object.defineProperty(exports, "flush", { enumerable: true, get: function () { return browser_client_1.flush; } });
 Object.defineProperty(exports, "getDeviceId", { enumerable: true, get: function () { return browser_client_1.getDeviceId; } });
 Object.defineProperty(exports, "getSessionId", { enumerable: true, get: function () { return browser_client_1.getSessionId; } });
 Object.defineProperty(exports, "getUserId", { enumerable: true, get: function () { return browser_client_1.getUserId; } });

package/lib/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,mDAkB0B;AAjBxB,qGAAA,GAAG,OAAA;AACH,6GAAA,WAAW,OAAA;AACX,8GAAA,YAAY,OAAA;AACZ,2GAAA,SAAS,OAAA;AACT,+GAAA,aAAa,OAAA;AACb,0GAAA,QAAQ,OAAA;AACR,sGAAA,IAAI,OAAA;AACJ,0GAAA,QAAQ,OAAA;AACR,wGAAA,MAAM,OAAA;AACN,yGAAA,OAAO,OAAA;AACP,6GAAA,WAAW,OAAA;AACX,0GAAA,QAAQ,OAAA;AACR,2GAAA,SAAS,OAAA;AACT,8GAAA,YAAY,OAAA;AACZ,8GAAA,YAAY,OAAA;AACZ,2GAAA,SAAS,OAAA;AACT,uGAAA,KAAK,OAAA;AAEP,yDAA4D;AAAnD,oHAAA,kBAAkB,OAAA;AAC3B,4DAA8D;AAArD,yGAAA,OAAO,OAAA;AAAE,0GAAA,QAAQ,OAAA;AAC1B,iFAAoD","sourcesContent":["export {\n  add,\n  getDeviceId,\n  getSessionId,\n  getUserId,\n  groupIdentify,\n  identify,\n  init,\n  logEvent,\n  remove,\n  revenue,\n  setDeviceId,\n  setGroup,\n  setOptOut,\n  setSessionId,\n  setTransport,\n  setUserId,\n  track,\n} from './browser-client';\nexport { runQueuedFunctions } from './utils/snippet-helper';\nexport { Revenue, Identify } from '@amplitude/analytics-core';\nexport * as Types from '@amplitude/analytics-types';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,mDAmB0B;AAlBxB,qGAAA,GAAG,OAAA;AACH,uGAAA,KAAK,OAAA;AACL,6GAAA,WAAW,OAAA;AACX,8GAAA,YAAY,OAAA;AACZ,2GAAA,SAAS,OAAA;AACT,+GAAA,aAAa,OAAA;AACb,0GAAA,QAAQ,OAAA;AACR,sGAAA,IAAI,OAAA;AACJ,0GAAA,QAAQ,OAAA;AACR,wGAAA,MAAM,OAAA;AACN,yGAAA,OAAO,OAAA;AACP,6GAAA,WAAW,OAAA;AACX,0GAAA,QAAQ,OAAA;AACR,2GAAA,SAAS,OAAA;AACT,8GAAA,YAAY,OAAA;AACZ,8GAAA,YAAY,OAAA;AACZ,2GAAA,SAAS,OAAA;AACT,uGAAA,KAAK,OAAA;AAEP,yDAA4D;AAAnD,oHAAA,kBAAkB,OAAA;AAC3B,4DAA8D;AAArD,yGAAA,OAAO,OAAA;AAAE,0GAAA,QAAQ,OAAA;AAC1B,iFAAoD","sourcesContent":["export {\n  add,\n  flush,\n  getDeviceId,\n  getSessionId,\n  getUserId,\n  groupIdentify,\n  identify,\n  init,\n  logEvent,\n  remove,\n  revenue,\n  setDeviceId,\n  setGroup,\n  setOptOut,\n  setSessionId,\n  setTransport,\n  setUserId,\n  track,\n} from './browser-client';\nexport { runQueuedFunctions } from './utils/snippet-helper';\nexport { Revenue, Identify } from '@amplitude/analytics-core';\nexport * as Types from '@amplitude/analytics-types';\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;IAM1C,OAAO,CAAC,OAAO,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAuC7C,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,19 +26,33 @@ 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);
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            var time, osName, osVersion, deviceModel, deviceVendor, event;
+            return (0, tslib_1.__generator)(this, function (_a) {
+                /**
+                 * 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();
+                time = new Date().getTime();
+                osName = this.uaResult.browser.name;
+                osVersion = this.uaResult.browser.version;
+                deviceModel = this.uaResult.device.model || this.uaResult.os.name;
+                deviceVendor = this.uaResult.device.vendor;
+                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 [2 /*return*/, event];
+            });
         });
     };
+    Context.prototype.isSessionValid = function () {
+        var lastEventTime = this.config.lastEventTime || Date.now();
+        var timeSinceLastEvent = Date.now() - lastEventTime;
+        return timeSinceLastEvent < this.config.sessionTimeout;
+    };
     return Context;
 }());
 exports.Context = 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  async 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\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    return 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,28 @@
-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 } from '@amplitude/analytics-types';
+export declare class SessionManager implements ISessionManager {
+    private storage;
+    storageKey: string;
+    cache: UserSession;
+    isSessionCacheValid: boolean;
+    constructor(storage: Storage<UserSession>, apiKey: string);
+    /**
+     * load() must be called immediately after instantation
+     *
+     * ```ts
+     * await new SessionManager(...).load();
+     * ```
+     */
+    load(): Promise<this>;
+    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,EAAE,WAAW,EAAE,OAAO,EAAE,cAAc,IAAI,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAGrG,qBAAa,cAAe,YAAW,eAAe;IAKxC,OAAO,CAAC,OAAO;IAJ3B,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,WAAW,CAAC;IACnB,mBAAmB,UAAQ;gBAEP,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,MAAM;IAKjE;;;;;;OAMG;IACG,IAAI;IAOV,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC;IAKxC,YAAY;IAWZ,YAAY,CAAC,SAAS,EAAE,MAAM;IAM9B,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,84 @@
 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, apiKey) {
+        this.storage = storage;
+        this.isSessionCacheValid = true;
+        this.storageKey = (0, cookie_name_1.getCookieName)(apiKey);
+        this.cache = { 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;
+    /**
+     * load() must be called immediately after instantation
+     *
+     * ```ts
+     * await new SessionManager(...).load();
+     * ```
+     */
+    SessionManager.prototype.load = function () {
+        var _a;
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            var _b;
+            return (0, tslib_1.__generator)(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        _b = this;
+                        return [4 /*yield*/, this.storage.get(this.storageKey)];
+                    case 1:
+                        _b.cache = (_a = (_c.sent())) !== null && _a !== void 0 ? _a : {
+                            optOut: false,
+                        };
+                        return [2 /*return*/, this];
+                }
+            });
+        });
+    };
+    SessionManager.prototype.setSession = function (session) {
+        this.cache = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, this.cache), session);
+        void this.storage.set(this.storageKey, this.cache);
+    };
+    SessionManager.prototype.getSessionId = function () {
+        var _this = this;
+        this.isSessionCacheValid = true;
+        void this.storage.get(this.storageKey).then(function (userSession) {
+            // Checks if session id has been set since the last get
+            if (_this.isSessionCacheValid) {
+                _this.cache.sessionId = userSession === null || userSession === void 0 ? void 0 : userSession.sessionId;
+            }
+        });
+        return this.cache.sessionId;
+    };
+    SessionManager.prototype.setSessionId = function (sessionId) {
+        // Flags session id has been set
+        this.isSessionCacheValid = false;
+        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

package/lib/cjs/session-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-manager.js","sourceRoot":"","sources":["../../src/session-manager.ts"],"names":[],"mappings":";;AACA,4DAA6D;AAEtD,IAAM,aAAa,GAAG,UAAC,MAAqB,EAAE,aAAsB;;IACzE,IAAM,UAAU,GAAG,IAAA,qBAAa,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAChD,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,EAAE;QACnC,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,aAAa,EAAE,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,MAAA,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,0CAAE,aAAa;QACnF,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;KAC/B,CAAC,CAAC;AACL,CAAC,CAAC;AATW,QAAA,aAAa,iBASxB;AAEK,IAAM,kBAAkB,GAAG,UAAC,MAAqB;;IACtD,IAAM,UAAU,GAAG,IAAA,qBAAa,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAChD,IAAM,aAAa,GAAG,MAAA,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,0CAAE,aAAa,CAAC;IAC1E,IAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,IAAI,aAAa,IAAI,GAAG,GAAG,aAAa,IAAI,MAAM,CAAC,cAAc,EAAE;QACjE,MAAM,CAAC,SAAS,GAAG,GAAG,CAAC;QACvB,IAAA,qBAAa,EAAC,MAAM,CAAC,CAAC;KACvB;AACH,CAAC,CAAC;AARW,QAAA,kBAAkB,sBAQ7B;AAEK,IAAM,aAAa,GAAG,UAAC,MAAc,EAAE,KAAU;IAAV,sBAAA,EAAA,UAAU;IACtD,OAAO,UAAG,iCAAgB,cAAI,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAE,CAAC;AAC7D,CAAC,CAAC;AAFW,QAAA,aAAa,iBAExB;AAEK,IAAM,gBAAgB,GAAG,UAAC,MAAc;IAC7C,OAAO,UAAG,iCAAgB,CAAC,WAAW,EAAE,cAAI,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAE,CAAC;AACvE,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B","sourcesContent":["import { BrowserConfig } from '@amplitude/analytics-types';\nimport { AMPLITUDE_PREFIX } from '@amplitude/analytics-core';\n\nexport const updateCookies = (config: BrowserConfig, lastEventTime?: number) => {\n  const cookieName = getCookieName(config.apiKey);\n  config.cookieStorage.set(cookieName, {\n    userId: config.userId,\n    deviceId: config.deviceId,\n    sessionId: config.sessionId,\n    lastEventTime: lastEventTime ?? config.cookieStorage.get(cookieName)?.lastEventTime,\n    optOut: Boolean(config.optOut),\n  });\n};\n\nexport const checkSessionExpiry = (config: BrowserConfig) => {\n  const cookieName = getCookieName(config.apiKey);\n  const lastEventTime = config.cookieStorage.get(cookieName)?.lastEventTime;\n  const now = Date.now();\n  if (lastEventTime && now - lastEventTime >= config.sessionTimeout) {\n    config.sessionId = now;\n    updateCookies(config);\n  }\n};\n\nexport const getCookieName = (apiKey: string, limit = 10) => {\n  return `${AMPLITUDE_PREFIX}_${apiKey.substring(0, limit)}`;\n};\n\nexport const getOldCookieName = (apiKey: string) => {\n  return `${AMPLITUDE_PREFIX.toLowerCase()}_${apiKey.substring(0, 6)}`;\n};\n"]}
+{"version":3,"file":"session-manager.js","sourceRoot":"","sources":["../../src/session-manager.ts"],"names":[],"mappings":";;;AACA,mDAAqE;AAErE;IAKE,wBAAoB,OAA6B,EAAE,MAAc;QAA7C,YAAO,GAAP,OAAO,CAAsB;QAFjD,wBAAmB,GAAG,IAAI,CAAC;QAGzB,IAAI,CAAC,UAAU,GAAG,IAAA,2BAAa,EAAC,MAAM,CAAC,CAAC;QACxC,IAAI,CAAC,KAAK,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACjC,CAAC;IAED;;;;;;OAMG;IACG,6BAAI,GAAV;;;;;;;wBACE,KAAA,IAAI,CAAA;wBAAU,qBAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,EAAA;;wBAArD,GAAK,KAAK,GAAG,MAAA,CAAC,SAAuC,CAAC,mCAAI;4BACxD,MAAM,EAAE,KAAK;yBACd,CAAC;wBACF,sBAAO,IAAI,EAAC;;;;KACb;IAED,mCAAU,GAAV,UAAW,OAA6B;QACtC,IAAI,CAAC,KAAK,mDAAQ,IAAI,CAAC,KAAK,GAAK,OAAO,CAAE,CAAC;QAC3C,KAAK,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACrD,CAAC;IAED,qCAAY,GAAZ;QAAA,iBASC;QARC,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;QAChC,KAAK,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,UAAC,WAAW;YACtD,uDAAuD;YACvD,IAAI,KAAI,CAAC,mBAAmB,EAAE;gBAC5B,KAAI,CAAC,KAAK,CAAC,SAAS,GAAG,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,SAAS,CAAC;aAC/C;QACH,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;IAC9B,CAAC;IAED,qCAAY,GAAZ,UAAa,SAAiB;QAC5B,gCAAgC;QAChC,IAAI,CAAC,mBAAmB,GAAG,KAAK,CAAC;QACjC,IAAI,CAAC,UAAU,CAAC,EAAE,SAAS,WAAA,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,oCAAW,GAAX;QACE,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;IAC7B,CAAC;IAED,oCAAW,GAAX,UAAY,QAAgB;QAC1B,IAAI,CAAC,UAAU,CAAC,EAAE,QAAQ,UAAA,EAAE,CAAC,CAAC;IAChC,CAAC;IAED,kCAAS,GAAT;QACE,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IAC3B,CAAC;IAED,kCAAS,GAAT,UAAU,MAAc;QACtB,IAAI,CAAC,UAAU,CAAC,EAAE,MAAM,QAAA,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,yCAAgB,GAAhB;QACE,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;IAClC,CAAC;IAED,yCAAgB,GAAhB,UAAiB,aAAqB;QACpC,IAAI,CAAC,UAAU,CAAC,EAAE,aAAa,eAAA,EAAE,CAAC,CAAC;IACrC,CAAC;IAED,kCAAS,GAAT;QACE,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IAC3B,CAAC;IAED,kCAAS,GAAT,UAAU,MAAe;QACvB,IAAI,CAAC,UAAU,CAAC,EAAE,MAAM,QAAA,EAAE,CAAC,CAAC;IAC9B,CAAC;IACH,qBAAC;AAAD,CAAC,AA7ED,IA6EC;AA7EY,wCAAc","sourcesContent":["import { UserSession, Storage, SessionManager as ISessionManager } from '@amplitude/analytics-types';\nimport { getCookieName as getStorageKey } from './utils/cookie-name';\n\nexport class SessionManager implements ISessionManager {\n  storageKey: string;\n  cache: UserSession;\n  isSessionCacheValid = true;\n\n  constructor(private storage: Storage<UserSession>, apiKey: string) {\n    this.storageKey = getStorageKey(apiKey);\n    this.cache = { optOut: false };\n  }\n\n  /**\n   * load() must be called immediately after instantation\n   *\n   * ```ts\n   * await new SessionManager(...).load();\n   * ```\n   */\n  async load() {\n    this.cache = (await this.storage.get(this.storageKey)) ?? {\n      optOut: false,\n    };\n    return this;\n  }\n\n  setSession(session: Partial<UserSession>) {\n    this.cache = { ...this.cache, ...session };\n    void this.storage.set(this.storageKey, this.cache);\n  }\n\n  getSessionId() {\n    this.isSessionCacheValid = true;\n    void this.storage.get(this.storageKey).then((userSession) => {\n      // Checks if session id has been set since the last get\n      if (this.isSessionCacheValid) {\n        this.cache.sessionId = userSession?.sessionId;\n      }\n    });\n    return this.cache.sessionId;\n  }\n\n  setSessionId(sessionId: number) {\n    // Flags session id has been set\n    this.isSessionCacheValid = false;\n    this.setSession({ sessionId });\n  }\n\n  getDeviceId(): string | undefined {\n    return this.cache.deviceId;\n  }\n\n  setDeviceId(deviceId: string): void {\n    this.setSession({ deviceId });\n  }\n\n  getUserId(): string | undefined {\n    return this.cache.userId;\n  }\n\n  setUserId(userId: string): void {\n    this.setSession({ userId });\n  }\n\n  getLastEventTime() {\n    return this.cache.lastEventTime;\n  }\n\n  setLastEventTime(lastEventTime: number) {\n    this.setSession({ lastEventTime });\n  }\n\n  getOptOut(): boolean {\n    return this.cache.optOut;\n  }\n\n  setOptOut(optOut: boolean): void {\n    this.setSession({ optOut });\n  }\n}\n"]}

package/lib/cjs/storage/cookie.d.ts

@@ -2,11 +2,11 @@ import { Storage, CookieStorageOptions } from '@amplitude/analytics-types';
 export declare class CookieStorage<T> implements Storage<T> {
     options: CookieStorageOptions;
     constructor(options?: CookieStorageOptions);
-    isEnabled(): boolean;
-    get(key: string): T | undefined;
-    getRaw(key: string): string | undefined;
-    set(key: string, value: T | null): void;
-    remove(key: string): void;
-    reset(): void;
+    isEnabled(): Promise<boolean>;
+    get(key: string): Promise<T | undefined>;
+    getRaw(key: string): Promise<string | undefined>;
+    set(key: string, value: T | null): Promise<void>;
+    remove(key: string): Promise<void>;
+    reset(): Promise<void>;
 }
 //# sourceMappingURL=cookie.d.ts.map

package/lib/cjs/storage/cookie.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cookie.d.ts","sourceRoot":"","sources":["../../../src/storage/cookie.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAE3E,qBAAa,aAAa,CAAC,CAAC,CAAE,YAAW,OAAO,CAAC,CAAC,CAAC;IACjD,OAAO,EAAE,oBAAoB,CAAC;gBAElB,OAAO,CAAC,EAAE,oBAAoB;IAI1C,SAAS;IAqBT,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;IAc/B,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IASvC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI;IA8BhC,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,KAAK;CAGN"}
+{"version":3,"file":"cookie.d.ts","sourceRoot":"","sources":["../../../src/storage/cookie.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAE3E,qBAAa,aAAa,CAAC,CAAC,CAAE,YAAW,OAAO,CAAC,CAAC,CAAC;IACjD,OAAO,EAAE,oBAAoB,CAAC;gBAElB,OAAO,CAAC,EAAE,oBAAoB;IAIpC,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAqB7B,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAcxC,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAShD,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IA8BhD,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7B"}