[WIP] Replace unmaintained packages #750
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| import { useCallback, useEffect, useRef, useState } from 'react' | ||
| import * as ExpoCrypto from 'expo-crypto' | ||
| import * as SecureStore from 'expo-secure-store' | ||
| import * as FileSystem from 'expo-file-system' | ||
| import { useMutation, useQuery, UseQueryResult } from 'react-query' | ||
| import { | ||
| Conversation, | ||
|
|
@@ -762,16 +762,16 @@ | |
| } { | ||
| const { data: address, refetch } = useQuery<string | null>( | ||
| ['xmtp', 'address'], | ||
| () => SecureStore.getItem('xmtp.address') | ||
| ) | ||
| return { | ||
| address, | ||
| save: async (address: string) => { | ||
| SecureStore.setItem('xmtp.address', address) | ||
| await refetch() | ||
| }, | ||
| clear: async () => { | ||
| await SecureStore.deleteItemAsync('xmtp.address') | ||
| await refetch() | ||
| }, | ||
| } | ||
|
|
@@ -784,11 +784,11 @@ | |
| try { | ||
| const key = `xmtp-${network}` | ||
|
|
||
| const result = SecureStore.getItem(key) | ||
|
There was a problem hiding this comment. SecureStore calls in - const result = SecureStore.getItem(key)
+ const result = await SecureStore.getItem(key)
|
||
| if (!result || clear === true) { | ||
| if (result) { | ||
| console.log('Removing existing dbEncryptionKey', key) | ||
| await SecureStore.deleteItemAsync(key) | ||
| } | ||
|
|
||
| // Generate random bytes for the encryption key | ||
|
|
@@ -797,13 +797,13 @@ | |
|
|
||
| // Convert to string for storage | ||
| const randomBytesString = uint8ArrayToHexString(randomBytes) | ||
| SecureStore.setItem(key, randomBytesString) | ||
|
|
||
| return randomBytes | ||
| } | ||
|
|
||
| // Convert stored string back to Uint8Array | ||
| return hexStringToUint8Array(result) | ||
| } catch (error) { | ||
| console.error('Error in getDbEncryptionKey:', error) | ||
| // Re-throw or handle as needed | ||
|
|
@@ -831,9 +831,15 @@ | |
| return new Uint8Array(byteArray) | ||
| } | ||
|
|
||
| function ensureFileUri(path: string): string { | ||
| return path.startsWith('file://') ? path : `file://${path}` | ||
| } | ||
|
|
||
| async function fileExists(path: string): Promise<boolean> { | ||
| try { | ||
| const uri = ensureFileUri(path) | ||
| const info = await FileSystem.getInfoAsync(uri) | ||
| return info.exists | ||
| } catch (error) { | ||
| console.error('Error checking file existence:', error) | ||
| return false | ||
|
|
@@ -842,8 +848,12 @@ | |
|
|
||
| async function getFileSize(path: string): Promise<number> { | ||
| try { | ||
| const uri = ensureFileUri(path) | ||
| const info = await FileSystem.getInfoAsync(uri, { size: true }) | ||
| if (info.exists) { | ||
| return info.size | ||
| } | ||
| return 0 | ||
| } catch (error) { | ||
| console.error('Error getting file size:', error) | ||
| return 0 | ||
|
|
@@ -853,13 +863,18 @@ | |
| async function calculateFileDigest(path: string): Promise<string> { | ||
| try { | ||
| // Read the file content | ||
| const uri = ensureFileUri(path) | ||
| const fileContent = await FileSystem.readAsStringAsync(uri, { | ||
| encoding: FileSystem.EncodingType.Base64, | ||
| }) | ||
| const buffer = Buffer.from(fileContent, 'base64') | ||
|
|
||
| // Create SHA-256 hash | ||
| const digest = await ExpoCrypto.digest( | ||
| ExpoCrypto.CryptoDigestAlgorithm.SHA256, | ||
| buffer | ||
| ) | ||
| return Buffer.from(digest).toString('hex') | ||
| } catch (error) { | ||
| console.error('Error calculating file digest:', error) | ||
| throw error | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Both the fetcher in
useQueryand thesavelogic insavecall non-existent synchronous methods (SecureStore.getItem/setItem) and don’t await them, leading to undefined-methodTypeErrors and race conditions (e.g.refetch()before storage). Update toawait SecureStore.getItemAsync(...)in your query fetcher andawait SecureStore.setItemAsync(...)insaveto ensure the values exist and are persisted before proceeding.