Update HyperTrack SDK React Native to 14.0.0 (#44)

Author: pavel-kuznetsov-hypertrack

ios/Podfile.lock

@@ -14,9 +14,9 @@ PODS:
   - hermes-engine (0.72.17):
     - hermes-engine/Pre-built (= 0.72.17)
   - hermes-engine/Pre-built (0.72.17)
-  - HyperTrack (5.10.0)
-  - hypertrack-sdk-react-native (13.8.0):
-    - HyperTrack (= 5.10.0)
+  - HyperTrack (5.11.0)
+  - hypertrack-sdk-react-native (14.0.0):
+    - HyperTrack (= 5.11.0)
     - React-Core
   - libevent (2.1.12)
   - RCT-Folly (2021.07.22.00):
@@ -578,8 +578,8 @@ SPEC CHECKSUMS:
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
   hermes-engine: 982096772bd947125ee3b4f72ace6cb9a33f1d02
-  HyperTrack: d6dd275a8e067e7c81859fc73edc095c981813d5
-  hypertrack-sdk-react-native: 69689d816e499fab7bc73fd1076696ad491236aa
+  HyperTrack: aa6f271e6f9b1339790667c20e281e470531cc21
+  hypertrack-sdk-react-native: 43c21686055bd0336c0573728515a5dd1993882d
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   RCT-Folly: 8dc08ca5a393b48b1c523ab6220dfdcc0fe000ad
   RCTRequired: 01c639ec840ee03928b2d65f5cd5297d737b3834

ios/QuickstartReactNative.xcodeproj/xcshareddata/xcschemes/QuickstartReactNative.xcscheme

@@ -62,7 +62,7 @@
       </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"

justfile

@@ -1,13 +1,15 @@
 alias a := add-plugin
 alias al := add-plugin-local
 alias ap := add-plugin
-alias c := compile
+alias c := clean
+alias cm := compile
 alias cn := clear-nm
 alias epn := extract-plugin-nm
 alias ogp := open-github-prs
 alias oi := open-ios
 alias pi := pod-install
 alias ra := run-android
+alias s := setup
 alias sm := start-metro
 alias us := update-sdk
 alias v := version
@@ -79,6 +81,9 @@ add-plugin-local: hooks
 
     just pod-install
 
+clean:
+    just clear-nm
+
 clear-nm: hooks
     rm -rf node_modules
     rm yarn.lock
@@ -112,6 +117,10 @@ pod-install:
 run-android: hooks compile
     npx react-native run-android
 
+setup: hooks
+    yarn
+    just pi
+
 start-metro: hooks compile
     npx react-native start
 

package.json

@@ -10,10 +10,10 @@
     "test": "jest"
   },
   "dependencies": {
-    "hypertrack-sdk-react-native": "13.8.0",
-    "hypertrack-sdk-react-native-plugin-android-activity-service-google": "13.8.0",
-    "hypertrack-sdk-react-native-plugin-android-location-services-google": "13.8.0",
-    "hypertrack-sdk-react-native-plugin-android-push-service-firebase": "13.8.0",
+    "hypertrack-sdk-react-native": "14.0.0",
+    "hypertrack-sdk-react-native-plugin-android-activity-service-google": "14.0.0",
+    "hypertrack-sdk-react-native-plugin-android-location-services-google": "14.0.0",
+    "hypertrack-sdk-react-native-plugin-android-push-service-firebase": "14.0.0",
     "react": "18.2.0",
     "react-native": "0.72.17",
     "react-native-permissions": "^4.1.5"

src/App.tsx

@@ -42,7 +42,7 @@ const App = () => {
   const [isAvailableState, setIsAvailableState] = useState(false);
   const [isTrackingState, setIsTrackingState] = useState(false);
   const [locationState, setLocationState] = useState('');
-  const [ordersState, setOrdersState] = useState(new Map<string, Order>());
+  const [ordersState, setOrdersState] = useState('N/A');
 
   const errorsListener = useRef<EmitterSubscription | null | undefined>(null);
   const isAvailableListener = useRef<EmitterSubscription | null | undefined>(
@@ -88,7 +88,7 @@ const App = () => {
          * (to remove the link between the device and the worker)
          **/
         HyperTrack.setWorkerHandle(
-          `test_driver_quickstart_react_native_${platformName}`,
+          `test_worker_quickstart_react_native_${platformName}`,
         );
         console.log('workerHandle is set');
 
@@ -125,9 +125,10 @@ const App = () => {
         );
 
         ordersListener.current = HyperTrack.subscribeToOrders(
-          (orders: Map<string, Order>) => {
+          async (orders: Map<string, Order>) => {
             console.log('Listener orders: ', orders);
-            setOrdersState(orders);
+            const text = await getOrdersResponseText(orders);
+            setOrdersState(text);
           },
         );
       } catch (error) {
@@ -216,7 +217,7 @@ const App = () => {
     const allowMockLocation = await HyperTrack.getAllowMockLocation();
     console.log('AllowMockLocation:', allowMockLocation);
     Alert.alert('AllowMockLocation', `${allowMockLocation}`);
-  }
+  };
 
   const getErrors = async () => {
     const errors = await HyperTrack.getErrors();
@@ -261,7 +262,8 @@ const App = () => {
   const getOrders = async () => {
     const orders = await HyperTrack.getOrders();
     console.log('Orders:', orders);
-    Alert.alert('Orders', getOrdersText(orders));
+    const text = await getOrdersResponseText(orders);
+    Alert.alert('Orders', text);
   };
 
   const locate = async () => {
@@ -284,7 +286,7 @@ const App = () => {
   const setAllowMockLocation = async (allowMockLocation: boolean) => {
     HyperTrack.setAllowMockLocation(allowMockLocation);
     console.log('setAllowMockLocation', allowMockLocation);
-  }
+  };
 
   const setIsAvailable = async (isAvailable: boolean) => {
     HyperTrack.setIsAvailable(isAvailable);
@@ -306,16 +308,7 @@ const App = () => {
         </Text>
 
         <Text style={styles.titleText}>Orders:</Text>
-        {Array.from(ordersState.values()).map(order => {
-          return (
-            <View key={order.orderHandle}>
-              <Text selectable style={styles.text}>
-                {order.orderHandle}
-              </Text>
-              <Text>{getIsInsideGeofenceText(order.isInsideGeofence)}</Text>
-            </View>
-          );
-        })}
+        <Text style={styles.text}>{ordersState}</Text>
 
         <Text style={styles.titleText}>{'Location'}</Text>
         <Text style={styles.text}>{locationState}</Text>
@@ -386,9 +379,18 @@ const App = () => {
         </View>
 
         <View style={styles.buttonWrapper}>
-          <Button title="Allow Mock Location" onPress={() => setAllowMockLocation(true)} />
-          <Button title="Disallow Mock Location" onPress={() => setAllowMockLocation(false)} />
-          <Button title="Get Allow Mock Location" onPress={getAllowMockLocation} />
+          <Button
+            title="Allow Mock Location"
+            onPress={() => setAllowMockLocation(true)}
+          />
+          <Button
+            title="Disallow Mock Location"
+            onPress={() => setAllowMockLocation(false)}
+          />
+          <Button
+            title="Get Allow Mock Location"
+            onPress={getAllowMockLocation}
+          />
         </View>
       </ScrollView>
     </SafeAreaView>
@@ -410,6 +412,17 @@ function getLocateResponseText(response: Result<Location, HyperTrackError[]>) {
   }
 }
 
+function getLocationErrorResponseText(locationError: LocationError) {
+  switch (locationError.type) {
+    case 'notRunning':
+      return 'Not running';
+    case 'starting':
+      return 'Starting';
+    case 'errors':
+      return `Errors:\n${getErrorsText(locationError.value)}`;
+  }
+}
+
 function getLocationResponseText(
   response: Result<Location, LocationError>,
 ): string {
@@ -421,16 +434,7 @@ function getLocationResponseText(
         4,
       )}`;
     case 'failure':
-      switch (response.value.type) {
-        case 'notRunning':
-          return 'Not running';
-        case 'starting':
-          return 'Starting';
-        case 'errors':
-          return `Errors:\n${getErrorsText(response.value.value)}`;
-      }
-    default:
-      return `Unknown response: $response`;
+      return getLocationErrorResponseText(response.value);
   }
 }
 
@@ -445,14 +449,31 @@ function getLocationWithDeviationResponseText(
         4,
       )}\nDeviation: ${response.value.deviation}`;
     case 'failure':
-      switch (response.value.type) {
-        case 'notRunning':
-          return 'Not running';
-        case 'starting':
-          return 'Starting';
-        case 'errors':
-          return `Errors:\n${getErrorsText(response.value.value)}`;
-      }
+      return getLocationErrorResponseText(response.value);
+  }
+}
+
+async function getOrdersResponseText(orders: Map<string, Order>) {
+  if (orders.size === 0) {
+    return 'No orders';
+  } else {
+    return await Promise.all(
+      Array.from(orders).map(async ([_, order]) => {
+        let isInsideGeofenceText: string;
+        const isInsideGeofence = await order.isInsideGeofence();
+        switch (isInsideGeofence.type) {
+          case 'success':
+            isInsideGeofenceText = isInsideGeofence.value.toString();
+            break;
+          case 'failure':
+            isInsideGeofenceText = getLocationErrorResponseText(
+              isInsideGeofence.value,
+            );
+            break;
+        }
+        return `Order: ${order.orderHandle}\nIsInsideGeofence: ${isInsideGeofenceText}`;
+      }),
+    ).then(texts => texts.join('\n'));
   }
 }
 
@@ -472,34 +493,6 @@ function getErrorsText(errors: HyperTrackError[]) {
   }
 }
 
-function getIsInsideGeofenceText(
-  isInsideResult: Result<boolean, LocationError>,
-) {
-  switch (isInsideResult.type) {
-    case 'success':
-      return isInsideResult.value.toString();
-    case 'failure':
-      switch (isInsideResult.value.type) {
-        case 'notRunning':
-          return 'Not running';
-        case 'starting':
-          return 'Starting';
-        case 'errors':
-          return `Errors:\n${getErrorsText(isInsideResult.value.value)}`;
-      }
-  }
-}
-
-function getOrdersText(orders: Map<string, Order>) {
-  return Array.from(orders.values())
-    .map(order => {
-      return `${order.orderHandle}:\n\t\t${getIsInsideGeofenceText(
-        order.isInsideGeofence,
-      )}`;
-    })
-    .join('\n');
-}
-
 const styles = StyleSheet.create({
   container: {
     flex: 1,