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

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.2'; // TODO: version compatability check inside each plugin.
+        this.version = '5.0.5-beta.3'; // 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.2',
+                trackerVersion: '5.0.5-beta.3',
                 projectKey: options.projectKey,
                 doNotTrack,
                 // TODO: add precise reason (an exact API missing)

package/cjs/modules/axiosSpy.d.ts

@@ -33,6 +33,7 @@ interface AxiosResponse<T = any> {
     response?: AxiosRequestConfig;
 }
 export interface AxiosInstance extends Record<string, any> {
+    getUri: (config?: AxiosRequestConfig) => string;
     interceptors: {
         request: AxiosInterceptorManager<InternalAxiosRequestConfig>;
         response: AxiosInterceptorManager<AxiosResponse>;

package/cjs/modules/axiosSpy.js

@@ -2,22 +2,61 @@
 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);
     function captureResponseData(axiosResponseObj) {
-        const { headers: reqHs, data: reqData, method, url } = axiosResponseObj.config;
+        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];
+            }
+        }
+        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: reqHs.toJSON(),
+                headers: requestHs,
                 body: reqData,
             },
             response: {
-                headers: (resHs === null || resHs === void 0 ? void 0 : resHs.toJSON()) || rHs.toJSON(),
+                headers: responseHs,
                 body: resData || rData,
             },
         });
@@ -27,6 +66,7 @@ function default_1(app, instance, opts, sanitize, stringify) {
         }
         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) {
@@ -50,7 +90,13 @@ function default_1(app, instance, opts, sanitize, stringify) {
         return response;
     }
     function captureNetworkError(error) {
-        captureResponseData(error);
+        app.debug.log('Openreplay: capturing API request error', error);
+        if (isAxiosError(error)) {
+            captureResponseData(error.response);
+        }
+        else if (error instanceof Error) {
+            app.send((0, exception_js_1.getExceptionMessage)(error, []));
+        }
         return Promise.reject(error);
     }
     function logRequestError(ev) {
@@ -69,3 +115,9 @@ function default_1(app, instance, opts, sanitize, stringify) {
     });
 }
 exports.default = default_1;
+function isAxiosError(payload) {
+    return isObject(payload) && payload.isAxiosError === true;
+}
+function isObject(thing) {
+    return thing !== null && typeof thing === 'object';
+}

package/cjs/modules/network.js

@@ -165,6 +165,7 @@ 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());
                 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
@@ -201,10 +202,12 @@ 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/cjs/utils.d.ts

@@ -11,3 +11,4 @@ export declare const DOCS_HOST = "https://docs.openreplay.com";
 export declare function deprecationWarn(nameOfFeature: string, useInstead: string, docsPath?: string): void;
 export declare function getLabelAttribute(e: Element): string | null;
 export declare function hasOpenreplayAttribute(e: Element, attr: string): boolean;
+export declare function buildFullUrl(baseURL: string | undefined, requestedURL: string): string;

package/cjs/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasOpenreplayAttribute = exports.getLabelAttribute = exports.deprecationWarn = exports.DOCS_HOST = exports.isURL = exports.normSpaces = exports.stars = exports.now = exports.getTimeOrigin = exports.adjustTimeOrigin = exports.MAX_STR_LEN = exports.IS_FIREFOX = exports.IN_BROWSER = void 0;
+exports.buildFullUrl = exports.hasOpenreplayAttribute = exports.getLabelAttribute = exports.deprecationWarn = exports.DOCS_HOST = exports.isURL = exports.normSpaces = exports.stars = exports.now = exports.getTimeOrigin = exports.adjustTimeOrigin = exports.MAX_STR_LEN = exports.IS_FIREFOX = exports.IN_BROWSER = void 0;
 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);
@@ -69,3 +69,23 @@ function hasOpenreplayAttribute(e, attr) {
     return false;
 }
 exports.hasOpenreplayAttribute = hasOpenreplayAttribute;
+// Copied from axios library because these functions haven't been exported.
+// Why can't axios put constructed fullURL into the config object or in an additional meta information?
+// TODO: axios feature request
+function isAbsoluteURL(url) {
+    // A URL is considered absolute if it begins with "<scheme>://" or "//" (protocol-relative URL).
+    // RFC 3986 defines scheme name as a sequence of characters beginning with a letter and followed
+    // by any combination of letters, digits, plus, period, or hyphen.
+    // eslint-disable-next-line no-useless-escape
+    return /^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(url);
+}
+function combineURLs(baseURL, relativeURL) {
+    return relativeURL ? baseURL.replace(/\/+$/, '') + '/' + relativeURL.replace(/^\/+/, '') : baseURL;
+}
+function buildFullUrl(baseURL, requestedURL) {
+    if (baseURL && !isAbsoluteURL(requestedURL)) {
+        return combineURLs(baseURL, requestedURL);
+    }
+    return requestedURL;
+}
+exports.buildFullUrl = buildFullUrl;

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.2'; // TODO: version compatability check inside each plugin.
+        this.version = '5.0.5-beta.3'; // 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.2',
+                trackerVersion: '5.0.5-beta.3',
                 projectKey: options.projectKey,
                 doNotTrack,
                 // TODO: add precise reason (an exact API missing)

package/lib/modules/axiosSpy.d.ts

@@ -33,6 +33,7 @@ interface AxiosResponse<T = any> {
     response?: AxiosRequestConfig;
 }
 export interface AxiosInstance extends Record<string, any> {
+    getUri: (config?: AxiosRequestConfig) => string;
     interceptors: {
         request: AxiosInterceptorManager<InternalAxiosRequestConfig>;
         response: AxiosInterceptorManager<AxiosResponse>;

package/lib/modules/axiosSpy.js

@@ -1,21 +1,60 @@
 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);
     function captureResponseData(axiosResponseObj) {
-        const { headers: reqHs, data: reqData, method, url } = axiosResponseObj.config;
+        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];
+            }
+        }
+        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: reqHs.toJSON(),
+                headers: requestHs,
                 body: reqData,
             },
             response: {
-                headers: (resHs === null || resHs === void 0 ? void 0 : resHs.toJSON()) || rHs.toJSON(),
+                headers: responseHs,
                 body: resData || rData,
             },
         });
@@ -25,6 +64,7 @@ export default function (app, instance, opts, sanitize, stringify) {
         }
         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) {
@@ -48,7 +88,13 @@ export default function (app, instance, opts, sanitize, stringify) {
         return response;
     }
     function captureNetworkError(error) {
-        captureResponseData(error);
+        app.debug.log('Openreplay: capturing API request error', error);
+        if (isAxiosError(error)) {
+            captureResponseData(error.response);
+        }
+        else if (error instanceof Error) {
+            app.send(getExceptionMessage(error, []));
+        }
         return Promise.reject(error);
     }
     function logRequestError(ev) {
@@ -66,3 +112,9 @@ export default function (app, instance, opts, sanitize, stringify) {
         (_d = (_c = instance.interceptors.response).eject) === null || _d === void 0 ? void 0 : _d.call(_c, resInt);
     });
 }
+function isAxiosError(payload) {
+    return isObject(payload) && payload.isAxiosError === true;
+}
+function isObject(thing) {
+    return thing !== null && typeof thing === 'object';
+}

package/lib/modules/network.js

@@ -163,6 +163,7 @@ 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());
                 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
@@ -199,10 +200,12 @@ 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/lib/utils.d.ts

@@ -11,3 +11,4 @@ export declare const DOCS_HOST = "https://docs.openreplay.com";
 export declare function deprecationWarn(nameOfFeature: string, useInstead: string, docsPath?: string): void;
 export declare function getLabelAttribute(e: Element): string | null;
 export declare function hasOpenreplayAttribute(e: Element, attr: string): boolean;
+export declare function buildFullUrl(baseURL: string | undefined, requestedURL: string): string;

package/lib/utils.js

@@ -59,3 +59,22 @@ export function hasOpenreplayAttribute(e, attr) {
     }
     return false;
 }
+// Copied from axios library because these functions haven't been exported.
+// Why can't axios put constructed fullURL into the config object or in an additional meta information?
+// TODO: axios feature request
+function isAbsoluteURL(url) {
+    // A URL is considered absolute if it begins with "<scheme>://" or "//" (protocol-relative URL).
+    // RFC 3986 defines scheme name as a sequence of characters beginning with a letter and followed
+    // by any combination of letters, digits, plus, period, or hyphen.
+    // eslint-disable-next-line no-useless-escape
+    return /^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(url);
+}
+function combineURLs(baseURL, relativeURL) {
+    return relativeURL ? baseURL.replace(/\/+$/, '') + '/' + relativeURL.replace(/^\/+/, '') : baseURL;
+}
+export function buildFullUrl(baseURL, requestedURL) {
+    if (baseURL && !isAbsoluteURL(requestedURL)) {
+        return combineURLs(baseURL, requestedURL);
+    }
+    return requestedURL;
+}

package/package.json

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