isite 2021.12.16 → 2022.1.13

package/lib/session.js

@@ -1,57 +1,5 @@
 module.exports = function init(req, res, ____0, callback) {
-    let session = {};
-
-    session.save = function () {
-        session = ____0.sessions.save(session);
-    };
-
-    session.load = function () {
-        session = ____0.sessions.attach(session);
-    };
-
-    session.set = function (key, value) {
-        key = key.toLowerCase();
-        for (let i = 0; i < session.data.length; i++) {
-            let obj = session.data[i];
-            if (obj.key === key) {
-                session.data[i] = {
-                    key: key,
-                    value: value,
-                };
-                session.save();
-                return;
-            }
-        }
-
-        session.data.push({
-            key: key,
-            value: value,
-        });
-
-        session.save();
-    };
-
-    session.get = function (key) {
-        key = key.toLowerCase();
-        for (let i = 0; i < session.data.length; i++) {
-            let d = session.data[i];
-            if (key.indexOf('.') != -1) {
-                if (d.key == key.split('.')[0]) {
-                    return session.data[i].value[key.split('.')[1]];
-                    break;
-                }
-            } else {
-                if (d.key == key) {
-                    return session.data[i].value;
-                    break;
-                }
-            }
-        }
-        return null;
-    };
-
-    session.accessToken = req.cookie('access_token') || req.headers['access-token'];
-    // session.browserToken = req.cookie('browser_token') || req.headers['browser_token'];
+    let session = ____0.getSession({ accessToken: req.cookie('access_token') || req.headers['access-token'] });
 
     if (!session.accessToken) {
         session.accessToken = new Date().getTime().toString() + '_' + Math.random() * (10000 - 1000) + 1000;
@@ -59,20 +7,10 @@ module.exports = function init(req, res, ____0, callback) {
         res.cookie('access_token', session.accessToken);
         res.set('Access-Token', session.accessToken);
     }
-    // if (!session.browserToken) {
-    //     session.browserToken = new Date().getTime().toString() + '_' + Math.random() * (10000 - 1000) + 1000;
-    //     session.browserToken = ____0.x0md50x(session.browserToken);
-    //     res.cookie('browser_token', session.browserToken, {
-    //         expires: 60 * 24 * 365 * 10,
-    //     });
-    //     res.set('browser_token', session.browserToken);
-    // }
-
-    session.load();
 
     session.ip = req.ip;
     session.modifiedTime = new Date().getTime();
-    session.save();
+    ____0.saveSession(session);
 
     function AssignFeatures() {
         ____0.options.defaults.features.forEach((f) => {
@@ -161,14 +99,15 @@ module.exports = function init(req, res, ____0, callback) {
         callback(session);
 
         if (!____0.options.ip_info) {
-            return;
+            return session;
         }
 
         if (session.$busy) {
-            return;
+            return session;
         }
+
         session.$busy = !0;
-        session.save();
+        ____0.saveSession(session);
         if (!session.ip_info || session.ip_info.status != 'success' || session.ip_info.id != session.ip) {
             // session.ip = session.ip == "localhost" ? "45.22.11.33" : session.ip
             ____0
@@ -183,22 +122,22 @@ module.exports = function init(req, res, ____0, callback) {
                     }
                 })
                 .then((info) => {
-                    session.load();
+                    session = ____0.getSession(session);
                     info.date = new Date();
-                    session.set('ip_' + session.ip, info);
+                    session['ip_' + session.ip] = info;
                     session.ip_info = info;
-                    session.save();
+                    ____0.saveSession(session);
                     setTimeout(() => {
-                        session.load();
+                        session = ____0.getSession(session);
                         session.$busy = !1;
-                        session.save();
+                        ____0.saveSession(session);
                     }, 1000 * 30);
                 })
                 .catch((err) => {
                     setTimeout(() => {
-                        session.load();
+                        session = ____0.getSession(session);
                         session.$busy = !1;
-                        session.save();
+                        ____0.saveSession(session);
                     }, 1000 * 30);
                 });
         }
@@ -206,10 +145,6 @@ module.exports = function init(req, res, ____0, callback) {
 
     AssignFeatures();
 
-
-
-    session.user_id = session.get('user_id');
-
     if (____0.security && session.user_id) {
         ____0.security.getUser(
             {

package/lib/sessions.js

@@ -81,24 +81,18 @@ module.exports = function init(____0) {
         );
     };
 
-    sessions.attach = function (session, callback) {
+    ____0.getSession = sessions.attach = function (session, callback) {
         callback = callback || function () {};
         session.$exists = !1;
 
-        sessions.list.forEach((s, i) => {
-            if (s.accessToken && s.accessToken == session.accessToken) {
-                session.$exists = !0;
-                session.lang = s.lang;
-                session.theme = s.theme;
-                session.data = s.data;
-                session.ip_info = s.ip_info;
-                session.requestesCount = s.requestesCount + 1;
-                session.createdTime = s.createdTime;
-                session.$busy = s.$busy;
-                session.$index = i;
-                callback(session);
-            }
-        });
+        if (session.accessToken) {
+            sessions.list.forEach((s, i) => {
+                if (s.accessToken && s.accessToken == session.accessToken) {
+                    session.$exists = !0;
+                    session.$index = i;
+                }
+            });
+        }
 
         if (!session.$exists) {
             session.$new = !0;
@@ -110,44 +104,35 @@ module.exports = function init(____0) {
             session.createdTime = new Date().getTime();
             session.$index = sessions.list.length;
             sessions.list.push(session);
-
-            callback(session);
         }
-        return session;
+
+        callback(sessions.list[session.$index]);
+        return sessions.list[session.$index];
     };
 
-    sessions.save = function (session, callback) {
+    ____0.saveSession = sessions.save = function (session, callback) {
         callback = callback || function () {};
         session.$exists = !1;
 
-        if (session.$index && sessions.list[session.$index] && sessions.list[session.$index].accessToken == session.accessToken) {
-            sessions.list[session.$index].lang = session.lang;
-            sessions.list[session.$index].theme = session.theme;
-            sessions.list[session.$index].data = session.data;
-            sessions.list[session.$index].ip_info = session.ip_info;
-            sessions.list[session.$index].requestesCount = session.requestesCount;
-            sessions.list[session.$index].createdTime = session.createdTime;
-            sessions.list[session.$index].$busy = session.$busy;
-            callback(session);
+        if (session.$index && sessions.list[session.$index]) {
+            sessions.list[session.$index] = { ...sessions.list[session.$index], ...session };
+            callback(sessions.list[session.$index]);
+            return sessions.list[session.$index];
         } else {
             sessions.list.forEach((s, i) => {
                 if (session.$exists) {
                     return;
                 }
                 if (s.accessToken == session.accessToken) {
+                    sessions.list[i] = { ...sessions.list[i], ...session };
                     session.$exists = !0;
-                    s.lang = session.lang;
-                    s.theme = session.theme;
-                    s.data = session.data;
-                    s.ip_info = session.ip_info;
-                    s.requestesCount = session.requestesCount;
-                    s.createdTime = session.createdTime;
-                    s.$busy = session.$busy;
-                    callback(session);
+                    session.$index = i;
+                    callback(sessions.list[session.$index]);
+                    return sessions.list[session.$index];
                 }
             });
         }
-        return session;
+        return sessions.list[session.$index];
     };
 
     ____0.on('[any][saving data]', function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isite",
-  "version": "2021.12.16",
+  "version": "2022.01.13",
   "description": "Create Enterprise Multi-Language Web Site [Fast and Easy] ",
   "main": "index.js",
   "repository": {
@@ -43,6 +43,7 @@
     "mongodb": "^4.2.2",
     "mv": "^2.1.1",
     "node-fetch": "^2.6.1",
-    "ws": "^8.2.3"
+    "ws": "^8.2.3",
+    "xlsx": "^0.17.4"
   }
 }