fix(#218): monitor network in background when sharing with iOS

Author: pmigueld

machines/request.ts

@@ -129,6 +129,8 @@ export const requestMachine =
             actions: 'switchProtocol',
           },
         ],
+
+        OFFLINE: 'offline',
       },
       states: {
         inactive: {
@@ -173,10 +175,6 @@ export const requestMachine =
               },
             },
           },
-
-          on: {
-            APP_ACTIVE: 'checkingNetwork',
-          },
         },
 
         bluetoothDenied: {
@@ -479,9 +477,15 @@ export const requestMachine =
 
         offline: {
           on: {
-            ONLINE: 'checkingBluetoothService',
+            OFFLINE: {
+              internal: true,
+            },
+            SCREEN_FOCUS: 'checkingNetwork',
             APP_ACTIVE: 'checkingNetwork',
           },
+          after: {
+            500: 'checkingNetwork',
+          },
         },
       },
     },
@@ -775,6 +779,15 @@ export const requestMachine =
             );
 
             return () => subscription.remove();
+          } else {
+            return NetInfo.addEventListener((state) => {
+              callback({
+                type:
+                  state.isConnected && state.isInternetReachable
+                    ? 'ONLINE'
+                    : 'OFFLINE',
+              });
+            });
           }
         },
 

machines/request.typegen.ts

@@ -9,6 +9,9 @@ export interface Typegen0 {
       data: unknown;
       __tip: 'See the XState TS docs to learn how to strongly type this.';
     };
+    'xstate.after(500)#request.offline': {
+      type: 'xstate.after(500)#request.offline';
+    };
     'xstate.after(CANCEL_TIMEOUT)#request.cancelling': {
       type: 'xstate.after(CANCEL_TIMEOUT)#request.cancelling';
     };
@@ -50,6 +53,7 @@ export interface Typegen0 {
       | 'CANCEL'
       | 'FACE_INVALID'
       | 'FACE_VALID'
+      | 'OFFLINE'
       | 'REJECT'
       | 'SCREEN_BLUR'
       | 'SCREEN_FOCUS'
@@ -59,6 +63,7 @@ export interface Typegen0 {
       | ''
       | 'DISCONNECT'
       | 'DISMISS'
+      | 'OFFLINE'
       | 'SCREEN_BLUR'
       | 'SCREEN_FOCUS'
       | 'SWITCH_PROTOCOL'
@@ -76,6 +81,7 @@ export interface Typegen0 {
       | 'xstate.after(CLEAR_DELAY)#request.clearingConnection';
     removeLoggers:
       | 'DISMISS'
+      | 'OFFLINE'
       | 'SCREEN_BLUR'
       | 'xstate.after(CLEAR_DELAY)#request.clearingConnection'
       | 'xstate.init';
@@ -117,9 +123,13 @@ export interface Typegen0 {
       | 'SCREEN_FOCUS'
       | 'SWITCH_PROTOCOL'
       | 'xstate.after(CANCEL_TIMEOUT)#request.cancelling';
-    checkNetwork: 'APP_ACTIVE' | 'SCREEN_FOCUS' | 'SWITCH_PROTOCOL';
+    checkNetwork:
+      | 'APP_ACTIVE'
+      | 'SCREEN_FOCUS'
+      | 'SWITCH_PROTOCOL'
+      | 'xstate.after(500)#request.offline';
     exchangeDeviceInfo: 'RECEIVE_DEVICE_INFO';
-    monitorConnection: 'xstate.init';
+    monitorConnection: 'OFFLINE' | 'xstate.init';
     receiveVc: 'EXCHANGE_DONE' | 'RECEIVE_DEVICE_INFO';
     requestBluetooth: 'BLUETOOTH_DISABLED';
     sendDisconnect: 'CANCEL';

machines/scan.ts

@@ -117,6 +117,10 @@ export const scanMachine =
         SCREEN_FOCUS: {
           target: '.checkingLocationService',
         },
+        OFFLINE: {
+          cond: 'isModeOnline',
+          target: '.offline',
+        },
       },
       states: {
         inactive: {
@@ -457,8 +461,8 @@ export const scanMachine =
           },
 
           on: {
-            OFFLINE: 'offline',
             ONLINE: 'preparingToConnect',
+            OFFLINE: 'offline',
           },
         },
 
@@ -662,6 +666,15 @@ export const scanMachine =
             );
 
             return () => subscription.remove();
+          } else {
+            return NetInfo.addEventListener((state) => {
+              callback({
+                type:
+                  state.isConnected && state.isInternetReachable
+                    ? 'ONLINE'
+                    : 'OFFLINE',
+              });
+            });
           }
         },
 

machines/scan.typegen.ts

@@ -52,13 +52,15 @@ export interface Typegen0 {
     clearCreatedVp:
       | 'DISCONNECT'
       | 'DISMISS'
+      | 'OFFLINE'
       | 'SCREEN_BLUR'
       | 'SCREEN_FOCUS'
       | 'xstate.after(CANCEL_TIMEOUT)#scan.reviewing.cancelling'
       | 'xstate.stop';
     clearReason:
       | 'DISCONNECT'
       | 'DISMISS'
+      | 'OFFLINE'
       | 'SCREEN_BLUR'
       | 'SCREEN_FOCUS'
       | 'xstate.after(CANCEL_TIMEOUT)#scan.reviewing.cancelling'
@@ -72,6 +74,7 @@ export interface Typegen0 {
       | 'DISCONNECT'
       | 'DISMISS'
       | 'LOCATION_ENABLED'
+      | 'OFFLINE'
       | 'SCREEN_BLUR'
       | 'SCREEN_FOCUS'
       | 'xstate.after(CANCEL_TIMEOUT)#scan.reviewing.cancelling'
@@ -82,6 +85,7 @@ export interface Typegen0 {
       | 'ACCEPT_REQUEST'
       | 'CANCEL'
       | 'DISCONNECT'
+      | 'OFFLINE'
       | 'SCREEN_BLUR'
       | 'SCREEN_FOCUS'
       | 'VERIFY_AND_ACCEPT_REQUEST'
@@ -126,7 +130,7 @@ export interface Typegen0 {
       | 'done.invoke.scan.reviewing.creatingVp:invocation[0]';
   };
   'eventsCausingGuards': {
-    isModeOnline: 'CONNECTED';
+    isModeOnline: 'CONNECTED' | 'OFFLINE';
     isQrOffline: 'SCAN';
     isQrOnline: 'SCAN';
   };