ekzyis
/
stacker.news
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add optional wallet short name for logging

This commit is contained in:
ekzyis 2024-07-07 09:43:37 +02:00
parent 1ce09051b1
commit 7528e5c2b6
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/wallet-logger.js
View File

@ -128,7 +128,7 @@ export const WalletLoggerProvider = ({ children }) => {
.map(({ createdAt, wallet: walletType, ...log }) => { .map(({ createdAt, wallet: walletType, ...log }) => {
return { return {
ts: +new Date(createdAt), ts: +new Date(createdAt),
wallet: getServerWallet(walletType).name, wallet: tag(getServerWallet(walletType)),
...log ...log
} }
}) })
@ -199,7 +199,7 @@ export const WalletLoggerProvider = ({ children }) => {
}, []) }, [])
const appendLog = useCallback((wallet, level, message) => { const appendLog = useCallback((wallet, level, message) => {
const log = { wallet: wallet.name, level, message, ts: +new Date() } const log = { wallet: tag(wallet), level, message, ts: +new Date() }
saveLog(log) saveLog(log)
setLogs((prevLogs) => [log, ...prevLogs]) setLogs((prevLogs) => [log, ...prevLogs])
}, [saveLog]) }, [saveLog])
@ -212,7 +212,7 @@ export const WalletLoggerProvider = ({ children }) => {
const tx = idb.current.transaction(idbStoreName, 'readwrite') const tx = idb.current.transaction(idbStoreName, 'readwrite')
const objectStore = tx.objectStore(idbStoreName) const objectStore = tx.objectStore(idbStoreName)
const idx = objectStore.index('wallet_ts') const idx = objectStore.index('wallet_ts')
const request = wallet ? idx.openCursor(window.IDBKeyRange.bound([wallet.name, -Infinity], [wallet.name, Infinity])) : idx.openCursor() const request = wallet ? idx.openCursor(window.IDBKeyRange.bound([tag(wallet), -Infinity], [tag(wallet), Infinity])) : idx.openCursor()
request.onsuccess = function (event) { request.onsuccess = function (event) {
const cursor = event.target.result const cursor = event.target.result
if (cursor) { if (cursor) {
@ -220,7 +220,7 @@ export const WalletLoggerProvider = ({ children }) => {
cursor.continue() cursor.continue()
} else { } else {
// finished // finished
setLogs((logs) => logs.filter(l => wallet ? l.wallet !== wallet.name : false)) setLogs((logs) => logs.filter(l => wallet ? l.wallet !== tag(wallet) : false))
} }
} }
} }
@ -251,7 +251,7 @@ export function useWalletLogger (wallet) {
// also send this to us if diagnostics was enabled, // also send this to us if diagnostics was enabled,
// very similar to how the service worker logger works. // very similar to how the service worker logger works.
appendLog(wallet, level, message) appendLog(wallet, level, message)
console[level !== 'error' ? 'info' : 'error'](`[${wallet.name}]`, message) console[level !== 'error' ? 'info' : 'error'](`[${tag(wallet)}]`, message)
}, [appendLog, wallet]) }, [appendLog, wallet])
const logger = useMemo(() => ({ const logger = useMemo(() => ({
@ -265,7 +265,11 @@ export function useWalletLogger (wallet) {
return { logger, deleteLogs } return { logger, deleteLogs }
} }
function tag (wallet) {
return wallet?.shortName || wallet?.name
}
export function useWalletLogs (wallet) { export function useWalletLogs (wallet) {
const logs = useContext(WalletLogsContext) const logs = useContext(WalletLogsContext)
return logs.filter(l => !wallet || l.wallet === wallet.name) return logs.filter(l => !wallet || l.wallet === tag(wallet))
} }

1
components/wallet/lightning-address.js
View File

@ -3,6 +3,7 @@ import { lnAddrAutowithdrawSchema } from '@/lib/validate'
import { fetchLnAddrInvoice } from '@/lib/wallet' import { fetchLnAddrInvoice } from '@/lib/wallet'
export const name = 'lightning-address' export const name = 'lightning-address'
export const shortName = 'lnAddr'
export const fields = [ export const fields = [
{ {