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

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

package/cjs/modules/network.js

@@ -165,18 +165,29 @@ function default_1(app, opts = {}) {
             });
             xhr.addEventListener('load', app.safe((e) => {
                 const { headers: reqHs, body: reqBody } = getXHRRequestDataObject(xhr);
-                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
-                    ? 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 hString = xhr.getAllResponseHeaders(); // might be null (though only if no response received though)
+                const headersArr = hString.trim().split(/[\r\n]+/);
+                const headerMap = {};
+                headersArr.forEach(function (line) {
+                    const parts = line.split(': ');
+                    const header = parts.shift();
+                    if (!isHIgnored(header)) {
+                        headerMap[header] = parts.join(': ');
+                    }
+                });
+                // const resHs = hString
+                //   ? hString
+                //       .split('\r\n')
+                //       .map((h) => h.split(':'))
+                //       .filter((entry) => !isHIgnored(entry[0]))
+                //       .reduce(
+                //         (hds, [name, value]) => ({ ...hds, [name]: value }),
+                //         {} as Record<string, string>,
+                //       )
+                //   : {}
                 const method = strMethod(initMethod);
                 const reqResInfo = sanitize({
                     url: String(url),
@@ -187,13 +198,19 @@ function default_1(app, opts = {}) {
                         body: reqBody,
                     },
                     response: {
-                        headers: resHs,
+                        headers: headerMap,
                         body: xhr.response,
                     },
                 });
                 if (!reqResInfo) {
                     return;
                 }
+                app.debug.log('Openreplay: XHR load', reqResInfo.url, {
+                    instance: xhr,
+                    headers: xhr.getAllResponseHeaders(),
+                    requestData: getXHRRequestDataObject(xhr),
+                    result: (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),
+                }, headerMap);
                 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)

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

package/lib/modules/network.js

@@ -163,18 +163,29 @@ export default function (app, opts = {}) {
             });
             xhr.addEventListener('load', app.safe((e) => {
                 const { headers: reqHs, body: reqBody } = getXHRRequestDataObject(xhr);
-                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
-                    ? 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 hString = xhr.getAllResponseHeaders(); // might be null (though only if no response received though)
+                const headersArr = hString.trim().split(/[\r\n]+/);
+                const headerMap = {};
+                headersArr.forEach(function (line) {
+                    const parts = line.split(': ');
+                    const header = parts.shift();
+                    if (!isHIgnored(header)) {
+                        headerMap[header] = parts.join(': ');
+                    }
+                });
+                // const resHs = hString
+                //   ? hString
+                //       .split('\r\n')
+                //       .map((h) => h.split(':'))
+                //       .filter((entry) => !isHIgnored(entry[0]))
+                //       .reduce(
+                //         (hds, [name, value]) => ({ ...hds, [name]: value }),
+                //         {} as Record<string, string>,
+                //       )
+                //   : {}
                 const method = strMethod(initMethod);
                 const reqResInfo = sanitize({
                     url: String(url),
@@ -185,13 +196,19 @@ export default function (app, opts = {}) {
                         body: reqBody,
                     },
                     response: {
-                        headers: resHs,
+                        headers: headerMap,
                         body: xhr.response,
                     },
                 });
                 if (!reqResInfo) {
                     return;
                 }
+                app.debug.log('Openreplay: XHR load', reqResInfo.url, {
+                    instance: xhr,
+                    headers: xhr.getAllResponseHeaders(),
+                    requestData: getXHRRequestDataObject(xhr),
+                    result: NetworkRequest('xhr', method, String(reqResInfo.url), stringify(reqResInfo.request), stringify(reqResInfo.response), xhr.status, startTime + getTimeOrigin(), duration),
+                }, headerMap);
                 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)

package/package.json

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