aiolabs/lightning-pub
2
0
Fork 0
Code Issues 9 Pull requests 4 Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into bug/bad-mac-logs

Browse source
This commit is contained in:
Emad Kheir 2021-07-22 20:49:45 +01:00 • committed by GitHub
commit ce650b3173
4 changed files with 31 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

59
services/gunDB/contact-api/utils/index.js
View file

@ -101,7 +101,6 @@ const timeout2 = promise => {
* @returns {Promise<T>} * @returns {Promise<T>}
*/ */
const tryAndWait = async (promGen, shouldRetry = () => false) => { const tryAndWait = async (promGen, shouldRetry = () => false) => {
/* eslint-disable no-empty */
/* eslint-disable init-declarations */ /* eslint-disable init-declarations */
// If hang stop at 10, wait 3, retry, if hang stop at 5, reinstate, warm for // If hang stop at 10, wait 3, retry, if hang stop at 5, reinstate, warm for
@ -118,28 +117,15 @@ const tryAndWait = async (promGen, shouldRetry = () => false) => {
) )
) )
if (shouldRetry(resolvedValue)) { if (!shouldRetry(resolvedValue)) {
logger.info(
'force retrying' /* +
` args: ${promGen.toString()} -- ${shouldRetry.toString()} \n resolvedValue: ${resolvedValue}, type: ${typeof resolvedValue}`
*/
)
} else {
return resolvedValue return resolvedValue
} }
} catch (e) { } catch (e) {
console.log(e) if (e.message !== Constants.ErrorCode.TIMEOUT_ERR) {
if (e.message === Constants.ErrorCode.NOT_AUTH) {
throw e throw e
} }
} }
logger.info(
`\n retrying \n` /* +
` args: ${promGen.toString()} -- ${shouldRetry.toString()}`
*/
)
await delay(200) await delay(200)
try { try {
@ -150,28 +136,15 @@ const tryAndWait = async (promGen, shouldRetry = () => false) => {
) )
) )
if (shouldRetry(resolvedValue)) { if (!shouldRetry(resolvedValue)) {
logger.info(
'force retrying' /* +
` args: ${promGen.toString()} -- ${shouldRetry.toString()} \n resolvedValue: ${resolvedValue}, type: ${typeof resolvedValue}`
*/
)
} else {
return resolvedValue return resolvedValue
} }
} catch (e) { } catch (e) {
console.log(e) if (e.message !== Constants.ErrorCode.TIMEOUT_ERR) {
if (e.message === Constants.ErrorCode.NOT_AUTH) {
throw e throw e
} }
} }
logger.info(
`\n retrying \n` /* +
` args: ${promGen.toString()} -- ${shouldRetry.toString()}`
*/
)
await delay(3000) await delay(3000)
try { try {
@ -182,32 +155,22 @@ const tryAndWait = async (promGen, shouldRetry = () => false) => {
) )
) )
if (shouldRetry(resolvedValue)) { if (!shouldRetry(resolvedValue)) {
logger.info(
'force retrying' /* +
` args: ${promGen.toString()} -- ${shouldRetry.toString()} \n resolvedValue: ${resolvedValue}, type: ${typeof resolvedValue}`
*/
)
} else {
return resolvedValue return resolvedValue
} }
} catch (e) { } catch (e) {
console.log(e) if (e.message !== Constants.ErrorCode.TIMEOUT_ERR) {
if (e.message === Constants.ErrorCode.NOT_AUTH) {
throw e throw e
} }
} }
logger.info( return timeout10(
`\n NOT recreating a fresh gun but retrying one last time \n` /* + promGen(
` args: ${promGen.toString()} -- ${shouldRetry.toString()}` require('../../Mediator/index').getGun(),
*/ require('../../Mediator/index').getUser()
)
) )
const { gun, user } = require('../../Mediator/index').freshGun()
return timeout10(promGen(gun, user))
/* eslint-enable no-empty */
/* eslint-enable init-declarations */ /* eslint-enable init-declarations */
} }

34
src/routes.js
View file

@ -6,7 +6,7 @@
const Axios = require('axios') const Axios = require('axios')
const Crypto = require('crypto') const Crypto = require('crypto')
const Storage = require('node-persist') const Storage = require('node-persist')
const logger = require('../../config/log') const logger = require('../config/log')
const httpsAgent = require('https') const httpsAgent = require('https')
const responseTime = require('response-time') const responseTime = require('response-time')
const uuid = require('uuid/v4') const uuid = require('uuid/v4')
@ -1137,7 +1137,7 @@ module.exports = async (
try { try {
return res.json(await LV2.getChanInfo(req.body.chan_id)) return res.json(await LV2.getChanInfo(req.body.chan_id))
} catch (e) { } catch (e) {
console.log(e) logger.error(e)
return res.status(500).json({ return res.status(500).json({
errorMessage: e.message errorMessage: e.message
}) })
@ -1172,7 +1172,7 @@ module.exports = async (
peers: await LV2.listPeers(req.body.latestError) peers: await LV2.listPeers(req.body.latestError)
}) })
} catch (e) { } catch (e) {
console.log(e) logger.error(e)
return res.status(500).json({ return res.status(500).json({
errorMessage: e.message errorMessage: e.message
}) })
@ -1240,7 +1240,7 @@ module.exports = async (
channels: await LV2.listChannels({ active_only: false }) channels: await LV2.listChannels({ active_only: false })
}) })
} catch (e) { } catch (e) {
console.log(e) logger.error(e)
return res.status(500).json({ return res.status(500).json({
errorMessage: e.message errorMessage: e.message
}) })
@ -1251,7 +1251,7 @@ module.exports = async (
try { try {
return res.json(await LV2.pendingChannels()) return res.json(await LV2.pendingChannels())
} catch (e) { } catch (e) {
console.log(e) logger.error(e)
return res.status(500).json({ return res.status(500).json({
errorMessage: e.message errorMessage: e.message
}) })
@ -1863,7 +1863,7 @@ module.exports = async (
try { try {
return res.json(addInvoiceRes) return res.json(addInvoiceRes)
} catch (e) { } catch (e) {
console.log(e) logger.error(e)
return res.status(500).json({ return res.status(500).json({
errorMessage: e.message errorMessage: e.message
}) })
@ -2300,7 +2300,7 @@ module.exports = async (
} }
return res.status(200).json(postRes) return res.status(200).json(postRes)
} catch (e) { } catch (e) {
console.log(e) logger.error(e)
return res.status(500).json({ return res.status(500).json({
errorMessage: errorMessage:
(typeof e === 'string' ? e : e.message) || 'Unknown error.' (typeof e === 'string' ? e : e.message) || 'Unknown error.'
@ -2725,16 +2725,16 @@ module.exports = async (
: gun : gun
keys.forEach(key => (node = node.get(key))) keys.forEach(key => (node = node.get(key)))
return new Promise(res => { return new Promise((res, rej) => {
const listener = async data => { const listener = data => {
if (publicKeyForDecryption) { if (publicKeyForDecryption) {
res( GunWriteRPC.deepDecryptIfNeeded(
await GunWriteRPC.deepDecryptIfNeeded( data,
data, publicKeyForDecryption,
publicKeyForDecryption, epubForDecryption
epubForDecryption
)
) )
.then(res)
.catch(rej)
} else { } else {
res(data) res(data)
} }
@ -2987,7 +2987,7 @@ module.exports = async (
ok: true ok: true
}) })
} catch (e) { } catch (e) {
console.log(e) logger.error(e)
return res.status(500).json({ return res.status(500).json({
errorMessage: errorMessage:
(typeof e === 'string' ? e : e.message) || 'Unknown error.' (typeof e === 'string' ? e : e.message) || 'Unknown error.'
@ -3001,7 +3001,7 @@ module.exports = async (
ok: true ok: true
}) })
} catch (e) { } catch (e) {
console.log(e) logger.error(e)
return res.status(500).json({ return res.status(500).json({
errorMessage: errorMessage:
(typeof e === 'string' ? e : e.message) || 'Unknown error.' (typeof e === 'string' ? e : e.message) || 'Unknown error.'

5
utils/ECC/index.js
View file

@ -1,8 +1,8 @@
/** @format */ /** @format */
const ECCrypto = require('eccrypto') const ECCrypto = require('eccrypto')
const Storage = require('node-persist') const Storage = require('node-persist')
const logger = require('winston')
const FieldError = require('../fieldError') const FieldError = require('../fieldError')
const logger = require('../../config/log')
const { const {
convertBufferToBase64, convertBufferToBase64,
processKey, processKey,
@ -152,14 +152,13 @@ const decryptMessage = async ({ encryptedMessage, deviceId }) => {
return parsedMessage return parsedMessage
} catch (err) { } catch (err) {
if (err.message?.toLowerCase() === 'bad mac') { if (err.message?.toLowerCase() === 'bad mac') {
console.error( logger.error(
'Bad Mac!', 'Bad Mac!',
err, err,
convertToEncryptedMessage(encryptedMessage), convertToEncryptedMessage(encryptedMessage),
!!keyPair !!keyPair
) )
} }
throw err throw err
} }
} }

2
utils/lightningServices/channelRequests.js
View file

@ -62,7 +62,7 @@ module.exports = async () => {
} catch(e){ } catch(e){
logger.error("error sending invite to channels handler") logger.error("error sending invite to channels handler")
console.log("DOING CHANNEL INVITE THING: :(") console.log("DOING CHANNEL INVITE THING: :(")
console.error(e) logger.error(e)
} }
} }