Merge pull request #492 from shocknet/bug/gun-stability

Gun stability fixes
This commit is contained in:
CapDog 2021-11-04 09:31:38 -04:00 committed by GitHub
commit 9a3de9e348
2 changed files with 36 additions and 28 deletions

View file

@ -392,15 +392,11 @@ const authenticate = async (alias, pass, __user) => {
}
}
const logoff = () => {
user.leave()
}
const instantiateGun = () => {
const Config = require('../config')
if (user) {
user.leave()
}
// if (user) {
// user.leave()
// }
// @ts-ignore
user = null
if (gun) {
@ -523,7 +519,7 @@ const register = async (alias, pass) => {
module.exports = {
authenticate,
logoff,
instantiateGun,
isAuthenticated,
isAuthenticating,
isRegistering,

View file

@ -506,7 +506,7 @@ module.exports = async (
await recreateLnServices()
if (GunDB.isAuthenticated()) {
GunDB.logoff()
GunDB.instantiateGun()
}
const publicKey = await GunDB.authenticate(alias, password)
@ -2296,9 +2296,18 @@ module.exports = async (
: publicKey
? gun.user(publicKey)
: gun
keys.forEach(key => (node = node.get(key)))
logger.info(`fetching: ${keys}`)
keys.forEach(key => (node = node.get(key)))
if (!publicKeyForDecryption || !epubForDecryption) {
logger.warn('[GUN] Missing public key for decryption!', {
publicKeyForDecryption,
epubForDecryption
})
}
return new Promise((res, rej) => {
try {
const listener = data => {
logger.info(`got res for: ${keys}`)
logger.info(data || 'falsey data (does not get logged)')
@ -2317,6 +2326,9 @@ module.exports = async (
if (type === 'once') node.once(listener)
if (type === 'load') node.load(listener)
} catch (err) {
logger.error('Gun Fetch Error:', err)
}
})
})
}