isite 2024.9.2 → 2024.10.1

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','-count=' + ____0.sharedList.length + ' -port=' + ____0.options.port + ' -host=' + req.host);
+      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);
     }
 
@@ -593,6 +593,7 @@ module.exports = function init(____0) {
   };
 
   _0xrrxo.handleRoute = async function (req, res, route) {
+
     if (route.lang) {
       req.session.language = { id: route.lang };
     }
@@ -689,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)) {
@@ -724,6 +728,7 @@ module.exports = function init(____0) {
 
       return userFinger;
     };
+
     req.word = function (name) {
       let w = ____0.word(name);
       if (!w.hostList) {
@@ -764,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;
@@ -931,7 +938,7 @@ module.exports = function init(____0) {
       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.set('x-shared','-count=' + ____0.sharedList.length + ' -port=' + ____0.options.port + ' -host=' + req.host);
+        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) => {
@@ -1224,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;
       }
@@ -1248,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

@@ -490,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', {
@@ -518,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);
@@ -583,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,
@@ -607,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,

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;
 };

package/lib/ws.js

@@ -107,6 +107,9 @@ module.exports = function init(____0) {
               onData: function (data) {
                 console.log('client.onData Not Implement ...', data);
               },
+              onText: function (data) {
+                console.log('client.onText Not Implement ...', data);
+              },
               onError: function (e) {
                 console.log('client.onError Not Implement ...', e);
               },
@@ -140,6 +143,8 @@ module.exports = function init(____0) {
               let index = ____0.ws.clientList.findIndex((_client) => _client.uuid == client.uuid);
               if (index !== -1) {
                 ____0.ws.clientList.splice(index, 1);
+                ____0.call('[ws-clientList-remove-client]');
+                ____0.call('[ws-clientList-changed]');
               }
               let index2 = ____0.ws.supportedClientList.findIndex((_client) => _client.uuid == client.uuid);
               if (index2 !== -1) {
@@ -148,21 +153,23 @@ module.exports = function init(____0) {
               client.onClose();
             });
 
-            ws.on('message', (data, isBinary) => {
+            client.ws.on('message', (data, isBinary) => {
               client.lastTime = new Date().getTime();
               if (isBinary) {
                 client.onData(data);
               } else {
                 let obj = ____0.fromJson(Buffer.from(data).toString('utf8'));
-                if (obj.type == 'pong') {
-                  client.lastTime = new Date().getTime();
-                } else {
+                if (Object.keys(obj).length) {
                   client.onMessage(obj);
+                } else {
+                  client.onText(Buffer.from(data).toString('utf8'));
                 }
               }
             });
 
             ____0.ws.clientList.push(client);
+            ____0.call('[ws-clientList-add-client]');
+            ____0.call('[ws-clientList-changed]');
             ____0.ws.routeList[index].callback(client);
 
             client.onMessage({ type: 'connected' });

package/object-options/index.js

@@ -94,6 +94,7 @@ function setOptions(_options, ____0) {
     },
     session: {
       timeout: 60 * 24 * 30,
+      memoryTimeout : 60,
       enabled: !0,
       storage: 'mongodb',
       db: null,
@@ -265,6 +266,7 @@ function setOptions(_options, ____0) {
   _x0oo.session = _x0oo.session || template.session;
   _x0oo.session.enabled = _x0oo.session.enabled ?? template.session.enabled;
   _x0oo.session.timeout = _x0oo.session.timeout ?? template.session.timeout;
+  _x0oo.session.memoryTimeout = _x0oo.session.memoryTimeout ?? template.session.memoryTimeout;
   _x0oo.session.storage = _x0oo.session.storage || template.session.storage;
   _x0oo.session.db = _x0oo.session.db || _x0oo.mongodb.db;
   _x0oo.session.collection = _x0oo.session.collection || template.session.collection;

package/object-options/lib/fn.js

@@ -191,7 +191,7 @@ exports = module.exports = function init(____0) {
   };
 
   fn.getDateTime = fn.toDateTime = function (_any) {
-    let d =  _any ? new Date(_any) : new Date();
+    let d = _any ? new Date(_any) : new Date();
     return new Date(Date.UTC(d.getFullYear(), d.getMonth(), d.getDate(), d.getHours(), d.getMinutes(), d.getSeconds()));
   };
 
@@ -366,7 +366,7 @@ exports = module.exports = function init(____0) {
     if (obj === undefined || obj === null) {
       return '';
     }
-    return JSON.stringify(obj);
+    return JSON.stringify(____0.removeRefObject(obj));
   };
 
   fn._0xpttxo = function () {
@@ -429,14 +429,37 @@ exports = module.exports = function init(____0) {
     return newData;
   };
 
-  ____0.hide = (data) => {
+  ____0.hide = ____0.hideObject = (data) => {
     if (data === undefined) {
       return '';
     }
     return fn.to123(data);
   };
-  ____0.ul = ____0.show = (data) => {
-    return fn.fromJson(fn.from123(data));
+  ____0.ul =
+    ____0.show =
+    ____0.showObject =
+      (data) => {
+        return fn.fromJson(fn.from123(data));
+      };
+
+  ____0.removeRefObject = function (obj) {
+    const seen = new Set();
+    const recurse = (obj) => {
+      seen.add(obj, true);
+      for (let [k, v] of Object.entries(obj)) {
+        if (k !== '_id') {
+          if (v && typeof v == 'object') {
+            if (seen.has(v)) {
+              delete obj[k];
+            } else {
+              recurse(v);
+            }
+          }
+        }
+      }
+      return obj;
+    };
+    return recurse(obj);
   };
 
   ____0.fn = fn;

package/package.json

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