theta42/proxy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update lookup object on edit

Browse Source
This commit is contained in:
William Mantly
2020-12-22 21:27:17 -05:00
parent 7053536353
commit bce23ab9fe
3 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nodejs/models/host.js
+31 -30
View File
@@ -18,8 +18,8 @@ const Host = require('../utils/redis_model')({
Host.add = async function(){ Host.add = async function(){
try{ try{
let out = await this.__proto__.add(...arguments) let out = await Host.__proto__.add.apply(this, arguments)
await this.buildLookUpObj() await Host.buildLookUpObj()
return out; return out;
} catch(error){ } catch(error){
@@ -27,10 +27,10 @@ Host.add = async function(){
} }
}; };
Host.update = async function(){ Host.update = async function(data, key){
try{ try{
let out = await this.__proto__.update(...arguments) let out = await Host.__proto__.update.apply(this, arguments)
await this.buildLookUpObj() await Host.buildLookUpObj()
return out; return out;
} catch(error){ } catch(error){
@@ -40,8 +40,8 @@ Host.update = async function(){
Host.remove = async function(){ Host.remove = async function(){
try{ try{
let out = await this.__proto__.remove(...arguments) let out = await Host.__proto__.remove.apply(this, arguments)
await this.buildLookUpObj() await Host.buildLookUpObj()
return out; return out;
} catch(error){ } catch(error){
@@ -59,6 +59,7 @@ Host.buildLookUpObj = async function(){
// Hold lookUp ready while the look up object is being built. // Hold lookUp ready while the look up object is being built.
this.__lookUpIsReady = false; this.__lookUpIsReady = false;
this.lookUpObj = {};
try{ try{
@@ -152,33 +153,33 @@ Host.lookUpReady = async function(){
module.exports = {Host}; 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 // let count = 6
console.log(count++, Host.lookUp('payments.718it.biz').host === 'payments.718it.biz') // 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('sd.blah.test.vm42.com') === undefined)
console.log(count++, Host.lookUp('payments.test.com').host === 'payments.**') // 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('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('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('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('blah.test.vm42.com').host === '*.test.vm42.com')
console.log(count++, Host.lookUp('payments.example.com').host === 'payments.**') // 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('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('infof.users.718it.biz') === undefined)
console.log(count++, Host.lookUp('blah.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('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('test1.exmaple.com').host === 'test1.exmaple.com')
console.log(count++, Host.lookUp('other.exmaple.com').host === '*.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('info.payments.example.com').host === 'info.**')
console.log(count++, Host.lookUp('718it.biz').host === '718it.biz') // console.log(count++, Host.lookUp('718it.biz').host === '718it.biz')
})() // })()
nodejs/models/socket_server_json.js
-1
View File
@@ -53,7 +53,6 @@ class SocketServerJson {
clientSocket.on('data', function(data){ clientSocket.on('data', function(data){
buffer += data.toString(); buffer += data.toString();
try{ try{
console.log('buffer', buffer)
instance.onData.call(JSON.parse(data), clientSocket) instance.onData.call(JSON.parse(data), clientSocket)
buffer = '' buffer = ''
// clientSocket.write(JSON.stringify(Host.lookUp(buffer)|| {host: 'none'})); // clientSocket.write(JSON.stringify(Host.lookUp(buffer)|| {host: 'none'}));
nodejs/routes/host.js
+2 -2
View File
@@ -43,7 +43,7 @@ router.put('/:host', async function(req, res, next){
try{ try{
req.body.updated_by = req.user.username; req.body.updated_by = req.user.username;
let host = await Host.get(req.params.host); let host = await Host.get(req.params.host);
await host.update(req.body); await host.update.call(host, req.body);
return res.json({ return res.json({
message: `Host "${req.params.host}" updated.` 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){ router.delete('/:host', async function(req, res, next){
try{ try{
let host = await Host.get(req.params); let host = await Host.get(req.params);
let count = await host.remove(host); let count = await host.remove.call(host, host);
return res.json({ return res.json({
message: `Host ${req.params.host} deleted`, message: `Host ${req.params.host} deleted`,