smartpager/dispatcher
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

added http delivery api

Browse source 
made delivery process easier and optimized it
This commit is contained in:
cheetah 2021-03-26 19:54:04 +00:00
parent 87f209a62c
commit 733819ad4e
3 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
index.js
View file

@ -37,8 +37,14 @@ app.post('/api/message/advanced', async (req, res) => {
await types.MessageManager.Deliver(id)
return res.json(id)
})
app.get('/api/message/status/:id', async (req, res) => { //TODO: make this fancy
return res.json(types.MessageManager.messages[ req.params.id ])
})
app.get('/api/message/ack/recv/:id', async (req, res) => { //TODO: make this fancy
types.ConnectorRegistry.reportDelivered({ id: req.params.id }, 'http')
return res.json(true)
})
app.listen(3000)

2
types/ConnectorRegistry.js
View file

@ -29,7 +29,7 @@ class ConnectorRegistry {
this.reportState(msg, uuid, 'failed')
}
reportDelivered(msg, uuid) {
this.events.emit(`msg:status:${ msg.id }:delivered`)
this.events.emit(`msg:status:${ msg.id }:delivered`, msg, uuid)
this.reportState(msg, uuid, 'delivered')
}

38
types/MessageManager.js
View file

@ -23,9 +23,9 @@ class MessageManager {
const hwDuplexSupport = require("./DeviceRegistry").Devices[ routingParams.device ].duplex || false
Object.assign(this.messages[ msgObj.id ]._routerData, hwDuplexSupport ? {
duplexCapable: true,
recvAck: false,
readAck: false,
response: false,
recvAck: false, // aka "delivered"
readAck: false, // "read"
response: false, // "resp"
deliveryLog: {},
} : {
duplexCapable: false,
@ -40,6 +40,7 @@ class MessageManager {
}
async msgStatus(msgId, uuid, status) {
this.messages[ msgId ]._routerData.deliveryLog[ uuid ] = status
if (status === 'delivered') this.messages[ msgId ]._routerData.recvAck = true
//this.Deliver(msgId)
console.log(msgId, uuid, 'status is', status)
}
@ -65,7 +66,6 @@ class MessageManager {
connectorConfig = config.connectors[connectorName]
//const UUID = md5(JSON.stringify(connectorDeliveryTry))
const chainPromise = (res) => {
ConnectorRegistry.events.removeAllListeners(`msg:status:${ msgId }:delivered`)
ConnectorRegistry.events.removeAllListeners(`msg:status:${ msgId }:failed`)
setTimeout(() => {
res([false, 'timeout'])
@ -74,24 +74,28 @@ class MessageManager {
console.log(`${ msgId } failed via ${ connectorName }:${ connectorArgs.join(',') }, continuing...`)
res([false, 'failed'])
})
ConnectorRegistry.events.once(`msg:status:${ msgId }:delivered`, () => {
console.log(`${ msgId } delivered via ${ connectorName }:${ connectorArgs.join(',') }`)
res([true, 'delivered'])
})
console.log(`Trying to deliver msg#${ msg.id } with ${ connectorName }:${ connectorArgs.join(',') }`)
//console.log(this.messages[ msgId ].deliveryLog)
ConnectorRegistry.transmit(connectorName, msg, connectorArgs)
}
return chainPromise
})
new Promise(async (res, rej) => {
for(let deliveryFunction of deliveryChain) {
let result = await new Promise(deliveryFunction)
if (result[0] === true) { res(result); break; }
// TODO: handle case, when a different verification channel is used for ACK
}
rej()
})
Promise.race([
new Promise(res => { // Delivery Event for this message
ConnectorRegistry.events.once(`msg:status:${ msgId }:delivered`, (_, uuid) => {
console.log(`${ msgId } delivered via ${ uuid }`)
return res()
})
}),
new Promise(async (res, rej) => {
for(let deliveryFunction of deliveryChain) {
//when a different verification channel is used for ACK
if (this.messages[ msgId ]._routerData.recvAck === true) break;
let result = await new Promise(deliveryFunction)
if (result[0] === true) { res(); break; }
}
rej()
})
])
.then(($) => {
this._clearEventHandlers4MsgID(msgId)
const dLog = this.messages[ msgId ]._routerData.deliveryLog