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

Merge pull request #333 from shocknet/fix/no-stream-seed

Browse source 
no stream seed
This commit is contained in:
CapDog 2021-04-11 13:38:55 -04:00 • committed by GitHub
commit 50e54eab92
3 changed files with 3 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1115,7 +1115,6 @@ const sendSpontaneousPayment = async (
(opts.type !== 'contentReveal' &&
opts.type !== 'torrentSeed' &&
opts.type !== 'service' &&
opts.type !== 'streamSeed' &&
opts.type !== 'product') ||
!orderResponse.ackNode
) {

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

@ -161,7 +161,7 @@ const listenerForAddr = (addr, SEA) => async (order, orderID) => {
/**
* @type {{ seedUrl: string, seedToken: string }|null}
*/
let serviceOrderContentSeedInfo = null //in case the service is of type 'torrentSeed' or 'streamSeed' 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') {
console.log('General Service')
const { ackInfo: serviceID } = order
@ -191,7 +191,7 @@ const listenerForAddr = (addr, SEA) => async (order, orderID) => {
`service price mismatch ${amount} : ${servicePrice}`
)
}
if (serviceType === 'torrentSeed' || serviceType === 'streamSeed') {
if (serviceType === 'torrentSeed') {
if (encSeedUrl && encSeedToken) {
const seedUrl = await SEA.decrypt(encSeedUrl, mySecret)
const seedToken = await SEA.decrypt(encSeedToken, mySecret)
@ -425,57 +425,6 @@ const listenerForAddr = (addr, SEA) => async (order, orderID) => {
orderMetadata = JSON.stringify(serviceResponse)
break
}
case 'streamSeed': {
console.log('STREAM')
const numberOfTokens = 1
const seedInfo = selfContentToken() //TODO this must change for streams
if (!seedInfo && !serviceOrderContentSeedInfo) {
breakError = 'torrentSeed service not available'
break //service not available
}
const seedInfoReady = serviceOrderContentSeedInfo || seedInfo
if (!seedInfoReady) {
breakError = 'torrentSeed service not available'
break //service not available
}
const { seedUrl } = seedInfoReady
const tokens = await enrollContentTokens(
numberOfTokens,
seedInfoReady
)
console.log('RES SEED OK')
const ackData = {
seedUrl,
tokens,
ackInfo
}
const toSend = JSON.stringify(ackData)
const encrypted = await SEA.encrypt(toSend, secret)
const serviceResponse = {
type: 'orderAck',
response: encrypted
}
console.log('RES SEED SENT')
await new Promise((res, rej) => {
getUser()
.get(Key.ORDER_TO_RESPONSE)
.get(ackNode)
.put(serviceResponse, ack => {
if (ack.err && typeof ack.err !== 'number') {
rej(
new Error(
`Error saving encrypted orderAck to order to response usergraph: ${ack}`
)
)
} else {
res(null)
}
})
})
console.log('RES SENT SEED')
orderMetadata = JSON.stringify(serviceResponse)
break
}
case 'other': //not implemented yet but save them as a coordinate anyways
break
default:

3
src/routes.js
View file

@ -1303,7 +1303,6 @@ module.exports = async (
type !== 'spontaneousPayment' &&
type !== 'tip' &&
type !== 'torrentSeed' &&
type !== 'streamSeed' &&
type !== 'contentReveal' &&
type !== 'service' &&
type !== 'product' &&
@ -1311,7 +1310,7 @@ module.exports = async (
) {
return res.status(415).json({
field: 'type',
errorMessage: `Only 'spontaneousPayment'| 'tip' | 'torrentSeed' | 'contentReveal' | 'service' | 'streamSeed' | 'product' |'other' payments supported via this endpoint for now.`
errorMessage: `Only 'spontaneousPayment'| 'tip' | 'torrentSeed' | 'contentReveal' | 'service' | 'product' |'other' payments supported via this endpoint for now.`
})
}