feat: Integrate Nostr chat preloader for improved chat data handling

- Introduce a new composable, useNostrChatPreloader, to manage chat data preloading, including peer loading and subscription for notifications.
- Update ChatComponent to utilize the preloader, ensuring chat data is ready before connecting.
- Enhance Navbar to display unread message counts with notification badges for better user experience.
- Refactor App.vue to trigger both market and chat preloading upon successful login, streamlining the user experience.
This commit is contained in:
padreug 2025-08-09 14:58:35 +02:00
parent b0101915c7
commit 855a003962
4 changed files with 233 additions and 133 deletions

View file

@ -8,13 +8,15 @@ import { Toaster } from '@/components/ui/sonner'
import 'vue-sonner/style.css' import 'vue-sonner/style.css'
import { auth } from '@/composables/useAuth' import { auth } from '@/composables/useAuth'
import { useMarketPreloader } from '@/composables/useMarketPreloader' import { useMarketPreloader } from '@/composables/useMarketPreloader'
import { useNostrChatPreloader } from '@/composables/useNostrChatPreloader'
import { toast } from 'vue-sonner' import { toast } from 'vue-sonner'
const route = useRoute() const route = useRoute()
const showLoginDialog = ref(false) const showLoginDialog = ref(false)
// Initialize market preloader // Initialize preloaders
const marketPreloader = useMarketPreloader() const marketPreloader = useMarketPreloader()
const chatPreloader = useNostrChatPreloader()
// Hide navbar on login page // Hide navbar on login page
const showNavbar = computed(() => { const showNavbar = computed(() => {
@ -25,8 +27,9 @@ function handleLoginSuccess() {
showLoginDialog.value = false showLoginDialog.value = false
toast.success('Welcome back!') toast.success('Welcome back!')
// Trigger market preloading after successful login // Trigger preloading after successful login
marketPreloader.preloadMarket() marketPreloader.preloadMarket()
chatPreloader.preloadChat()
} }
onMounted(async () => { onMounted(async () => {
@ -38,11 +41,17 @@ onMounted(async () => {
} }
}) })
// Watch for authentication changes and trigger market preloading // Watch for authentication changes and trigger preloading
watch(() => auth.isAuthenticated.value, (isAuthenticated) => { watch(() => auth.isAuthenticated.value, (isAuthenticated) => {
if (isAuthenticated && !marketPreloader.isPreloaded.value) { if (isAuthenticated) {
console.log('User authenticated, triggering market preload...') if (!marketPreloader.isPreloaded.value) {
marketPreloader.preloadMarket() console.log('User authenticated, triggering market preload...')
marketPreloader.preloadMarket()
}
if (!chatPreloader.isPreloaded.value) {
console.log('User authenticated, triggering chat preload...')
chatPreloader.preloadChat()
}
} }
}, { immediate: true }) }, { immediate: true })
</script> </script>

View file

@ -13,6 +13,7 @@ import ProfileDialog from '@/components/auth/ProfileDialog.vue'
import CurrencyDisplay from '@/components/ui/CurrencyDisplay.vue' import CurrencyDisplay from '@/components/ui/CurrencyDisplay.vue'
import { auth } from '@/composables/useAuth' import { auth } from '@/composables/useAuth'
import { useMarketPreloader } from '@/composables/useMarketPreloader' import { useMarketPreloader } from '@/composables/useMarketPreloader'
import { useNostrChatPreloader } from '@/composables/useNostrChatPreloader'
interface NavigationItem { interface NavigationItem {
name: string name: string
@ -26,6 +27,7 @@ const isOpen = ref(false)
const showLoginDialog = ref(false) const showLoginDialog = ref(false)
const showProfileDialog = ref(false) const showProfileDialog = ref(false)
const marketPreloader = useMarketPreloader() const marketPreloader = useMarketPreloader()
const chatPreloader = useNostrChatPreloader()
const navigation = computed<NavigationItem[]>(() => [ const navigation = computed<NavigationItem[]>(() => [
{ name: t('nav.home'), href: '/' }, { name: t('nav.home'), href: '/' },
@ -43,6 +45,11 @@ const totalBalance = computed(() => {
}, 0) }, 0)
}) })
// Compute total unread messages
const totalUnreadMessages = computed(() => {
return chatPreloader.getTotalUnreadCount()
})
const toggleMenu = () => { const toggleMenu = () => {
isOpen.value = !isOpen.value isOpen.value = !isOpen.value
} }
@ -87,13 +94,20 @@ const handleLogout = async () => {
<!-- Desktop Navigation --> <!-- Desktop Navigation -->
<div class="hidden md:flex gap-4 lg:gap-6 xl:gap-8"> <div class="hidden md:flex gap-4 lg:gap-6 xl:gap-8">
<router-link v-for="item in navigation" :key="item.name" :to="item.href" <router-link v-for="item in navigation" :key="item.name" :to="item.href"
class="text-muted-foreground hover:text-foreground transition-colors flex items-center gap-2 text-sm lg:text-base xl:text-lg" class="text-muted-foreground hover:text-foreground transition-colors flex items-center gap-2 text-sm lg:text-base xl:text-lg relative"
:class="{ :class="{
'text-foreground': $route.path === item.href 'text-foreground': $route.path === item.href
}"> }">
<!-- Chat icon --> <!-- Chat icon with notification badge -->
<MessageSquare v-if="item.href === '/chat'" class="h-4 w-4" /> <div v-if="item.href === '/chat'" class="relative">
{{ item.name }} <MessageSquare class="h-4 w-4" />
<Badge v-if="totalUnreadMessages > 0"
class="absolute -top-2 -right-2 h-3.5 w-4 text-xs bg-red-500 text-white border-0 p-0 flex items-center justify-center">
{{ totalUnreadMessages > 99 ? '99+' : totalUnreadMessages }}
</Badge>
</div>
<span v-else>{{ item.name }}</span>
<span v-if="item.href === '/chat'">{{ item.name }}</span>
<!-- Market preloading indicator --> <!-- Market preloading indicator -->
<div v-if="item.href === '/market' && marketPreloader.isPreloading" <div v-if="item.href === '/market' && marketPreloader.isPreloading"
class="w-2 h-2 bg-blue-500 rounded-full animate-pulse"></div> class="w-2 h-2 bg-blue-500 rounded-full animate-pulse"></div>
@ -226,12 +240,18 @@ const handleLogout = async () => {
</div> </div>
<router-link v-for="item in navigation" :key="item.name" :to="item.href" <router-link v-for="item in navigation" :key="item.name" :to="item.href"
class="flex items-center gap-2 px-3 py-2 text-base font-medium text-muted-foreground hover:text-foreground transition-colors" class="flex items-center gap-2 px-3 py-2 text-base font-medium text-muted-foreground hover:text-foreground transition-colors relative"
:class="{ :class="{
'text-foreground': $route.path === item.href 'text-foreground': $route.path === item.href
}" @click="isOpen = false"> }" @click="isOpen = false">
<!-- Chat icon --> <!-- Chat icon with notification badge -->
<MessageSquare v-if="item.href === '/chat'" class="h-4 w-4" /> <div v-if="item.href === '/chat'" class="relative">
<MessageSquare class="h-4 w-4" />
<Badge v-if="totalUnreadMessages > 0"
class="absolute -top-2 -right-2 h-3.5 w-4 text-xs bg-red-500 text-white border-0 p-0 flex items-center justify-center">
{{ totalUnreadMessages > 99 ? '99+' : totalUnreadMessages }}
</Badge>
</div>
{{ item.name }} {{ item.name }}
<!-- Market preloading indicator --> <!-- Market preloading indicator -->
<div v-if="item.href === '/market' && marketPreloader.isPreloading" <div v-if="item.href === '/market' && marketPreloader.isPreloading"

View file

@ -376,9 +376,8 @@ import { Badge } from '@/components/ui/badge'
import { ScrollArea } from '@/components/ui/scroll-area' import { ScrollArea } from '@/components/ui/scroll-area'
import { Avatar, AvatarImage, AvatarFallback } from '@/components/ui/avatar' import { Avatar, AvatarImage, AvatarFallback } from '@/components/ui/avatar'
import { useNostrChat } from '@/composables/useNostrChat' import { useNostrChat } from '@/composables/useNostrChat'
import { useNostrChatPreloader } from '@/composables/useNostrChatPreloader'
import { useFuzzySearch } from '@/composables/useFuzzySearch' import { useFuzzySearch } from '@/composables/useFuzzySearch'
import { getAuthToken } from '@/lib/config/lnbits'
import { config } from '@/lib/config'
// Types // Types
interface Peer { interface Peer {
@ -387,12 +386,15 @@ interface Peer {
pubkey: string pubkey: string
} }
// Initialize preloader and chat
const chatPreloader = useNostrChatPreloader()
// State // State
const peers = ref<Peer[]>([]) const peers = computed(() => chatPreloader.peers.value)
const selectedPeer = ref<Peer | null>(null) const selectedPeer = ref<Peer | null>(null)
const messageInput = ref('') const messageInput = ref('')
const isLoading = ref(false) const isLoading = computed(() => chatPreloader.isPreloading.value)
const showChat = ref(false) const showChat = ref(false)
const messagesScrollArea = ref<HTMLElement | null>(null) const messagesScrollArea = ref<HTMLElement | null>(null)
const messagesContainer = ref<HTMLElement | null>(null) const messagesContainer = ref<HTMLElement | null>(null)
@ -408,7 +410,6 @@ const {
connect, connect,
disconnect, disconnect,
subscribeToPeer, subscribeToPeer,
subscribeToPeerForNotifications,
sendMessage: sendNostrMessage, sendMessage: sendNostrMessage,
onMessageAdded, onMessageAdded,
markMessagesAsRead, markMessagesAsRead,
@ -499,106 +500,12 @@ const goBackToPeers = () => {
} }
// Methods // Methods
const loadPeers = async () => {
try {
isLoading.value = true
const authToken = getAuthToken()
if (!authToken) {
console.warn('No authentication token found - cannot load peers')
return
}
const API_BASE_URL = config.api.baseUrl || 'http://localhost:5006'
const response = await fetch(`${API_BASE_URL}/api/v1/auth/nostr/pubkeys`, {
headers: {
'Authorization': `Bearer ${authToken}`,
'Content-Type': 'application/json'
}
})
console.log('Peers API Response status:', response.status)
if (!response.ok) {
const errorText = await response.text()
console.error('Peers API Error:', response.status, errorText)
throw new Error(`Failed to load peers: ${response.status}`)
}
const responseText = await response.text()
console.log('Peers API Response text:', responseText)
try {
const data = JSON.parse(responseText)
peers.value = data.map((peer: any) => ({
user_id: peer.user_id,
username: peer.username,
pubkey: peer.pubkey
}))
console.log(`Loaded ${peers.value.length} peers`)
// Note: Subscriptions will be handled by the isConnected watcher
} catch (parseError) {
console.error('JSON Parse Error for peers:', parseError)
console.error('Response was:', responseText)
throw new Error('Invalid JSON response from peers API')
}
} catch (error) {
console.error('Failed to load peers:', error)
} finally {
isLoading.value = false
}
}
// Subscribe to all peers for notifications (without loading full message history)
const subscribeToAllPeers = async () => {
if (!peers.value.length) {
console.log('No peers to subscribe to')
return
}
// Wait for connection to be established
if (!isConnected.value) {
console.log('Waiting for connection to be established before subscribing to peers')
// Wait a bit for connection to establish
await new Promise(resolve => setTimeout(resolve, 1000))
if (!isConnected.value) {
console.warn('Still not connected, skipping peer subscriptions')
return
}
}
console.log(`Subscribing to ${peers.value.length} peers for notifications`)
console.log('Peers to subscribe to:', peers.value.map(p => ({ pubkey: p.pubkey, username: p.username })))
let successCount = 0
let errorCount = 0
for (const peer of peers.value) {
try {
console.log(`Attempting to subscribe to peer: ${peer.pubkey} (${peer.username})`)
// Subscribe to peer for notifications only (don't load full history)
const subscription = await subscribeToPeerForNotifications(peer.pubkey)
if (subscription) {
console.log(`Successfully subscribed to notifications for peer: ${peer.pubkey}`)
successCount++
} else {
console.warn(`Failed to create subscription for peer: ${peer.pubkey}`)
errorCount++
}
} catch (error) {
console.warn(`Failed to subscribe to peer ${peer.pubkey}:`, error)
errorCount++
}
}
console.log(`Subscription summary: ${successCount} successful, ${errorCount} failed`)
}
const refreshPeers = () => { const refreshPeers = async () => {
loadPeers() console.log('Refreshing peers and chat data...')
await chatPreloader.preloadChat()
} }
const selectPeer = async (peer: Peer) => { const selectPeer = async (peer: Peer) => {
@ -693,21 +600,22 @@ onMounted(async () => {
} }
} }
console.log('Starting connection and peer loading...') console.log('Chat component mounted - checking if preloader has data...')
await connect()
console.log('Connection established, loading peers...')
await loadPeers()
console.log('Peers loaded, checking if we should subscribe...')
// If we're connected and have peers, subscribe to them // If chat is already preloaded, we're good to go
if (isConnected.value && peers.value.length > 0) { if (chatPreloader.isPreloaded.value) {
console.log('Connection and peers ready, subscribing to all peers for notifications') console.log('Chat data was preloaded, connecting to chat...')
await subscribeToAllPeers() await connect()
console.log('Chat connected successfully')
} else if (!chatPreloader.isPreloading.value) {
// If not preloaded and not currently preloading, trigger preload
console.log('Chat data not preloaded, triggering preload...')
await chatPreloader.preloadChat()
await connect()
} else { } else {
console.log('Not ready to subscribe yet:', { // Currently preloading, just connect
isConnected: isConnected.value, console.log('Chat is currently preloading, just connecting...')
peerCount: peers.value.length await connect()
})
} }
}) })
@ -716,13 +624,10 @@ onUnmounted(() => {
disconnect() disconnect()
}) })
// Watch for connection state changes and subscribe to peers when connected // Watch for connection state changes
watch(isConnected, async (connected, prevConnected) => { watch(isConnected, async (connected, prevConnected) => {
console.log('Connection state changed:', { connected, prevConnected, peerCount: peers.value.length }) console.log('Connection state changed:', { connected, prevConnected, peerCount: peers.value.length })
if (connected && peers.value.length > 0 && !prevConnected) { // Note: Peer subscriptions are handled by the preloader
console.log('Connection established and peers available, subscribing to peers for notifications')
await subscribeToAllPeers()
}
}) })
// Watch for new messages and scroll to bottom // Watch for new messages and scroll to bottom

View file

@ -0,0 +1,166 @@
import { ref, readonly } from 'vue'
import { useNostrChat } from './useNostrChat'
import { getAuthToken } from '@/lib/config/lnbits'
import { config } from '@/lib/config'
export interface Peer {
user_id: string
username: string
pubkey: string
}
export function useNostrChatPreloader() {
const isPreloading = ref(false)
const isPreloaded = ref(false)
const preloadError = ref<string | null>(null)
const peers = ref<Peer[]>([])
const chat = useNostrChat()
const preloadChat = async () => {
// Don't preload if already done or currently preloading
if (isPreloaded.value || isPreloading.value) {
return
}
try {
isPreloading.value = true
preloadError.value = null
console.log('Preloading chat data...')
// Connect to chat
await chat.connect()
// Load peers
await loadPeers()
// Subscribe to all peers for notifications (without loading full history)
if (peers.value.length > 0) {
console.log(`Subscribing to ${peers.value.length} peers for notifications`)
await subscribeToAllPeersForNotifications()
}
isPreloaded.value = true
console.log('Chat data preloaded successfully')
} catch (error) {
console.error('Failed to preload chat:', error)
preloadError.value = error instanceof Error ? error.message : 'Failed to preload chat'
// Don't throw error, let the UI handle it gracefully
} finally {
isPreloading.value = false
}
}
const loadPeers = async () => {
try {
const authToken = getAuthToken()
if (!authToken) {
console.warn('No authentication token found - cannot load peers')
return
}
const API_BASE_URL = config.api.baseUrl || 'http://localhost:5006'
const response = await fetch(`${API_BASE_URL}/api/v1/auth/nostr/pubkeys`, {
headers: {
'Authorization': `Bearer ${authToken}`,
'Content-Type': 'application/json'
}
})
if (!response.ok) {
const errorText = await response.text()
console.error('Peers API Error:', response.status, errorText)
throw new Error(`Failed to load peers: ${response.status}`)
}
const responseText = await response.text()
try {
const data = JSON.parse(responseText)
peers.value = data.map((peer: any) => ({
user_id: peer.user_id,
username: peer.username,
pubkey: peer.pubkey
}))
console.log(`Loaded ${peers.value.length} peers for chat preloader`)
} catch (parseError) {
console.error('JSON Parse Error for peers:', parseError)
throw new Error('Invalid JSON response from peers API')
}
} catch (error) {
console.error('Failed to load peers in preloader:', error)
throw error
}
}
// Subscribe to all peers for notifications (without loading full message history)
const subscribeToAllPeersForNotifications = async () => {
if (!peers.value.length) {
console.log('No peers to subscribe to')
return
}
// Wait for connection to be established
if (!chat.isConnected.value) {
console.log('Waiting for connection to be established before subscribing to peers')
// Wait a bit for connection to establish
await new Promise(resolve => setTimeout(resolve, 1000))
if (!chat.isConnected.value) {
console.warn('Still not connected, skipping peer subscriptions')
return
}
}
console.log(`Subscribing to ${peers.value.length} peers for notifications`)
let successCount = 0
let errorCount = 0
for (const peer of peers.value) {
try {
console.log(`Attempting to subscribe to peer: ${peer.pubkey} (${peer.username})`)
// Subscribe to peer for notifications only (don't load full history)
const subscription = await chat.subscribeToPeerForNotifications(peer.pubkey)
if (subscription) {
console.log(`Successfully subscribed to notifications for peer: ${peer.pubkey}`)
successCount++
} else {
console.warn(`Failed to create subscription for peer: ${peer.pubkey}`)
errorCount++
}
} catch (error) {
console.warn(`Failed to subscribe to peer ${peer.pubkey}:`, error)
errorCount++
}
}
console.log(`Chat preloader subscription summary: ${successCount} successful, ${errorCount} failed`)
}
const resetPreload = () => {
isPreloaded.value = false
preloadError.value = null
peers.value = []
}
return {
isPreloading: readonly(isPreloading),
isPreloaded: readonly(isPreloaded),
preloadError: readonly(preloadError),
peers: readonly(peers),
preloadChat,
resetPreload,
// Expose chat composable methods for global access
getTotalUnreadCount: chat.getTotalUnreadCount,
getUnreadCount: chat.getUnreadCount,
getAllUnreadCounts: chat.getAllUnreadCounts,
markMessagesAsRead: chat.markMessagesAsRead,
clearAllUnreadCounts: chat.clearAllUnreadCounts
}
}