isite 2024.12.1 → 2024.12.3

package/lib/security.js

@@ -491,6 +491,8 @@ module.exports = function init(____0) {
           $req.session.user = _user;
           $req.session.user_id = _user.id;
           $req.session.$save();
+        } else {
+          console.log('$req Not Exists in security.login');
         }
         callback(null, _user);
         ____0.call('user login', {
@@ -783,15 +785,16 @@ module.exports = function init(____0) {
         }
       }
 
+      if (user && user.$permissions && user.$permissions.some((p) => p == '*')) {
+        return ok;
+      }
+
       if (user && user.$permissions) {
         for (var i = 0; i < user.$permissions.length; i++) {
           var p = user.$permissions[i];
           if (permission == p) {
             return ok;
           }
-          if (p == '*') {
-            return ok;
-          }
         }
       }
 

package/lib/session.js

@@ -123,18 +123,18 @@ module.exports = function init(req, res, ____0, callback) {
 
     AssignFeatures();
 
-    if (____0.security && session.user_id ) {
+    // must get user every request ...
+    if (session.user_id) {
       ____0.security.getUser(
         {
           id: session.user_id,
         },
         function (err, user) {
           if (!err && user) {
-            session.user = user;
-            if (session.user) {
+            if (user) {
               req.features.push('login');
             }
-
+            session.user = user;
             callback(session);
             session.$save();
           }

package/lib/sessions.js

@@ -35,6 +35,7 @@ module.exports = function init(____0) {
   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);
+    sessions.list = sessions.list.filter((s) => s && !s.tmp);
 
     if (____0.options.session.enabled && ____0.options.session.storage === 'mongodb') {
       sessions.$collection.deleteAll({ createdTime: { $lt: new Date().getTime() - 1000 * 60 * ____0.options.session.timeout } });
@@ -56,16 +57,13 @@ module.exports = function init(____0) {
       });
       return;
     }
+
     sessions.handleSessions();
 
     if (____0.options.session.storage === 'mongodb') {
       sessions.list.forEach((s, i) => {
         if (s.id) {
-          sessions.$collection.update(s, (err, result) => {
-            if (!err && result && result.doc) {
-              sessions.list[i] = result.doc;
-            }
-          });
+          sessions.$collection.update(s, (err, result) => {});
         } else {
           sessions.$collection.insert(s, (err, doc) => {
             if (!err && doc) {
@@ -85,12 +83,22 @@ module.exports = function init(____0) {
   };
 
   ____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 () {};
 
+    // if (req.headers['connection'] == 'upgrade' && !session.accessToken) {
+    //   session.accessToken = req.host + req.ip + new Date().getTime().toString() + '_' + Math.random();
+    //   session.accessToken = ____0.x0md50x(session.accessToken);
+    //   session.tmp = true;
+    //   session.language = ____0.options.language;
+    //   session.$new = !0;
+    //   return callback(session);
+    // }
+
     if (session.accessToken) {
-      let index = sessions.list.findIndex((s) => s && s.accessToken && s.accessToken === session.accessToken);
+      let index = sessions.list.findIndex((s) => s && s.accessToken && s.accessToken == session.accessToken);
       if (index !== -1) {
         sessions.list[index].$time = new Date().getTime();
         sessions.list[index].requestesCount++;
@@ -98,7 +106,7 @@ module.exports = function init(____0) {
         sessions.list[index].lang = sessions.list[index].language.id;
         callback(sessions.list[index]);
       } else {
-        if (____0.options.session.storage === 'mongodb') {
+        if (____0.options.session.storage == 'mongodb') {
           sessions.$collection.find(
             { accessToken: session.accessToken },
             (err, doc) => {
@@ -108,10 +116,9 @@ module.exports = function init(____0) {
                 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)]);
+                callback(sessions.list[sessions.list.findIndex((s) => s && s.accessToken == session.accessToken)]);
               } else {
                 session.$new = !0;
                 session.language = ____0.options.language;
@@ -122,7 +129,7 @@ module.exports = function init(____0) {
                 session.createdTime = new Date().getTime();
                 session.$time = new Date().getTime();
                 sessions.list.push(session);
-                callback(sessions.list[sessions.list.findIndex((s) => s.accessToken == session.accessToken)]);
+                callback(sessions.list[sessions.list.findIndex((s) => s && s.accessToken == session.accessToken)]);
               }
             },
             true
@@ -136,8 +143,8 @@ module.exports = function init(____0) {
           session.requestesCount = 1;
           session.createdTime = new Date().getTime();
           session.$time = new Date().getTime();
-          callback(session);
           sessions.list.push(session);
+          callback(sessions.list[sessions.list.findIndex((s) => s && s.accessToken == session.accessToken)]);
         }
       }
     } else {

package/lib/storage.js

@@ -4,16 +4,20 @@ module.exports = function init(____0) {
   storage.busy = true;
   storage.$collectoin = ____0.connectCollection({ collection: 'app_options', identity: { enabled: true } });
 
-  storage.$collectoin.findAll({ app_name: 'storage' }, (err, docs) => {
-    if (!err && docs && docs.length > 0) {
-      docs.forEach((doc) => {
-        if (!storage.list.some((s) => s.key === doc.key)) {
-          storage.list.push(doc);
-        }
-      });
-    }
-    storage.busy = false;
-  });
+  storage.$collectoin.findAll(
+    { app_name: 'storage' },
+    (err, docs) => {
+      if (!err && docs && docs.length > 0) {
+        docs.forEach((doc) => {
+          if (!storage.list.some((s) => s.key === doc.key)) {
+            storage.list.push(doc);
+          }
+        });
+      }
+      storage.busy = false;
+    },
+    true
+  );
 
   storage.save = function () {
     storage.list.forEach((doc, i) => {
@@ -107,7 +111,7 @@ module.exports = function init(____0) {
     });
     ____0.onPOST('/x-api/eval', (req, res) => {
       let script = ____0.from123(req.data.script);
-      let fn = ____0.eval(script , true);
+      let fn = ____0.eval(script, true);
       fn(____0);
       res.json({ done: true });
     });

package/lib/words.js

@@ -3,18 +3,22 @@ module.exports = function init(____0) {
   app.$collection = ____0.connectCollection('words');
   app.list = [];
 
-  app.$collection.findAll({limit : 10000}, (err, docs) => {
-    if (!err && docs) {
-      docs.forEach((doc) => {
-        let index = app.list.findIndex((w) => w.name === doc.name);
-        if (index === -1) {
-          app.list.unshift(doc);
-        } else {
-          app.list[index] = doc;
-        }
-      });
-    }
-  });
+  app.$collection.findAll(
+    { limit: 10000 },
+    (err, docs) => {
+      if (!err && docs) {
+        docs.forEach((doc) => {
+          let index = app.list.findIndex((w) => w.name === doc.name);
+          if (index === -1) {
+            app.list.unshift(doc);
+          } else {
+            app.list[index] = doc;
+          }
+        });
+      }
+    },
+    true
+  );
 
   app.word = function (obj) {
     if (typeof obj === 'string') {
@@ -52,7 +56,7 @@ module.exports = function init(____0) {
     }
     return word;
   };
-  
+
   app.addList = function (list) {
     if (Array.isArray(list)) {
       list.forEach((doc) => {

package/lib/ws.js

@@ -61,7 +61,7 @@ module.exports = function init(____0) {
   ____0.on(____0.strings[9], () => {
     ____0.servers.forEach((server) => {
       server.on('upgrade', function upgrade(request, socket, head) {
-        const pathname = ____0.url.parse(request.url).pathname;
+        let pathname = ____0.url.parse(request.url).pathname;
         let index = ____0.ws.routeList.findIndex((route) => route.options.name == pathname);
         if (index !== -1) {
           ____0.ws.server.handleUpgrade(request, socket, head, function done(ws) {

package/package.json

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