shakebug-react-native 2.2.9 → 2.3.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shakebug-react-native",
   "title": "shakebug-react-native",
-  "version": "2.2.9",
+  "version": "2.3.1",
   "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",
   "scripts": {
@@ -29,7 +29,6 @@
   "readmeFilename": "README.md",
   "dependencies": {
     "@react-navigation/native": "^6.1.9",
-    "html2canvas": "^1.4.1",
     "react-native-logs": "^5.1.0",
     "rxjs": "^7.8.1",
     "typescript": "^5.3.3"
@@ -42,4 +41,4 @@
     "flow-bin": "^0.170.0",
     "html-webpack-plugin": "^5.5.1"
   }
-}
+}

package/src/APIs/AddIssue.js

@@ -12,14 +12,11 @@ async function AddIssueApi(session_id, application_id, path, isVideo, desc, emai
 
         const Custom_User_Id = await ShakebugSDKSharedPreferencesModule.getString('custom_user_id')
 
-        let i = 0;
         let internetType = "";
-        NetInfo.addEventListener(stat => {
-            if (i == 0) {
-                internetType = stat.type
-            }
-            i++
-        })
+        try {
+            const stat = await NetInfo.fetch();
+            internetType = stat.type;
+        } catch(e) {}
 
         let batteryLevel = parseFloat(await DeviceInfo.getBatteryLevel() * 100).toFixed(0);
         let architecture = await DeviceInfo.supportedAbis();
@@ -29,8 +26,8 @@ async function AddIssueApi(session_id, application_id, path, isVideo, desc, emai
         let appversion = DeviceInfo.getVersion();
         let memory = await DeviceInfo.getTotalMemory() - await DeviceInfo.getUsedMemory()
         let osversion = await DeviceInfo.getSystemVersion()
-        const type = isVideo ? 'video/mp4' : 'image/png';
-        const name = isVideo ? 'video' : 'photo.png';
+        const type = isVideo ? 'video/mp4' : 'image/jpg';
+        const name = isVideo ? 'video.mp4' : 'photo.jpg';
         const media = isVideo ? `file://'${path}` : path;
 
 
@@ -40,7 +37,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", media);
+        formData.append("image", {uri: media, name: name, type: type});
         formData.append("memory", memory);
         formData.append("email", email);
         formData.append("devicemodel", `${architecture[0]} -- ${model}`);

package/src/APIs/MatchKey.js

@@ -27,7 +27,8 @@ async function MatchKeyApi(appkey, BundleId) {
             const total_video = data.response_data.total_video;
             const used_video = data.response_data.used_video;
             const video_duration = data.response_data.video_duration; 
-            return { success: true, application_id, total_mau, used_mau, total_video, used_video, video_duration, message: data.msg };
+            const shakebug_type = data.response_data.shakebug_type;
+            return { success: true, application_id, total_mau, used_mau, total_video, used_video, video_duration, shakebug_type, message: data.msg };
         } else {
             return { success: false, message: data.msg };
         }

package/src/APIs/StartSession.js

@@ -14,8 +14,11 @@ async function SessionStartApi(latitude, longitude, application_id) {
 
     if (latitude != "" && latitude != undefined && longitude != "" && longitude != undefined) {
         try {
+            let BundleId = DeviceInfo.getBundleId ? DeviceInfo.getBundleId() : "UnknownApp";
+            
             await fetch(
                 `https://nominatim.openstreetmap.org/reverse?format=json&lat=${latitude}&lon=${longitude}`,
+                { headers: { 'User-Agent': `Shakebug-SDK-Mobile-${BundleId}` } }
             )
                 .then(response => response.json())
                 .then(async data => {
@@ -93,8 +96,7 @@ async function SessionStartApi(latitude, longitude, application_id) {
             return { success: false, message: data.msg };
         }
     } catch (error) {
-        // console.error('Error fetching data:', error);
-        // throw error;
+        return { success: false, message: "Network request failed. Please check your connection." };
     }
 }
 

package/src/Componanats/ErrorHandler.js

@@ -15,14 +15,11 @@ const AddCrashApi = async (desc) => {
     let memory = await DeviceInfo.getTotalMemory() - await DeviceInfo.getUsedMemory()
     let osversion = await DeviceInfo.getSystemVersion()
 
-    let i = 0;
     let internetType = "";
-    NetInfo.addEventListener(stat => {
-        if (i == 0) {
-            internetType = stat.type
-        }
-        i++
-    })
+    try {
+        const stat = await NetInfo.fetch();
+        internetType = stat.type;
+    } catch(e) {}
 
     const arr = {
         session_id: global.session_id,
@@ -72,8 +69,12 @@ const setGlobalErrorHandler = () => {
 // Function to handle unhandled promise rejections
 const captureUnhandledRejections = () => {
     // Listen for unhandled promise rejections
+    const originalHandler = window.onunhandledrejection;
     window.onunhandledrejection = (reason, promise) => {
         logError(reason, false);
+        if (typeof originalHandler === 'function') {
+            originalHandler(reason, promise);
+        }
     };
 };
 

package/src/Componanats/ShakeFunction.js

@@ -16,6 +16,8 @@ import { useGlobalState } from 'shakebug-react-native/src/Componanats/GlobalStat
 
 LogBox.ignoreAllLogs()
 
+let stopWatchIntervalId = null;
+
 const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitle, allowToReportBugByShaking, allowToReportBugByScreenCapture, allowCrashReport }) => {
 
   const { ShakebugSDKScreenShotDetector, ShakebugSDKSharedPreferencesModule, ShakebugSDKCustomScreenCapture} = NativeModules;
@@ -33,7 +35,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
 
     useEffect(() => {
       const subscription = DeviceEventEmitter.addListener('ScreenshotTaken', async () => {
-        if (allowToReportBugByScreenCapture == true) {
+        if (allowToReportBugByScreenCapture == true && global.isFeatureEnabled?.('2')) {
           if (!global.isScreenShotDetected && global.application_id != "" && global.application_id != undefined) {
             OpenShakebug()
           }
@@ -49,7 +51,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
       const subscription = screenShotEmitter.addListener(
         'ScreenshotTaken',
         (event) => {
-          if (allowToReportBugByScreenCapture == true) {
+          if (allowToReportBugByScreenCapture == true && global.isFeatureEnabled?.('2')) {
             // setIsScreenShot(true)
             if (!global.isScreenShotDetected && global.application_id != "" && global.application_id != undefined) {
               OpenShakebug()
@@ -132,7 +134,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
       iscrashSaveed = await ShakebugSDKSharedPreferencesModule.getString('iscrashSaveed')
       const Custom_User_Id = await ShakebugSDKSharedPreferencesModule.getString('custom_user_id')
 
-      if (iscrashSaveed.length > 10 && allowCrashReport) {
+      if (iscrashSaveed.length > 10 && allowCrashReport && global.isFeatureEnabled?.('4')) {
 
         let data = JSON.parse(iscrashSaveed)
 
@@ -195,7 +197,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
       global.isDraw = false;
       global.isShow = false;
       startTimeRef.current = null
-      clearInterval(intervalId);
+      if (stopWatchIntervalId) clearInterval(stopWatchIntervalId);
       setIsLoading(false)
       global.isRecording = false;
       navigate("AddDetailsScreen", { media: res.result.outputURL, mediaType: 'Recordvideo', themeColor: themeColor, SDKScreenTitle: `${SDKScreenTitle}` })
@@ -232,13 +234,13 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
     return () => {
       // AppState.removeEventListener('change', handleAppStateChange);
       AppStateListener.remove()
-      clearInterval(intervalId);
+      if (stopWatchIntervalId) clearInterval(stopWatchIntervalId);
     };
   }, []);
 
   const startTimer = () => {
     startTimeRef.current = Date.now();
-    intervalId = setInterval(() => {
+    stopWatchIntervalId = setInterval(() => {
       if (global.isRecording) {
         const elapsed = Math.floor((Date.now() - startTimeRef.current) / 1000);
         updateTimer(elapsed);
@@ -251,7 +253,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
     const sec = parseInt(elapsed % 60);
 
     if (elapsed == global.videoDuration) {
-      clearInterval(intervalId);
+      if (stopWatchIntervalId) clearInterval(stopWatchIntervalId);
       setTimeout(() => {
         Stop()
       }, 1000)
@@ -269,7 +271,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
           global.isDraw = false;
           global.isShow = false;
           startTimeRef.current = null
-          clearInterval(intervalId);
+          if (stopWatchIntervalId) clearInterval(stopWatchIntervalId);
         })
     }
 
@@ -282,10 +284,14 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
     let xdata = 0;
     let ydata = 0;
     let zdata = 0;
+    let isMounted = true;
+    let localSubscription = null;
+    let localPollingInterval = null;
 
     DeviceInfo.isEmulator().then(res => {
-      if (!res && isRecording == false && allowToReportBugByShaking !== false) {
-        const subscription = accelerometer.subscribe(async ({ x, y, z, timestamp }) => {
+      if (!isMounted) return;
+      if (!res && global.isRecording == false && allowToReportBugByShaking !== false && global.isFeatureEnabled?.('2')) {
+        localSubscription = accelerometer.subscribe(async ({ x, y, z, timestamp }) => {
 
           let calculate = Math.sqrt(x * x + y * y + z * z);
 
@@ -304,7 +310,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
                 const ImgUrl = await ref.current.capture()
                 if (!isShow) {
                   if (ImgUrl != undefined || ImgUrl != null) {
-                    subscription.unsubscribe();
+                    if (localSubscription) localSubscription.unsubscribe();
                     global.IsBackground = false
                     global.isShakebugSDKOpen = true
                     navigate("FirstScreen", { img: `${ImgUrl}`, themeColor: `${themeColor}`, SDKScreenTitle: `${SDKScreenTitle}` })
@@ -333,7 +339,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
        
                 }
                 if (ImgUrl != undefined || ImgUrl != null) {
-                  subscription.unsubscribe();
+                  if (localSubscription) localSubscription.unsubscribe();
                   global.isShakebugSDKOpen = true
                   navigate("FirstScreen", { img: `${ImgUrl}`, themeColor: `${themeColor}`, SDKScreenTitle: `${SDKScreenTitle}` })
                 }
@@ -350,7 +356,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
         })
 
         if (isFocused == false) {
-          subscription.unsubscribe()
+          if (localSubscription) localSubscription.unsubscribe()
           xdata = 0;
           ydata = 0;
           zdata = 0;
@@ -359,7 +365,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
         }
       }
       else {
-        setInterval(() => {
+        localPollingInterval = setInterval(() => {
           if (global.isTrigger == true && global.isShakebugOpen == false) {
             global.isShakebugOpen = true;
             global.isTrigger = true;
@@ -369,6 +375,16 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
       }
     })
 
+    return () => {
+      isMounted = false;
+      if (localSubscription) {
+        localSubscription.unsubscribe();
+      }
+      if (localPollingInterval) {
+        clearInterval(localPollingInterval);
+      }
+    };
+
   }, [isFocused])
 
   const OpenShakebug = async () => {

package/src/Screens/Shakebug.js

@@ -24,6 +24,7 @@ import { SafeAreaView } from 'react-native-safe-area-context';
 
 console.ignoredYellowBox = ["Warning: Each", "Warning: Failed"];
 
+export const ShakebugPropsContext = React.createContext({});
 
 global.session_id = "";
 global.application_id = "";
@@ -52,11 +53,19 @@ global.isScreeenShotTaken = false;
 global.restrictedViews = [];
 global.currentScreen = ""
 global.isShakebugSDKOpen = false;
-global.sdk_version = "2.2.9";
+global.sdk_version = "2.3.0";
 global.app_lunch_count = 0;
 global.POPUP_LAUNCH_THRESHOLD = 3;
 global.POPUP_COOLDOWN_DAYS = 2;
 global.KEY_REVIEW_SUBMITTED = false;
+global.shakebug_type = "";
+
+global.isFeatureEnabled = (id) => {
+  if (!global.shakebug_type) return false;
+  const types = global.shakebug_type.split(',').map(s => s.trim());
+  if (types.includes('1')) return true;
+  return types.includes(id.toString());
+};
 
 function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirstTime, ShakebugThemeColor, changeSDKScreenTitle, allowToReportBugByShakingMobile, allowToReportBugByScreenCapture, allowCrashReport, ShakebugLanguage, makeLogEnabled, setShakebugSDKEndPointURL }) {
 
@@ -156,12 +165,12 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
 
           const afterDaysTimestamp = now + sevenDaysInMs;
 
-          if (LAST_POPUP_TIME > afterDaysTimestamp) {
+          if (LAST_POPUP_TIME > afterDaysTimestamp && global.isFeatureEnabled?.('6')) {
             setShowModal(true)
           }
 
         }
-        else if (IS_REVIEW_SUBMITTED != "true") {
+        else if (IS_REVIEW_SUBMITTED != "true" && global.isFeatureEnabled?.('6')) {
           setShowModal(true)
         }
       }
@@ -237,7 +246,7 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
     }
 
     let i = 0;
-    NetInfo.addEventListener(state => {
+    const unsubscribe = NetInfo.addEventListener(state => {
       if (i == 0) {
         if (state.isConnected == true) {
           fetchData()
@@ -249,6 +258,12 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
       }
       i++;
     })
+
+    return () => {
+      if (unsubscribe) {
+        unsubscribe();
+      }
+    };
   }, [Android_appkey, iOS_appkey])
 
 
@@ -264,7 +279,7 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
             StartSession()
         }
         else if (nextAppState == "background" || nextAppState == 'inactive') {
-          if (global.session_id != "" && global.IsBackground == 'true') {
+          if (global.session_id != "" && global.IsBackground == 'true' && global.isFeatureEnabled?.('3')) {
             async function FetchEndSessionData() {
               try {
                 const { success, message } = await SessionEndApi(global.session_id);
@@ -304,9 +319,10 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
     try {
       let BundleId = DeviceInfo.getBundleId();
 
-      const { success, application_id: newApplication_id, message, total_mau, used_mau, total_video, used_video, video_duration } = await MatchKeyApi(appkey, BundleId);
+      const { success, application_id: newApplication_id, message, total_mau, used_mau, total_video, used_video, video_duration, shakebug_type } = await MatchKeyApi(appkey, BundleId);
 
       global.videoDuration = video_duration;
+      global.shakebug_type = shakebug_type || "";
 
       if (success) {
         if (total_video == "Unlimited") {
@@ -362,7 +378,7 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
 
   // For call Startsesstion and get session id 
   const StartSession = async () => {
-    if (global.session_id == "") {
+    if (global.session_id == "" && global.isFeatureEnabled?.('3')) {
       try {
         const { success, session_id: newSessionId, message } = await SessionStartApi(global.latitude, global.longitude, global.application_id);
         if (success) {
@@ -389,67 +405,9 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
     })
   }
 
-  // For shakeFunctionscreen with childern as props
-  const ShakeScreen = () => {
-
-    DeviceInfo.isEmulator()
-      .then(res => {
-        global.isRealDevice = !res
-      })
-
-    return (
-      <ShakeFunction isRealDevice={global.isRealDevice} themeColor={ThemeColor} showTutorialScreen={showTutorialScreenFirstTime} SDKScreenTitle={[FirstScreenTitle, SecondScreenTitle]} allowToReportBugByShaking={allowToReportBugByShakingMobile} allowToReportBugByScreenCapture={allowToReportBugByScreenCapture} allowCrashReport={allowCrashReport} ShakebugLanguage={ShakebugLanguage}>
-        {children}
-      </ShakeFunction>
-    )
-  }
-
   // For handel error globaly
   setGlobalErrorHandler()
 
-  const { width } = Dimensions.get('window');
-
-  // For register all screen
-  const screens = {
-    ShakebugHome: ShakeScreen,
-    TutorialScreen: TutorialScreen,
-    FirstScreen: FirstScreen,
-    TrimVideoScreen: TrimVideoScreen,
-    AddDetailsScreen: AddDetailsScreen
-  };
-
-  // For navigation in register screen
-  const NavigationContainer = () => {
-    const { navigationState } = useNavigation();
-    const animation = React.useRef(new Animated.Value(0)).current;
-
-    React.useEffect(() => {
-      Animated.timing(animation, {
-        toValue: navigationState.length - 1,
-        duration: 300,
-        useNativeDriver: true,
-      }).start();
-    }, [navigationState]);
-
-    return (
-      <View style={styles.container}>
-        {navigationState.map((screen, index) => {
-          const ScreenComponent = screens[screen.name];
-          const translateX = animation.interpolate({
-            inputRange: [index - 1, index, index + 1],
-            outputRange: [width, 0, -width],
-          });
-
-          return (
-            <Animated.View key={index} style={[styles.screen, { transform: [{ translateX }] }]}>
-              <ScreenComponent {...screen.params} />
-            </Animated.View>
-          );
-        })}
-      </View>
-    );
-  };
-
   return (
       <View
         style={{
@@ -457,11 +415,13 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
           height: '100%'
         }}
       >
-        <GlobalStateProvider>
-          <NavigationProvider>
-            <NavigationContainer />
-          </NavigationProvider>
-        </GlobalStateProvider>
+        <ShakebugPropsContext.Provider value={{ ThemeColor, showTutorialScreenFirstTime, FirstScreenTitle, SecondScreenTitle, allowToReportBugByShakingMobile, allowToReportBugByScreenCapture, allowCrashReport, ShakebugLanguage, children }}>
+          <GlobalStateProvider>
+            <NavigationProvider>
+              <NavigationContainerComponent />
+            </NavigationProvider>
+          </GlobalStateProvider>
+        </ShakebugPropsContext.Provider>
 
         <CustomeAlert
           isVisible={isAlert}
@@ -478,12 +438,80 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
   )
 }
 
+const ShakeScreenInner = () => {
+    const props = React.useContext(ShakebugPropsContext);
+
+    useEffect(() => {
+      DeviceInfo.isEmulator()
+        .then(res => {
+          global.isRealDevice = !res
+        })
+    }, []);
+
+    return (
+      <ShakeFunction 
+        isRealDevice={global.isRealDevice} 
+        themeColor={props.ThemeColor} 
+        showTutorialScreen={props.showTutorialScreenFirstTime} 
+        SDKScreenTitle={[props.FirstScreenTitle, props.SecondScreenTitle]} 
+        allowToReportBugByShaking={props.allowToReportBugByShakingMobile} 
+        allowToReportBugByScreenCapture={props.allowToReportBugByScreenCapture} 
+        allowCrashReport={props.allowCrashReport} 
+        ShakebugLanguage={props.ShakebugLanguage}
+      >
+        {props.children}
+      </ShakeFunction>
+    )
+}
+
+const screens = {
+  ShakebugHome: ShakeScreenInner,
+  TutorialScreen: TutorialScreen,
+  FirstScreen: FirstScreen,
+  TrimVideoScreen: TrimVideoScreen,
+  AddDetailsScreen: AddDetailsScreen
+};
+
+const NavigationContainerComponent = () => {
+  const { width } = Dimensions.get('window');
+  const { navigationState } = useNavigation();
+  const animation = React.useRef(new Animated.Value(0)).current;
+
+  React.useEffect(() => {
+    Animated.timing(animation, {
+      toValue: navigationState.length - 1,
+      duration: 300,
+      useNativeDriver: true,
+    }).start();
+  }, [navigationState]);
+
+  return (
+    <View style={styles.container}>
+      {navigationState.map((screen, index) => {
+        const ScreenComponent = screens[screen.name];
+        const translateX = animation.interpolate({
+          inputRange: [index - 1, index, index + 1],
+          outputRange: [width, 0, -width],
+        });
+
+        return (
+          <Animated.View key={index} style={[styles.screen, { transform: [{ translateX }] }]}>
+            <ScreenComponent {...screen.params} />
+          </Animated.View>
+        );
+      })}
+    </View>
+  );
+};
+
 
 export default Shakebug;
 
 // For add event api
 export const AddEvent = async (name, value) => {
 
+  if (!global.isFeatureEnabled?.('5')) return;
+
   const defaultConfig = {
     levels: {
       debug: 0,

package/src/index.tsx

@@ -47,7 +47,7 @@ const ShakebugView: React.FC<ShakebugViewProps> = ({
 }) => {
 
   return (
-    <NavigationContainer>
+    <NavigationContainer independent={true}>
       <Shakebug
         children={children}
         Android_appkey={Android_appkey}