mirror of
https://github.com/stablyai/orca.git
synced 2026-11-17 19:34:29 +00:00
* build(mobile): upgrade to Expo SDK 58 and React Native 0.88 Expo 58 drops Zod from @expo/cli, which clears the last Zod 3 advisory (GHSA-mrhx-c7xc-m3w5) in mobile along with its local patch and override. - Expo 55 -> 58, React Native 0.83 -> 0.88, React 19.3, gesture-handler 3, webview 14, reanimated 4.7, worklets 0.13 (SDK 58 bundled versions, pinned below today's batch to respect minimumReleaseAge). - Port the react-native and react-native-webview patches unchanged; drop expo-constants, expo-notifications, @expo/cli, expo-router, zod and query-string patches plus the zod/query-string/xcode>uuid overrides, which upstream fixed or no longer need. - iOS minimum rises to 16.4 (Expo 58 / RN 0.88 requirement). - Migrate to RN 0.88 strict types: instance ref types, NamedStyles, AppState.currentState, list header/footer nulls. - Replace removed runtime APIs: InteractionManager -> idle callback with a macrotask fallback; StyleSheet.absoluteFillObject -> absoluteFill; FileHandle.readBytes -> readBytesSync (it became async). - Resolve react-native/asset-registry for shared assets in Metro and alias the old registry path for react-native-svg in the desktop mobile-web bundle. - Reduce the iOS scene plugin to the reconnect override; Expo 58's template now ships the scene delegate itself. * fix(mobile): bridge react-native-svg web imports and libsodium runtime for RN 0.88 - Share react-native-svg web shims between the mobile-web build and its render checks: map the old asset-registry path to react-native-web's registry and stub the Android-only touch-sound TurboModule. - Patch react-native-libsodium 1.7.0 to read the JSI runtime from the bridge proxy; RN 0.88 removed RCTCxxBridge.runtime. * fix(mobile): use Expo 58's legacy promise resolver for audio permissions * fix(mobile): skip null handles in the RPC recording timer shims for RN 0.88 types * style(mobile): format MobilePRSidebar after rebase * fix(mobile): name RN 0.88 text input refs for declarations; allow queued back in stack render check - Type text input refs with an exported interface so declaration emit can name hook results (RN 0.88 aliases TextInputInstance to an unexported class). - Expo Router 58 drains back() after a commit; check the interrupted push's exit from the frame it starts, bounded to three frames of lag. * chore(mobile): justify the text input handle interface for React Doctor * chore(mobile): use a nameable intersection alias for text input refs * fix(mobile): use sync expo-file-system writes, copies and moves on Expo 58 Expo 58 made File.write/copy/move and FileHandle.writeBytes return promises. Our callers never awaited them, so failures escaped their try/catch and the store's tmp-then-move and PDF writes could race their close or rename. * build(mobile): raise the page bundle budget to 10 MiB for Expo 58 Expo 58 adds about 310 KB to the page: expo-router (+258 KB, now carrying React Navigation, net about +110 KB) and Reanimated 4.7 (+152 KB). Main had 85 KB of headroom left. 10 MiB still stays within the 10 MiB per-asset contract. * fix(mobile): drop the window-metrics seed RN 0.88 removed from Android RN 0.88 no longer holds window metrics: DeviceInfoModule reads the activity's WindowMetrics on demand and setWindowDisplayMetrics is gone, so MainActivity no longer compiled. Layout scale still comes from the screen metrics we reseed. --------- Co-authored-by: Kelvin Amoaba <97001695+AmoabaKelvin@users.noreply.github.com>
345 lines
11 KiB
TypeScript
345 lines
11 KiB
TypeScript
import { useCallback, useRef, useState } from 'react'
|
|
import { View, Text, Pressable, BackHandler, type HostInstance } from 'react-native'
|
|
import { useSafeAreaInsets } from 'react-native-safe-area-context'
|
|
import { useFocusEffect, useLocalSearchParams, useRouter } from 'expo-router'
|
|
import { ChevronLeft } from 'lucide-react-native'
|
|
import {
|
|
resolvePairConfirmRouteState,
|
|
type PairConfirmRouteState
|
|
} from '../src/pairing/pair-confirm-state'
|
|
import {
|
|
startPreProfilePairing,
|
|
type PreProfilePairingAttempt
|
|
} from '../src/pairing/pre-profile-pairing-coordinator'
|
|
import type { ConnectionLogEntry } from '../src/diagnostics/connection/connection-log-types'
|
|
import { useRefreshHostClient } from '../src/transport/connection/host-client-hooks'
|
|
import { colors, spacing, radii, typography, pressedStyle } from '../src/theme/mobile-theme'
|
|
import { themedStyleSheet } from '../src/theme/themed-styles'
|
|
import { useMobileColorScheme } from '../src/theme/use-mobile-color-scheme'
|
|
import { useMobileTranslation } from '../src/i18n/use-mobile-translation'
|
|
import { ConnectionLog } from '../src/components/ConnectionLog'
|
|
import {
|
|
loadMobileOnboardingSteps,
|
|
mobileOnboardingDestination
|
|
} from '../src/onboarding/mobile-onboarding-plan'
|
|
import {
|
|
PAIRING_SUCCESS_HOLD_MS,
|
|
PairingProgress,
|
|
waitForBeat
|
|
} from '../src/pairing/pairing-visuals'
|
|
import { triggerSuccess } from '../src/platform/haptics'
|
|
import { getPairingFailureMessage } from '../src/pairing/pairing-failure-message'
|
|
|
|
type Status = 'awaiting-confirm' | 'connecting' | 'error'
|
|
|
|
// Bound initial pairing at ~25s (one connect timeout plus retry) so broken routes show an actionable error/log; live RPC retries indefinitely.
|
|
const PAIRING_OVERALL_TIMEOUT_MS = 25_000
|
|
|
|
export default function PairConfirmScreen() {
|
|
useMobileTranslation()
|
|
const params = useLocalSearchParams<{ code?: string | string[] }>()
|
|
return (
|
|
<PairConfirmContent
|
|
key={typeof params.code === 'string' ? params.code : undefined}
|
|
routeState={resolvePairConfirmRouteState(params.code)}
|
|
/>
|
|
)
|
|
}
|
|
|
|
function PairConfirmContent({ routeState }: { routeState: PairConfirmRouteState }) {
|
|
useMobileColorScheme()
|
|
const t = useMobileTranslation()
|
|
const router = useRouter()
|
|
const refreshHostClient = useRefreshHostClient()
|
|
const insets = useSafeAreaInsets()
|
|
const [status, setStatus] = useState<Status>('awaiting-confirm')
|
|
const [paired, setPaired] = useState(false)
|
|
const [errorMessage, setErrorMessage] = useState('')
|
|
const [logs, setLogs] = useState<ConnectionLogEntry[]>([])
|
|
// Ref keeps RPC callback logs current and batches bursty state updates.
|
|
const logsRef = useRef<ConnectionLogEntry[]>([])
|
|
const mountedRef = useRef(true)
|
|
const activePairingAttemptRef = useRef<PreProfilePairingAttempt | null>(null)
|
|
|
|
const offer = routeState.offer
|
|
const resolvedStatus =
|
|
status === 'awaiting-confirm' && routeState.kind === 'error' ? 'error' : status
|
|
const resolvedErrorMessage =
|
|
status === 'awaiting-confirm' && routeState.kind === 'error'
|
|
? routeState.errorMessage
|
|
: errorMessage
|
|
|
|
const cancel = useCallback(() => {
|
|
mountedRef.current = false
|
|
activePairingAttemptRef.current?.dispose()
|
|
activePairingAttemptRef.current = null
|
|
router.replace('/')
|
|
}, [router])
|
|
|
|
useFocusEffect(
|
|
useCallback(() => {
|
|
const subscription = BackHandler.addEventListener('hardwareBackPress', () => {
|
|
cancel()
|
|
return true
|
|
})
|
|
return () => subscription.remove()
|
|
}, [cancel])
|
|
)
|
|
|
|
const setPairConfirmRootRef = useCallback((node: HostInstance | null): void => {
|
|
if (node !== null) {
|
|
mountedRef.current = true
|
|
return
|
|
}
|
|
// Dispose pairing on route detach: attempts can outlive the visible screen, before passive cleanup.
|
|
mountedRef.current = false
|
|
activePairingAttemptRef.current?.dispose()
|
|
activePairingAttemptRef.current = null
|
|
}, [])
|
|
|
|
async function confirm() {
|
|
if (!offer) {
|
|
return
|
|
}
|
|
setStatus('connecting')
|
|
logsRef.current = []
|
|
setLogs([])
|
|
activePairingAttemptRef.current?.dispose()
|
|
|
|
const attempt = startPreProfilePairing({
|
|
offer,
|
|
timeoutMs: PAIRING_OVERALL_TIMEOUT_MS,
|
|
connectOptions: {
|
|
onLog: (entry) => {
|
|
if (!mountedRef.current || activePairingAttemptRef.current !== attempt) {
|
|
return
|
|
}
|
|
logsRef.current = [...logsRef.current, entry]
|
|
setLogs(logsRef.current)
|
|
}
|
|
}
|
|
})
|
|
activePairingAttemptRef.current = attempt
|
|
try {
|
|
const { hostId } = await attempt.result
|
|
const attemptIsCurrent = activePairingAttemptRef.current === attempt
|
|
attempt.dispose()
|
|
if (activePairingAttemptRef.current === attempt) {
|
|
activePairingAttemptRef.current = null
|
|
}
|
|
if (!mountedRef.current || !attemptIsCurrent) {
|
|
return
|
|
}
|
|
// Re-pair reuses host id; close cached client so it reloads the persisted endpoint/relay (STA-1840).
|
|
refreshHostClient(hostId)
|
|
setPaired(true)
|
|
triggerSuccess()
|
|
const [onboardingSteps] = await Promise.all([
|
|
loadMobileOnboardingSteps(),
|
|
waitForBeat(PAIRING_SUCCESS_HOLD_MS)
|
|
])
|
|
if (!mountedRef.current) {
|
|
return
|
|
}
|
|
router.replace(mobileOnboardingDestination(onboardingSteps, hostId))
|
|
} catch (err) {
|
|
const timedOut = attempt.timedOut
|
|
const attemptIsCurrent = activePairingAttemptRef.current === attempt
|
|
attempt.dispose()
|
|
if (activePairingAttemptRef.current === attempt) {
|
|
activePairingAttemptRef.current = null
|
|
}
|
|
if (!mountedRef.current || !attemptIsCurrent) {
|
|
return
|
|
}
|
|
console.warn('[pair-confirm] connect failed', err)
|
|
setStatus('error')
|
|
setErrorMessage(
|
|
getPairingFailureMessage({
|
|
screen: 'confirm',
|
|
error: err,
|
|
timedOut,
|
|
timeoutMs: PAIRING_OVERALL_TIMEOUT_MS,
|
|
t
|
|
})
|
|
)
|
|
}
|
|
}
|
|
|
|
const containerPadding = { paddingTop: insets.top + spacing.sm }
|
|
|
|
return (
|
|
<View ref={setPairConfirmRootRef} style={[styles.container, containerPadding]}>
|
|
<Pressable
|
|
style={({ pressed }) => [styles.backButton, pressed && pressedStyle]}
|
|
onPress={cancel}
|
|
hitSlop={8}
|
|
accessibilityRole="button"
|
|
accessibilityLabel={t('common.back', 'Back')}
|
|
>
|
|
<ChevronLeft size={22} color={colors.textSecondary} />
|
|
</Pressable>
|
|
|
|
<View style={styles.content}>
|
|
{offer && resolvedStatus === 'awaiting-confirm' && (
|
|
<>
|
|
<Text style={styles.title}>
|
|
{t('app.pairConfirm.title', 'Pair with this desktop?')}
|
|
</Text>
|
|
<Text style={styles.subtitle}>
|
|
{t(
|
|
'app.pairConfirm.description',
|
|
'You opened a pairing link from your desktop. Confirm to add it to your hosts.'
|
|
)}
|
|
</Text>
|
|
<View style={styles.actionStack}>
|
|
<Pressable
|
|
style={({ pressed }) => [styles.primaryButton, pressed && pressedStyle]}
|
|
onPress={() => void confirm()}
|
|
>
|
|
<Text style={styles.primaryButtonText}>
|
|
{t('app.pairConfirm.pairButton', 'Pair')}
|
|
</Text>
|
|
</Pressable>
|
|
<Pressable
|
|
style={({ pressed }) => [styles.secondaryButton, pressed && pressedStyle]}
|
|
onPress={cancel}
|
|
>
|
|
<Text style={styles.secondaryButtonText}>{t('common.cancel', 'Cancel')}</Text>
|
|
</Pressable>
|
|
</View>
|
|
</>
|
|
)}
|
|
|
|
{resolvedStatus === 'connecting' && (
|
|
<>
|
|
<PairingProgress
|
|
succeeded={paired}
|
|
connectingLabel={t('app.pairConfirm.connecting', 'Connecting…')}
|
|
labelStyle={styles.connectingText}
|
|
/>
|
|
<View style={styles.logSlot}>
|
|
<ConnectionLog
|
|
entries={logs}
|
|
title={t('app.pairConfirm.pairingLog', 'Pairing log')}
|
|
/>
|
|
</View>
|
|
</>
|
|
)}
|
|
|
|
{resolvedStatus === 'error' && (
|
|
<>
|
|
<Text style={styles.errorText}>{resolvedErrorMessage}</Text>
|
|
{logs.length > 0 && (
|
|
<View style={styles.logSlot}>
|
|
<ConnectionLog
|
|
entries={logs}
|
|
title={t('app.pairConfirm.pairingLog', 'Pairing log')}
|
|
/>
|
|
</View>
|
|
)}
|
|
<View style={styles.actionStack}>
|
|
<Pressable
|
|
style={({ pressed }) => [styles.primaryButton, pressed && pressedStyle]}
|
|
onPress={cancel}
|
|
>
|
|
<Text style={styles.primaryButtonText}>
|
|
{t('app.pairConfirm.backToHome', 'Back to home')}
|
|
</Text>
|
|
</Pressable>
|
|
</View>
|
|
</>
|
|
)}
|
|
</View>
|
|
</View>
|
|
)
|
|
}
|
|
|
|
const styles = themedStyleSheet(() => ({
|
|
container: {
|
|
flex: 1,
|
|
backgroundColor: colors.bgBase,
|
|
padding: spacing.lg
|
|
},
|
|
backButton: {
|
|
width: 36,
|
|
height: 36,
|
|
borderRadius: radii.control,
|
|
alignItems: 'center',
|
|
justifyContent: 'center',
|
|
marginBottom: spacing.sm
|
|
},
|
|
content: {
|
|
flex: 1,
|
|
justifyContent: 'center',
|
|
paddingHorizontal: spacing.sm,
|
|
// Offset above geometric center to balance home-indicator/nav-bar space.
|
|
paddingBottom: spacing.xl * 2
|
|
},
|
|
title: {
|
|
fontSize: typography.titleSize,
|
|
fontWeight: '600',
|
|
color: colors.textPrimary,
|
|
marginBottom: spacing.sm,
|
|
textAlign: 'center'
|
|
},
|
|
subtitle: {
|
|
fontSize: typography.bodySize,
|
|
color: colors.textSecondary,
|
|
lineHeight: 20,
|
|
marginBottom: spacing.xl,
|
|
textAlign: 'center',
|
|
maxWidth: 520,
|
|
alignSelf: 'center'
|
|
},
|
|
actionStack: {
|
|
width: '100%',
|
|
maxWidth: 360,
|
|
alignSelf: 'center'
|
|
},
|
|
primaryButton: {
|
|
width: '100%',
|
|
backgroundColor: colors.textPrimary,
|
|
paddingHorizontal: spacing.xl,
|
|
paddingVertical: spacing.sm + 2,
|
|
borderRadius: radii.control,
|
|
alignItems: 'center',
|
|
marginBottom: spacing.sm
|
|
},
|
|
primaryButtonText: {
|
|
color: colors.bgBase,
|
|
fontSize: typography.bodySize,
|
|
fontWeight: '600'
|
|
},
|
|
secondaryButton: {
|
|
width: '100%',
|
|
paddingHorizontal: spacing.xl,
|
|
paddingVertical: spacing.sm + 2,
|
|
borderRadius: radii.control,
|
|
alignItems: 'center'
|
|
},
|
|
secondaryButtonText: {
|
|
color: colors.textSecondary,
|
|
fontSize: typography.bodySize,
|
|
fontWeight: '500'
|
|
},
|
|
connectingText: {
|
|
color: colors.textSecondary,
|
|
fontSize: typography.bodySize,
|
|
marginTop: spacing.lg,
|
|
textAlign: 'center'
|
|
},
|
|
logSlot: {
|
|
width: '100%',
|
|
marginTop: spacing.lg,
|
|
marginBottom: spacing.md
|
|
},
|
|
errorText: {
|
|
color: colors.statusRed,
|
|
fontSize: typography.bodySize,
|
|
textAlign: 'center',
|
|
marginBottom: spacing.xl,
|
|
lineHeight: 20
|
|
}
|
|
}))
|