1 Commits

Author SHA1 Message Date
Alexander Whitestone
88d3c6d9d0 feat(mobile): Nostr identity — Amber NIP-55 deep link + nsec fallback
Some checks failed
CI / Typecheck & Lint (pull_request) Failing after 0s
Implements mobile Nostr identity management per issue #29.

Android — NIP-55 Amber integration:
- Opens com.greenart7c3.nostrsigner via `nostrsigner:` URI scheme to
  retrieve the user's public key without exposing it to the app.
- Listens for the `mobile://nostr-callback` deep link response and stores
  the resulting npub in Expo SecureStore.
- Falls back to Play Store install prompt when Amber is not installed.

iOS / manual fallback:
- NostrConnectModal accepts an nsec1 paste-in, validates bech32, derives
  the pubkey via nostr-tools getPublicKey, and stores the key only in
  Expo SecureStore — never in AsyncStorage, Redux, or logs.

Both platforms:
- Truncated npub and signer type (Amber / nsec) shown in Settings.
- "Disconnect Nostr" wipes all keys from SecureStore and resets state.
- Identity persists across restarts via SecureStore.

Supporting changes:
- NostrContext: new React context for identity lifecycle.
- NostrConnectModal: platform-aware bottom-sheet modal for connect flow.
- TimmyContext: added apiBaseUrl/setApiBaseUrl/isConnected; URL persisted
  in AsyncStorage and restored on mount; circular dep broken via refs.
- constants/colors: added field, textInverted, destructive, link colours.
- constants/storage-keys: added SERVER_URL_KEY.
- app.json: added Android intent filter for mobile://nostr-callback.
- package.json: added nostr-tools and expo-secure-store dependencies.

Fixes #29

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-23 22:30:40 -04:00
9 changed files with 831 additions and 166 deletions

View File

@@ -20,7 +20,20 @@
"adaptiveIcon": { "adaptiveIcon": {
"foregroundImage": "./assets/images/icon.png", "foregroundImage": "./assets/images/icon.png",
"backgroundColor": "#0A0A12" "backgroundColor": "#0A0A12"
} },
"intentFilters": [
{
"action": "VIEW",
"autoVerify": false,
"data": [
{
"scheme": "mobile",
"host": "nostr-callback"
}
],
"category": ["BROWSABLE", "DEFAULT"]
}
]
}, },
"web": { "web": {
"favicon": "./assets/images/icon.png", "favicon": "./assets/images/icon.png",

View File

@@ -16,6 +16,7 @@ import { SafeAreaProvider } from "react-native-safe-area-context";
import { ErrorBoundary } from "@/components/ErrorBoundary"; import { ErrorBoundary } from "@/components/ErrorBoundary";
import { TimmyProvider } from "@/context/TimmyContext"; import { TimmyProvider } from "@/context/TimmyContext";
import { NostrProvider } from "@/context/NostrContext";
import { ONBOARDING_COMPLETED_KEY } from "@/constants/storage-keys"; import { ONBOARDING_COMPLETED_KEY } from "@/constants/storage-keys";
SplashScreen.preventAutoHideAsync(); SplashScreen.preventAutoHideAsync();
@@ -77,9 +78,11 @@ export default function RootLayout() {
<QueryClientProvider client={queryClient}> <QueryClientProvider client={queryClient}>
<GestureHandlerRootView style={{ flex: 1 }}> <GestureHandlerRootView style={{ flex: 1 }}>
<KeyboardProvider> <KeyboardProvider>
<TimmyProvider> <NostrProvider>
<RootLayoutNav /> <TimmyProvider>
</TimmyProvider> <RootLayoutNav />
</TimmyProvider>
</NostrProvider>
</KeyboardProvider> </KeyboardProvider>
</GestureHandlerRootView> </GestureHandlerRootView>
</QueryClientProvider> </QueryClientProvider>

View File

@@ -1,114 +1,101 @@
import { Stack } from 'expo-router'; import { Stack } from "expo-router";
import { View, Text, StyleSheet, ScrollView, TextInput, Switch, Pressable, Linking, Platform } from 'react-native'; import {
import { useState, useEffect } from 'react'; Linking,
import AsyncStorage from '@react-native-async-storage/async-storage'; Platform,
import * as SecureStore from 'expo-secure-store'; Pressable,
import Constants from 'expo-constants'; ScrollView,
import { useTimmy } from '@/context/TimmyContext'; StyleSheet,
import { Ionicons } from '@expo/vector-icons'; Switch,
import { ConnectionBadge } from '@/components/ConnectionBadge'; Text,
import { Colors } from '@/constants/colors'; TextInput,
View,
} from "react-native";
import { useState, useEffect } from "react";
import AsyncStorage from "@react-native-async-storage/async-storage";
import Constants from "expo-constants";
import { Ionicons } from "@expo/vector-icons";
const STORAGE_KEYS = { import { useTimmy } from "@/context/TimmyContext";
SERVER_URL: 'settings_server_url', import { useNostr, truncateNpub } from "@/context/NostrContext";
NOTIFICATIONS_JOB_COMPLETION: 'settings_notifications_job_completion', import { ConnectionBadge } from "@/components/ConnectionBadge";
NOTIFICATIONS_LOW_BALANCE: 'settings_notifications_low_balance', import { NostrConnectModal } from "@/components/NostrConnectModal";
NOSTR_PRIVATE_KEY: 'settings_nostr_private_key', // Use SecureStore for this import { Colors } from "@/constants/colors";
};
const NOTIF_JOB_KEY = "settings.notifications_job_completion";
const NOTIF_BALANCE_KEY = "settings.notifications_low_balance";
export default function SettingsScreen() { export default function SettingsScreen() {
const { apiBaseUrl, setApiBaseUrl, isConnected, nostrPublicKey, connectNostr, disconnectNostr } = useTimmy();
const C = Colors.dark; const C = Colors.dark;
const { apiBaseUrl, setApiBaseUrl, isConnected } = useTimmy();
const { npub, nostrConnected, signerType, disconnect: disconnectNostr } = useNostr();
const [serverUrl, setServerUrl] = useState(apiBaseUrl); const [serverUrl, setServerUrl] = useState(apiBaseUrl);
const [jobCompletionNotifications, setJobCompletionNotifications] = useState(false); const [jobCompletionNotifications, setJobCompletionNotifications] = useState(false);
const [lowBalanceWarning, setLowBalanceWarning] = useState(false); const [lowBalanceWarning, setLowBalanceWarning] = useState(false);
const [currentNpub, setCurrentNpub] = useState<string | null>(nostrPublicKey); const [nostrModalVisible, setNostrModalVisible] = useState(false);
// Sync local serverUrl with context value (e.g. on first load from AsyncStorage)
useEffect(() => {
setServerUrl(apiBaseUrl);
}, [apiBaseUrl]);
useEffect(() => { useEffect(() => {
// Load settings from AsyncStorage and SecureStore AsyncStorage.multiGet([NOTIF_JOB_KEY, NOTIF_BALANCE_KEY])
const loadSettings = async () => { .then(([[, job], [, balance]]) => {
const storedServerUrl = await AsyncStorage.getItem(STORAGE_KEYS.SERVER_URL); if (job !== null) setJobCompletionNotifications(JSON.parse(job));
if (storedServerUrl) { if (balance !== null) setLowBalanceWarning(JSON.parse(balance));
setServerUrl(storedServerUrl); })
} .catch(() => {});
const storedJobCompletion = await AsyncStorage.getItem(STORAGE_KEYS.NOTIFICATIONS_JOB_COMPLETION); }, []);
if (storedJobCompletion !== null) {
setJobCompletionNotifications(JSON.parse(storedJobCompletion));
}
const storedLowBalance = await AsyncStorage.getItem(STORAGE_KEYS.NOTIFICATIONS_LOW_BALANCE);
if (storedLowBalance !== null) {
setLowBalanceWarning(JSON.parse(storedLowBalance));
}
// Nostr npub is handled by TimmyContext, so we just use the provided nostrPublicKey
setCurrentNpub(nostrPublicKey);
};
loadSettings();
}, [nostrPublicKey]);
// Update apiBaseUrl in context when serverUrl changes and is saved const handleServerUrlBlur = () => {
useEffect(() => {
if (serverUrl !== apiBaseUrl) { if (serverUrl !== apiBaseUrl) {
setApiBaseUrl(serverUrl); setApiBaseUrl(serverUrl);
AsyncStorage.setItem(STORAGE_KEYS.SERVER_URL, serverUrl);
} }
}, [serverUrl, setApiBaseUrl, apiBaseUrl]);
const handleServerUrlChange = (text: string) => {
setServerUrl(text);
}; };
const toggleJobCompletionNotifications = async () => { const toggleJobCompletion = async () => {
const newValue = !jobCompletionNotifications; const next = !jobCompletionNotifications;
setJobCompletionNotifications(newValue); setJobCompletionNotifications(next);
await AsyncStorage.setItem(STORAGE_KEYS.NOTIFICATIONS_JOB_COMPLETION, JSON.stringify(newValue)); await AsyncStorage.setItem(NOTIF_JOB_KEY, JSON.stringify(next));
}; };
const toggleLowBalanceWarning = async () => { const toggleLowBalance = async () => {
const newValue = !lowBalanceWarning; const next = !lowBalanceWarning;
setLowBalanceWarning(newValue); setLowBalanceWarning(next);
await AsyncStorage.setItem(STORAGE_KEYS.NOTIFICATIONS_LOW_BALANCE, JSON.stringify(newValue)); await AsyncStorage.setItem(NOTIF_BALANCE_KEY, JSON.stringify(next));
};
const handleConnectNostr = async () => {
// This will ideally link to a dedicated Nostr connection flow
console.log('Connect Nostr button pressed');
// For now, simulate connection if not connected
if (!currentNpub) {
// This is a placeholder. Real implementation would involve generating/importing keys.
const simulatedNpub = 'npub1xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx';
connectNostr(simulatedNpub, 'private_key_placeholder'); // Pass a placeholder private key
setCurrentNpub(simulatedNpub);
// In a real app, the private key would be securely stored and managed by the context
// For now, just a placeholder to show connected state
}
}; };
const handleDisconnectNostr = async () => { const handleDisconnectNostr = async () => {
await disconnectNostr(); await disconnectNostr();
setCurrentNpub(null);
}; };
const appVersion = Constants.expoConfig?.version || 'N/A'; const appVersion = Constants.expoConfig?.version ?? "N/A";
const buildCommitHash = Constants.expoConfig?.extra?.gitCommitHash || 'N/A'; const buildCommitHash = Constants.expoConfig?.extra?.["gitCommitHash"] ?? "N/A";
const giteaRepoUrl = 'http://143.198.27.163:3000/replit/timmy-tower'; const giteaRepoUrl = "http://143.198.27.163:3000/replit/timmy-tower";
const openGiteaLink = () => {
Linking.openURL(giteaRepoUrl);
};
return ( return (
<View style={styles.container}> <View style={[styles.container, { backgroundColor: C.background }]}>
<Stack.Screen options={{ title: 'Settings', headerShown: true, headerStyle: { backgroundColor: C.surface }, headerTintColor: C.text }} /> <Stack.Screen
options={{
title: "Settings",
headerShown: true,
headerStyle: { backgroundColor: C.surface },
headerTintColor: C.text,
}}
/>
<ScrollView contentContainerStyle={styles.scrollContent}> <ScrollView contentContainerStyle={styles.scrollContent}>
<Text style={styles.sectionHeader}>Connection</Text>
{/* ── Connection ──────────────────────────────────────────────── */}
<Text style={[styles.sectionHeader, { color: C.text }]}>Connection</Text>
<View style={styles.settingItem}> <View style={styles.settingItem}>
<Text style={styles.settingLabel}>Server URL</Text> <Text style={[styles.settingLabel, { color: C.text }]}>Server URL</Text>
<View style={styles.serverUrlContainer}> <View style={styles.serverUrlContainer}>
<TextInput <TextInput
style={[styles.input, { color: C.text, backgroundColor: C.field }]} // Apply text and background color from Colors style={[styles.input, { color: C.text, backgroundColor: C.field, borderColor: C.border }]}
value={serverUrl} value={serverUrl}
onChangeText={handleServerUrlChange} onChangeText={setServerUrl}
onBlur={handleServerUrlBlur}
placeholder="Enter server URL" placeholder="Enter server URL"
placeholderTextColor={C.textMuted} placeholderTextColor={C.textMuted}
autoCapitalize="none" autoCapitalize="none"
@@ -118,61 +105,100 @@ export default function SettingsScreen() {
</View> </View>
</View> </View>
<Text style={styles.sectionHeader}>Notifications</Text> {/* ── Notifications ────────────────────────────────────────────── */}
<View style={styles.settingItem}> <Text style={[styles.sectionHeader, { color: C.text }]}>Notifications</Text>
<Text style={styles.settingLabel}>Job Completion Push Notifications</Text> <View style={[styles.settingItem, { borderBottomColor: C.border }]}>
<Text style={[styles.settingLabel, { color: C.text }]}>Job Completion</Text>
<Switch <Switch
trackColor={{ false: C.surface, true: C.accentGlow }} trackColor={{ false: C.surface, true: C.accentGlow }}
thumbColor={Platform.OS === 'android' ? C.text : ''} thumbColor={Platform.OS === "android" ? C.text : ""}
ios_backgroundColor={C.field} ios_backgroundColor={C.field}
onValueChange={toggleJobCompletionNotifications} onValueChange={toggleJobCompletion}
value={jobCompletionNotifications} value={jobCompletionNotifications}
/> />
</View> </View>
<View style={styles.settingItem}> <View style={[styles.settingItem, { borderBottomColor: C.border }]}>
<Text style={styles.settingLabel}>Low Balance Warning</Text> <Text style={[styles.settingLabel, { color: C.text }]}>Low Balance Warning</Text>
<Switch <Switch
trackColor={{ false: C.surface, true: C.accentGlow }} trackColor={{ false: C.surface, true: C.accentGlow }}
thumbColor={Platform.OS === 'android' ? C.text : ''} thumbColor={Platform.OS === "android" ? C.text : ""}
ios_backgroundColor={C.field} ios_backgroundColor={C.field}
onValueChange={toggleLowBalanceWarning} onValueChange={toggleLowBalance}
value={lowBalanceWarning} value={lowBalanceWarning}
/> />
</View> </View>
<Text style={styles.sectionHeader}>Identity</Text> {/* ── Nostr Identity ───────────────────────────────────────────── */}
<View style={styles.settingItem}> <Text style={[styles.sectionHeader, { color: C.text }]}>Identity</Text>
<Text style={styles.settingLabel}>Nostr Public Key</Text> <View style={[styles.settingItem, { borderBottomColor: C.border }]}>
<Text style={[styles.settingLabel, { color: C.text }]}>Nostr Public Key</Text>
<Text style={[styles.settingValue, { color: C.textMuted }]}> <Text style={[styles.settingValue, { color: C.textMuted }]}>
{currentNpub ? `${currentNpub.substring(0, 10)}...${currentNpub.substring(currentNpub.length - 5)}` : 'Not connected'} {npub ? truncateNpub(npub) : "Not connected"}
</Text> </Text>
</View> </View>
{nostrConnected && signerType && (
<View style={[styles.settingItem, { borderBottomColor: C.border }]}>
<Text style={[styles.settingLabel, { color: C.text }]}>Signer</Text>
<Text style={[styles.settingValue, { color: C.textSecondary }]}>
{signerType === "amber" ? "Amber (NIP-55)" : "nsec key"}
</Text>
</View>
)}
<View style={styles.buttonContainer}> <View style={styles.buttonContainer}>
{!currentNpub ? ( {!nostrConnected ? (
<Pressable onPress={handleConnectNostr} style={({ pressed }) => [styles.button, { backgroundColor: C.accent, opacity: pressed ? 0.8 : 1 }]}> <Pressable
<Text style={[styles.buttonText, { color: C.textInverted }]}>Connect Nostr</Text> onPress={() => setNostrModalVisible(true)}
style={({ pressed }) => [
styles.button,
{ backgroundColor: C.accent, opacity: pressed ? 0.8 : 1 },
]}
>
<Text style={[styles.buttonText, { color: C.textInverted }]}>
Connect Nostr Identity
</Text>
</Pressable> </Pressable>
) : ( ) : (
<Pressable onPress={handleDisconnectNostr} style={({ pressed }) => [styles.button, { backgroundColor: C.destructive, opacity: pressed ? 0.8 : 1 }]}> <Pressable
<Text style={[styles.buttonText, { color: C.textInverted }]}>Disconnect Nostr</Text> onPress={handleDisconnectNostr}
style={({ pressed }) => [
styles.button,
{ backgroundColor: C.destructive, opacity: pressed ? 0.8 : 1 },
]}
>
<Text style={[styles.buttonText, { color: C.textInverted }]}>
Disconnect Nostr
</Text>
</Pressable> </Pressable>
)} )}
</View> </View>
<Text style={styles.sectionHeader}>About</Text> {/* ── About ───────────────────────────────────────────────────── */}
<View style={styles.settingItem}> <Text style={[styles.sectionHeader, { color: C.text }]}>About</Text>
<Text style={styles.settingLabel}>App Version</Text> <View style={[styles.settingItem, { borderBottomColor: C.border }]}>
<Text style={[styles.settingLabel, { color: C.text }]}>App Version</Text>
<Text style={[styles.settingValue, { color: C.text }]}>{appVersion}</Text> <Text style={[styles.settingValue, { color: C.text }]}>{appVersion}</Text>
</View> </View>
<View style={styles.settingItem}> <View style={[styles.settingItem, { borderBottomColor: C.border }]}>
<Text style={styles.settingLabel}>Build Commit Hash</Text> <Text style={[styles.settingLabel, { color: C.text }]}>Build Commit</Text>
<Text style={[styles.settingValue, { color: C.text }]}>{buildCommitHash}</Text> <Text style={[styles.settingValue, { color: C.text }]}>{buildCommitHash}</Text>
</View> </View>
<Pressable onPress={openGiteaLink} style={({ pressed }) => [styles.linkButton, { opacity: pressed ? 0.8 : 1 }]}> <Pressable
onPress={() => Linking.openURL(giteaRepoUrl)}
style={({ pressed }) => [styles.linkButton, { opacity: pressed ? 0.8 : 1 }]}
>
<Ionicons name="link" size={16} color={C.text} /> <Ionicons name="link" size={16} color={C.text} />
<Text style={[styles.linkButtonText, { color: C.link }]}>View project on Gitea</Text> <Text style={[styles.linkButtonText, { color: C.link }]}>
View project on Gitea
</Text>
</Pressable> </Pressable>
</ScrollView> </ScrollView>
<NostrConnectModal
visible={nostrModalVisible}
onClose={() => setNostrModalVisible(false)}
/>
</View> </View>
); );
} }
@@ -180,7 +206,6 @@ export default function SettingsScreen() {
const styles = StyleSheet.create({ const styles = StyleSheet.create({
container: { container: {
flex: 1, flex: 1,
backgroundColor: Colors.dark.background, // Use background color from Colors
}, },
scrollContent: { scrollContent: {
padding: 20, padding: 20,
@@ -188,36 +213,35 @@ const styles = StyleSheet.create({
}, },
sectionHeader: { sectionHeader: {
fontSize: 18, fontSize: 18,
fontWeight: 'bold', fontWeight: "bold",
color: Colors.dark.text,
marginTop: 20, marginTop: 20,
marginBottom: 10, marginBottom: 10,
}, },
settingItem: { settingItem: {
flexDirection: 'row', flexDirection: "row",
justifyContent: 'space-between', justifyContent: "space-between",
alignItems: 'center', alignItems: "center",
paddingVertical: 12, paddingVertical: 12,
borderBottomWidth: 0.5, borderBottomWidth: 0.5,
borderBottomColor: Colors.dark.border,
}, },
settingLabel: { settingLabel: {
fontSize: 16, fontSize: 16,
color: Colors.dark.text,
flex: 1, flex: 1,
}, },
settingValue: { settingValue: {
fontSize: 16, fontSize: 14,
flexShrink: 1,
textAlign: "right",
marginLeft: 8,
}, },
serverUrlContainer: { serverUrlContainer: {
flexDirection: 'row', flexDirection: "row",
alignItems: 'center', alignItems: "center",
flex: 2, flex: 2,
}, },
input: { input: {
flex: 1, flex: 1,
borderWidth: 1, borderWidth: 1,
borderColor: Colors.dark.border,
borderRadius: 8, borderRadius: 8,
padding: 8, padding: 8,
fontSize: 14, fontSize: 14,
@@ -225,7 +249,7 @@ const styles = StyleSheet.create({
}, },
buttonContainer: { buttonContainer: {
marginTop: 20, marginTop: 20,
alignItems: 'flex-start', alignItems: "flex-start",
}, },
button: { button: {
paddingVertical: 10, paddingVertical: 10,
@@ -234,11 +258,11 @@ const styles = StyleSheet.create({
}, },
buttonText: { buttonText: {
fontSize: 16, fontSize: 16,
fontWeight: 'bold', fontWeight: "bold",
}, },
linkButton: { linkButton: {
flexDirection: 'row', flexDirection: "row",
alignItems: 'center', alignItems: "center",
marginTop: 15, marginTop: 15,
paddingVertical: 8, paddingVertical: 8,
}, },

View File

@@ -0,0 +1,276 @@
/**
* NostrConnectModal — UI for connecting a Nostr identity on mobile.
*
* Android: offers "Connect with Amber" (NIP-55) as the primary action,
* with manual nsec entry as a secondary option.
* iOS / other: manual nsec entry only.
*/
import React, { useCallback, useState } from "react";
import {
ActivityIndicator,
Modal,
Platform,
Pressable,
StyleSheet,
Text,
TextInput,
View,
} from "react-native";
import { Ionicons } from "@expo/vector-icons";
import { Colors } from "@/constants/colors";
import { useNostr } from "@/context/NostrContext";
// ─── Props ────────────────────────────────────────────────────────────────────
type Props = {
visible: boolean;
onClose: () => void;
};
// ─── Component ────────────────────────────────────────────────────────────────
export function NostrConnectModal({ visible, onClose }: Props) {
const C = Colors.dark;
const { connectWithAmber, connectWithNsec, canUseAmber } = useNostr();
const [showNsecForm, setShowNsecForm] = useState(!canUseAmber);
const [nsecInput, setNsecInput] = useState("");
const [error, setError] = useState<string | null>(null);
const [loading, setLoading] = useState(false);
const handleClose = useCallback(() => {
setNsecInput("");
setError(null);
setShowNsecForm(!canUseAmber);
onClose();
}, [canUseAmber, onClose]);
const handleAmberPress = useCallback(async () => {
setError(null);
setLoading(true);
try {
await connectWithAmber();
// Amber opens; the result arrives via deep-link callback.
// Close the modal — NostrContext handles the incoming URL.
handleClose();
} finally {
setLoading(false);
}
}, [connectWithAmber, handleClose]);
const handleNsecConnect = useCallback(async () => {
if (!nsecInput.trim()) {
setError("Please enter your nsec key");
return;
}
setError(null);
setLoading(true);
const result = await connectWithNsec(nsecInput.trim());
setLoading(false);
if (result.success) {
handleClose();
} else {
setError(result.error);
}
}, [nsecInput, connectWithNsec, handleClose]);
return (
<Modal
visible={visible}
animationType="slide"
transparent
onRequestClose={handleClose}
>
<View style={styles.overlay}>
<View style={[styles.sheet, { backgroundColor: C.surface, borderColor: C.border }]}>
{/* Header */}
<View style={styles.header}>
<Text style={[styles.title, { color: C.text }]}>Connect Nostr Identity</Text>
<Pressable onPress={handleClose} hitSlop={12}>
<Ionicons name="close" size={22} color={C.textSecondary} />
</Pressable>
</View>
{/* Android: Amber option */}
{canUseAmber && !showNsecForm && (
<View style={styles.body}>
<Text style={[styles.description, { color: C.textSecondary }]}>
Connect using{" "}
<Text style={{ color: C.text, fontWeight: "600" }}>Amber</Text>{" "}
your keys stay in Amber and are never exposed to this app.
</Text>
<Pressable
onPress={handleAmberPress}
disabled={loading}
style={({ pressed }) => [
styles.primaryButton,
{ backgroundColor: C.accent, opacity: pressed || loading ? 0.75 : 1 },
]}
>
{loading ? (
<ActivityIndicator color={C.textInverted} />
) : (
<>
<Ionicons name="shield-checkmark" size={18} color={C.textInverted} />
<Text style={[styles.buttonText, { color: C.textInverted }]}>
Connect with Amber
</Text>
</>
)}
</Pressable>
<Pressable
onPress={() => setShowNsecForm(true)}
style={styles.secondaryLink}
>
<Text style={[styles.secondaryLinkText, { color: C.link }]}>
Enter nsec manually instead
</Text>
</Pressable>
</View>
)}
{/* nsec form */}
{showNsecForm && (
<View style={styles.body}>
{canUseAmber && (
<Pressable
onPress={() => { setShowNsecForm(false); setError(null); }}
style={styles.backLink}
>
<Ionicons name="arrow-back" size={14} color={C.link} />
<Text style={[styles.secondaryLinkText, { color: C.link }]}>
Use Amber instead
</Text>
</Pressable>
)}
<Text style={[styles.description, { color: C.textSecondary }]}>
Paste your{" "}
<Text style={{ color: C.text, fontWeight: "600" }}>nsec1</Text>{" "}
private key. It will be stored only in the device secure keystore
and never logged or transmitted.
</Text>
<TextInput
style={[
styles.input,
{
backgroundColor: C.field,
color: C.text,
borderColor: error ? C.destructive : C.border,
},
]}
placeholder="nsec1…"
placeholderTextColor={C.textMuted}
value={nsecInput}
onChangeText={(t) => { setNsecInput(t); setError(null); }}
autoCapitalize="none"
autoCorrect={false}
secureTextEntry
editable={!loading}
/>
{error && (
<Text style={[styles.errorText, { color: C.destructive }]}>
{error}
</Text>
)}
<Pressable
onPress={handleNsecConnect}
disabled={loading}
style={({ pressed }) => [
styles.primaryButton,
{ backgroundColor: C.accent, opacity: pressed || loading ? 0.75 : 1 },
]}
>
{loading ? (
<ActivityIndicator color={C.textInverted} />
) : (
<Text style={[styles.buttonText, { color: C.textInverted }]}>
Connect
</Text>
)}
</Pressable>
</View>
)}
</View>
</View>
</Modal>
);
}
// ─── Styles ───────────────────────────────────────────────────────────────────
const styles = StyleSheet.create({
overlay: {
flex: 1,
justifyContent: "flex-end",
backgroundColor: "rgba(0,0,0,0.6)",
},
sheet: {
borderTopLeftRadius: 20,
borderTopRightRadius: 20,
borderWidth: 1,
borderBottomWidth: 0,
paddingHorizontal: 24,
paddingTop: 20,
paddingBottom: Platform.OS === "ios" ? 40 : 24,
},
header: {
flexDirection: "row",
justifyContent: "space-between",
alignItems: "center",
marginBottom: 16,
},
title: {
fontSize: 18,
fontWeight: "700",
},
body: {
gap: 14,
},
description: {
fontSize: 14,
lineHeight: 20,
},
primaryButton: {
flexDirection: "row",
alignItems: "center",
justifyContent: "center",
gap: 8,
paddingVertical: 14,
borderRadius: 10,
},
buttonText: {
fontSize: 16,
fontWeight: "600",
},
secondaryLink: {
alignItems: "center",
paddingVertical: 4,
},
secondaryLinkText: {
fontSize: 14,
},
backLink: {
flexDirection: "row",
alignItems: "center",
gap: 4,
},
input: {
borderWidth: 1,
borderRadius: 10,
paddingHorizontal: 14,
paddingVertical: 12,
fontSize: 14,
fontFamily: Platform.OS === "ios" ? "Courier" : "monospace",
},
errorText: {
fontSize: 13,
},
});

View File

@@ -29,6 +29,10 @@ export const Colors = {
working: "#F59E0B", working: "#F59E0B",
idle: "#6B7280", idle: "#6B7280",
micActive: "#EF4444", micActive: "#EF4444",
field: "#1A1A2E",
textInverted: "#0A0A12",
destructive: "#EF4444",
link: "#A78BFA",
}, },
} as const; } as const;

View File

@@ -1 +1,2 @@
export const ONBOARDING_COMPLETED_KEY = "app.onboarding_completed"; export const ONBOARDING_COMPLETED_KEY = "app.onboarding_completed";
export const SERVER_URL_KEY = "settings.server_url";

View File

@@ -0,0 +1,274 @@
/**
* NostrContext — Nostr identity management for mobile.
*
* Android: NIP-55 Amber deep-link signing (com.greenart7c3.nostrsigner).
* Opens Amber via the `nostrsigner:` URI scheme to retrieve the user's
* public key; falls back to the Play Store install prompt when Amber is
* not installed.
*
* iOS / manual fallback: nsec paste-in stored exclusively in Expo SecureStore.
* The raw key is NEVER written to AsyncStorage, Redux state, or logs.
*/
import React, {
createContext,
useCallback,
useContext,
useEffect,
useMemo,
useState,
} from "react";
import { Linking, Platform } from "react-native";
import * as SecureStore from "expo-secure-store";
import { getPublicKey, nip19 } from "nostr-tools";
// ─── Types ────────────────────────────────────────────────────────────────────
export type NostrSignerType = "amber" | "nsec" | null;
export type NostrConnectResult =
| { success: true }
| { success: false; error: string };
type NostrContextValue = {
/** bech32 public key (npub1…), null when no identity is loaded */
npub: string | null;
/** Raw hex public key, null when no identity is loaded */
pubkeyHex: string | null;
/** How the key was connected */
signerType: NostrSignerType;
/** True when an identity is loaded */
nostrConnected: boolean;
/** True only on Android — Amber integration available */
canUseAmber: boolean;
/** Android only: launch Amber to retrieve the user's public key */
connectWithAmber: () => Promise<void>;
/** Both platforms: validate & store an nsec; derive and cache the npub */
connectWithNsec: (nsec: string) => Promise<NostrConnectResult>;
/** Wipe all Nostr credentials from SecureStore and reset state */
disconnect: () => Promise<void>;
};
// ─── Constants ────────────────────────────────────────────────────────────────
const SECURE_KEY_NSEC = "nostr.nsec";
const SECURE_KEY_NPUB = "nostr.npub";
const SECURE_KEY_SIGNER_TYPE = "nostr.signer_type";
/** The deep-link scheme declared in app.json */
const APP_SCHEME = "mobile";
/** Path Amber will call back to with the pubkey result */
const AMBER_CALLBACK_URL = `${APP_SCHEME}://nostr-callback`;
const AMBER_PACKAGE = "com.greenart7c3.nostrsigner";
const AMBER_PLAY_STORE_URL =
"https://play.google.com/store/apps/details?id=com.greenart7c3.nostrsigner";
// ─── Helpers ──────────────────────────────────────────────────────────────────
/** Truncate an npub for display: "npub1abcde…xyz12" */
export function truncateNpub(npub: string): string {
if (npub.length <= 20) return npub;
return `${npub.substring(0, 10)}${npub.substring(npub.length - 5)}`;
}
// ─── Context ──────────────────────────────────────────────────────────────────
const NostrContext = createContext<NostrContextValue | null>(null);
export function NostrProvider({ children }: { children: React.ReactNode }) {
const [npub, setNpub] = useState<string | null>(null);
const [pubkeyHex, setPubkeyHex] = useState<string | null>(null);
const [signerType, setSignerType] = useState<NostrSignerType>(null);
const canUseAmber = Platform.OS === "android";
// ── Load persisted identity on mount ──────────────────────────────────────
useEffect(() => {
async function loadIdentity() {
try {
const [storedNpub, storedSignerType] = await Promise.all([
SecureStore.getItemAsync(SECURE_KEY_NPUB),
SecureStore.getItemAsync(SECURE_KEY_SIGNER_TYPE),
]);
if (storedNpub && storedSignerType) {
setNpub(storedNpub);
setSignerType(storedSignerType as NostrSignerType);
try {
const decoded = nip19.decode(storedNpub);
if (decoded.type === "npub") {
setPubkeyHex(decoded.data as string);
}
} catch {
// npub decode failure — identity still "connected", pubkeyHex stays null
}
}
} catch {
// SecureStore unavailable (e.g. web build) — proceed without identity
}
}
loadIdentity();
}, []);
// ── Handle Amber callback deep link (Android) ─────────────────────────────
useEffect(() => {
if (!canUseAmber) return;
function handleUrl({ url }: { url: string }) {
if (!url.startsWith(`${APP_SCHEME}://nostr-callback`)) return;
try {
// React Native's URL parsing is not available in all environments;
// parse manually to avoid importing a polyfill.
const queryStart = url.indexOf("?");
if (queryStart === -1) return;
const params = new URLSearchParams(url.slice(queryStart + 1));
const result = params.get("result");
if (!result) return;
// Amber returns the hex pubkey in `result`
let hexKey = result;
if (result.startsWith("npub1")) {
const decoded = nip19.decode(result);
if (decoded.type === "npub") hexKey = decoded.data as string;
}
const derivedNpub = nip19.npubEncode(hexKey);
// Persist — no private key stored for Amber flow
SecureStore.setItemAsync(SECURE_KEY_NPUB, derivedNpub).catch(() => {});
SecureStore.setItemAsync(SECURE_KEY_SIGNER_TYPE, "amber").catch(() => {});
setNpub(derivedNpub);
setPubkeyHex(hexKey);
setSignerType("amber");
} catch {
// Malformed callback — silently ignore
}
}
const subscription = Linking.addEventListener("url", handleUrl);
return () => subscription.remove();
}, [canUseAmber]);
// ── Actions ───────────────────────────────────────────────────────────────
const connectWithAmber = useCallback(async () => {
// NIP-55: request the user's public key from Amber
const amberUri = `nostrsigner:?type=get_public_key&compressionType=none&returnType=signature&callbackUrl=${encodeURIComponent(AMBER_CALLBACK_URL)}`;
let canOpen = false;
try {
canOpen = await Linking.canOpenURL(`nostrsigner:`);
} catch {
canOpen = false;
}
if (canOpen) {
await Linking.openURL(amberUri);
} else {
// Amber not installed — direct user to Play Store
await Linking.openURL(AMBER_PLAY_STORE_URL);
}
}, []);
const connectWithNsec = useCallback(
async (nsec: string): Promise<NostrConnectResult> => {
const trimmed = nsec.trim();
if (!trimmed.startsWith("nsec1")) {
return { success: false, error: "Key must start with nsec1" };
}
let decoded: ReturnType<typeof nip19.decode>;
try {
decoded = nip19.decode(trimmed);
} catch {
return { success: false, error: "Invalid bech32 encoding" };
}
if (decoded.type !== "nsec") {
return { success: false, error: "Not a valid nsec key" };
}
let hexPubkey: string;
try {
const sk = decoded.data as Uint8Array;
hexPubkey = getPublicKey(sk);
} catch {
return { success: false, error: "Could not derive public key" };
}
const derivedNpub = nip19.npubEncode(hexPubkey);
try {
// Store only in SecureStore — never AsyncStorage, never logs
await SecureStore.setItemAsync(SECURE_KEY_NSEC, trimmed);
await SecureStore.setItemAsync(SECURE_KEY_NPUB, derivedNpub);
await SecureStore.setItemAsync(SECURE_KEY_SIGNER_TYPE, "nsec");
} catch {
return { success: false, error: "Failed to store key securely" };
}
setNpub(derivedNpub);
setPubkeyHex(hexPubkey);
setSignerType("nsec");
return { success: true };
},
[]
);
const disconnect = useCallback(async () => {
try {
await Promise.all([
SecureStore.deleteItemAsync(SECURE_KEY_NSEC),
SecureStore.deleteItemAsync(SECURE_KEY_NPUB),
SecureStore.deleteItemAsync(SECURE_KEY_SIGNER_TYPE),
]);
} catch {
// Best-effort cleanup; reset state regardless
}
setNpub(null);
setPubkeyHex(null);
setSignerType(null);
}, []);
// ── Context value ─────────────────────────────────────────────────────────
const value = useMemo<NostrContextValue>(
() => ({
npub,
pubkeyHex,
signerType,
nostrConnected: npub !== null,
canUseAmber,
connectWithAmber,
connectWithNsec,
disconnect,
}),
[
npub,
pubkeyHex,
signerType,
canUseAmber,
connectWithAmber,
connectWithNsec,
disconnect,
]
);
return (
<NostrContext.Provider value={value}>{children}</NostrContext.Provider>
);
}
export function useNostr(): NostrContextValue {
const ctx = useContext(NostrContext);
if (!ctx) throw new Error("useNostr must be used within NostrProvider");
return ctx;
}
export { AMBER_PACKAGE };

View File

@@ -8,6 +8,9 @@ import React, {
useState, useState,
} from "react"; } from "react";
import { AppState, Platform } from "react-native"; import { AppState, Platform } from "react-native";
import AsyncStorage from "@react-native-async-storage/async-storage";
import { SERVER_URL_KEY } from "@/constants/storage-keys";
export type TimmyMood = "idle" | "thinking" | "working" | "speaking"; export type TimmyMood = "idle" | "thinking" | "working" | "speaking";
@@ -22,33 +25,42 @@ export type WsEvent = {
count?: number; count?: number;
}; };
export type ConnectionStatus = "connecting" | "connected" | "disconnected" | "reconnecting" | "error"; export type ConnectionStatus =
| "connecting"
| "connected"
| "disconnected"
| "reconnecting"
| "error";
type TimmyContextValue = { type TimmyContextValue = {
timmyMood: TimmyMood; timmyMood: TimmyMood;
connectionStatus: ConnectionStatus; connectionStatus: ConnectionStatus;
/** True when the WebSocket is fully open */
isConnected: boolean;
recentEvents: WsEvent[]; recentEvents: WsEvent[];
send: (msg: object) => void; send: (msg: object) => void;
sendVisitorMessage: (text: string) => void; sendVisitorMessage: (text: string) => void;
visitorId: string; visitorId: string;
/** Current API / WebSocket base domain */
apiBaseUrl: string;
/** Persist a new base URL and reconnect the WebSocket */
setApiBaseUrl: (url: string) => void;
}; };
const TimmyContext = createContext<TimmyContextValue | null>(null); const TimmyContext = createContext<TimmyContextValue | null>(null);
const MAX_EVENTS = 100; const MAX_EVENTS = 100;
const BASE_URL = process.env.EXPO_PUBLIC_DOMAIN ?? ""; const ENV_DOMAIN = process.env["EXPO_PUBLIC_DOMAIN"] ?? "";
const VISITOR_ID = const VISITOR_ID =
Date.now().toString() + Math.random().toString(36).substr(2, 9); Date.now().toString() + Math.random().toString(36).substr(2, 9);
function getWsUrl(): string { function buildWsUrl(domain: string): string {
let domain = BASE_URL; let d = domain.trim();
if (!domain) { if (!d) d = "localhost:8080";
domain = "localhost:8080"; d = d.replace(/^https?:\/\//, "");
} d = d.replace(/\/$/, "");
domain = domain.replace(/^https?:\/\//, ""); const proto = d.startsWith("localhost") ? "ws" : "wss";
domain = domain.replace(/\/$/, ""); return `${proto}://${d}/api/ws`;
const proto = domain.startsWith("localhost") ? "ws" : "wss";
return `${proto}://${domain}/api/ws`;
} }
function deriveMood(agentStates: Record<string, string>): TimmyMood { function deriveMood(agentStates: Record<string, string>): TimmyMood {
@@ -63,10 +75,12 @@ function deriveMood(agentStates: Record<string, string>): TimmyMood {
} }
export function TimmyProvider({ children }: { children: React.ReactNode }) { export function TimmyProvider({ children }: { children: React.ReactNode }) {
const [apiBaseUrl, setApiBaseUrlState] = useState(ENV_DOMAIN);
const [timmyMood, setTimmyMood] = useState<TimmyMood>("idle"); const [timmyMood, setTimmyMood] = useState<TimmyMood>("idle");
const [connectionStatus, setConnectionStatus] = const [connectionStatus, setConnectionStatus] =
useState<ConnectionStatus>("connecting"); useState<ConnectionStatus>("connecting");
const [recentEvents, setRecentEvents] = useState<WsEvent[]>([]); const [recentEvents, setRecentEvents] = useState<WsEvent[]>([]);
const wsRef = useRef<WebSocket | null>(null); const wsRef = useRef<WebSocket | null>(null);
const retryTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null); const retryTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
const retryCountRef = useRef(0); const retryCountRef = useRef(0);
@@ -77,6 +91,32 @@ export function TimmyProvider({ children }: { children: React.ReactNode }) {
delta: "idle", delta: "idle",
}); });
const speakingTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null); const speakingTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
// Stable ref so WebSocket callbacks always read the current URL
const apiBaseUrlRef = useRef(apiBaseUrl);
// Stable refs to break the connectWs ↔ scheduleRetry circular dependency
const connectWsRef = useRef<() => void>(() => {});
const scheduleRetryRef = useRef<() => void>(() => {});
// ── Load persisted URL on mount ────────────────────────────────────────
useEffect(() => {
AsyncStorage.getItem(SERVER_URL_KEY)
.then((stored) => {
if (stored) {
setApiBaseUrlState(stored);
apiBaseUrlRef.current = stored;
}
})
.catch(() => {});
}, []);
const setApiBaseUrl = useCallback((url: string) => {
setApiBaseUrlState(url);
apiBaseUrlRef.current = url;
AsyncStorage.setItem(SERVER_URL_KEY, url).catch(() => {});
}, []);
// ── WebSocket helpers ──────────────────────────────────────────────────
const addEvent = useCallback((evt: Omit<WsEvent, "id" | "timestamp">) => { const addEvent = useCallback((evt: Omit<WsEvent, "id" | "timestamp">) => {
const entry: WsEvent = { const entry: WsEvent = {
@@ -94,14 +134,14 @@ export function TimmyProvider({ children }: { children: React.ReactNode }) {
wsRef.current.close(); wsRef.current.close();
wsRef.current = null; wsRef.current = null;
} }
const url = getWsUrl(); const url = buildWsUrl(apiBaseUrlRef.current);
setConnectionStatus("connecting"); setConnectionStatus("connecting");
let ws: WebSocket; let ws: WebSocket;
try { try {
ws = new WebSocket(url); ws = new WebSocket(url);
} catch { } catch {
setConnectionStatus("error"); setConnectionStatus("error");
scheduleRetry(); scheduleRetryRef.current();
return; return;
} }
wsRef.current = ws; wsRef.current = ws;
@@ -134,10 +174,7 @@ export function TimmyProvider({ children }: { children: React.ReactNode }) {
if (type === "world_state") { if (type === "world_state") {
const states = (msg.agentStates as Record<string, string>) ?? {}; const states = (msg.agentStates as Record<string, string>) ?? {};
agentStatesRef.current = { agentStatesRef.current = { ...agentStatesRef.current, ...states };
...agentStatesRef.current,
...states,
};
setTimmyMood(deriveMood(agentStatesRef.current)); setTimmyMood(deriveMood(agentStatesRef.current));
return; return;
} }
@@ -187,7 +224,7 @@ export function TimmyProvider({ children }: { children: React.ReactNode }) {
ws.onclose = () => { ws.onclose = () => {
setConnectionStatus("disconnected"); setConnectionStatus("disconnected");
scheduleRetry(); scheduleRetryRef.current();
}; };
ws.onerror = () => { ws.onerror = () => {
@@ -200,9 +237,15 @@ export function TimmyProvider({ children }: { children: React.ReactNode }) {
const delay = Math.min(1000 * Math.pow(2, retryCountRef.current), 30000); const delay = Math.min(1000 * Math.pow(2, retryCountRef.current), 30000);
retryCountRef.current += 1; retryCountRef.current += 1;
retryTimerRef.current = setTimeout(() => { retryTimerRef.current = setTimeout(() => {
connectWs(); connectWsRef.current();
}, delay); }, delay);
}, [connectWs]); }, []);
// Keep the stable refs current after every render
connectWsRef.current = connectWs;
scheduleRetryRef.current = scheduleRetry;
// ── Initial connect ────────────────────────────────────────────────────
useEffect(() => { useEffect(() => {
connectWs(); connectWs();
@@ -216,7 +259,19 @@ export function TimmyProvider({ children }: { children: React.ReactNode }) {
}; };
}, [connectWs]); }, [connectWs]);
// AppState-aware WebSocket reconnect on foreground // Reconnect when apiBaseUrl changes (skip the very first render)
const isFirstRenderRef = useRef(true);
useEffect(() => {
if (isFirstRenderRef.current) {
isFirstRenderRef.current = false;
return;
}
retryCountRef.current = 0;
connectWs();
}, [apiBaseUrl, connectWs]);
// ── AppState-aware reconnect on foreground ─────────────────────────────
useEffect(() => { useEffect(() => {
if (Platform.OS === "web") return; if (Platform.OS === "web") return;
@@ -229,20 +284,17 @@ export function TimmyProvider({ children }: { children: React.ReactNode }) {
const isNowActive = nextAppState === "active"; const isNowActive = nextAppState === "active";
if (wasBackground && isNowActive) { if (wasBackground && isNowActive) {
// App returned to foreground — check if WS is still alive
const ws = wsRef.current; const ws = wsRef.current;
if (!ws || ws.readyState !== WebSocket.OPEN) { if (!ws || ws.readyState !== WebSocket.OPEN) {
// Cancel any pending retry so we don't create duplicates
if (retryTimerRef.current) { if (retryTimerRef.current) {
clearTimeout(retryTimerRef.current); clearTimeout(retryTimerRef.current);
retryTimerRef.current = null; retryTimerRef.current = null;
} }
retryCountRef.current = 0; retryCountRef.current = 0;
setConnectionStatus("reconnecting"); setConnectionStatus("reconnecting");
connectWs(); connectWsRef.current();
} }
} else if (nextAppState === "background") { } else if (nextAppState === "background") {
// Proactively close the WS to avoid OS killing it mid-frame
if (retryTimerRef.current) { if (retryTimerRef.current) {
clearTimeout(retryTimerRef.current); clearTimeout(retryTimerRef.current);
retryTimerRef.current = null; retryTimerRef.current = null;
@@ -262,7 +314,9 @@ export function TimmyProvider({ children }: { children: React.ReactNode }) {
return () => { return () => {
subscription.remove(); subscription.remove();
}; };
}, [connectWs]); }, []);
// ── Outbound messages ──────────────────────────────────────────────────
const send = useCallback((msg: object) => { const send = useCallback((msg: object) => {
if (wsRef.current && wsRef.current.readyState === WebSocket.OPEN) { if (wsRef.current && wsRef.current.readyState === WebSocket.OPEN) {
@@ -270,28 +324,42 @@ export function TimmyProvider({ children }: { children: React.ReactNode }) {
} }
}, []); }, []);
const sendVisitorMessage = useCallback( const sendVisitorMessage = useCallback((text: string) => {
(text: string) => { if (wsRef.current && wsRef.current.readyState === WebSocket.OPEN) {
if (wsRef.current && wsRef.current.readyState === WebSocket.OPEN) { wsRef.current.send(
wsRef.current.send( JSON.stringify({
JSON.stringify({ type: "visitor_message", visitorId: VISITOR_ID, text }) type: "visitor_message",
); visitorId: VISITOR_ID,
setTimmyMood("thinking"); text,
} })
}, );
[] setTimmyMood("thinking");
); }
}, []);
const value = useMemo( // ── Context value ──────────────────────────────────────────────────────
const value = useMemo<TimmyContextValue>(
() => ({ () => ({
timmyMood,
connectionStatus,
isConnected: connectionStatus === "connected",
recentEvents,
send,
sendVisitorMessage,
visitorId: VISITOR_ID,
apiBaseUrl,
setApiBaseUrl,
}),
[
timmyMood, timmyMood,
connectionStatus, connectionStatus,
recentEvents, recentEvents,
send, send,
sendVisitorMessage, sendVisitorMessage,
visitorId: VISITOR_ID, apiBaseUrl,
}), setApiBaseUrl,
[timmyMood, connectionStatus, recentEvents, send, sendVisitorMessage] ]
); );
return ( return (

View File

@@ -57,7 +57,9 @@
}, },
"dependencies": { "dependencies": {
"@react-native-voice/voice": "^3.2.4", "@react-native-voice/voice": "^3.2.4",
"expo-secure-store": "~14.0.1",
"expo-speech": "^14.0.8", "expo-speech": "^14.0.8",
"nostr-tools": "^2.23.3",
"react-native-qrcode-svg": "^6.3.21", "react-native-qrcode-svg": "^6.3.21",
"react-native-webview": "^13.15.0" "react-native-webview": "^13.15.0"
} }