@openreplay/tracker 4.0.0 → 4.0.2

package/lib/app/index.js

@@ -29,7 +29,7 @@ export default class App {
         this.stopCallbacks = [];
         this.commitCallbacks = [];
         this.activityState = ActivityState.NotActive;
-        this.version = '4.0.0'; // TODO: version compatability check inside each plugin.
+        this.version = '4.0.2'; // TODO: version compatability check inside each plugin.
         this.projectKey = projectKey;
         this.options = Object.assign({
             revID: '',
@@ -71,17 +71,17 @@ export default class App {
             this.session.applySessionHash(sessionToken);
         }
         try {
-            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 = 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]);case 79:return this.string(t[1])&&this.string(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!==f&&(clearInterval(f),f=null),h&&(h.clean(),h=null),r&&(r.clean(),r=null),n.NotActive}function o(){self.postMessage("restart"),a()}n.NotActive;let c,f=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]?c=setTimeout(()=>o(),18e5):clearTimeout(c)),t.writeMessage(i)})}else{if("start"===i.type)return n.Starting,r=new t(i.ingestPoint,()=>{o()},()=>{self.postMessage("failed"),a()},i.connAttemptCount,i.connAttemptGap),h=new e(i.pageNo,i.timestamp,i.url,t=>r&&r.push(t)),null===f&&(f=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') {
-                    this.stop();
+                    this.stop(false);
                     this._debug('worker_failed', {}); // add context (from worker)
                 }
                 else if (data === 'restart') {
-                    this.stop();
+                    this.stop(false);
                     this.start({ forceNew: true });
                 }
             };
@@ -150,8 +150,6 @@ export default 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, useSafe = false) {
@@ -166,6 +164,7 @@ export default class App {
         }
         this.stopCallbacks.push(cb);
     }
+    // Use  app.nodes.attachNodeListener for registered nodes instead
     attachEventListener(target, type, listener, useSafe = true, useCapture = true) {
         if (useSafe) {
             listener = this.safe(listener);
@@ -217,7 +216,7 @@ export default class App {
         return this.options.ingestPoint.replace(/ingest$/, `${projectID}/session/${sessionID}`);
     }
     getHost() {
-        return new URL(this.options.ingestPoint).hostname;
+        return new URL(this.options.ingestPoint).host;
     }
     getProjectKey() {
         return this.projectKey;
@@ -288,14 +287,15 @@ export default class App {
         });
         const sReset = this.sessionStorage.getItem(this.options.session_reset_key);
         this.sessionStorage.removeItem(this.options.session_reset_key);
+        const shouldReset = startOpts.forceNew || sReset !== null;
         return window
             .fetch(this.options.ingestPoint + '/v1/web/start', {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',
             },
-            body: JSON.stringify(Object.assign(Object.assign({}, this.getTrackerInfo()), { timestamp, userID: this.session.getInfo().userID, token: this.session.getSessionToken(), deviceMemory,
-                jsHeapSizeLimit, reset: startOpts.forceNew || sReset !== null })),
+            body: JSON.stringify(Object.assign(Object.assign({}, this.getTrackerInfo()), { timestamp, userID: this.session.getInfo().userID, token: shouldReset ? undefined : this.session.getSessionToken(), deviceMemory,
+                jsHeapSizeLimit })),
         })
             .then((r) => {
             if (r.status === 200) {
@@ -313,6 +313,9 @@ export default class App {
             if (!this.worker) {
                 return Promise.reject('no worker found after start request (this might not happen)');
             }
+            if (this.activityState === ActivityState.NotActive) {
+                return Promise.reject('Tracker stopped during authorisation');
+            }
             const { token, userUUID, sessionID, projectID, beaconSizeLimit, startTimestamp, // real startTS, derived from sessionID
              } = r;
             if (typeof token !== 'string' ||
@@ -322,9 +325,12 @@ export default class App {
                 (typeof beaconSizeLimit !== 'number' && typeof beaconSizeLimit !== 'undefined')) {
                 return Promise.reject(`Incorrect server response: ${JSON.stringify(r)}`);
             }
+            if (sessionID !== this.session.getInfo().sessionID) {
+                this.session.reset();
+            }
             this.session.setSessionToken(token);
-            this.localStorage.setItem(this.options.local_uuid_key, userUUID);
             this.session.update({ sessionID, timestamp: startTimestamp || timestamp, projectID }); // TODO: no no-explicit 'any'
+            this.localStorage.setItem(this.options.local_uuid_key, userUUID);
             const startWorkerMsg = {
                 type: 'auth',
                 token,

package/lib/app/messages.gen.d.ts

@@ -55,3 +55,4 @@ export declare function AdoptedSSInsertRuleURLBased(sheetID: number, rule: strin
 export declare function AdoptedSSDeleteRule(sheetID: number, index: number): Messages.AdoptedSSDeleteRule;
 export declare function AdoptedSSAddOwner(sheetID: number, id: number): Messages.AdoptedSSAddOwner;
 export declare function AdoptedSSRemoveOwner(sheetID: number, id: number): Messages.AdoptedSSRemoveOwner;
+export declare function Zustand(mutation: string, state: string): Messages.Zustand;

package/lib/app/messages.gen.js

@@ -1,4 +1,5 @@
 // Auto-generated, do not edit
+/* eslint-disable */
 export function BatchMetadata(version, pageNo, firstIndex, timestamp, location) {
     return [
         81 /* BatchMetadata */,
@@ -432,3 +433,10 @@ export function AdoptedSSRemoveOwner(sheetID, id) {
         id,
     ];
 }
+export function Zustand(mutation, state) {
+    return [
+        79 /* Zustand */,
+        mutation,
+        state,
+    ];
+}

package/lib/app/nodes.d.ts

@@ -6,7 +6,7 @@ export default class Nodes {
     private readonly elementListeners;
     constructor(node_id: string);
     attachNodeCallback(nodeCallback: NodeCallback): void;
-    attachElementListener(type: string, node: Element, elementListener: EventListener): void;
+    attachNodeListener(node: Node, type: string, listener: EventListener): void;
     registerNode(node: Node): [/*id:*/ number, /*isNew:*/ boolean];
     unregisterNode(node: Node): number | undefined;
     cleanTree(): void;

package/lib/app/nodes.js

@@ -9,20 +9,18 @@ export default class Nodes {
     attachNodeCallback(nodeCallback) {
         this.nodeCallbacks.push(nodeCallback);
     }
-    // TODO: what is the difference with app.attachEventListener. can we use only one of those?
-    attachElementListener(type, node, elementListener) {
+    attachNodeListener(node, type, listener) {
         const id = this.getID(node);
         if (id === undefined) {
             return;
         }
-        node.addEventListener(type, elementListener);
+        node.addEventListener(type, listener);
         let listeners = this.elementListeners.get(id);
         if (listeners === undefined) {
             listeners = [];
             this.elementListeners.set(id, listeners);
-            return;
         }
-        listeners.push([type, elementListener]);
+        listeners.push([type, listener]);
     }
     registerNode(node) {
         let id = node[this.node_id];

package/lib/app/observer/iframe_observer.js

@@ -9,6 +9,7 @@ export default class IFrameObserver extends Observer {
         } //log TODO common app.logger
         // Have to observe document, because the inner <html> might be changed
         this.observeRoot(doc, (docID) => {
+            //MBTODO: do not send if empty (send on load? it might be in-place iframe, like our replayer, which does not get loaded)
             if (docID === undefined) {
                 console.log('OpenReplay: Iframe document not bound');
                 return;

package/lib/app/observer/iframe_offsets.d.ts

@@ -0,0 +1,8 @@
+export declare type Offset = [/*left:*/ number, /*top: */ number];
+export default class IFrameOffsets {
+    private readonly states;
+    private calcOffset;
+    getDocumentOffset(doc: Document): Offset;
+    observe(iFrame: HTMLIFrameElement): void;
+    clear(): void;
+}

package/lib/app/observer/iframe_offsets.js

@@ -0,0 +1,56 @@
+// Le truc - for defining an absolute offset for (nested) iframe documents. (To track mouse movments)
+export default class IFrameOffsets {
+    constructor() {
+        this.states = new Map();
+    }
+    calcOffset(state) {
+        let parLeft = 0, parTop = 0;
+        if (state.parent) {
+            ;
+            [parLeft, parTop] = this.calcOffset(state.parent);
+        }
+        if (!state.offset) {
+            const { left, top } = state.iFrame.getBoundingClientRect();
+            state.offset = [left, top];
+        }
+        const [left, top] = state.offset;
+        return [parLeft + left, parTop + top]; // TODO: store absolute sum, invalidate whole subtree. Otherwise it is summated on each mousemove
+    }
+    getDocumentOffset(doc) {
+        const state = this.states.get(doc);
+        if (!state) {
+            return [0, 0];
+        } // topmost doc
+        return this.calcOffset(state);
+    }
+    observe(iFrame) {
+        var _a;
+        const doc = iFrame.contentDocument;
+        if (!doc) {
+            return;
+        }
+        const parentDoc = iFrame.ownerDocument;
+        const parentState = this.states.get(parentDoc);
+        const state = {
+            offset: null,
+            iFrame,
+            parent: parentState || null,
+            clear: () => {
+                var _a;
+                parentDoc.removeEventListener('scroll', invalidateOffset);
+                (_a = parentDoc.defaultView) === null || _a === void 0 ? void 0 : _a.removeEventListener('resize', invalidateOffset);
+            },
+        };
+        const invalidateOffset = () => {
+            state.offset = null;
+        };
+        // anything more reliable? This does not cover all cases (layout changes are ignored, for ex.)
+        parentDoc.addEventListener('scroll', invalidateOffset);
+        (_a = parentDoc.defaultView) === null || _a === void 0 ? void 0 : _a.addEventListener('resize', invalidateOffset);
+        this.states.set(doc, state);
+    }
+    clear() {
+        this.states.forEach((s) => s.clear());
+        this.states.clear();
+    }
+}

package/lib/app/observer/observer.js

@@ -221,7 +221,7 @@ export default class Observer {
                 return false;
             }
             this.app.sanitizer.handleNode(id, parentID, node);
-            if (this.app.sanitizer.isMaskedContainer(parentID)) {
+            if (this.app.sanitizer.isHidden(parentID)) {
                 return false;
             }
         }
@@ -249,12 +249,12 @@ export default class Observer {
             if (isElementNode(node)) {
                 let el = node;
                 if (parentID !== undefined) {
-                    if (this.app.sanitizer.isMaskedContainer(id)) {
+                    if (this.app.sanitizer.isHidden(id)) {
                         const width = el.clientWidth;
                         const height = el.clientHeight;
                         el = node.cloneNode();
-                        el.style.width = width + 'px';
-                        el.style.height = height + 'px';
+                        el.style.width = `${width}px`;
+                        el.style.height = `${height}px`;
                     }
                     this.app.send(CreateElementNode(id, parentID, index, el.tagName, isSVGElement(node)));
                 }

package/lib/app/observer/top_observer.d.ts

@@ -1,16 +1,14 @@
 import Observer from './observer.js';
+import { Offset } from './iframe_offsets.js';
 import App from '../index.js';
 export interface Options {
     captureIFrames: boolean;
 }
 declare type Context = Window & typeof globalThis;
 declare type ContextCallback = (context: Context) => void;
-declare type Offset = {
-    top: number;
-    left: number;
-};
 export default class TopObserver extends Observer {
     private readonly options;
+    private readonly iframeOffsets;
     constructor(app: App, options: Partial<Options>);
     private readonly contextCallbacks;
     private readonly contextsSet;

package/lib/app/observer/top_observer.js

@@ -2,16 +2,14 @@ import Observer from './observer.js';
 import { isElementNode, hasTag } from '../guards.js';
 import IFrameObserver from './iframe_observer.js';
 import ShadowRootObserver from './shadow_root_observer.js';
+import IFrameOffsets from './iframe_offsets.js';
 import { CreateDocument } from '../messages.gen.js';
 import { IN_BROWSER, hasOpenreplayAttribute } from '../../utils.js';
-function isPatchedDocument(doc) {
-    // @ts-ignore
-    return typeof doc.__openreplay__getOffset === 'function';
-}
 const attachShadowNativeFn = IN_BROWSER ? Element.prototype.attachShadow : () => new ShadowRoot();
 export default class TopObserver extends Observer {
     constructor(app, options) {
         super(app, true);
+        this.iframeOffsets = new IFrameOffsets();
         this.contextCallbacks = [];
         // Attached once per Tracker instance
         this.contextsSet = new Set();
@@ -38,17 +36,14 @@ export default class TopObserver extends Observer {
     attachContextCallback(cb) {
         this.contextCallbacks.push(cb);
     }
-    // Le truc
     getDocumentOffset(doc) {
-        if (isPatchedDocument(doc)) {
-            return doc.__openreplay__getOffset();
-        }
-        return { top: 0, left: 0 };
+        return this.iframeOffsets.getDocumentOffset(doc);
     }
     handleIframe(iframe) {
         let doc = null;
-        let win = null;
-        const handle = this.app.safe(() => {
+        // setTimeout is required. Otherwise some event listeners (scroll, mousemove) applied in modules
+        //     do not work on the iframe document when it 've been loaded dynamically ((why?))
+        const handle = this.app.safe(() => setTimeout(() => {
             const id = this.app.nodes.getID(iframe);
             if (id === undefined) {
                 //log
@@ -59,27 +54,21 @@ export default class TopObserver extends Observer {
             if (currentDoc && currentDoc !== doc) {
                 const observer = new IFrameObserver(this.app);
                 this.iframeObservers.push(observer);
-                observer.observe(iframe);
+                observer.observe(iframe); // TODO: call unregisterNode for the previous doc if present (incapsulate: one iframe - one observer)
                 doc = currentDoc;
-                doc.__openreplay__getOffset = () => {
-                    const { top, left } = this.getDocumentOffset(iframe.ownerDocument);
-                    return {
-                        top: iframe.offsetTop + top,
-                        left: iframe.offsetLeft + left,
-                    };
-                };
+                this.iframeOffsets.observe(iframe);
             }
             if (currentWin &&
                 // Sometimes currentWin.window is null (not in specification). Such window object is not functional
                 currentWin === currentWin.window &&
                 !this.contextsSet.has(currentWin) // for each context callbacks called once per Tracker (TopObserver) instance
+            //TODO: more explicit logic
             ) {
                 this.contextsSet.add(currentWin);
                 //@ts-ignore https://github.com/microsoft/TypeScript/issues/41684
                 this.contextCallbacks.forEach((cb) => cb(currentWin));
-                win = currentWin;
             }
-        });
+        }, 0));
         iframe.addEventListener('load', handle); // why app.attachEventListener not working?
         handle();
     }
@@ -108,6 +97,7 @@ export default class TopObserver extends Observer {
         }, window.document.documentElement);
     }
     disconnect() {
+        this.iframeOffsets.clear();
         Element.prototype.attachShadow = attachShadowNativeFn;
         this.iframeObservers.forEach((o) => o.disconnect());
         this.iframeObservers = [];

package/lib/app/sanitizer.d.ts

@@ -1,18 +1,24 @@
 import type App from './index.js';
+export declare enum SanitizeLevel {
+    Plain = 0,
+    Obscured = 1,
+    Hidden = 2
+}
 export interface Options {
     obscureTextEmails: boolean;
     obscureTextNumbers: boolean;
+    domSanitizer?: (node: Element) => SanitizeLevel;
 }
 export default class Sanitizer {
     private readonly app;
-    private readonly masked;
-    private readonly maskedContainers;
+    private readonly obscured;
+    private readonly hidden;
     private readonly options;
     constructor(app: App, options: Partial<Options>);
     handleNode(id: number, parentID: number, node: Node): void;
     sanitize(id: number, data: string): string;
-    isMasked(id: number): boolean;
-    isMaskedContainer(id: number): boolean;
+    isObscured(id: number): boolean;
+    isHidden(id: number): boolean;
     getInnerTextSecure(el: HTMLElement): string;
     clear(): void;
 }

package/lib/app/sanitizer.js

@@ -1,27 +1,44 @@
 import { stars, hasOpenreplayAttribute } from '../utils.js';
 import { isElementNode } from './guards.js';
+export var SanitizeLevel;
+(function (SanitizeLevel) {
+    SanitizeLevel[SanitizeLevel["Plain"] = 0] = "Plain";
+    SanitizeLevel[SanitizeLevel["Obscured"] = 1] = "Obscured";
+    SanitizeLevel[SanitizeLevel["Hidden"] = 2] = "Hidden";
+})(SanitizeLevel || (SanitizeLevel = {}));
 export default class Sanitizer {
     constructor(app, options) {
         this.app = app;
-        this.masked = new Set();
-        this.maskedContainers = new Set();
+        this.obscured = new Set();
+        this.hidden = new Set();
         this.options = Object.assign({
             obscureTextEmails: true,
             obscureTextNumbers: false,
         }, options);
     }
     handleNode(id, parentID, node) {
-        if (this.masked.has(parentID) ||
-            (isElementNode(node) && hasOpenreplayAttribute(node, 'masked'))) {
-            this.masked.add(id);
+        if (this.obscured.has(parentID) ||
+            (isElementNode(node) &&
+                (hasOpenreplayAttribute(node, 'masked') || hasOpenreplayAttribute(node, 'obscured')))) {
+            this.obscured.add(id);
         }
-        if (this.maskedContainers.has(parentID) ||
-            (isElementNode(node) && hasOpenreplayAttribute(node, 'htmlmasked'))) {
-            this.maskedContainers.add(id);
+        if (this.hidden.has(parentID) ||
+            (isElementNode(node) &&
+                (hasOpenreplayAttribute(node, 'htmlmasked') || hasOpenreplayAttribute(node, 'hidden')))) {
+            this.hidden.add(id);
+        }
+        if (this.options.domSanitizer !== undefined && isElementNode(node)) {
+            const sanitizeLevel = this.options.domSanitizer(node);
+            if (sanitizeLevel === SanitizeLevel.Obscured) {
+                this.obscured.add(id);
+            }
+            if (sanitizeLevel === SanitizeLevel.Hidden) {
+                this.hidden.add(id);
+            }
         }
     }
     sanitize(id, data) {
-        if (this.masked.has(id)) {
+        if (this.obscured.has(id)) {
             // TODO: is it the best place to put trim() ? Might trimmed spaces be considered in layout in certain cases?
             return data
                 .trim()
@@ -35,11 +52,11 @@ export default class Sanitizer {
         }
         return data;
     }
-    isMasked(id) {
-        return this.masked.has(id);
+    isObscured(id) {
+        return this.obscured.has(id);
     }
-    isMaskedContainer(id) {
-        return this.maskedContainers.has(id);
+    isHidden(id) {
+        return this.hidden.has(id);
     }
     getInnerTextSecure(el) {
         const id = this.app.nodes.getID(el);
@@ -49,7 +66,7 @@ export default class Sanitizer {
         return this.sanitize(id, el.innerText);
     }
     clear() {
-        this.masked.clear();
-        this.maskedContainers.clear();
+        this.obscured.clear();
+        this.hidden.clear();
     }
 }

package/lib/app/session.js

@@ -76,7 +76,7 @@ export default class Session {
         let pageNoStr = '100500'; // back-compat for sessionToken
         if (hashParts.length == 2) {
             ;
-            [token, pageNoStr] = hashParts;
+            [pageNoStr, token] = hashParts;
         }
         if (!pageNoStr || !token) {
             return;

package/lib/common/messages.gen.d.ts

@@ -53,7 +53,8 @@ export declare const enum Type {
     AdoptedSSInsertRuleURLBased = 73,
     AdoptedSSDeleteRule = 75,
     AdoptedSSAddOwner = 76,
-    AdoptedSSRemoveOwner = 77
+    AdoptedSSRemoveOwner = 77,
+    Zustand = 79
 }
 export declare type BatchMetadata = [
     Type.BatchMetadata,
@@ -378,5 +379,10 @@ export declare type AdoptedSSRemoveOwner = [
     number,
     number
 ];
-declare type Message = BatchMetadata | PartitionedMessage | Timestamp | SetPageLocation | SetViewportSize | SetViewportScroll | CreateDocument | CreateElementNode | CreateTextNode | MoveNode | RemoveNode | SetNodeAttribute | RemoveNodeAttribute | SetNodeData | SetNodeScroll | SetInputTarget | SetInputValue | SetInputChecked | MouseMove | ConsoleLog | PageLoadTiming | PageRenderTiming | JSException | RawCustomEvent | UserID | UserAnonymousID | Metadata | CSSInsertRule | CSSDeleteRule | Fetch | Profiler | OTable | StateAction | Redux | Vuex | MobX | NgRx | GraphQL | PerformanceTrack | ResourceTiming | ConnectionInformation | SetPageVisibility | LongTask | SetNodeAttributeURLBased | SetCSSDataURLBased | TechnicalInfo | CustomIssue | CSSInsertRuleURLBased | MouseClick | CreateIFrameDocument | AdoptedSSReplaceURLBased | AdoptedSSInsertRuleURLBased | AdoptedSSDeleteRule | AdoptedSSAddOwner | AdoptedSSRemoveOwner;
+export declare type Zustand = [
+    Type.Zustand,
+    string,
+    string
+];
+declare type Message = BatchMetadata | PartitionedMessage | Timestamp | SetPageLocation | SetViewportSize | SetViewportScroll | CreateDocument | CreateElementNode | CreateTextNode | MoveNode | RemoveNode | SetNodeAttribute | RemoveNodeAttribute | SetNodeData | SetNodeScroll | SetInputTarget | SetInputValue | SetInputChecked | MouseMove | ConsoleLog | PageLoadTiming | PageRenderTiming | JSException | RawCustomEvent | UserID | UserAnonymousID | Metadata | CSSInsertRule | CSSDeleteRule | Fetch | Profiler | OTable | StateAction | Redux | Vuex | MobX | NgRx | GraphQL | PerformanceTrack | ResourceTiming | ConnectionInformation | SetPageVisibility | LongTask | SetNodeAttributeURLBased | SetCSSDataURLBased | TechnicalInfo | CustomIssue | CSSInsertRuleURLBased | MouseClick | CreateIFrameDocument | AdoptedSSReplaceURLBased | AdoptedSSInsertRuleURLBased | AdoptedSSDeleteRule | AdoptedSSAddOwner | AdoptedSSRemoveOwner | Zustand;
 export default Message;

package/lib/common/messages.gen.js

@@ -1,2 +1,3 @@
 // Auto-generated, do not edit
+/* eslint-disable */
 export {};