Do not use load()
This commit is contained in:
parent
beb722fb57
commit
194f8465ec
2 changed files with 22 additions and 40 deletions
|
|
@ -162,22 +162,24 @@ const listenerForAddr = (addr, SEA) => async (order, orderID) => {
|
|||
if (!Common.isPopulatedString(serviceID)) {
|
||||
throw new TypeError(`no serviceID provided to orderAck`)
|
||||
}
|
||||
const selectedService = await new Promise(res => {
|
||||
getUser()
|
||||
const selectedService = await getUser()
|
||||
.get(Key.OFFERED_SERVICES)
|
||||
.get(serviceID)
|
||||
.load(res)
|
||||
})
|
||||
.then()
|
||||
|
||||
logger.info(selectedService)
|
||||
if (!selectedService) {
|
||||
throw new TypeError(`invalid serviceID provided to orderAck`)
|
||||
if (!Common.isObj(selectedService)) {
|
||||
throw new TypeError(
|
||||
`invalid serviceID provided to orderAck or service is not an object`
|
||||
)
|
||||
}
|
||||
|
||||
const {
|
||||
serviceType,
|
||||
servicePrice,
|
||||
serviceSeedUrl: encSeedUrl, //=
|
||||
serviceSeedToken: encSeedToken //=
|
||||
} = selectedService
|
||||
} = /** @type {Record<string, any>} */ (selectedService)
|
||||
if (Number(amount) !== Number(servicePrice)) {
|
||||
throw new TypeError(
|
||||
`service price mismatch ${amount} : ${servicePrice}`
|
||||
|
|
@ -326,12 +328,16 @@ const listenerForAddr = (addr, SEA) => async (order, orderID) => {
|
|||
break //create the coordinate, but stop because of the invalid id
|
||||
}
|
||||
logger.info('IS STRING')
|
||||
const selectedPost = await new Promise(res => {
|
||||
getUser()
|
||||
const selectedPost = /** @type {Record<string, any>} */ (await getUser()
|
||||
.get(Key.POSTS_NEW)
|
||||
.get(postID)
|
||||
.load(res)
|
||||
})
|
||||
.then())
|
||||
const selectedPostContent = /** @type {Record<string, any>} */ (await getUser()
|
||||
.get(Key.POSTS_NEW)
|
||||
.get(postID)
|
||||
.get(Key.CONTENT_ITEMS)
|
||||
.then())
|
||||
|
||||
logger.info('LOAD ok')
|
||||
logger.info(selectedPost)
|
||||
if (
|
||||
|
|
@ -350,7 +356,7 @@ const listenerForAddr = (addr, SEA) => async (order, orderID) => {
|
|||
logger.info('SECRET OK')
|
||||
let privateFound = false
|
||||
await Common.Utils.asyncForEach(
|
||||
Object.entries(selectedPost.contentItems),
|
||||
Object.entries(selectedPostContent),
|
||||
async ([contentID, item]) => {
|
||||
if (
|
||||
item.type !== 'image/embedded' &&
|
||||
|
|
|
|||
|
|
@ -381,30 +381,6 @@ function createReplica(path, afterMap = false) {
|
|||
}
|
||||
return createReplica(path + '>' + key)
|
||||
},
|
||||
load(cb) {
|
||||
// Dumb implementation. We must move away from load() anyways.
|
||||
if (afterMap) {
|
||||
throw new Error('Cannot call load() after map() on a GunSmith node')
|
||||
}
|
||||
if (cb) {
|
||||
listenersForThisRef.push(cb)
|
||||
|
||||
const id = uuid()
|
||||
|
||||
idToLoadListener[id] = cb
|
||||
|
||||
/** @type {Smith.SmithMsgLoad} */
|
||||
const msg = {
|
||||
id,
|
||||
path,
|
||||
type: 'load'
|
||||
}
|
||||
isReady().then(() => {
|
||||
currentGun.send(msg)
|
||||
})
|
||||
}
|
||||
return this
|
||||
},
|
||||
map() {
|
||||
if (afterMap) {
|
||||
throw new Error('Cannot call map() after map() on a GunSmith node')
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue