noibu-react-native 0.2.6 → 0.2.7

package/dist/monitors/RequestMonitor.js

@@ -1,10 +1,9 @@
 import { __awaiter } from 'tslib';
-import 'react-native/Libraries/Network/fetch';
 import { saveErrorToPagevisit } from '../pageVisit/pageVisitEventError.js';
-import { isHttpCodeFailure, PageVisitEventHTTP } from '../pageVisit/pageVisitEventHTTP.js';
+import { isHttpCodeFailure, saveHTTPEvent } from '../pageVisit/HttpEventManager.js';
 import { safeEntries, propWriteableOrMadeWriteable, replace } from '../utils/object.js';
-import { BODY_USED_ERROR, HTTP_RESP_LENGTH_ATT_NAME, SEVERITY, PV_SEQ_ATT_NAME, RESPONSE_ERROR_TYPE, GQL_ERROR_TYPE, XML_HTTP_REQUEST_ERROR_TYPE, FETCH_EXCEPTION_ERROR_TYPE, HTTP_METHOD_ATT_NAME, HTTP_RESP_CODE_ATT_NAME, URL_ATT_NAME, HTTP_RESP_TIME_ATT_NAME } from '../constants.js';
-import ClientConfig from '../api/clientConfig.js';
+import { SEVERITY } from '../constants.js';
+import ClientConfig from '../api/ClientConfig.js';
 import { noibuLog } from '../utils/log.js';
 import { tryGetStackTrace, safeTrim } from '../utils/function.js';
 import { promiseAll } from '../utils/polyfills.js';
@@ -12,10 +11,12 @@ import { addSafeEventListener } from '../utils/eventlistener.js';
 import { HTTPDataBundler } from './http-tools/HTTPDataBundler.js';
 import GqlErrorValidator from './http-tools/GqlErrorValidator.js';
 import { Singleton } from './BaseMonitor.js';
+import '../node_modules/@noibu/metroplex-ts-bindings/dist/index.js';
+import { PageVisitErrorSource } from '../node_modules/@noibu/metroplex-ts-bindings/dist/PageVisitErrorSource.js';
 
-/**
- * Monitors all requests
- */
+/** request monitor */
+const BODY_USED_ERROR = 'Response data unavailable due to an improperly wrapped fetch call';
+/** Monitors all requests */
 class RequestMonitor extends Singleton {
     /** main method */
     monitor() {
@@ -42,27 +43,23 @@ class RequestMonitor extends Singleton {
             return response.text();
         });
     }
-    /**
-     * Generates new PVEventHTTP
-     */
+    /** Generates new PVEventHTTP */
     static getPvEventHttp(status, responseHeaders, method, url, responseTime) {
         const httpEvent = {
-            [HTTP_METHOD_ATT_NAME]: method,
-            [HTTP_RESP_CODE_ATT_NAME]: status,
-            [URL_ATT_NAME]: url,
-            [HTTP_RESP_TIME_ATT_NAME]: responseTime,
+            mtd: method,
+            code: status,
+            url,
+            r_time: responseTime,
         };
         const bundler = HTTPDataBundler.getInstance();
         // add response payload length, if any
         const contentLength = bundler.contentLength(responseHeaders);
         if (contentLength > 0 && bundler.shouldContinueForURL(url)) {
-            httpEvent[HTTP_RESP_LENGTH_ATT_NAME] = contentLength;
+            httpEvent.resp_len = contentLength;
         }
         return httpEvent;
     }
-    /**
-     * Gets headers from request or request options. Handles different scenarios where simple conversion is not possible
-     */
+    /** Gets headers from request or request options. Handles different scenarios where simple conversion is not possible */
     static getRequestHeaders(request, options) {
         const headers = safeEntries((request === null || request === void 0 ? void 0 : request.headers) || (options === null || options === void 0 ? void 0 : options.headers));
         return HTTPDataBundler.headersMapFromIterable(headers);
@@ -75,9 +72,7 @@ class RequestMonitor extends Singleton {
         const headers = safeEntries(response === null || response === void 0 ? void 0 : response.headers);
         return HTTPDataBundler.headersMapFromIterable(headers);
     }
-    /**
-     * Gets request body from body strings or Request options
-     */
+    /** Gets request body from body strings or Request options */
     static getRequestBody(requestText, options) {
         if (typeof requestText === 'string') {
             return requestText;
@@ -85,9 +80,7 @@ class RequestMonitor extends Singleton {
         // it's fine if it's falsy or an empty string, we catch that in HTTPDataBundler.getInstance().bundleHTTPData
         return options === null || options === void 0 ? void 0 : options.body;
     }
-    /**
-     * Returns the parameters to pass the PageVisitEventHTTP constructor. Specific to the fetch wrapper.
-     */
+    /** Returns the parameters to pass the HttpEventManager constructor. Specific to the fetch wrapper. */
     static getHttpDataFromFetch(request, response, method, url, options, isError, requestText, responseText) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!HTTPDataBundler.getInstance().shouldContinueForURL(url)) {
@@ -103,17 +96,15 @@ class RequestMonitor extends Singleton {
         }
         return ogResponse; // body consumed already, no http response body for us
     }
-    /**
-     * Handles fetch response safely. Reports PageVisitEventHTTP and error to Pagevisit if needed.
-     */
+    /** Handles fetch response safely. Reports HttpEventManager and error to Pagevisit if needed. */
     static safeHandleFetchResponse(startTime, url, method, options, request) {
         return (ogResponse) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a;
             try {
                 if (!ogResponse) {
                     // no idea how, but this happens sometimes, esp if other libs override fetch
                     // logging to track the issue if it becomes widespread
-                    return ClientConfig.getInstance().postNoibuErrorAndOptionallyDisableClient(`Error in custom fetch() callback: no response received`, false, SEVERITY.error);
+                    return ClientConfig.getInstance().postInternalError({ msg: 'No response object in fetch callback', url, method, options, request }, false, SEVERITY.error);
                 }
                 const clonedResponse = RequestMonitor.cloneResponse(ogResponse); // have to do it as early as possible
                 const graphqlResponse = RequestMonitor.cloneResponse(clonedResponse); // and two times more for each consumption
@@ -129,15 +120,17 @@ class RequestMonitor extends Singleton {
                 ]);
                 const httpEvent = RequestMonitor.getPvEventHttp(status, headers, method, url, respTime);
                 const httpData = yield RequestMonitor.getHttpDataFromFetch(request, httpEventDataResponse, method, url, options, isHttpError || !!gqlError, maybeRequestText, responseText);
-                const pageVisitEventHTTP = new PageVisitEventHTTP(httpEvent, httpData, !!gqlError);
-                pageVisitEventHTTP.saveHTTPEvent();
-                const seq = (_b = pageVisitEventHTTP.httpData) === null || _b === void 0 ? void 0 : _b[PV_SEQ_ATT_NAME];
+                const seq = saveHTTPEvent(httpEvent, httpData, !!gqlError);
                 if (isHttpError) {
                     // this does not consume response body so no need to clone it
-                    saveErrorToPagevisit(RESPONSE_ERROR_TYPE, clonedResponse, seq);
+                    saveErrorToPagevisit(Object.assign(Object.assign({}, clonedResponse), { type: PageVisitErrorSource.Response }), seq);
                 }
                 if (gqlError) {
-                    gqlError.forEach(error => saveErrorToPagevisit(GQL_ERROR_TYPE, error, seq));
+                    gqlError.forEach(error => saveErrorToPagevisit({
+                        url: ClientConfig.getInstance().globalUrl,
+                        gql_err: error,
+                        type: PageVisitErrorSource.Response,
+                    }, seq));
                 }
             }
             catch (e) {
@@ -146,13 +139,11 @@ class RequestMonitor extends Singleton {
                     return;
                 }
                 const stack = tryGetStackTrace(e);
-                ClientConfig.getInstance().postNoibuErrorAndOptionallyDisableClient(`Error in custom fetch() callback: ${e}${stack}`, false, SEVERITY.error);
+                ClientConfig.getInstance().postInternalError({ msg: `Error in custom fetch() callback`, error: e, stack }, false, SEVERITY.error);
             }
         });
     }
-    /**
-     * Safe function to get method and url from fetch args
-     */
+    /** Safe function to get method and url from fetch args */
     static getMethodUrlFromFetchArgs(resource, options) {
         const defaultResource = { method: 'GET', url: '' };
         try {
@@ -170,7 +161,7 @@ class RequestMonitor extends Singleton {
             };
         }
         catch (e) {
-            ClientConfig.getInstance().postNoibuErrorAndOptionallyDisableClient(`Error in fetch() wrapper: ${e}`, false, SEVERITY.error);
+            ClientConfig.getInstance().postInternalError({ msg: `Error in fetch() wrapper`, error: e }, false, SEVERITY.error);
         }
         return defaultResource;
     }
@@ -206,9 +197,7 @@ class RequestMonitor extends Singleton {
             };
         });
     }
-    /**
-     * Does a check if data collection is enabled and combines it into HttpDataBundle
-     */
+    /** Does a check if data collection is enabled and combines it into HttpDataBundle */
     static getHttpDataFromXhr(xhrObj_1, method_1, url_1, isError_1) {
         return __awaiter(this, arguments, void 0, function* (xhrObj, method, url, isError, requestPayload = null, responseText) {
             if (!HTTPDataBundler.getInstance().shouldContinueForURL(url)) {
@@ -224,28 +213,27 @@ class RequestMonitor extends Singleton {
      */
     static loadendHandler(xhr, startTime, url, method, requestPayload) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
             const respTime = Date.now() - startTime;
             const gqlError = yield GqlErrorValidator.fromXhr(url, xhr);
             const httpError = isHttpCodeFailure(xhr.status);
             const responseText = yield HTTPDataBundler.getResponseStringFromXHR(xhr);
             const httpEvent = RequestMonitor.getPvEventHttp(xhr.status, HTTPDataBundler.headersMapFromString(xhr.getAllResponseHeaders()), method, url, respTime);
             const httpData = yield RequestMonitor.getHttpDataFromXhr(xhr, method, url, httpError || !!gqlError, requestPayload, responseText);
-            const pageVisitEventHTTP = new PageVisitEventHTTP(httpEvent, httpData, !!gqlError);
             // Save HTTP Info
-            pageVisitEventHTTP.saveHTTPEvent();
-            const seq = (_a = pageVisitEventHTTP.httpData) === null || _a === void 0 ? void 0 : _a[PV_SEQ_ATT_NAME];
+            const seq = saveHTTPEvent(httpEvent, httpData, !!gqlError);
             if (httpError) {
-                saveErrorToPagevisit(XML_HTTP_REQUEST_ERROR_TYPE, xhr, seq);
+                saveErrorToPagevisit({ url: xhr.responseURL, status: xhr.status, type: PageVisitErrorSource.XMLHttpRequest }, seq);
             }
             if (gqlError) {
-                gqlError.forEach(error => saveErrorToPagevisit(GQL_ERROR_TYPE, error, seq));
+                gqlError.forEach(error => saveErrorToPagevisit({
+                    url: ClientConfig.getInstance().globalUrl,
+                    gql_err: error,
+                    type: PageVisitErrorSource.Response,
+                }, seq));
             }
         });
     }
-    /**
-     * Handles fetch failure
-     */
+    /** Handles fetch failure */
     static handleFetchFailure(maybeErr, url) {
         if (!maybeErr || typeof maybeErr !== 'object') {
             return;
@@ -263,8 +251,9 @@ class RequestMonitor extends Singleton {
         errorFromFetch.message = `${err.message}${urlMessage}`;
         const errorPayload = {
             error: errorFromFetch,
+            type: PageVisitErrorSource.FetchException,
         };
-        saveErrorToPagevisit(FETCH_EXCEPTION_ERROR_TYPE, errorPayload);
+        saveErrorToPagevisit(errorPayload);
     }
     /** gets method from xhr */
     static getMethodFromXHR(xhr, payload) {
@@ -292,7 +281,7 @@ class RequestMonitor extends Singleton {
                 }
                 catch (e) {
                     const stack = tryGetStackTrace(e);
-                    ClientConfig.getInstance().postNoibuErrorAndOptionallyDisableClient(`Error in XHR.send() wrapper: ${e}${stack}`, false, SEVERITY.error);
+                    ClientConfig.getInstance().postInternalError({ msg: `Error in XHR.send() wrapper`, error: e, stack }, false, SEVERITY.error);
                 }
                 return originalFunction.call(this, payload);
             };
@@ -310,14 +299,14 @@ class RequestMonitor extends Singleton {
                 try {
                     /**
                      * We wrap assignment of the .noibu[...] variables in a try/catch, as we're assigning
-                     * properties to a built-in object type, and have no guarantee of success.
+                     * properties to a built-in object source, and have no guarantee of success.
                      */
                     try {
                         this.noibuHttpMethod = method;
                         this.noibuHttpUrl = url;
                     }
                     catch (error) {
-                        ClientConfig.getInstance().postNoibuErrorAndOptionallyDisableClient(`Unable to set custom properties on XHR object: ${error}`, false, SEVERITY.warn);
+                        ClientConfig.getInstance().postInternalError({ msg: `Unable to set custom properties on XHR object`, error }, false, SEVERITY.warn);
                     }
                     if (shouldHandleLoadend) {
                         const startTime = Date.now();
@@ -326,7 +315,7 @@ class RequestMonitor extends Singleton {
                 }
                 catch (e) {
                     const stack = tryGetStackTrace(e);
-                    ClientConfig.getInstance().postNoibuErrorAndOptionallyDisableClient(`Error in XHR.open() wrapper: ${e}${stack}`, false, SEVERITY.error);
+                    ClientConfig.getInstance().postInternalError({ msg: `Error in XHR.open() wrapper`, error: e, stack }, false, SEVERITY.error);
                 }
                 return originalFunction.call(this, method, url, async, user, password);
             };
@@ -353,7 +342,7 @@ class RequestMonitor extends Singleton {
                     }
                 }
                 catch (error) {
-                    ClientConfig.getInstance().postNoibuErrorAndOptionallyDisableClient(`Error in XHR.setRequestHeader() wrapper: ${error}`, false, SEVERITY.error);
+                    ClientConfig.getInstance().postInternalError({ msg: `Error in XHR.setRequestHeader() wrapper`, error }, false, SEVERITY.error);
                 }
                 return originalFunction.call(this, header, value);
             };

package/dist/monitors/http-tools/GqlErrorValidator.js

@@ -1,24 +1,20 @@
 import { __awaiter } from 'tslib';
 import { isInstanceOf, getMaxSubstringAllowed } from '../../utils/function.js';
 import { CONTENT_TYPE, SEVERITY } from '../../constants.js';
-import ClientConfig from '../../api/clientConfig.js';
+import ClientConfig from '../../api/ClientConfig.js';
 
-const MESSAGE_ATT_NAME = 'message';
-const EXTENSIONS_ATT_NAME = 'extensions';
-const LOCATIONS_ATT_NAME = 'locations';
-const PATH_ATT_NAME = 'path';
-const LINE_ATT_NAME = 'line';
-const COLUMN_ATT_NAME = 'column';
+const GQL_EXTENSIONS_ATT_NAME = 'extensions';
+const GQL_LOCATIONS_ATT_NAME = 'locations';
+const GQL_PATH_ATT_NAME = 'path';
+const GQL_LINE_ATT_NAME = 'line';
+const GQL_COLUMN_ATT_NAME = 'column';
+const GQL_MESSAGE_ATT_NAME = 'message';
 const MESSAGE_MAX_LENGTH = 1000;
 /* eslint-disable no-restricted-syntax */
 /* eslint-disable no-param-reassign */
-/**
- * Try detecting GraphQL errors from http response
- */
+/** Try detecting GraphQL errors from http response */
 class GqlErrorValidator {
-    /**
-     * Retrieves GQL error object based on fetch request/response
-     */
+    /** Retrieves GQL error object based on fetch request/response */
     static fromFetch(url, options, request, response) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
@@ -42,15 +38,11 @@ class GqlErrorValidator {
             return null;
         });
     }
-    /**
-     * Retrieves GQL error object based on XHR object
-     */
+    /** Retrieves GQL error object based on XHR object */
     static fromXhr(url, xhr) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const isResponseValid = isInstanceOf(xhr, XMLHttpRequest) &&
-                    xhr.status >= 200 &&
-                    xhr.status <= 299;
+                const isResponseValid = isInstanceOf(xhr, XMLHttpRequest) && xhr.status >= 200 && xhr.status <= 299;
                 if (!isResponseValid) {
                     return null;
                 }
@@ -84,9 +76,7 @@ class GqlErrorValidator {
             return null;
         });
     }
-    /**
-     * Try safely parse a string and return null if fails
-     */
+    /** Try safely parse a string and return null if fails */
     static _parseJsonSafely(content) {
         try {
             return JSON.parse(content);
@@ -95,9 +85,7 @@ class GqlErrorValidator {
             return null;
         }
     }
-    /**
-     * Try to get content type for fetch arguments
-     */
+    /** Try to get content type for fetch arguments */
     static _getContentTypeFromFetchArguments(options, request) {
         let headers = null;
         if (isInstanceOf(request, Request)) {
@@ -125,9 +113,7 @@ class GqlErrorValidator {
         }
         return false;
     }
-    /**
-     * Determines if request should be processed
-     */
+    /** Determines if request should be processed */
     static _shouldHandleRequest(url, contentType) {
         if (contentType) {
             contentType = contentType.toLowerCase();
@@ -139,36 +125,31 @@ class GqlErrorValidator {
             }
             isGqlUrl = url.toLowerCase().includes('graphql');
         }
-        return ((contentType === 'application/json' && isGqlUrl) ||
-            contentType === 'application/graphql');
+        return (contentType === 'application/json' && isGqlUrl) || contentType === 'application/graphql';
     }
-    /**
-     * Sanitizes payload object
-     */
+    /** Sanitizes payload object */
     static _validate(data, validationIssues) {
-        if (!(typeof data === 'object' &&
-            data &&
-            Array.isArray(data.errors))) {
+        if (!(typeof data === 'object' && data && Array.isArray(data.errors))) {
             return null;
         }
         const errors = data.errors;
-        errors.forEach(error => {
+        errors.forEach((error) => {
             if (typeof error !== 'object' || !error) {
                 return;
             }
             const properties = Object.keys(error);
             for (const property of properties) {
                 switch (property) {
-                    case MESSAGE_ATT_NAME:
+                    case GQL_MESSAGE_ATT_NAME:
                         this._validateMessage(error);
                         break;
-                    case LOCATIONS_ATT_NAME:
+                    case GQL_LOCATIONS_ATT_NAME:
                         this._validateLocations(error, validationIssues);
                         break;
-                    case PATH_ATT_NAME:
+                    case GQL_PATH_ATT_NAME:
                         this._validatePath(error, validationIssues);
                         break;
-                    case EXTENSIONS_ATT_NAME:
+                    case GQL_EXTENSIONS_ATT_NAME:
                         this._validateExtensions(error);
                         break;
                     default:
@@ -183,32 +164,27 @@ class GqlErrorValidator {
         }
         return errors;
     }
-    /**
-     * Sanitizes message object
-     */
+    /** Sanitizes message object */
     static _validateMessage(error) {
-        error[MESSAGE_ATT_NAME] = getMaxSubstringAllowed(error[MESSAGE_ATT_NAME], MESSAGE_MAX_LENGTH);
+        error[GQL_MESSAGE_ATT_NAME] = getMaxSubstringAllowed(error[GQL_MESSAGE_ATT_NAME], MESSAGE_MAX_LENGTH);
     }
     /**
      * Sanitizes extensions object
-     * @param {any} error
      */
     static _validateExtensions(error) {
-        const json = JSON.stringify(error[EXTENSIONS_ATT_NAME]);
-        error[EXTENSIONS_ATT_NAME] = getMaxSubstringAllowed(json, MESSAGE_MAX_LENGTH);
+        const json = JSON.stringify(error[GQL_EXTENSIONS_ATT_NAME]);
+        error[GQL_EXTENSIONS_ATT_NAME] = getMaxSubstringAllowed(json, MESSAGE_MAX_LENGTH);
     }
-    /**
-     * Sanitizes locations object
-     */
+    /** Sanitizes locations object */
     static _validateLocations(error, validationIssues) {
-        const locations = error[LOCATIONS_ATT_NAME];
+        const locations = error[GQL_LOCATIONS_ATT_NAME];
         if (Array.isArray(locations)) {
             for (const location of locations) {
                 const properties = Object.keys(location);
                 for (const property of properties) {
                     switch (property) {
-                        case LINE_ATT_NAME:
-                        case COLUMN_ATT_NAME:
+                        case GQL_LINE_ATT_NAME:
+                        case GQL_COLUMN_ATT_NAME:
                             if (!Number.isSafeInteger(location[property])) {
                                 const value = location[property];
                                 location[property] = 0;
@@ -224,35 +200,29 @@ class GqlErrorValidator {
             }
         }
         else {
-            delete error[LOCATIONS_ATT_NAME];
+            delete error[GQL_LOCATIONS_ATT_NAME];
             validationIssues.push(`unexpected error.locations`);
         }
     }
-    /**
-     * Sanitizes path object
-     */
+    /** Sanitizes path object */
     static _validatePath(error, validationIssues) {
-        const path = error[PATH_ATT_NAME];
+        const path = error[GQL_PATH_ATT_NAME];
         if (Array.isArray(path)) {
-            error[PATH_ATT_NAME] = error[PATH_ATT_NAME].map(x => x.toString());
+            error[GQL_PATH_ATT_NAME] = error[GQL_PATH_ATT_NAME].map(x => x.toString());
         }
         else {
-            delete error[PATH_ATT_NAME];
+            delete error[GQL_PATH_ATT_NAME];
             validationIssues.push(`unexpected error.path`);
         }
     }
-    /**
-     * Posts error
-     */
+    /** Posts error */
     static _postError(message) {
-        ClientConfig.getInstance().postNoibuErrorAndOptionallyDisableClient(`GQL parse error: ${message}`, false, SEVERITY.error);
+        ClientConfig.getInstance().postInternalError({ msg: `GQL parse error: ${message}` }, false, SEVERITY.error);
     }
-    /**
-     * Posts issue found during object sanitization
-     */
+    /** Posts issue found during object sanitization */
     static _postValidationIssues(validationIssues) {
         const message = validationIssues.join(',');
-        ClientConfig.getInstance().postNoibuErrorAndOptionallyDisableClient(`GQL error validation warning: ${message}`, false, SEVERITY.error);
+        ClientConfig.getInstance().postInternalError({ msg: `GQL error validation warning: ${message}` }, false, SEVERITY.error);
     }
 }