isite 2022.9.16 → 2022.9.18

package/lib/mongodb.js

@@ -52,31 +52,28 @@ module.exports = function init(____0) {
   });
 
   _mongo.handleDoc = function (doc) {
+    
     if (!doc) {
       return doc;
     }
 
-    if (typeof doc === 'object') {
+    if (typeof doc === 'array') {
+      doc.forEach((v, i) => {
+        doc[i] = _mongo.handleDoc(v);
+      });
+      return doc;
+    } else if (typeof doc === 'object') {
       for (let key in doc) {
-        let val = doc[key];
-
-        if (typeof key === 'string') {
-          if (key.startsWith('$')) {
-            delete doc[key];
-            continue;
-          }
-        }
-
-        if (typeof val === 'object') {
-          val = _mongo.handleDoc(val);
-        } else if (typeof val === 'array') {
-          val.forEach((v) => {
-            v = _mongo.handleDoc(v);
+        if (typeof key === 'string' && key.indexOf('$') === 0) {
+          delete doc[key];
+        } else if (typeof doc[key] === 'string' && ____0.fn.isDate(doc[key])) {
+          doc[key] = new Date(doc[key]);
+        } else if (typeof doc[key] === 'object') {
+          doc[key] = _mongo.handleDoc(doc[key]);
+        } else if (typeof doc[key] === 'array') {
+          doc[key].forEach((v, i) => {
+            doc[key][i] = _mongo.handleDoc(v);
           });
-        } else if (typeof val === 'string') {
-          if (____0.fn.isDate(val)) {
-            doc[key] = new Date(val);
-          }
         }
       }
     }
@@ -305,7 +302,6 @@ module.exports = function init(____0) {
         db.collection(____0.options.mongodb.prefix.collection + obj.collectionName).insertMany(obj.docs, obj.options, function (err, result) {
           if (!err) {
             callback(null, obj.docs, result);
-            console.log(' Sessions Saved : ' + obj.docs.length);
             if (____0.options.mongodb.events) {
               ____0.call('mongodb after insert many', {
                 db: obj.dbName,
@@ -314,12 +310,12 @@ module.exports = function init(____0) {
               });
             }
           } else {
-            console.error(' Sessions Not Saved ', err.message);
+            console.error(' _mongo.insertMany() ', err.message);
             callback(err, obj.docs, result);
           }
         });
       } else {
-        console.error(' Sessions Not Saved ', err.message);
+        console.error(' _mongo.insertMany() ', err.message);
         callback(err);
       }
     });

package/lib/parser.js

@@ -180,6 +180,13 @@ module.exports = function init(req, res, ____0, route) {
     return out;
   }
 
+  function renderSetting(v) {
+    if (v && v == '*') {
+      return JSON.stringify(____0.setting);
+    } else {
+      return render_site('setting.' + v);
+    }
+  }
   function render_req(v) {
     if (!v) {
       return '';
@@ -240,7 +247,7 @@ module.exports = function init(req, res, ____0, route) {
         ip: req.session.ip,
         requestesCount: req.session.requestesCount,
         busy: req.session.$busy,
-        ip_info: req.session.ip_info,
+        ipLookup: req.session.ip_list.find((info) => info.ip == req.session.ip),
       });
     }
     if (v == 'lang') {
@@ -276,13 +283,6 @@ module.exports = function init(req, res, ____0, route) {
     }
   }
 
-  function renderSetting(v) {
-    if (v && v == '*') {
-      return JSON.stringify(____0.setting.list);
-    }
-    return ____0.setting.get(v).value;
-  }
-
   function getContent(name) {
     let path = null;
 
@@ -350,7 +350,7 @@ module.exports = function init(req, res, ____0, route) {
 
   function renderHtml($, log) {
     $('[x-setting]').each(function (i, elem) {
-      if (!____0.setting.get($(this).attr('x-setting')).value) {
+      if (____0.setting[$(this).attr('x-setting')] !== true) {
         $(this).remove();
       }
     });

package/lib/routing.js

@@ -595,7 +595,6 @@ module.exports = function init(____0) {
           }
         });
         if (!ok) {
-         
           if (route.name.contains(____0.strings[16])) {
             res.status(401);
             return res.json({
@@ -935,6 +934,11 @@ module.exports = function init(____0) {
           if (____0.options.cache.enabled && req.route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.images);
           }
+        } else if (name.endsWith('.webp')) {
+          res.set(____0.strings[7], 'image/webp');
+          if (____0.options.cache.enabled && req.route.cache) {
+            res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.images);
+          }
         }
         res.end(req.content, ____0.getFileEncode(name));
       });
@@ -1196,6 +1200,11 @@ module.exports = function init(____0) {
   _0xrrxo.start = function (_ports, callback) {
     ____0.startTime = Date.now();
 
+    ____0.https.globalAgent.options = {
+      key: ____0.fs.readFileSync( ____0.options.https.key ||  __dirname + '/../ssl/key.pem'),
+      cert: ____0.fs.readFileSync(____0.options.https.cert || __dirname + '/../ssl/cert.pem'),
+    };
+
     const ports = [];
 
     if (_ports && ____0.typeof(_ports) !== 'Array') {
@@ -1230,14 +1239,9 @@ module.exports = function init(____0) {
     });
 
     if (____0.options.https.enabled) {
-      const https_options = {
-        key: ____0.fs.readFileSync(____0.options.https.key || __dirname + '/../ssl/key.pem'),
-        cert: ____0.fs.readFileSync(____0.options.https.cert || __dirname + '/../ssl/cert.pem'),
-      };
-
       ____0.options.https.ports.forEach((p, i) => {
         let index = ____0.servers.length;
-        ____0.servers[index] = ____0.https.createServer(https_options, _0xrrxo.handleServer);
+        ____0.servers[index] = ____0.https.createServer(_0xrrxo.handleServer);
         ____0.servers[index].listen(p, function () {
           ____0.log('');
           ____0.log('-----------------------------------------');

package/lib/session.js

@@ -1,11 +1,10 @@
 module.exports = function init(req, res, ____0, callback) {
-    let session = ____0.getSession({ accessToken: req.cookie('access_token') || req.headers['access-token'] });
-
+  ____0.getSession({ accessToken: req.cookie('access_token') || req.headers['Access-Token'] || req.headers['access-token'] }, (session) => {
     if (!session.accessToken) {
-        session.accessToken = new Date().getTime().toString() + '_' + Math.random() * (10000 - 1000) + 1000;
-        session.accessToken = ____0.x0md50x(session.accessToken);
-        res.cookie('access_token', session.accessToken);
-        res.set('Access-Token', session.accessToken);
+      session.accessToken = new Date().getTime().toString() + '_' + Math.random() * (10000 - 1000) + 1000;
+      session.accessToken = ____0.x0md50x(session.accessToken);
+      res.cookie('access_token', session.accessToken);
+      res.set('Access-Token', session.accessToken);
     }
 
     session.ip = req.ip;
@@ -13,155 +12,167 @@ module.exports = function init(req, res, ____0, callback) {
     ____0.saveSession(session);
 
     function AssignFeatures() {
-        ____0.options.defaults.features.forEach((f) => {
-            req.features.push(f);
-        });
-        ____0.features.forEach((f) => {
-            req.features.push(f.name);
+      ____0.options.defaults.features.forEach((f) => {
+        req.features.push(f);
+      });
+      ____0.features.forEach((f) => {
+        req.features.push(f.name);
+      });
+      if (____0.options.dynamic) {
+        req.features.push('site.dynamic');
+      }
+      req.features.push('ip.' + req.ip);
+
+      if (req.headers['host']) {
+        req.features.push('host.' + req.headers['host']);
+        req.headers['host'].split('.').forEach((h) => {
+          req.features.push('host.' + h);
         });
-        if (____0.options.dynamic) {
-            req.features.push('site.dynamic');
-        }
-        req.features.push('ip.' + req.ip);
+      }
 
-        if (req.headers['host']) {
-            req.features.push('host.' + req.headers['host']);
-            req.headers['host'].split('.').forEach((h) => {
-                req.features.push('host.' + h);
-            });
-        }
+      if (req.cookies.obj && req.cookies.obj['_ga'] && req.cookies.obj['_ga'].contains('sb')) {
+        req.features.push('browser.social');
+        req.features.push('browser.social.app');
+      }
+      if (req.cookies.obj && req.cookies.obj['_gab'] && req.cookies.obj['_gab'].contains('sb')) {
+        req.features.push('browser.social');
+        req.features.push('browser.social.app');
+      }
+      if (req.headers['x-browser'] && req.headers['x-browser'].contains('social-browser')) {
+        req.features.push('browser.social');
+        req.features.push('browser.social.app');
+      }
 
-        if (req.cookies.obj && req.cookies.obj['_ga'] && req.cookies.obj['_ga'].contains('sb')) {
-            req.features.push('browser.social');
-            req.features.push('browser.social.app');
-        }
-        if (req.cookies.obj && req.cookies.obj['_gab'] && req.cookies.obj['_gab'].contains('sb')) {
-            req.features.push('browser.social');
-            req.features.push('browser.social.app');
+      if (req.headers['user-agent']) {
+        req.userAgent = req.headers['user-agent'].toLowerCase();
+        req.features.push('user-agent.' + req.userAgent);
+        if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(req.userAgent)) {
+          req.features.push('os.mobile');
+        } else {
+          req.features.push('os.desktop');
         }
-        if (req.headers['x-browser'] && req.headers['x-browser'].contains('social-browser')) {
-            req.features.push('browser.social');
-            req.features.push('browser.social.app');
-        }
-
-        if (req.headers['user-agent']) {
-            req.userAgent = req.headers['user-agent'].toLowerCase();
-            req.features.push('user-agent.' + req.userAgent);
-            if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(req.userAgent)) {
-                req.features.push('os.mobile');
-            } else {
-                req.features.push('os.desktop');
-            }
 
-            if (req.userAgent.contains('windows')) {
-                req.features.push('os.windows');
-                if (req.userAgent.contains('windows nt 5.1')) {
-                    req.features.push('os.windowsxp');
-                } else if (req.userAgent.contains('windows nt 6.1')) {
-                    req.features.push('os.windows7');
-                } else if (req.userAgent.contains('windows nt 6.2') || req.userAgent.contains('windows nt 6.3')) {
-                    req.features.push('os.windows8');
-                } else if (req.userAgent.contains('windows nt 6.4') || req.userAgent.contains('windows nt 10')) {
-                    req.features.push('os.windows10');
-                } else {
-                }
-            } else if (req.userAgent.contains('linux')) {
-                req.features.push('os.linux');
-            } else if (req.userAgent.contains('macintosh')) {
-                req.features.push('os.mac');
-            } else if (req.userAgent.contains('android')) {
-                req.features.push('os.android');
-            } else {
-                req.features.push('os.unknown');
-            }
+        if (req.userAgent.contains('windows')) {
+          req.features.push('os.windows');
+          if (req.userAgent.contains('windows nt 5.1')) {
+            req.features.push('os.windowsxp');
+          } else if (req.userAgent.contains('windows nt 6.1')) {
+            req.features.push('os.windows7');
+          } else if (req.userAgent.contains('windows nt 6.2') || req.userAgent.contains('windows nt 6.3')) {
+            req.features.push('os.windows8');
+          } else if (req.userAgent.contains('windows nt 6.4') || req.userAgent.contains('windows nt 10')) {
+            req.features.push('os.windows10');
+          } else {
+          }
+        } else if (req.userAgent.contains('linux')) {
+          req.features.push('os.linux');
+        } else if (req.userAgent.contains('macintosh')) {
+          req.features.push('os.mac');
+        } else if (req.userAgent.contains('android')) {
+          req.features.push('os.android');
+        } else {
+          req.features.push('os.unknown');
+        }
 
-            if (req.userAgent.contains('edge')) {
-                req.features.push('browser.edge');
-            } else if (req.userAgent.contains('firefox')) {
-                req.features.push('browser.firefox');
-            } else if (req.userAgent.contains('opr')) {
-                req.features.push('browser.opera');
-            } else if (req.userAgent.contains('ucbrowser')) {
-                req.features.push('browser.ucbrowser');
-            } else if (req.userAgent.contains('bdbrowser') || req.userAgent.contains('baidu') || req.userAgent.contains('baidubrowser')) {
-                req.features.push('browser.baidu');
-            } else if (req.userAgent.contains('chromium')) {
-                req.features.push('browser.chromium');
-            } else if (req.userAgent.contains('chrome')) {
-                req.features.push('browser.chrome');
-            } else {
-                req.features.push('browser.unknown');
-            }
+        if (req.userAgent.contains('edge')) {
+          req.features.push('browser.edge');
+        } else if (req.userAgent.contains('firefox')) {
+          req.features.push('browser.firefox');
+        } else if (req.userAgent.contains('opr')) {
+          req.features.push('browser.opera');
+        } else if (req.userAgent.contains('ucbrowser')) {
+          req.features.push('browser.ucbrowser');
+        } else if (req.userAgent.contains('bdbrowser') || req.userAgent.contains('baidu') || req.userAgent.contains('baidubrowser')) {
+          req.features.push('browser.baidu');
+        } else if (req.userAgent.contains('chromium')) {
+          req.features.push('browser.chromium');
+        } else if (req.userAgent.contains('chrome')) {
+          req.features.push('browser.chrome');
+        } else {
+          req.features.push('browser.unknown');
         }
+      }
     }
 
     function ipInfo(session, callback) {
-        callback(session);
+      callback(session);
 
-        if (!____0.options.ip_info) {
-            return session;
-        }
+      if (!____0.options.ipLookup) {
+        return session;
+      }
 
-        if (session.$busy) {
-            return session;
-        }
+      if (session.ip == '127.0.0.1' || session.ip == 'localhost') {
+        return session;
+      }
+
+      if (session.$busy) {
+        return session;
+      }
 
-        session.$busy = !0;
-        ____0.saveSession(session);
-        if (!session.ip_info || session.ip_info.status != 'success' || session.ip_info.id != session.ip) {
-            // session.ip = session.ip == "localhost" ? "45.22.11.33" : session.ip
-            ____0
-                .fetch(`http://ip-api.com/json/${session.ip}`, {
-                    method: 'get',
-                    headers: { 'Content-Type': 'application/json' },
-                })
-                .then((res) => {
-                    if (res.status == 200) {
-                        return res.json();
-                    } else {
-                    }
-                })
-                .then((info) => {
-                    session = ____0.getSession(session);
-                    info.date = new Date();
-                    session['ip_' + session.ip] = info;
-                    session.ip_info = info;
-                    ____0.saveSession(session);
-                    setTimeout(() => {
-                        session = ____0.getSession(session);
-                        session.$busy = !1;
-                        ____0.saveSession(session);
-                    }, 1000 * 30);
-                })
-                .catch((err) => {
-                    setTimeout(() => {
-                        session = ____0.getSession(session);
-                        session.$busy = !1;
-                        ____0.saveSession(session);
-                    }, 1000 * 30);
+      session.$busy = !0;
+      ____0.saveSession(session);
+      if (session.ip_list.length === 0 || !session.ip_list.some((info) => info.ip === session.ip)) {
+        ____0
+          .fetch(`http://ip-api.com/json/${session.ip}`, {
+            method: 'get',
+            headers: { 'Content-Type': 'application/json' },
+          })
+          .then((res) => {
+            if (res.status == 200) {
+              return res.json();
+            } else {
+            }
+          })
+          .then((info) => {
+            ____0.getSession(session, (session) => {
+              info.date = new Date();
+              info.ip = session.ip;
+              session.ip_list.unshift(info);
+              ____0.saveSession(session);
+              setTimeout(() => {
+                ____0.getSession(session, (session) => {
+                  session.$busy = !1;
+                  ____0.saveSession(session);
                 });
-        }
+              }, 1000 * 30);
+            });
+          })
+          .catch((err) => {
+            setTimeout(() => {
+              ____0.getSession(session, (session) => {
+                session.$busy = !1;
+                ____0.saveSession(session);
+              });
+            }, 1000 * 30);
+          });
+      } else {
+        ____0.getSession(session, (session) => {
+          session.$busy = !1;
+          ____0.saveSession(session);
+        });
+      }
     }
 
     AssignFeatures();
 
     if (____0.security && session.user_id) {
-        ____0.security.getUser(
-            {
-                id: session.user_id,
-            },
-            function (err, user) {
-                session.user = user;
-                if (session.user) {
-                    if (!session.user.permissions) {
-                        session.user.permissions = [];
-                    }
-                    req.features.push('login');
-                }
-                ipInfo(session, callback);
-            },
-        );
+      ____0.security.getUser(
+        {
+          id: session.user_id,
+        },
+        function (err, user) {
+          session.user = user;
+          if (session.user) {
+            if (!session.user.permissions) {
+              session.user.permissions = [];
+            }
+            req.features.push('login');
+          }
+          ipInfo(session, callback);
+        }
+      );
     } else {
-        ipInfo(session, callback);
+      ipInfo(session, callback);
     }
+  });
 };

package/lib/sessions.js

@@ -48,20 +48,42 @@ module.exports = function init(____0) {
       return;
     }
 
-    sessions.list.forEach((s, i) => {
-      let online = new Date().getTime() - s.createdTime;
-      let timeout = 1000 * 60 * ____0.options.session.timeout;
-      if (online > timeout) {
-        sessions.list.splice(i, 1);
-      }
-    });
     if (____0.options.session.storage === 'mongodb') {
-      sessions.$collection.deleteAll({}, (err, docs) => {
-        sessions.$collection.insertAll(sessions.list, (err, docs) => {
-          callback(err, docs);
-        });
+      sessions.list.forEach((s, i) => {
+        if (!s) {
+          return false;
+        }
+        if (new Date().getTime() - s.createdTime > 1000 * 60 * ____0.options.session.timeout) {
+          sessions.list.splice(i, 1);
+          sessions.$collection.delete(s);
+        } else {
+          if (s.id) {
+            sessions.$collection.update(s, (err, result) => {
+              if (!err && result) {
+                sessions.list[i] = result.doc;
+              }
+            });
+          } else {
+            sessions.$collection.insert(s, (err, doc) => {
+              if (!err && doc) {
+                sessions.list[i] = doc;
+              }
+            });
+          }
+        }
       });
     } else {
+      sessions.list.forEach((s, i) => {
+        if (!s) {
+          return false;
+        }
+        let online = new Date().getTime() - s.createdTime;
+        let timeout = 1000 * 60 * ____0.options.session.timeout;
+        if (online > timeout) {
+          sessions.list.splice(i, 1);
+        }
+      });
+
       ____0.writeFile(sessions.path, JSON.stringify(sessions.list), () => {
         callback(null, sessions.list);
         console.log(' ... sessions Saved to ...' + sessions.path);
@@ -71,35 +93,68 @@ module.exports = function init(____0) {
     return;
   };
 
-  sessions.loadAll();
-
   ____0.getSession = sessions.attach = function (session, callback) {
     callback = callback || function () {};
     session.$exists = !1;
 
     if (session.accessToken) {
       sessions.list.forEach((s, i) => {
-        if (s.accessToken && s.accessToken == session.accessToken) {
+        if (s && s.accessToken && s.accessToken == session.accessToken) {
           session.$exists = !0;
           session.$index = i;
+          sessions.list[session.$index].requestesCount++;
         }
       });
-    }
-
-    if (!session.$exists) {
+      if (!session.$exists) {
+        if (____0.options.session.storage === 'mongodb') {
+          sessions.$collection.find({ accessToken: session.accessToken }, (err, doc) => {
+            if (!err && doc) {
+              session.$exists = !0;
+              session = { ...session, ...doc };
+              session.requestesCount++;
+              session.$index = sessions.list.length;
+              sessions.list.push(session);
+              callback(sessions.list[session.$index]);
+            } else {
+              session.$new = !0;
+              session.lang = ____0.options.lang;
+              session.theme = ____0.options.theme;
+              session.data = [];
+              session.ip_list = [];
+              session.requestesCount = 1;
+              session.createdTime = new Date().getTime();
+              session.$index = sessions.list.length;
+              sessions.list.push(session);
+              callback(sessions.list[session.$index]);
+            }
+          });
+        } else {
+          session.$new = !0;
+          session.lang = ____0.options.lang;
+          session.theme = ____0.options.theme;
+          session.data = [];
+          session.ip_list = session.ip_list || [];
+          session.requestesCount = 1;
+          session.createdTime = new Date().getTime();
+          session.$index = sessions.list.length;
+          sessions.list.push(session);
+          callback(sessions.list[session.$index]);
+        }
+      } else {
+        callback(sessions.list[session.$index]);
+      }
+    } else {
       session.$new = !0;
       session.lang = ____0.options.lang;
       session.theme = ____0.options.theme;
       session.data = [];
-      session.ip_info = session.ip_info || {};
+      session.ip_list = session.ip_list || [];
       session.requestesCount = 1;
       session.createdTime = new Date().getTime();
       session.$index = sessions.list.length;
       sessions.list.push(session);
+      callback(sessions.list[session.$index]);
     }
-
-    callback(sessions.list[session.$index]);
-    return sessions.list[session.$index];
   };
 
   ____0.saveSession = sessions.save = function (session, callback) {
@@ -115,7 +170,7 @@ module.exports = function init(____0) {
         if (session.$exists) {
           return;
         }
-        if (s.accessToken == session.accessToken) {
+        if (s && s.accessToken == session.accessToken) {
           sessions.list[i] = { ...sessions.list[i], ...session };
           session.$exists = !0;
           session.$index = i;
@@ -153,15 +208,15 @@ module.exports = function init(____0) {
   });
   ____0.on('[session][delete]', (session) => {
     sessions.list.forEach((s, i) => {
-      if (s.accessToken == session.accessToken) {
+      if (s && s.accessToken == session.accessToken) {
         sessions.list.splice(i, 1);
       }
     });
   });
   ____0.on('[session][user][update]', (user) => {
-    sessions.list.forEach((s) => {
-      if (s.user && s.user.id == user.id) {
-        s.user = user;
+    sessions.list.forEach((s, i) => {
+      if (s && s.user && s.user.id == user.id) {
+        sessions.list[i].user = user;
       }
     });
   });
@@ -179,6 +234,13 @@ module.exports = function init(____0) {
     });
   });
 
+  ____0.onPOST('x-api/session', (req, res) => {
+    res.json({
+      done: !0,
+      session: req.session,
+    });
+  });
+
   ____0.onPOST('x-api/sessions', (req, res) => {
     res.json({
       done: !0,
@@ -203,5 +265,8 @@ module.exports = function init(____0) {
     });
   });
 
+  if (!____0.options.session.storage === 'mongodb') {
+    sessions.loadAll();
+  }
   return sessions;
 };