isite 2023.12.17 → 2023.12.19

package/apps/client-side/app.js

@@ -129,17 +129,12 @@ module.exports = function (site) {
   });
 
   site.get({
-    name: '/x-fonts',
+    name: ['/x-fonts', '/x-css/x-fonts'],
     path: __dirname + '/site_files/fonts',
     public: true,
   });
   site.get({
-    name: '/x-css/x-fonts',
-    path: __dirname + '/site_files/fonts',
-    public: true,
-  });
-  site.get({
-    name: '/webfonts',
+    name: ['/webfonts', '/x-css/webfonts'],
     path: __dirname + '/site_files/webfonts',
     public: true,
   });

package/lib/fsm.js

@@ -171,16 +171,22 @@ module.exports = function init(____0) {
   };
 
   fsm.off = function (path) {
+    if (path && Array.isArray(path)) {
+      path.forEach((p) => {
+        fsm.off(p);
+      });
+      return;
+    }
+    if (typeof path === 'object') {
+      path = path.path;
+    }
+    path = fsm.getFilePath(path);
     if (path && typeof path == 'string') {
       for (let i = fsm.list.length; i--; ) {
         if (fsm.list[i] && fsm.list[i].path.like(path)) {
           fsm.list.splice(i, 1);
         }
       }
-    } else if (path && Array.isArray(path)) {
-      path.forEach((p) => {
-        fsm.off(p);
-      });
     }
   };
 
@@ -245,7 +251,7 @@ module.exports = function init(____0) {
       }
     });
   };
-  
+
   fsm.readFile = function (path, callback) {
     path = fsm.getFilePath(path);
 
@@ -346,7 +352,7 @@ module.exports = function init(____0) {
   };
 
   fsm.isImage = function (extname) {
-    if (extname == 'png' || extname == 'jpg' || extname == 'jpeg' || extname == 'bmp' || extname == 'ico' || extname == 'webp') {
+    if (extname.contains('png|jpg|jpeg|bmp|ico|webp|gif')) {
       return true;
     }
     return false;
@@ -360,6 +366,7 @@ module.exports = function init(____0) {
     }
 
     let path = name;
+
     if (!____0.isFileExistsSync(path)) {
       path = ____0.path.join(____0.dir, extname, name);
     }

package/lib/routing.js

@@ -35,7 +35,6 @@ module.exports = function init(____0) {
     }
 
     route.path = route.path || '';
-    let encode = ____0.getFileEncode(route.path);
 
     // let hash = req.content ? ____0.x0md50x(req.content) : ____0.x0md50x('');
     let last_modified = new Date().toUTCString();
@@ -63,6 +62,8 @@ module.exports = function init(____0) {
       }
     }
 
+    let encode = ____0.getFileEncode(route.path);
+
     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);
@@ -302,18 +303,29 @@ module.exports = function init(____0) {
     if (typeof r == 'string') {
       r = { name: r };
     }
+    if (!r.name.startsWith('/')) {
+      r.name = '/' + r.name;
+    }
+
     for (let i = _0xrrxo.list.length; i--; ) {
-      let r0 = _0xrrxo.list[i];
-      if (r.name && r.method && r0.name.like(r.name) && r0.method.like(r.method)) {
+      let oldRoute = _0xrrxo.list[i];
+      if (r.name && r.method && oldRoute.name.like(r.name) && oldRoute.method.like(r.method)) {
+        _0xrrxo.list.splice(i, 1);
+        ____0.fsm.off(oldRoute.path);
+      } else if (r.name && r.method && oldRoute.nameRaw.like(r.name) && oldRoute.method.like(r.method)) {
         _0xrrxo.list.splice(i, 1);
-        ____0.fsm.off(r0.path);
-      } else if (r.name && r0.name.like(r.name)) {
+        ____0.fsm.off(oldRoute.path);
+      } else if (r.name && oldRoute.name.like(r.name)) {
         _0xrrxo.list.splice(i, 1);
-        ____0.fsm.off('*' + r0.name.replace('/', '') + '*');
-        ____0.fsm.off(r0.path);
-      } else if (r.method && r0.method.like(r.method)) {
+        ____0.fsm.off('*' + oldRoute.name.replace('/', '') + '*');
+        ____0.fsm.off(oldRoute.path);
+      } else if (r.name && oldRoute.nameRaw.like(r.name)) {
         _0xrrxo.list.splice(i, 1);
-        ____0.fsm.off(r0.path);
+        ____0.fsm.off('*' + oldRoute.name.replace('/', '') + '*');
+        ____0.fsm.off(oldRoute.path);
+      } else if (r.method && oldRoute.method.like(r.method)) {
+        _0xrrxo.list.splice(i, 1);
+        ____0.fsm.off(oldRoute.path);
       }
     }
   };
@@ -336,7 +348,7 @@ module.exports = function init(____0) {
 
     if (typeof r == 'string') {
       route.name = r.toLowerCase();
-      route.name0 = r;
+      route.nameRaw = r;
       route.public = ____0.options.public || false;
       route.method = 'GET';
       route.path = null;
@@ -360,7 +372,7 @@ module.exports = function init(____0) {
       }
     } else {
       route.name = r.name.toLowerCase();
-      route.name0 = r.name;
+      route.nameRaw = r.name;
       route.public = r.public ?? (____0.options.public || false);
       route.method = r.method || 'GET';
       route.path = r.path || null;
@@ -396,14 +408,14 @@ module.exports = function init(____0) {
 
     if (!route.name.startsWith('/')) {
       route.name = '/' + route.name;
-      route.name0 = '/' + route.name0;
+      route.nameRaw = '/' + route.nameRaw;
     }
 
     route.name = route.name.replace('//', '/');
-    route.name0 = route.name0.replace('//', '/');
+    route.nameRaw = route.nameRaw.replace('//', '/');
 
     let arr = route.name.split('/');
-    let arr0 = route.name0.split('/');
+    let arr0 = route.nameRaw.split('/');
 
     for (var i = 0; i < arr.length; i++) {
       var s = arr[i];
@@ -412,17 +424,17 @@ module.exports = function init(____0) {
       if (s.startsWith(':')) {
         arr[i] = '*';
         let name = s.replace(':', '');
-        let name0 = s0.replace(':', '');
+        let nameRaw = s0.replace(':', '');
 
         route.map.push({
           index: i,
           name: name,
           isLower: !1,
         });
-        if (name !== name0) {
+        if (name !== nameRaw) {
           route.map.push({
             index: i,
-            name: name0,
+            name: nameRaw,
             isLower: !0,
           });
         }
@@ -454,7 +466,7 @@ module.exports = function init(____0) {
         let index = _0xrrxo.list.findIndex((rr) => rr.name == route.name && rr.method == route.method);
         if (index === -1) {
           _0xrrxo.list.push(route);
-        } else if (index > -1 && !route.overwrite) {
+        } else if (!route.overwrite) {
           if (route.name.like('*api/*')) {
             ____0.log('[ Duplicate API ]  ' + route.name);
           } else {
@@ -867,8 +879,15 @@ module.exports = function init(____0) {
       }
     };
 
-    res.html = res.render = function (name, _data, options) {
-      ____0.fsm.getContent(name, (content) => {
+    res.html = res.render = function (file, _data = null, options = {}) {
+      let filePath = '';
+      if (typeof file === 'object') {
+        filePath = file.path;
+        options = { ...options, ...file };
+      } else {
+        filePath = file;
+      }
+      ____0.fsm.getContent(filePath, (content) => {
         if (!content) {
           if (_data && _data.html) {
             return res.status(404).htmlContent(_data.html);
@@ -877,10 +896,8 @@ module.exports = function init(____0) {
           }
         }
 
-        options = options || {};
         req.content = content;
         req.data = { ...req.data, ..._data };
-        req.route = req.route || {};
         req.route = { ...req.route, ...options };
         if (req.route.parser) {
           req.content = ____0.parser(req, res, ____0, req.route).html(req.content);
@@ -892,103 +909,103 @@ module.exports = function init(____0) {
           req.content = req.content.replace(/\r?\n|\r/g, ' ').replace(/\s+/g, ' ');
         }
 
-        if (name.endsWith('.css')) {
+        if (filePath.endsWith('.css')) {
           res.set(____0.strings[7], 'text/css');
           if (____0.options.cache.enabled && req.route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.css);
           }
-        } else if (name.endsWith('.js')) {
+        } else if (filePath.endsWith('.js')) {
           res.set(____0.strings[7], 'application/javascript');
           if (____0.options.cache.enabled && req.route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.js);
           }
-        } else if (name.endsWith('.html')) {
+        } else if (filePath.endsWith('.html')) {
           res.set(____0.strings[7], 'text/html');
           if (____0.options.cache.enabled && req.route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.html);
           }
-        } else if (name.endsWith('.txt')) {
+        } else if (filePath.endsWith('.txt')) {
           res.set(____0.strings[7], 'text/plain');
           if (____0.options.cache.enabled && req.route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.txt);
           }
-        } else if (name.endsWith('.json')) {
+        } else if (filePath.endsWith('.json')) {
           res.set(____0.strings[7], 'application/json');
           if (____0.options.cache.enabled && req.route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.json);
           }
-        } else if (name.endsWith('.xml')) {
+        } else if (filePath.endsWith('.xml')) {
           res.set(____0.strings[7], 'text/xml');
           if (____0.options.cache.enabled && req.route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.xml);
           }
-        } else if (name.endsWith('.woff2')) {
+        } else if (filePath.endsWith('.woff2')) {
           res.set(____0.strings[7], 'application/font-woff2');
           if (____0.options.cache.enabled && req.route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.fonts);
           }
-        } else if (name.endsWith('.woff')) {
+        } else if (filePath.endsWith('.woff')) {
           res.set(____0.strings[7], 'application/font-woff');
           if (____0.options.cache.enabled && req.route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.fonts);
           }
-        } else if (name.endsWith('.ttf')) {
+        } else if (filePath.endsWith('.ttf')) {
           res.set(____0.strings[7], 'application/font-ttf');
           if (____0.options.cache.enabled && req.route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.fonts);
           }
-        } else if (name.endsWith('.svg')) {
+        } else if (filePath.endsWith('.svg')) {
           res.set(____0.strings[7], 'application/font-svg');
           if (____0.options.cache.enabled && req.route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.fonts);
           }
-        } else if (name.endsWith('.otf')) {
+        } else if (filePath.endsWith('.otf')) {
           res.set(____0.strings[7], 'application/font-otf');
           if (____0.options.cache.enabled && req.route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.fonts);
           }
-        } else if (name.endsWith('.eot')) {
+        } else if (filePath.endsWith('.eot')) {
           res.set(____0.strings[7], 'application/font-eot');
           if (____0.options.cache.enabled && req.route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.fonts);
           }
-        } else if (name.endsWith('.gif')) {
+        } else if (filePath.endsWith('.gif')) {
           res.set(____0.strings[7], 'image/gif');
           if (____0.options.cache.enabled && req.route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.images);
           }
-        } else if (name.endsWith('.png')) {
+        } else if (filePath.endsWith('.png')) {
           res.set(____0.strings[7], 'image/png');
           if (____0.options.cache.enabled && req.route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.images);
           }
-        } else if (name.endsWith('.jpg')) {
+        } else if (filePath.endsWith('.jpg')) {
           res.set(____0.strings[7], 'image/jpg');
           if (____0.options.cache.enabled && req.route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.images);
           }
-        } else if (name.endsWith('.jpeg')) {
+        } else if (filePath.endsWith('.jpeg')) {
           res.set(____0.strings[7], 'image/jpeg');
           if (____0.options.cache.enabled && req.route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.images);
           }
-        } else if (name.endsWith('.ico')) {
+        } else if (filePath.endsWith('.ico')) {
           res.set(____0.strings[7], 'image/ico');
           if (____0.options.cache.enabled && req.route.cache) {
             res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.images);
           }
-        } else if (name.endsWith('.bmp')) {
+        } else if (filePath.endsWith('.bmp')) {
           res.set(____0.strings[7], 'image/bmp');
           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')) {
+        } else if (filePath.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));
+        res.end(req.content, ____0.getFileEncode(filePath));
       });
     };
 
@@ -1147,8 +1164,14 @@ module.exports = function init(____0) {
 
       for (let i = 0; i < req.route.map.length; i++) {
         let map = req.route.map[i];
-        req.params[map.name] = decodeURIComponent(req.urlParser.arr[map.index].replace(/\+/g, ' '));
-        req.paramsRaw[map.name] = req.urlParserRaw.arr[map.index];
+        if (typeof req.urlParser.arr[map.index] === 'string') {
+          try {
+            req.params[map.name] = decodeURIComponent(req.urlParser.arr[map.index].replace(/\+/g, ' '));
+          } catch (error) {
+            req.params[map.name] = req.urlParser.arr[map.index].replace(/\+/g, ' ');
+          }
+          req.paramsRaw[map.name] = req.urlParserRaw.arr[map.index];
+        }
       }
 
       req.query = req.urlParser.query;
@@ -1250,14 +1273,14 @@ module.exports = function init(____0) {
 
     if (req.urlParser.pathname == '/') {
       if (____0.options.help) {
-        res.set('help-eror-message', 'unhandled route root ' + req.urlParser.pathname);
+        res.set('help-eror-message', 'unhandled route root : ' + req.urlParser.pathname);
       }
       res.htmlContent("<h1 align='center'>Base Route / Not Set</h1>");
       return;
     }
 
     if (____0.options.help) {
-      res.set('help-eror-message', 'unhandled route help' + req.urlParser.pathname);
+      res.set('help-eror-message', 'unhandled route help : ' + req.urlParser.pathname);
     }
 
     if (req.method.toLowerCase().like('options') || req.method.toLowerCase().like('head')) {
@@ -1267,7 +1290,7 @@ module.exports = function init(____0) {
     ____0.handleNotRoute(req, res);
   };
   ____0.handleNotRoute = function (req, res) {
-    res.set('help-eror-message', 'unhandled route fn' + req.urlParser.pathname);
+    res.set('help-eror-message', 'unhandled route fn : ' + req.urlParser.pathname);
     res.status(404).end();
   };
   ____0.servers = [];

package/object-options/index.js

@@ -40,6 +40,7 @@ function setOptions(_options, ____0) {
     log: !0,
     lang: 'en',
     theme: 'default',
+    public : false,
     help: !1,
     stdin: !0,
     _0xmmxo: '26319191',

package/package.json

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