@openreplay/tracker 3.6.3 → 4.0.0

package/.eslintignore

@@ -0,0 +1,8 @@
+node_modules
+npm-debug.log
+lib
+cjs
+build
+.cache
+.eslintrc.cjs
+*.gen.ts

package/.prettierignore

@@ -0,0 +1 @@
+*.gen.ts

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2021 OpenReplay.com <support@openreplay.com>
+Copyright (c) 2022 Asayer, Inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/cjs/app/guards.d.ts

@@ -1,7 +1,8 @@
 export declare function isSVGElement(node: Element): node is SVGElement;
 export declare function isElementNode(node: Node): node is Element;
 export declare function isTextNode(node: Node): node is Text;
-export declare function isRootNode(node: Node): boolean;
+export declare function isDocument(node: Node): node is Document;
+export declare function isRootNode(node: Node): node is Document | DocumentFragment;
 declare type TagTypeMap = {
     HTML: HTMLHtmlElement;
     IMG: HTMLImageElement;

package/cjs/app/guards.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasTag = exports.isRootNode = exports.isTextNode = exports.isElementNode = exports.isSVGElement = void 0;
+exports.hasTag = exports.isRootNode = exports.isDocument = exports.isTextNode = exports.isElementNode = exports.isSVGElement = void 0;
 function isSVGElement(node) {
     return node.namespaceURI === 'http://www.w3.org/2000/svg';
 }
@@ -13,9 +13,12 @@ function isTextNode(node) {
     return node.nodeType === Node.TEXT_NODE;
 }
 exports.isTextNode = isTextNode;
+function isDocument(node) {
+    return node.nodeType === Node.DOCUMENT_NODE;
+}
+exports.isDocument = isDocument;
 function isRootNode(node) {
-    return node.nodeType === Node.DOCUMENT_NODE ||
-        node.nodeType === Node.DOCUMENT_FRAGMENT_NODE;
+    return node.nodeType === Node.DOCUMENT_NODE || node.nodeType === Node.DOCUMENT_FRAGMENT_NODE;
 }
 exports.isRootNode = isRootNode;
 function hasTag(el, tagName) {

package/cjs/app/index.d.ts

@@ -1,17 +1,20 @@
-import type Message from "../common/messages.js";
-import Nodes from "./nodes.js";
-import Sanitizer from "./sanitizer.js";
-import Ticker from "./ticker.js";
-import Logger from "./logger.js";
-import Session from "./session.js";
-import type { Options as ObserverOptions } from "./observer/top_observer.js";
-import type { Options as SanitizerOptions } from "./sanitizer.js";
-import type { Options as LoggerOptions } from "./logger.js";
-import type { Options as WebworkerOptions } from "../common/webworker.js";
+import type Message from './messages.gen.js';
+import Nodes from './nodes.js';
+import Observer from './observer/top_observer.js';
+import Sanitizer from './sanitizer.js';
+import Ticker from './ticker.js';
+import Logger from './logger.js';
+import Session from './session.js';
+import type { Options as ObserverOptions } from './observer/top_observer.js';
+import type { Options as SanitizerOptions } from './sanitizer.js';
+import type { Options as LoggerOptions } from './logger.js';
+import type { Options as SessOptions } from './session.js';
+import type { Options as WebworkerOptions } from '../common/interaction.js';
 export interface StartOptions {
     userID?: string;
     metadata?: Record<string, string>;
     forceNew?: boolean;
+    sessionHash?: string;
 }
 interface OnStartInfo {
     sessionID: string;
@@ -34,9 +37,9 @@ declare type CommitCallback = (messages: Array<Message>) => void;
 declare type AppOptions = {
     revID: string;
     node_id: string;
+    session_reset_key: string;
     session_token_key: string;
     session_pageno_key: string;
-    session_reset_key: string;
     local_uuid_key: string;
     ingestPoint: string;
     resourceBaseHref: string | null;
@@ -44,10 +47,10 @@ declare type AppOptions = {
     __is_snippet: boolean;
     __debug_report_edp: string | null;
     __debug__?: LoggerOptions;
-    localStorage: Storage;
-    sessionStorage: Storage;
+    localStorage: Storage | null;
+    sessionStorage: Storage | null;
     onStart?: StartCallback;
-} & WebworkerOptions;
+} & WebworkerOptions & SessOptions;
 export declare type Options = AppOptions & ObserverOptions & SanitizerOptions;
 export declare const DEFAULT_INGEST_POINT = "https://api.openreplay.com/ingest";
 export default class App {
@@ -61,39 +64,41 @@ export default class App {
     readonly localStorage: Storage;
     readonly sessionStorage: Storage;
     private readonly messages;
-    private readonly observer;
+    readonly observer: Observer;
     private readonly startCallbacks;
     private readonly stopCallbacks;
     private readonly commitCallbacks;
     private readonly options;
     private readonly revID;
     private activityState;
-    private version;
+    private readonly version;
     private readonly worker?;
-    constructor(projectKey: string, sessionToken: string | null | undefined, options: Partial<Options>);
+    constructor(projectKey: string, sessionToken: string | undefined, options: Partial<Options>);
     private _debug;
     send(message: Message, urgent?: boolean): void;
     private commit;
     safe<T extends (...args: any[]) => void>(fn: T): T;
     attachCommitCallback(cb: CommitCallback): void;
-    attachStartCallback(cb: StartCallback): void;
-    attachStopCallback(cb: Function): void;
+    attachStartCallback(cb: StartCallback, useSafe?: boolean): void;
+    attachStopCallback(cb: () => any, useSafe?: boolean): void;
     attachEventListener(target: EventTarget, type: string, listener: EventListener, useSafe?: boolean, useCapture?: boolean): void;
     checkRequiredVersion(version: string): boolean;
-    private getStartInfo;
+    private getTrackerInfo;
     getSessionInfo(): {
         userUUID: string | null;
         projectKey: string;
         revID: string;
-        timestamp: number;
         trackerVersion: string;
         isSnippet: boolean;
-        sessionID: string | null;
+        sessionID: string | undefined;
         metadata: Record<string, string>;
         userID: string | null;
+        timestamp: number;
+        projectID?: string | undefined;
     };
     getSessionToken(): string | undefined;
     getSessionID(): string | undefined;
+    getSessionURL(): string | undefined;
     getHost(): string;
     getProjectKey(): string;
     getBaseHref(): string;
@@ -103,7 +108,7 @@ export default class App {
     resetNextPageSession(flag: boolean): void;
     private _start;
     start(options?: StartOptions): Promise<StartPromiseReturn>;
-    stop(calledFromAPI?: boolean, restarting?: boolean): void;
+    stop(stopWorker?: boolean): void;
     restart(): void;
 }
 export {};

package/cjs/app/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_INGEST_POINT = void 0;
-const messages_js_1 = require("../common/messages.js");
+const messages_gen_js_1 = require("./messages.gen.js");
 const utils_js_1 = require("../utils.js");
 const nodes_js_1 = require("./nodes.js");
 const top_observer_js_1 = require("./observer/top_observer.js");
@@ -10,8 +10,8 @@ const ticker_js_1 = require("./ticker.js");
 const logger_js_1 = require("./logger.js");
 const session_js_1 = require("./session.js");
 const performance_js_1 = require("../modules/performance.js");
-const CANCELED = "canceled";
-const START_ERROR = ":(";
+const CANCELED = 'canceled';
+const START_ERROR = ':(';
 const UnsuccessfulStart = (reason) => ({ reason, success: false });
 const SuccessfulStart = (body) => (Object.assign(Object.assign({}, body), { success: true }));
 var ActivityState;
@@ -32,7 +32,7 @@ class App {
         this.stopCallbacks = [];
         this.commitCallbacks = [];
         this.activityState = ActivityState.NotActive;
-        this.version = '3.6.3'; // TODO: version compatability check inside each plugin.
+        this.version = '4.0.0'; // TODO: version compatability check inside each plugin.
         this.projectKey = projectKey;
         this.options = Object.assign({
             revID: '',
@@ -46,8 +46,8 @@ class App {
             verbose: false,
             __is_snippet: false,
             __debug_report_edp: null,
-            localStorage: window.localStorage,
-            sessionStorage: window.sessionStorage,
+            localStorage: window === null || window === void 0 ? void 0 : window.localStorage,
+            sessionStorage: window === null || window === void 0 ? void 0 : window.sessionStorage,
         }, options);
         this.revID = this.options.revID;
         this.sanitizer = new sanitizer_js_1.default(this, options);
@@ -57,32 +57,33 @@ class App {
         this.ticker.attach(() => this.commit());
         this.debug = new logger_js_1.default(this.options.__debug__);
         this.notify = new logger_js_1.default(this.options.verbose ? logger_js_1.LogLevel.Warnings : logger_js_1.LogLevel.Silent);
-        this.session = new session_js_1.default();
+        this.localStorage = this.options.localStorage || window.localStorage;
+        this.sessionStorage = this.options.sessionStorage || window.sessionStorage;
+        this.session = new session_js_1.default(this, this.options);
         this.session.attachUpdateCallback(({ userID, metadata }) => {
-            if (userID != null) { // TODO: nullable userID
-                this.send(new messages_js_1.UserID(userID));
+            if (userID != null) {
+                // TODO: nullable userID
+                this.send((0, messages_gen_js_1.UserID)(userID));
             }
             if (metadata != null) {
-                Object.entries(metadata).forEach(([key, value]) => this.send(new messages_js_1.Metadata(key, value)));
+                Object.entries(metadata).forEach(([key, value]) => this.send((0, messages_gen_js_1.Metadata)(key, value)));
             }
         });
-        this.localStorage = this.options.localStorage;
-        this.sessionStorage = this.options.sessionStorage;
+        // @depricated (use sessionHash on start instead)
         if (sessionToken != null) {
-            this.sessionStorage.setItem(this.options.session_token_key, sessionToken);
+            this.session.applySessionHash(sessionToken);
         }
         try {
-            this.worker = new Worker(URL.createObjectURL(new Blob([`"use strict";function t(t){function i(...i){return new t(...i)}return i.prototype=t.prototype,i}const i=new Map;const s=t(class{constructor(t,i,s){this.pageNo=t,this.firstIndex=i,this.timestamp=s,this._id=80}encode(t){return t.uint(80)&&t.uint(this.pageNo)&&t.uint(this.firstIndex)&&t.int(this.timestamp)}});i.set(80,s);const e=t(class{constructor(t){this.timestamp=t,this._id=0}encode(t){return t.uint(0)&&t.uint(this.timestamp)}});i.set(0,e);const n=t(class{constructor(t,i,s){this.url=t,this.referrer=i,this.navigationStart=s,this._id=4}encode(t){return t.uint(4)&&t.string(this.url)&&t.string(this.referrer)&&t.uint(this.navigationStart)}});i.set(4,n);const r=t(class{constructor(t,i){this.width=t,this.height=i,this._id=5}encode(t){return t.uint(5)&&t.uint(this.width)&&t.uint(this.height)}});i.set(5,r);const h=t(class{constructor(t,i){this.x=t,this.y=i,this._id=6}encode(t){return t.uint(6)&&t.int(this.x)&&t.int(this.y)}});i.set(6,h);const o=t(class{constructor(){this._id=7}encode(t){return t.uint(7)}});i.set(7,o);const c=t(class{constructor(t,i,s,e,n){this.id=t,this.parentID=i,this.index=s,this.tag=e,this.svg=n,this._id=8}encode(t){return t.uint(8)&&t.uint(this.id)&&t.uint(this.parentID)&&t.uint(this.index)&&t.string(this.tag)&&t.boolean(this.svg)}});i.set(8,c);const a=t(class{constructor(t,i,s){this.id=t,this.parentID=i,this.index=s,this._id=9}encode(t){return t.uint(9)&&t.uint(this.id)&&t.uint(this.parentID)&&t.uint(this.index)}});i.set(9,a);const u=t(class{constructor(t,i,s){this.id=t,this.parentID=i,this.index=s,this._id=10}encode(t){return t.uint(10)&&t.uint(this.id)&&t.uint(this.parentID)&&t.uint(this.index)}});i.set(10,u);const d=t(class{constructor(t){this.id=t,this._id=11}encode(t){return t.uint(11)&&t.uint(this.id)}});i.set(11,d);const l=t(class{constructor(t,i,s){this.id=t,this.name=i,this.value=s,this._id=12}encode(t){return t.uint(12)&&t.uint(this.id)&&t.string(this.name)&&t.string(this.value)}});i.set(12,l);const p=t(class{constructor(t,i){this.id=t,this.name=i,this._id=13}encode(t){return t.uint(13)&&t.uint(this.id)&&t.string(this.name)}});i.set(13,p);const g=t(class{constructor(t,i){this.id=t,this.data=i,this._id=14}encode(t){return t.uint(14)&&t.uint(this.id)&&t.string(this.data)}});i.set(14,g);const m=t(class{constructor(t,i,s){this.id=t,this.x=i,this.y=s,this._id=16}encode(t){return t.uint(16)&&t.uint(this.id)&&t.int(this.x)&&t.int(this.y)}});i.set(16,m);const f=t(class{constructor(t,i){this.id=t,this.label=i,this._id=17}encode(t){return t.uint(17)&&t.uint(this.id)&&t.string(this.label)}});i.set(17,f);const y=t(class{constructor(t,i,s){this.id=t,this.value=i,this.mask=s,this._id=18}encode(t){return t.uint(18)&&t.uint(this.id)&&t.string(this.value)&&t.int(this.mask)}});i.set(18,y);const _=t(class{constructor(t,i){this.id=t,this.checked=i,this._id=19}encode(t){return t.uint(19)&&t.uint(this.id)&&t.boolean(this.checked)}});i.set(19,_);const v=t(class{constructor(t,i){this.x=t,this.y=i,this._id=20}encode(t){return t.uint(20)&&t.uint(this.x)&&t.uint(this.y)}});i.set(20,v);const S=t(class{constructor(t,i){this.level=t,this.value=i,this._id=22}encode(t){return t.uint(22)&&t.string(this.level)&&t.string(this.value)}});i.set(22,S);const b=t(class{constructor(t,i,s,e,n,r,h,o,c){this.requestStart=t,this.responseStart=i,this.responseEnd=s,this.domContentLoadedEventStart=e,this.domContentLoadedEventEnd=n,this.loadEventStart=r,this.loadEventEnd=h,this.firstPaint=o,this.firstContentfulPaint=c,this._id=23}encode(t){return t.uint(23)&&t.uint(this.requestStart)&&t.uint(this.responseStart)&&t.uint(this.responseEnd)&&t.uint(this.domContentLoadedEventStart)&&t.uint(this.domContentLoadedEventEnd)&&t.uint(this.loadEventStart)&&t.uint(this.loadEventEnd)&&t.uint(this.firstPaint)&&t.uint(this.firstContentfulPaint)}});i.set(23,b);const w=t(class{constructor(t,i,s){this.speedIndex=t,this.visuallyComplete=i,this.timeToInteractive=s,this._id=24}encode(t){return t.uint(24)&&t.uint(this.speedIndex)&&t.uint(this.visuallyComplete)&&t.uint(this.timeToInteractive)}});i.set(24,w);const E=t(class{constructor(t,i,s){this.name=t,this.message=i,this.payload=s,this._id=25}encode(t){return t.uint(25)&&t.string(this.name)&&t.string(this.message)&&t.string(this.payload)}});i.set(25,E);const x=t(class{constructor(t,i){this.name=t,this.payload=i,this._id=27}encode(t){return t.uint(27)&&t.string(this.name)&&t.string(this.payload)}});i.set(27,x);const T=t(class{constructor(t){this.id=t,this._id=28}encode(t){return t.uint(28)&&t.string(this.id)}});i.set(28,T);const z=t(class{constructor(t){this.id=t,this._id=29}encode(t){return t.uint(29)&&t.string(this.id)}});i.set(29,z);const k=t(class{constructor(t,i){this.key=t,this.value=i,this._id=30}encode(t){return t.uint(30)&&t.string(this.key)&&t.string(this.value)}});i.set(30,k);const A=t(class{constructor(t,i,s){this.id=t,this.rule=i,this.index=s,this._id=37}encode(t){return t.uint(37)&&t.uint(this.id)&&t.string(this.rule)&&t.uint(this.index)}});i.set(37,A);const I=t(class{constructor(t,i){this.id=t,this.index=i,this._id=38}encode(t){return t.uint(38)&&t.uint(this.id)&&t.uint(this.index)}});i.set(38,I);const L=t(class{constructor(t,i,s,e,n,r,h){this.method=t,this.url=i,this.request=s,this.response=e,this.status=n,this.timestamp=r,this.duration=h,this._id=39}encode(t){return t.uint(39)&&t.string(this.method)&&t.string(this.url)&&t.string(this.request)&&t.string(this.response)&&t.uint(this.status)&&t.uint(this.timestamp)&&t.uint(this.duration)}});i.set(39,L);const C=t(class{constructor(t,i,s,e){this.name=t,this.duration=i,this.args=s,this.result=e,this._id=40}encode(t){return t.uint(40)&&t.string(this.name)&&t.uint(this.duration)&&t.string(this.args)&&t.string(this.result)}});i.set(40,C);const M=t(class{constructor(t,i){this.key=t,this.value=i,this._id=41}encode(t){return t.uint(41)&&t.string(this.key)&&t.string(this.value)}});i.set(41,M);const N=t(class{constructor(t){this.type=t,this._id=42}encode(t){return t.uint(42)&&t.string(this.type)}});i.set(42,N);const B=t(class{constructor(t,i,s){this.action=t,this.state=i,this.duration=s,this._id=44}encode(t){return t.uint(44)&&t.string(this.action)&&t.string(this.state)&&t.uint(this.duration)}});i.set(44,B);const U=t(class{constructor(t,i){this.mutation=t,this.state=i,this._id=45}encode(t){return t.uint(45)&&t.string(this.mutation)&&t.string(this.state)}});i.set(45,U);const R=t(class{constructor(t,i){this.type=t,this.payload=i,this._id=46}encode(t){return t.uint(46)&&t.string(this.type)&&t.string(this.payload)}});i.set(46,R);const O=t(class{constructor(t,i,s){this.action=t,this.state=i,this.duration=s,this._id=47}encode(t){return t.uint(47)&&t.string(this.action)&&t.string(this.state)&&t.uint(this.duration)}});i.set(47,O);const P=t(class{constructor(t,i,s,e){this.operationKind=t,this.operationName=i,this.variables=s,this.response=e,this._id=48}encode(t){return t.uint(48)&&t.string(this.operationKind)&&t.string(this.operationName)&&t.string(this.variables)&&t.string(this.response)}});i.set(48,P);const q=t(class{constructor(t,i,s,e){this.frames=t,this.ticks=i,this.totalJSHeapSize=s,this.usedJSHeapSize=e,this._id=49}encode(t){return t.uint(49)&&t.int(this.frames)&&t.int(this.ticks)&&t.uint(this.totalJSHeapSize)&&t.uint(this.usedJSHeapSize)}});i.set(49,q);const D=t(class{constructor(t,i,s,e,n,r,h,o){this.timestamp=t,this.duration=i,this.ttfb=s,this.headerSize=e,this.encodedBodySize=n,this.decodedBodySize=r,this.url=h,this.initiator=o,this._id=53}encode(t){return t.uint(53)&&t.uint(this.timestamp)&&t.uint(this.duration)&&t.uint(this.ttfb)&&t.uint(this.headerSize)&&t.uint(this.encodedBodySize)&&t.uint(this.decodedBodySize)&&t.string(this.url)&&t.string(this.initiator)}});i.set(53,D);const W=t(class{constructor(t,i){this.downlink=t,this.type=i,this._id=54}encode(t){return t.uint(54)&&t.uint(this.downlink)&&t.string(this.type)}});i.set(54,W);const H=t(class{constructor(t){this.hidden=t,this._id=55}encode(t){return t.uint(55)&&t.boolean(this.hidden)}});i.set(55,H);const J=t(class{constructor(t,i,s,e,n,r,h){this.timestamp=t,this.duration=i,this.context=s,this.containerType=e,this.containerSrc=n,this.containerId=r,this.containerName=h,this._id=59}encode(t){return t.uint(59)&&t.uint(this.timestamp)&&t.uint(this.duration)&&t.uint(this.context)&&t.uint(this.containerType)&&t.string(this.containerSrc)&&t.string(this.containerId)&&t.string(this.containerName)}});i.set(59,J);const F=t(class{constructor(t,i,s,e){this.id=t,this.name=i,this.value=s,this.baseURL=e,this._id=60}encode(t){return t.uint(60)&&t.uint(this.id)&&t.string(this.name)&&t.string(this.value)&&t.string(this.baseURL)}});i.set(60,F);const X=t(class{constructor(t,i,s){this.id=t,this.data=i,this.baseURL=s,this._id=61}encode(t){return t.uint(61)&&t.uint(this.id)&&t.string(this.data)&&t.string(this.baseURL)}});i.set(61,X);const G=t(class{constructor(t,i){this.type=t,this.value=i,this._id=63}encode(t){return t.uint(63)&&t.string(this.type)&&t.string(this.value)}});i.set(63,G);const K=t(class{constructor(t,i){this.name=t,this.payload=i,this._id=64}encode(t){return t.uint(64)&&t.string(this.name)&&t.string(this.payload)}});i.set(64,K);const j=t(class{constructor(){this._id=65}encode(t){return t.uint(65)}});i.set(65,j);const Q=t(class{constructor(t,i,s,e){this.id=t,this.rule=i,this.index=s,this.baseURL=e,this._id=67}encode(t){return t.uint(67)&&t.uint(this.id)&&t.string(this.rule)&&t.uint(this.index)&&t.string(this.baseURL)}});i.set(67,Q);const V=t(class{constructor(t,i,s,e){this.id=t,this.hesitationTime=i,this.label=s,this.selector=e,this._id=69}encode(t){return t.uint(69)&&t.uint(this.id)&&t.uint(this.hesitationTime)&&t.string(this.label)&&t.string(this.selector)}});i.set(69,V);const Y=t(class{constructor(t,i){this.frameID=t,this.id=i,this._id=70}encode(t){return t.uint(70)&&t.uint(this.frameID)&&t.uint(this.id)}});i.set(70,Y);class Z{constructor(t,i,s,e=10,n=1e3){this.onUnauthorised=i,this.onFailure=s,this.MAX_ATTEMPTS_COUNT=e,this.ATTEMPT_TIMEOUT=n,this.attemptsCount=0,this.busy=!1,this.queue=[],this.token=null,this.ingestURL=t+"/v1/web/i"}authorise(t){this.token=t}push(t){this.busy||!this.token?this.queue.push(t):this.sendBatch(t)}retry(t){this.attemptsCount>=this.MAX_ATTEMPTS_COUNT?this.onFailure():(this.attemptsCount++,setTimeout(()=>this.sendBatch(t),this.ATTEMPT_TIMEOUT*this.attemptsCount))}sendBatch(t){this.busy=!0,fetch(this.ingestURL,{body:t,method:"POST",headers:{Authorization:"Bearer "+this.token},keepalive:t.length<65536}).then(i=>{if(401===i.status)return this.busy=!1,void this.onUnauthorised();if(i.status>=400)return void this.retry(t);this.attemptsCount=0;const s=this.queue.shift();s?this.sendBatch(s):this.busy=!1}).catch(i=>{console.warn("OpenReplay:",i),this.retry(t)})}clean(){this.queue.length=0}}const tt="function"==typeof TextEncoder?new TextEncoder:{encode(t){const i=t.length,s=new Uint8Array(3*i);let e=-1;for(var n=0,r=0,h=0;h!==i;){if(n=t.charCodeAt(h),h+=1,n>=55296&&n<=56319){if(h===i){s[e+=1]=239,s[e+=1]=191,s[e+=1]=189;break}if(!((r=t.charCodeAt(h))>=56320&&r<=57343)){s[e+=1]=239,s[e+=1]=191,s[e+=1]=189;continue}if(h+=1,(n=1024*(n-55296)+r-56320+65536)>65535){s[e+=1]=240|n>>>18,s[e+=1]=128|n>>>12&63,s[e+=1]=128|n>>>6&63,s[e+=1]=128|63&n;continue}}n<=127?s[e+=1]=0|n:n<=2047?(s[e+=1]=192|n>>>6,s[e+=1]=128|63&n):(s[e+=1]=224|n>>>12,s[e+=1]=128|n>>>6&63,s[e+=1]=128|63&n)}return s.subarray(0,e+1)}};class it{constructor(t){this.size=t,this.offset=0,this.checkpointOffset=0,this.data=new Uint8Array(t)}checkpoint(){this.checkpointOffset=this.offset}isEmpty(){return 0===this.offset}boolean(t){return this.data[this.offset++]=+t,this.offset<=this.size}uint(t){for((t<0||t>Number.MAX_SAFE_INTEGER)&&(t=0);t>=128;)this.data[this.offset++]=t%256|128,t=Math.floor(t/128);return this.data[this.offset++]=t,this.offset<=this.size}int(t){return t=Math.round(t),this.uint(t>=0?2*t:-2*t-1)}string(t){const i=tt.encode(t),s=i.byteLength;return!(!this.uint(s)||this.offset+s>this.size)&&(this.data.set(i,this.offset),this.offset+=s,!0)}reset(){this.offset=0,this.checkpointOffset=0}flush(){const t=this.data.slice(0,this.checkpointOffset);return this.reset(),t}}class st{constructor(t,i,s){this.pageNo=t,this.timestamp=i,this.onBatch=s,this.nextIndex=0,this.beaconSize=2e5,this.writer=new it(this.beaconSize),this.isEmpty=!0,this.beaconSizeLimit=1e6,this.prepare()}prepare(){this.writer.isEmpty()&&new s(this.pageNo,this.nextIndex,this.timestamp).encode(this.writer)}write(t){const i=t.encode(this.writer);return i&&(this.isEmpty=!1,this.writer.checkpoint(),this.nextIndex++),i}setBeaconSizeLimit(t){this.beaconSizeLimit=t}writeMessage(t){for(t instanceof e&&(this.timestamp=t.timestamp);!this.write(t);){if(this.finaliseBatch(),this.beaconSize===this.beaconSizeLimit)return console.warn("OpenReplay: beacon size overflow. Skipping large message."),this.writer.reset(),this.prepare(),void(this.isEmpty=!0);this.beaconSize=Math.min(2*this.beaconSize,this.beaconSizeLimit),this.writer=new it(this.beaconSize),this.prepare(),this.isEmpty=!0}}finaliseBatch(){this.isEmpty||(this.onBatch(this.writer.flush()),this.prepare(),this.isEmpty=!0)}clean(){this.writer.reset()}}var et;!function(t){t[t.NotActive=0]="NotActive",t[t.Starting=1]="Starting",t[t.Stopping=2]="Stopping",t[t.Active=3]="Active"}(et||(et={}));let nt=null,rt=null;function ht(){rt&&rt.finaliseBatch()}function ot(){et.Stopping,null!==at&&(clearInterval(at),at=null),rt&&(rt.clean(),rt=null),et.NotActive}et.NotActive;let ct,at=null;self.onmessage=({data:t})=>{if(null!=t){if("stop"===t)return ht(),void ot();if(Array.isArray(t)){if(!rt)throw new Error("WebWorker: writer not initialised. Service Should be Started.");const s=rt;t.forEach(t=>{const e=new(i.get(t._id));Object.assign(e,t),e instanceof H&&(e.hidden?ct=setTimeout(()=>self.postMessage("restart"),18e5):clearTimeout(ct)),s.writeMessage(e)})}else{if("start"===t.type)return et.Starting,nt=new Z(t.ingestPoint,()=>{self.postMessage("restart")},()=>{nt&&(nt.clean(),nt=null),ot(),self.postMessage("failed")},t.connAttemptCount,t.connAttemptGap),rt=new st(t.pageNo,t.timestamp,t=>nt&&nt.push(t)),null===at&&(at=setInterval(ht,1e4)),et.Active;if("auth"===t.type){if(!nt)throw new Error("WebWorker: sender not initialised. Received auth.");if(!rt)throw new Error("WebWorker: writer not initialised. Received auth.");return nt.authorise(t.token),void(t.beaconSizeLimit&&rt.setBeaconSizeLimit(t.beaconSizeLimit))}}}else ht()};
-`], { type: 'text/javascript' })));
-            this.worker.onerror = e => {
-                this._debug("webworker_error", e);
+            this.worker = new Worker(URL.createObjectURL(new Blob(['"use strict";class t{constructor(t,i,s,e=10,n=1e3){this.onUnauthorised=i,this.onFailure=s,this.MAX_ATTEMPTS_COUNT=e,this.ATTEMPT_TIMEOUT=n,this.attemptsCount=0,this.busy=!1,this.queue=[],this.token=null,this.ingestURL=t+"/v1/web/i"}authorise(t){this.token=t}push(t){this.busy||!this.token?this.queue.push(t):this.sendBatch(t)}retry(t){this.attemptsCount>=this.MAX_ATTEMPTS_COUNT?this.onFailure():(this.attemptsCount++,setTimeout(()=>this.sendBatch(t),this.ATTEMPT_TIMEOUT*this.attemptsCount))}sendBatch(t){this.busy=!0,fetch(this.ingestURL,{body:t,method:"POST",headers:{Authorization:"Bearer "+this.token},keepalive:t.length<65536}).then(i=>{if(401===i.status)return this.busy=!1,void this.onUnauthorised();if(i.status>=400)return void this.retry(t);this.attemptsCount=0;const s=this.queue.shift();s?this.sendBatch(s):this.busy=!1}).catch(i=>{console.warn("OpenReplay:",i),this.retry(t)})}clean(){this.queue.length=0}}const i="function"==typeof TextEncoder?new TextEncoder:{encode(t){const i=t.length,s=new Uint8Array(3*i);let e=-1;for(let n=0,r=0,h=0;h!==i;){if(n=t.charCodeAt(h),h+=1,n>=55296&&n<=56319){if(h===i){s[e+=1]=239,s[e+=1]=191,s[e+=1]=189;break}if(r=t.charCodeAt(h),!(r>=56320&&r<=57343)){s[e+=1]=239,s[e+=1]=191,s[e+=1]=189;continue}if(n=1024*(n-55296)+r-56320+65536,h+=1,n>65535){s[e+=1]=240|n>>>18,s[e+=1]=128|n>>>12&63,s[e+=1]=128|n>>>6&63,s[e+=1]=128|63&n;continue}}n<=127?s[e+=1]=0|n:n<=2047?(s[e+=1]=192|n>>>6,s[e+=1]=128|63&n):(s[e+=1]=224|n>>>12,s[e+=1]=128|n>>>6&63,s[e+=1]=128|63&n)}return s.subarray(0,e+1)}};class s extends class{constructor(t){this.size=t,this.offset=0,this.checkpointOffset=0,this.data=new Uint8Array(t)}getCurrentOffset(){return this.offset}checkpoint(){this.checkpointOffset=this.offset}isEmpty(){return 0===this.offset}skip(t){return this.offset+=t,this.offset<=this.size}set(t,i){this.data.set(t,i)}boolean(t){return this.data[this.offset++]=+t,this.offset<=this.size}uint(t){for((t<0||t>Number.MAX_SAFE_INTEGER)&&(t=0);t>=128;)this.data[this.offset++]=t%256|128,t=Math.floor(t/128);return this.data[this.offset++]=t,this.offset<=this.size}int(t){return t=Math.round(t),this.uint(t>=0?2*t:-2*t-1)}string(t){const s=i.encode(t),e=s.byteLength;return!(!this.uint(e)||this.offset+e>this.size)&&(this.data.set(s,this.offset),this.offset+=e,!0)}reset(){this.offset=0,this.checkpointOffset=0}flush(){const t=this.data.slice(0,this.checkpointOffset);return this.reset(),t}}{encode(t){switch(t[0]){case 81:return this.uint(t[1])&&this.uint(t[2])&&this.uint(t[3])&&this.int(t[4])&&this.string(t[5]);case 82:return this.uint(t[1])&&this.uint(t[2]);case 0:return this.uint(t[1]);case 4:return this.string(t[1])&&this.string(t[2])&&this.uint(t[3]);case 5:return this.uint(t[1])&&this.uint(t[2]);case 6:return this.int(t[1])&&this.int(t[2]);case 7:return!0;case 8:return this.uint(t[1])&&this.uint(t[2])&&this.uint(t[3])&&this.string(t[4])&&this.boolean(t[5]);case 9:case 10:return this.uint(t[1])&&this.uint(t[2])&&this.uint(t[3]);case 11:return this.uint(t[1]);case 12:return this.uint(t[1])&&this.string(t[2])&&this.string(t[3]);case 13:case 14:return this.uint(t[1])&&this.string(t[2]);case 16:return this.uint(t[1])&&this.int(t[2])&&this.int(t[3]);case 17:return this.uint(t[1])&&this.string(t[2]);case 18:return this.uint(t[1])&&this.string(t[2])&&this.int(t[3]);case 19:return this.uint(t[1])&&this.boolean(t[2]);case 20:return this.uint(t[1])&&this.uint(t[2]);case 22:return this.string(t[1])&&this.string(t[2]);case 23:return this.uint(t[1])&&this.uint(t[2])&&this.uint(t[3])&&this.uint(t[4])&&this.uint(t[5])&&this.uint(t[6])&&this.uint(t[7])&&this.uint(t[8])&&this.uint(t[9]);case 24:return this.uint(t[1])&&this.uint(t[2])&&this.uint(t[3]);case 25:return this.string(t[1])&&this.string(t[2])&&this.string(t[3]);case 27:return this.string(t[1])&&this.string(t[2]);case 28:case 29:return this.string(t[1]);case 30:return this.string(t[1])&&this.string(t[2]);case 37:return this.uint(t[1])&&this.string(t[2])&&this.uint(t[3]);case 38:return this.uint(t[1])&&this.uint(t[2]);case 39:return this.string(t[1])&&this.string(t[2])&&this.string(t[3])&&this.string(t[4])&&this.uint(t[5])&&this.uint(t[6])&&this.uint(t[7]);case 40:return this.string(t[1])&&this.uint(t[2])&&this.string(t[3])&&this.string(t[4]);case 41:return this.string(t[1])&&this.string(t[2]);case 42:return this.string(t[1]);case 44:return this.string(t[1])&&this.string(t[2])&&this.uint(t[3]);case 45:case 46:return this.string(t[1])&&this.string(t[2]);case 47:return this.string(t[1])&&this.string(t[2])&&this.uint(t[3]);case 48:return this.string(t[1])&&this.string(t[2])&&this.string(t[3])&&this.string(t[4]);case 49:return this.int(t[1])&&this.int(t[2])&&this.uint(t[3])&&this.uint(t[4]);case 53:return this.uint(t[1])&&this.uint(t[2])&&this.uint(t[3])&&this.uint(t[4])&&this.uint(t[5])&&this.uint(t[6])&&this.string(t[7])&&this.string(t[8]);case 54:return this.uint(t[1])&&this.string(t[2]);case 55:return this.boolean(t[1]);case 59:return this.uint(t[1])&&this.uint(t[2])&&this.uint(t[3])&&this.uint(t[4])&&this.string(t[5])&&this.string(t[6])&&this.string(t[7]);case 60:return this.uint(t[1])&&this.string(t[2])&&this.string(t[3])&&this.string(t[4]);case 61:return this.uint(t[1])&&this.string(t[2])&&this.string(t[3]);case 63:case 64:return this.string(t[1])&&this.string(t[2]);case 67:return this.uint(t[1])&&this.string(t[2])&&this.uint(t[3])&&this.string(t[4]);case 69:return this.uint(t[1])&&this.uint(t[2])&&this.string(t[3])&&this.string(t[4]);case 70:return this.uint(t[1])&&this.uint(t[2]);case 71:return this.uint(t[1])&&this.string(t[2])&&this.string(t[3]);case 73:return this.uint(t[1])&&this.string(t[2])&&this.uint(t[3])&&this.string(t[4]);case 75:case 76:case 77:return this.uint(t[1])&&this.uint(t[2])}}}class e{constructor(t,i,e,n){this.pageNo=t,this.timestamp=i,this.url=e,this.onBatch=n,this.nextIndex=0,this.beaconSize=2e5,this.encoder=new s(this.beaconSize),this.sizeBuffer=new Uint8Array(3),this.isEmpty=!0,this.beaconSizeLimit=1e6,this.prepare()}writeType(t){return this.encoder.uint(t[0])}writeFields(t){return this.encoder.encode(t)}writeSizeAt(t,i){for(let i=0;i<3;i++)this.sizeBuffer[i]=t>>8*i;this.encoder.set(this.sizeBuffer,i)}prepare(){if(!this.encoder.isEmpty())return;const t=[81,1,this.pageNo,this.nextIndex,this.timestamp,this.url];this.writeType(t),this.writeFields(t),this.isEmpty=!0}writeWithSize(t){const i=this.encoder;if(!this.writeType(t)||!i.skip(3))return!1;const s=i.getCurrentOffset(),e=this.writeFields(t);if(e){const e=i.getCurrentOffset()-s;if(e>16777215)return console.warn("OpenReplay: max message size overflow."),!1;this.writeSizeAt(e,s-3),i.checkpoint(),this.isEmpty=this.isEmpty&&0===t[0],this.nextIndex++}return e}setBeaconSizeLimit(t){this.beaconSizeLimit=t}writeMessage(t){if(0===t[0]&&(this.timestamp=t[1]),4===t[0]&&(this.url=t[1]),!this.writeWithSize(t))for(this.finaliseBatch();!this.writeWithSize(t);){if(this.beaconSize===this.beaconSizeLimit)return console.warn("OpenReplay: beacon size overflow. Skipping large message.",t,this),this.encoder.reset(),void this.prepare();this.beaconSize=Math.min(2*this.beaconSize,this.beaconSizeLimit),this.encoder=new s(this.beaconSize),this.prepare()}}finaliseBatch(){this.isEmpty||(this.onBatch(this.encoder.flush()),this.prepare())}clean(){this.encoder.reset()}}var n;!function(t){t[t.NotActive=0]="NotActive",t[t.Starting=1]="Starting",t[t.Stopping=2]="Stopping",t[t.Active=3]="Active"}(n||(n={}));let r=null,h=null;function u(){h&&h.finaliseBatch()}function a(){n.Stopping,null!==c&&(clearInterval(c),c=null),h&&(h.clean(),h=null),n.NotActive}n.NotActive;let o,c=null;self.onmessage=({data:i})=>{if(null!=i){if("stop"===i)return u(),void a();if(Array.isArray(i)){if(!h)throw new Error("WebWorker: writer not initialised. Service Should be Started.");const t=h;i.forEach(i=>{55===i[0]&&(i[1]?o=setTimeout(()=>self.postMessage("restart"),18e5):clearTimeout(o)),t.writeMessage(i)})}else{if("start"===i.type)return n.Starting,r=new t(i.ingestPoint,()=>{self.postMessage("restart")},()=>{r&&(r.clean(),r=null),a(),self.postMessage("failed")},i.connAttemptCount,i.connAttemptGap),h=new e(i.pageNo,i.timestamp,i.url,t=>r&&r.push(t)),null===c&&(c=setInterval(u,1e4)),n.Active;if("auth"===i.type){if(!r)throw new Error("WebWorker: sender not initialised. Received auth.");if(!h)throw new Error("WebWorker: writer not initialised. Received auth.");return r.authorise(i.token),void(i.beaconSizeLimit&&h.setBeaconSizeLimit(i.beaconSizeLimit))}}}else u()};'], { type: 'text/javascript' })));
+            this.worker.onerror = (e) => {
+                this._debug('webworker_error', e);
             };
             this.worker.onmessage = ({ data }) => {
-                if (data === "failed") {
+                if (data === 'failed') {
                     this.stop();
-                    this._debug("worker_failed", {}); // add context (from worker)
+                    this._debug('worker_failed', {}); // add context (from worker)
                 }
-                else if (data === "restart") {
+                else if (data === 'restart') {
                     this.stop();
                     this.start({ forceNew: true });
                 }
@@ -99,7 +100,7 @@ class App {
             this.attachEventListener(document, 'visibilitychange', alertWorker, false);
         }
         catch (e) {
-            this._debug("worker_start", e);
+            this._debug('worker_start', e);
         }
     }
     _debug(context, e) {
@@ -109,11 +110,11 @@ class App {
                 headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify({
                     context,
-                    error: `${e}`
-                })
+                    error: `${e}`,
+                }),
             });
         }
-        this.debug.error("OpenReplay error: ", context, e);
+        this.debug.error('OpenReplay error: ', context, e);
     }
     send(message, urgent = false) {
         if (this.activityState === ActivityState.NotActive) {
@@ -130,9 +131,9 @@ class App {
     }
     commit() {
         if (this.worker && this.messages.length) {
-            this.messages.unshift(new messages_js_1.Timestamp((0, utils_js_1.timestamp)()));
+            this.messages.unshift((0, messages_gen_js_1.Timestamp)((0, utils_js_1.timestamp)()));
             this.worker.postMessage(this.messages);
-            this.commitCallbacks.forEach(cb => cb(this.messages));
+            this.commitCallbacks.forEach((cb) => cb(this.messages));
             this.messages.length = 0;
         }
     }
@@ -143,8 +144,8 @@ class App {
                 fn.apply(this, args);
             }
             catch (e) {
-                app._debug("safe_fn_call", e);
-                // time: timestamp(),
+                app._debug('safe_fn_call', e);
+                // time: now(),
                 // name: e.name,
                 // message: e.message,
                 // stack: e.stack
@@ -152,57 +153,72 @@ class App {
         }; // TODO: correct typing
     }
     attachCommitCallback(cb) {
+        // TODO!: what if start callback added when activityState === Active ?
+        // For example - attachEventListener() called during dynamic <iframe> appearance
         this.commitCallbacks.push(cb);
     }
-    attachStartCallback(cb) {
+    attachStartCallback(cb, useSafe = false) {
+        if (useSafe) {
+            cb = this.safe(cb);
+        }
         this.startCallbacks.push(cb);
     }
-    attachStopCallback(cb) {
+    attachStopCallback(cb, useSafe = false) {
+        if (useSafe) {
+            cb = this.safe(cb);
+        }
         this.stopCallbacks.push(cb);
     }
     attachEventListener(target, type, listener, useSafe = true, useCapture = true) {
         if (useSafe) {
             listener = this.safe(listener);
         }
-        this.attachStartCallback(() => target.addEventListener(type, listener, useCapture));
-        this.attachStopCallback(() => target.removeEventListener(type, listener, useCapture));
+        this.attachStartCallback(() => target.addEventListener(type, listener, useCapture), useSafe);
+        this.attachStopCallback(() => target.removeEventListener(type, listener, useCapture), useSafe);
     }
     // TODO: full correct semantic
     checkRequiredVersion(version) {
         const reqVer = version.split(/[.-]/);
         const ver = this.version.split(/[.-]/);
         for (let i = 0; i < 3; i++) {
+            if (isNaN(Number(ver[i])) || isNaN(Number(reqVer[i]))) {
+                return false;
+            }
             if (Number(ver[i]) > Number(reqVer[i])) {
                 return true;
             }
-            if (Number(ver[i]) < Number(reqVer[i]) || isNaN(Number(ver[i])) || isNaN(Number(reqVer[i]))) {
+            if (Number(ver[i]) < Number(reqVer[i])) {
                 return false;
             }
         }
         return true;
     }
-    getStartInfo() {
+    getTrackerInfo() {
         return {
             userUUID: this.localStorage.getItem(this.options.local_uuid_key),
             projectKey: this.projectKey,
             revID: this.revID,
-            timestamp: (0, utils_js_1.timestamp)(),
             trackerVersion: this.version,
             isSnippet: this.options.__is_snippet,
         };
     }
     getSessionInfo() {
-        return Object.assign(Object.assign({}, this.session.getInfo()), this.getStartInfo());
+        return Object.assign(Object.assign({}, this.session.getInfo()), this.getTrackerInfo());
     }
     getSessionToken() {
-        const token = this.sessionStorage.getItem(this.options.session_token_key);
-        if (token !== null) {
-            return token;
-        }
+        return this.session.getSessionToken();
     }
     getSessionID() {
         return this.session.getInfo().sessionID || undefined;
     }
+    getSessionURL() {
+        const { projectID, sessionID } = this.session.getInfo();
+        if (!projectID || !sessionID) {
+            this.debug.error('OpenReplay error: Unable to build session URL');
+            return undefined;
+        }
+        return this.options.ingestPoint.replace(/ingest$/, `${projectID}/session/${sessionID}`);
+    }
     getHost() {
         return new URL(this.options.ingestPoint).hostname;
     }
@@ -215,18 +231,19 @@ class App {
             return this.options.resourceBaseHref;
         }
         else if (typeof this.options.resourceBaseHref === 'object') {
-            //switch between  types
+            //TODO: switch between types
         }
         if (document.baseURI) {
             return document.baseURI;
         }
         // IE only
-        return ((_b = (_a = document.head) === null || _a === void 0 ? void 0 : _a.getElementsByTagName("base")[0]) === null || _b === void 0 ? void 0 : _b.getAttribute("href")) || location.origin + location.pathname;
+        return (((_b = (_a = document.head) === null || _a === void 0 ? void 0 : _a.getElementsByTagName('base')[0]) === null || _b === void 0 ? void 0 : _b.getAttribute('href')) ||
+            location.origin + location.pathname);
     }
     resolveResourceURL(resourceURL) {
         const base = new URL(this.getBaseHref());
-        base.pathname += "/" + new URL(resourceURL).pathname;
-        base.pathname.replace(/\/+/g, "/");
+        base.pathname += '/' + new URL(resourceURL).pathname;
+        base.pathname.replace(/\/+/g, '/');
         return base.toString();
     }
     isServiceURL(url) {
@@ -245,30 +262,28 @@ class App {
     }
     _start(startOpts) {
         if (!this.worker) {
-            return Promise.resolve(UnsuccessfulStart("No worker found: perhaps, CSP is not set."));
+            return Promise.resolve(UnsuccessfulStart('No worker found: perhaps, CSP is not set.'));
         }
         if (this.activityState !== ActivityState.NotActive) {
-            return Promise.resolve(UnsuccessfulStart("OpenReplay: trying to call `start()` on the instance that has been started already."));
+            return Promise.resolve(UnsuccessfulStart('OpenReplay: trying to call `start()` on the instance that has been started already.'));
         }
         this.activityState = ActivityState.Starting;
-        let pageNo = 0;
-        const pageNoStr = this.sessionStorage.getItem(this.options.session_pageno_key);
-        if (pageNoStr != null) {
-            pageNo = parseInt(pageNoStr);
-            pageNo++;
+        if (startOpts.sessionHash) {
+            this.session.applySessionHash(startOpts.sessionHash);
         }
-        this.sessionStorage.setItem(this.options.session_pageno_key, pageNo.toString());
-        const startInfo = this.getStartInfo();
+        const timestamp = (0, utils_js_1.timestamp)();
         const startWorkerMsg = {
-            type: "start",
-            pageNo,
+            type: 'start',
+            pageNo: this.session.incPageNo(),
             ingestPoint: this.options.ingestPoint,
-            timestamp: startInfo.timestamp,
+            timestamp,
+            url: document.URL,
             connAttemptCount: this.options.connAttemptCount,
             connAttemptGap: this.options.connAttemptGap,
         };
         this.worker.postMessage(startWorkerMsg);
         this.session.update({
+            // TODO: transparent "session" module logic AND explicit internal api for plugins.
             // "updating" with old metadata in order to trigger session's UpdateCallbacks.
             // (for the case of internal .start() calls, like on "restart" webworker signal or assistent connection in tracker-assist )
             metadata: startOpts.metadata || this.session.getInfo().metadata,
@@ -276,63 +291,69 @@ class App {
         });
         const sReset = this.sessionStorage.getItem(this.options.session_reset_key);
         this.sessionStorage.removeItem(this.options.session_reset_key);
-        return window.fetch(this.options.ingestPoint + '/v1/web/start', {
+        return window
+            .fetch(this.options.ingestPoint + '/v1/web/start', {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',
             },
-            body: JSON.stringify(Object.assign(Object.assign({}, startInfo), { userID: this.session.getInfo().userID, token: this.sessionStorage.getItem(this.options.session_token_key), deviceMemory: performance_js_1.deviceMemory,
+            body: JSON.stringify(Object.assign(Object.assign({}, this.getTrackerInfo()), { timestamp, userID: this.session.getInfo().userID, token: this.session.getSessionToken(), deviceMemory: performance_js_1.deviceMemory,
                 jsHeapSizeLimit: performance_js_1.jsHeapSizeLimit, reset: startOpts.forceNew || sReset !== null })),
         })
-            .then(r => {
+            .then((r) => {
             if (r.status === 200) {
                 return r.json();
             }
             else {
-                return r.text().then(text => text === CANCELED
+                return r
+                    .text()
+                    .then((text) => text === CANCELED
                     ? Promise.reject(CANCELED)
                     : Promise.reject(`Server error: ${r.status}. ${text}`));
             }
         })
-            .then(r => {
+            .then((r) => {
             if (!this.worker) {
-                return Promise.reject("no worker found after start request (this might not happen)");
+                return Promise.reject('no worker found after start request (this might not happen)');
             }
-            const { token, userUUID, sessionID, beaconSizeLimit } = r;
+            const { token, userUUID, sessionID, projectID, beaconSizeLimit, startTimestamp, // real startTS, derived from sessionID
+             } = r;
             if (typeof token !== 'string' ||
                 typeof userUUID !== 'string' ||
+                //typeof startTimestamp !== 'number' ||
+                //typeof sessionID !== 'string' ||
                 (typeof beaconSizeLimit !== 'number' && typeof beaconSizeLimit !== 'undefined')) {
                 return Promise.reject(`Incorrect server response: ${JSON.stringify(r)}`);
             }
-            this.sessionStorage.setItem(this.options.session_token_key, token);
+            this.session.setSessionToken(token);
             this.localStorage.setItem(this.options.local_uuid_key, userUUID);
-            this.session.update({ sessionID }); // TODO: no no-explicit 'any'
+            this.session.update({ sessionID, timestamp: startTimestamp || timestamp, projectID }); // TODO: no no-explicit 'any'
             const startWorkerMsg = {
-                type: "auth",
+                type: 'auth',
                 token,
-                beaconSizeLimit
+                beaconSizeLimit,
             };
             this.worker.postMessage(startWorkerMsg);
-            this.activityState = ActivityState.Active;
             const onStartInfo = { sessionToken: token, userUUID, sessionID };
             this.startCallbacks.forEach((cb) => cb(onStartInfo)); // TODO: start as early as possible (before receiving the token)
             this.observer.observe();
             this.ticker.start();
-            this.notify.log("OpenReplay tracking started.");
+            this.activityState = ActivityState.Active;
+            this.notify.log('OpenReplay tracking started.');
             // get rid of onStart ?
             if (typeof this.options.onStart === 'function') {
                 this.options.onStart(onStartInfo);
             }
             return SuccessfulStart(onStartInfo);
         })
-            .catch(reason => {
-            this.sessionStorage.removeItem(this.options.session_token_key);
+            .catch((reason) => {
             this.stop();
+            this.session.reset();
             if (reason === CANCELED) {
                 return UnsuccessfulStart(CANCELED);
             }
-            this.notify.log("OpenReplay was unable to start. ", reason);
-            this._debug("session_start", reason);
+            this.notify.log('OpenReplay was unable to start. ', reason);
+            this._debug('session_start', reason);
             return UnsuccessfulStart(START_ERROR);
         });
     }
@@ -344,15 +365,15 @@ class App {
             return new Promise((resolve) => {
                 const onVisibilityChange = () => {
                     if (!document.hidden) {
-                        document.removeEventListener("visibilitychange", onVisibilityChange);
+                        document.removeEventListener('visibilitychange', onVisibilityChange);
                         resolve(this._start(options));
                     }
                 };
-                document.addEventListener("visibilitychange", onVisibilityChange);
+                document.addEventListener('visibilitychange', onVisibilityChange);
             });
         }
     }
-    stop(calledFromAPI = false, restarting = false) {
+    stop(stopWorker = true) {
         if (this.activityState !== ActivityState.NotActive) {
             try {
                 this.sanitizer.clear();
@@ -360,12 +381,9 @@ class App {
                 this.nodes.clear();
                 this.ticker.stop();
                 this.stopCallbacks.forEach((cb) => cb());
-                if (calledFromAPI) {
-                    this.session.reset();
-                }
-                this.notify.log("OpenReplay tracking stopped.");
-                if (this.worker && !restarting) {
-                    this.worker.postMessage("stop");
+                this.notify.log('OpenReplay tracking stopped.');
+                if (this.worker && stopWorker) {
+                    this.worker.postMessage('stop');
                 }
             }
             finally {
@@ -374,7 +392,7 @@ class App {
         }
     }
     restart() {
-        this.stop(false, true);
+        this.stop(false);
         this.start({ forceNew: false });
     }
 }