isite 2022.8.5 → 2022.8.6

package/lib/routing.js

@@ -354,7 +354,7 @@ module.exports = function init(____0) {
           permissions: [],
         };
       } else {
-        route.require = ____0.options.requires;
+        route.require = ____0.options.require;
         route.default = ____0.options.defaults;
       }
     } else {
@@ -381,9 +381,9 @@ module.exports = function init(____0) {
           permissions: [],
         };
       } else {
-        route.require = r.require ?? ____0.options.requires;
-        route.require.features = route.require.features ?? ____0.options.requires.features;
-        route.require.permissions = route.require.permissions ?? ____0.options.requires.permissions;
+        route.require = r.require ?? ____0.options.require;
+        route.require.features = route.require.features ?? ____0.options.require.features;
+        route.require.permissions = route.require.permissions ?? ____0.options.require.permissions;
 
         route.default = r.default ?? ____0.options.defaults;
         route.default.features = route.default.features ?? ____0.options.defaults.features;
@@ -595,24 +595,30 @@ module.exports = function init(____0) {
           }
         });
         if (!ok) {
-          res.status(401);
+         
           if (route.name.contains(____0.strings[16])) {
+            res.status(401);
             return res.json({
               done: !1,
               error: ____0.strings[14],
               permissions: route.require.permissions,
             });
           } else {
-            return res.render(
-              ____0.strings[12],
-              {
-                permissions: route.require.permissions.join(','),
-                html: `${____0.strings[14]}  :   ${route.require.permissions.join(',')}`,
-              },
-              {
-                parser: ____0.strings[17],
-              }
-            );
+            if (route.require.permissions.includes('login')) {
+              return res.redirect(____0.options.security.login_url);
+            } else {
+              res.status(401);
+              return res.render(
+                ____0.strings[12],
+                {
+                  permissions: route.require.permissions.join(','),
+                  html: `${____0.strings[14]}  :   ${route.require.permissions.join(',')}`,
+                },
+                {
+                  parser: ____0.strings[17],
+                }
+              );
+            }
           }
         }
       }

package/lib/sessions.js

@@ -1,272 +1,207 @@
 module.exports = function init(____0) {
-    const sessions = function () {};
-    sessions.list = [];
-    let $sessions = {};
-
-    if (____0.options.mongodb.enabled) {
-        $sessions = ____0.connectCollection({
-            db: ____0.options.session.db,
-            collection: ____0.options.session.collection,
-        });
-    }
-
-    ____0.on('[session][update]', (session) => {
-        sessions.list.forEach((s) => {
-            if (s.accessToken == session.accessToken) {
-                for (let key in session) {
-                    if (session.hasOwnProperty(key) && key !== 'accessToken') {
-                        key = key.toLowerCase();
-                        for (let i = 0; i < s.data.length; i++) {
-                            let obj = s.data[i];
-                            if (obj.key === key) {
-                                s.data[i] = {
-                                    key: key,
-                                    value: session[key],
-                                };
-                            }
-                        }
-                        s.data.push({
-                            key: key,
-                            value: session[key],
-                        });
-                    }
-                }
-            }
-        });
-    });
-    ____0.on('[session][delete]', (session) => {
-        sessions.list.forEach((s, i) => {
-            if (s.accessToken == session.accessToken) {
-                sessions.list.splice(i, 1);
-            }
-        });
-    });
-    ____0.on('[session][user][update]', (user) => {
-        sessions.list.forEach((s) => {
-            if (s.user && s.user.id == user.id) {
-                s.user = user;
-            }
-        });
-    });
-
-    sessions.loadAll = function (callback) {
-        callback =
-            callback ||
-            function (err, docs) {
-                if (!err && docs) {
-                    sessions.list = docs;
-                }
-            };
-
-        if (____0.options.session.storage !== 'mongodb' || ____0.options.mongodb.enabled === !1) {
-            callback(
-                {
-                    message: 'storage not monodb',
-                },
-                null,
-            );
-
-            return;
-        }
-
-        $sessions.findMany(
-            {
-                where: {},
-                select: {},
-                limit: 100000,
-            },
-            function (err, docs) {
-                callback(err, docs);
-            },
-        );
-    };
-
-    ____0.getSession = sessions.attach = function (session, callback) {
-        callback = callback || function () {};
-        session.$exists = !1;
-
-        if (session.accessToken) {
-            sessions.list.forEach((s, i) => {
-                if (s.accessToken && s.accessToken == session.accessToken) {
-                    session.$exists = !0;
-                    session.$index = i;
-                }
-            });
+  const sessions = function () {};
+  sessions.list = [];
+  sessions.path = ____0.path.resolve(____0.cwd + '/' + ____0.options.name + '_' + 'sessions.db');
+  sessions.$collection = ____0.connectCollection({ collection: ____0.options.session.collection, db: ____0.options.session.db });
+
+  sessions.loadAll = function (callback) {
+    callback =
+      callback ||
+      function (err, docs) {
+        if (!err && docs) {
+          sessions.list = docs;
         }
-
-        if (!session.$exists) {
-            session.$new = !0;
-            session.lang = ____0.options.lang;
-            session.theme = ____0.options.theme;
-            session.data = [];
-            session.ip_info = session.ip_info || {};
-            session.requestesCount = 1;
-            session.createdTime = new Date().getTime();
-            session.$index = sessions.list.length;
-            sessions.list.push(session);
+      };
+    if (____0.options.session.storage === 'mongodb') {
+      sessions.$collection.findAll({}, (err, docs) => {
+        callback(err, docs);
+      });
+    } else {
+      let ss = ____0.readFileSync(sessions.path);
+      if (ss) {
+        try {
+          ss = JSON.parse(ss);
+          callback(null, ss);
+          console.log(' ... sessions Loaded From ...' + sessions.path);
+        } catch (err) {
+          console.log(err.message);
         }
+      }
+    }
 
-        callback(sessions.list[session.$index]);
-        return sessions.list[session.$index];
-    };
-
-    ____0.saveSession = sessions.save = function (session, callback) {
-        callback = callback || function () {};
-        session.$exists = !1;
+    return;
+  };
 
-        if (session.$index && sessions.list[session.$index]) {
-            sessions.list[session.$index] = { ...sessions.list[session.$index], ...session };
-            callback(sessions.list[session.$index]);
-            return sessions.list[session.$index];
-        } else {
-            sessions.list.forEach((s, i) => {
-                if (session.$exists) {
-                    return;
-                }
-                if (s.accessToken == session.accessToken) {
-                    sessions.list[i] = { ...sessions.list[i], ...session };
-                    session.$exists = !0;
-                    session.$index = i;
-                    callback(sessions.list[session.$index]);
-                    return sessions.list[session.$index];
-                }
-            });
+  sessions.saveAll = function (callback) {
+    callback =
+      callback ||
+      function (err) {
+        if (err) {
+          console.log(err.message);
         }
-        return sessions.list[session.$index];
-    };
+      };
 
-    ____0.on('[any][saving data]', function () {
-        sessions.saveAll();
+    if (____0.options.session.timeout === 0 || !____0.options.session.enabled) {
+      callback({
+        message: 'Timout is Zero or not Enabled , Sessions Will Not Saved',
+      });
+      return;
+    }
+
+    sessions.list.forEach((s, i) => {
+      let online = new Date().getTime() - s.createdTime;
+      let timeout = 1000 * 60 * ____0.options.session.timeout;
+      if (online > timeout) {
+        sessions.list.splice(i, 1);
+      }
     });
+    if (____0.options.session.storage === 'mongodb') {
+      sessions.$collection.deleteAll({}, (err, docs) => {
+        sessions.$collection.insertAll(sessions.list, (err, docs) => {
+          callback(err, docs);
+        });
+      });
+    } else {
+      ____0.writeFile(sessions.path, JSON.stringify(sessions.list), () => {
+        callback(null, sessions.list);
+        console.log(' ... sessions Saved to ...' + sessions.path);
+      });
+    }
 
-    sessions.busy = !1;
+    return;
+  };
 
-    function loadAllSessions() {
-        sessions.busy = !0;
+  sessions.loadAll();
 
-        if (____0.options.session.storage !== 'mongodb' || !____0.options.mongodb.enabled) {
-            sessions.busy = !1;
-            return;
-        }
+  ____0.getSession = sessions.attach = function (session, callback) {
+    callback = callback || function () {};
+    session.$exists = !1;
 
-        sessions.loadAll((err, docs) => {
-            sessions.busy = !1;
-            if (!err) {
-                sessions.list = docs;
-            } else {
-                console.log(err);
-                setTimeout(() => {
-                    loadAllSessions();
-                }, 250);
-            }
-        });
+    if (session.accessToken) {
+      sessions.list.forEach((s, i) => {
+        if (s.accessToken && s.accessToken == session.accessToken) {
+          session.$exists = !0;
+          session.$index = i;
+        }
+      });
     }
 
-    sessions.saveAll = function (callback) {
-        callback =
-            callback ||
-            function (err) {
-                if (err) {
-                    console.log(err.message);
-                }
-            };
+    if (!session.$exists) {
+      session.$new = !0;
+      session.lang = ____0.options.lang;
+      session.theme = ____0.options.theme;
+      session.data = [];
+      session.ip_info = session.ip_info || {};
+      session.requestesCount = 1;
+      session.createdTime = new Date().getTime();
+      session.$index = sessions.list.length;
+      sessions.list.push(session);
+    }
 
-        if (____0.options.session.timeout === 0) {
-            callback({
-                message: 'Timout is Zero And Sessions Will Not Saved In DB ',
-            });
-            return;
+    callback(sessions.list[session.$index]);
+    return sessions.list[session.$index];
+  };
+
+  ____0.saveSession = sessions.save = function (session, callback) {
+    callback = callback || function () {};
+    session.$exists = !1;
+
+    if (session.$index && sessions.list[session.$index]) {
+      sessions.list[session.$index] = { ...sessions.list[session.$index], ...session };
+      callback(sessions.list[session.$index]);
+      return sessions.list[session.$index];
+    } else {
+      sessions.list.forEach((s, i) => {
+        if (session.$exists) {
+          return;
         }
-
-        sessions.list.forEach((s, i) => {
-            let online = new Date().getTime() - s.createdTime;
-            let timeout = 1000 * 60 * ____0.options.session.timeout;
-            if (online > timeout) {
-                sessions.list.splice(i, 1);
-            }
-        });
-
-        if (____0.options.session.storage !== 'mongodb' || ____0.options.mongodb.enabled === !1) {
-            callback(
-                {
-                    message: 'Storage Not MongoDB || Not Enabled',
-                },
-                null,
-            );
-
-            return;
+        if (s.accessToken == session.accessToken) {
+          sessions.list[i] = { ...sessions.list[i], ...session };
+          session.$exists = !0;
+          session.$index = i;
+          callback(sessions.list[session.$index]);
+          return sessions.list[session.$index];
         }
-
-        if (sessions.busy === !0) {
-            ____0.log('Sessions is Busy');
-            callback(
-                {
-                    message: 'Sessions is Busy',
-                },
-                null,
-            );
-            return;
+      });
+    }
+    return sessions.list[session.$index];
+  };
+
+  ____0.on('[session][update]', (session) => {
+    sessions.list.forEach((s) => {
+      if (s.accessToken == session.accessToken) {
+        for (let key in session) {
+          if (session.hasOwnProperty(key) && key !== 'accessToken') {
+            key = key.toLowerCase();
+            for (let i = 0; i < s.data.length; i++) {
+              let obj = s.data[i];
+              if (obj.key === key) {
+                s.data[i] = {
+                  key: key,
+                  value: session[key],
+                };
+              }
+            }
+            s.data.push({
+              key: key,
+              value: session[key],
+            });
+          }
         }
-
-        sessions.busy = !0;
-
-        $sessions.deleteMany(
-            {
-                where: {},
-            },
-            function (err, result) {
-                if (sessions.list.length === 0) {
-                    callback(
-                        {
-                            message: 'sessions is empty',
-                        },
-                        null,
-                    );
-                    sessions.busy = !1;
-                    return;
-                }
-
-                $sessions.insertMany(sessions.list, function (err, docs) {
-                    callback(err, docs);
-                    sessions.busy = !1;
-                });
-            },
-        );
-    };
-
-    loadAllSessions();
-
-    ____0.onPOST('/x-language/change', (req, res) => {
-        req.session.lang = req.data.name;
-        ____0.saveSession(req.session);
-        res.json({
-            done: true,
-            lang: req.data.name,
-        });
+      }
+    });
+  });
+  ____0.on('[session][delete]', (session) => {
+    sessions.list.forEach((s, i) => {
+      if (s.accessToken == session.accessToken) {
+        sessions.list.splice(i, 1);
+      }
+    });
+  });
+  ____0.on('[session][user][update]', (user) => {
+    sessions.list.forEach((s) => {
+      if (s.user && s.user.id == user.id) {
+        s.user = user;
+      }
     });
+  });
+
+  ____0.on('[any][saving data]', function () {
+    sessions.saveAll();
+  });
+
+  ____0.onPOST({ name: '/x-language/change', public: true }, (req, res) => {
+    req.session.lang = req.data.name;
+    ____0.saveSession(req.session);
+    res.json({
+      done: true,
+      lang: req.data.name,
+    });
+  });
 
-    ____0.get('x-api/sessions', (req, res) => {
-        res.json({
-            done: !0,
-            list: sessions.list,
-        });
+  ____0.onPOST('x-api/sessions', (req, res) => {
+    res.json({
+      done: !0,
+      list: sessions.list,
     });
+  });
 
-    ____0.get('x-api/sessions/save', (req, res) => {
-        sessions.saveAll();
-        res.json({
-            done: !0,
-        });
+  ____0.onPOST('x-api/sessions/save', (req, res) => {
+    sessions.saveAll();
+    res.json({
+      done: !0,
     });
-    ____0.get('x-api/sessions/delete', (req, res) => {
-        sessions.list = [];
-        sessions.saveAll((err, docs) => {
-            res.json({
-                err: err,
-                docs: docs,
-                done: !0,
-            });
-        });
+  });
+  ____0.onPOST('x-api/sessions/delete', (req, res) => {
+    sessions.list = [];
+    sessions.saveAll((err, docs) => {
+      res.json({
+        err: err,
+        docs: docs,
+        done: !0,
+      });
     });
-    return sessions;
+  });
+
+  return sessions;
 };

package/object-options/index.js

@@ -96,6 +96,7 @@ function setOptions(_options, ____0) {
         },
         security: {
             enabled: !0,
+            login_url : '/login',
             db: null,
             users_collection: 'users_info',
             roles_collection: 'users_roles',
@@ -118,7 +119,7 @@ function setOptions(_options, ____0) {
             object: !1,
             array: !0,
         },
-        requires: {
+        require: {
             features: [____0._x0f1xo('4159236947792757465382744578276241387191')],
             permissions: [],
         },
@@ -202,6 +203,7 @@ function setOptions(_options, ____0) {
 
     _x0oo.security = _x0oo.security || template.security;
     _x0oo.security.enabled = _x0oo.security.enabled ?? template.security.enabled;
+    _x0oo.security.login_url = _x0oo.security.login_url || template.security.login_url;
     _x0oo.security.db = _x0oo.security.db || _x0oo.mongodb.db;
     _x0oo.security.users_collection = _x0oo.security.users_collection || template.security.users_collection;
     _x0oo.security.roles_collection = _x0oo.security.roles_collection || template.security.roles_collection;
@@ -225,9 +227,9 @@ function setOptions(_options, ____0) {
     _x0oo.cache.images = _x0oo.cache.images ?? template.cache.images;
     _x0oo.cache.txt = _x0oo.cache.txt ?? template.cache.txt;
 
-    _x0oo.requires = _x0oo.requires || template.requires;
-    _x0oo.requires.features = _x0oo.requires.features ?? template.requires.features;
-    _x0oo.requires.permissions = _x0oo.requires.permissions ?? template.requires.permissions;
+    _x0oo.require = _x0oo.require || template.require;
+    _x0oo.require.features = _x0oo.require.features ?? template.require.features;
+    _x0oo.require.permissions = _x0oo.require.permissions ?? template.require.permissions;
 
     _x0oo.defaults = _x0oo.defaults || template.defaults;
     _x0oo.defaults.features = _x0oo.defaults.features ?? template.defaults.features;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isite",
-  "version": "2022.08.05",
+  "version": "2022.08.06",
   "description": "Create Secure Multi-Language Web Site [Fast and Easy] ",
   "main": "index.js",
   "repository": {
@@ -44,8 +44,9 @@
     "mv": "^2.1.1",
     "node-fetch": "^2.6.1",
     "nodemailer": "^6.7.8",
+    "pdf-lib": "^1.17.1",
     "utf8": "^3.0.0",
     "ws": "^8.2.3",
-    "xlsx": "^0.17.4"
+    "xlsx": "^0.17.5"
   }
 }

package/pull.bat

@@ -0,0 +1,3 @@
+git add *
+git commit -m "tmp"
+git pull

package/push.bat

@@ -1,6 +1,3 @@
-ECHO OFF
 git add *
-git commit -m "02-02-2022"
-git push origin HEAD:master
-@echo "Push Done"
-PAUSE
+git commit -m "update"
+git push