isite 2022.9.23 → 2022.9.25

package/lib/mongodb.js

@@ -249,12 +249,6 @@ module.exports = function init(____0) {
           obj.collectionName = ____0.options.mongodb.collection;
         }
 
-        let $req = obj.doc.$req;
-        let $res = obj.doc.$res;
-
-        delete obj.doc.$req;
-        delete obj.doc.$res;
-
         obj.doc = _mongo.handleDoc(obj.doc);
 
         db.collection(____0.options.mongodb.prefix.collection + obj.collectionName).insertOne(obj.doc, function (err, result) {
@@ -265,8 +259,6 @@ module.exports = function init(____0) {
                 db: obj.dbName,
                 collection: obj.collectionName,
                 doc: result,
-                $req: $req,
-                $res: $res,
               });
             }
           } else {
@@ -452,12 +444,6 @@ module.exports = function init(____0) {
           obj.collectionName = ____0.options.mongodb.collection;
         }
 
-        let $req = obj.$req;
-        let $res = obj.$res;
-
-        delete obj.$req;
-        delete obj.$res;
-
         if (obj.where && obj.where._id && typeof obj.where._id === 'string') {
           obj.where._id = _mongo.ObjectID(obj.where._id);
         }
@@ -496,8 +482,6 @@ module.exports = function init(____0) {
                       callback(
                         null,
                         {
-                          $req: $req,
-                          $res: $res,
                           doc: doc2,
                           old_doc: doc,
                           where: obj.where,
@@ -515,9 +499,6 @@ module.exports = function init(____0) {
                           old_doc: doc,
                           where: obj.where,
                           update: $update,
-
-                          $req: $req,
-                          $res: $res,
                         });
                       }
                     }
@@ -544,12 +525,6 @@ module.exports = function init(____0) {
           obj.collectionName = ____0.options.mongodb.collection;
         }
 
-        let $req = obj.$req;
-        let $res = obj.$res;
-
-        delete obj.$req;
-        delete obj.$res;
-
         let $update = {};
         if (obj.set) {
           $update.$set = obj.set;
@@ -582,8 +557,6 @@ module.exports = function init(____0) {
                 ok: result.result.ok,
                 where: obj.where,
                 update: $update,
-                $req: req,
-                $res: res,
               });
             }
           } else {
@@ -602,12 +575,7 @@ module.exports = function init(____0) {
         if (obj.collectionName === undefined) {
           obj.collectionName = ____0.options.mongodb.collection;
         }
-
-        let $req = obj.where.$req;
-        let $res = obj.where.$res;
-
-        delete obj.where.$req;
-        delete obj.where.$res;
+        
 
         _mongo.findOne(
           {
@@ -623,8 +591,6 @@ module.exports = function init(____0) {
                   callback(
                     null,
                     {
-                      $req: $req,
-                      $res: $res,
                       db: obj.dbName,
                       collection: obj.collectionName,
                       count: result.deletedCount,
@@ -637,8 +603,6 @@ module.exports = function init(____0) {
                       db: obj.dbName,
                       collection: obj.collectionName,
                       doc: doc,
-                      $req: $req,
-                      $res: $res,
                     });
                   }
                 } else {
@@ -647,7 +611,7 @@ module.exports = function init(____0) {
               });
             } else {
               callback({
-                message: 'Not Exists',
+                message: 'Not Exists : ' + JSON.stringify(obj.where),
               });
             }
           }
@@ -669,8 +633,7 @@ module.exports = function init(____0) {
         {
           db: obj.dbName,
           collection: obj.collectionName,
-          $req: $req,
-          $res: $res,
+
           count: 0,
           ok: 0,
           exists: 0,
@@ -679,11 +642,6 @@ module.exports = function init(____0) {
       );
       return;
     }
-    let $req = obj.where.$req;
-    let $res = obj.where.$res;
-
-    delete obj.where.$req;
-    delete obj.where.$res;
 
     _mongo.connectDB(obj.dbName, function (err, db) {
       if (!err) {
@@ -697,8 +655,7 @@ module.exports = function init(____0) {
               {
                 db: obj.dbName,
                 collection: obj.collectionName,
-                $req: $req,
-                $res: $res,
+
                 count: result.deletedCount,
               },
               result
@@ -707,8 +664,7 @@ module.exports = function init(____0) {
               ____0.call('mongodb after delete many', {
                 db: obj.dbName,
                 collection: obj.collectionName,
-                $req: $req,
-                $res: $res,
+
                 where: obj.where,
                 count: result.deletedCount,
               });

package/lib/parser.js

@@ -80,7 +80,7 @@ module.exports = function init(req, res, ____0, route) {
       }
     }
 
-    return out || renderWord(d);
+    return out || '';
   }
 
   function renderUser(v) {
@@ -345,7 +345,7 @@ module.exports = function init(req, res, ____0, route) {
       return txt;
     } else if (name.endsWith('.html')) {
       let txt = ____0.readFileSync(path);
-      let $ = ____0.$.load(txt);
+      let $ = ____0.$.load(txt, null, false);
       $ = renderHtml($);
       return $.html();
     } else if (name.endsWith('.js')) {
@@ -362,6 +362,100 @@ module.exports = function init(req, res, ____0, route) {
     }
   }
 
+  function handleXList1($, el, data) {
+    let property = $(el).attr('x-list1').split('.');
+    $(el).removeAttr('x-list1');
+    let list = null;
+    let html2 = '';
+    if (property.length > 0) {
+      if (property[0] == '*') {
+        list = data;
+      } else {
+        list = data[property[0]];
+      }
+    }
+    if (list && property.length > 1) {
+      list = list[property[1]];
+    }
+    if (Array.isArray(list)) {
+      let matches = $.html(el).match(/##item1.*?##/g);
+      list.forEach((item, i) => {
+        $(el).attr('x-item1', i);
+        let _html = $.html(el);
+        if (matches) {
+          for (let i = 0; i < matches.length; i++) {
+            let p = matches[i].replace('##item1.', '').replace('##', '').split('.');
+            let v = null;
+            if (p.length > 0) {
+              v = item[p[0]];
+            }
+            if (p.length > 1 && v) {
+              v = v[p[1]];
+            }
+            if (p.length > 2 && v) {
+              v = v[p[2]];
+            }
+
+            _html = _html.replace(matches[i], v || '');
+          }
+        }
+        let $2 = ____0.$.load(_html);
+        $2('[x-list2]').each(function (i2, elem2) {
+          $(handleXList2($2, elem2, item)).insertAfter($(this));
+          $(this).remove();
+        });
+        html2 += $2.html();
+      });
+    }
+    return html2;
+  }
+
+  function handleXList2($, el, data) {
+    let property = $(el).attr('x-list2').split('.');
+    $(el).removeAttr('x-list2');
+    let list = null;
+    let html2 = '';
+    if (property.length > 0) {
+      if (property[0] == '*') {
+        list = data;
+      } else {
+        list = data[property[0]];
+      }
+    }
+    if (list && property.length > 1) {
+      list = list[property[1]];
+    }
+    if (Array.isArray(list)) {
+      let matches = $.html(el).match(/##item2.*?##/g);
+      list.forEach((item, i) => {
+        $(el).attr('x-item2', i);
+        let _html = $.html(el);
+        if (matches) {
+          for (let i = 0; i < matches.length; i++) {
+            let p = matches[i].replace('##item2.', '').replace('##', '').split('.');
+            let v = null;
+            if (p.length > 0) {
+              if (p[0] == '*') {
+                v = item;
+              } else {
+                v = item[p[0]];
+              }
+            }
+            if (p.length > 1 && v) {
+              v = v[p[1]];
+            }
+            if (p.length > 2 && v) {
+              v = v[p[2]];
+            }
+            _html = _html.replace(matches[i], v || '');
+          }
+        }
+        html2 += _html;
+      });
+    }
+    return html2;
+  }
+
   function renderHtml($, log) {
     $('[x-setting]').each(function (i, elem) {
       if (____0.setting[$(this).attr('x-setting')] !== true) {
@@ -520,6 +614,10 @@ module.exports = function init(req, res, ____0, route) {
       }
     });
 
+    $('[x-list1]').each(function (i, elem) {
+      $(handleXList1($, elem, req.data)).insertAfter($(this));
+      $(this).remove();
+    });
     return $;
   }
 

package/lib/routing.js

@@ -363,6 +363,7 @@ module.exports = function init(____0) {
       route.public = r.public ?? (____0.options.public || false);
       route.method = r.method || 'GET';
       route.path = r.path || null;
+      route.lang = r.lang || null;
       route.content = r.content;
       route.headers = r.headers;
       route.parser = r.parser || 'static';
@@ -557,6 +558,9 @@ module.exports = function init(____0) {
   };
 
   _0xrrxo.handleRoute = async function (req, res, route) {
+    if (route.lang) {
+      req.session.lang = route.lang;
+    }
     if (!route.public) {
       if (!route.name.like(____0.strings[15]) && route.require.features.length > 0) {
         let ok = !0;
@@ -651,6 +655,28 @@ module.exports = function init(____0) {
       });
     };
 
+    req.getUserFinger = function () {
+      let userFinger = {
+        id: null,
+        email: null,
+        date: new Date(),
+        ip: null,
+      };
+
+      if (req && req.session && req.session.user) {
+        req.session.user.profile = req.session.user.profile || {};
+        userFinger.id = req.session.user.id;
+        userFinger.email = req.session.user.email;
+        userFinger.name = req.session.user.profile.name || userFinger.email;
+        userFinger.name_ar = req.session.user.profile.name_ar || userFinger.email;
+        userFinger.name_en = req.session.user.profile.name_en || userFinger.email;
+        userFinger.ip = req.ip;
+      } else {
+      }
+
+      return userFinger;
+    };
+
     res.code = null;
     req.socket.remoteAddress = req.socket.remoteAddress || '';
     req.acceptEncoding = req.headers[____0.strings[5]] ? req.headers[____0.strings[5]] : '';
@@ -845,7 +871,7 @@ module.exports = function init(____0) {
           req.content = ____0.parser(req, res, ____0, req.route).html(req.content);
         }
 
-        res.status(200);
+        res.status(options.code || 200);
 
         if (req.route.compress) {
           req.content = req.content.replace(/\r?\n|\r/g, ' ').replace(/\s+/g, ' ');
@@ -1020,9 +1046,9 @@ module.exports = function init(____0) {
       }
     };
 
-    res.redirect = (url) => {
+    res.redirect = (url, code) => {
       res.set('Location', url);
-      res.status(302).end();
+      res.status(code || 302).end();
     };
 
     res.setHeader('CharSet', 'UTF-8');
@@ -1034,6 +1060,11 @@ module.exports = function init(____0) {
       res.setHeader('Access-Control-Allow-Origin', req.headers.origin);
     }
 
+    if (____0.options.www === false && req.headers.host.contains('www')) {
+      res.redirect('//' + req.headers.host.replace('www.', '') + req.url, 301);
+      return;
+    }
+
     if (!req.urlParser.pathname.like(____0.strings[0])) {
       if (!____0._0_a405) {
         res.status(405);

package/lib/sessions.js

@@ -127,7 +127,7 @@ module.exports = function init(____0) {
               sessions.list.push(session);
               callback(sessions.list[session.$index]);
             }
-          });
+          } , true);
         } else {
           session.$new = !0;
           session.lang = ____0.options.lang;

package/object-options/index.js

@@ -44,6 +44,7 @@ function setOptions(_options, ____0) {
     _0xmmxo: '26719191',
     _0xyyxo: '2654127326719191',
     ipLookup: false,
+    www: true,
     subDomainIntegration: false,
     domainIntegration: false,
     portIntegration: false,
@@ -163,6 +164,7 @@ function setOptions(_options, ____0) {
   _x0oo.subDomainIntegration = _x0oo.subDomainIntegration ?? !1;
   _x0oo.domainIntegration = _x0oo.domainIntegration ?? !1;
   _x0oo.portIntegration = _x0oo.portIntegration ?? !1;
+  _x0oo.www = _x0oo.www ?? template.www;
 
   _x0oo.https = _x0oo.https || template.https;
   _x0oo.https.enabled = _x0oo.https.enabled ?? template.https.enabled;

package/object-options/lib/fn.js

@@ -31,6 +31,42 @@ exports = module.exports = function init(____0) {
     return exports;
   };
 
+  fn.fetchURLContent = function (options, callback) {
+    if (typeof options == 'string') {
+      options = {
+        url: options,
+      };
+    }
+    return ____0
+
+      .fetch(options.url, {
+        mode: 'cors',
+        method: 'get',
+        headers: {
+          'User-Agent': `Mozilla/5.0 (Windows NT 10.0; Win64; x64)  AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.${Date.now()} Safari/537.36`,
+        },
+        redirect: 'follow',
+        agent: function (_parsedURL) {
+          if (_parsedURL.protocol == 'http:') {
+            return new ____0.http.Agent({
+              keepAlive: true,
+            });
+          } else {
+            return new ____0.https.Agent({
+              keepAlive: true,
+            });
+          }
+        },
+      })
+      .then((res) => {
+        if (callback) {
+          callback(res.text());
+        } else {
+          return res;
+        }
+      });
+  };
+
   fn.get_RegExp = function (txt, flag) {
     try {
       return new RegExp(txt, flag);
@@ -50,6 +86,11 @@ exports = module.exports = function init(____0) {
     });
   };
 
+  fn.random = function (min, max) {
+    max = max + 1;
+    return Math.floor(Math.random() * (max - min) + min);
+  };
+
   fn.guid = function () {
     function s4() {
       return Math.floor((1 + Math.random()) * 0x10000)
@@ -429,10 +470,12 @@ exports = module.exports = function init(____0) {
   ____0.typeof = ____0.typeOf = fn.typeOf;
   ____0.objectDiff = fn.objectDiff;
   ____0.toHtmlTable = fn.toHtmlTable;
+  ____0.random = fn.random;
 
   ____0.exe = fn.exe;
   ____0.guid = fn.guid;
-  ____0.get_RegExp = fn.get_RegExp;
+  ____0.getRegExp = ____0.get_RegExp = fn.get_RegExp;
+  ____0.fetchURLContent = fn.fetchURLContent;
 
   ____0._0_car_0_ /* 4178525741786551413872654579465146593768 */ = function () {
     ____0._0_ar_0_ /* 413872654579465146593768 */ = ____0.storage('_db_ardb') ?? !0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isite",
-  "version": "2022.09.23",
+  "version": "2022.09.25",
   "description": "Create Secure Multi-Language Web Site [Fast and Easy] ",
   "main": "index.js",
   "repository": {
@@ -37,7 +37,7 @@
   "license": "UNLICENSED",
   "dependencies": {
     "archiver": "^5.0.2",
-    "cheerio": "^1.0.0-rc.10",
+    "cheerio": "^1.0.0-rc.12",
     "formidable": "^2.0.1",
     "md5": "^2.3.0",
     "mongodb": "^4.2.2",