@openreplay/tracker 5.0.5-beta.4 → 5.0.5-beta.7

package/cjs/app/index.js

@@ -33,7 +33,7 @@ class App {
         this.stopCallbacks = [];
         this.commitCallbacks = [];
         this.activityState = ActivityState.NotActive;
-        this.version = '5.0.5-beta.3'; // TODO: version compatability check inside each plugin.
+        this.version = '5.0.5-beta.7'; // TODO: version compatability check inside each plugin.
         this._usingOldFetchPlugin = false;
         this.delay = 0;
         this.projectKey = projectKey;

package/cjs/index.js

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

package/cjs/modules/axiosSpy.js

@@ -1,73 +1,85 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const messages_gen_js_1 = require("../app/messages.gen.js");
 const utils_js_1 = require("../utils.js");
 const exception_js_1 = require("./exception.js");
 function default_1(app, instance, opts, sanitize, stringify) {
     app.debug.log('Openreplay: attaching axios spy to instance', instance);
+    // eslint-disable-next-line @typescript-eslint/require-await
     function captureResponseData(axiosResponseObj) {
-        app.debug.log('Openreplay: capturing axios response data', axiosResponseObj);
-        const { headers: reqHs, data: reqData, method, url, baseURL } = axiosResponseObj.config;
-        const { data: rData, headers: rHs, status: globStatus, response } = axiosResponseObj;
-        const { data: resData, headers: resHs, status: resStatus } = response || {};
-        const ihOpt = opts.ignoreHeaders;
-        const isHIgnoring = Array.isArray(ihOpt) ? (name) => ihOpt.includes(name) : () => ihOpt;
-        function writeHeader(hsObj, header) {
-            if (!isHIgnoring(header[0])) {
-                hsObj[header[0]] = header[1];
+        return __awaiter(this, void 0, void 0, function* () {
+            app.debug.log('Openreplay: capturing axios response data', axiosResponseObj);
+            const { headers: reqHs, data: reqData, method, url } = axiosResponseObj.config;
+            const { data: rData, headers: rHs, status: globStatus, response } = axiosResponseObj;
+            const { data: resData, headers: resHs, status: resStatus } = response || {};
+            const ihOpt = opts.ignoreHeaders;
+            const isHIgnoring = Array.isArray(ihOpt) ? (name) => ihOpt.includes(name) : () => ihOpt;
+            function writeHeader(hsObj, header) {
+                if (!isHIgnoring(header[0])) {
+                    hsObj[header[0]] = header[1];
+                }
             }
-        }
-        let requestHs = {};
-        let responseHs = {};
-        if (reqHs.toJSON) {
-            requestHs = reqHs.toJSON();
-        }
-        else if (reqHs instanceof Headers) {
-            reqHs.forEach((v, n) => writeHeader(requestHs, [n, v]));
-        }
-        else if (Array.isArray(reqHs)) {
-            reqHs.forEach((h) => writeHeader(requestHs, h));
-        }
-        else if (typeof reqHs === 'object') {
-            Object.entries(reqHs).forEach((h) => writeHeader(requestHs, h));
-        }
-        const usedResHeader = resHs ? resHs : rHs;
-        if (usedResHeader.toJSON) {
-            responseHs = usedResHeader.toJSON();
-        }
-        else if (usedResHeader instanceof Headers) {
-            usedResHeader.forEach((v, n) => writeHeader(responseHs, [n, v]));
-        }
-        else if (Array.isArray(usedResHeader)) {
-            usedResHeader.forEach((h) => writeHeader(responseHs, h));
-        }
-        else if (typeof usedResHeader === 'object') {
-            Object.entries(usedResHeader).forEach(([n, v]) => {
-                if (!isHIgnoring(n))
-                    responseHs[n] = v;
+            let requestHs = {};
+            let responseHs = {};
+            if (reqHs.toJSON) {
+                requestHs = reqHs.toJSON();
+            }
+            else if (reqHs instanceof Headers) {
+                reqHs.forEach((v, n) => writeHeader(requestHs, [n, v]));
+            }
+            else if (Array.isArray(reqHs)) {
+                reqHs.forEach((h) => writeHeader(requestHs, h));
+            }
+            else if (typeof reqHs === 'object') {
+                Object.entries(reqHs).forEach((h) => writeHeader(requestHs, h));
+            }
+            const usedResHeader = resHs ? resHs : rHs;
+            if (usedResHeader.toJSON) {
+                responseHs = usedResHeader.toJSON();
+            }
+            else if (usedResHeader instanceof Headers) {
+                usedResHeader.forEach((v, n) => writeHeader(responseHs, [n, v]));
+            }
+            else if (Array.isArray(usedResHeader)) {
+                usedResHeader.forEach((h) => writeHeader(responseHs, h));
+            }
+            else if (typeof usedResHeader === 'object') {
+                Object.entries(usedResHeader).forEach(([n, v]) => {
+                    if (!isHIgnoring(n))
+                        responseHs[n] = v;
+                });
+            }
+            const reqResInfo = sanitize({
+                url,
+                method: method || '',
+                status: globStatus || resStatus || 0,
+                request: {
+                    headers: requestHs,
+                    body: reqData,
+                },
+                response: {
+                    headers: responseHs,
+                    body: resData || rData,
+                },
             });
-        }
-        const reqResInfo = sanitize({
-            url,
-            method: method || '',
-            status: globStatus || resStatus || 0,
-            request: {
-                headers: requestHs,
-                body: reqData,
-            },
-            response: {
-                headers: responseHs,
-                body: resData || rData,
-            },
+            if (!reqResInfo) {
+                app.debug.log('Openreplay: empty request/response info, skipping');
+                return;
+            }
+            const requestStart = axiosResponseObj.config.__openreplay_timing;
+            const duration = performance.now() - requestStart;
+            console.log(reqResInfo, 'finally');
+            app.send((0, messages_gen_js_1.NetworkRequest)('xhr', String(method), String(reqResInfo.url), stringify(reqResInfo.request), stringify(reqResInfo.response), reqResInfo.status, requestStart + (0, utils_js_1.getTimeOrigin)(), duration));
         });
-        if (!reqResInfo) {
-            app.debug.log('Openreplay: empty request/response info, skipping');
-            return;
-        }
-        const requestStart = axiosResponseObj.config.__openreplay_timing;
-        const duration = performance.now() - requestStart;
-        console.log(reqResInfo, 'finally');
-        app.send((0, messages_gen_js_1.NetworkRequest)('xhr', String(method), String(reqResInfo.url), stringify(reqResInfo.request), stringify(reqResInfo.response), reqResInfo.status, requestStart + (0, utils_js_1.getTimeOrigin)(), duration));
     }
     function getStartTime(config) {
         app.debug.log('Openreplay: capturing API request', config);
@@ -86,13 +98,13 @@ function default_1(app, instance, opts, sanitize, stringify) {
     function captureNetworkRequest(response) {
         if (opts.failuresOnly)
             return response;
-        captureResponseData(response);
+        void captureResponseData(response);
         return response;
     }
     function captureNetworkError(error) {
         app.debug.log('Openreplay: capturing API request error', error);
         if (isAxiosError(error)) {
-            captureResponseData(error.response);
+            void captureResponseData(error.response);
         }
         else if (error instanceof Error) {
             app.send((0, exception_js_1.getExceptionMessage)(error, []));
@@ -102,17 +114,8 @@ function default_1(app, instance, opts, sanitize, stringify) {
     function logRequestError(ev) {
         app.debug.log('Openreplay: failed API request, skipping', ev);
     }
-    const reqInt = instance.interceptors.request.use(getStartTime, logRequestError, {
-        synchronous: true,
-    });
-    const resInt = instance.interceptors.response.use(captureNetworkRequest, captureNetworkError, {
-        synchronous: true,
-    });
-    app.attachStopCallback(() => {
-        var _a, _b, _c, _d;
-        (_b = (_a = instance.interceptors.request).eject) === null || _b === void 0 ? void 0 : _b.call(_a, reqInt);
-        (_d = (_c = instance.interceptors.response).eject) === null || _d === void 0 ? void 0 : _d.call(_c, resInt);
-    });
+    instance.interceptors.request.use(getStartTime, logRequestError);
+    instance.interceptors.response.use(captureNetworkRequest, captureNetworkError);
 }
 exports.default = default_1;
 function isAxiosError(payload) {

package/cjs/modules/network.js

@@ -165,7 +165,9 @@ function default_1(app, opts = {}) {
             });
             xhr.addEventListener('load', app.safe((e) => {
                 const { headers: reqHs, body: reqBody } = getXHRRequestDataObject(xhr);
-                app.debug.log('Openreplay: XHR load ', reqHs, reqBody, xhr, xhr.getAllResponseHeaders());
+                app.debug.log('Openreplay: XHR load', xhr, xhr.getAllResponseHeaders(), getXHRRequestDataObject(xhr));
+                if (!xhr.getAllResponseHeaders())
+                    app.debug.warn('Openreplay: XHR no response headers returned');
                 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
@@ -202,12 +204,10 @@ function default_1(app, opts = {}) {
         XMLHttpRequest.prototype.send = function (body) {
             const rdo = getXHRRequestDataObject(this);
             rdo.body = body;
-            app.debug.log('Openreplay: ', 'XHR send', rdo, 'XHR Object', this);
             return nativeSend.apply(this, arguments);
         };
         const nativeSetRequestHeader = XMLHttpRequest.prototype.setRequestHeader;
         XMLHttpRequest.prototype.setRequestHeader = function (name, value) {
-            app.debug.log('Openreplay: ', name, value, isHIgnored(name), getXHRRequestDataObject(this));
             if (!isHIgnored(name)) {
                 const rdo = getXHRRequestDataObject(this);
                 rdo.headers[name] = value;

package/lib/app/index.js

@@ -30,7 +30,7 @@ export default class App {
         this.stopCallbacks = [];
         this.commitCallbacks = [];
         this.activityState = ActivityState.NotActive;
-        this.version = '5.0.5-beta.3'; // TODO: version compatability check inside each plugin.
+        this.version = '5.0.5-beta.7'; // TODO: version compatability check inside each plugin.
         this._usingOldFetchPlugin = false;
         this.delay = 0;
         this.projectKey = projectKey;

package/lib/index.js

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

package/lib/modules/axiosSpy.js

@@ -1,71 +1,83 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import { NetworkRequest } from '../app/messages.gen.js';
 import { getTimeOrigin } from '../utils.js';
 import { getExceptionMessage } from './exception.js';
 export default function (app, instance, opts, sanitize, stringify) {
     app.debug.log('Openreplay: attaching axios spy to instance', instance);
+    // eslint-disable-next-line @typescript-eslint/require-await
     function captureResponseData(axiosResponseObj) {
-        app.debug.log('Openreplay: capturing axios response data', axiosResponseObj);
-        const { headers: reqHs, data: reqData, method, url, baseURL } = axiosResponseObj.config;
-        const { data: rData, headers: rHs, status: globStatus, response } = axiosResponseObj;
-        const { data: resData, headers: resHs, status: resStatus } = response || {};
-        const ihOpt = opts.ignoreHeaders;
-        const isHIgnoring = Array.isArray(ihOpt) ? (name) => ihOpt.includes(name) : () => ihOpt;
-        function writeHeader(hsObj, header) {
-            if (!isHIgnoring(header[0])) {
-                hsObj[header[0]] = header[1];
+        return __awaiter(this, void 0, void 0, function* () {
+            app.debug.log('Openreplay: capturing axios response data', axiosResponseObj);
+            const { headers: reqHs, data: reqData, method, url } = axiosResponseObj.config;
+            const { data: rData, headers: rHs, status: globStatus, response } = axiosResponseObj;
+            const { data: resData, headers: resHs, status: resStatus } = response || {};
+            const ihOpt = opts.ignoreHeaders;
+            const isHIgnoring = Array.isArray(ihOpt) ? (name) => ihOpt.includes(name) : () => ihOpt;
+            function writeHeader(hsObj, header) {
+                if (!isHIgnoring(header[0])) {
+                    hsObj[header[0]] = header[1];
+                }
             }
-        }
-        let requestHs = {};
-        let responseHs = {};
-        if (reqHs.toJSON) {
-            requestHs = reqHs.toJSON();
-        }
-        else if (reqHs instanceof Headers) {
-            reqHs.forEach((v, n) => writeHeader(requestHs, [n, v]));
-        }
-        else if (Array.isArray(reqHs)) {
-            reqHs.forEach((h) => writeHeader(requestHs, h));
-        }
-        else if (typeof reqHs === 'object') {
-            Object.entries(reqHs).forEach((h) => writeHeader(requestHs, h));
-        }
-        const usedResHeader = resHs ? resHs : rHs;
-        if (usedResHeader.toJSON) {
-            responseHs = usedResHeader.toJSON();
-        }
-        else if (usedResHeader instanceof Headers) {
-            usedResHeader.forEach((v, n) => writeHeader(responseHs, [n, v]));
-        }
-        else if (Array.isArray(usedResHeader)) {
-            usedResHeader.forEach((h) => writeHeader(responseHs, h));
-        }
-        else if (typeof usedResHeader === 'object') {
-            Object.entries(usedResHeader).forEach(([n, v]) => {
-                if (!isHIgnoring(n))
-                    responseHs[n] = v;
+            let requestHs = {};
+            let responseHs = {};
+            if (reqHs.toJSON) {
+                requestHs = reqHs.toJSON();
+            }
+            else if (reqHs instanceof Headers) {
+                reqHs.forEach((v, n) => writeHeader(requestHs, [n, v]));
+            }
+            else if (Array.isArray(reqHs)) {
+                reqHs.forEach((h) => writeHeader(requestHs, h));
+            }
+            else if (typeof reqHs === 'object') {
+                Object.entries(reqHs).forEach((h) => writeHeader(requestHs, h));
+            }
+            const usedResHeader = resHs ? resHs : rHs;
+            if (usedResHeader.toJSON) {
+                responseHs = usedResHeader.toJSON();
+            }
+            else if (usedResHeader instanceof Headers) {
+                usedResHeader.forEach((v, n) => writeHeader(responseHs, [n, v]));
+            }
+            else if (Array.isArray(usedResHeader)) {
+                usedResHeader.forEach((h) => writeHeader(responseHs, h));
+            }
+            else if (typeof usedResHeader === 'object') {
+                Object.entries(usedResHeader).forEach(([n, v]) => {
+                    if (!isHIgnoring(n))
+                        responseHs[n] = v;
+                });
+            }
+            const reqResInfo = sanitize({
+                url,
+                method: method || '',
+                status: globStatus || resStatus || 0,
+                request: {
+                    headers: requestHs,
+                    body: reqData,
+                },
+                response: {
+                    headers: responseHs,
+                    body: resData || rData,
+                },
             });
-        }
-        const reqResInfo = sanitize({
-            url,
-            method: method || '',
-            status: globStatus || resStatus || 0,
-            request: {
-                headers: requestHs,
-                body: reqData,
-            },
-            response: {
-                headers: responseHs,
-                body: resData || rData,
-            },
+            if (!reqResInfo) {
+                app.debug.log('Openreplay: empty request/response info, skipping');
+                return;
+            }
+            const requestStart = axiosResponseObj.config.__openreplay_timing;
+            const duration = performance.now() - requestStart;
+            console.log(reqResInfo, 'finally');
+            app.send(NetworkRequest('xhr', String(method), String(reqResInfo.url), stringify(reqResInfo.request), stringify(reqResInfo.response), reqResInfo.status, requestStart + getTimeOrigin(), duration));
         });
-        if (!reqResInfo) {
-            app.debug.log('Openreplay: empty request/response info, skipping');
-            return;
-        }
-        const requestStart = axiosResponseObj.config.__openreplay_timing;
-        const duration = performance.now() - requestStart;
-        console.log(reqResInfo, 'finally');
-        app.send(NetworkRequest('xhr', String(method), String(reqResInfo.url), stringify(reqResInfo.request), stringify(reqResInfo.response), reqResInfo.status, requestStart + getTimeOrigin(), duration));
     }
     function getStartTime(config) {
         app.debug.log('Openreplay: capturing API request', config);
@@ -84,13 +96,13 @@ export default function (app, instance, opts, sanitize, stringify) {
     function captureNetworkRequest(response) {
         if (opts.failuresOnly)
             return response;
-        captureResponseData(response);
+        void captureResponseData(response);
         return response;
     }
     function captureNetworkError(error) {
         app.debug.log('Openreplay: capturing API request error', error);
         if (isAxiosError(error)) {
-            captureResponseData(error.response);
+            void captureResponseData(error.response);
         }
         else if (error instanceof Error) {
             app.send(getExceptionMessage(error, []));
@@ -100,17 +112,8 @@ export default function (app, instance, opts, sanitize, stringify) {
     function logRequestError(ev) {
         app.debug.log('Openreplay: failed API request, skipping', ev);
     }
-    const reqInt = instance.interceptors.request.use(getStartTime, logRequestError, {
-        synchronous: true,
-    });
-    const resInt = instance.interceptors.response.use(captureNetworkRequest, captureNetworkError, {
-        synchronous: true,
-    });
-    app.attachStopCallback(() => {
-        var _a, _b, _c, _d;
-        (_b = (_a = instance.interceptors.request).eject) === null || _b === void 0 ? void 0 : _b.call(_a, reqInt);
-        (_d = (_c = instance.interceptors.response).eject) === null || _d === void 0 ? void 0 : _d.call(_c, resInt);
-    });
+    instance.interceptors.request.use(getStartTime, logRequestError);
+    instance.interceptors.response.use(captureNetworkRequest, captureNetworkError);
 }
 function isAxiosError(payload) {
     return isObject(payload) && payload.isAxiosError === true;

package/lib/modules/network.js

@@ -163,7 +163,9 @@ export default function (app, opts = {}) {
             });
             xhr.addEventListener('load', app.safe((e) => {
                 const { headers: reqHs, body: reqBody } = getXHRRequestDataObject(xhr);
-                app.debug.log('Openreplay: XHR load ', reqHs, reqBody, xhr, xhr.getAllResponseHeaders());
+                app.debug.log('Openreplay: XHR load', xhr, xhr.getAllResponseHeaders(), getXHRRequestDataObject(xhr));
+                if (!xhr.getAllResponseHeaders())
+                    app.debug.warn('Openreplay: XHR no response headers returned');
                 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
@@ -200,12 +202,10 @@ export default function (app, opts = {}) {
         XMLHttpRequest.prototype.send = function (body) {
             const rdo = getXHRRequestDataObject(this);
             rdo.body = body;
-            app.debug.log('Openreplay: ', 'XHR send', rdo, 'XHR Object', this);
             return nativeSend.apply(this, arguments);
         };
         const nativeSetRequestHeader = XMLHttpRequest.prototype.setRequestHeader;
         XMLHttpRequest.prototype.setRequestHeader = function (name, value) {
-            app.debug.log('Openreplay: ', name, value, isHIgnored(name), getXHRRequestDataObject(this));
             if (!isHIgnored(name)) {
                 const rdo = getXHRRequestDataObject(this);
                 rdo.headers[name] = value;

package/package.json

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