From bce23ab9fe498e66673ea0ea58e9c53fa49982db Mon Sep 17 00:00:00 2001 From: William Mantly Date: Tue, 22 Dec 2020 21:27:17 -0500 Subject: [PATCH] update lookup object on edit --- nodejs/models/host.js | 61 +++++++++++++++-------------- nodejs/models/socket_server_json.js | 1 - nodejs/routes/host.js | 4 +- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/nodejs/models/host.js b/nodejs/models/host.js index f29f8bd..96e01c7 100755 --- a/nodejs/models/host.js +++ b/nodejs/models/host.js @@ -18,8 +18,8 @@ const Host = require('../utils/redis_model')({ Host.add = async function(){ try{ - let out = await this.__proto__.add(...arguments) - await this.buildLookUpObj() + let out = await Host.__proto__.add.apply(this, arguments) + await Host.buildLookUpObj() return out; } catch(error){ @@ -27,10 +27,10 @@ Host.add = async function(){ } }; -Host.update = async function(){ +Host.update = async function(data, key){ try{ - let out = await this.__proto__.update(...arguments) - await this.buildLookUpObj() + let out = await Host.__proto__.update.apply(this, arguments) + await Host.buildLookUpObj() return out; } catch(error){ @@ -40,8 +40,8 @@ Host.update = async function(){ Host.remove = async function(){ try{ - let out = await this.__proto__.remove(...arguments) - await this.buildLookUpObj() + let out = await Host.__proto__.remove.apply(this, arguments) + await Host.buildLookUpObj() return out; } catch(error){ @@ -59,6 +59,7 @@ Host.buildLookUpObj = async function(){ // Hold lookUp ready while the look up object is being built. this.__lookUpIsReady = false; + this.lookUpObj = {}; try{ @@ -152,33 +153,33 @@ Host.lookUpReady = async function(){ module.exports = {Host}; -(async function(){ +// (async function(){ - await Host.lookUpReady(); +// await Host.lookUpReady(); - // console.log(Host.lookUpObj) +// // console.log(Host.lookUpObj) - // console.log(Host.lookUpObj['com']['vm42']) +// // console.log(Host.lookUpObj['com']['vm42']) - // console.log('test-res', await Host.lookUp('payments.718it.biz')) +// // console.log('test-res', await Host.lookUp('payments.718it.biz')) - let count = 6 - console.log(count++, Host.lookUp('payments.718it.biz').host === 'payments.718it.biz') - console.log(count++, Host.lookUp('sd.blah.test.vm42.com') === undefined) - console.log(count++, Host.lookUp('payments.test.com').host === 'payments.**') - console.log(count++, Host.lookUp('test.sample.other.exmaple.com').host === '**.exmaple.com') - console.log(count++, Host.lookUp('stan.test.vm42.com').host === 'stan.test.vm42.com') - console.log(count++, Host.lookUp('test.vm42.com').host === 'test.vm42.com') - console.log(count++, Host.lookUp('blah.test.vm42.com').host === '*.test.vm42.com') - console.log(count++, Host.lookUp('payments.example.com').host === 'payments.**') - console.log(count++, Host.lookUp('info.wma.users.718it.biz').host === 'info.*.users.718it.biz') - console.log(count++, Host.lookUp('infof.users.718it.biz') === undefined) - console.log(count++, Host.lookUp('blah.biz') === undefined) - console.log(count++, Host.lookUp('test.1.2.718it.net').host === 'test.*.*.718it.net') - console.log(count++, Host.lookUp('test1.exmaple.com').host === 'test1.exmaple.com') - console.log(count++, Host.lookUp('other.exmaple.com').host === '*.exmaple.com') - console.log(count++, Host.lookUp('info.payments.example.com').host === 'info.**') - console.log(count++, Host.lookUp('718it.biz').host === '718it.biz') +// let count = 6 +// console.log(count++, Host.lookUp('payments.718it.biz').host === 'payments.718it.biz') +// console.log(count++, Host.lookUp('sd.blah.test.vm42.com') === undefined) +// console.log(count++, Host.lookUp('payments.test.com').host === 'payments.**') +// console.log(count++, Host.lookUp('test.sample.other.exmaple.com').host === '**.exmaple.com') +// console.log(count++, Host.lookUp('stan.test.vm42.com').host === 'stan.test.vm42.com') +// console.log(count++, Host.lookUp('test.vm42.com').host === 'test.vm42.com') +// console.log(count++, Host.lookUp('blah.test.vm42.com').host === '*.test.vm42.com') +// console.log(count++, Host.lookUp('payments.example.com').host === 'payments.**') +// console.log(count++, Host.lookUp('info.wma.users.718it.biz').host === 'info.*.users.718it.biz') +// console.log(count++, Host.lookUp('infof.users.718it.biz') === undefined) +// console.log(count++, Host.lookUp('blah.biz') === undefined) +// console.log(count++, Host.lookUp('test.1.2.718it.net').host === 'test.*.*.718it.net') +// console.log(count++, Host.lookUp('test1.exmaple.com').host === 'test1.exmaple.com') +// console.log(count++, Host.lookUp('other.exmaple.com').host === '*.exmaple.com') +// console.log(count++, Host.lookUp('info.payments.example.com').host === 'info.**') +// console.log(count++, Host.lookUp('718it.biz').host === '718it.biz') -})() +// })() diff --git a/nodejs/models/socket_server_json.js b/nodejs/models/socket_server_json.js index 3cd8de4..f34d850 100644 --- a/nodejs/models/socket_server_json.js +++ b/nodejs/models/socket_server_json.js @@ -53,7 +53,6 @@ class SocketServerJson { clientSocket.on('data', function(data){ buffer += data.toString(); try{ - console.log('buffer', buffer) instance.onData.call(JSON.parse(data), clientSocket) buffer = '' // clientSocket.write(JSON.stringify(Host.lookUp(buffer)|| {host: 'none'})); diff --git a/nodejs/routes/host.js b/nodejs/routes/host.js index 13d6b83..dd6ccef 100755 --- a/nodejs/routes/host.js +++ b/nodejs/routes/host.js @@ -43,7 +43,7 @@ router.put('/:host', async function(req, res, next){ try{ req.body.updated_by = req.user.username; let host = await Host.get(req.params.host); - await host.update(req.body); + await host.update.call(host, req.body); return res.json({ message: `Host "${req.params.host}" updated.` @@ -58,7 +58,7 @@ router.put('/:host', async function(req, res, next){ router.delete('/:host', async function(req, res, next){ try{ let host = await Host.get(req.params); - let count = await host.remove(host); + let count = await host.remove.call(host, host); return res.json({ message: `Host ${req.params.host} deleted`,