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

Merge pull request #461 from shocknet/use-logger

Browse source 
Use logger instead of console.*
This commit is contained in:
CapDog 2021-09-03 17:36:44 -04:00 • committed by GitHub
commit 8ab46fc699
11 changed files with 54 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
services/gunDB/Mediator/index.js
View file

@ -454,7 +454,7 @@ const authenticate = async (alias, pass, __user) => {
return ack.sea.pub return ack.sea.pub
} else { } else {
console.log(ack) logger.info(ack)
logger.error( logger.error(
`Unknown error, wrong password? Ack looks like: ${JSON.stringify(ack)}` `Unknown error, wrong password? Ack looks like: ${JSON.stringify(ack)}`
) )

20
services/gunDB/contact-api/actions.js
View file

@ -311,9 +311,9 @@ const sendSpontaneousPayment = async (
throw new Error('torrentSeed service not available') throw new Error('torrentSeed service not available')
} }
const { seedUrl } = seedInfo const { seedUrl } = seedInfo
console.log('SEED URL OK') logger.info('SEED URL OK')
const tokens = await enrollContentTokens(numberOfTokens, seedInfo) const tokens = await enrollContentTokens(numberOfTokens, seedInfo)
console.log('RES SEED OK') logger.info('RES SEED OK')
const ackData = JSON.stringify({ seedUrl, tokens }) const ackData = JSON.stringify({ seedUrl, tokens })
return { return {
payment: null, payment: null,
@ -386,8 +386,8 @@ const sendSpontaneousPayment = async (
)}` )}`
throw new Error(msg) throw new Error(msg)
} }
console.log('ORDER ID') logger.info('ORDER ID')
console.log(orderID) logger.info(orderID)
/** @type {import('shock-common').Schema.OrderResponse} */ /** @type {import('shock-common').Schema.OrderResponse} */
const encryptedOrderRes = await Utils.tryAndWait( const encryptedOrderRes = await Utils.tryAndWait(
gun => gun =>
@ -397,7 +397,7 @@ const sendSpontaneousPayment = async (
.get(Key.ORDER_TO_RESPONSE) .get(Key.ORDER_TO_RESPONSE)
.get(orderID) .get(orderID)
.on(orderResponse => { .on(orderResponse => {
console.log(orderResponse) logger.info(orderResponse)
if (Schema.isOrderResponse(orderResponse)) { if (Schema.isOrderResponse(orderResponse)) {
res(orderResponse) res(orderResponse)
} }
@ -476,8 +476,8 @@ const sendSpontaneousPayment = async (
}) })
return { payment } return { payment }
} }
console.log('ACK NODE') logger.info('ACK NODE')
console.log(orderResponse.ackNode) logger.info(orderResponse.ackNode)
/** @type {import('shock-common').Schema.OrderResponse} */ /** @type {import('shock-common').Schema.OrderResponse} */
const encryptedOrderAckRes = await Utils.tryAndWait( const encryptedOrderAckRes = await Utils.tryAndWait(
gun => gun =>
@ -487,8 +487,8 @@ const sendSpontaneousPayment = async (
.get(Key.ORDER_TO_RESPONSE) .get(Key.ORDER_TO_RESPONSE)
.get(orderResponse.ackNode) .get(orderResponse.ackNode)
.on(orderResponse => { .on(orderResponse => {
console.log(orderResponse) logger.info(orderResponse)
console.log(Schema.isOrderResponse(orderResponse)) logger.info(Schema.isOrderResponse(orderResponse))
//@ts-expect-error //@ts-expect-error
if (orderResponse && orderResponse.type === 'orderAck') { if (orderResponse && orderResponse.type === 'orderAck') {
@ -546,7 +546,7 @@ const sendSpontaneousPayment = async (
}) })
return { payment, orderAck } return { payment, orderAck }
} catch (e) { } catch (e) {
console.log(e) logger.info(e)
logger.error('Error inside sendPayment()') logger.error('Error inside sendPayment()')
logger.error(e) logger.error(e)
throw e throw e

44
services/gunDB/contact-api/jobs/onOrders.js
View file

@ -156,10 +156,10 @@ const listenerForAddr = (addr, SEA) => async (order, orderID) => {
*/ */
let serviceOrderContentSeedInfo = null //in case the service is of type 'torrentSeed' this is {seedUrl,seedToken}, can be omitted, in that case, it will be taken from env let serviceOrderContentSeedInfo = null //in case the service is of type 'torrentSeed' this is {seedUrl,seedToken}, can be omitted, in that case, it will be taken from env
if (order.targetType === 'service') { if (order.targetType === 'service') {
console.log('General Service') logger.info('General Service')
const { ackInfo: serviceID } = order const { ackInfo: serviceID } = order
console.log('ACK INFO') logger.info('ACK INFO')
console.log(serviceID) logger.info(serviceID)
if (!Common.isPopulatedString(serviceID)) { if (!Common.isPopulatedString(serviceID)) {
throw new TypeError(`no serviceID provided to orderAck`) throw new TypeError(`no serviceID provided to orderAck`)
} }
@ -169,7 +169,7 @@ const listenerForAddr = (addr, SEA) => async (order, orderID) => {
.get(serviceID) .get(serviceID)
.load(res) .load(res)
}) })
console.log(selectedService) logger.info(selectedService)
if (!selectedService) { if (!selectedService) {
throw new TypeError(`invalid serviceID provided to orderAck`) throw new TypeError(`invalid serviceID provided to orderAck`)
} }
@ -247,7 +247,7 @@ const listenerForAddr = (addr, SEA) => async (order, orderID) => {
* @param {Common.Schema.InvoiceWhenListed & {r_hash:Buffer,payment_addr:Buffer}} paidInvoice * @param {Common.Schema.InvoiceWhenListed & {r_hash:Buffer,payment_addr:Buffer}} paidInvoice
*/ */
const invoicePaidCb = async paidInvoice => { const invoicePaidCb = async paidInvoice => {
console.log('INVOICE PAID') logger.info('INVOICE PAID')
let breakError = null let breakError = null
let orderMetadata //eslint-disable-line init-declarations let orderMetadata //eslint-disable-line init-declarations
const hashString = paidInvoice.r_hash.toString('hex') const hashString = paidInvoice.r_hash.toString('hex')
@ -309,24 +309,24 @@ const listenerForAddr = (addr, SEA) => async (order, orderID) => {
break break
} }
case 'contentReveal': { case 'contentReveal': {
console.log('cONTENT REVEAL') logger.info('cONTENT REVEAL')
//assuming digital product that only requires to be unlocked //assuming digital product that only requires to be unlocked
const postID = ackInfo const postID = ackInfo
console.log('ACK INFO') logger.info('ACK INFO')
console.log(ackInfo) logger.info(ackInfo)
if (!Common.isPopulatedString(postID)) { if (!Common.isPopulatedString(postID)) {
breakError = 'invalid ackInfo provided for postID' breakError = 'invalid ackInfo provided for postID'
break //create the coordinate, but stop because of the invalid id break //create the coordinate, but stop because of the invalid id
} }
console.log('IS STRING') logger.info('IS STRING')
const selectedPost = await new Promise(res => { const selectedPost = await new Promise(res => {
getUser() getUser()
.get(Key.POSTS_NEW) .get(Key.POSTS_NEW)
.get(postID) .get(postID)
.load(res) .load(res)
}) })
console.log('LOAD ok') logger.info('LOAD ok')
console.log(selectedPost) logger.info(selectedPost)
if ( if (
!selectedPost || !selectedPost ||
!selectedPost.status || !selectedPost.status ||
@ -335,12 +335,12 @@ const listenerForAddr = (addr, SEA) => async (order, orderID) => {
breakError = 'ackInfo provided does not correspond to a valid post' breakError = 'ackInfo provided does not correspond to a valid post'
break //create the coordinate, but stop because of the invalid post break //create the coordinate, but stop because of the invalid post
} }
console.log('IS POST') logger.info('IS POST')
/** /**
* @type {Record<string,string>} <contentID,decryptedRef> * @type {Record<string,string>} <contentID,decryptedRef>
*/ */
const contentsToSend = {} const contentsToSend = {}
console.log('SECRET OK') logger.info('SECRET OK')
let privateFound = false let privateFound = false
await Common.Utils.asyncForEach( await Common.Utils.asyncForEach(
Object.entries(selectedPost.contentItems), Object.entries(selectedPost.contentItems),
@ -371,7 +371,7 @@ const listenerForAddr = (addr, SEA) => async (order, orderID) => {
type: 'orderAck', type: 'orderAck',
response: encrypted response: encrypted
} }
console.log('RES READY') logger.info('RES READY')
await new Promise((res, rej) => { await new Promise((res, rej) => {
getUser() getUser()
@ -389,12 +389,12 @@ const listenerForAddr = (addr, SEA) => async (order, orderID) => {
} }
}) })
}) })
console.log('RES SENT CONTENT') logger.info('RES SENT CONTENT')
orderMetadata = JSON.stringify(ackData) orderMetadata = JSON.stringify(ackData)
break break
} }
case 'torrentSeed': { case 'torrentSeed': {
console.log('TORRENT') logger.info('TORRENT')
const numberOfTokens = Number(ackInfo) || 1 const numberOfTokens = Number(ackInfo) || 1
const seedInfo = selfContentToken() const seedInfo = selfContentToken()
if (!seedInfo && !serviceOrderContentSeedInfo) { if (!seedInfo && !serviceOrderContentSeedInfo) {
@ -411,7 +411,7 @@ const listenerForAddr = (addr, SEA) => async (order, orderID) => {
numberOfTokens, numberOfTokens,
seedInfoReady seedInfoReady
) )
console.log('RES SEED OK') logger.info('RES SEED OK')
const ackData = { seedUrl, tokens, ackInfo } const ackData = { seedUrl, tokens, ackInfo }
const toSend = JSON.stringify(ackData) const toSend = JSON.stringify(ackData)
const encrypted = await SEA.encrypt(toSend, secret) const encrypted = await SEA.encrypt(toSend, secret)
@ -419,7 +419,7 @@ const listenerForAddr = (addr, SEA) => async (order, orderID) => {
type: 'orderAck', type: 'orderAck',
response: encrypted response: encrypted
} }
console.log('RES SEED SENT') logger.info('RES SEED SENT')
await new Promise((res, rej) => { await new Promise((res, rej) => {
getUser() getUser()
.get(Key.ORDER_TO_RESPONSE) .get(Key.ORDER_TO_RESPONSE)
@ -436,7 +436,7 @@ const listenerForAddr = (addr, SEA) => async (order, orderID) => {
} }
}) })
}) })
console.log('RES SENT SEED') logger.info('RES SENT SEED')
orderMetadata = JSON.stringify(ackData) orderMetadata = JSON.stringify(ackData)
break break
} }
@ -466,7 +466,7 @@ const listenerForAddr = (addr, SEA) => async (order, orderID) => {
throw new Error(breakError) throw new Error(breakError)
} }
} }
console.log('WAITING INVOICE TO BE PAID') logger.info('WAITING INVOICE TO BE PAID')
new Promise(res => SchemaManager.addListenInvoice(invoice.r_hash, res)) new Promise(res => SchemaManager.addListenInvoice(invoice.r_hash, res))
.then(invoicePaidCb) .then(invoicePaidCb)
.catch(err => { .catch(err => {
@ -476,7 +476,7 @@ const listenerForAddr = (addr, SEA) => async (order, orderID) => {
)}` )}`
) )
logger.error(err) logger.error(err)
console.log(err) logger.info(err)
/** @type {import('shock-common').Schema.OrderResponse} */ /** @type {import('shock-common').Schema.OrderResponse} */
const orderResponse = { const orderResponse = {
@ -503,7 +503,7 @@ const listenerForAddr = (addr, SEA) => async (order, orderID) => {
)}` )}`
) )
logger.error(err) logger.error(err)
console.log(err) logger.info(err)
/** @type {import('shock-common').Schema.OrderResponse} */ /** @type {import('shock-common').Schema.OrderResponse} */
const orderResponse = { const orderResponse = {

5
services/gunDB/rpc/index.js
View file

@ -16,6 +16,7 @@ const {
getMySecret, getMySecret,
$$__SHOCKWALLET__ENCRYPTED__ $$__SHOCKWALLET__ENCRYPTED__
} = require('../Mediator') } = require('../Mediator')
const logger = require('../../../config/log')
/** /**
* @typedef {import('../contact-api/SimpleGUN').ValidDataValue} ValidDataValue * @typedef {import('../contact-api/SimpleGUN').ValidDataValue} ValidDataValue
* @typedef {import('./types').ValidRPCDataValue} ValidRPCDataValue * @typedef {import('./types').ValidRPCDataValue} ValidRPCDataValue
@ -210,8 +211,8 @@ const put = async (rawPath, value) => {
if (typeof ack.err === 'string') { if (typeof ack.err === 'string') {
rej(new Error(ack.err)) rej(new Error(ack.err))
} else { } else {
console.log(`NON STANDARD GUN ERROR:`) logger.info(`NON STANDARD GUN ERROR:`)
console.log(ack) logger.info(ack)
rej(new Error(JSON.stringify(ack.err, null, 4))) rej(new Error(JSON.stringify(ack.err, null, 4)))
} }
} else { } else {

2
services/gunDB/sockets/index.js
View file

@ -180,7 +180,7 @@ const startSocket = socket => {
if (isAuthenticated()) { if (isAuthenticated()) {
socket.onAny(() => { socket.onAny(() => {
GunActions.setLastSeenApp().catch(e => GunActions.setLastSeenApp().catch(e =>
console.log('error setting last seen app', e) logger.info('error setting last seen app', e)
) )
}) })
} }

2
services/schema/index.js
View file

@ -371,7 +371,7 @@ class SchemaManager {
.get(coordinateSHA256) .get(coordinateSHA256)
.put(encryptedOrderString, ack => { .put(encryptedOrderString, ack => {
if (ack.err && typeof ack.err !== 'number') { if (ack.err && typeof ack.err !== 'number') {
console.log(ack) logger.info(ack)
rej( rej(
new Error( new Error(
`Error saving coordinate order to user-graph: ${ack}` `Error saving coordinate order to user-graph: ${ack}`

3
services/tipsCallback.js
View file

@ -1,5 +1,6 @@
//@ts-nocheck TODO- fix types //@ts-nocheck TODO- fix types
const { gunUUID } = require("../utils") const { gunUUID } = require("../utils")
const logger = require('../config/log')
class TipsCB { class TipsCB {
listeners = {} listeners = {}
@ -16,7 +17,7 @@ class TipsCB {
return "invalid access id" return "invalid access id"
} }
const postID = this.postsEnabled[accessId] const postID = this.postsEnabled[accessId]
console.log("subbing new socket for post: "+postID) logger.info("subbing new socket for post: "+postID)
if(!this.listeners[postID]){ if(!this.listeners[postID]){
this.listeners[postID] = [] this.listeners[postID] = []

6
src/routes.js
View file

@ -2376,11 +2376,11 @@ module.exports = async (
? gun.user(publicKey) ? gun.user(publicKey)
: gun : gun
keys.forEach(key => (node = node.get(key))) keys.forEach(key => (node = node.get(key)))
console.log(`fetching: ${keys}`) logger.info(`fetching: ${keys}`)
return new Promise((res, rej) => { return new Promise((res, rej) => {
const listener = data => { const listener = data => {
console.log(`got res for: ${keys}`) logger.info(`got res for: ${keys}`)
console.log(data) logger.info(data)
if (publicKeyForDecryption) { if (publicKeyForDecryption) {
GunWriteRPC.deepDecryptIfNeeded( GunWriteRPC.deepDecryptIfNeeded(
data, data,

4
src/server.js
View file

@ -413,7 +413,7 @@ const server = program => {
address: tunnelHost, address: tunnelHost,
port: serverPort port: serverPort
} }
console.log(opts) logger.info(opts)
relayClient.default(opts, async (connected, params) => { relayClient.default(opts, async (connected, params) => {
if (connected) { if (connected) {
const noProtocolAddress = params.address.replace( const noProtocolAddress = params.address.replace(
@ -431,7 +431,7 @@ const server = program => {
externalIP: `${params.relayId}@${noProtocolAddress}` externalIP: `${params.relayId}@${noProtocolAddress}`
}) })
qrcode.generate(dataToQr, { small: true }) qrcode.generate(dataToQr, { small: true })
console.log(`connect to ${params.relayId}@${noProtocolAddress}`) logger.info(`connect to ${params.relayId}@${noProtocolAddress}`)
} else { } else {
logger.error('!! Relay did not connect to server !!') logger.error('!! Relay did not connect to server !!')
} }

4
src/sockets.js
View file

@ -195,11 +195,11 @@ module.exports = (
) )
io.of('streams').on('connect', socket => { io.of('streams').on('connect', socket => {
console.log('a user connected') logger.info('a user connected')
socket.on('accessId', accessId => { socket.on('accessId', accessId => {
const err = TipsForwarder.addSocket(accessId, socket) const err = TipsForwarder.addSocket(accessId, socket)
if (err) { if (err) {
console.log('err invalid socket for tips notifications ' + err) logger.info('err invalid socket for tips notifications ' + err)
socket.disconnect(true) socket.disconnect(true)
} }
}) })

14
utils/lightningServices/channelRequests.js
View file

@ -6,13 +6,13 @@ const { listPeers, connectPeer,getInfo } = require('./v2')
const handlerBaseUrl = "https://channels.shock.network:4444" const handlerBaseUrl = "https://channels.shock.network:4444"
module.exports = async () => { module.exports = async () => {
console.log("DOING CHANNEL INVITE THING: START") logger.info("DOING CHANNEL INVITE THING: START")
/** /**
* @type string | undefined * @type string | undefined
*/ */
const invite = process.env.HOSTING_INVITE const invite = process.env.HOSTING_INVITE
if(!invite) { if(!invite) {
console.log("DOING CHANNEL INVITE THING: NVM NO INVITE") logger.info("DOING CHANNEL INVITE THING: NVM NO INVITE")
return return
} }
try { try {
@ -21,7 +21,7 @@ module.exports = async () => {
*/ */
const invites = await Storage.getItem('processedInvites') || [] const invites = await Storage.getItem('processedInvites') || []
if(invites.includes(invite)){ if(invites.includes(invite)){
console.log("DOING CHANNEL INVITE THING: INVITE PROCESSED ALREADY") logger.info("DOING CHANNEL INVITE THING: INVITE PROCESSED ALREADY")
return return
} }
const me = await getInfo() const me = await getInfo()
@ -29,7 +29,7 @@ module.exports = async () => {
//@ts-expect-error //@ts-expect-error
const connectReq = await fetch(`${handlerBaseUrl}/connect`) const connectReq = await fetch(`${handlerBaseUrl}/connect`)
if(connectReq.status !== 200 ){ if(connectReq.status !== 200 ){
console.log("DOING CHANNEL INVITE THING: CONNECT FAILED") logger.info("DOING CHANNEL INVITE THING: CONNECT FAILED")
return return
} }
const connJson = await connectReq.json() const connJson = await connectReq.json()
@ -53,15 +53,15 @@ module.exports = async () => {
body:JSON.stringify(channelReq) body:JSON.stringify(channelReq)
}) })
if(res.status !== 200 ){ if(res.status !== 200 ){
console.log("DOING CHANNEL INVITE THING: FAILED ") logger.info("DOING CHANNEL INVITE THING: FAILED ")
return return
} }
invites.push(invite) invites.push(invite)
await Storage.setItem('processedInvites',invites) await Storage.setItem('processedInvites',invites)
console.log("DOING CHANNEL INVITE THING: DONE!") logger.info("DOING CHANNEL INVITE THING: DONE!")
} 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: :(") logger.info("DOING CHANNEL INVITE THING: :(")
logger.error(e) logger.error(e)
} }