padreug/web-app
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor AuthService and market components for improved functionality and error handling

Browse source 
- Integrate LNbits API for authentication in AuthService, replacing token management with direct API calls for user data.
- Enhance login and registration processes to utilize the new API, improving user experience and error handling.
- Update market components to include detailed logging and fallback mechanisms for offline scenarios, ensuring better resilience during market data loading.
- Refactor market preloader to handle connection timeouts and provide sample data as a fallback, enhancing user experience in offline mode.
This commit is contained in:
padreug 2025-09-05 03:07:55 +02:00
parent daa9656680
commit 55e99e002d
5 changed files with 178 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

70
src/modules/market/composables/useMarket.ts
View file

@ -70,8 +70,31 @@ export function useMarket() {
// Load market data from Nostr events
const loadMarketData = async (marketData: any) => {
try {
console.log('🛒 Loading market data for:', { identifier: marketData.identifier, pubkey: marketData.pubkey?.slice(0, 8) })
// Check if we can query events (relays are connected)
if (!isConnected.value) {
console.log('🛒 Not connected to relays, creating default market')
// Create default market without trying to fetch from Nostr
const market = {
d: marketData.identifier,
pubkey: marketData.pubkey,
relays: config.nostr.relays,
selected: true,
opts: {
name: 'Demo Market (Offline)',
description: 'Demo market running in offline mode',
merchants: [],
ui: {}
}
}
marketStore.addMarket(market)
marketStore.setActiveMarket(market)
return
}
// Load market data from Nostr events
// Fetch market configuration event
const events = await relayHub.queryEvents([
{
@ -80,6 +103,8 @@ export function useMarket() {
'#d': [marketData.identifier]
}
])
console.log('🛒 Found', events.length, 'market events')
// Process market events
@ -90,7 +115,7 @@ export function useMarket() {
const market = {
d: marketData.identifier,
pubkey: marketData.pubkey,
relays: config.market.supportedRelays,
relays: config.nostr.relays,
selected: true,
opts: JSON.parse(marketEvent.content)
}
@ -103,7 +128,7 @@ export function useMarket() {
const market = {
d: marketData.identifier,
pubkey: marketData.pubkey,
relays: config.market.supportedRelays,
relays: config.nostr.relays,
selected: true,
opts: {
name: 'Ariège Market',
@ -122,7 +147,7 @@ export function useMarket() {
const market = {
d: marketData.identifier,
pubkey: marketData.pubkey,
relays: config.market.supportedRelays,
relays: config.nostr.relays,
selected: true,
opts: {
name: 'Default Market',
@ -159,6 +184,8 @@ export function useMarket() {
authors: merchants
}
])
console.log('🛒 Found', events.length, 'stall events for', merchants.length, 'merchants')
// Process stall events
@ -221,6 +248,8 @@ export function useMarket() {
authors: merchants
}
])
console.log('🛒 Found', events.length, 'product events for', merchants.length, 'merchants')
// Process product events
@ -463,35 +492,46 @@ export function useMarket() {
// Connect to market
const connectToMarket = async () => {
try {
console.log('🛒 Checking RelayHub connection...')
// Use existing relay hub connection (should already be connected by base module)
isConnected.value = relayHub.isConnected.value
console.log('🛒 RelayHub connected:', isConnected.value)
if (!isConnected.value) {
console.warn('RelayHub not connected, attempting to connect...')
await relayHub.connect()
isConnected.value = relayHub.isConnected.value
if (!isConnected.value) {
throw new Error('Failed to connect to Nostr relays')
}
console.warn('🛒 RelayHub not connected - this is expected if authentication is not complete')
// Don't try to connect here - let the base module handle connections
// Just proceed with offline/demo mode
console.log('🛒 Proceeding in offline mode')
}
// Market connected successfully
console.log('🛒 Market connected successfully')
// Load market data
console.log('🛒 Loading basic market data...')
await loadMarketData({
identifier: 'default',
pubkey: nostrStore.account?.pubkey || ''
})
// Load stalls and products
await loadStalls()
await loadProducts()
// Load stalls and products only if connected
if (isConnected.value) {
console.log('🛒 Loading stalls...')
await loadStalls()
console.log('🛒 Loading products...')
await loadProducts()
} else {
console.log('🛒 Skipping stalls/products loading - not connected to relays')
// Add sample products for demo mode
console.log('🛒 Adding sample products for offline demo...')
addSampleProducts()
}
// Subscribe to updates
console.log('🛒 Subscribing to market updates...')
subscribeToMarketUpdates()
} catch (err) {
console.error('🛒 Failed to connect to market:', err)
error.value = err instanceof Error ? err : new Error('Failed to connect to market')
throw err
}

77
src/modules/market/composables/useMarketPreloader.ts
View file

@ -14,32 +14,97 @@ export function useMarketPreloader() {
const preloadMarket = async () => {
// Don't preload if already done or currently preloading
if (isPreloaded.value || isPreloading.value) {
console.log('🛒 Market preload skipped - already loaded or in progress')
return
}
console.log('🛒 Starting market preload...')
try {
isPreloading.value = true
preloadError.value = null
const naddr = config.market.defaultNaddr
if (!naddr) {
console.warn('🛒 No market naddr configured, skipping preload')
return
}
// Connect to market
await market.connectToMarket()
console.log('🛒 Using market naddr:', naddr.slice(0, 20) + '...')
// Load market data
await market.loadMarket(naddr)
// Add timeout protection to prevent hanging
const timeoutMs = 30000 // 30 seconds
const connectWithTimeout = async () => {
const timeoutPromise = new Promise((_, reject) => {
setTimeout(() => reject(new Error('Market connection timeout after 30 seconds')), timeoutMs)
})
return Promise.race([
market.connectToMarket(),
timeoutPromise
])
}
const loadWithTimeout = async () => {
const timeoutPromise = new Promise((_, reject) => {
setTimeout(() => reject(new Error('Market loading timeout after 30 seconds')), timeoutMs)
})
return Promise.race([
market.loadMarket(naddr),
timeoutPromise
])
}
// Connect to market
console.log('🛒 Connecting to market...')
await connectWithTimeout()
// Load market data
console.log('🛒 Loading market data...')
await loadWithTimeout()
// Clear any error state since preloading succeeded
marketStore.setError(null)
isPreloaded.value = true
console.log('🛒 Market preload completed successfully')
} catch (error) {
preloadError.value = error instanceof Error ? error.message : 'Failed to preload market'
// Don't throw error, let the UI handle it gracefully
console.error('🛒 Market preload failed:', error)
console.log('🛒 Attempting fallback with sample data...')
try {
// Create a basic market with sample data as fallback
const fallbackMarket = {
d: 'demo-market',
pubkey: 'demo',
relays: ['ws://localhost:5006/nostrrelay/test1'],
selected: true,
opts: {
name: 'Demo Market',
description: 'Demo market with sample products',
merchants: [],
ui: {}
}
}
marketStore.addMarket(fallbackMarket)
marketStore.setActiveMarket(fallbackMarket)
// Add some sample products if the useMarket composable supports it
if (market.addSampleProducts && typeof market.addSampleProducts === 'function') {
market.addSampleProducts()
}
isPreloaded.value = true
console.log('🛒 Market preload completed with fallback data')
} catch (fallbackError) {
console.error('🛒 Fallback also failed:', fallbackError)
preloadError.value = error instanceof Error ? error.message : 'Failed to preload market'
}
} finally {
isPreloading.value = false
}