broadcasts, more user validation

techcoderx · techcoderx · commit 92771e55290e · 2022-04-19T18:05:38.000+08:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -9,7 +9,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@blurtfoundation/blurtjs": "^1.0.0",
+    "@hiveio/hive-js": "^2.0.4",
     "body-parser": "^1.20.0",
+    "javalon": "^1.0.34",
     "mongodb": "^4.5.0"
   }
 }
diff --git a/src/actions.js b/src/actions.js
@@ -5,6 +5,8 @@ let actions = {
     new: async (user,network,operation,operationNetwork,scheduled) => {
         if (!validator.validate(operationNetwork,operation))
             return { error: 'operation validation failed' }
+        else if (!validator.general.positiveInteger(scheduled) || scheduled < new Date().getTime())
+            return { error: 'scheduled timestamp must be in the future' }
         let newDoc
         try {
             newDoc = await mongo.db.collection('operations').insertOne({
@@ -22,6 +24,20 @@ let actions = {
     edit: async (user,network,id,updatedOperation,updatedOperationNetwork,scheduled) => {
         if (!validator.validate(updatedOperationNetwork,updatedOperation))
             return { error: 'updated operation validation failed' }
+        else if (!validator.general.positiveInteger(scheduled) || scheduled < new Date().getTime())
+            return { error: 'scheduled timestamp must be in the future' }
+        let existing
+        try {
+            existing = await mongo.db.collection('operations').findOne({ _id: new mongo.objectId(id) })
+        } catch (e) {
+            return { error: e.toString() }
+        }
+        if (!existing)
+            return { error: 'operation id does not exist' }
+        else if (existing.tx || existing.error)
+            return { error: 'cannot edit operations that have already been broadcasted' }
+        else if (existing.user !== user || existing.network !== network)
+            return { error: 'operation isn\'t yours to edit' }
         let update = { $set: {}}
         if (updatedOperation)
             update.$set.operation = updatedOperation
@@ -35,6 +51,16 @@ let actions = {
         return { result: { ok: 1 } }
     },
     delete: async (user,network,id) => {
+        let existing
+        try {
+            existing = await mongo.db.collection('operations').findOne({ _id: new mongo.objectId(id) })
+        } catch (e) {
+            return { error: e.toString() }
+        }
+        if (!existing)
+            return { error: 'operation id does not exist already' }
+        else if (existing.user !== user || existing.network !== network)
+            return { error: 'operation isn\'t yours to delete' }
         try {
             await mongo.db.collection('operations').deleteOne({ _id: new mongo.objectId(id) })
         } catch (e) {
@@ -49,6 +75,8 @@ let actions = {
         } catch (e) {
             return { error: e.toString() }
         }
+        if (result.user !== user || result.network !== network)
+            return { error: 'operation isn\'t yours to look at' }
         return { result: result }
     },
     list: async (user,network) => {
diff --git a/src/api.js b/src/api.js
@@ -1,6 +1,7 @@
 const Parser = require('body-parser')
 const mongo = require('./mongo')
 const actions = require('./actions')
+const runner = require('./runner')
 const config = require('./config')
 
 let api = {
@@ -10,6 +11,7 @@ let api = {
     init: async (app, appConfig = {}, mongoClientDb = null, authenticator = null) => {
         config.init(appConfig)
         await mongo.init(mongoClientDb)
+        runner.init()
 
         if (typeof authenticator === 'function')
             api.authenticator = authenticator
diff --git a/src/broadcast.js b/src/broadcast.js
@@ -0,0 +1,53 @@
+const hive = require('@hiveio/hive-js')
+const blurt = require('@blurtfoundation/blurtjs')
+const avalon = require('javalon')
+const { config } = require('./config')
+
+let broadcast = {
+    init: (apis) => {
+        if (apis.hive)
+            hive.api.setOptions({ url: apis.hive, useAppbaseApi: true })
+        if (apis.blurt)
+            blurt.api.setOptions({ url: apis.blurt, useAppbaseApi: true })
+        if (apis.avalon)
+            avalon.init({ api: apis.avalon })
+    },
+    hive: (operation) => {
+        return new Promise((rs,rj) => {
+            if (!config.wifs.hive)
+                return rj('No Wif')
+            hive.broadcast.send({ extensions: [], operations: operation },[config.wifs.hive],(e,result) => {
+                if (e)
+                    rj(e.toString())
+                else
+                    rs(result.id)
+            })
+        })
+    },
+    blurt: (operation) => {
+        return new Promise((rs,rj) => {
+            if (!config.wifs.blurt)
+                return rj('No Wif')
+            blurt.broadcast.send({ extensions: [], operations: operation },[config.wifs.blurt],(e,result) => {
+                if (e)
+                    rj(e.toString())
+                else
+                    rs(result.id)
+            })
+        })
+    },
+    avalon: (operation) => {
+        return new Promise((rs,rj) => {
+            if (!config.wifs.avalon)
+                return rj('No Wif')
+            avalon.sendRawTransaction(avalon.signMultisig([config.wifs.avalon],operation.sender,operation),(e) => {
+                if (e)
+                    rj(e.error)
+                else
+                    rs(operation.hash)
+            })
+        })
+    }
+}
+
+module.exports = broadcast
diff --git a/src/config.js b/src/config.js
@@ -6,6 +6,8 @@ let config = {
         mongodbUrl: 'mongodb://localhost:27017',
         mongodbName: 'olisc',
         apiNamespace: '/olisc',
+        runInterval: 300000,
+        rpcs: {},
         wifs: {}
     }
 }
diff --git a/src/runner.js b/src/runner.js
@@ -0,0 +1,36 @@
+const mongo = require('./mongo')
+const broadcast = require('./broadcast')
+const { config } = require('./config')
+
+let runner = {
+    init: () => {
+        broadcast.init(config.rpcs)
+        runner.scheduleNext()
+    },
+    scheduleNext: () => {
+        let nextInterval = Math.ceil(new Date().getTime() / config.runInterval) * config.runInterval
+        setTimeout(async () => {
+            await runner.run()
+            runner.scheduleNext()
+        }, nextInterval - new Date().getTime())
+    },
+    run: async () => {
+        let pendingOps = await mongo.db.collection('operations').find({ $and: [
+            { scheduled: { $lte: new Date().getTime() }},
+            { error: { $exists: false }},
+            { tx: { $exists: false }}
+        ]}).toArray()
+        for (let op in pendingOps)
+            if (broadcast[pendingOps[op].operationNetwork]) {
+                let txhash
+                try {
+                    txhash = await broadcast[pendingOps[op].operationNetwork](pendingOps[op].operation)
+                } catch (e) {
+                    mongo.db.collection('operations').updateOne({ _id: pendingOps[op]._id }, { $set: { error: e } }).then(() => {}).catch(() => {})
+                }
+                mongo.db.collection('operations').updateOne({ _id: pendingOps[op]._id }, { $set: { tx: txhash } }).then(() => {}).catch(() => {})
+            }
+    }
+}
+
+module.exports = runner
diff --git a/src/validator/hive.js b/src/validator/hive.js
@@ -26,7 +26,7 @@ let specificTypes = {
         return true
     },
     arrayOfUsernames: (val) => {
-        if (!generalValidator.arrayOfStrings(val))
+        if (!general.arrayOfStrings(val))
             return false
         for (let i in val)
             if (!specificTypes.username(val[i]))
diff --git a/src/validator/index.js b/src/validator/index.js
@@ -1,3 +1,5 @@
+const general = require('./general')
+
 let networkValidators = {
     avalon: require('./avalon'),
     blurt: require('./blurt'),
@@ -9,5 +11,6 @@ module.exports = {
         if (!networkValidators[network])
             return false
         return networkValidators[network].validate(op)
-    }
+    },
+    general
 }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,10 @@`
`9`	`9`	`"author": "",`
`10`	`10`	`"license": "ISC",`
`11`	`11`	`"dependencies": {`
	`12`	`+ "@blurtfoundation/blurtjs": "^1.0.0",`
	`13`	`+ "@hiveio/hive-js": "^2.0.4",`
`12`	`14`	`"body-parser": "^1.20.0",`
	`15`	`+ "javalon": "^1.0.34",`
`13`	`16`	`"mongodb": "^4.5.0"`
`14`	`17`	`}`
`15`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ let config = {`
`6`	`6`	`mongodbUrl: 'mongodb://localhost:27017',`
`7`	`7`	`mongodbName: 'olisc',`
`8`	`8`	`apiNamespace: '/olisc',`
	`9`	`+ runInterval: 300000,`
	`10`	`+ rpcs: {},`
`9`	`11`	`wifs: {}`
`10`	`12`	`}`
`11`	`13`	`}`