isite 2022.9.17 → 2022.9.19

package/lib/mongodb.js

@@ -51,14 +51,14 @@ module.exports = function init(____0) {
     }, 1000);
   });
 
-  _mongo.handleDoc = function (doc) {
+  _mongo.handleDoc = function (doc, isProperty = false) {
     if (!doc) {
       return doc;
     }
 
-    if (typeof doc === 'array') {
+    if (Array.isArray(doc)) {
       doc.forEach((v, i) => {
-        doc[i] = _mongo.handleDoc(v);
+        doc[i] = _mongo.handleDoc(v, true);
       });
       return doc;
     } else if (typeof doc === 'object') {
@@ -67,17 +67,17 @@ module.exports = function init(____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') {
+        } else if (Array.isArray(doc[key])) {
           doc[key].forEach((v, i) => {
-            doc[key][i] = _mongo.handleDoc(v);
+            doc[key][i] = _mongo.handleDoc(v, true);
           });
+        } else if (typeof doc[key] === 'object') {
+          doc[key] = _mongo.handleDoc(doc[key], true);
         }
       }
     }
 
-    return doc;
+    return isProperty ? doc : { ...doc };
   };
 
   _mongo.connectDBBusy = !1;
@@ -476,7 +476,6 @@ module.exports = function init(____0) {
         if (obj.rename) {
           $update.$rename = obj.rename;
         }
-
         _mongo.findOne(
           {
             dbName: obj.dbName,

package/lib/parser.js

@@ -32,9 +32,17 @@ module.exports = function init(req, res, ____0, route) {
   }
 
   function renderData(d) {
-    let out = null;
+    if (!d) {
+      return '';
+    }
+    let hide = false;
+    let out = '';
+    if (d.indexOf('#') == 0) {
+      d = d.replace('#', '');
+      hide = true;
+    }
 
-    if (d && d == '*') {
+    if (d == '*') {
       out = JSON.stringify(req.data);
     } else if (d) {
       v = d.split('.');
@@ -63,9 +71,15 @@ module.exports = function init(req, res, ____0, route) {
         out = out[v[5]];
       }
     }
-    if (out && typeof out == 'object') {
-      out = JSON.stringify(out);
+
+    if (hide) {
+      out = ____0.hide(out);
+    } else {
+      if (typeof out === 'object') {
+        out = ____0.toJson(out);
+      }
     }
+
     return out || renderWord(d);
   }
 
@@ -180,6 +194,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 +261,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 +297,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 +364,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/security.js

@@ -743,7 +743,6 @@ module.exports = function init(____0) {
       });
       return;
     }
-
     ____0.$users.update(
       {
         where: where,
@@ -753,16 +752,11 @@ module.exports = function init(____0) {
       },
       function (err, result) {
         callback(err, result);
-        if (result.doc) {
-          for (let i = 0; i < security.users.length; i++) {
-            let element = security.users[i];
-            if (element.id == result.doc.id) {
-              element = Object.assign(element, security.handleUser(result.doc));
-              security.users[i] = element;
-            }
+        if (!err && result && result.doc) {
+          let index = security.users.findIndex((u) => u.id == result.doc.id);
+          if (index >= 0) {
+            security.users[index] = { ...security.users[index], ...result.doc };
           }
-          ____0.call('user update', result);
-          ____0.call('[session][user][update]', result.doc);
         }
       }
     );

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'] || 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,169 @@ 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) {
+          if (!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);
     }
+  });
 };