multiple changesHEADmain

4 files changed, 57 insertions, 14 deletions

diff --git a/src/db.js b/src/db.js
index 9bd85a4..d3c15ed 100644
--- a/src/db.js
+++ b/src/db.js
@@ -1,5 +1,6 @@
 const path = require('path');
 const { Sequelize, DataTypes } = require('sequelize');
+const llog = require("../src/logg")
 
 const _db_raw = new Sequelize({
     dialect: 'sqlite',
@@ -69,11 +70,25 @@ db.Track = _db_raw.define('Track', {
 try {
     db.BattleShip.sync({force:true})
     db._raw.authenticate();
-    console.log('db connected');
+    llog.log('db connected');
 } catch (error) {
-    console.error('Unable to connect to the database:', error);
+    llog.error('Unable to connect to the database:', error);
 }
 
 _db_raw.sync()
 
+const persist = require("node-persist")
+let serialize = require('serialize-javascript');
+function deserialize(i){
+    return eval('(' + i + ')');
+}
+
+global.preserve = {}
+
+global.preserve.interactions = persist.create({dir:"./.node-persist/interaction", parse:deserialize, stringify:serialize})
+global.preserve.interactions.init()
+
+global.preserve.blacklist = persist.create({dir:"./.node-persist/blacklist", parse:deserialize, stringify:serialize})
+global.preserve.blacklist.init()
+
 module.exports = db
\ No newline at end of file
diff --git a/src/interaction-preserve.js b/src/interaction-preserve.js
index da4f1c9..9e0449c 100644
--- a/src/interaction-preserve.js
+++ b/src/interaction-preserve.js
@@ -1,12 +1,4 @@
 const { stringify } = require('querystring');
-let serialize = require('serialize-javascript');
-function deserialize(i){
-    return eval('(' + i + ')');
-  }
-global.preserve = {}
-global.preserve.interactions = require('node-persist')
-global.preserve.interactions.initSync({dir:"./.node-persist/interaction",parse:deserialize,
-     stringify:serialize})
 
 module.exports = {
     register: async (id, fn, data) => {
diff --git a/src/logg.js b/src/logg.js
new file mode 100644
index 0000000..8e7aa4b
--- /dev/null
+++ b/src/logg.js
@@ -0,0 +1,35 @@
+module.exports = {
+    levels : {
+        nothing : 0,
+        error : 1,
+        log : 2,
+        debug : 3
+    },
+
+    get_time(){
+        let date = new Date();
+        return `${date.getDate()}/${date.getMonth() + 1} ${date.getHours()}:${date.getMinutes()}:${date.getSeconds()}`
+    },
+    get_level(){
+        return global._logg_level ?? this.set_level(this.levels.debug);
+    },
+    set_level(level){
+        return global._logg_level = level;
+    },
+    color(str, code){
+        return "\x1b[" + code + "m" + str + "\x1b[0m";
+    },
+
+    error(str) {
+        if(this.get_level() >= this.levels.error)
+            console.log(this.color("["+this.get_time()+"]: ", 31) + this.color(str, 90));
+    },
+    log(str) {
+        if(this.get_level() >= this.levels.log)
+            console.log(this.color("["+this.get_time()+"]: ", 90) + str);
+    },
+    debug(str) {
+        if(this.get_level() >= this.levels.debug)
+            console.log(this.color("["+this.get_time()+"]: " + str, 90));
+    }
+}
\ No newline at end of file
diff --git a/src/webui.js b/src/webui.js
index 999de2f..98ff924 100644
--- a/src/webui.js
+++ b/src/webui.js
@@ -6,6 +6,7 @@ const fs = require('fs');
 let db = require("../src/db");
 const path = require("path")
 const Tickets = db.Tickets
+const llog = require("./logg")
 
 const app = express();
 app.use(bodyParser.urlencoded({ extended: false }));
@@ -23,7 +24,7 @@ app.post('/tickets/data', async (req, res) => {
 })
 app.post('/tickets/edit', async (req, res) => {
   if(req.body.key == key){
-    console.log('pass')
+    llog.log('pass')
 		res.send('pass')
   }
   else
@@ -71,7 +72,7 @@ for(let dir of settings_dirs){
   })
 }
 
-console.log(settings_full)
+//console.log(settings_full)
 app.get('/settings/', async (req, res) => {
   res.sendFile(path.join(__dirname+'/../html/settings.html'))
 })
@@ -94,10 +95,10 @@ for(let ddir in settings_full){
       let data = {data:settings_full,sel:c.toString()}
       res.send(JSON.stringify(data))
     })
-    console.log('/settings/'+at)
+    //console.log('/settings/'+at)
     app.get('/settings/'+at, async (req, res) => {
       res.sendFile(path.join(__dirname+'/../html/settings.html'))
     })
   }
 }
-app.listen(port, () => console.log(`listening at http://localhost:${port}`));
+app.listen(port, () => llog.log(`listening at http://localhost:${port}`));