Added socket.io

nodejs/models/_auth.js

@@ -1,7 +1,9 @@
+'use strict';
+
 const {User} = require('./user');
 const {Token, AuthToken} = require('./token');
 
-Auth = {}
+let Auth = {}
 Auth.errors = {}
 
 Auth.errors.login = function(){

nodejs/models/host.js

@@ -1,11 +1,12 @@
 'use strict';
 
 const Table = require('../utils/redis_model');
+const ModelPs = require('../utils/model_pubsub');
 
 const tldExtract = require('tld-extract').parse_host;
 const PorkBun = require('../utils/porkbun');
 const LetsEncrypt = require('../utils/letsencrypt');
-const conf = require('../conf/conf');
+const conf = require('../conf');
 
 let porkBun = new PorkBun(conf.porkBun.apiKey, conf.porkBun.secretApiKey);
 let letsEncrypt = new LetsEncrypt({
@@ -13,7 +14,6 @@ let letsEncrypt = new LetsEncrypt({
 });
 
 
-
 class Host extends Table{
 	static _key = 'host';
 	static _keyMap = {
@@ -86,7 +86,6 @@ class Host extends Table{
 
 	static async add(data, ...args){
 		try{
-
 			let out = await super.add(data, ...args)
 			await this.buildLookUpObj()
 			if(out.is_wildcard) await out.createWildcardCert()
@@ -246,8 +245,13 @@ class Host extends Table{
 		return true;
 	}
 
+	static test(pass){
+		return `yes ${pass}`
+	}
+
 }
 
+
 class Cached extends Table{
 	static _key = 'host';
 	static _keyMap = {
@@ -262,7 +266,7 @@ class Cached extends Table{
 	await Host.buildLookUpObj();
 })()
 
-module.exports = {Host};
+module.exports = {Host: ModelPs(Host)};
 
 (async function(){
 try{
@@ -279,8 +283,8 @@ try{
 	// })
 	// console.log('IIFE res:\n', res)
 
-
-	console.log(await Host.listDetail())
+	// console.log(Host.test(55))
+	// console.log(await Host.listDetail())
 	// console.log('IIFE lookup:', Host.lookUp('bld3324sdf.test.holycore.quest'))
 
 

nodejs/models/token.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const Table = require('../utils/redis_model');
+const {User} = require('./user');
 const UUID = function b(a){return a?(a^Math.random()*16>>a/4).toString(16):([1e7]+-1e3+-4e3+-8e3+-1e11).replace(/[018]/g,b)};
 
 
@@ -32,6 +33,10 @@ class AuthToken extends Token{
 		super(...args);
 	}
 
+	async getUser(){
+		return await User.get(this.created_by);
+	}
+
 	static async add(data){
 		data.created_by = data.username;
 		return super.add(data)

nodejs/models/user.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const conf = require('../app').conf;
+const conf = require('../conf');
 
 const User = require(`./user_${conf.userModel}`)
 

nodejs/models/user_redis.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const Table = require('../utils/redis_model');
-const {Token, InviteToken} = require('./token');
+// const {Token, InviteToken} = require('./token');
 const bcrypt = require('bcrypt');
 const saltRounds = 10;
 
@@ -32,7 +32,7 @@ class User extends Table{
 		}
 	}
 
-	static async addByInvite(data){
+/*	static async addByInvite(data){
 		try{
 			let token = await InviteToken.get(data.token);
 
@@ -55,7 +55,7 @@ class User extends Table{
 			throw error;
 		}
 
-	};
+	};*/
 
 	async setPassword(data){
 		try{
@@ -67,7 +67,7 @@ class User extends Table{
 		}
 	}
 
-	async invite(){
+/*	async invite(){
 		try{
 			let token = await InviteToken.add({created_by: this.username});
 			
@@ -76,7 +76,7 @@ class User extends Table{
 		}catch(error){
 			throw error;
 		}
-	}
+	}*/
 
 	static async login(data){
 		try{