isite 2024.10.3 → 2024.12.2

package/apps/client-side/site_files/js/bootstrap-5-directive.js

@@ -738,8 +738,8 @@ app.directive('iDate', function ($timeout) {
 
       $scope.model = {};
 
-      $scope.lang = site.session ? site.session.language.id : 'en';
-      if ($scope.lang === 'ar') {
+      $scope.lang = site.session ? site.session.language.id : 'En';
+      if ($scope.lang.contains('ar')) {
         $scope.monthes = [
           { id: 0, name: 'يناير' },
           { id: 1, name: 'فبراير' },
@@ -846,8 +846,8 @@ app.directive('iDatetime', function () {
 
       $scope.model = {};
 
-      $scope.lang = site.session ? site.session.language.id : 'en';
-      if ($scope.lang === 'ar') {
+      $scope.lang = site.session ? site.session.language.id : 'En';
+      if ($scope.lang.contains('ar')) {
         $scope.monthes = [
           { id: 0, name: 'يناير' },
           { id: 1, name: 'فبراير' },

package/index.js

@@ -1,4 +1,5 @@
 module.exports = function init(options) {
+  console.log('isite init ...');
   const ____0 = function () {};
 
   ____0.args = {};
@@ -175,23 +176,26 @@ module.exports = function init(options) {
     });
   }
 
-  if (____0.options.cluster.enabled && ____0.cluster.isPrimary) {
-    console.log(`Primary cluster : ${process.pid} is running`);
+  // if (____0.options.cluster.enabled && ____0.cluster.isPrimary) {
+  //   console.log(`Primary cluster : ${process.pid} is running`);
 
-    if (____0.options.cluster.enabled) {
-      for (let i = 0; i < ____0.options.cluster.count; i++) {
-        ____0.cluster.fork();
-      }
+  //   if (____0.options.cluster.enabled) {
+  //     for (let i = 0; i < ____0.options.cluster.count; i++) {
+  //       ____0.cluster.fork();
+  //     }
+
+  //     ____0.cluster.on('exit', (worker, code, signal) => {
+  //       console.log(`worker cluster : ${worker.process.pid} died`);
+  //     });
+  //   }
+  // } else if (____0.options.cluster.enabled && !____0.cluster.isPrimary) {
+  //   console.log(`Worker cluster : ${process.pid} started`);
+  // } else {
+  //   console.log(`Process : ${process.pid} started`);
+  // }
+
+  console.log(`Process ID : ${process.pid} `);
 
-      ____0.cluster.on('exit', (worker, code, signal) => {
-        console.log(`worker cluster : ${worker.process.pid} died`);
-      });
-    }
-  } else if (____0.options.cluster.enabled && !____0.cluster.isPrimary) {
-    console.log(`Worker cluster : ${process.pid} started`);
-  } else {
-    console.log(`Process : ${process.pid} started`);
-  }
   ____0.fsm = require('./lib/data.js')(____0);
   ____0.fsm = require('./lib/fsm.js')(____0);
 

package/lib/collection.js

@@ -157,8 +157,8 @@ module.exports = function init(____0, options, db) {
             return;
           }
 
-          if (newOptions.where && newOptions.where.id) {
-            newOptions.where.id = ____0.toInt(newOptions.where.id);
+          if (newOptions.where && newOptions.where.id && typeof newOptions.where.id == 'string') {
+            newOptions.where.id = ____0.toInt(newOptions.where.id) || newOptions.where.id;
           }
 
           ____0.mongodb.updateOne(
@@ -170,8 +170,8 @@ module.exports = function init(____0, options, db) {
               unset: newOptions.unset || {},
               rename: newOptions.rename || {},
             },
-            function (err, result, result2) {
-              callback(err, result, result2);
+            function (err, result) {
+              callback(err, result);
               $collection.taskBusy = !1;
             }
           );
@@ -212,8 +212,8 @@ module.exports = function init(____0, options, db) {
             return;
           }
 
-          if (typeof newOptions.where.id === 'string') {
-            newOptions.where.id = ____0.toInt(newOptions.where.id);
+          if (newOptions.where.id && newOptions.where.id && typeof newOptions.where.id === 'string') {
+            newOptions.where.id = ____0.toInt(newOptions.where.id) || newOptions.where.id;
           }
 
           ____0.mongodb.deleteOne(
@@ -262,8 +262,8 @@ module.exports = function init(____0, options, db) {
             newOptions.sort = options.sort;
           }
 
-          if (newOptions.where.id && typeof newOptions.where.id === 'string') {
-            newOptions.where.id = ____0.toInt(newOptions.where.id);
+          if (newOptions.where.id && newOptions.where.id && typeof newOptions.where.id === 'string') {
+            newOptions.where.id = ____0.toInt(newOptions.where.id) || newOptions.where.id;
           }
 
           ____0.mongodb.findOne(
@@ -347,7 +347,7 @@ module.exports = function init(____0, options, db) {
             newOptions.skip = options.skip;
           }
           if (newOptions.where.id && typeof newOptions.where.id === 'string') {
-            newOptions.where.id = ____0.toInt(newOptions.where.id);
+            newOptions.where.id = ____0.toInt(newOptions.where.id) || newOptions.where.id;
           }
 
           ____0.mongodb.findMany(
@@ -441,7 +441,7 @@ module.exports = function init(____0, options, db) {
           }
 
           if (options.where && options.where.id && typeof options.where.id == 'string') {
-            options.where.id = ____0.toInt(options.where.id);
+            options.where.id = ____0.toInt(options.where.id) || options.where.id;
           }
 
           ____0.mongodb.updateMany(
@@ -481,8 +481,8 @@ module.exports = function init(____0, options, db) {
             options = $options;
           }
 
-          if (options.where && options.where.id) {
-            options.where.id = ____0.toInt(options.where.id);
+          if (options.where && options.where.id && typeof options.where.id === 'string') {
+            options.where.id = ____0.toInt(options.where.id) || options.where.id;
           }
 
           ____0.mongodb.deleteMany(

package/lib/dashboard.js

@@ -181,7 +181,7 @@ module.exports = function init(____0) {
   });
 
   ____0.post('/x-dashboard-Language/Change', function (req, res) {
-    let name = req.body.name || 'ar';
+    let name = req.body.name || 'Ar';
     req.session.language = req.body;
     req.session.lang = req.session.language.id || name;
     req.session.$save();

package/lib/logs.js

@@ -3,18 +3,22 @@ module.exports = function init(____0) {
   logs.list = [];
   logs.$collectoin = ____0.connectCollection('app_options');
 
-  logs.$collectoin.findAll({app_name : 'logs'}, (err, docs) => {
-    if (!err && docs && docs.length > 0) {
-      logs.list = docs;
-    }
-  });
+  logs.$collectoin.findAll(
+    { app_name: 'logs' },
+    (err, docs) => {
+      if (!err && docs && docs.length > 0) {
+        logs.list = docs;
+      }
+    },
+    true
+  );
 
   logs.save = function () {
     logs.list.forEach((doc) => {
       if (doc.id) {
         logs.$collectoin.update(doc);
       } else {
-        doc.app_name = 'logs'
+        doc.app_name = 'logs';
         logs.$collectoin.add(doc, (err, newDoc) => {
           if (!err && newDoc) {
             doc = newDoc;
@@ -51,7 +55,6 @@ module.exports = function init(____0) {
   };
 
   ____0.on(____0.strings[9], () => {
-
     ____0.get('/x-api/logs/:key/:value', (req, res) => {
       if (req.params.value == 'true') {
         req.params.value = !0;
@@ -105,13 +108,12 @@ module.exports = function init(____0) {
             } else {
               logs.$collectoin.add(req.data);
             }
-          },
+          }
         );
       } else {
         logs.$collectoin.add(req.data);
       }
     });
-    
   });
 
   return logs;

package/lib/mongodb.js

@@ -71,20 +71,22 @@ module.exports = function init(____0) {
       }
 
       for (let key in doc) {
-        if (key === '_id' && typeof doc[key] === 'string') {
-          doc[key] = _mongo.ObjectID(doc[key]);
+        if (key === '_id') {
+          if (typeof doc[key] === 'string') {
+            doc[key] = _mongo.ObjectID(doc[key]);
+          }
         } else if (typeof key === 'string' && $badLetter && key.indexOf($badLetter) === 0) {
           delete doc[key];
-        } else if (typeof doc[key] === 'string' && ____0.fn.isDate(doc[key])) {
-          doc[key] = ____0.getDateTime(doc[key]);
         } else if (Array.isArray(doc[key])) {
           doc[key].forEach((v, i) => {
             if (v && typeof v === 'object') {
               doc[key][i] = _mongo.handleDoc(v, $badLetter);
             }
           });
-        } else if (typeof doc[key] === 'object' && doc[key] && key !== '_id') {
+        } else if (typeof doc[key] === 'object' && doc[key]) {
           doc[key] = _mongo.handleDoc(doc[key], $badLetter);
+        } else if (typeof doc[key] === 'string' && ____0.fn.isDate(doc[key])) {
+          doc[key] = ____0.getDateTime(doc[key]);
         }
       }
     }
@@ -366,9 +368,6 @@ module.exports = function init(____0) {
           .findOne(obj.where, options)
           .then((doc) => {
             let err = null;
-            if (!doc) {
-              err = { message: 'Not Exists : ' + JSON.stringify(obj.where) };
-            }
             callback(err, doc);
           })
           .catch((err) => {
@@ -480,15 +479,13 @@ module.exports = function init(____0) {
         collection
           .updateOne(obj.where, $update)
           .then((result) => {
-            callback(null, {
-              ...result,
-              doc: $update.$set,
-              old_doc: {},
-              where: obj.where,
-              update: $update,
-              db: obj.dbName,
-              collection: obj.collectionName,
-            });
+            result.doc = $update.$set;
+            result.old_doc = {};
+            result.where = obj.where;
+            result.update = $update;
+            result.db = obj.dbName;
+            result.collection = obj.collectionName;
+            callback(null, result);
           })
           .catch((err) => {
             callback(err);
@@ -518,14 +515,12 @@ module.exports = function init(____0) {
         collection
           .updateMany(obj.where, $update)
           .then((result) => {
-            callback(null, {
-              ...result,
-              exists: result.result?.n,
-              count: result.result?.nModified,
-              ok: result.result?.ok,
-              where: obj.where,
-              update: $update,
-            });
+            result.exists = result.result?.n;
+            result.count = result.result?.nModified;
+            result.ok = result.result?.ok;
+            result.where = obj.where;
+            result.update = $update;
+            callback(null, result);
           })
           .catch((err) => {
             callback(err);
@@ -545,13 +540,11 @@ module.exports = function init(____0) {
         collection
           .deleteOne(obj.where)
           .then((result) => {
-            callback(null, {
-              ...result,
-              db: obj.dbName,
-              collection: obj.collectionName,
-              count: result.deletedCount,
-              doc: obj.where,
-            });
+            result.db = obj.dbName;
+            result.collection = obj.collectionName;
+            result.count = result.deletedCount;
+            result.doc = obj.where;
+            callback(null, result);
           })
           .catch((err) => {
             callback(err);
@@ -588,12 +581,10 @@ module.exports = function init(____0) {
         collection
           .deleteMany(obj.where)
           .then((result) => {
-            callback(null, {
-              ...result,
-              db: obj.dbName,
-              collection: obj.collectionName,
-              count: result.deletedCount,
-            });
+            result.db = obj.dbName;
+            result.collection = obj.collectionName;
+            result.count = result.deletedCount;
+            callback(null, result);
           })
           .catch((err) => {
             callback(err);

package/lib/routing.js

@@ -595,7 +595,6 @@ module.exports = function init(____0) {
   };
 
   _0xrrxo.handleRoute = async function (req, res, route) {
-
     if (route.lang) {
       req.session.language = { id: route.lang };
     }
@@ -940,7 +939,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', '-host=' + req.host + ' -port=' + ____0.options.port + ' -index=' + ____0.sharedList.length+ ' -count=' + req.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);
       }
       ____0.fsm.getContent(filePath, (content) => {
@@ -954,7 +953,7 @@ module.exports = function init(____0) {
 
         req.content = content;
         req.data = { ...req.data, ..._data };
-         let route = { ...req.route, ...options };
+        let route = { ...req.route, ...options };
 
         if (route.encript == '123') {
           req.content = ____0.f1(req.content);
@@ -1233,7 +1232,6 @@ 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;
       }
@@ -1261,8 +1259,8 @@ module.exports = function init(____0) {
       req.session = {
         $save: () => {},
         accessToken: 'SHARED',
-        language: ____0.options.language || { id: 'en', dir: 'ltr' },
-        lang: ____0.options.language?.id || ____0.options.lang || 'en',
+        language: ____0.options.language || { id: 'En', dir: 'ltr', text: 'left' },
+        lang: ____0.options.language?.id || ____0.options.lang || 'En',
       };
 
       req.query = req.urlParser.query;

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

@@ -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) {
@@ -89,6 +87,14 @@ module.exports = function init(____0) {
 
     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;
+      return callback(session);
+    }
+
     if (session.accessToken) {
       let index = sessions.list.findIndex((s) => s && s.accessToken && s.accessToken === session.accessToken);
       if (index !== -1) {
@@ -111,7 +117,7 @@ module.exports = function init(____0) {
 
                 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 +128,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

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.10.03",
+  "version": "2024.12.02",
   "description": "Create High Level Multi-Language Web Site [Fast and Easy] ",
   "main": "index.js",
   "repository": {