- Neuer Endpoint /api/magic/me liefert nickname/avatar/plan fuer Hub-Header. Mac-App ruft fetchMe() beim Hub-Load. - DeviceHubView Header zeigt jetzt Avatar (AsyncImage mit Fallback auf Initial-Letter), Nickname + Plan-Badge statt nur 'ReBreak Magic'. - /api/magic/devices erweitert: listet zusaetzlich UserDevice-Rows mit boundToPlan != null (das sind iPhone/iPad aus dem Native-App-Login- Flow, Legend-Device-Lock). source='locked'. - Dedupe: ProtectedDevice wird unterdrueckt wenn bereits ein UserDevice mit aehnlichem Namen + gleicher Plattform existiert (fixt doppelten MacBook im Hub). - Helper prettyPlatform() + Normalisierung (platform-key 'mac'/'ios'/ 'android'/'win') fuer robusten Vergleich.
276 lines
8.5 KiB
TypeScript
276 lines
8.5 KiB
TypeScript
import { useEffect } from 'react';
|
|
import { AppState, I18nManager } from 'react-native';
|
|
|
|
I18nManager.allowRTL(true);
|
|
import { Stack, router } from 'expo-router';
|
|
|
|
import { StatusBar } from 'expo-status-bar';
|
|
import * as Notifications from 'expo-notifications';
|
|
import { GestureHandlerRootView } from 'react-native-gesture-handler';
|
|
import { KeyboardProvider } from 'react-native-keyboard-controller';
|
|
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
|
|
import { SafeAreaProvider } from 'react-native-safe-area-context';
|
|
import { ActionSheetProvider } from '@expo/react-native-action-sheet';
|
|
import * as SplashScreen from 'expo-splash-screen';
|
|
import {
|
|
useFonts,
|
|
Nunito_400Regular,
|
|
Nunito_600SemiBold,
|
|
Nunito_700Bold,
|
|
Nunito_800ExtraBold,
|
|
} from '@expo-google-fonts/nunito';
|
|
import { supabase } from '../lib/supabase';
|
|
import { useAuthStore } from '../stores/auth';
|
|
import { useThemeStore } from '../stores/theme';
|
|
import { useRealtimeDebugStore } from '../stores/realtimeDebug';
|
|
import { useColors } from '../lib/theme';
|
|
import { useLanguageStore } from '../stores/language';
|
|
import { useAppLockStore } from '../stores/appLock';
|
|
import { useLyraVoiceStore } from '../stores/lyraVoice';
|
|
import { useChatBackgroundStore } from '../stores/chatBackground';
|
|
import { AppLockGate } from '../components/AppLockGate';
|
|
import { DeviceLimitReachedSheet } from '../components/DeviceLimitReachedSheet';
|
|
import { DeviceApprovalIncomingSheet } from '../components/DeviceApprovalIncomingSheet';
|
|
import { DeviceApprovalPendingSheet } from '../components/DeviceApprovalPendingSheet';
|
|
import { useDeviceApprovalRealtime } from '../hooks/useDeviceApprovalRealtime';
|
|
import { useDevicesStore } from '../stores/devices';
|
|
import { OnlinePresenceProvider } from '../components/OnlinePresenceProvider';
|
|
import { usePushTokenRegistration } from '../hooks/usePushTokenRegistration';
|
|
import '../lib/i18n'; // i18next-Init via Side-Effect
|
|
import '../global.css';
|
|
|
|
SplashScreen.preventAutoHideAsync();
|
|
|
|
Notifications.setNotificationHandler({
|
|
handleNotification: async () => ({
|
|
shouldShowBanner: true,
|
|
shouldShowList: true,
|
|
shouldPlaySound: true,
|
|
shouldSetBadge: false,
|
|
}),
|
|
});
|
|
|
|
const queryClient = new QueryClient({
|
|
defaultOptions: {
|
|
queries: {
|
|
retry: 2,
|
|
staleTime: 1000 * 60,
|
|
},
|
|
},
|
|
});
|
|
|
|
function RootLayoutInner() {
|
|
const { loading, init, user } = useAuthStore();
|
|
const initTheme = useThemeStore((s) => s.init);
|
|
const colorScheme = useThemeStore((s) => s.colorScheme);
|
|
const initLanguage = useLanguageStore((s) => s.init);
|
|
const initAppLock = useAppLockStore((s) => s.init);
|
|
const initLyraVoice = useLyraVoiceStore((s) => s.init);
|
|
const initChatBackground = useChatBackgroundStore((s) => s.init);
|
|
const appLockReady = useAppLockStore((s) => s.ready);
|
|
const initRealtimeDebug = useRealtimeDebugStore((s) => s.init);
|
|
const colors = useColors();
|
|
const [fontsLoaded] = useFonts({
|
|
Nunito_400Regular,
|
|
Nunito_600SemiBold,
|
|
Nunito_700Bold,
|
|
Nunito_800ExtraBold,
|
|
});
|
|
|
|
// Push-Token-Registration nach Login (idempotent)
|
|
usePushTokenRegistration(user?.id);
|
|
|
|
// Apple-Style Device-Approval Realtime — lauscht auf neue Approval-Requests
|
|
// für diesen User und zeigt das Incoming-Sheet wenn ein anderes Gerät
|
|
// sich anmelden möchte.
|
|
useDeviceApprovalRealtime(!!user?.id);
|
|
|
|
// Push-Tap-Deep-Link: User tippt Notification → navigate zu Chat
|
|
useEffect(() => {
|
|
const sub = Notifications.addNotificationResponseReceivedListener(
|
|
(response) => {
|
|
const data = response.notification.request.content.data as
|
|
| { type?: 'dm' | 'room'; targetId?: string }
|
|
| undefined;
|
|
if (!data?.type || !data.targetId) return;
|
|
if (data.type === 'dm') {
|
|
router.push({ pathname: '/dm', params: { userId: data.targetId } });
|
|
} else if (data.type === 'room') {
|
|
router.push({ pathname: '/room', params: { roomId: data.targetId } });
|
|
}
|
|
},
|
|
);
|
|
return () => sub.remove();
|
|
}, []);
|
|
|
|
useEffect(() => {
|
|
init();
|
|
initTheme();
|
|
initLanguage();
|
|
initAppLock();
|
|
initLyraVoice();
|
|
initChatBackground();
|
|
if (__DEV__) initRealtimeDebug();
|
|
}, []);
|
|
|
|
// Supabase-Doku-Pattern für RN: Token-Auto-Refresh nur wenn App aktiv ist.
|
|
// Plus Foreground-Reconnect via onAuthStateChange (TOKEN_REFRESHED →
|
|
// realtime.setAuth wird intern getriggert). Fixt den Realtime-Disconnect-Bug
|
|
// bei lange eingeloggten Usern (siehe `project_session_2026-05-15_push.md`).
|
|
useEffect(() => {
|
|
const sub = AppState.addEventListener('change', (state) => {
|
|
if (state === 'active') {
|
|
supabase.auth.startAutoRefresh();
|
|
} else {
|
|
supabase.auth.stopAutoRefresh();
|
|
}
|
|
});
|
|
return () => sub.remove();
|
|
}, []);
|
|
|
|
useEffect(() => {
|
|
if (fontsLoaded && !loading && appLockReady) {
|
|
SplashScreen.hideAsync();
|
|
}
|
|
}, [fontsLoaded, loading, appLockReady]);
|
|
|
|
if (!fontsLoaded || loading || !appLockReady) {
|
|
// Nativer expo-splash-screen bleibt sichtbar bis SplashScreen.hideAsync()
|
|
// im Effect oben aufgerufen wird → kein Flicker durch zusätzlichen
|
|
// React-Splash mehr (User-Feedback: "geht sehr schnell vorbei und zuckt")
|
|
return null;
|
|
}
|
|
|
|
return (
|
|
<OnlinePresenceProvider>
|
|
<AppLockGate>
|
|
<StatusBar style={colorScheme === 'dark' ? 'light' : 'dark'} />
|
|
<DeviceLimitReachedSheet />
|
|
<DeviceApprovalIncomingSheet />
|
|
<DeviceApprovalPendingSheet
|
|
onApproved={() => {
|
|
// Slot wurde freigegeben — register retry
|
|
useDevicesStore.getState().ensureRegistered().catch(() => {});
|
|
}}
|
|
/>
|
|
<Stack
|
|
screenOptions={{
|
|
headerShown: false,
|
|
animation: 'slide_from_right',
|
|
contentStyle: { backgroundColor: colors.bg },
|
|
}}
|
|
>
|
|
<Stack.Screen name="index" />
|
|
<Stack.Screen name="(auth)" />
|
|
<Stack.Screen name="(app)" />
|
|
<Stack.Screen
|
|
name="lyra"
|
|
options={{
|
|
headerShown: false,
|
|
presentation: 'card',
|
|
animation: 'slide_from_right',
|
|
}}
|
|
/>
|
|
<Stack.Screen
|
|
name="urge"
|
|
options={{
|
|
headerShown: false,
|
|
presentation: 'card',
|
|
animation: 'slide_from_bottom',
|
|
}}
|
|
/>
|
|
<Stack.Screen
|
|
name="dm"
|
|
options={{
|
|
headerShown: false,
|
|
presentation: 'card',
|
|
animation: 'slide_from_right',
|
|
}}
|
|
/>
|
|
<Stack.Screen
|
|
name="settings"
|
|
options={{
|
|
headerShown: false,
|
|
presentation: 'card',
|
|
animation: 'slide_from_right',
|
|
}}
|
|
/>
|
|
<Stack.Screen
|
|
name="profile/index"
|
|
options={{
|
|
headerShown: false,
|
|
presentation: 'card',
|
|
animation: 'slide_from_right',
|
|
}}
|
|
/>
|
|
<Stack.Screen
|
|
name="profile/[userId]"
|
|
options={{
|
|
headerShown: false,
|
|
presentation: 'card',
|
|
animation: 'slide_from_right',
|
|
}}
|
|
/>
|
|
<Stack.Screen
|
|
name="games"
|
|
options={{
|
|
headerShown: false,
|
|
presentation: 'card',
|
|
animation: 'slide_from_right',
|
|
}}
|
|
/>
|
|
<Stack.Screen
|
|
name="debug"
|
|
options={{
|
|
headerShown: false,
|
|
presentation: 'card',
|
|
animation: 'slide_from_right',
|
|
}}
|
|
/>
|
|
<Stack.Screen
|
|
name="help"
|
|
options={{
|
|
headerShown: false,
|
|
presentation: 'card',
|
|
animation: 'slide_from_right',
|
|
}}
|
|
/>
|
|
<Stack.Screen
|
|
name="magic"
|
|
options={{
|
|
headerShown: false,
|
|
presentation: 'card',
|
|
animation: 'slide_from_right',
|
|
}}
|
|
/>
|
|
<Stack.Screen
|
|
name="onboarding/index"
|
|
options={{
|
|
headerShown: false,
|
|
presentation: 'card',
|
|
animation: 'fade',
|
|
gestureEnabled: false,
|
|
}}
|
|
/>
|
|
</Stack>
|
|
</AppLockGate>
|
|
</OnlinePresenceProvider>
|
|
);
|
|
}
|
|
|
|
export default function RootLayout() {
|
|
return (
|
|
<GestureHandlerRootView style={{ flex: 1 }}>
|
|
<KeyboardProvider>
|
|
<QueryClientProvider client={queryClient}>
|
|
<ActionSheetProvider>
|
|
<SafeAreaProvider>
|
|
<RootLayoutInner />
|
|
</SafeAreaProvider>
|
|
</ActionSheetProvider>
|
|
</QueryClientProvider>
|
|
</KeyboardProvider>
|
|
</GestureHandlerRootView>
|
|
);
|
|
}
|