isite 2024.9.1 → 2024.10.1

package/lib/routing.js

@@ -166,6 +166,7 @@ module.exports = function init(____0) {
     }
 
     let response = {
+      host: req.host,
       url: req.url,
       filePath: route.path,
       content: req.content,
@@ -174,7 +175,7 @@ module.exports = function init(____0) {
       code: res.code,
     };
 
-    if (route.shared && !____0.sharedList.some((s) => s.filePath == response.filePath && s.url == response.url)) {
+    if (route.shared && !____0.sharedList.some((s) => s.host == req.host && s.filePath == response.filePath && s.url == response.url)) {
       ____0.sharedList.push(response);
     }
 
@@ -188,10 +189,10 @@ module.exports = function init(____0) {
   _0xrrxo.defaultCallback = function (req, res) {
     let route = req.route;
 
-    if ((response = ____0.sharedList.find((s) => s.filePath == route.path && s.url == req.url))) {
+    if ((response = ____0.sharedList.find((s) => s.host == req.host && s.filePath == route.path && s.url == req.url))) {
       res.headers = response.headers;
       res.code = response.code;
-      res.setHeader('x-shared', ____0.sharedList.length + ' - ' + ____0.options.port);
+      res.set('x-shared', '-host=' + req.host + ' -port=' + ____0.options.port + ' -index=' + ____0.sharedList.length + ' -count=' + route.count);
       return res.end(response.content, response.encode);
     }
 
@@ -592,6 +593,7 @@ module.exports = function init(____0) {
   };
 
   _0xrrxo.handleRoute = async function (req, res, route) {
+
     if (route.lang) {
       req.session.language = { id: route.lang };
     }
@@ -688,12 +690,15 @@ module.exports = function init(____0) {
         res.end(503);
       }
     });
+
     req.addFeature = function (name) {
       req.features.push(name);
     };
+
     req.hasFeature = function (name) {
       return req.features.some((f) => f.like(name));
     };
+
     req.removeFeature = function (name) {
       req.features.forEach((f, i) => {
         if (f.like(name)) {
@@ -723,6 +728,7 @@ module.exports = function init(____0) {
 
       return userFinger;
     };
+
     req.word = function (name) {
       let w = ____0.word(name);
       if (!w.hostList) {
@@ -763,9 +769,11 @@ module.exports = function init(____0) {
       res.setHeader(a, b, c);
       return res;
     };
+
     res.delete = res.remove = res.removeHeader;
     res.writeHead0 = res.writeHead;
     res.writeHeadEnabled = !0;
+
     res.writeHead = (code, obj) => {
       if (res.writeHeadEnabled === !1 || res.finished === !0) {
         return res;
@@ -927,10 +935,10 @@ module.exports = function init(____0) {
         filePath = file;
       }
 
-      if ((response = ____0.sharedList.find((s) => s.filePath == filePath && s.url == req.url))) {
+      if ((response = ____0.sharedList.find((s) => s.host == req.host && s.filePath == filePath && s.url == req.url))) {
         res.headers = response.headers;
         res.code = response.code;
-        res.setHeader('x-shared', ____0.sharedList.length + ' - ' + ____0.options.port);
+        res.set('x-shared', '-host=' + req.host + ' -port=' + ____0.options.port + ' -index=' + ____0.sharedList.length+ ' -count=' + req.route.count);
         return res.end(response.content, response.encode);
       }
       ____0.fsm.getContent(filePath, (content) => {
@@ -1057,6 +1065,7 @@ module.exports = function init(____0) {
         }
 
         let response = {
+          host: req.host,
           url: req.url,
           filePath: filePath,
           content: req.content,
@@ -1065,7 +1074,7 @@ module.exports = function init(____0) {
           code: res.code,
         };
 
-        if (options.shared && !____0.sharedList.some((s) => s.filePath == response.filePath && s.url == response.url)) {
+        if (options.shared && !____0.sharedList.some((s) => s.host == req.host && s.filePath == response.filePath && s.url == response.url)) {
           ____0.sharedList.push(response);
         }
 
@@ -1177,13 +1186,13 @@ module.exports = function init(____0) {
       res.status(code).end();
     };
 
-    res.setHeader('CharSet', 'UTF-8');
-    res.setHeader('Access-Control-Allow-Credentials', 'true');
-    res.setHeader('Access-Control-Allow-Headers', req.headers['access-control-request-headers'] || 'Origin, X-Requested-With, Content-Type, Accept , Access-Token , Authorization');
-    res.setHeader('Access-Control-Allow-Methods', req.headers['access-control-request-method'] || 'POST,GET,DELETE,PUT,OPTIONS,VIEW,HEAD,CONNECT,TRACE');
-    res.setHeader('Access-Control-Allow-Origin', req.referer || '*');
+    res.set('CharSet', 'UTF-8');
+    res.set('Access-Control-Allow-Credentials', 'true');
+    res.set('Access-Control-Allow-Headers', req.headers['access-control-request-headers'] || 'Origin, X-Requested-With, Content-Type, Accept , Access-Token , Authorization');
+    res.set('Access-Control-Allow-Methods', req.headers['access-control-request-method'] || 'POST,GET,DELETE,PUT,OPTIONS,VIEW,HEAD,CONNECT,TRACE');
+    res.set('Access-Control-Allow-Origin', req.referer || '*');
     if (req.origin) {
-      res.setHeader('Access-Control-Allow-Origin', req.origin);
+      res.set('Access-Control-Allow-Origin', req.origin);
     }
 
     if (____0.options.www === false && req.host.contains('www')) {
@@ -1222,6 +1231,7 @@ module.exports = function init(____0) {
 
     let findRouteIndex = _0xrrxo.list.findIndex((r) => req.method.toLowerCase().like(r.method.toLowerCase()) && req.urlParser.pathname.like(r.name));
     if (findRouteIndex !== -1) {
+
       if (!_0xrrxo.list[findRouteIndex].count) {
         _0xrrxo.list[findRouteIndex].count = 0;
       }
@@ -1246,6 +1256,12 @@ module.exports = function init(____0) {
           req.paramsRaw[map.name] = req.urlParserRaw.arr[map.index];
         }
       }
+      req.session = {
+        $save: () => {},
+        accessToken: 'SHARED',
+        language: ____0.options.language || { id: 'en', dir: 'ltr' },
+        lang: ____0.options.language?.id || ____0.options.lang || 'en',
+      };
 
       req.query = req.urlParser.query;
       req.queryRaw = req.urlParserRaw.query;

package/lib/security.js

@@ -476,11 +476,6 @@ module.exports = function init(____0) {
       user.mobile = user.mobile.trim().toLowerCase();
     } else if (user && user.username && user.password) {
       user.username = user.username.trim().toLowerCase();
-    } else {
-      callback({
-        message: 'User Info Not Correct',
-      });
-      return;
     }
 
     for (var i = 0; i < security.users.length; i++) {
@@ -495,7 +490,8 @@ module.exports = function init(____0) {
         if ($req) {
           $req.session.user = _user;
           $req.session.user_id = _user.id;
-          ____0.saveSession($req.session);
+          $req.session.$save();
+         
         }
         callback(null, _user);
         ____0.call('user login', {
@@ -510,24 +506,9 @@ module.exports = function init(____0) {
       }
     }
 
-    let where = {
-      password: user.password,
-    };
-    if (user.email) {
-      where.email = user.email;
-    } else if (user.mobile) {
-      where.mobile = user.mobile;
-    } else if (user.username) {
-      where.username = user.username;
-    } else {
-      callback({
-        message: 'User Info Not Correct',
-      });
-      return;
-    }
     ____0.$users.findOne(
       {
-        where: where,
+        where: user,
       },
       function (err, doc) {
         if (doc) {
@@ -538,7 +519,8 @@ module.exports = function init(____0) {
           if ($req) {
             $req.session.user = doc;
             $req.session.user_id = doc.id;
-            ____0.saveSession($req.session);
+            $req.session.$save();
+          
           }
 
           callback(null, doc);
@@ -555,12 +537,12 @@ module.exports = function init(____0) {
             callback(err);
           } else {
             callback({
-              message: 'email or password error ',
+              message: 'User Credential Not Correct ',
             });
           }
 
           ____0.call('security error', {
-            message: 'email or password error',
+            message: 'User Credential Not Correct ',
           });
         }
       }
@@ -581,11 +563,6 @@ module.exports = function init(____0) {
       user.mobile = user.mobile.trim().toLowerCase();
     } else if (user && user.username && user.password) {
       user.username = user.username.trim().toLowerCase();
-    } else {
-      callback({
-        message: 'User Info Not Correct',
-      });
-      return;
     }
 
     security.isUserExists(user, function (err, u) {
@@ -608,7 +585,8 @@ module.exports = function init(____0) {
             if ($req) {
               $req.session.user = doc;
               $req.session.user_id = doc.id;
-              ____0.saveSession($req.session);
+              $req.session.$save();
+              
             }
             ____0.call('user register', {
               db: ____0.$users.db,
@@ -632,9 +610,7 @@ module.exports = function init(____0) {
 
     if (security.isUserLogin(req, res)) {
       let _user = req.session.user;
-      ____0.call('[session][delete]', {
-        accessToken: req.session.accessToken,
-      });
+      
 
       ____0.call('user logout', {
         db: ____0.$users.db,
@@ -668,11 +644,6 @@ module.exports = function init(____0) {
       user.mobile = user.mobile.trim().toLowerCase();
     } else if (user && user.username && user.password) {
       user.username = user.username.trim().toLowerCase();
-    } else {
-      callback({
-        message: 'User Info Not Correct',
-      });
-      return;
     }
 
     if (!user.email) {
@@ -737,11 +708,6 @@ module.exports = function init(____0) {
       where.mobile = user.mobile.trim().toLowerCase();
     } else if (user.username) {
       where.username = user.username.trim().toLowerCase();
-    } else {
-      callback({
-        message: 'User Info Not Correct',
-      });
-      return;
     }
     ____0.$users.update(
       {

package/lib/session.js

@@ -1,18 +1,17 @@
 module.exports = function init(req, res, ____0, callback) {
-  ____0.getSession({ accessToken: req.headers['Access-Token'] || req.headers['access-token'] || req.query['access-token'] || req.cookie('access_token') }, (session) => {
+  ____0.getSession(req, (session) => {
     session.$save = function () {
       ____0.saveSession(session);
     };
-    if (!session.accessToken) {
-      session.accessToken = req.host + new Date().getTime().toString() + '_' + Math.random();
-      session.accessToken = ____0.x0md50x(session.accessToken);
+
+    if (session.$new) {
+      session.$new = !1;
       res.cookie('access_token', session.accessToken);
       res.set('Access-Token', session.accessToken);
     }
 
     session.ip = req.ip;
     session.modifiedTime = new Date().getTime();
-    ____0.saveSession(session);
 
     function AssignFeatures() {
       ____0.options.defaults.features.forEach((f) => {
@@ -135,13 +134,15 @@ module.exports = function init(req, res, ____0, callback) {
             if (session.user) {
               req.features.push('login');
             }
-            ____0.saveSession(session);
+
             callback(session);
+            session.$save();
           }
         }
       );
     } else {
       callback(session);
+      session.$save();
     }
   });
 };

package/lib/sessions.js

@@ -22,7 +22,7 @@ module.exports = function init(____0) {
         try {
           ss = JSON.parse(ss);
           callback(null, ss);
-          console.log(' ... sessions Loaded From ...' + sessions.path);
+          console.log(' /// sessions Loaded From /// ' + sessions.path);
         } catch (err) {
           console.log(err.message);
         }
@@ -32,6 +32,16 @@ module.exports = function init(____0) {
     return;
   };
 
+  sessions.handleSessions = function () {
+    sessions.list = sessions.list.filter((s) => s && new Date().getTime() - s.createdTime < 1000 * 60 * ____0.options.session.timeout);
+    sessions.list = sessions.list.filter((s) => s && new Date().getTime() - s.$time < 1000 * 60 * ____0.options.session.memoryTimeout);
+
+    if (____0.options.session.storage === 'mongodb') {
+      sessions.$collection.deleteAll({ createdTime: { $lt: new Date().getTime() - 1000 * 60 * ____0.options.session.timeout } });
+      sessions.$collection.deleteAll({ where: { createdTime: { $exists: false } } });
+    }
+  };
+
   sessions.saveAll = function (callback) {
     callback =
       callback ||
@@ -47,63 +57,45 @@ module.exports = function init(____0) {
       });
       return;
     }
+    sessions.handleSessions();
 
     if (____0.options.session.storage === 'mongodb') {
       sessions.list.forEach((s, i) => {
-        if (!s) {
-          return false;
-        }
-        if (new Date().getTime() - s.createdTime > 1000 * 60 * ____0.options.session.timeout) {
-          sessions.list.splice(i, 1);
-          sessions.$collection.delete(s);
+        if (s.id) {
+          sessions.$collection.update(s, (err, result) => {
+            if (!err && result && result.doc) {
+              sessions.list[i] = result.doc;
+            }
+          });
         } else {
-          if (s.id) {
-            sessions.$collection.update(s, (err, result) => {
-              if (!err && result) {
-                sessions.list[i] = result.doc;
-              }
-            });
-          } else {
-            sessions.$collection.insert(s, (err, doc) => {
-              if (!err && doc) {
-                sessions.list[i] = doc;
-              }
-            });
-          }
+          sessions.$collection.insert(s, (err, doc) => {
+            if (!err && doc) {
+              sessions.list[i] = doc;
+            }
+          });
         }
       });
     } else {
-      sessions.list.forEach((s, i) => {
-        if (!s) {
-          return false;
-        }
-        let online = new Date().getTime() - s.createdTime;
-        let timeout = 1000 * 60 * ____0.options.session.timeout;
-        if (online > timeout) {
-          sessions.list.splice(i, 1);
-        }
-      });
-
       ____0.writeFile(sessions.path, JSON.stringify(sessions.list), () => {
         callback(null, sessions.list);
-        console.log(' ... sessions Saved to ...' + sessions.path);
+        console.log(' /// sessions Saved to ///' + sessions.path);
       });
     }
 
     return;
   };
 
-  ____0.getSession = sessions.attach = function (session, callback) {
+  ____0.getSession = sessions.attach = function (req, callback) {
+    let session = { accessToken: req.headers['Access-Token'] || req.headers['access-token'] || req.query['access-token'] || req.cookie('access_token') };
+
     callback = callback || function () {};
-    session.$exists = !1;
 
     if (session.accessToken) {
       let index = sessions.list.findIndex((s) => s && s.accessToken && s.accessToken === session.accessToken);
-      if (index > -1) {
+      if (index !== -1) {
+        sessions.list[index].$time = new Date().getTime();
         sessions.list[index].requestesCount++;
         sessions.list[index].language = sessions.list[index].language || ____0.options.language;
-        session.$exists = !0;
-        session.$index = index;
         callback(sessions.list[index]);
       } else {
         if (____0.options.session.storage === 'mongodb') {
@@ -111,14 +103,11 @@ module.exports = function init(____0) {
             { accessToken: session.accessToken },
             (err, doc) => {
               if (!err && doc) {
-                session.$exists = !0;
-                session = { ...session, ...doc };
-                session.requestesCount++;
-                session.$index = sessions.list.length;
-                session.language = session.language || ____0.options.language;
-
-                sessions.list.push(session);
-                callback(sessions.list[session.$index]);
+                doc.$time = new Date().getTime();
+                doc.requestesCount++;
+                doc.language = doc.language || ____0.options.language;
+                sessions.list.push(doc);
+                callback(sessions.list[sessions.list.findIndex((s) => s.accessToken == session.accessToken)]);
               } else {
                 session.$new = !0;
                 session.language = ____0.options.language;
@@ -127,9 +116,9 @@ module.exports = function init(____0) {
                 session.data = [];
                 session.requestesCount = 1;
                 session.createdTime = new Date().getTime();
-                session.$index = sessions.list.length;
+                session.$time = new Date().getTime();
                 sessions.list.push(session);
-                callback(sessions.list[session.$index]);
+                callback(sessions.list[sessions.list.findIndex((s) => s.accessToken == session.accessToken)]);
               }
             },
             true
@@ -142,9 +131,9 @@ module.exports = function init(____0) {
           session.data = [];
           session.requestesCount = 1;
           session.createdTime = new Date().getTime();
-          session.$index = sessions.list.length;
+          session.$time = new Date().getTime();
+          callback(session);
           sessions.list.push(session);
-          callback(sessions.list[session.$index]);
         }
       }
     } else {
@@ -155,60 +144,21 @@ module.exports = function init(____0) {
       session.data = [];
       session.requestesCount = 1;
       session.createdTime = new Date().getTime();
-      session.$index = sessions.list.length;
+      session.$time = new Date().getTime();
+      session.accessToken = req.host + req.ip + new Date().getTime().toString() + '_' + Math.random();
+      session.accessToken = ____0.x0md50x(session.accessToken);
       sessions.list.push(session);
-      callback(sessions.list[session.$index]);
+      callback(sessions.list[sessions.list.findIndex((s) => s && s.accessToken == session.accessToken)]);
     }
   };
 
-  ____0.saveSession = sessions.save = function (session, callback) {
-    callback = callback || function () {};
-    session.$exists = !1;
-    let index = sessions.list.findIndex((s) => s.accessToken && s.accessToken == session.accessToken);
+  ____0.saveSession = sessions.save = function (session) {
+    let index = sessions.list.findIndex((s) => s && s.accessToken && s.accessToken == session.accessToken);
     if (index !== -1) {
-      sessions.list[index] = { ...sessions.list[index], ...session };
-      callback(sessions.list[index]);
-      return sessions.list[index];
+      sessions.list[index] = session;
     }
   };
 
-  ____0.on('[session][update]', (session) => {
-    sessions.list.forEach((s) => {
-      if (s.accessToken == session.accessToken) {
-        for (let key in session) {
-          if (session.hasOwnProperty(key) && key !== 'accessToken') {
-            key = key.toLowerCase();
-            for (let i = 0; i < s.data.length; i++) {
-              let obj = s.data[i];
-              if (obj.key === key) {
-                s.data[i] = {
-                  key: key,
-                  value: session[key],
-                };
-              }
-            }
-            s.data.push({
-              key: key,
-              value: session[key],
-            });
-          }
-        }
-      }
-    });
-  });
-  ____0.on('[session][delete]', (session) => {
-    let index = sessions.list.findIndex((s) => s.accessToken && s.accessToken == session.accessToken);
-    if (index !== -1) {
-      sessions.list.splice(index, 1);
-    }
-  });
-  ____0.on('[session][user][update]', (user) => {
-    let index = sessions.list.findIndex((s) => s.user && s.user == session.user);
-    if (index !== -1) {
-      sessions.list[index].user = user;
-    }
-  });
-
   ____0.on('[any][saving data]', function () {
     sessions.saveAll();
   });
@@ -217,8 +167,7 @@ module.exports = function init(____0) {
     req.session.language = req.data;
     req.session.lang = req.session.language?.id || req.data.name;
     req.session.langDir = req.session.language?.dir;
-
-    ____0.saveSession(req.session);
+    req.session.$save();
     res.json({
       done: true,
       lang: req.data.name,
@@ -259,5 +208,8 @@ module.exports = function init(____0) {
   if (!____0.options.session.storage === 'mongodb') {
     sessions.loadAll();
   }
+
+  sessions.handleSessions();
+
   return sessions;
 };