shakebug-react-native 2.4.10 → 2.4.11

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shakebug-react-native",
   "title": "shakebug-react-native",
-  "version": "2.4.10",
+  "version": "2.4.11",
   "description": "Shakebug allows users to report the bug from your mobile phone for your application. Here users just need to shake their mobile and all the data regarding bugs & crashes can be seen by developers through their log in panel easily",
   "main": "src/index.tsx",
   "types": "src/index.tsx",

package/src/APIs/AddIssue.js

@@ -2,10 +2,11 @@ import { NativeModules, Platform } from "react-native";
 import DeviceInfo from "../../DeviceInfo";
 import NetInfo from "../../NetInfo/src";
 
-const BASE_URL = global.ShakebugSDKEndPointURL;
-const API_KEY = global.ShakebugSDKEndPointURLheaderKey;
 
 async function AddIssueApi(session_id, application_id, path, isVideo, desc, email) {
+    const BASE_URL = global.ShakebugSDKEndPointURL || "https://www.shakebug.com/api/v1.6/webservice.php/";
+    const API_KEY = global.ShakebugSDKEndPointURLheaderKey || "MarchShake2022";
+
     try {
 
         const { ShakebugSDKSharedPreferencesModule } = NativeModules;
@@ -30,7 +31,7 @@ async function AddIssueApi(session_id, application_id, path, isVideo, desc, emai
         let totalMemory = await DeviceInfo.getTotalMemory();
         let usedMemory = await DeviceInfo.getUsedMemory();
         let memoryInBytes = totalMemory - usedMemory;
-        
+
         let memory = "";
         if (memoryInBytes >= 1024 * 1024 * 1024) {
             memory = (memoryInBytes / (1024 * 1024 * 1024)).toFixed(2) + " GB";
@@ -50,7 +51,7 @@ async function AddIssueApi(session_id, application_id, path, isVideo, desc, emai
         formData.append("applicationsid", application_id);
         formData.append("session_id", session_id);
         formData.append("batteryLevel", batteryLevel);
-        formData.append("image", {uri: media, name: name, type: type});
+        formData.append("image", { uri: media, name: name, type: type });
         formData.append("memory", memory);
         formData.append("email", email);
         formData.append("devicemodel", `${architecture[0]} -- ${model}`);
@@ -63,7 +64,8 @@ async function AddIssueApi(session_id, application_id, path, isVideo, desc, emai
         formData.append("custom_user_id", Custom_User_Id || "")
         formData.append("sdk_version", global.sdk_version)
         formData.append("platform", Platform.OS)
-
+        formData.append("sdk_platform", global.sdk_platform)
+        formData.append("sdk_platform_version", global.sdk_platform_version)
 
         const response = await fetch(BASE_URL, {
             method: 'POST',

package/src/APIs/AddReview.js

@@ -1,9 +1,10 @@
 import { NativeModules } from "react-native";
 
-const BASE_URL = global.ShakebugSDKEndPointURL;
-const API_KEY = global.ShakebugSDKEndPointURLheaderKey;
 
 async function AddReviewApi(rating, review, applicationsid, session_id) {
+    const BASE_URL = global.ShakebugSDKEndPointURL || "https://www.shakebug.com/api/v1.6/webservice.php/";
+    const API_KEY = global.ShakebugSDKEndPointURLheaderKey || "MarchShake2022";
+
 
     const { ShakebugSDKSharedPreferencesModule } = NativeModules;
 
@@ -18,6 +19,8 @@ async function AddReviewApi(rating, review, applicationsid, session_id) {
         formData.append("session_id", session_id);
         formData.append("appVersion", global.sdk_version);
         formData.append("custom_user_id", Custom_User_Id || "");
+        formData.append("sdk_platform", global.sdk_platform)
+        formData.append("sdk_platform_version", global.sdk_platform_version)
 
         const response = await fetch(BASE_URL, {
             method: 'POST',

package/src/APIs/CustomUserId.js

@@ -1,9 +1,10 @@
 import { NativeModules } from "react-native";
 
-const BASE_URL = global.ShakebugSDKEndPointURL;
-const API_KEY = global.ShakebugSDKEndPointURLheaderKey;
 
 async function CustomUserIdApi(id, name, email, country, other, applicationsid) {
+    const BASE_URL = global.ShakebugSDKEndPointURL || "https://www.shakebug.com/api/v1.6/webservice.php/";
+    const API_KEY = global.ShakebugSDKEndPointURLheaderKey || "MarchShake2022";
+
 
     const { ShakebugSDKSharedPreferencesModule } = NativeModules;
 
@@ -19,6 +20,8 @@ async function CustomUserIdApi(id, name, email, country, other, applicationsid)
             formData.append("country", country?.trim());
             formData.append("other", other);
             formData.append("applicationsid", applicationsid);
+            formData.append("sdk_platform", global.sdk_platform)
+            formData.append("sdk_platform_version", global.sdk_platform_version)
 
             const response = await fetch(BASE_URL, {
                 method: 'POST',

package/src/APIs/EndSession.js

@@ -1,7 +1,8 @@
-const BASE_URL = global.ShakebugSDKEndPointURL;
-const API_KEY = global.ShakebugSDKEndPointURLheaderKey;
 
 async function SessionEndApi(session_id) {
+    const BASE_URL = global.ShakebugSDKEndPointURL || "https://www.shakebug.com/api/v1.6/webservice.php/";
+    const API_KEY = global.ShakebugSDKEndPointURLheaderKey || "MarchShake2022";
+
     try {
 
         const formData = new FormData();

package/src/APIs/Event.js

@@ -2,10 +2,11 @@ import { NativeModules } from "react-native";
 import DeviceInfo from "../../DeviceInfo";
 import NetInfo from "../../NetInfo/src";
 
-const BASE_URL = global.ShakebugSDKEndPointURL;
-const API_KEY = global.ShakebugSDKEndPointURLheaderKey;
 
 async function EventApi(application_id, name, value, session_id) {
+    const BASE_URL = global.ShakebugSDKEndPointURL || "https://www.shakebug.com/api/v1.6/webservice.php/";
+    const API_KEY = global.ShakebugSDKEndPointURLheaderKey || "MarchShake2022";
+
     try {
 
         const { ShakebugSDKSharedPreferencesModule } = NativeModules;
@@ -20,6 +21,8 @@ async function EventApi(application_id, name, value, session_id) {
         formData.append("session_id", session_id);
         formData.append("custom_user_id", Custom_User_Id || "")
         formData.append("sdk_version", global.sdk_version)
+        formData.append("sdk_platform", global.sdk_platform)
+        formData.append("sdk_platform_version", global.sdk_platform_version)
 
         const response = await fetch(BASE_URL, {
             method: 'POST',

package/src/APIs/FetchRemoteCodeAPI.js

@@ -1,10 +1,11 @@
 import { NativeModules } from "react-native";
 import DeviceInfo from "../../DeviceInfo";
 
-const BASE_URL = global.ShakebugSDKEndPointURL;
-const API_KEY = global.ShakebugSDKEndPointURLheaderKey;
 
 async function FetchRemoteCodeAPI(config_key, applicationsid, session_id) {
+    const BASE_URL = global.ShakebugSDKEndPointURL || "https://www.shakebug.com/api/v1.6/webservice.php/";
+    const API_KEY = global.ShakebugSDKEndPointURLheaderKey || "MarchShake2022";
+
 
     try {
         const { ShakebugSDKSharedPreferencesModule } = NativeModules;
@@ -20,6 +21,8 @@ async function FetchRemoteCodeAPI(config_key, applicationsid, session_id) {
         formData.append("appVersion", DeviceInfo?.getVersion());
         formData.append("session_id", session_id);
         formData.append("custom_user_id", Custom_User_Id || "");
+        formData.append("sdk_platform", global.sdk_platform)
+        formData.append("sdk_platform_version", global.sdk_platform_version)
 
         const response = await fetch(BASE_URL, {
             method: "POST",

package/src/APIs/MatchKey.js

@@ -1,7 +1,8 @@
-const BASE_URL = global.ShakebugSDKEndPointURL;
-const API_KEY = global.ShakebugSDKEndPointURLheaderKey;
 
 async function MatchKeyApi(appkey, BundleId) {
+    const BASE_URL = global.ShakebugSDKEndPointURL || "https://www.shakebug.com/api/v1.6/webservice.php/";
+    const API_KEY = global.ShakebugSDKEndPointURLheaderKey || "MarchShake2022";
+
 
     const formData = new FormData();
     formData.append("method", "matchKeys")

package/src/APIs/StartSession.js

@@ -2,10 +2,10 @@ import { NativeModules } from "react-native";
 import DeviceInfo from "../../DeviceInfo";
 import { getLocales } from "../../GetLocals/src";
 
-const BASE_URL = global.ShakebugSDKEndPointURL;
-const API_KEY = global.ShakebugSDKEndPointURLheaderKey;
-
 async function SessionStartApi(latitude, longitude, application_id) {
+    const BASE_URL = global.ShakebugSDKEndPointURL || "https://www.shakebug.com/api/v1.6/webservice.php/";
+    const API_KEY = global.ShakebugSDKEndPointURLheaderKey || "MarchShake2022";
+
 
     let city = "";
     let state = ""
@@ -57,24 +57,35 @@ async function SessionStartApi(latitude, longitude, application_id) {
 
     let architecture = await DeviceInfo.supportedAbis()
 
+    const requestPayload = {
+        method: "startSession",
+        uuid: uuid || "",
+        applicationsid: application_id || "",
+        systemversion: system_version || "",
+        os: os || "",
+        language: (locals && locals[0]) ? locals[0].languageCode : "",
+        country: (locals && locals[0]) ? locals[0].countryCode : "",
+        phonename: (device_name || "").replace(/'/g, ""),
+        devicemodel: (architecture && architecture[0]) ? architecture[0] : "",
+        city: city || "",
+        state: state || "",
+        latitude: latitude === undefined || latitude === null ? "" : latitude,
+        longitude: longitude === undefined || longitude === null ? "" : longitude,
+        phonecarrier: phone_carrier || "",
+        appversion: app_version || "",
+        custom_user_id: Custom_User_Id || "",
+        sdk_version: global.sdk_version || "",
+        sdk_platform: global.sdk_platform || "",
+        sdk_platform_version: global.sdk_platform_version || ""
+    };
+
+    console.log("➡️ [Shakebug] SessionStartApi Request URL:", BASE_URL);
+    console.log("➡️ [Shakebug] SessionStartApi Payload:", requestPayload);
+
     const formData = new FormData();
-    formData.append("method", "startSession")
-    formData.append("uuid", uuid)
-    formData.append("applicationsid", application_id)
-    formData.append("systemversion", system_version)
-    formData.append("os", os)
-    formData.append("language", locals[0].languageCode)
-    formData.append("country", locals[0].countryCode)
-    formData.append("phonename", device_name)
-    formData.append("devicemodel", architecture[0])
-    formData.append("city", city)
-    formData.append("state", state)
-    formData.append("latitude", latitude)
-    formData.append("longitude", longitude)
-    formData.append("phonecarrier", phone_carrier)
-    formData.append("appversion", app_version)
-    formData.append("custom_user_id", Custom_User_Id || "")
-    formData.append("sdk_version", global.sdk_version)
+    Object.keys(requestPayload).forEach(key => {
+        formData.append(key, requestPayload[key]);
+    });
     
     try {
         const response = await fetch(BASE_URL, {
@@ -85,7 +96,17 @@ async function SessionStartApi(latitude, longitude, application_id) {
             body: formData,
         });
 
-        const data = await response.json();
+        const responseText = await response.text();
+        console.log("⬅️ [Shakebug] SessionStartApi Raw Response:", responseText);
+
+        let data;
+        try {
+            data = JSON.parse(responseText);
+        } catch (parseError) {
+            console.error("❌ [Shakebug] Server returned invalid JSON. Could not parse:", responseText);
+            return { success: false, message: "Invalid server response" };
+        }
+
         if (data.code === 200 && data.success === true) {
             const session_id = data.response_data.session_id;
             return { success: true, session_id, message: data.msg };
@@ -93,8 +114,8 @@ async function SessionStartApi(latitude, longitude, application_id) {
             return { success: false, message: data.msg };
         }
     } catch (error) {
-        // console.error('Error fetching data:', error);
-        // throw error;
+        console.error('❌ [Shakebug] Error fetching data:', error);
+        return { success: false, message: "Network error" };
     }
 }
 

package/src/Componanats/ShakeFunction.js

@@ -17,6 +17,7 @@ import LoadingModal from './LoadingModal';
 
 LogBox.ignoreAllLogs()
 
+let intervalId = null;
 const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitle, allowToReportBugByShaking, allowToReportBugByScreenCapture, allowCrashReport }) => {
 
   const { ShakebugSDKScreenShotDetector, ShakebugSDKSharedPreferencesModule, ShakebugSDKCustomScreenCapture} = NativeModules;
@@ -105,6 +106,20 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
     return global.allowBugReport !== false && allowToReportBugByShaking !== false;
   };
 
+  useEffect(() => {
+    const triggerSubscription = DeviceEventEmitter.addListener('TriggerBugReportingEvent', () => {
+      log.info("TriggerBugReportingEvent received. global.isShakebugOpen:", global.isShakebugOpen);
+      if (!global.isShakebugOpen) {
+        setTriggred(true);
+        global.isShakebugOpen = true;
+        setTimeout(() => {
+          OpenShakebug(true); // Pass true to bypass shake checks
+        }, 200);
+      }
+    });
+    return () => triggerSubscription.remove();
+  }, []);
+
   setUpdateIntervalForType(SensorTypes.accelerometer, 200);
 
   let iscrashSaveed = ""
@@ -242,6 +257,9 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
   }, []);
 
   const startTimer = () => {
+    if (intervalId) {
+      clearInterval(intervalId);
+    }
     startTimeRef.current = Date.now();
     intervalId = setInterval(() => {
       if (global.isRecording) {
@@ -254,15 +272,16 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
   const updateTimer = (elapsed) => {
     const min = Math.floor(elapsed / 60);
     const sec = parseInt(elapsed % 60);
+    const durationLimit = parseInt(global.videoDuration) || 20;
 
-    if (elapsed == global.videoDuration) {
+    if (elapsed == durationLimit) {
       clearInterval(intervalId);
       setTimeout(() => {
         Stop()
       }, 1000)
     }
 
-    if (elapsed > global.videoDuration) {
+    if (elapsed > durationLimit) {
       RecordScreen.stopRecording()
         .then(() => {
           global.isMic = false;
@@ -387,8 +406,9 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
 
   }, [isFocused])
 
-  const OpenShakebug = async () => {
-    if (!isBugReportingEnabled()) {
+  const OpenShakebug = async (bypassShakeCheck = false) => {
+    if (!bypassShakeCheck && !isBugReportingEnabled()) {
+      log.warn("OpenShakebug aborted: Bug reporting is disabled.");
       return;
     }
     setIsScreenShot(true)
@@ -406,8 +426,14 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
           setTriggred(false)
           global.isShakebugSDKOpen = true
           navigate("FirstScreen", { img: `${ImgUrl}`, themeColor: `${themeColor}`, SDKScreenTitle: `${SDKScreenTitle}` })
+        } else {
+          log.warn("OpenShakebug aborted: Screenshot capture returned null.");
         }
+      } else {
+        log.warn("OpenShakebug aborted: isShow is true (currently recording).");
       }
+    } else {
+      log.warn("OpenShakebug aborted: Missing application_id or session_id. App_Id:", global.application_id, "Session_Id:", global.session_id);
     }
   }
 

package/src/Screens/Shakebug.js

@@ -49,7 +49,7 @@ global.isRecording = false
 global.isScreenShotDetected = false
 global.ShakebugLanguage = "ENGLISH"
 global.makeLogEnabled = false
-global.ShakebugSDKEndPointURL = "https://www.shakebug.com/api/v1.5/webservice.php/";
+global.ShakebugSDKEndPointURL = "https://www.shakebug.com/api/v1.6/webservice.php/";
 global.ShakebugSDKEndPointURLheaderKey = 'MarchShake2022';
 global.AllowVideo = false;
 global.total_video = 0;
@@ -63,7 +63,7 @@ global.isScreeenShotTaken = false;
 global.restrictedViews = [];
 global.currentScreen = ""
 global.isShakebugSDKOpen = false;
-global.sdk_version = "2.4.10";
+global.sdk_version = "2.4.11";
 global.app_lunch_count = 0;
 global.POPUP_LAUNCH_THRESHOLD = 3;
 global.POPUP_COOLDOWN_DAYS = 2;
@@ -75,7 +75,12 @@ global.allowEvent = true;
 global.allowReview = true;
 global.allowSession = true;
 global.shakebug_type = "1"; // default allow all
-
+global.sdk_platform = "react-native";
+try {
+  global.sdk_platform_version = require("react-native/package.json").version;
+} catch (error) {
+  global.sdk_platform_version = "";
+}
 
 const ShakebugContext = React.createContext();
 
@@ -204,7 +209,7 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
   const [focusedScreen, setFocusedScreen] = useState('');
   global.ShakebugLanguage = ShakebugLanguage;
   global.makeLogEnabled = makeLogEnabled;
-  global.ShakebugSDKEndPointURL = setShakebugSDKEndPointURL[0].length > 0 ? setShakebugSDKEndPointURL[0] : "https://www.shakebug.com/api/v1.5/webservice.php/";
+  global.ShakebugSDKEndPointURL = setShakebugSDKEndPointURL[0].length > 0 ? setShakebugSDKEndPointURL[0] : "https://www.shakebug.com/api/v1.6/webservice.php/";
   global.ShakebugSDKEndPointURLheaderKey = setShakebugSDKEndPointURL[1].length > 0 ? setShakebugSDKEndPointURL[1] : "MarchShake2022";
 
 
@@ -291,12 +296,12 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
           const afterDaysTimestamp = now + sevenDaysInMs;
 
           if (LAST_POPUP_TIME > afterDaysTimestamp) {
-            setShowModal(true)
+            setTimeout(() => { setShowModal(true) }, 15000);
           }
 
         }
         else if (IS_REVIEW_SUBMITTED != "true") {
-          setShowModal(true)
+          setTimeout(() => { setShowModal(true) }, 15000);
         }
       }
 

package/src/index.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import Shakebug, { AddEvent } from '../src/Screens/Shakebug';
 import { getLocales } from '../GetLocals/src';
-import { NativeModules, Text, View, findNodeHandle } from 'react-native';
+import { NativeModules, Text, View, findNodeHandle, DeviceEventEmitter } from 'react-native';
 import { useGlobalState } from './Componanats/GlobalStateContext'
 import { CustomUserIdApi } from './APIs/CustomUserId'
 import { FetchRemoteCodeAPI } from './APIs/FetchRemoteCodeAPI';
@@ -42,7 +42,7 @@ const ShakebugView: React.FC<ShakebugViewProps> = ({
   allowCrashReport = true,
   makeLogEnabled = false,
   ShakebugLanguage = LocalLanguage != -1 ? Languages[LocalLanguage] : "ENGLISH",
-  setShakebugSDKEndPointURL = ["https://www.shakebug.com/api/v1.5/webservice.php/", "MarchShake2022", ""]
+  setShakebugSDKEndPointURL = ["https://www.shakebug.com/api/v1.6/webservice.php/", "MarchShake2022", ""]
 }) => {
 
   return (
@@ -75,6 +75,7 @@ export const triggerBugReporting = (): void => {
   }
   global.isShakebugOpen = false;
   global.isTrigger = true;
+  DeviceEventEmitter.emit('TriggerBugReportingEvent');
 }
 
 export const ShakebugSdkProtectedView = ({ children }) => {

package/Volumes:.fileloc

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>URL</key>
-	<string>file:///Volumes/Data/React-Native/expenzo/node_modules/shakebug-react-native/src</string>
-</dict>
-</plist>