@logrocket/react-native 1.39.2 → 1.40.0

package/android/build.gradle

@@ -13,7 +13,7 @@
 def DEFAULT_COMPILE_SDK_VERSION = 33
 def DEFAULT_MIN_SDK_VERSION = 25
 def DEFAULT_TARGET_SDK_VERSION = 31
-def SDK_VERSION = "1.39.2"
+def SDK_VERSION = "1.40.0"
 
 def PACKAGE_ROOT_DIR = rootProject.name == 'LogRocket SDK' ? "$rootDir/../packages/@logrocket/react-native" : "$rootDir/..";
 

package/android/src/main/java/com/logrocket/plugins/react/LogRocketNativeModule.java

@@ -18,11 +18,12 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableMapKeySetIterator;
+import com.facebook.react.bridge.ReadableType;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.uimanager.util.ReactFindViewUtil;
 import com.facebook.react.uimanager.util.ReactFindViewUtil.OnViewFoundListener;
-import com.logrocket.core.CaptureMessageBuilder;
 import com.logrocket.core.CustomEventBuilder;
 import com.logrocket.core.IdentifyHelper;
 import com.logrocket.core.LogRocketCore;
@@ -30,26 +31,28 @@ import com.logrocket.core.SDK;
 import com.logrocket.core.SDK.OptionsConfiguration;
 import com.logrocket.core.SDK.SanitizerType;
 import com.logrocket.core.TelemetryReporter;
-import com.logrocket.core.network.IRequestBuilder;
-import com.logrocket.core.network.IResponseBuilder;
 import com.logrocket.core.util.logging.Logger;
 import com.logrocket.core.util.logging.TaggedLogger;
+import com.logrocket.core.util.MessageReceiverHelper;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 public class LogRocketNativeModule extends ReactContextBaseJavaModule {
 
   private final ReactApplicationContext reactContext;
-  private final Map<String, IResponseBuilder> capturedRequests = new HashMap<>();
   private final Logger logger = new TaggedLogger("react-native");
 
   private static final String SDK_ERROR_ACTION = "LogRocketSDK.Error";
   private static final String SDK_SESSION_ACCEPTED_ACTION = "LogRocketSDK.SessionAccepted";
   private static String currentAppId = "";
+  private List<JSONArray> messageList = new ArrayList<>();
 
   public LogRocketNativeModule(ReactApplicationContext reactContext) {
     super(reactContext);
@@ -145,88 +148,6 @@ public class LogRocketNativeModule extends ReactContextBaseJavaModule {
     }
   }
 
-  @Keep
-  @ReactMethod
-  public void captureRequest(String reqId, ReadableMap request) {
-    try {
-      IRequestBuilder requestBuilder = SDK.newRequestBuilder().setUrl(request.getString("url"));
-
-      if (request.hasKey("body")) {
-        ReadableMap arson = request.getMap("body");
-        if (arson != null && arson.hasKey("arson")) {
-          requestBuilder.setArsonBody(arson.getString("arson"));
-        }
-      }
-
-      if (request.hasKey("method")) {
-        requestBuilder.setMethod(request.getString("method"));
-      }
-
-      if (request.hasKey("headers") && !request.isNull("headers")) {
-        requestBuilder.setHeaders(formatReadableMap(request.getMap("headers")));
-      }
-
-      IResponseBuilder responseBuilder = requestBuilder.capture();
-
-      this.capturedRequests.put(reqId, responseBuilder);
-    } catch (Throwable th) {
-      this.logger.error("Error while capturing network request", th);
-      TelemetryReporter.sendErrorTelemetry(th);
-    }
-  }
-
-  @Keep
-  @ReactMethod
-  public void captureResponse(String reqId, ReadableMap response) {
-    try {
-      IResponseBuilder responseBuilder = this.capturedRequests.get(reqId);
-      if (responseBuilder != null) {
-
-        if (response.hasKey("statusCode")) {
-          responseBuilder.setStatusCode(response.getInt("statusCode"));
-        }
-
-        if (response.hasKey("duration")) {
-          responseBuilder.setDuration(response.getDouble("duration"));
-        }
-
-        if (response.hasKey("body")) {
-          ReadableMap arson = response.getMap("body");
-          if (arson != null && arson.hasKey("arson")) {
-            responseBuilder.setArsonBody(arson.getString("arson"));
-          }
-        }
-
-        if (response.hasKey("headers") && !response.isNull("headers")) {
-          responseBuilder.setHeaders(formatReadableMap(response.getMap("headers")));
-        }
-
-        responseBuilder.capture();
-      }
-
-    } catch (Throwable th) {
-      this.logger.error("Error while capturing network response", th);
-      TelemetryReporter.sendErrorTelemetry(th);
-    } finally {
-      this.capturedRequests.remove(reqId);
-    }
-  }
-
-  @Keep
-  @ReactMethod
-  public void addLog(String level, ReadableArray args) {
-    try {
-      List<Object> argsList = args.toArrayList();
-      LogRocketCore core = LogRocketCore.maybeGetInstance();
-
-      if (core != null) {
-        core.captureReactNativeLog(level, argsList);
-      }
-    } catch (Throwable th) {
-      this.logger.error("Error while adding log", th);
-      TelemetryReporter.sendErrorTelemetry(th);
-    }
-  }
 
   @Keep
   @ReactMethod
@@ -301,91 +222,6 @@ public class LogRocketNativeModule extends ReactContextBaseJavaModule {
     }
   }
 
-  @Keep
-  @ReactMethod
-  public void captureException(
-      String errorMessage, String errorType, String exceptionType, String stackTrace) {
-    try {
-      SDK.captureException(errorMessage, errorType, exceptionType, stackTrace);
-    } catch (Throwable th) {
-      this.logger.error("Error during captureException call", th);
-      TelemetryReporter.sendErrorTelemetry(th);
-    }
-  }
-
-  @Keep
-  @ReactMethod
-  public void captureMessage(String message, ReadableMap options) {
-    try {
-      CaptureMessageBuilder builder = new CaptureMessageBuilder(message);
-
-      Iterator<Map.Entry<String, Object>> iterator = options.getEntryIterator();
-      while (iterator.hasNext()) {
-        Map.Entry<String, Object> entry = iterator.next();
-        String keyString = entry.getKey();
-
-        if (keyString.equals("tags") || keyString.equals("extra")) {
-          ReadableMap objectField = (ReadableMap) entry.getValue();
-          Iterator<Map.Entry<String, Object>> propIterator = objectField.getEntryIterator();
-
-          while (propIterator.hasNext()) {
-            Map.Entry<String, Object> prop = propIterator.next();
-            String propKey = prop.getKey();
-            String propValue = prop.getValue().toString();
-            if (keyString.equals("tags")) {
-              builder.putTag(propKey, propValue);
-            } else {
-              builder.putExtra(propKey, propValue);
-            }
-          }
-        }
-      }
-      SDK.captureMessage(builder);
-    } catch (Throwable th) {
-      this.logger.error("Error during captureMessage call", th);
-      TelemetryReporter.sendErrorTelemetry(th);
-    }
-  }
-
-  @Keep
-  @ReactMethod
-  public void captureReduxInitialState(ReadableMap data) {
-    try {
-      int storeId = data.getInt("storeId");
-      String state = data.getString("state");
-
-      LogRocketCore core = LogRocketCore.maybeGetInstance();
-
-      if (core != null) {
-        core.captureReduxInitialState(storeId, state);
-      }
-    } catch (Throwable th) {
-      this.logger.error("Error during captureReduxInitialState call", th);
-      TelemetryReporter.sendErrorTelemetry(th);
-    }
-  }
-
-  @Keep
-  @ReactMethod
-  public void captureReduxAction(ReadableMap data) {
-    try {
-      int storeId = data.getInt("storeId");
-      int count = data.hasKey("count") ? data.getInt("count") : 0;
-      float duration = data.getInt("duration");
-      String stateDelta = data.getString("stateDelta");
-      String action = data.getString("action");
-
-      LogRocketCore core = LogRocketCore.maybeGetInstance();
-
-      if (core != null) {
-        core.captureReduxAction(storeId, count, duration, stateDelta, action);
-      }
-    } catch (Throwable th) {
-      this.logger.error("Error during captureReduxAction call", th);
-      TelemetryReporter.sendErrorTelemetry(th);
-    }
-  }
-
   @Keep
   @ReactMethod
   public void tagPage(String relativePage) {
@@ -439,6 +275,25 @@ public class LogRocketNativeModule extends ReactContextBaseJavaModule {
     }
   }
 
+  @Keep
+  @ReactMethod
+  public void postMessage(ReadableArray message){
+    try {
+      JSONArray array = toJSONArray(message);
+      messageList.add(array);
+    } catch (Throwable th) {
+      this.logger.error("Error while capturing message", th);
+      TelemetryReporter.sendErrorTelemetry(th);
+    }
+  }
+
+  @Keep
+  @ReactMethod
+  public void donePostingMessage() {
+    MessageReceiverHelper.rebuildMessage(messageList);
+    messageList = new ArrayList<>();
+  }
+  
   static class LogRocketReceiver extends BroadcastReceiver {
     private final ReactApplicationContext reactContext;
     private final Logger logger = new TaggedLogger("logrocket-receiver");
@@ -579,4 +434,105 @@ public class LogRocketNativeModule extends ReactContextBaseJavaModule {
       }
     };
   }
+
+  // helpers found here: https://gist.github.com/mfmendiola/bb8397162df9f76681325ab9f705748b
+  /*
+  MIT License
+  Copyright (c) 2020 Marc Mendiola
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+ */
+
+  private static JSONObject toJSONObject(ReadableMap readableMap) throws JSONException {
+    JSONObject jsonObject = new JSONObject();
+
+    ReadableMapKeySetIterator iterator = readableMap.keySetIterator();
+
+    while (iterator.hasNextKey()) {
+      String key = iterator.nextKey();
+      ReadableType type = readableMap.getType(key);
+
+      switch (type) {
+        case Null:
+          // The standard Java null reference causes JSONArray.get to fail so we
+          // use JSONObject.NULL instead.
+          // reference: https://developer.android.com/reference/org/json/JSONArray
+          jsonObject.put(key, JSONObject.NULL);
+          break;
+        case Boolean:
+          jsonObject.put(key, readableMap.getBoolean(key));
+          break;
+        case Number:
+          jsonObject.put(key, readableMap.getDouble(key));
+          break;
+        case String:
+          String string = readableMap.getString(key);
+          if(string != null) {
+            jsonObject.put(key, string);
+          }
+          break;
+        case Map:
+          ReadableMap map = readableMap.getMap(key);
+          if(map != null) {
+            jsonObject.put(key, toJSONObject(map));
+          }
+          break;
+        case Array:
+          ReadableArray array = readableMap.getArray(key);
+          if(array != null) {
+            jsonObject.put(key, toJSONArray(array));
+          }
+          break;
+      }
+    }
+
+    return jsonObject;
+  }
+
+  private static JSONArray toJSONArray(ReadableArray readableArray) throws JSONException {
+    JSONArray jsonArray = new JSONArray();
+
+    for (int i = 0; i < readableArray.size(); i++) {
+      ReadableType type = readableArray.getType(i);
+
+      switch (type) {
+        case Null:
+          // The standard Java null reference causes JSONArray.get to fail so we
+          // use JSONObject.NULL instead.
+          // reference: https://developer.android.com/reference/org/json/JSONArray
+          jsonArray.put(i, JSONObject.NULL);
+          break;
+        case Boolean:
+          jsonArray.put(i, readableArray.getBoolean(i));
+          break;
+        case Number:
+          jsonArray.put(i, readableArray.getDouble(i));
+          break;
+        case String:
+          jsonArray.put(i, readableArray.getString(i));
+          break;
+        case Map:
+          jsonArray.put(i, toJSONObject(readableArray.getMap(i)));
+          break;
+        case Array:
+          jsonArray.put(i, toJSONArray(readableArray.getArray(i)));
+          break;
+      }
+    }
+
+    return jsonArray;
+  }
 }