v7.0.3

boehlerlukas · boehlerlukas · commit c25d053249a2 · 2022-05-24T13:56:52.000+02:00
diff --git a/build/index.js b/build/index.js
diff --git a/demo/main.js b/demo/main.js
@@ -44,7 +44,7 @@ setTimeout(() => {
   console.warn("Demo warning :)");
   console.log("Data will be loaded soon.");
 
-  xxx();
+  // xxx();
 }, 4000);
 
 const files = [
diff --git a/index.d.ts b/index.d.ts
@@ -2,24 +2,11 @@ export namespace Gleap {
   function initialize(
     sdkKey: string
   ): void;
-  /**
-   * @deprecated Please use sendSilentReport instead.
-   */
-  function sendSilentBugReport(
-    description: string,
-    priority: "LOW" | "MEDIUM" | "HIGH"
-  ): void;
-  function sendSilentBugReportWithType(
-    description: string,
-    priority: "LOW" | "MEDIUM" | "HIGH",
-    type: string
-  ): void;
-  function sendSilentReport(
+  function sendSilentCrashReport(
     formData: {
       [key: string]: string;
     },
     priority?: "LOW" | "MEDIUM" | "HIGH",
-    feedbackType?: string,
     excludeData?: {
       customData: Boolean;
       metaData: Boolean;
@@ -43,7 +30,6 @@ export namespace Gleap {
   function logEvent(name: string, data?: any): void;
   function setAppBuildNumber(buildNumber: string): void;
   function setAppVersionCode(versionCode: string): void;
-  function attachNetworkLogs(externalConsoleLogs: any[]): void;
   function setStyles(styles: {
     primaryColor: string;
     headerColor: string;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gleap",
-  "version": "7.0.2",
+  "version": "7.0.3",
   "main": "build/index.js",
   "scripts": {
     "start": "webpack serve",
diff --git a/published/latest/index.js b/published/latest/index.js
diff --git a/src/Gleap.js b/src/Gleap.js
@@ -70,15 +70,6 @@ class Gleap {
     }
   }
 
-  /**
-   * Attaches external network logs that get merged with the internal network logs.
-   * @param {*} externalConsoleLogs
-   */
-  static attachNetworkLogs(externalConsoleLogs) {
-    GleapNetworkIntercepter.getInstance().externalConsoleLogs =
-      externalConsoleLogs;
-  }
-
   /**
    * Active the Gleap offline mode.
    * @param {*} offlineMode
@@ -228,13 +219,6 @@ class Gleap {
     GleapFeedbackButtonManager.getInstance().toggleFeedbackButton(show);
   }
 
-  /**
-   * Enables the network logger.
-   */
-  static setNetworkLogFilters(filters) {
-    GleapNetworkIntercepter.getInstance().setFilters(filters);
-  }
-
   /**
    * Sets the app version code.
    * @param {string} appVersionCode
@@ -359,54 +343,15 @@ class Gleap {
     }
   }
 
-  /**
-   * Reports a bug silently
-   * @param {*} description
-   * @param {*} priority
-   * @param {*} type
-   * @deprecated Please use sendSilentReport instead.
-   */
-  static sendSilentBugReportWithType(
-    description,
-    priority = "MEDIUM",
-    type = "BUG"
-  ) {
-    return Gleap.sendSilentReport(
-      {
-        description: description,
-      },
-      priority,
-      type
-    );
-  }
-
-  /**
-   * Reports a bug silently
-   * @param {*} description
-   * @param {*} priority
-   * @deprecated Please use sendSilentReport instead.
-   */
-  static sendSilentBugReport(description, priority = "MEDIUM") {
-    return Gleap.sendSilentReport(
-      {
-        description: description,
-      },
-      priority,
-      "BUG"
-    );
-  }
-
   /**
    * Sends a silent feedback report
    * @param {*} formData
    * @param {*} priority
-   * @param {*} feedbackType
    * @param {*} excludeData
    */
-  static sendSilentReport(
+  static sendSilentCrashReport(
     formData,
     priority = "MEDIUM",
-    feedbackType = "BUG",
     excludeData = {}
   ) {
     const sessionInstance = GleapSession.getInstance();
@@ -420,7 +365,7 @@ class Gleap {
     }
 
     GleapEventManager.notifyEvent("sending-silent-report");
-    const feedback = new GleapFeedback(feedbackType, priority, newFormData, true, excludeData ? excludeData : {});
+    const feedback = new GleapFeedback("CRASH", priority, newFormData, true, excludeData ? excludeData : {});
     feedback.sendFeedback().then(() => {
       GleapEventManager.notifyEvent("silent-report-sent");
     }).catch((error) => {
diff --git a/src/GleapConfigManager.js b/src/GleapConfigManager.js
@@ -119,6 +119,10 @@ export default class GleapConfigManager {
         GleapNetworkIntercepter.getInstance().setFilters(flowConfig.networkLogPropsToIgnore);
       }
 
+      if (flowConfig.networkLogBlacklist) {
+        GleapNetworkIntercepter.getInstance().setBlacklist(flowConfig.networkLogBlacklist);
+      }
+
       if (flowConfig.customTranslations) {
         GleapTranslationManager.getInstance().setCustomTranslation(flowConfig.customTranslations);
       }
diff --git a/src/GleapCrashDetector.js b/src/GleapCrashDetector.js
@@ -30,7 +30,7 @@ export default class GleapCrashDetector {
       const flowConfig = GleapConfigManager.getInstance().getFlowConfig();
       if (flowConfig && typeof flowConfig.enableCrashDetector !== "undefined" && flowConfig.enableCrashDetector) {
         if (flowConfig.crashDetectorIsSilent) {
-          Gleap.sendSilentReport(
+          Gleap.sendSilentCrashReport(
             {
               errorMessage: message,
               url: filename,
@@ -39,7 +39,6 @@ export default class GleapCrashDetector {
               stackTrace: stackTrace,
             },
             "MEDIUM",
-            "CRASH",
             {
               screenshot: true,
               replays: true,
diff --git a/src/GleapFeedback.js b/src/GleapFeedback.js
@@ -17,14 +17,16 @@ export default class GleapFeedback {
     screenshotData = undefined;
     webReplay = undefined;
     screenRecordingUrl = undefined;
+    spamToken = undefined;
 
-    constructor(type, priority, formData, isSilent, excludeData, outboundId) {
+    constructor(type, priority, formData, isSilent, excludeData, outboundId, spamToken) {
         this.type = type;
         this.priority = priority;
         this.formData = formData;
         this.isSilent = isSilent;
         this.excludeData = excludeData;
         this.outboundId = outboundId;
+        this.spamToken = spamToken;
     }
 
     takeSnapshot() {
@@ -84,7 +86,8 @@ export default class GleapFeedback {
             outbound: this.outboundId,
             screenshotData: this.screenshotData,
             webReplay: this.webReplay,
-            screenRecordingUrl: this.screenRecordingUrl
+            screenRecordingUrl: this.screenRecordingUrl,
+            spamToken: this.spamToken,
         };
 
         const keysToExclude = Object.keys(this.excludeData);
@@ -112,7 +115,7 @@ export default class GleapFeedback {
                 const dataToSend = this.getData();
 
                 const http = new XMLHttpRequest();
-                http.open("POST", GleapSession.getInstance().apiUrl + "/bugs");
+                http.open("POST", GleapSession.getInstance().apiUrl + "/bugs/v2");
                 http.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
                 GleapSession.getInstance().injectSession(http);
                 http.onerror = (error) => {
diff --git a/src/GleapFrameManager.js b/src/GleapFrameManager.js
@@ -228,8 +228,9 @@ export default class GleapFrameManager {
         const formData = data.data.formData;
         const action = data.data.action;
         const outboundId = data.data.outboundId;
+        const spamToken = data.data.spamToken;
 
-        const feedback = new GleapFeedback(action.feedbackType, "MEDIUM", formData, false, action.excludeData, outboundId);
+        const feedback = new GleapFeedback(action.feedbackType, "MEDIUM", formData, false, action.excludeData, outboundId, spamToken);
         feedback.sendFeedback().then(() => {
           this.sendMessage({
             name: "feedback-sent"
diff --git a/src/GleapNetworkIntercepter.js b/src/GleapNetworkIntercepter.js
@@ -2,9 +2,9 @@ class GleapNetworkIntercepter {
   startTimestamp = Date.now();
   requestId = 0;
   requests = {};
-  externalConsoleLogs = [];
   maxRequests = 10;
   filters = [];
+  blacklist = [];
   initialized = false;
   stopped = false;
   loadAllResources = false;
@@ -44,9 +44,7 @@ class GleapNetworkIntercepter {
   }
 
   getRequests() {
-    var requests = this.externalConsoleLogs.concat(
-      Object.values(this.requests)
-    );
+    var requests = JSON.parse(JSON.stringify(Object.values(this.requests)));
 
     if (this.filters && this.filters.length > 0) {
       // Perform network log filtering.
@@ -109,6 +107,17 @@ class GleapNetworkIntercepter {
       }
     } catch (exp) { }
 
+    if (this.blacklist && this.blacklist.length > 0) {
+      requests = requests.filter((request) => {
+        for (var i = 0; i < this.blacklist.length; i++) {
+          if (request.url && request.url.includes(this.blacklist[i])) {
+            return false;
+          }
+        }
+        return true;
+      });
+    }
+
     return requests;
   }
 
@@ -121,9 +130,11 @@ class GleapNetworkIntercepter {
   }
 
   setFilters(filters) {
-    if (filters) {
-      this.filters = filters;
-    }
+    this.filters = filters ? filters : [];
+  }
+
+  setBlacklist(blacklist) {
+    this.blacklist = blacklist ? blacklist : [];
   }
 
   cleanRequests() {
@@ -148,14 +159,23 @@ class GleapNetworkIntercepter {
     }
   }
 
-  calculateTextSize(text) {
+  getTextContentSize(text) {
     const size = new TextEncoder().encode(text).length;
     const kiloBytes = size / 1024;
     const megaBytes = kiloBytes / 1024;
     return megaBytes;
   }
 
-  fixPayload(payload) {
+  cleanupContentSize(text) {
+    const contentSize = this.getTextContentSize(text);
+    if (contentSize > 0.2) {
+      return "<content_too_large>";
+    }
+
+    return text;
+  }
+
+  cleanupPayload(payload) {
     if (payload === undefined || payload === null) {
       return "{}";
     }
@@ -170,6 +190,11 @@ class GleapNetworkIntercepter {
     return payload;
   }
 
+  preparePayload(payload) {
+    var payloadText = this.cleanupPayload(payload);
+    return this.cleanupContentSize(payloadText);
+  }
+
   start() {
     if (this.initialized) {
       return;
@@ -207,7 +232,7 @@ class GleapNetworkIntercepter {
               params[1] && params[1].method ? params[1].method : "GET";
             this.requests[bbRequestId] = {
               request: {
-                payload: self.fixPayload(params[1].body),
+                payload: self.preparePayload(params[1].body),
                 headers: params[1].headers,
               },
               type: method,
@@ -259,10 +284,7 @@ class GleapNetworkIntercepter {
                   this.requests[bbRequestId]["response"] = {
                     status: req.status,
                     statusText: req.statusText,
-                    responseText:
-                      self.calculateTextSize(responseText) > 0.5
-                        ? "<response_too_large>"
-                        : responseText,
+                    responseText: self.cleanupContentSize(responseText)
                   };
                 }
                 this.calcRequestTime(bbRequestId);
@@ -331,7 +353,7 @@ class GleapNetworkIntercepter {
           this.requests[request.bbRequestId]
         ) {
           this.requests[request.bbRequestId]["request"] = {
-            payload: this.fixPayload(args.length > 0 ? args[0] : "{}"),
+            payload: this.preparePayload(args.length > 0 ? args[0] : "{}"),
             headers: request.requestHeaders,
           };
         }
@@ -369,10 +391,7 @@ class GleapNetworkIntercepter {
           var responseType = target.responseType;
           var responseText = "<" + responseType + ">";
           if (responseType === "" || responseType === "text") {
-            responseText =
-              this.calculateTextSize(target.responseText) > 0.5
-                ? "<response_too_large>"
-                : target.responseText;
+            responseText = this.cleanupContentSize(target.responseText);
           }
 
           this.requests[target.bbRequestId]["success"] = true;
diff --git a/src/GleapRageClickDetector.js b/src/GleapRageClickDetector.js
@@ -52,13 +52,12 @@ export default class GleapRageClickDetector {
       const flowConfig = GleapConfigManager.getInstance().getFlowConfig();
       if (flowConfig && typeof flowConfig.enableRageClickDetector !== "undefined" && flowConfig.enableRageClickDetector) {
         if (flowConfig.rageClickDetectorIsSilent) {
-          Gleap.sendSilentReport(
+          Gleap.sendSilentCrashReport(
             {
               description: `Rage click detected.`,
               element: elementDescription,
             },
-            "MEDIUM",
-            "CRASH"
+            "MEDIUM"
           );
         } else {
           Gleap.startFeedbackFlow("crash");

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "gleap",`
`3`		`- "version": "7.0.2",`
	`3`	`+ "version": "7.0.3",`
`4`	`4`	`"main": "build/index.js",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"start": "webpack serve",`
Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,10 @@ export default class GleapConfigManager {`
`119`	`119`	`GleapNetworkIntercepter.getInstance().setFilters(flowConfig.networkLogPropsToIgnore);`
`120`	`120`	`}`
`121`	`121`
	`122`	`+ if (flowConfig.networkLogBlacklist) {`
	`123`	`+ GleapNetworkIntercepter.getInstance().setBlacklist(flowConfig.networkLogBlacklist);`
	`124`	`+ }`
	`125`	`+`
`122`	`126`	`if (flowConfig.customTranslations) {`
`123`	`127`	`GleapTranslationManager.getInstance().setCustomTranslation(flowConfig.customTranslations);`
`124`	`128`	`}`