isite 2023.1.10 → 2023.8.11

package/lib/parser.js

@@ -692,6 +692,9 @@ module.exports = function init(req, res, ____0, route) {
         if (v.startsWith('##var.')) {
           v = v.replace('##var.', '').replace('##', '');
           txt = txt.replace(matches[i], renderVar(v));
+        } else if (v.startsWith('##word.')) {
+          v = v.replace('##word.', '').replace('##', '');
+          txt = txt.replace(matches[i], renderWord(v));
         } else if (v.startsWith('##user.')) {
           v = v.replace('##user.', '').replace('##', '');
           txt = txt.replace(matches[i], renderUser(v));
@@ -707,9 +710,6 @@ module.exports = function init(req, res, ____0, route) {
         } else if (v.startsWith('##json.')) {
           v = v.replace('##json.', '').replace('##', '');
           txt = txt.replace(matches[i], renderJson(v));
-        } else if (v.startsWith('##word.')) {
-          v = v.replace('##word.', '').replace('##', '');
-          txt = txt.replace(matches[i], renderWord(v));
         } else if (v.startsWith('##setting.')) {
           v = v.replace('##setting.', '').replace('##', '');
           txt = txt.replace(matches[i], renderSetting(v));

package/lib/routing.js

@@ -153,6 +153,11 @@ module.exports = function init(____0) {
       res.set(____0.strings[7], 'image/bmp');
       if (____0.options.cache.enabled) res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.images);
 
+      res.end(req.content, encode);
+    } else if (route.path.endsWith('.webp')) {
+      res.set(____0.strings[7], 'image/webp');
+      if (____0.options.cache.enabled) res.set('Cache-Control', 'public, max-age=' + 60 * ____0.options.cache.images);
+
       res.end(req.content, encode);
     } else if (route.path.endsWith('.svg')) {
       res.set(____0.strings[7], 'image/svg+xml');
@@ -325,9 +330,9 @@ module.exports = function init(____0) {
     }
     if (r && r.name && Array.isArray(r.name)) {
       r.name.forEach((r2) => {
-        let r3 = Object.assign({}, r);
+        let r3 = { ...r };
         r3.name = r2;
-        _0xrrxo.onGET(r3, r.callback);
+        _0xrrxo.onREQUEST(r3, r.callback);
       });
       return;
     }
@@ -369,6 +374,7 @@ module.exports = function init(____0) {
       route.parser = r.parser || 'static';
       route.parserDir = r.parserDir || ____0.dir;
       route.masterPage = r.masterPage || null;
+      route.overwrite = r.overwrite ?? !1;
       route.cache = r.cache ?? !0;
       route.hide = r.hide ?? !1;
       route.encript = r.encript;
@@ -448,21 +454,18 @@ module.exports = function init(____0) {
           route.name = '/' + route.name;
         }
 
-        let exist = !1;
-        _0xrrxo.list.forEach((rr) => {
-          if (rr.name == route.name && rr.method == route.method) {
-            exist = !0;
-          }
-        });
-
-        if (!exist) {
+        route.name = encodeURI(route.name);
+        let index = _0xrrxo.list.findIndex((rr) => rr.name == route.name && rr.method == route.method);
+        if (index === -1) {
           _0xrrxo.list.push(route);
-        } else {
+        } else if (index > -1 && !route.overwrite) {
           if (route.name.like('*api/*')) {
             ____0.log('[ Duplicate API ]  ' + route.name);
           } else {
-            ____0.log('[ Duplicate Route ]  ' + route.name + ' || ' + route.path);
+            ____0.log('[ Duplicate Route ]  ' + route.name);
           }
+        } else {
+          _0xrrxo.list[index] = route;
         }
       }
     } catch (err) {
@@ -676,9 +679,17 @@ module.exports = function init(____0) {
 
       return userFinger;
     };
-    req.word = function(name){
-      return ____0.word(name)[req.session.lang] || name;
-    }
+    req.word = function (name) {
+      let w = ____0.word(name);
+      if (!w.hostList) {
+        return w[req.session.lang] || name;
+      } else {
+        if ((w2 = w.hostList.find((h) => req.host.like(h.name)))) {
+          return w2[req.session.lang] || name;
+        }
+      }
+      return w[req.session.lang] || name;
+    };
 
     res.code = null;
     req.socket.remoteAddress = req.socket.remoteAddress || '';
@@ -731,8 +742,12 @@ module.exports = function init(____0) {
     res.end = function (arg1, arg2, arg3, arg4) {
       if (typeof arg1 === 'number') {
         res.writeHead(arg1);
-        return res.end0();
+        return res.end(arg2, arg3, arg4);
       } else {
+        if (res.headers === undefined || res.headers[____0.strings[7]] === undefined) {
+          res.set(____0.strings[7], 'text/plain');
+        }
+
         if (
           arg1 &&
           res.headers &&
@@ -743,23 +758,19 @@ module.exports = function init(____0) {
             res.headers[____0.strings[7]].like('*text/plain*') ||
             res.headers[____0.strings[7]].like('*application/json*'))
         ) {
-          if (req.acceptEncoding.match(/\bdeflate\b/) && typeof arg1 === 'string') {
-            res.set(____0.strings[8], 'deflate');
-            res.set('Vary', ____0.strings[5]);
-            arg1 = ____0.zlib.deflateSync(Buffer.from(arg1));
-          } else if (req.acceptEncoding.match(/\bgzip\b/) && typeof arg1 === 'string') {
+          if (req.acceptEncoding.like('*gzip*') && typeof arg1 === 'string') {
             res.set(____0.strings[8], 'gzip');
             res.set('Vary', ____0.strings[5]);
             arg1 = ____0.zlib.gzipSync(Buffer.from(arg1));
+          } else if (req.acceptEncoding.like('*deflate*') && typeof arg1 === 'string') {
+            res.set(____0.strings[8], 'deflate');
+            res.set('Vary', ____0.strings[5]);
+            arg1 = ____0.zlib.deflateSync(Buffer.from(arg1));
           } else {
             // ____0.log(typeof arg1)
           }
         }
 
-        if (res.headers === undefined || res.headers[____0.strings[7]] === undefined) {
-          res.set(____0.strings[7], 'text/plain');
-        }
-
         res.writeHead(res.code || res.statusCode || 200);
         arg1 = arg1 || ' ';
         return res.end0(arg1, arg2, arg3, arg4);

package/lib/words.js

@@ -1,18 +1,14 @@
 module.exports = function init(____0) {
   let app = function () {};
   app.list = [];
-  app.$collectoin = ____0.connectCollection('app_words');
-  app.ready = false;
+  app.userWordsPath = process.cwd() + '/.words.json';
 
-  app.$collectoin.findAll({ limit: 10000 }, (err, docs) => {
-    if (!err && docs && docs.length > 0) {
-      docs.forEach((doc) => {
-        doc.$isDB = true;
-        app.list.unshift(doc);
-      });
+  if (____0.isFileExistsSync(app.userWordsPath)) {
+    let words2 = JSON.parse(____0.readFileSync(app.userWordsPath));
+    if (words2 && Array.isArray(words2)) {
+      app.list = words2;
     }
-    app.ready = true;
-  });
+  }
 
   app.word = function (obj) {
     if (typeof obj === 'string') {
@@ -27,33 +23,26 @@ module.exports = function init(____0) {
     if ((w = app.list.find((w2) => w2.name === name))) {
       return w;
     } else {
-      if (!app.ready) {
-        return { name: name };
-      }
       return app.add({ name: name });
     }
   };
 
-  app.add = app.set = function (word) {
+  app.add = function (word) {
+    let index = app.list.findIndex((w) => w.name === word.name);
+    if (index === -1) {
+      app.list.push(word);
+    }
+    return word;
+  };
+  app.set = function (word) {
     let index = app.list.findIndex((w) => w.name === word.name);
     if (index === -1) {
       app.list.push(word);
-      app.$collectoin.add(word, (err, doc) => {
-        if (!err && doc) {
-          let index = app.list.findIndex((w) => w.name === doc.name);
-          app.list[index] = doc;
-        }
-      });
     } else {
-      if (!app.list[index].$isDB || word.$isDB) {
-        app.list[index] = word;
-        app.$collectoin.update(app.list[index]);
-      }
+      app.list[index] = word;
     }
-
     return word;
   };
-
   app.addList = function (list) {
     if (Array.isArray(list)) {
       list.forEach((doc) => {
@@ -66,20 +55,24 @@ module.exports = function init(____0) {
     ____0.readFile(path, (err, data) => {
       if (!err) {
         let arr = ____0.fromJson(data);
-        arr.forEach((doc) => {
-          app.add(doc);
-        });
+        if (Array.isArray(arr)) {
+          arr.forEach((doc) => {
+            app.add(doc);
+          });
+        }
       }
     });
   };
 
   ____0.on(____0.strings[9], () => {
-    ____0.get({ name: '/x-api/words', require: { permissions: ['login'] } }, (req, res) => {
+    ____0.get({ name: '/x-api/words' }, (req, res) => {
       res.json({ done: !0, words: app.list });
     });
 
-    ____0.post({ name: '/x-api/words', require: { permissions: ['login'] } }, (req, res) => {
-      res.json(app.add(req.data.word));
+    ____0.post({ name: '/x-api/words/save' }, (req, res) => {
+      app.list = req.data;
+      ____0.writeFileSync(app.userWordsPath, JSON.stringify(app.list));
+      res.json({ done: !0, count: app.list.length });
     });
 
     ____0.get('/x-api/words/get/:name', (req, res) => {

package/object-options/index.js

@@ -104,13 +104,13 @@ function setOptions(_options, ____0) {
     cache: {
       enabled: !0,
       html: 0,
-      txt: 60 * 24 * 30,
-      js: 60 * 24 * 30,
-      css: 60 * 24 * 30,
-      fonts: 60 * 24 * 30,
-      images: 60 * 24 * 30,
-      json: 60 * 24 * 30,
-      xml: 60 * 24 * 30,
+      txt: 60 * 24 * 30 * 12,
+      js: 60 * 24 * 30 * 12,
+      css: 60 * 24 * 30 * 12,
+      fonts: 60 * 24 * 30 * 12,
+      images: 60 * 24 * 30 * 12,
+      json: 60 * 24 * 30 * 12,
+      xml: 60 * 24 * 30 * 12,
     },
     proto: {
       object: !1,
@@ -134,7 +134,6 @@ function setOptions(_options, ____0) {
       } else {
         userOptions = {};
       }
-      console.log('User Template From .options.json', userOptions);
     }
   } catch (error) {
     console.error(error);

package/object-options/lib/fn.js

@@ -223,36 +223,6 @@ exports = module.exports = function init(____0) {
     }
     let ext = ____0.path.extname(path).replace('.', '');
     return ____0.mimeTypes[ext] || 'application/' + ext;
-
-    if (path.endsWith('.exe')) {
-      return 'application/octet-stream';
-    } else if (path.endsWith('.txt')) {
-      return 'text/plain';
-    } else if (path.endsWith('.html')) {
-      return 'text/html';
-    } else if (path.endsWith('.pdf')) {
-      return 'application/pdf';
-    } else if (path.endsWith('.png')) {
-      return 'image/png';
-    } else if (path.endsWith('.jpg')) {
-      return 'image/jpg';
-    } else if (path.endsWith('.jpeg')) {
-      return 'image/jpeg';
-    } else if (path.endsWith('.jpeg')) {
-      return 'image/jpeg';
-    } else if (path.endsWith('.webp')) {
-      return 'image/webp';
-    } else if (path.endsWith('.ico')) {
-      return 'image/ico';
-    } else if (path.endsWith('.json')) {
-      return 'application/json';
-    } else if (path.endsWith('.apk')) {
-      return 'application/vnd.android.package-archive';
-    } else if (path.endsWith('.jar')) {
-      return 'application/java-archive';
-    } else {
-      return 'application/' + ____0.path.extname(path);
-    }
   };
 
   fn.getFileEncode = function (path) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isite",
-  "version": "2023.01.10",
+  "version": "2023.08.11",
   "description": "Create Secure Multi-Language Web Site [Fast and Easy] ",
   "main": "index.js",
   "repository": {
@@ -47,6 +47,7 @@
     "nodemailer": "^6.7.8",
     "pdf-lib": "^1.17.1",
     "utf8": "^3.0.0",
+    "webp-converter": "^2.3.3",
     "ws": "^8.9.0",
     "xlsx": "^0.17.5"
   }