isite 2024.10.1 → 2024.10.3

package/lib/routing.js

@@ -192,7 +192,7 @@ module.exports = function init(____0) {
     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.set('x-shared', '-host=' + req.host + ' -port=' + ____0.options.port + ' -index=' + ____0.sharedList.length + ' -count=' + route.count);
+      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);
     }
 
@@ -375,6 +375,7 @@ module.exports = function init(____0) {
       route.path = null;
       route.parser = 'static';
       route.parserDir = ____0.dir;
+      route.count = 0;
       route.cache = !0;
       route.hide = !1;
       route.compress = !1;
@@ -407,6 +408,7 @@ module.exports = function init(____0) {
       route.masterPage = r.masterPage || null;
       route.overwrite = r.overwrite ?? !1;
       route.cache = r.cache ?? !0;
+      route.count = r.count || 0;
       route.hide = r.hide ?? !1;
       route.compress = r.compress ?? !1;
       route.encript = r.encript ?? !1;
@@ -952,114 +954,114 @@ module.exports = function init(____0) {
 
         req.content = content;
         req.data = { ...req.data, ..._data };
-        req.route = { ...req.route, ...options };
+         let route = { ...req.route, ...options };
 
-        if (req.route.encript == '123') {
+        if (route.encript == '123') {
           req.content = ____0.f1(req.content);
         }
 
-        if (req.route.parser) {
-          req.content = ____0.parser(req, res, ____0, req.route).html(req.content);
+        if (route.parser) {
+          req.content = ____0.parser(req, res, ____0, route).html(req.content);
         }
 
-        if (req.route.compress) {
+        if (route.compress) {
           req.content = req.content.replace(/\r?\n|\r/g, ' ').replace(/\s+/g, ' ');
         }
 
         res.status(options.code || 200);
         if (filePath.endsWith('.css')) {
           res.set(____0.strings[7], 'text/css');
-          if (____0.options.cache.enabled && req.route.cache) {
+          if (____0.options.cache.enabled && route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.css);
           }
         } else if (filePath.endsWith('.js')) {
           res.set(____0.strings[7], 'application/javascript');
-          if (____0.options.cache.enabled && req.route.cache) {
+          if (____0.options.cache.enabled && route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.js);
           }
         } else if (filePath.endsWith('.html')) {
           res.set(____0.strings[7], 'text/html');
-          if (____0.options.cache.enabled && req.route.cache) {
+          if (____0.options.cache.enabled && route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.html);
           }
         } else if (filePath.endsWith('.txt')) {
           res.set(____0.strings[7], 'text/plain');
-          if (____0.options.cache.enabled && req.route.cache) {
+          if (____0.options.cache.enabled && route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.txt);
           }
         } else if (filePath.endsWith('.json')) {
           res.set(____0.strings[7], 'application/json');
-          if (____0.options.cache.enabled && req.route.cache) {
+          if (____0.options.cache.enabled && route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.json);
           }
         } else if (filePath.endsWith('.xml')) {
           res.set(____0.strings[7], 'text/xml');
-          if (____0.options.cache.enabled && req.route.cache) {
+          if (____0.options.cache.enabled && route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.xml);
           }
         } else if (filePath.endsWith('.woff2')) {
           res.set(____0.strings[7], 'application/font-woff2');
-          if (____0.options.cache.enabled && req.route.cache) {
+          if (____0.options.cache.enabled && route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.fonts);
           }
         } else if (filePath.endsWith('.woff')) {
           res.set(____0.strings[7], 'application/font-woff');
-          if (____0.options.cache.enabled && req.route.cache) {
+          if (____0.options.cache.enabled && route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.fonts);
           }
         } else if (filePath.endsWith('.ttf')) {
           res.set(____0.strings[7], 'application/font-ttf');
-          if (____0.options.cache.enabled && req.route.cache) {
+          if (____0.options.cache.enabled && route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.fonts);
           }
         } else if (filePath.endsWith('.svg')) {
           res.set(____0.strings[7], 'application/font-svg');
-          if (____0.options.cache.enabled && req.route.cache) {
+          if (____0.options.cache.enabled && route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.fonts);
           }
         } else if (filePath.endsWith('.otf')) {
           res.set(____0.strings[7], 'application/font-otf');
-          if (____0.options.cache.enabled && req.route.cache) {
+          if (____0.options.cache.enabled && route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.fonts);
           }
         } else if (filePath.endsWith('.eot')) {
           res.set(____0.strings[7], 'application/font-eot');
-          if (____0.options.cache.enabled && req.route.cache) {
+          if (____0.options.cache.enabled && route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.fonts);
           }
         } else if (filePath.endsWith('.gif')) {
           res.set(____0.strings[7], 'image/gif');
-          if (____0.options.cache.enabled && req.route.cache) {
+          if (____0.options.cache.enabled && route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.images);
           }
         } else if (filePath.endsWith('.png')) {
           res.set(____0.strings[7], 'image/png');
-          if (____0.options.cache.enabled && req.route.cache) {
+          if (____0.options.cache.enabled && route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.images);
           }
         } else if (filePath.endsWith('.jpg')) {
           res.set(____0.strings[7], 'image/jpg');
-          if (____0.options.cache.enabled && req.route.cache) {
+          if (____0.options.cache.enabled && route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.images);
           }
         } else if (filePath.endsWith('.jpeg')) {
           res.set(____0.strings[7], 'image/jpeg');
-          if (____0.options.cache.enabled && req.route.cache) {
+          if (____0.options.cache.enabled && route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.images);
           }
         } else if (filePath.endsWith('.ico')) {
           res.set(____0.strings[7], 'image/ico');
-          if (____0.options.cache.enabled && req.route.cache) {
+          if (____0.options.cache.enabled && route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.images);
           }
         } else if (filePath.endsWith('.bmp')) {
           res.set(____0.strings[7], 'image/bmp');
-          if (____0.options.cache.enabled && req.route.cache) {
+          if (____0.options.cache.enabled && route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.images);
           }
         } else if (filePath.endsWith('.webp')) {
           res.set(____0.strings[7], 'image/webp');
-          if (____0.options.cache.enabled && req.route.cache) {
+          if (____0.options.cache.enabled && route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.images);
           }
         }

package/lib/security.js

@@ -491,7 +491,6 @@ module.exports = function init(____0) {
           $req.session.user = _user;
           $req.session.user_id = _user.id;
           $req.session.$save();
-         
         }
         callback(null, _user);
         ____0.call('user login', {
@@ -520,7 +519,6 @@ module.exports = function init(____0) {
             $req.session.user = doc;
             $req.session.user_id = doc.id;
             $req.session.$save();
-          
           }
 
           callback(null, doc);
@@ -586,7 +584,6 @@ module.exports = function init(____0) {
               $req.session.user = doc;
               $req.session.user_id = doc.id;
               $req.session.$save();
-              
             }
             ____0.call('user register', {
               db: ____0.$users.db,
@@ -610,22 +607,25 @@ module.exports = function init(____0) {
 
     if (security.isUserLogin(req, res)) {
       let _user = req.session.user;
-      
 
       ____0.call('user logout', {
         db: ____0.$users.db,
         collection: ____0.$users.collection,
         doc: _user,
-        $res: res,
-        $req: req,
       });
     }
 
-    delete req.session.user;
+    req.session.user = null;
+    req.session.user_id = null;
+    req.session.$save();
+
     req.session.accessToken = req.host + new Date().getTime().toString() + '_' + Math.random();
     req.session.accessToken = ____0.x0md50x(req.session.accessToken);
+    req.session.$save();
+
     res.set('Access-Token', req.session.accessToken);
     res.cookie('access_token', req.session.accessToken);
+
     callback(null, !0);
   };
 

package/lib/session.js

@@ -123,7 +123,7 @@ module.exports = function init(req, res, ____0, callback) {
 
     AssignFeatures();
 
-    if (____0.security && session.user_id) {
+    if (____0.security && session.user_id ) {
       ____0.security.getUser(
         {
           id: session.user_id,

package/lib/sessions.js

@@ -36,9 +36,8 @@ module.exports = function init(____0) {
     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') {
+    if (____0.options.session.enabled && ____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 } } });
     }
   };
 
@@ -96,6 +95,7 @@ module.exports = function init(____0) {
         sessions.list[index].$time = new Date().getTime();
         sessions.list[index].requestesCount++;
         sessions.list[index].language = sessions.list[index].language || ____0.options.language;
+        sessions.list[index].lang = sessions.list[index].language.id;
         callback(sessions.list[index]);
       } else {
         if (____0.options.session.storage === 'mongodb') {
@@ -105,13 +105,17 @@ module.exports = function init(____0) {
               if (!err && doc) {
                 doc.$time = new Date().getTime();
                 doc.requestesCount++;
-                doc.language = doc.language || ____0.options.language;
+                if (!doc.language || !doc.language.id) {
+                  doc.language = ____0.options.language;
+                }
+
+                doc.lang = doc.language.id;
                 sessions.list.push(doc);
                 callback(sessions.list[sessions.list.findIndex((s) => s.accessToken == session.accessToken)]);
               } else {
                 session.$new = !0;
                 session.language = ____0.options.language;
-                session.lang = ____0.options.language.id;
+                session.lang = session.language.id;
                 session.theme = ____0.options.theme;
                 session.data = [];
                 session.requestesCount = 1;
@@ -126,7 +130,7 @@ module.exports = function init(____0) {
         } else {
           session.$new = !0;
           session.language = ____0.options.language;
-          session.lang = ____0.options.language.id;
+          session.lang = session.language.id;
           session.theme = ____0.options.theme;
           session.data = [];
           session.requestesCount = 1;
@@ -139,7 +143,7 @@ module.exports = function init(____0) {
     } else {
       session.$new = !0;
       session.language = ____0.options.language;
-      session.lang = ____0.options.language.id;
+      session.lang = session.language.id;
       session.theme = ____0.options.theme;
       session.data = [];
       session.requestesCount = 1;
@@ -165,12 +169,12 @@ module.exports = function init(____0) {
 
   ____0.onPOST({ name: '/x-language/change', public: true }, (req, res) => {
     req.session.language = req.data;
-    req.session.lang = req.session.language?.id || req.data.name;
+    req.session.lang = req.session.language.id || req.data.name;
     req.session.langDir = req.session.language?.dir;
     req.session.$save();
     res.json({
       done: true,
-      lang: req.data.name,
+      language: req.session.language,
     });
   });
 

package/object-options/index.js

@@ -39,7 +39,7 @@ function setOptions(_options, ____0) {
     _0x14xo: _0x14xo, // 3259376545129191
     _0xddxo: _0xddxo, // 421957684138766241719191
     log: !0,
-    lang: 'en',
+    lang: 'En',
     language: { id: 'En', dir: 'ltr', text: 'left' },
     theme: 'default',
     public: false,

package/object-options/plugins/file-manager/site-files/html/index.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="En">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isite",
-  "version": "2024.10.01",
+  "version": "2024.10.03",
   "description": "Create High Level Multi-Language Web Site [Fast and Easy] ",
   "main": "index.js",
   "repository": {