fix: reduce log size

__mocks__/src/utils/Logger.ts

@@ -3,6 +3,6 @@ module.exports = {
   ...jest.requireActual('src/utils/Logger'),
   default: {
     ...jest.requireActual('src/utils/Logger').default,
-    createCombinedLogs: jest.fn(),
+    getLogsToAttach: jest.fn(),
   },
 }

index.js

@@ -19,6 +19,7 @@ import { Text, TextInput } from 'react-native'
 const SENTRY_ENABLED = stringToBoolean(Config.SENTRY_ENABLED || 'false')
 
 Logger.overrideConsoleLogs()
+Logger.cleanupOldLogs()
 
 const defaultErrorHandler = ErrorUtils.getGlobalHandler()
 const customErrorHandler = (e, isFatal) => {

ios/Podfile.lock

@@ -452,7 +452,7 @@ PODS:
     - React-Core
   - react-native-keep-awake (4.0.0):
     - React-Core
-  - react-native-mail (6.0.0):
+  - react-native-mail (6.1.1):
     - React-Core
   - react-native-netinfo (5.8.0):
     - React-Core
@@ -599,7 +599,7 @@ PODS:
     - Firebase/Storage (= 7.11.0)
     - React-Core
     - RNFBApp
-  - RNFS (2.16.6):
+  - RNFS (2.20.0):
     - React-Core
   - RNGestureHandler (1.9.0):
     - React-Core
@@ -1092,7 +1092,7 @@ SPEC CHECKSUMS:
   react-native-fast-crypto: db61bcb2d1224a180449b886f27426a67d7628c0
   react-native-flipper: b9e2e817604af8da0d5a9ba20a8516e780e30f3c
   react-native-keep-awake: 6c078705f3fb2586963b13588d31148adc6bd128
-  react-native-mail: 88305252f4c3fb0157015ff8a7ac9c41b321a0dd
+  react-native-mail: 8fdcd3aef007c33a6877a18eb4cf7447a1d4ce4a
   react-native-netinfo: f3f52e6d92372003b78d5cafa3557797c7beee47
   react-native-plaid-link-sdk: 33cb904b956dc3b56799ac3027de8aa6fbb4b0ab
   react-native-randombytes: b6677f7d495c27e9ee0dbd77ebc97b3c59173729
@@ -1132,7 +1132,7 @@ SPEC CHECKSUMS:
   RNFBMessaging: b05aa2a76ed2b9fd50f05f036c96b26189a1fce2
   RNFBRemoteConfig: e8d462f46e1759a5921d0e4b76d0ab89aef9baee
   RNFBStorage: 48f869205eb5537749cdd4f53689a526728421f8
-  RNFS: 7161a36db9bbdaab96d91fff660820f94e29ca58
+  RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
   RNGestureHandler: 9b7e605a741412e20e13c512738a31bd1611759b
   RNImageCropPicker: 9e0bf18cf4184a846fed55747c8e622208b39947
   RNInAppBrowser: 48b95ba7a4eaff5cc223bca338d3e319561dbd1b

package.json

@@ -147,19 +147,19 @@
     "react-native-config": "https://github.com/luggit/react-native-config#2f68b94",
     "react-native-contacts": "https://github.com/celo-org/react-native-contacts#9940121",
     "react-native-device-info": "^8.3.1",
-    "react-native-email-link": "^1.12.2",
+    "react-native-email-link": "^1.14.0",
     "react-native-exit-app": "https://github.com/wumke/react-native-exit-app#5a022a7",
     "react-native-fast-crypto": "^2.0.0",
     "react-native-flag-secure-android": "https://github.com/kristiansorens/react-native-flag-secure-android#e234251",
-    "react-native-fs": "git+https://github.com/celo-org/react-native-fs#04669ac",
+    "react-native-fs": "^2.20.0",
     "react-native-gesture-handler": "^1.9.0",
     "react-native-google-safetynet": "https://github.com/celo-org/react-native-google-safetynet#8a0355f",
     "react-native-image-crop-picker": "^0.35.1",
     "react-native-inappbrowser-reborn": "^3.5.1",
     "react-native-keep-awake": "^4.0.0",
     "react-native-keychain": "8.0.0",
     "react-native-localize": "^2.1.7",
-    "react-native-mail": "^6.0.0",
+    "react-native-mail": "^6.1.1",
     "react-native-modal": "^13.0.1",
     "react-native-ntp-client": "^1.0.3",
     "react-native-permissions": "^3.0.3",

src/account/SupportContact.test.tsx

@@ -7,6 +7,7 @@ import SupportContact from 'src/account/SupportContact'
 import { APP_NAME, CELO_SUPPORT_EMAIL_ADDRESS } from 'src/brandingConfig'
 import i18n from 'src/i18n'
 import { Screens } from 'src/navigator/Screens'
+import Logger from 'src/utils/Logger'
 import { createMockStore, flushMicrotasksQueue, getMockStackScreenProps } from 'test/utils'
 
 const mockScreenProps = getMockStackScreenProps(Screens.SupportContact)
@@ -22,6 +23,22 @@ describe('Contact', () => {
   })
 
   it('submits email with logs', async () => {
+    const mockedLogAttachments = Logger.getLogsToAttach as jest.Mock
+    Logger.getCurrentLogFileName = jest.fn(() => 'log2.txt')
+    const logAttachments = [
+      {
+        path: 'logs/log1.txt',
+        type: 'text',
+        name: 'log1.txt',
+      },
+      {
+        path: 'logs/log2.txt',
+        type: 'text',
+        name: 'log2.txt',
+      },
+    ]
+    mockedLogAttachments.mockResolvedValue(logAttachments)
+
     const { getByTestId } = render(
       <Provider store={createMockStore({})}>
         <SupportContact {...mockScreenProps} />
@@ -40,13 +57,7 @@ describe('Contact', () => {
           'Test Message<br/><br/><b>{"version":"0.0.1","buildNumber":"1","apiLevel":-1,"deviceId":"unknown","address":"0x0000000000000000000000000000000000007e57","sessionId":"","numberVerified":false,"network":"alfajores"}</b><br/><br/><b>Support logs are attached...</b>',
         recipients: [CELO_SUPPORT_EMAIL_ADDRESS],
         subject: i18n.t('supportEmailSubject', { appName: APP_NAME, user: '+1415555XXXX' }),
-        attachments: [
-          {
-            path: '__EXTERNAL_DIRECTORY_PATH__/rn_logs.txt',
-            type: 'text',
-            name: '',
-          },
-        ],
+        attachments: logAttachments,
       }),
       expect.any(Function)
     )

src/account/SupportContact.tsx

@@ -1,11 +1,9 @@
 import { anonymizedPhone } from '@celo/utils/lib/phoneNumbers'
 import { StackScreenProps } from '@react-navigation/stack'
-import path from 'path'
 import React, { useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { ActivityIndicator, Platform, ScrollView, StyleSheet, Text, View } from 'react-native'
+import { ActivityIndicator, ScrollView, StyleSheet, Text, View } from 'react-native'
 import DeviceInfo from 'react-native-device-info'
-import * as RNFS from 'react-native-fs'
 import { useDispatch, useSelector } from 'react-redux'
 import { Email, sendEmail } from 'src/account/emailSender'
 import { e164NumberSelector } from 'src/account/selectors'
@@ -17,7 +15,6 @@ import KeyboardSpacer from 'src/components/KeyboardSpacer'
 import Switch from 'src/components/Switch'
 import TextInput from 'src/components/TextInput'
 import { CELO_SUPPORT_EMAIL_ADDRESS, DEFAULT_TESTNET } from 'src/config'
-import i18n from 'src/i18n'
 import { navigateBack } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
 import { StackParamList } from 'src/navigator/types'
@@ -28,28 +25,6 @@ import { currentAccountSelector } from 'src/web3/selectors'
 
 type Props = StackScreenProps<StackParamList, Screens.SupportContact>
 
-async function exportLogs() {
-  try {
-    Logger.showMessage(i18n.t('supportExportLogsStart'))
-    const logsPath = Logger.getReactNativeLogsFilePath()
-
-    // For now we need to export to a world-readable directory on Android
-    // TODO: use the FileProvider approach so we don't need to do this.
-    // See https://developer.android.com/reference/androidx/core/content/FileProvider
-    // and https://github.com/chirag04/react-native-mail/blame/340618e4ef7f21a29d739d4180c2a267a14093d3/android/src/main/java/com/chirag/RNMail/RNMailModule.java#L106
-    if (Platform.OS === 'android') {
-      const publicPath = `${RNFS.ExternalDirectoryPath}/${path.basename(logsPath)}`
-      await RNFS.copyFile(logsPath, publicPath)
-      return publicPath
-    }
-
-    return logsPath
-  } catch (e) {
-    Logger.showError(i18n.t('supportExportLogsError', { error: e }))
-    return false
-  }
-}
-
 function SupportContact({ route }: Props) {
   const { t } = useTranslation()
   const [message, setMessage] = useState('')
@@ -92,23 +67,27 @@ function SupportContact({ route }: Props) {
       body: `${message}<br/><br/><b>${JSON.stringify(deviceInfo)}</b>`,
       isHTML: true,
     }
-    let logsPath: string | false = false
+    let attachments: Email['attachments']
     if (attachLogs) {
-      logsPath = await exportLogs()
-      if (logsPath) {
-        email.attachments = [
-          {
-            path: logsPath, // The absolute path of the file from which to read data.
-            type: 'text', // Mime Type: jpg, png, doc, ppt, html, pdf, csv
-            name: '', // Optional: Custom filename for attachment
-          },
-        ]
+      attachments = await Logger.getLogsToAttach()
+      if (attachments) {
+        email.attachments = attachments
         email.body += (email.body ? '<br/><br/>' : '') + '<b>Support logs are attached...</b>'
       }
     }
-    setInProgress(false)
+    // Used to prevent flickering of the activity indicator on quick uploads
+    setTimeout(() => setInProgress(false), 1000)
     try {
-      await sendEmail(email, deviceInfo, logsPath)
+      await sendEmail(
+        email,
+        deviceInfo,
+        // Get the current months log file to attach as text if sendEmailWithNonNativeApp is used
+        attachments
+          ? attachments.find(
+              (attachment: { name: string }) => attachment.name === Logger.getCurrentLogFileName()
+            )?.path ?? false
+          : false
+      )
       navigateBackAndToast()
     } catch (error) {
       Logger.error('SupportContact', 'Error while sending logs to support', error)

src/account/emailSender.ts

@@ -1,8 +1,8 @@
 import { openComposer } from 'react-native-email-link'
-import * as RNFS from 'react-native-fs'
 import Mailer from 'react-native-mail'
 import { CELO_SUPPORT_EMAIL_ADDRESS } from 'src/config'
 import Logger from 'src/utils/Logger'
+import { readFileChunked } from 'src/utils/readFile'
 
 export interface Email {
   subject: string
@@ -24,7 +24,7 @@ export async function sendEmailWithNonNativeApp(
 ) {
   try {
     const supportLogsMessage = logsPath
-      ? `Support logs: ${!logsPath || (await RNFS.readFile(logsPath))}`
+      ? `Support logs: ${!logsPath || (await readFileChunked(logsPath))}`
       : ''
     await openComposer({
       to: CELO_SUPPORT_EMAIL_ADDRESS,

src/app/Debug.tsx

@@ -33,7 +33,7 @@ export class Debug extends React.Component<RootState, State> {
   }
 
   updateLogs = async () => {
-    const reactNativeLogs = await Logger.getLogs()
+    const reactNativeLogs = await Logger.getMonthLogs()
     this.setState({
       reactNativeLogs: reactNativeLogs || 'Not Found',
     })

src/utils/Logger.test.ts

@@ -0,0 +1,86 @@
+/* eslint no-console: 0 */
+// no-console disabled as we are testing console logs are overwritten by the logger
+import 'react-native'
+import { Platform } from 'react-native'
+import { ONE_DAY_IN_MILLIS } from 'src/utils/time'
+import Logger from './Logger'
+
+const mockData = [
+  {
+    // ctime is 61 days ago
+    ctime: new Date(new Date().getTime() - ONE_DAY_IN_MILLIS * 61),
+    name: 'toDelete.txt',
+    path: '__CACHES_DIRECTORY_PATH__/rn_logs/toDelete.txt',
+    size: 5318,
+    isFile: true,
+    isDirectory: false,
+  },
+  {
+    ctime: new Date(),
+    name: 'toSave.txt',
+    path: '__CACHES_DIRECTORY_PATH__/rn_logs/toSave.txt',
+    size: 5318,
+    isFile: true,
+    isDirectory: false,
+  },
+]
+
+jest.mock('react-native-fs', () => {
+  return {
+    readDir: jest.fn(() => Promise.resolve(mockData)),
+    stat: jest
+      .fn()
+      .mockImplementation((filePath) =>
+        Promise.resolve(mockData.find((file) => file.path === filePath))
+      ),
+    exists: jest.fn(),
+    unlink: jest.fn(() => Promise.resolve()),
+    writeFile: jest.fn(() => Promise.resolve()),
+    ExternalDirectoryPath: '__EXTERNAL_DIRECTORY_PATH__',
+    TemporaryDirectoryPath: '__CACHES_DIRECTORY_PATH__',
+  }
+})
+
+describe('utils/Logger', () => {
+  it('Logger overrides console.debug', () => {
+    console.debug = jest.fn()
+    Logger.debug('Test/Debug', 'Test message #1', 'Test message #2')
+    expect(console.debug).toBeCalledTimes(1)
+    expect(console.debug).toHaveBeenCalledWith('Test/Debug/Test message #1, Test message #2')
+  })
+
+  it('Logger overrides console.info', () => {
+    console.info = jest.fn()
+    Logger.info('Test/Info', 'Test message #1', 'Test message #2')
+    expect(console.info).toBeCalledTimes(1)
+    expect(console.info).toHaveBeenCalledWith('Test/Info/Test message #1, Test message #2')
+  })
+
+  it('Logger.warn pipes to console.info', () => {
+    console.info = jest.fn()
+    Logger.warn('Test/Warn', 'Test message #1', 'Test message #2')
+    expect(console.info).toBeCalledTimes(1)
+    expect(console.info).toHaveBeenCalledWith('Test/Warn/Test message #1, Test message #2')
+  })
+
+  it('Returns combined logs file path iOS', () => {
+    // mock
+    Platform.OS = 'ios'
+    expect(Logger.getCombinedLogsFilePath()).toBe('__CACHES_DIRECTORY_PATH__/rn_logs.txt')
+  })
+
+  it('Returns combined logs file path Android', () => {
+    // mock
+    Platform.OS = 'android'
+    expect(Logger.getCombinedLogsFilePath()).toBe('__EXTERNAL_DIRECTORY_PATH__/rn_logs.txt')
+  })
+
+  it('Cleans up old logs', async () => {
+    console.debug = jest.fn()
+    await Logger.cleanupOldLogs()
+    expect(console.debug).toHaveBeenCalledTimes(1)
+    expect(console.debug).toHaveBeenCalledWith(
+      'Logger/cleanupOldLogs/Deleting React Native log file older than 60 days, __CACHES_DIRECTORY_PATH__/rn_logs/toDelete.txt'
+    )
+  })
+})