@openreplay/tracker 4.1.3 → 4.1.4-beta.0

package/cjs/app/index.js

@@ -32,7 +32,7 @@ class App {
         this.stopCallbacks = [];
         this.commitCallbacks = [];
         this.activityState = ActivityState.NotActive;
-        this.version = '4.0.1'; // TODO: version compatability check inside each plugin.
+        this.version = '4.1.3'; // TODO: version compatability check inside each plugin.
         this.projectKey = projectKey;
         this.options = Object.assign({
             revID: '',
@@ -216,10 +216,13 @@ class App {
             this.debug.error('OpenReplay error: Unable to build session URL');
             return undefined;
         }
-        return this.options.ingestPoint.replace(/ingest$/, `${projectID}/session/${sessionID}`);
+        const ingest = this.options.ingestPoint;
+        const isSaas = ingest === exports.DEFAULT_INGEST_POINT;
+        const projectPath = isSaas ? ingest.replace('api', 'app') : ingest;
+        return projectPath.replace(/ingest$/, `${projectID}/session/${sessionID}`);
     }
     getHost() {
-        return new URL(this.options.ingestPoint).hostname;
+        return new URL(this.options.ingestPoint).host;
     }
     getProjectKey() {
         return this.projectKey;

package/cjs/index.js

@@ -133,7 +133,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: '4.0.1',
+                trackerVersion: '4.1.3',
                 projectKey: options.projectKey,
                 doNotTrack,
                 // TODO: add precise reason (an exact API missing)

package/cjs/modules/constructedStyleSheets.js

@@ -28,12 +28,12 @@ function default_1(app) {
     }
     const styleSheetIDMap = new Map();
     const adoptedStyleSheetsOwnings = new Map();
-    const sendAdoptedStyleSheetsUpdate = (root) => {
+    const sendAdoptedStyleSheetsUpdate = (root) => setTimeout(() => {
         let nodeID = app.nodes.getID(root);
         if (root === document) {
             nodeID = 0; // main document doesn't have nodeID. ID count starts from the documentElement
         }
-        if (!nodeID) {
+        if (nodeID === undefined) {
             return;
         }
         let pastOwning = adoptedStyleSheetsOwnings.get(nodeID);
@@ -48,28 +48,31 @@ function default_1(app) {
             if (!sheetID) {
                 sheetID = nextID();
             }
-            nowOwning.push(sheetID);
             if (!pastOwning.includes(sheetID)) {
                 app.send((0, messages_gen_js_1.AdoptedSSAddOwner)(sheetID, nodeID));
             }
             if (init) {
                 const rules = s.cssRules;
                 for (let i = 0; i < rules.length; i++) {
+                    nodeID === 1110 && console.log(rules[i].cssText, root, s, root.adoptedStyleSheets[0], s.cssRules[0]);
                     app.send((0, messages_gen_js_1.AdoptedSSInsertRuleURLBased)(sheetID, rules[i].cssText, i, app.getBaseHref()));
                 }
             }
+            nowOwning.push(sheetID);
         }
+        //     nodeID === 0 && console.log(pastOwning, nowOwning, nowOwning.length)
         for (const sheetID of pastOwning) {
             if (!nowOwning.includes(sheetID)) {
                 app.send((0, messages_gen_js_1.AdoptedSSRemoveOwner)(sheetID, nodeID));
             }
         }
         adoptedStyleSheetsOwnings.set(nodeID, nowOwning);
-    };
-    function patchAdoptedStyleSheets(prototype) {
+    }, 0);
+    function patchAdoptedStyleSheets(prototype, ctx) {
         const nativeAdoptedStyleSheetsDescriptor = Object.getOwnPropertyDescriptor(prototype, 'adoptedStyleSheets');
         if (nativeAdoptedStyleSheetsDescriptor) {
             Object.defineProperty(prototype, 'adoptedStyleSheets', Object.assign(Object.assign({}, nativeAdoptedStyleSheetsDescriptor), { set: function (value) {
+                    ctx !== window && ctx.Document.prototype === prototype && console.log("custom set!", value, ctx);
                     // @ts-ignore
                     const retVal = nativeAdoptedStyleSheetsDescriptor.set.call(this, value);
                     sendAdoptedStyleSheetsUpdate(this);
@@ -78,6 +81,8 @@ function default_1(app) {
         }
     }
     const patchContext = (context) => {
+        // @ts-ignore
+        console.log("new context", context, context.document.adoptedStyleSheets.length && context.document.adoptedStyleSheets[0].cssRules[0].cssText);
         // @ts-ignore
         if (context.__openreplay_adpss_patched__) {
             return;
@@ -86,12 +91,13 @@ function default_1(app) {
             // @ts-ignore
             context.__openreplay_adpss_patched__ = true;
         }
-        patchAdoptedStyleSheets(context.Document.prototype);
-        patchAdoptedStyleSheets(context.ShadowRoot.prototype);
+        patchAdoptedStyleSheets(context.Document.prototype, context);
+        patchAdoptedStyleSheets(context.ShadowRoot.prototype, context);
         //@ts-ignore TODO: configure ts (use necessary lib)
-        const { insertRule, deleteRule, replace, replaceSync } = context.CSSStyleSheet.prototype;
+        const { replace, replaceSync } = context.CSSStyleSheet.prototype;
         //@ts-ignore
         context.CSSStyleSheet.prototype.replace = function (text) {
+            styleSheetIDMap.get(this) === 102 && console.log("replace with", text);
             return replace.call(this, text).then((sheet) => {
                 const sheetID = styleSheetIDMap.get(this);
                 if (sheetID) {
@@ -103,6 +109,7 @@ function default_1(app) {
         //@ts-ignore
         context.CSSStyleSheet.prototype.replaceSync = function (text) {
             const sheetID = styleSheetIDMap.get(this);
+            sheetID === 102 && console.log("replacesnc with", text);
             if (sheetID) {
                 app.send((0, messages_gen_js_1.AdoptedSSReplaceURLBased)(sheetID, text, app.getBaseHref()));
             }
@@ -110,7 +117,7 @@ function default_1(app) {
         };
     };
     patchContext(window);
-    app.observer.attachContextCallback(patchContext);
+    app.observer.attachContextCallback(app.safe(patchContext));
     app.attachStopCallback(() => {
         styleSheetIDMap.clear();
         adoptedStyleSheetsOwnings.clear();

package/cjs/modules/cssrules.js

@@ -11,7 +11,7 @@ function default_1(app) {
         app.send((0, messages_gen_js_1.TechnicalInfo)('no_stylesheet_prototype_in_window', ''));
         return;
     }
-    const sendInserDeleteRule = app.safe((sheet, index, rule) => {
+    const sendInsertDeleteRule = app.safe((sheet, index, rule) => {
         const sheetID = constructedStyleSheets_js_1.styleSheetIDMap.get(sheet);
         if (!sheetID) {
             // OK-case. Sheet haven't been registered yet. Rules will be sent on registration.
@@ -51,15 +51,15 @@ function default_1(app) {
             app.debug.warn('Rule index not found in', sheet, topmostRule);
         }
     });
-    const patchContext = (context) => {
+    const patchContext = app.safe((context) => {
         const { insertRule, deleteRule } = context.CSSStyleSheet.prototype;
-        const { insertRule: groupInsertRule, deleteRule: groupDeleteRule } = context.CSSGroupingRule.prototype;
+        const { insertRule: groupInsertRule, deleteRule: groupDeleteRule, } = context.CSSGroupingRule.prototype;
         context.CSSStyleSheet.prototype.insertRule = function (rule, index = 0) {
-            sendInserDeleteRule(this, index, rule);
+            sendInsertDeleteRule(this, index, rule);
             return insertRule.call(this, rule, index);
         };
         context.CSSStyleSheet.prototype.deleteRule = function (index) {
-            sendInserDeleteRule(this, index);
+            sendInsertDeleteRule(this, index);
             return deleteRule.call(this, index);
         };
         context.CSSGroupingRule.prototype.insertRule = function (rule, index = 0) {
@@ -72,7 +72,7 @@ function default_1(app) {
             sendReplaceGroupingRule(this);
             return result;
         };
-    };
+    });
     patchContext(window);
     app.observer.attachContextCallback(patchContext);
     app.nodes.attachNodeCallback((node) => {
@@ -92,7 +92,7 @@ function default_1(app) {
         app.send((0, messages_gen_js_1.AdoptedSSAddOwner)(sheetID, nodeID));
         const rules = sheet.cssRules;
         for (let i = 0; i < rules.length; i++) {
-            sendInserDeleteRule(sheet, i, rules[i].cssText);
+            sendInsertDeleteRule(sheet, i, rules[i].cssText);
         }
     });
 }

package/cjs/modules/exception.js

@@ -70,7 +70,7 @@ function default_1(app, opts) {
         app.attachEventListener(context, 'error', handler);
     }
     if (options.captureExceptions) {
-        app.observer.attachContextCallback(patchContext);
+        app.observer.attachContextCallback(patchContext); // TODO: attach once-per-iframe (?)
         patchContext(window);
     }
 }

package/cjs/utils.js

@@ -5,7 +5,7 @@ const DEPRECATED_ATTRS = { htmlmasked: 'hidden', masked: 'obscured' };
 exports.IN_BROWSER = !(typeof window === 'undefined');
 exports.IS_FIREFOX = exports.IN_BROWSER && navigator.userAgent.match(/firefox|fxios/i);
 exports.MAX_STR_LEN = 1e5;
-const navigationStart = (exports.IN_BROWSER && performance.timing.navigationStart) || performance.timeOrigin;
+const navigationStart = exports.IN_BROWSER && (performance.timing.navigationStart || performance.timeOrigin);
 // performance.now() is buggy in some browsers
 exports.timestamp = exports.IN_BROWSER && performance.now() && navigationStart
     ? () => Math.round(performance.now() + navigationStart)

package/lib/app/index.js

@@ -29,7 +29,7 @@ export default class App {
         this.stopCallbacks = [];
         this.commitCallbacks = [];
         this.activityState = ActivityState.NotActive;
-        this.version = '4.0.1'; // TODO: version compatability check inside each plugin.
+        this.version = '4.1.3'; // TODO: version compatability check inside each plugin.
         this.projectKey = projectKey;
         this.options = Object.assign({
             revID: '',
@@ -213,10 +213,13 @@ export default class App {
             this.debug.error('OpenReplay error: Unable to build session URL');
             return undefined;
         }
-        return this.options.ingestPoint.replace(/ingest$/, `${projectID}/session/${sessionID}`);
+        const ingest = this.options.ingestPoint;
+        const isSaas = ingest === DEFAULT_INGEST_POINT;
+        const projectPath = isSaas ? ingest.replace('api', 'app') : ingest;
+        return projectPath.replace(/ingest$/, `${projectID}/session/${sessionID}`);
     }
     getHost() {
-        return new URL(this.options.ingestPoint).hostname;
+        return new URL(this.options.ingestPoint).host;
     }
     getProjectKey() {
         return this.projectKey;

package/lib/index.js

@@ -128,7 +128,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: '4.0.1',
+                trackerVersion: '4.1.3',
                 projectKey: options.projectKey,
                 doNotTrack,
                 // TODO: add precise reason (an exact API missing)

package/lib/modules/constructedStyleSheets.js

@@ -24,12 +24,12 @@ export default function (app) {
     }
     const styleSheetIDMap = new Map();
     const adoptedStyleSheetsOwnings = new Map();
-    const sendAdoptedStyleSheetsUpdate = (root) => {
+    const sendAdoptedStyleSheetsUpdate = (root) => setTimeout(() => {
         let nodeID = app.nodes.getID(root);
         if (root === document) {
             nodeID = 0; // main document doesn't have nodeID. ID count starts from the documentElement
         }
-        if (!nodeID) {
+        if (nodeID === undefined) {
             return;
         }
         let pastOwning = adoptedStyleSheetsOwnings.get(nodeID);
@@ -44,28 +44,31 @@ export default function (app) {
             if (!sheetID) {
                 sheetID = nextID();
             }
-            nowOwning.push(sheetID);
             if (!pastOwning.includes(sheetID)) {
                 app.send(AdoptedSSAddOwner(sheetID, nodeID));
             }
             if (init) {
                 const rules = s.cssRules;
                 for (let i = 0; i < rules.length; i++) {
+                    nodeID === 1110 && console.log(rules[i].cssText, root, s, root.adoptedStyleSheets[0], s.cssRules[0]);
                     app.send(AdoptedSSInsertRuleURLBased(sheetID, rules[i].cssText, i, app.getBaseHref()));
                 }
             }
+            nowOwning.push(sheetID);
         }
+        //     nodeID === 0 && console.log(pastOwning, nowOwning, nowOwning.length)
         for (const sheetID of pastOwning) {
             if (!nowOwning.includes(sheetID)) {
                 app.send(AdoptedSSRemoveOwner(sheetID, nodeID));
             }
         }
         adoptedStyleSheetsOwnings.set(nodeID, nowOwning);
-    };
-    function patchAdoptedStyleSheets(prototype) {
+    }, 0);
+    function patchAdoptedStyleSheets(prototype, ctx) {
         const nativeAdoptedStyleSheetsDescriptor = Object.getOwnPropertyDescriptor(prototype, 'adoptedStyleSheets');
         if (nativeAdoptedStyleSheetsDescriptor) {
             Object.defineProperty(prototype, 'adoptedStyleSheets', Object.assign(Object.assign({}, nativeAdoptedStyleSheetsDescriptor), { set: function (value) {
+                    ctx !== window && ctx.Document.prototype === prototype && console.log("custom set!", value, ctx);
                     // @ts-ignore
                     const retVal = nativeAdoptedStyleSheetsDescriptor.set.call(this, value);
                     sendAdoptedStyleSheetsUpdate(this);
@@ -74,6 +77,8 @@ export default function (app) {
         }
     }
     const patchContext = (context) => {
+        // @ts-ignore
+        console.log("new context", context, context.document.adoptedStyleSheets.length && context.document.adoptedStyleSheets[0].cssRules[0].cssText);
         // @ts-ignore
         if (context.__openreplay_adpss_patched__) {
             return;
@@ -82,12 +87,13 @@ export default function (app) {
             // @ts-ignore
             context.__openreplay_adpss_patched__ = true;
         }
-        patchAdoptedStyleSheets(context.Document.prototype);
-        patchAdoptedStyleSheets(context.ShadowRoot.prototype);
+        patchAdoptedStyleSheets(context.Document.prototype, context);
+        patchAdoptedStyleSheets(context.ShadowRoot.prototype, context);
         //@ts-ignore TODO: configure ts (use necessary lib)
-        const { insertRule, deleteRule, replace, replaceSync } = context.CSSStyleSheet.prototype;
+        const { replace, replaceSync } = context.CSSStyleSheet.prototype;
         //@ts-ignore
         context.CSSStyleSheet.prototype.replace = function (text) {
+            styleSheetIDMap.get(this) === 102 && console.log("replace with", text);
             return replace.call(this, text).then((sheet) => {
                 const sheetID = styleSheetIDMap.get(this);
                 if (sheetID) {
@@ -99,6 +105,7 @@ export default function (app) {
         //@ts-ignore
         context.CSSStyleSheet.prototype.replaceSync = function (text) {
             const sheetID = styleSheetIDMap.get(this);
+            sheetID === 102 && console.log("replacesnc with", text);
             if (sheetID) {
                 app.send(AdoptedSSReplaceURLBased(sheetID, text, app.getBaseHref()));
             }
@@ -106,7 +113,7 @@ export default function (app) {
         };
     };
     patchContext(window);
-    app.observer.attachContextCallback(patchContext);
+    app.observer.attachContextCallback(app.safe(patchContext));
     app.attachStopCallback(() => {
         styleSheetIDMap.clear();
         adoptedStyleSheetsOwnings.clear();

package/lib/modules/cssrules.js

@@ -10,7 +10,7 @@ export default function (app) {
         app.send(TechnicalInfo('no_stylesheet_prototype_in_window', ''));
         return;
     }
-    const sendInserDeleteRule = app.safe((sheet, index, rule) => {
+    const sendInsertDeleteRule = app.safe((sheet, index, rule) => {
         const sheetID = styleSheetIDMap.get(sheet);
         if (!sheetID) {
             // OK-case. Sheet haven't been registered yet. Rules will be sent on registration.
@@ -50,15 +50,15 @@ export default function (app) {
             app.debug.warn('Rule index not found in', sheet, topmostRule);
         }
     });
-    const patchContext = (context) => {
+    const patchContext = app.safe((context) => {
         const { insertRule, deleteRule } = context.CSSStyleSheet.prototype;
-        const { insertRule: groupInsertRule, deleteRule: groupDeleteRule } = context.CSSGroupingRule.prototype;
+        const { insertRule: groupInsertRule, deleteRule: groupDeleteRule, } = context.CSSGroupingRule.prototype;
         context.CSSStyleSheet.prototype.insertRule = function (rule, index = 0) {
-            sendInserDeleteRule(this, index, rule);
+            sendInsertDeleteRule(this, index, rule);
             return insertRule.call(this, rule, index);
         };
         context.CSSStyleSheet.prototype.deleteRule = function (index) {
-            sendInserDeleteRule(this, index);
+            sendInsertDeleteRule(this, index);
             return deleteRule.call(this, index);
         };
         context.CSSGroupingRule.prototype.insertRule = function (rule, index = 0) {
@@ -71,7 +71,7 @@ export default function (app) {
             sendReplaceGroupingRule(this);
             return result;
         };
-    };
+    });
     patchContext(window);
     app.observer.attachContextCallback(patchContext);
     app.nodes.attachNodeCallback((node) => {
@@ -91,7 +91,7 @@ export default function (app) {
         app.send(AdoptedSSAddOwner(sheetID, nodeID));
         const rules = sheet.cssRules;
         for (let i = 0; i < rules.length; i++) {
-            sendInserDeleteRule(sheet, i, rules[i].cssText);
+            sendInsertDeleteRule(sheet, i, rules[i].cssText);
         }
     });
 }

package/lib/modules/exception.js

@@ -65,7 +65,7 @@ export default function (app, opts) {
         app.attachEventListener(context, 'error', handler);
     }
     if (options.captureExceptions) {
-        app.observer.attachContextCallback(patchContext);
+        app.observer.attachContextCallback(patchContext); // TODO: attach once-per-iframe (?)
         patchContext(window);
     }
 }

package/lib/utils.js

@@ -2,7 +2,7 @@ const DEPRECATED_ATTRS = { htmlmasked: 'hidden', masked: 'obscured' };
 export const IN_BROWSER = !(typeof window === 'undefined');
 export const IS_FIREFOX = IN_BROWSER && navigator.userAgent.match(/firefox|fxios/i);
 export const MAX_STR_LEN = 1e5;
-const navigationStart = (IN_BROWSER && performance.timing.navigationStart) || performance.timeOrigin;
+const navigationStart = IN_BROWSER && (performance.timing.navigationStart || performance.timeOrigin);
 // performance.now() is buggy in some browsers
 export const timestamp = IN_BROWSER && performance.now() && navigationStart
     ? () => Math.round(performance.now() + navigationStart)

package/package.json

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