@openreplay/tracker 3.5.11 → 3.5.13

package/lib/app/index.js

@@ -1,4 +1,4 @@
-import { Timestamp } from "../common/messages.js";
+import { Timestamp, Metadata, UserID } from "../common/messages.js";
 import { timestamp } from "../utils.js";
 import Nodes from "./nodes.js";
 import Observer from "./observer/top_observer.js";
@@ -7,13 +7,16 @@ import Ticker from "./ticker.js";
 import Logger, { LogLevel } from "./logger.js";
 import Session from "./session.js";
 import { deviceMemory, jsHeapSizeLimit } from "../modules/performance.js";
+const CANCELED = "canceled";
+const START_ERROR = ":(";
+const UnsuccessfulStart = (reason) => ({ reason, success: false });
+const SuccessfulStart = (body) => (Object.assign(Object.assign({}, body), { success: true }));
 var ActivityState;
 (function (ActivityState) {
     ActivityState[ActivityState["NotActive"] = 0] = "NotActive";
     ActivityState[ActivityState["Starting"] = 1] = "Starting";
     ActivityState[ActivityState["Active"] = 2] = "Active";
 })(ActivityState || (ActivityState = {}));
-export const CANCELED = "canceled";
 // TODO: use backendHost only
 export const DEFAULT_INGEST_POINT = 'https://api.openreplay.com/ingest';
 export default class App {
@@ -26,7 +29,7 @@ export default class App {
         this.stopCallbacks = [];
         this.commitCallbacks = [];
         this.activityState = ActivityState.NotActive;
-        this.version = '3.5.11'; // TODO: version compatability check inside each plugin.
+        this.version = '3.5.13'; // TODO: version compatability check inside each plugin.
         this.projectKey = projectKey;
         this.options = Object.assign({
             revID: '',
@@ -40,10 +43,9 @@ export default class App {
             verbose: false,
             __is_snippet: false,
             __debug_report_edp: null,
+            localStorage: window.localStorage,
+            sessionStorage: window.sessionStorage,
         }, options);
-        if (sessionToken != null) {
-            sessionStorage.setItem(this.options.session_token_key, sessionToken);
-        }
         this.revID = this.options.revID;
         this.sanitizer = new Sanitizer(this, options);
         this.nodes = new Nodes(this.options.node_id);
@@ -52,9 +54,22 @@ export default class App {
         this.ticker.attach(() => this.commit());
         this.debug = new Logger(this.options.__debug__);
         this.notify = new Logger(this.options.verbose ? LogLevel.Warnings : LogLevel.Silent);
-        this.session = new Session(this);
+        this.session = new Session();
+        this.session.attachUpdateCallback(({ userID, metadata }) => {
+            if (userID != null) { // TODO: nullable userID
+                this.send(new UserID(userID));
+            }
+            if (metadata != null) {
+                Object.entries(metadata).forEach(([key, value]) => this.send(new Metadata(key, value)));
+            }
+        });
+        this.localStorage = this.options.localStorage;
+        this.sessionStorage = this.options.sessionStorage;
+        if (sessionToken != null) {
+            this.sessionStorage.setItem(this.options.session_token_key, 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 m=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,m);const g=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,g);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 b=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,b);const S=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,S);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 I=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,I);const M=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,M);const B=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,B);const L=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,L);const C=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,C);const A=t(class{constructor(t){this.type=t,this._id=42}encode(t){return t.uint(42)&&t.string(this.type)}});i.set(42,A);const U=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,U);const N=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,N);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.prepareBatchMeta()}prepareBatchMeta(){return new s(this.pageNo,this.nextIndex,this.timestamp).encode(this.writer)}setBeaconSizeLimit(t){this.beaconSizeLimit=t}writeMessage(t){if(t instanceof e&&(this.timestamp=t.timestamp),!t.encode(this.writer))for(this.isEmpty||(this.onBatch(this.writer.flush()),this.prepareBatchMeta());!t.encode(this.writer);){if(this.beaconSize===this.beaconSizeLimit)return console.warn("OpenReplay: beacon size overflow. Skipping large message."),this.writer.reset(),this.prepareBatchMeta(),void(this.isEmpty=!0);this.beaconSize=Math.min(2*this.beaconSize,this.beaconSizeLimit),this.writer=new it(this.beaconSize),this.prepareBatchMeta()}this.writer.checkpoint(),this.nextIndex++,this.isEmpty=!1}finaliseBatch(){this.isEmpty||(this.onBatch(this.writer.flush()),this.prepareBatchMeta(),this.isEmpty=!0)}clean(){this.writer.reset()}}let et=null,nt=null;function rt(){nt&&nt.finaliseBatch()}function ht(){null!==ct&&(clearInterval(ct),ct=null),nt&&(nt.clean(),nt=null)}let ot,ct=null;self.onmessage=({data:t})=>{if(null!=t){if("stop"===t)return rt(),void ht();if(Array.isArray(t)){if(!nt)throw new Error("WebWorker: writer not initialised.");const s=nt;t.forEach(t=>{const e=new(i.get(t._id));Object.assign(e,t),e instanceof H&&(e.hidden?ot=setTimeout(()=>self.postMessage("restart"),18e5):clearTimeout(ot)),s.writeMessage(e)})}else{if("start"===t.type)return et=new Z(t.ingestPoint,()=>{self.postMessage("restart")},()=>{et&&(et.clean(),et=null),ht(),self.postMessage("failed")},t.connAttemptCount,t.connAttemptGap),nt=new st(t.pageNo,t.timestamp,t=>et&&et.push(t)),void(null===ct&&(ct=setInterval(rt,1e4)));if("auth"===t.type){if(!et)throw new Error("WebWorker: sender not initialised. Recieved auth.");if(!nt)throw new Error("WebWorker: writer not initialised. Recieved auth.");return et.authorise(t.token),void(t.beaconSizeLimit&&nt.setBeaconSizeLimit(t.beaconSizeLimit))}}}else rt()};
+            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,ht=et.NotActive;function ot(){rt&&rt.finaliseBatch()}function ct(){ht=et.Stopping,null!==ut&&(clearInterval(ut),ut=null),rt&&(rt.clean(),rt=null),ht=et.NotActive}let at,ut=null;self.onmessage=({data:t})=>{if(null!=t){if("stop"===t)return ot(),void ct();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?at=setTimeout(()=>self.postMessage("restart"),18e5):clearTimeout(at)),s.writeMessage(e)})}else{if("start"===t.type)return ht=et.Starting,nt=new Z(t.ingestPoint,()=>{self.postMessage("restart")},()=>{nt&&(nt.clean(),nt=null),ct(),self.postMessage("failed")},t.connAttemptCount,t.connAttemptGap),rt=new st(t.pageNo,t.timestamp,t=>nt&&nt.push(t)),null===ut&&(ut=setInterval(ot,1e4)),ht=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 ot()};
 `], { type: 'text/javascript' })));
             this.worker.onerror = e => {
                 this._debug("webworker_error", e);
@@ -62,6 +77,7 @@ export default class App {
             this.worker.onmessage = ({ data }) => {
                 if (data === "failed") {
                     this.stop();
+                    this._debug("worker_failed", {}); // add context (from worker)
                 }
                 else if (data === "restart") {
                     this.stop();
@@ -73,9 +89,10 @@ export default class App {
                     this.worker.postMessage(null);
                 }
             };
-            // TODO: keep better tactics, discard others (look https://developer.mozilla.org/en-US/docs/Web/API/Navigator/sendBeacon)
+            // keep better tactics, discard others?
             this.attachEventListener(window, 'beforeunload', alertWorker, false);
-            this.attachEventListener(document, 'mouseleave', alertWorker, false, false);
+            this.attachEventListener(document.body, 'mouseleave', alertWorker, false, false);
+            // TODO: stop session after inactivity timeout (make configurable)
             this.attachEventListener(document, 'visibilitychange', alertWorker, false);
         }
         catch (e) {
@@ -149,8 +166,8 @@ export default class App {
     }
     // TODO: full correct semantic
     checkRequiredVersion(version) {
-        const reqVer = version.split('.');
-        const ver = this.version.split('.');
+        const reqVer = version.split(/[.-]/);
+        const ver = this.version.split(/[.-]/);
         for (let i = 0; i < 3; i++) {
             if (Number(ver[i]) < Number(reqVer[i]) || isNaN(Number(ver[i])) || isNaN(Number(reqVer[i]))) {
                 return false;
@@ -160,7 +177,7 @@ export default class App {
     }
     getStartInfo() {
         return {
-            userUUID: localStorage.getItem(this.options.local_uuid_key),
+            userUUID: this.localStorage.getItem(this.options.local_uuid_key),
             projectKey: this.projectKey,
             revID: this.revID,
             timestamp: timestamp(),
@@ -172,7 +189,7 @@ export default class App {
         return Object.assign(Object.assign({}, this.session.getInfo()), this.getStartInfo());
     }
     getSessionToken() {
-        const token = sessionStorage.getItem(this.options.session_token_key);
+        const token = this.sessionStorage.getItem(this.options.session_token_key);
         if (token !== null) {
             return token;
         }
@@ -214,27 +231,27 @@ export default class App {
     }
     resetNextPageSession(flag) {
         if (flag) {
-            sessionStorage.setItem(this.options.session_reset_key, 't');
+            this.sessionStorage.setItem(this.options.session_reset_key, 't');
         }
         else {
-            sessionStorage.removeItem(this.options.session_reset_key);
+            this.sessionStorage.removeItem(this.options.session_reset_key);
         }
     }
     _start(startOpts) {
         if (!this.worker) {
-            return Promise.reject("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.reject("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 = sessionStorage.getItem(this.options.session_pageno_key);
+        const pageNoStr = this.sessionStorage.getItem(this.options.session_pageno_key);
         if (pageNoStr != null) {
             pageNo = parseInt(pageNoStr);
             pageNo++;
         }
-        sessionStorage.setItem(this.options.session_pageno_key, pageNo.toString());
+        this.sessionStorage.setItem(this.options.session_pageno_key, pageNo.toString());
         const startInfo = this.getStartInfo();
         const startWorkerMsg = {
             type: "start",
@@ -244,15 +261,21 @@ export default class App {
             connAttemptCount: this.options.connAttemptCount,
             connAttemptGap: this.options.connAttemptGap,
         };
-        this.worker.postMessage(startWorkerMsg); // brings delay of 10th ms?
-        const sReset = sessionStorage.getItem(this.options.session_reset_key);
-        sessionStorage.removeItem(this.options.session_reset_key);
+        this.worker.postMessage(startWorkerMsg);
+        this.session.update({
+            // "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,
+            userID: startOpts.userID,
+        });
+        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', {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',
             },
-            body: JSON.stringify(Object.assign(Object.assign({}, startInfo), { userID: startOpts.userID || this.session.getInfo().userID, token: sessionStorage.getItem(this.options.session_token_key), deviceMemory,
+            body: JSON.stringify(Object.assign(Object.assign({}, startInfo), { userID: this.session.getInfo().userID, token: this.sessionStorage.getItem(this.options.session_token_key), deviceMemory,
                 jsHeapSizeLimit, reset: startOpts.forceNew || sReset !== null })),
         })
             .then(r => {
@@ -261,7 +284,7 @@ export default class App {
             }
             else {
                 return r.text().then(text => text === CANCELED
-                    ? Promise.reject(CANCELED) // TODO: return {error: CANCELED} instead
+                    ? Promise.reject(CANCELED)
                     : Promise.reject(`Server error: ${r.status}. ${text}`));
             }
         })
@@ -275,36 +298,36 @@ export default class App {
                 (typeof beaconSizeLimit !== 'number' && typeof beaconSizeLimit !== 'undefined')) {
                 return Promise.reject(`Incorrect server response: ${JSON.stringify(r)}`);
             }
-            sessionStorage.setItem(this.options.session_token_key, token);
-            localStorage.setItem(this.options.local_uuid_key, userUUID);
-            this.session.update(Object.assign({ sessionID }, startOpts));
-            this.activityState = ActivityState.Active;
+            this.sessionStorage.setItem(this.options.session_token_key, token);
+            this.localStorage.setItem(this.options.local_uuid_key, userUUID);
+            this.session.update({ sessionID }); // TODO: no no-explicit 'any'
             const startWorkerMsg = {
                 type: "auth",
                 token,
                 beaconSizeLimit
             };
             this.worker.postMessage(startWorkerMsg);
+            this.activityState = ActivityState.Active;
             const onStartInfo = { sessionToken: token, userUUID, sessionID };
-            this.startCallbacks.forEach((cb) => cb(onStartInfo));
+            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.");
-            // TODO: get rid of onStart
+            // get rid of onStart ?
             if (typeof this.options.onStart === 'function') {
                 this.options.onStart(onStartInfo);
             }
-            return onStartInfo;
+            return SuccessfulStart(onStartInfo);
         })
             .catch(reason => {
-            sessionStorage.removeItem(this.options.session_token_key);
+            this.sessionStorage.removeItem(this.options.session_token_key);
             this.stop();
-            //if (reason === CANCELED) { return Promise.resolve(CANCELED) } // TODO: what to return ????? Throwing is baad
-            if (reason !== CANCELED) {
-                this.notify.log("OpenReplay was unable to start. ", reason);
-                this._debug("session_start", reason);
+            if (reason === CANCELED) {
+                return UnsuccessfulStart(CANCELED);
             }
-            return Promise.reject(reason);
+            this.notify.log("OpenReplay was unable to start. ", reason);
+            this._debug("session_start", reason);
+            return UnsuccessfulStart(START_ERROR);
         });
     }
     start(options = {}) {
@@ -323,18 +346,21 @@ export default class App {
             });
         }
     }
-    stop() {
+    stop(calledFromAPI = false) {
         if (this.activityState !== ActivityState.NotActive) {
             try {
-                if (this.worker) {
-                    this.worker.postMessage("stop");
-                }
                 this.sanitizer.clear();
                 this.observer.disconnect();
                 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) {
+                    this.worker.postMessage("stop");
+                }
             }
             finally {
                 this.activityState = ActivityState.NotActive;

package/lib/app/nodes.d.ts

@@ -1,4 +1,4 @@
-declare type NodeCallback = (node: Node) => void;
+declare type NodeCallback = (node: Node, isStart: boolean) => void;
 export default class Nodes {
     private readonly node_id;
     private readonly nodes;
@@ -7,9 +7,9 @@ export default class Nodes {
     constructor(node_id: string);
     attachNodeCallback(nodeCallback: NodeCallback): void;
     attachElementListener(type: string, node: Element, elementListener: EventListener): void;
-    registerNode(node: Node): [number, boolean];
+    registerNode(node: Node): [id: number, isNew: boolean];
     unregisterNode(node: Node): number | undefined;
-    callNodeCallbacks(node: Node): void;
+    callNodeCallbacks(node: Node, isStart: boolean): void;
     getID(node: Node): number | undefined;
     getNode(id: number): Node | undefined;
     clear(): void;

package/lib/app/nodes.js

@@ -45,8 +45,8 @@ export default class Nodes {
         }
         return id;
     }
-    callNodeCallbacks(node) {
-        this.nodeCallbacks.forEach((cb) => cb(node));
+    callNodeCallbacks(node, isStart) {
+        this.nodeCallbacks.forEach((cb) => cb(node, isStart));
     }
     getID(node) {
         return node[this.node_id];

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

@@ -5,9 +5,8 @@ export default abstract class Observer {
     private readonly observer;
     private readonly commited;
     private readonly recents;
-    private readonly myNodes;
     private readonly indexes;
-    private readonly attributesList;
+    private readonly attributesMap;
     private readonly textSet;
     constructor(app: App, isTopContext?: boolean);
     private clear;

package/lib/app/observer/observer.js

@@ -1,13 +1,10 @@
 import { RemoveNodeAttribute, SetNodeAttribute, SetNodeAttributeURLBased, SetCSSDataURLBased, SetNodeData, CreateTextNode, CreateElementNode, MoveNode, RemoveNode, } from "../../common/messages.js";
-import { isInstance, inDocument } from "../context.js";
-function isSVGElement(node) {
-    return node.namespaceURI === 'http://www.w3.org/2000/svg';
-}
+import { isRootNode, isTextNode, isElementNode, isSVGElement, hasTag, } from "../guards.js";
 function isIgnored(node) {
-    if (isInstance(node, Text)) {
+    if (isTextNode(node)) {
         return false;
     }
-    if (!isInstance(node, Element)) {
+    if (!isElementNode(node)) {
         return true;
     }
     const tag = node.tagName.toUpperCase();
@@ -22,30 +19,37 @@ function isIgnored(node) {
         tag === 'TITLE' ||
         tag === 'BASE');
 }
-function isRootNode(node) {
-    return isInstance(node, Document) || isInstance(node, ShadowRoot);
-}
 function isObservable(node) {
     if (isRootNode(node)) {
         return true;
     }
     return !isIgnored(node);
 }
+/*
+  TODO:
+    - fix unbinding logic + send all removals first (ensure sequence is correct)
+    - use document as a 0-node in the upper context (should be updated in player at first)
+*/
+var RecentsType;
+(function (RecentsType) {
+    RecentsType[RecentsType["New"] = 0] = "New";
+    RecentsType[RecentsType["Removed"] = 1] = "Removed";
+    RecentsType[RecentsType["Changed"] = 2] = "Changed";
+})(RecentsType || (RecentsType = {}));
 export default class Observer {
     constructor(app, isTopContext = false) {
         this.app = app;
         this.isTopContext = isTopContext;
         this.commited = [];
-        this.recents = [];
-        this.myNodes = [];
+        this.recents = new Map();
         this.indexes = [];
-        this.attributesList = [];
+        this.attributesMap = new Map();
         this.textSet = new Set();
         this.observer = new MutationObserver(this.app.safe((mutations) => {
-            for (const mutation of mutations) {
+            for (const mutation of mutations) { // mutations order is sequential
                 const target = mutation.target;
                 const type = mutation.type;
-                if (!isObservable(target) || !inDocument(target)) {
+                if (!isObservable(target)) {
                     continue;
                 }
                 if (type === 'childList') {
@@ -61,17 +65,17 @@ export default class Observer {
                 if (id === undefined) {
                     continue;
                 }
-                if (id >= this.recents.length) { // TODO: something more convinient
-                    this.recents[id] = undefined;
+                if (!this.recents.has(id)) {
+                    this.recents.set(id, RecentsType.Changed); // TODO only when altered
                 }
                 if (type === 'attributes') {
                     const name = mutation.attributeName;
                     if (name === null) {
                         continue;
                     }
-                    let attr = this.attributesList[id];
+                    let attr = this.attributesMap.get(id);
                     if (attr === undefined) {
-                        this.attributesList[id] = attr = new Set();
+                        this.attributesMap.set(id, attr = new Set());
                     }
                     attr.add(name);
                     continue;
@@ -86,9 +90,9 @@ export default class Observer {
     }
     clear() {
         this.commited.length = 0;
-        this.recents.length = 0;
+        this.recents.clear();
         this.indexes.length = 1;
-        this.attributesList.length = 0;
+        this.attributesMap.clear();
         this.textSet.clear();
     }
     sendNodeAttribute(id, node, name, value) {
@@ -119,7 +123,7 @@ export default class Observer {
             return;
         }
         if (name === 'value' &&
-            isInstance(node, HTMLInputElement) &&
+            hasTag(node, "INPUT") &&
             node.type !== 'button' &&
             node.type !== 'reset' &&
             node.type !== 'submit') {
@@ -129,7 +133,7 @@ export default class Observer {
             this.app.send(new RemoveNodeAttribute(id, name));
             return;
         }
-        if (name === 'style' || name === 'href' && isInstance(node, HTMLLinkElement)) {
+        if (name === 'style' || name === 'href' && hasTag(node, "LINK")) {
             this.app.send(new SetNodeAttributeURLBased(id, name, value, this.app.getBaseHref()));
             return;
         }
@@ -139,7 +143,7 @@ export default class Observer {
         this.app.send(new SetNodeAttribute(id, name, value));
     }
     sendNodeData(id, parentElement, data) {
-        if (isInstance(parentElement, HTMLStyleElement) || isInstance(parentElement, SVGStyleElement)) {
+        if (hasTag(parentElement, "STYLE") || hasTag(parentElement, "style")) {
             this.app.send(new SetCSSDataURLBased(id, data, this.app.getBaseHref()));
             return;
         }
@@ -147,10 +151,13 @@ export default class Observer {
         this.app.send(new SetNodeData(id, data));
     }
     bindNode(node) {
-        const r = this.app.nodes.registerNode(node);
-        const id = r[0];
-        this.recents[id] = r[1] || this.recents[id] || false;
-        this.myNodes[id] = true;
+        const [id, isNew] = this.app.nodes.registerNode(node);
+        if (isNew) {
+            this.recents.set(id, RecentsType.New);
+        }
+        else if (!this.recents.has(id)) {
+            this.recents.set(id, RecentsType.Removed);
+        }
     }
     bindTree(node) {
         if (!isObservable(node)) {
@@ -170,10 +177,11 @@ export default class Observer {
     }
     unbindNode(node) {
         const id = this.app.nodes.unregisterNode(node);
-        if (id !== undefined && this.recents[id] === false) {
+        if (id !== undefined && this.recents.get(id) === RecentsType.Removed) {
             this.app.send(new RemoveNode(id));
         }
     }
+    // A top-consumption function on the infinite lists test. (~1% of performance resources)
     _commitNode(id, node) {
         if (isRootNode(node)) {
             return true;
@@ -182,8 +190,8 @@ export default class Observer {
         let parentID;
         // Disable parent check for the upper context HTMLHtmlElement, because it is root there... (before)
         // TODO: get rid of "special" cases (there is an issue with CreateDocument altered behaviour though)
-        // TODO: Clean the logic (though now it workd fine) 
-        if (!isInstance(node, HTMLHtmlElement) || !this.isTopContext) {
+        // TODO: Clean the logic (though now it workd fine)
+        if (!hasTag(node, "HTML") || !this.isTopContext) {
             if (parent === null) {
                 this.unbindNode(node);
                 return false;
@@ -198,7 +206,11 @@ export default class Observer {
                 return false;
             }
             this.app.sanitizer.handleNode(id, parentID, node);
+            if (this.app.sanitizer.isMaskedContainer(parentID)) {
+                return false;
+            }
         }
+        // From here parentID === undefined if node is top context HTML node
         let sibling = node.previousSibling;
         while (sibling !== null) {
             const siblingID = this.app.nodes.getID(sibling);
@@ -210,36 +222,45 @@ export default class Observer {
             sibling = sibling.previousSibling;
         }
         if (sibling === null) {
-            this.indexes[id] = 0; //
+            this.indexes[id] = 0;
         }
-        const isNew = this.recents[id];
+        const recentsType = this.recents.get(id);
+        const isNew = recentsType === RecentsType.New;
         const index = this.indexes[id];
         if (index === undefined) {
             throw 'commitNode: missing node index';
         }
-        if (isNew === true) {
-            if (isInstance(node, Element)) {
+        if (isNew) {
+            if (isElementNode(node)) {
+                let el = node;
                 if (parentID !== undefined) {
-                    this.app.send(new CreateElementNode(id, parentID, index, node.tagName, isSVGElement(node)));
+                    if (this.app.sanitizer.isMaskedContainer(id)) {
+                        const width = el.clientWidth;
+                        const height = el.clientHeight;
+                        el = node.cloneNode();
+                        el.style.width = width + 'px';
+                        el.style.height = height + 'px';
+                    }
+                    this.app.send(new CreateElementNode(id, parentID, index, el.tagName, isSVGElement(node)));
                 }
-                for (let i = 0; i < node.attributes.length; i++) {
-                    const attr = node.attributes[i];
-                    this.sendNodeAttribute(id, node, attr.nodeName, attr.value);
+                for (let i = 0; i < el.attributes.length; i++) {
+                    const attr = el.attributes[i];
+                    this.sendNodeAttribute(id, el, attr.nodeName, attr.value);
                 }
             }
-            else if (isInstance(node, Text)) {
+            else if (isTextNode(node)) {
                 // for text node id != 0, hence parentID !== undefined and parent is Element
                 this.app.send(new CreateTextNode(id, parentID, index));
                 this.sendNodeData(id, parent, node.data);
             }
             return true;
         }
-        if (isNew === false && parentID !== undefined) {
+        if (recentsType === RecentsType.Removed && parentID !== undefined) {
             this.app.send(new MoveNode(id, parentID, index));
         }
-        const attr = this.attributesList[id];
+        const attr = this.attributesMap.get(id);
         if (attr !== undefined) {
-            if (!isInstance(node, Element)) {
+            if (!isElementNode(node)) {
                 throw 'commitNode: node is not an element';
             }
             for (const name of attr) {
@@ -247,7 +268,7 @@ export default class Observer {
             }
         }
         if (this.textSet.has(id)) {
-            if (!isInstance(node, Text)) {
+            if (!isTextNode(node)) {
                 throw 'commitNode: node is not a text';
             }
             // for text node id != 0, hence parent is Element
@@ -266,21 +287,14 @@ export default class Observer {
         }
         return (this.commited[id] = this._commitNode(id, node));
     }
-    commitNodes() {
+    commitNodes(isStart = false) {
         let node;
-        for (let id = 0; id < this.recents.length; id++) {
-            // TODO: make things/logic nice here.
-            // commit required in any case if recents[id] true or false (in case of unbinding) or undefined (in case of attr change).
-            // Possible solution: separate new node commit (recents) and new attribute/move node commit
-            // Otherwise commitNode is called on each node, which might be a lot
-            if (!this.myNodes[id]) {
-                continue;
-            }
+        this.recents.forEach((type, id) => {
             this.commitNode(id);
-            if (this.recents[id] === true && (node = this.app.nodes.getNode(id))) {
-                this.app.nodes.callNodeCallbacks(node);
+            if (type === RecentsType.New && (node = this.app.nodes.getNode(id))) {
+                this.app.nodes.callNodeCallbacks(node, isStart);
             }
-        }
+        });
         this.clear();
     }
     // ISSSUE
@@ -295,11 +309,10 @@ export default class Observer {
         });
         this.bindTree(nodeToBind);
         beforeCommit(this.app.nodes.getID(node));
-        this.commitNodes();
+        this.commitNodes(true);
     }
     disconnect() {
         this.observer.disconnect();
         this.clear();
-        this.myNodes.length = 0;
     }
 }