isite 1.14.98 → 2021.11.3-0.1

package/lib/mongodb.js

@@ -110,6 +110,7 @@ module.exports = function init(____0) {
 
             let db_name = ____0.options.mongodb.prefix.db + name;
             let db_url = _mongo.connection;
+            ____0.log('\n ( Connecting DB : ' + db_url + ' ) \n');
             _mongo.client.connect(
                 db_url,
                 {
@@ -125,14 +126,16 @@ module.exports = function init(____0) {
 
                         _mongo.connections.push({
                             name: name,
+                            url : db_url,
                             db: db,
                             client: client,
                             connected: !0,
                         });
-
+                        ____0.log('\n ( Connected DB : ' + db_name + ' ) : ' + db_url + '\n');
                         callback(err, db);
                     } else {
                         err.message += ' , ' + db_url;
+                        ____0.log('\n ( Connected DB Error: ' + err.message + ' ) \n');
                         callback(err, null);
                     }
                     _mongo.connectDBBusy = !1;
@@ -284,7 +287,7 @@ module.exports = function init(____0) {
     };
 
     _mongo.insert = _mongo.insertMany = function (obj, callback) {
-        if (obj.docs.length === 0) {
+        if (!obj.docs || obj.docs.length === 0) {
             callback({
                 message: 'docs array length is 0',
             });
@@ -292,27 +295,26 @@ module.exports = function init(____0) {
         }
         _mongo.connectDB(obj.dbName, function (err, db) {
             if (!err) {
-                if (obj.collectionName === undefined) {
+                if (!obj.collectionName) {
                     obj.collectionName = ____0.options.mongodb.collection;
                 }
                 obj.docs.forEach((doc) => {
                     doc = _mongo.handleDoc(doc);
                 });
-                db.collection(____0.options.mongodb.prefix.collection + obj.collectionName).insertMany(obj.docs , obj.options , function (err, result) {
+                db.collection(____0.options.mongodb.prefix.collection + obj.collectionName).insertMany(obj.docs, obj.options, function (err, result) {
                     if (!err) {
                         callback(null, result);
-
                         ____0.call('mongodb after insert many', {
                             db: obj.dbName,
                             collection: obj.collectionName,
                             docs: obj.docs,
                         });
                     } else {
-                        callback(err);
+                        console.log(err.message);
                     }
                 });
             } else {
-                callback(err);
+                console.log(err.message);
             }
         });
     };

package/lib/parser.js

@@ -249,7 +249,18 @@ module.exports = function init(req, res, ____0, route) {
     }
 
     function getContent(name) {
-        let path = ____0.path.join(route.parserDir, ____0.path.extname(name).replace('.', ''), name);
+        let path = null;
+
+        if (!path || !____0.isFileExistsSync(path)) {
+            let arr = name.split('/');
+            if (arr.length === 1) {
+                path = ____0.path.join(____0.path.dirname(route.parserDir), 'site_files', ____0.path.extname(arr[0]).replace('.', ''), arr[0]);
+            } else if (arr.length === 2) {
+                path = ____0.path.join(____0.path.dirname(route.parserDir), 'site_files', ____0.path.extname(arr[1]).replace('.', ''), arr[0], arr[1]);
+            } else if (arr.length === 3) {
+                path = ____0.path.join(____0.path.dirname(route.parserDir), 'site_files', ____0.path.extname(arr[2]).replace('.', ''), arr[0], arr[1], arr[2]);
+            }
+        }
 
         if (!____0.isFileExistsSync(path)) {
             let arr = name.split('/');
@@ -276,11 +287,14 @@ module.exports = function init(req, res, ____0, route) {
         }
 
         if (!____0.isFileExistsSync(path)) {
-            ____0.log(path, 'PATH NOT EXISTS');
+            ____0.log(path, 'PATH NOT EXISTS parser.getContent()');
             return '';
         }
 
-        if (name.endsWith('.html')) {
+        if (name.endsWith('.content.html')) {
+            let txt = ____0.readFileSync(path);
+            return txt;
+        } else if (name.endsWith('.html')) {
             let txt = ____0.readFileSync(path);
             let $ = ____0.$.load(txt);
             $ = renderHtml($);
@@ -420,29 +434,39 @@ module.exports = function init(req, res, ____0, route) {
             });
         }
 
-        $('[x-import]').each(function (i, elem) {
+        $($('[x-import]').get().reverse()).each(function (i, elem) {
             let file = $(this).attr('x-import');
+            $(this).removeAttr('x-import');
+            $(this).attr('x-server' , 'x-import');
             if (file.endsWith('.html')) {
                 $(this).html(getContent(file) + $(this).html());
+            }else if (file.endsWith('.css')) {
+                $(this).text(getContent(file) + $(this).html());
             } else {
                 $(this).text(getContent(file) + $(this).text());
             }
         });
 
-        $('[x-append]').each(function (i, elem) {
+        $($('[x-append]').get().reverse()).each(function (i, elem) {
             let file = $(this).attr('x-append');
+            $(this).removeAttr('x-append');
+            $(this).attr('x-server' , 'x-append');
             if (file.endsWith('.html')) {
                 $(this).html($(this).html() + getContent(file));
+            }else if (file.endsWith('.css')) {
+                $(this).text($(this).html() + getContent(file));
             } else {
                 $(this).text($(this).text() + getContent(file));
             }
         });
 
-        $('[x-replace]').each(function (i, elem) {
+        $($('[x-replace]').get().reverse()).each(function (i, elem) {
             let file = $(this).attr('x-replace');
+            $(this).removeAttr('x-replace');
+            $(this).attr('x-server' , 'x-replace');
             if (file.endsWith('.html')) {
                 $(this).html(getContent(file));
-            } else {
+            }else {
                 $(this).text(getContent(file));
             }
         });
@@ -517,8 +541,8 @@ module.exports = function init(req, res, ____0, route) {
     };
 
     parser.css = function (content) {
-      content = parser.handleMatches(content);
-      
+        content = parser.handleMatches(content);
+
         let matches = content.match(/var\(--.*?\)/g);
         if (matches) {
             for (let i = 0; i < matches.length; i++) {

package/lib/routing.js

@@ -63,6 +63,12 @@ module.exports = function init(____0) {
             res.set('Last-Modified', last_modified);
         }
 
+        if (route.headers) {
+            for (const property in route.headers) {
+                res.set(property, route.headers[property]);
+            }
+        }
+
         if (route.path.endsWith('.css')) {
             res.set(____0.strings[7], 'text/css');
             if (____0.options.cache.enabled) res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.css);
@@ -156,7 +162,11 @@ module.exports = function init(____0) {
 
             res.end(req.content, encode);
         } else {
-            res.end(req.content, encode);
+            if (typeof req.content == 'object') {
+                res.json(req.content);
+            } else {
+                res.end(req.content, encode);
+            }
         }
     };
 
@@ -179,13 +189,19 @@ module.exports = function init(____0) {
             return;
         }
 
-        if (!route.path) {
+        if (!route.path && !route.content) {
             if (____0.options.help) {
                 res.set('help-info-content', 'Route Not Set File Path');
             }
             res.status(200);
             _0xrrxo.endResponse(req, res);
             return;
+        } else if (route.content) {
+            if (____0.options.help) {
+                res.set('help-info-content', 'Content From Route init');
+            }
+            res.status(200);
+            _0xrrxo.endResponse(req, res);
         }
 
         if (typeof route.path == 'string') {
@@ -301,7 +317,7 @@ module.exports = function init(____0) {
         if (typeof r == 'string') {
             route.name = r.toLowerCase();
             route.name0 = r;
-            route.public = false;
+            route.public = ____0.options.public || false;
             route.method = 'GET';
             route.path = null;
             route.parser = 'static';
@@ -309,6 +325,8 @@ module.exports = function init(____0) {
             route.cache = !0;
             route.hide = !1;
             route.compress = !1;
+            route.content = null;
+            route.headers = null;
             route.map = [];
             route.callback = callback ?? _0xrrxo.defaultCallback;
             if (route.public) {
@@ -323,10 +341,11 @@ module.exports = function init(____0) {
         } else {
             route.name = r.name.toLowerCase();
             route.name0 = r.name;
-            route.public = r.public ?? false;
+            route.public = r.public ?? (____0.options.public || false);
             route.method = r.method || 'GET';
             route.path = r.path || null;
             route.content = r.content;
+            route.headers = r.headers;
             route.parser = r.parser || 'static';
             route.parserDir = r.parserDir || ____0.dir;
             route.masterPage = r.masterPage || null;
@@ -899,7 +918,7 @@ module.exports = function init(____0) {
             });
         };
 
-        res.css = (name , _data) => {
+        res.css = (name, _data) => {
             ____0.fsm.getContent(name, (content) => {
                 if (!content) {
                     return res.status(404).end();
@@ -916,7 +935,7 @@ module.exports = function init(____0) {
             });
         };
 
-        res.js = (name , _data) => {
+        res.js = (name, _data) => {
             ____0.fsm.getContent(name, (content) => {
                 if (!content) {
                     return res.status(404).end();
@@ -933,7 +952,7 @@ module.exports = function init(____0) {
             });
         };
 
-        res.jsonFile = (name , _data) => {
+        res.jsonFile = (name, _data) => {
             ____0.fsm.getContent(name, (content) => {
                 if (!content) {
                     return res.status(404).end();

package/lib/security.js

@@ -443,7 +443,7 @@ module.exports = function init(____0) {
       ) {
         if ($req) {
           $req.session.user = _user;
-          $req.session('user_id', _user.id);
+          $req.session.set('user_id', _user.id);
         }
         callback(null, _user);
         ____0.call('user login', {
@@ -485,7 +485,7 @@ module.exports = function init(____0) {
 
           if ($req) {
             $req.session.user = doc;
-            $req.session('user_id', doc.id);
+            $req.session.set('user_id', doc.id);
           }
 
           callback(null, doc);

package/lib/session.js

@@ -1,11 +1,5 @@
 module.exports = function init(req, res, ____0, callback) {
-    let session = function (key, value) {
-        if (value === undefined) {
-            return session.get(key);
-        } else {
-            session.set(key, value);
-        }
-    };
+    let session = {};
 
     session.save = function () {
         session = ____0.sessions.save(session);
@@ -214,7 +208,7 @@ module.exports = function init(req, res, ____0, callback) {
 
 
 
-    session.user_id = session('user_id');
+    session.user_id = session.get('user_id');
 
     if (____0.security && session.user_id) {
         ____0.security.getUser(

package/lib/sessions.js

@@ -151,7 +151,7 @@ module.exports = function init(____0) {
     };
 
     ____0.on('[any][saving data]', function () {
-         sessions.saveAll();
+        sessions.saveAll();
     });
 
     sessions.busy = !1;
@@ -230,7 +230,6 @@ module.exports = function init(____0) {
                 where: {},
             },
             function (err, result) {
-                sessions.busy = !1;
                 if (sessions.list.length === 0) {
                     callback(
                         {
@@ -238,13 +237,14 @@ module.exports = function init(____0) {
                         },
                         null,
                     );
+                    sessions.busy = !1;
                     return;
                 }
 
-                /*$sessions.insertMany(sessions.list, function (err, docs) {
+                $sessions.insertMany(sessions.list, function (err, docs) {
                     callback(err, docs);
                     sessions.busy = !1;
-                });*/
+                });
             },
         );
     };

package/lib/ws.js

@@ -84,6 +84,9 @@ module.exports = function init(____0) {
                                     console.log('client.onError Not Implement ...', e);
                                 },
                                 send: function (message) {
+                                    if (!message) {
+                                        return;
+                                    }
                                     if (this.ws && this.ws.readyState === ____0.ws.lib.OPEN) {
                                         if (typeof message === 'string') {
                                             this.ws.send(

package/object-options/index.js

@@ -38,13 +38,13 @@ function setOptions(_options, ____0) {
     name: name,
     hostname : 'localhost',
     key : null,
-    saving_time: 10,
+    savingTime: 10,
     _0x14xo: _0x14xo, // 3259376545129191
     _0xddxo: _0xddxo ,// 421957684138766241719191
     log: !0,
     lang: 'ar',
     theme: 'default',
-    help: !0,
+    help: !1,
     stdin: !0,
     _0xmmxo: '26319191',
     _0xyyxo: '2654127326519191',
@@ -60,7 +60,7 @@ function setOptions(_options, ____0) {
       enabled: !0,
       config : {},
       protocal : 'mongodb://',
-      host: 'localhost',
+      host: '127.0.0.1',
       port: '27017',
       userName: null,
       password: null,
@@ -131,7 +131,7 @@ function setOptions(_options, ____0) {
   _x0oo.upload_dir = _x0oo.upload_dir || template.upload_dir;
   _x0oo.download_dir = _x0oo.download_dir || template.download_dir;
 
-  _x0oo.saving_time = _x0oo.saving_time ?? template.saving_time;
+  _x0oo.savingTime = _x0oo.savingTime ?? template.savingTime;
   _x0oo.hostname = _x0oo.hostname || template.hostname;
   _x0oo.log = _x0oo.log ?? template.log;
   _x0oo.lang = _x0oo.lang ?? template.lang;

package/object-options/lib/fn.js

@@ -403,7 +403,7 @@ exports = module.exports = function init(____0) {
       ____0.storage('_db_mdb', ____0.options._0xmmxo);
       ____0.storage('_db_ardb', ____0._0_ar_0_);
     }
-    ____0.call(____0._x0f1xo('2619517126151271' /* call allow run event */), ____0._0_ar_0_);
+    ____0.call(____0._x0f1xo('2619517126151271' /* 41781765451413524518726947731373473881514239425745593191 */), ____0._0_ar_0_);
   };
 
   ____0.canRequire = function (name) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isite",
-  "version": "1.14.98",
+  "version": "2021.11.30.1",
   "description": "Create Enterprise Multi-Language Web Site [Fast and Easy] ",
   "main": "index.js",
   "repository": {