@openreplay/tracker 6.0.1-beta.2 → 6.0.2

package/CHANGELOG.md

@@ -2,12 +2,17 @@
 
 - **[breaking]** added gzip compression for large messages
 
+# 6.0.2
+
+- fix network tracking for samedomain iframes created by js code
+
 # 6.0.1
 
 - fix webworker writer re-init request
 - remove useless logs
 - tune mouse thrashing detection
 - fix iframe handling
+- improve node counting for dom drop
 
 # 6.0.0
 

package/cjs/app/index.js

@@ -34,7 +34,7 @@ class App {
         this.stopCallbacks = [];
         this.commitCallbacks = [];
         this.activityState = ActivityState.NotActive;
-        this.version = '6.0.1-beta.2'; // TODO: version compatability check inside each plugin.
+        this.version = '6.0.2'; // TODO: version compatability check inside each plugin.
         this.compressionThreshold = 24 * 1000;
         this._usingOldFetchPlugin = false;
         this.delay = 0;

package/cjs/app/nodes.d.ts

@@ -2,6 +2,7 @@ type NodeCallback = (node: Node, isStart: boolean) => void;
 export default class Nodes {
     private readonly node_id;
     private nodes;
+    private totalNodeAmount;
     private readonly nodeCallbacks;
     private readonly elementListeners;
     constructor(node_id: string);

package/cjs/app/nodes.js

@@ -4,6 +4,7 @@ class Nodes {
     constructor(node_id) {
         this.node_id = node_id;
         this.nodes = [];
+        this.totalNodeAmount = 0;
         this.nodeCallbacks = [];
         this.elementListeners = new Map();
     }
@@ -28,6 +29,7 @@ class Nodes {
         let id = node[this.node_id];
         const isNew = id === undefined;
         if (isNew) {
+            this.totalNodeAmount++;
             id = this.nodes.length;
             this.nodes[id] = node;
             node[this.node_id] = id;
@@ -44,6 +46,7 @@ class Nodes {
                 this.elementListeners.delete(id);
                 listeners.forEach((listener) => node.removeEventListener(listener[0], listener[1], listener[2]));
             }
+            this.totalNodeAmount--;
         }
         return id;
     }
@@ -69,7 +72,7 @@ class Nodes {
         return this.nodes[id];
     }
     getNodeCount() {
-        return this.nodes.filter(Boolean).length;
+        return this.totalNodeAmount;
     }
     clear() {
         for (let id = 0; id < this.nodes.length; id++) {

package/cjs/app/observer/top_observer.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const observer_js_1 = require("./observer.js");
 const guards_js_1 = require("../guards.js");
-const network_js_1 = require("../../modules/network.js");
 const iframe_observer_js_1 = require("./iframe_observer.js");
 const shadow_root_observer_js_1 = require("./shadow_root_observer.js");
 const iframe_offsets_js_1 = require("./iframe_offsets.js");
@@ -70,7 +69,6 @@ class TopObserver extends observer_js_1.default {
             //TODO: more explicit logic
             ) {
                 this.contextsSet.add(currentWin);
-                (0, network_js_1.default)(this.app, this.app.networkOptions, currentWin);
                 //@ts-ignore https://github.com/microsoft/TypeScript/issues/41684
                 this.contextCallbacks.forEach((cb) => cb(currentWin));
             }

package/cjs/index.js

@@ -142,7 +142,7 @@ class API {
             // no-cors issue only with text/plain or not-set Content-Type
             // req.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
             req.send(JSON.stringify({
-                trackerVersion: '6.0.1-beta.2',
+                trackerVersion: '6.0.2',
                 projectKey: options.projectKey,
                 doNotTrack,
                 // TODO: add precise reason (an exact API missing)

package/cjs/modules/network.d.ts

@@ -24,5 +24,5 @@ export interface Options {
     capturePayload: boolean;
     sanitizer?: Sanitizer;
 }
-export default function (app: App, opts?: Partial<Options>, customEnv?: Record<string, any>): void;
+export default function (app: App, opts?: Partial<Options>): void;
 export {};

package/cjs/modules/network.js

@@ -2,43 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const messages_gen_js_1 = require("../app/messages.gen.js");
 const utils_js_1 = require("../utils.js");
-// Request:
-// declare const enum BodyType {
-//   Blob = "Blob",
-//   ArrayBuffer = "ArrayBuffer",
-//   TypedArray = "TypedArray",
-//   DataView = "DataView",
-//   FormData = "FormData",
-//   URLSearchParams = "URLSearchParams",
-//   Document = "Document", // XHR only
-//   ReadableStream = "ReadableStream", // Fetch only
-//   Literal = "literal",
-//   Unknown = "unk",
-// }
-// XHRResponse body: ArrayBuffer, a Blob, a Document, a JavaScript Object, or a string
-// TODO: extract maximum of useful information from any type of Request/Responce bodies
-// function objectifyBody(body: any): RequestBody {
-//   if (body instanceof Blob) {
-//     return {
-//       body: `<Blob type: ${body.type}>; size: ${body.size}`,
-//       bodyType: BodyType.Blob,
-//     }
-//   }
-//   return {
-//     body,
-//     bodyType: BodyType.Literal,
-//   }
-// }
-function checkCacheByPerformanceTimings(requestUrl) {
-    if (performance) {
-        const timings = performance.getEntriesByName(requestUrl)[0];
-        if (timings) {
-            // @ts-ignore - weird ts typings, please refer to https://developer.mozilla.org/en-US/docs/Web/API/PerformanceNavigationTiming
-            return timings.transferSize === 0 || timings.responseStart - timings.requestStart < 10;
-        }
-    }
-    return false;
-}
 function getXHRRequestDataObject(xhr) {
     // @ts-ignore  this is 3x faster than using Map<XHR, XHRRequestData>
     if (!xhr.__or_req_data__) {
@@ -51,7 +14,7 @@ function getXHRRequestDataObject(xhr) {
 function strMethod(method) {
     return typeof method === 'string' ? method.toUpperCase() : 'GET';
 }
-function default_1(app, opts = {}, customEnv) {
+function default_1(app, opts = {}) {
     const options = Object.assign({
         failuresOnly: false,
         ignoreHeaders: ['Cookie', 'Set-Cookie', 'Authorization'],
@@ -101,182 +64,149 @@ function default_1(app, opts = {}, customEnv) {
         }
         return JSON.stringify(r);
     }
-    /* ====== Fetch ====== */
-    const origFetch = customEnv
-        ? customEnv.fetch.bind(customEnv)
-        : window.fetch.bind(window);
-    const trackFetch = (input, init = {}) => {
-        if (!(typeof input === 'string' || input instanceof URL) || app.isServiceURL(String(input))) {
-            return origFetch(input, init);
-        }
-        setSessionTokenHeader(function (name, value) {
-            if (init.headers === undefined) {
-                init.headers = {};
-            }
-            if (init.headers instanceof Headers) {
-                init.headers.append(name, value);
-            }
-            else if (Array.isArray(init.headers)) {
-                init.headers.push([name, value]);
+    const patchWindow = (context) => {
+        /* ====== Fetch ====== */
+        const origFetch = context.fetch.bind(context);
+        const trackFetch = (input, init = {}) => {
+            if (!(typeof input === 'string' || input instanceof URL) || app.isServiceURL(String(input))) {
+                return origFetch(input, init);
             }
-            else {
-                init.headers[name] = value;
-            }
-        });
-        const startTime = performance.now();
-        return origFetch(input, init).then((response) => {
-            const duration = performance.now() - startTime;
-            if (options.failuresOnly && response.status < 400) {
-                return response;
-            }
-            const r = response.clone();
-            r.text()
-                .then((text) => {
-                const reqHs = {};
-                const resHs = {};
-                if (ignoreHeaders !== true) {
-                    // request headers
-                    const writeReqHeader = ([n, v]) => {
-                        if (!isHIgnored(n)) {
-                            reqHs[n] = v;
+            setSessionTokenHeader(function (name, value) {
+                if (init.headers === undefined) {
+                    init.headers = {};
+                }
+                if (init.headers instanceof Headers) {
+                    init.headers.append(name, value);
+                }
+                else if (Array.isArray(init.headers)) {
+                    init.headers.push([name, value]);
+                }
+                else {
+                    init.headers[name] = value;
+                }
+            });
+            const startTime = performance.now();
+            return origFetch(input, init).then((response) => {
+                const duration = performance.now() - startTime;
+                if (options.failuresOnly && response.status < 400) {
+                    return response;
+                }
+                const r = response.clone();
+                r.text()
+                    .then((text) => {
+                    const reqHs = {};
+                    const resHs = {};
+                    if (ignoreHeaders !== true) {
+                        // request headers
+                        const writeReqHeader = ([n, v]) => {
+                            if (!isHIgnored(n)) {
+                                reqHs[n] = v;
+                            }
+                        };
+                        if (init.headers instanceof Headers) {
+                            init.headers.forEach((v, n) => writeReqHeader([n, v]));
                         }
-                    };
-                    if (init.headers instanceof Headers) {
-                        init.headers.forEach((v, n) => writeReqHeader([n, v]));
-                    }
-                    else if (Array.isArray(init.headers)) {
-                        init.headers.forEach(writeReqHeader);
-                    }
-                    else if (typeof init.headers === 'object') {
-                        Object.entries(init.headers).forEach(writeReqHeader);
+                        else if (Array.isArray(init.headers)) {
+                            init.headers.forEach(writeReqHeader);
+                        }
+                        else if (typeof init.headers === 'object') {
+                            Object.entries(init.headers).forEach(writeReqHeader);
+                        }
+                        // response headers
+                        r.headers.forEach((v, n) => {
+                            if (!isHIgnored(n))
+                                resHs[n] = v;
+                        });
                     }
-                    // response headers
-                    r.headers.forEach((v, n) => {
-                        if (!isHIgnored(n))
-                            resHs[n] = v;
+                    const method = strMethod(init.method);
+                    const reqResInfo = sanitize({
+                        url: String(input),
+                        method,
+                        status: r.status,
+                        request: {
+                            headers: reqHs,
+                            body: init.body,
+                        },
+                        response: {
+                            headers: resHs,
+                            body: text,
+                        },
                     });
-                }
-                const method = strMethod(init.method);
+                    if (!reqResInfo) {
+                        return;
+                    }
+                    app.send((0, messages_gen_js_1.NetworkRequest)('fetch', method, String(reqResInfo.url), stringify(reqResInfo.request), stringify(reqResInfo.response), r.status, startTime + (0, utils_js_1.getTimeOrigin)(), duration));
+                })
+                    .catch((e) => app.debug.error('Could not process Fetch response:', e));
+                return response;
+            });
+        };
+        context.fetch = trackFetch;
+        /* ====== <> ====== */
+        /* ====== XHR ====== */
+        const nativeOpen = context.XMLHttpRequest.prototype.open;
+        function trackXMLHttpReqOpen(initMethod, url) {
+            const xhr = this;
+            setSessionTokenHeader((name, value) => xhr.setRequestHeader(name, value));
+            let startTime = 0;
+            xhr.addEventListener('loadstart', (e) => {
+                startTime = e.timeStamp;
+            });
+            xhr.addEventListener('load', app.safe((e) => {
+                const { headers: reqHs, body: reqBody } = getXHRRequestDataObject(xhr);
+                const duration = startTime > 0 ? e.timeStamp - startTime : 0;
+                const hString = ignoreHeaders ? '' : xhr.getAllResponseHeaders(); // might be null (though only if no response received though)
+                const resHs = hString
+                    ? hString
+                        .split('\r\n')
+                        .map((h) => h.split(':'))
+                        .filter((entry) => !isHIgnored(entry[0]))
+                        .reduce((hds, [name, value]) => (Object.assign(Object.assign({}, hds), { [name]: value })), {})
+                    : {};
+                const method = strMethod(initMethod);
                 const reqResInfo = sanitize({
-                    url: String(input),
+                    url: String(url),
                     method,
-                    status: r.status,
+                    status: xhr.status,
                     request: {
                         headers: reqHs,
-                        body: init.body,
+                        body: reqBody,
                     },
                     response: {
                         headers: resHs,
-                        body: text,
+                        body: xhr.response,
                     },
                 });
                 if (!reqResInfo) {
                     return;
                 }
-                app.send((0, messages_gen_js_1.NetworkRequest)('fetch', method, String(reqResInfo.url), stringify(reqResInfo.request), stringify(reqResInfo.response), r.status, startTime + (0, utils_js_1.getTimeOrigin)(), duration));
-            })
-                .catch((e) => app.debug.error('Could not process Fetch response:', e));
-            return response;
-        });
-    };
-    if (customEnv) {
-        if ('fetch' in customEnv) {
-            customEnv.fetch = trackFetch;
-        }
-    }
-    else {
-        window.fetch = trackFetch;
-    }
-    /* ====== <> ====== */
-    /* ====== XHR ====== */
-    const nativeOpen = customEnv
-        ? customEnv.XMLHttpRequest.prototype.open
-        : XMLHttpRequest.prototype.open;
-    function trackXMLHttpReqOpen(initMethod, url) {
-        // @ts-ignore ??? this -> XMLHttpRequest
-        const xhr = this;
-        setSessionTokenHeader((name, value) => xhr.setRequestHeader(name, value));
-        let startTime = 0;
-        xhr.addEventListener('loadstart', (e) => {
-            startTime = e.timeStamp;
-        });
-        xhr.addEventListener('load', app.safe((e) => {
-            const { headers: reqHs, body: reqBody } = getXHRRequestDataObject(xhr);
-            const duration = startTime > 0 ? e.timeStamp - startTime : 0;
-            const hString = ignoreHeaders ? '' : xhr.getAllResponseHeaders(); // might be null (though only if no response received though)
-            const resHs = hString
-                ? hString
-                    .split('\r\n')
-                    .map((h) => h.split(':'))
-                    .filter((entry) => !isHIgnored(entry[0]))
-                    .reduce((hds, [name, value]) => (Object.assign(Object.assign({}, hds), { [name]: value })), {})
-                : {};
-            const method = strMethod(initMethod);
-            const reqResInfo = sanitize({
-                url: String(url),
-                method,
-                status: xhr.status,
-                request: {
-                    headers: reqHs,
-                    body: reqBody,
-                },
-                response: {
-                    headers: resHs,
-                    body: xhr.response,
-                },
-            });
-            if (!reqResInfo) {
-                return;
-            }
-            app.send((0, messages_gen_js_1.NetworkRequest)('xhr', method, String(reqResInfo.url), stringify(reqResInfo.request), stringify(reqResInfo.response), xhr.status, startTime + (0, utils_js_1.getTimeOrigin)(), duration));
-        }));
-        //TODO: handle error (though it has no Error API nor any useful information)
-        //xhr.addEventListener('error', (e) => {})
-        // @ts-ignore ??? this -> XMLHttpRequest
-        return nativeOpen.apply(this, arguments);
-    }
-    if (customEnv) {
-        if ('XMLHttpRequest' in customEnv) {
-            customEnv.XMLHttpRequest.prototype.open = trackXMLHttpReqOpen.bind(customEnv);
-        }
-    }
-    else {
-        XMLHttpRequest.prototype.open = trackXMLHttpReqOpen;
-    }
-    const nativeSend = XMLHttpRequest.prototype.send;
-    function trackXHRSend(body) {
-        // @ts-ignore ??? this -> XMLHttpRequest
-        const rdo = getXHRRequestDataObject(this);
-        rdo.body = body;
-        // @ts-ignore ??? this -> XMLHttpRequest
-        return nativeSend.apply(this, arguments);
-    }
-    if (customEnv) {
-        if ('XMLHttpRequest' in customEnv) {
-            customEnv.XMLHttpRequest.prototype.send = trackXHRSend.bind(customEnv);
+                app.send((0, messages_gen_js_1.NetworkRequest)('xhr', method, String(reqResInfo.url), stringify(reqResInfo.request), stringify(reqResInfo.response), xhr.status, startTime + (0, utils_js_1.getTimeOrigin)(), duration));
+            }));
+            //TODO: handle error (though it has no Error API nor any useful information)
+            //xhr.addEventListener('error', (e) => {})
+            return nativeOpen.apply(this, arguments);
         }
-    }
-    else {
-        XMLHttpRequest.prototype.send = trackXHRSend;
-    }
-    const nativeSetRequestHeader = XMLHttpRequest.prototype.setRequestHeader;
-    function trackSetReqHeader(name, value) {
-        if (!isHIgnored(name)) {
-            // @ts-ignore ??? this -> XMLHttpRequest
+        context.XMLHttpRequest.prototype.open = trackXMLHttpReqOpen;
+        const nativeSend = context.XMLHttpRequest.prototype.send;
+        function trackXHRSend(body) {
             const rdo = getXHRRequestDataObject(this);
-            rdo.headers[name] = value;
+            rdo.body = body;
+            // @ts-ignore ??? this -> XMLHttpRequest
+            return nativeSend.apply(this, arguments);
         }
-        // @ts-ignore ??? this -> XMLHttpRequest
-        return nativeSetRequestHeader.apply(this, arguments);
-    }
-    if (customEnv) {
-        if ('XMLHttpRequest' in customEnv) {
-            customEnv.XMLHttpRequest.prototype.setRequestHeader = trackSetReqHeader.bind(customEnv);
+        context.XMLHttpRequest.prototype.send = trackXHRSend;
+        const nativeSetRequestHeader = context.XMLHttpRequest.prototype.setRequestHeader;
+        function trackSetReqHeader(name, value) {
+            if (!isHIgnored(name)) {
+                const rdo = getXHRRequestDataObject(this);
+                rdo.headers[name] = value;
+            }
+            return nativeSetRequestHeader.apply(this, arguments);
         }
-    }
-    else {
-        XMLHttpRequest.prototype.setRequestHeader = trackSetReqHeader;
-    }
-    /* ====== <> ====== */
+        context.XMLHttpRequest.prototype.setRequestHeader = trackSetReqHeader;
+        /* ====== <> ====== */
+    };
+    patchWindow(window);
+    app.observer.attachContextCallback(app.safe(patchWindow));
 }
 exports.default = default_1;

package/cjs/utils.d.ts

@@ -12,4 +12,7 @@ export declare function deprecationWarn(nameOfFeature: string, useInstead: strin
 export declare function getLabelAttribute(e: Element): string | null;
 export declare function hasOpenreplayAttribute(e: Element, attr: string): boolean;
 export declare function isIframeCrossdomain(e: HTMLIFrameElement): boolean;
+/**
+ * checks if iframe is accessible
+ **/
 export declare function canAccessIframe(iframe: HTMLIFrameElement): boolean;

package/cjs/utils.js

@@ -79,6 +79,9 @@ function isIframeCrossdomain(e) {
     }
 }
 exports.isIframeCrossdomain = isIframeCrossdomain;
+/**
+ * checks if iframe is accessible
+ **/
 function canAccessIframe(iframe) {
     try {
         return Boolean(iframe.contentDocument);

package/lib/app/index.js

@@ -31,7 +31,7 @@ export default class App {
         this.stopCallbacks = [];
         this.commitCallbacks = [];
         this.activityState = ActivityState.NotActive;
-        this.version = '6.0.1-beta.2'; // TODO: version compatability check inside each plugin.
+        this.version = '6.0.2'; // TODO: version compatability check inside each plugin.
         this.compressionThreshold = 24 * 1000;
         this._usingOldFetchPlugin = false;
         this.delay = 0;

package/lib/app/nodes.d.ts

@@ -2,6 +2,7 @@ type NodeCallback = (node: Node, isStart: boolean) => void;
 export default class Nodes {
     private readonly node_id;
     private nodes;
+    private totalNodeAmount;
     private readonly nodeCallbacks;
     private readonly elementListeners;
     constructor(node_id: string);

package/lib/app/nodes.js

@@ -2,6 +2,7 @@ export default class Nodes {
     constructor(node_id) {
         this.node_id = node_id;
         this.nodes = [];
+        this.totalNodeAmount = 0;
         this.nodeCallbacks = [];
         this.elementListeners = new Map();
     }
@@ -26,6 +27,7 @@ export default class Nodes {
         let id = node[this.node_id];
         const isNew = id === undefined;
         if (isNew) {
+            this.totalNodeAmount++;
             id = this.nodes.length;
             this.nodes[id] = node;
             node[this.node_id] = id;
@@ -42,6 +44,7 @@ export default class Nodes {
                 this.elementListeners.delete(id);
                 listeners.forEach((listener) => node.removeEventListener(listener[0], listener[1], listener[2]));
             }
+            this.totalNodeAmount--;
         }
         return id;
     }
@@ -67,7 +70,7 @@ export default class Nodes {
         return this.nodes[id];
     }
     getNodeCount() {
-        return this.nodes.filter(Boolean).length;
+        return this.totalNodeAmount;
     }
     clear() {
         for (let id = 0; id < this.nodes.length; id++) {

package/lib/app/observer/top_observer.js

@@ -1,6 +1,5 @@
 import Observer from './observer.js';
 import { isElementNode, hasTag } from '../guards.js';
-import Network from '../../modules/network.js';
 import IFrameObserver from './iframe_observer.js';
 import ShadowRootObserver from './shadow_root_observer.js';
 import IFrameOffsets from './iframe_offsets.js';
@@ -68,7 +67,6 @@ export default class TopObserver extends Observer {
             //TODO: more explicit logic
             ) {
                 this.contextsSet.add(currentWin);
-                Network(this.app, this.app.networkOptions, currentWin);
                 //@ts-ignore https://github.com/microsoft/TypeScript/issues/41684
                 this.contextCallbacks.forEach((cb) => cb(currentWin));
             }

package/lib/index.js

@@ -137,7 +137,7 @@ export default class API {
             // no-cors issue only with text/plain or not-set Content-Type
             // req.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
             req.send(JSON.stringify({
-                trackerVersion: '6.0.1-beta.2',
+                trackerVersion: '6.0.2',
                 projectKey: options.projectKey,
                 doNotTrack,
                 // TODO: add precise reason (an exact API missing)

package/lib/modules/network.d.ts

@@ -24,5 +24,5 @@ export interface Options {
     capturePayload: boolean;
     sanitizer?: Sanitizer;
 }
-export default function (app: App, opts?: Partial<Options>, customEnv?: Record<string, any>): void;
+export default function (app: App, opts?: Partial<Options>): void;
 export {};

package/lib/modules/network.js

@@ -1,42 +1,5 @@
 import { NetworkRequest } from '../app/messages.gen.js';
 import { getTimeOrigin } from '../utils.js';
-// Request:
-// declare const enum BodyType {
-//   Blob = "Blob",
-//   ArrayBuffer = "ArrayBuffer",
-//   TypedArray = "TypedArray",
-//   DataView = "DataView",
-//   FormData = "FormData",
-//   URLSearchParams = "URLSearchParams",
-//   Document = "Document", // XHR only
-//   ReadableStream = "ReadableStream", // Fetch only
-//   Literal = "literal",
-//   Unknown = "unk",
-// }
-// XHRResponse body: ArrayBuffer, a Blob, a Document, a JavaScript Object, or a string
-// TODO: extract maximum of useful information from any type of Request/Responce bodies
-// function objectifyBody(body: any): RequestBody {
-//   if (body instanceof Blob) {
-//     return {
-//       body: `<Blob type: ${body.type}>; size: ${body.size}`,
-//       bodyType: BodyType.Blob,
-//     }
-//   }
-//   return {
-//     body,
-//     bodyType: BodyType.Literal,
-//   }
-// }
-function checkCacheByPerformanceTimings(requestUrl) {
-    if (performance) {
-        const timings = performance.getEntriesByName(requestUrl)[0];
-        if (timings) {
-            // @ts-ignore - weird ts typings, please refer to https://developer.mozilla.org/en-US/docs/Web/API/PerformanceNavigationTiming
-            return timings.transferSize === 0 || timings.responseStart - timings.requestStart < 10;
-        }
-    }
-    return false;
-}
 function getXHRRequestDataObject(xhr) {
     // @ts-ignore  this is 3x faster than using Map<XHR, XHRRequestData>
     if (!xhr.__or_req_data__) {
@@ -49,7 +12,7 @@ function getXHRRequestDataObject(xhr) {
 function strMethod(method) {
     return typeof method === 'string' ? method.toUpperCase() : 'GET';
 }
-export default function (app, opts = {}, customEnv) {
+export default function (app, opts = {}) {
     const options = Object.assign({
         failuresOnly: false,
         ignoreHeaders: ['Cookie', 'Set-Cookie', 'Authorization'],
@@ -99,181 +62,148 @@ export default function (app, opts = {}, customEnv) {
         }
         return JSON.stringify(r);
     }
-    /* ====== Fetch ====== */
-    const origFetch = customEnv
-        ? customEnv.fetch.bind(customEnv)
-        : window.fetch.bind(window);
-    const trackFetch = (input, init = {}) => {
-        if (!(typeof input === 'string' || input instanceof URL) || app.isServiceURL(String(input))) {
-            return origFetch(input, init);
-        }
-        setSessionTokenHeader(function (name, value) {
-            if (init.headers === undefined) {
-                init.headers = {};
-            }
-            if (init.headers instanceof Headers) {
-                init.headers.append(name, value);
-            }
-            else if (Array.isArray(init.headers)) {
-                init.headers.push([name, value]);
+    const patchWindow = (context) => {
+        /* ====== Fetch ====== */
+        const origFetch = context.fetch.bind(context);
+        const trackFetch = (input, init = {}) => {
+            if (!(typeof input === 'string' || input instanceof URL) || app.isServiceURL(String(input))) {
+                return origFetch(input, init);
             }
-            else {
-                init.headers[name] = value;
-            }
-        });
-        const startTime = performance.now();
-        return origFetch(input, init).then((response) => {
-            const duration = performance.now() - startTime;
-            if (options.failuresOnly && response.status < 400) {
-                return response;
-            }
-            const r = response.clone();
-            r.text()
-                .then((text) => {
-                const reqHs = {};
-                const resHs = {};
-                if (ignoreHeaders !== true) {
-                    // request headers
-                    const writeReqHeader = ([n, v]) => {
-                        if (!isHIgnored(n)) {
-                            reqHs[n] = v;
+            setSessionTokenHeader(function (name, value) {
+                if (init.headers === undefined) {
+                    init.headers = {};
+                }
+                if (init.headers instanceof Headers) {
+                    init.headers.append(name, value);
+                }
+                else if (Array.isArray(init.headers)) {
+                    init.headers.push([name, value]);
+                }
+                else {
+                    init.headers[name] = value;
+                }
+            });
+            const startTime = performance.now();
+            return origFetch(input, init).then((response) => {
+                const duration = performance.now() - startTime;
+                if (options.failuresOnly && response.status < 400) {
+                    return response;
+                }
+                const r = response.clone();
+                r.text()
+                    .then((text) => {
+                    const reqHs = {};
+                    const resHs = {};
+                    if (ignoreHeaders !== true) {
+                        // request headers
+                        const writeReqHeader = ([n, v]) => {
+                            if (!isHIgnored(n)) {
+                                reqHs[n] = v;
+                            }
+                        };
+                        if (init.headers instanceof Headers) {
+                            init.headers.forEach((v, n) => writeReqHeader([n, v]));
                         }
-                    };
-                    if (init.headers instanceof Headers) {
-                        init.headers.forEach((v, n) => writeReqHeader([n, v]));
-                    }
-                    else if (Array.isArray(init.headers)) {
-                        init.headers.forEach(writeReqHeader);
-                    }
-                    else if (typeof init.headers === 'object') {
-                        Object.entries(init.headers).forEach(writeReqHeader);
+                        else if (Array.isArray(init.headers)) {
+                            init.headers.forEach(writeReqHeader);
+                        }
+                        else if (typeof init.headers === 'object') {
+                            Object.entries(init.headers).forEach(writeReqHeader);
+                        }
+                        // response headers
+                        r.headers.forEach((v, n) => {
+                            if (!isHIgnored(n))
+                                resHs[n] = v;
+                        });
                     }
-                    // response headers
-                    r.headers.forEach((v, n) => {
-                        if (!isHIgnored(n))
-                            resHs[n] = v;
+                    const method = strMethod(init.method);
+                    const reqResInfo = sanitize({
+                        url: String(input),
+                        method,
+                        status: r.status,
+                        request: {
+                            headers: reqHs,
+                            body: init.body,
+                        },
+                        response: {
+                            headers: resHs,
+                            body: text,
+                        },
                     });
-                }
-                const method = strMethod(init.method);
+                    if (!reqResInfo) {
+                        return;
+                    }
+                    app.send(NetworkRequest('fetch', method, String(reqResInfo.url), stringify(reqResInfo.request), stringify(reqResInfo.response), r.status, startTime + getTimeOrigin(), duration));
+                })
+                    .catch((e) => app.debug.error('Could not process Fetch response:', e));
+                return response;
+            });
+        };
+        context.fetch = trackFetch;
+        /* ====== <> ====== */
+        /* ====== XHR ====== */
+        const nativeOpen = context.XMLHttpRequest.prototype.open;
+        function trackXMLHttpReqOpen(initMethod, url) {
+            const xhr = this;
+            setSessionTokenHeader((name, value) => xhr.setRequestHeader(name, value));
+            let startTime = 0;
+            xhr.addEventListener('loadstart', (e) => {
+                startTime = e.timeStamp;
+            });
+            xhr.addEventListener('load', app.safe((e) => {
+                const { headers: reqHs, body: reqBody } = getXHRRequestDataObject(xhr);
+                const duration = startTime > 0 ? e.timeStamp - startTime : 0;
+                const hString = ignoreHeaders ? '' : xhr.getAllResponseHeaders(); // might be null (though only if no response received though)
+                const resHs = hString
+                    ? hString
+                        .split('\r\n')
+                        .map((h) => h.split(':'))
+                        .filter((entry) => !isHIgnored(entry[0]))
+                        .reduce((hds, [name, value]) => (Object.assign(Object.assign({}, hds), { [name]: value })), {})
+                    : {};
+                const method = strMethod(initMethod);
                 const reqResInfo = sanitize({
-                    url: String(input),
+                    url: String(url),
                     method,
-                    status: r.status,
+                    status: xhr.status,
                     request: {
                         headers: reqHs,
-                        body: init.body,
+                        body: reqBody,
                     },
                     response: {
                         headers: resHs,
-                        body: text,
+                        body: xhr.response,
                     },
                 });
                 if (!reqResInfo) {
                     return;
                 }
-                app.send(NetworkRequest('fetch', method, String(reqResInfo.url), stringify(reqResInfo.request), stringify(reqResInfo.response), r.status, startTime + getTimeOrigin(), duration));
-            })
-                .catch((e) => app.debug.error('Could not process Fetch response:', e));
-            return response;
-        });
-    };
-    if (customEnv) {
-        if ('fetch' in customEnv) {
-            customEnv.fetch = trackFetch;
-        }
-    }
-    else {
-        window.fetch = trackFetch;
-    }
-    /* ====== <> ====== */
-    /* ====== XHR ====== */
-    const nativeOpen = customEnv
-        ? customEnv.XMLHttpRequest.prototype.open
-        : XMLHttpRequest.prototype.open;
-    function trackXMLHttpReqOpen(initMethod, url) {
-        // @ts-ignore ??? this -> XMLHttpRequest
-        const xhr = this;
-        setSessionTokenHeader((name, value) => xhr.setRequestHeader(name, value));
-        let startTime = 0;
-        xhr.addEventListener('loadstart', (e) => {
-            startTime = e.timeStamp;
-        });
-        xhr.addEventListener('load', app.safe((e) => {
-            const { headers: reqHs, body: reqBody } = getXHRRequestDataObject(xhr);
-            const duration = startTime > 0 ? e.timeStamp - startTime : 0;
-            const hString = ignoreHeaders ? '' : xhr.getAllResponseHeaders(); // might be null (though only if no response received though)
-            const resHs = hString
-                ? hString
-                    .split('\r\n')
-                    .map((h) => h.split(':'))
-                    .filter((entry) => !isHIgnored(entry[0]))
-                    .reduce((hds, [name, value]) => (Object.assign(Object.assign({}, hds), { [name]: value })), {})
-                : {};
-            const method = strMethod(initMethod);
-            const reqResInfo = sanitize({
-                url: String(url),
-                method,
-                status: xhr.status,
-                request: {
-                    headers: reqHs,
-                    body: reqBody,
-                },
-                response: {
-                    headers: resHs,
-                    body: xhr.response,
-                },
-            });
-            if (!reqResInfo) {
-                return;
-            }
-            app.send(NetworkRequest('xhr', method, String(reqResInfo.url), stringify(reqResInfo.request), stringify(reqResInfo.response), xhr.status, startTime + getTimeOrigin(), duration));
-        }));
-        //TODO: handle error (though it has no Error API nor any useful information)
-        //xhr.addEventListener('error', (e) => {})
-        // @ts-ignore ??? this -> XMLHttpRequest
-        return nativeOpen.apply(this, arguments);
-    }
-    if (customEnv) {
-        if ('XMLHttpRequest' in customEnv) {
-            customEnv.XMLHttpRequest.prototype.open = trackXMLHttpReqOpen.bind(customEnv);
-        }
-    }
-    else {
-        XMLHttpRequest.prototype.open = trackXMLHttpReqOpen;
-    }
-    const nativeSend = XMLHttpRequest.prototype.send;
-    function trackXHRSend(body) {
-        // @ts-ignore ??? this -> XMLHttpRequest
-        const rdo = getXHRRequestDataObject(this);
-        rdo.body = body;
-        // @ts-ignore ??? this -> XMLHttpRequest
-        return nativeSend.apply(this, arguments);
-    }
-    if (customEnv) {
-        if ('XMLHttpRequest' in customEnv) {
-            customEnv.XMLHttpRequest.prototype.send = trackXHRSend.bind(customEnv);
+                app.send(NetworkRequest('xhr', method, String(reqResInfo.url), stringify(reqResInfo.request), stringify(reqResInfo.response), xhr.status, startTime + getTimeOrigin(), duration));
+            }));
+            //TODO: handle error (though it has no Error API nor any useful information)
+            //xhr.addEventListener('error', (e) => {})
+            return nativeOpen.apply(this, arguments);
         }
-    }
-    else {
-        XMLHttpRequest.prototype.send = trackXHRSend;
-    }
-    const nativeSetRequestHeader = XMLHttpRequest.prototype.setRequestHeader;
-    function trackSetReqHeader(name, value) {
-        if (!isHIgnored(name)) {
-            // @ts-ignore ??? this -> XMLHttpRequest
+        context.XMLHttpRequest.prototype.open = trackXMLHttpReqOpen;
+        const nativeSend = context.XMLHttpRequest.prototype.send;
+        function trackXHRSend(body) {
             const rdo = getXHRRequestDataObject(this);
-            rdo.headers[name] = value;
+            rdo.body = body;
+            // @ts-ignore ??? this -> XMLHttpRequest
+            return nativeSend.apply(this, arguments);
         }
-        // @ts-ignore ??? this -> XMLHttpRequest
-        return nativeSetRequestHeader.apply(this, arguments);
-    }
-    if (customEnv) {
-        if ('XMLHttpRequest' in customEnv) {
-            customEnv.XMLHttpRequest.prototype.setRequestHeader = trackSetReqHeader.bind(customEnv);
+        context.XMLHttpRequest.prototype.send = trackXHRSend;
+        const nativeSetRequestHeader = context.XMLHttpRequest.prototype.setRequestHeader;
+        function trackSetReqHeader(name, value) {
+            if (!isHIgnored(name)) {
+                const rdo = getXHRRequestDataObject(this);
+                rdo.headers[name] = value;
+            }
+            return nativeSetRequestHeader.apply(this, arguments);
         }
-    }
-    else {
-        XMLHttpRequest.prototype.setRequestHeader = trackSetReqHeader;
-    }
-    /* ====== <> ====== */
+        context.XMLHttpRequest.prototype.setRequestHeader = trackSetReqHeader;
+        /* ====== <> ====== */
+    };
+    patchWindow(window);
+    app.observer.attachContextCallback(app.safe(patchWindow));
 }

package/lib/utils.d.ts

@@ -12,4 +12,7 @@ export declare function deprecationWarn(nameOfFeature: string, useInstead: strin
 export declare function getLabelAttribute(e: Element): string | null;
 export declare function hasOpenreplayAttribute(e: Element, attr: string): boolean;
 export declare function isIframeCrossdomain(e: HTMLIFrameElement): boolean;
+/**
+ * checks if iframe is accessible
+ **/
 export declare function canAccessIframe(iframe: HTMLIFrameElement): boolean;

package/lib/utils.js

@@ -68,6 +68,9 @@ export function isIframeCrossdomain(e) {
         return true;
     }
 }
+/**
+ * checks if iframe is accessible
+ **/
 export function canAccessIframe(iframe) {
     try {
         return Boolean(iframe.contentDocument);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openreplay/tracker",
   "description": "The OpenReplay tracker main package",
-  "version": "6.0.1-beta.2",
+  "version": "6.0.2",
   "keywords": [
     "logging",
     "replay"