isite 2023.12.2 → 2023.12.16

package/apps/client-side/app.js

@@ -243,7 +243,7 @@ module.exports = function (site) {
   });
 
   site.post({ name: '/x-api/upload/image', public: true }, (req, res) => {
-    let folder = req.headers['folder'] || new Date().getFullYear() + '_' + new Date().getMonth() + '_' + new Date().getDate();
+    let folder = req.headers['folder'] || new Date().getFullYear() + '_' + (new Date().getMonth() + 1) + '_' + new Date().getDate();
 
     site.createDir(site.options.upload_dir + '/' + folder, () => {
       site.createDir(site.options.upload_dir + '/' + folder + '/images', () => {
@@ -268,13 +268,12 @@ module.exports = function (site) {
               response.image.path = newpath;
               response.image.url = '/x-api/image/' + folder + '/' + newName;
               response.image.size = file.size;
-              if (!response.image.name.like('*.webp')) {
+              if (!response.image.name.like('*.webp|*.gif')) {
                 site.webp.cwebp(newpath, newpath2, '-q 80').then((output) => {
-                  console.log(output);
                   response.image.path = newpath2;
                   response.image.url = '/x-api/image/' + folder + '/' + newName2;
                   res.json(response);
-                  site.fs.unlink(newpath, () => {});
+                  site.deleteFileSync(newpath, () => {});
                 });
               } else {
                 res.json(response);

package/apps/client-side/site_files/css/bootstrap5-addon.css

@@ -114,12 +114,15 @@ i-button.default button {
 i-file {
   display: block;
   padding: 10px !important;
-  border: 1px dashed var(--theme-color);
+  border: 3px dashed var(--theme-color);
   margin: 1% !important;
   height: fit-content;
   width: 98% !important;
 }
-i-file button {
+i-file label {
+  margin-top: 10px !important;
+}
+i-file i-button {
   max-width: 100px;
 }
 i-upload {
@@ -131,19 +134,17 @@ i-datetime .left-10 {
 }
 i-date .fas,
 i-datetime .fas {
-  font-size: 24px;
-  vertical-align: middle;
-  margin-top: 5px;
-  cursor: pointer;
-}
-i-date .fas:hover,
-i-datetime .fas:hover {
-  font-size: 26px;
+  color: green;
 }
 i-date p,
 i-datetime p {
   margin: 0 !important;
 }
+i-date button,
+i-datetime button {
+  background: transparent !important;
+  margin: 0 !important;
+}
 i-date input,
 i-datetime input {
   margin: 0 !important;

package/apps/client-side/site_files/css/images.css

@@ -12,6 +12,7 @@ i-image {
   border: var(--i-image-border);
   margin: 5px;
   border-radius: 5px;
+  padding: 5px;
 }
 i-image div{
   width: 100%;

package/apps/client-side/site_files/css/theme.css

@@ -98,7 +98,7 @@
   --btn-box-shadow-color: #272727;
   --btn-border-radius: 5px;
 
-  --i-image-border: 2px dashed var(--modal-header-background-color);
+  --i-image-border: 3px dashed var(--modal-header-background-color);
   --i-image-view-border: 2px solid var(--modal-header-background-color);
 
   --fieldset-border: 2px solid #283e4a;

package/apps/client-side/site_files/css/theme_dark.css

@@ -99,7 +99,7 @@
     --btn-box-shadow-color: #030303;
     --btn-border-radius: 0px;
 
-    --i-image-border: 2px dashed #030303;
+    --i-image-border: 3px dashed #030303;
     --i-image-view-border: 2px solid #030303;
 
     --fieldset-border: 1px solid #151515;

package/apps/client-side/site_files/css/theme_paper.css

@@ -129,7 +129,7 @@
     --btn-sgin-color: #000000;
     --btn-sgin-background-color: #ffffff;
 
-    --i-image-border: 2px dashed var(--theme-color);
+    --i-image-border: 3px dashed var(--theme-color);
     --i-image-view-border: 2px solid var(--theme-color);
 
     --fieldset-border: 1px solid var(--theme-color);

package/apps/client-side/site_files/html/directive/i-button.html

@@ -1,5 +1,5 @@
 <button class="btn {{class}} {{class2}}" type="button" ng-click="click()" ng-disabled="busy">
-  <span ng-show="busy" class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
+  <span ng-show="busy || clickBusy" class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
   {{label}}
   <i class="{{fa}}"></i>
 </button>

package/apps/client-side/site_files/html/directive/i-date.html

@@ -2,7 +2,8 @@
   <label for="{{id2}}" class="form-label"> <span class="red bold"> {{requird}} </span> {{label}}</label>
   <div class="row" ng-hide="editOnly">
     <p ng-click="editOnly = true" class="blue bold border padding pointer">
-      <span class="bold">{{model.selectedDay || '__'}} </span> <span class="orange"> / </span> <span class="bold">{{model.selectedMonth.name || '______'}}</span> <span class="orange"> / </span> <span class="bold">{{model.selectedYear || '____'}}</span>
+      <span class="bold">{{model.selectedDay || '__'}} </span> <span class="orange"> / </span> <span class="bold">{{model.selectedMonth.name || '______'}}</span> <span class="orange"> / </span>
+      <span class="bold">{{model.selectedYear || '____'}}</span>
     </p>
   </div>
   <div class="row" ng-show="editOnly">
@@ -21,7 +22,7 @@
       />
     </div>
     <div class="col2">
-      <i class="fas fa-save" ng-click="updateDate()"></i>
+      <i-button type="save" ng-click="updateDate()"></i-button>
     </div>
     <div class="invalid-feedback"></div>
   </div>

package/apps/client-side/site_files/html/directive/i-file.html

@@ -1,12 +1,11 @@
 <div class="row">
   <label class="col"> {{label}} </label>
-  <button ng-hide="ngModel || viewOnly" class="btn btn-primary col">
-    <i class="fas fa-upload"></i>
-  </button>
+  <i-button type="upload" ng-hide="ngModel || viewOnly" class="col"></i-button>
+
   <div class="row">
     <input class="hidden" type="file" name="fileToUpload" accept="{{accept}}" />
     <div class="progress row">
-      <div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="100" style="width: {{value}}%"></div>
+      <div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="100"></div>
     </div>
   </div>
 

package/apps/client-side/site_files/html/directive/i-image.html

@@ -1,7 +1,7 @@
-<div class="text-center pointer">
+<div class="text-center pointer" ng-click="upload()">
   <input class="hidden" type="file" name="fileToUpload" accept="{{accept}}" />
   <div class="center">
-    <img ng-src="{{ngModel.url}}" ngClick="ngClick()" onerror="this.src='/images/no.jpg'" ng-click="upload()" />
+    <img ng-src="{{ngModel.url}}" ngClick="ngClick()" onerror="this.src='/images/no.jpg'" />
     <i-button type="upload" ng-click="upload()"></i-button>
     <i-button type="delete" ng-click="delete()"></i-button>
   </div>

package/apps/client-side/site_files/html/directive/i-list.html

@@ -14,7 +14,7 @@
     </div>
 
     <div class="row center padding pointer">
-      <a class="btn red" ng-click="updateModel(null)"> <i class="fa fa-trash"></i> Clear </a>
+      <i-button class="block center" type="clear" ng-click="updateModel(null)" label="Clear"></i-button>
     </div>
   </div>
 </div>

package/apps/client-side/site_files/html/directive/i-upload.html

@@ -1,5 +1,5 @@
 <form class="mb-3">
-    <input  class="hidden" type="file" name="file" />
-    <i-button type="{{type}}" fa="fas fa-upload" ngClick="ngClick()" url="{{ngModel}}" label="{{label}}"> </i-button>
-    <progress class="row"></progress>
-</form>
+  <input class="hidden" type="file" name="file" />
+  <i-button type="{{type}}" fa="fas fa-upload" ngClick="ngClick()" url="{{ngModel}}" label="{{label}}"> </i-button>
+  <progress class="row"></progress>
+</form>

package/apps/client-side/site_files/js/bootstrap-5-directive.js

@@ -204,97 +204,125 @@ app.directive('iRadio', function () {
   };
 });
 
-app.directive('iButton', function () {
-  return {
-    restrict: 'E',
-    scope: {
-      label: '@',
-      type: '@',
-      class2: '@',
-      loading: '@',
-      click: '&',
-      fa: '@',
-    },
-    link: function ($scope, element, attrs, ctrl) {
-      $scope.type = $scope.type || '';
-      $scope.class = $scope.class = 'btn-dark';
-      $scope.fa = $scope.fa || $scope.label ? '' : 'fas fa-play';
-
-      if ($scope.type.like('*add*') || $scope.type.like('*new*')) {
-        $scope.fa = 'fas fa-plus';
-        $scope.class = 'btn-primary';
-      } else if ($scope.type.like('*update*') || $scope.type.like('*edit*')) {
-        $scope.fa = 'fas fa-edit';
-        $scope.class = 'btn-warning';
-      } else if ($scope.type.like('*save*')) {
-        $scope.fa = 'fas fa-save';
-        $scope.class = 'btn-success';
-      } else if ($scope.type.like('*list*')) {
-        $scope.fa = 'fas fa-list';
-        $scope.class = 'btn-info';
-      } else if ($scope.type.like('unapprove')) {
-        $scope.fa = 'fas fa-eject';
-        $scope.class = 'btn-danger';
-      } else if ($scope.type.like('approve')) {
-        $scope.fa = 'fas fa-check-double';
-        $scope.class = 'btn-primary';
-      } else if ($scope.type.like('*view*') || $scope.type.like('*details*')) {
-        $scope.fa = 'fas fa-eye';
-        $scope.class = 'btn-info';
-      } else if ($scope.type.like('*delete*') || $scope.type.like('*remove*')) {
-        $scope.fa = 'fas fa-trash';
-        $scope.class = 'btn-danger';
-      } else if ($scope.type.like('*exit*') || $scope.type.like('*close*')) {
-        $scope.fa = 'fas fa-times-circle';
-        $scope.class = 'btn-danger';
-      } else if ($scope.type.like('*print*')) {
-        $scope.fa = 'fas fa-print';
-        $scope.class = 'btn-secondary';
-      } else if ($scope.type.like('*export*') || $scope.type.like('*excel*')) {
-        $scope.fa = 'fas fa-file-export';
-        $scope.class = 'btn-secondary';
-      } else if ($scope.type.like('*search*') || $scope.type.like('*find*')) {
-        $scope.fa = 'fas fa-search';
-        $scope.class = 'btn-light';
-      } else if ($scope.type.like('*login*') || $scope.type.like('*signin*')) {
-        $scope.fa = 'fas fa-sign-in-alt';
-        $scope.class = 'btn-light';
-      } else if ($scope.type.like('*logout*') || $scope.type.like('*signout*')) {
-        $scope.fa = 'fas fa-sign-out-alt';
-        $scope.class = 'btn-light';
-      } else if ($scope.type.like('*push*')) {
-        $scope.fa = 'fas fa-plus-circle';
-        $scope.class = 'btn-primary';
-      } else if ($scope.type.like('*cancel*')) {
-        $scope.fa = 'fas fa-minus-circle';
-        $scope.class = 'btn-danger';
-      } else if ($scope.type.like('*upload*')) {
-        $scope.fa = 'fas fa-upload';
-        $scope.class = 'btn-primary';
-      } else if ($scope.type.like('*up*')) {
-        $scope.fa = 'fas fa-long-arrow-alt-up';
-        $scope.class = 'btn-light';
-      } else if ($scope.type.like('*down*')) {
-        $scope.fa = 'fas fa-long-arrow-alt-down';
-        $scope.class = 'btn-light';
-      }
-      if ($scope.type.like('*default*')) {
-        $scope.class = '';
-      }
-      if ($scope.class2) {
-        $scope.class = $scope.class2;
-      }
-      $scope.$watch('loading', (loading) => {
-        if (loading === 'true') {
-          $scope.busy = true;
-        } else {
-          $scope.busy = false;
+app.directive('iButton', [
+  '$interval',
+  '$timeout',
+  function ($interval, $timeout) {
+    return {
+      restrict: 'E',
+      scope: {
+        label: '@',
+        type: '@',
+        class2: '@',
+        loading: '@',
+        ngClick: '&',
+        fa: '@',
+      },
+      link: function ($scope, element, attrs, ctrl) {
+        $scope.type = $scope.type || '';
+        $scope.class = $scope.class = 'btn-light';
+        $scope.fa = $scope.fa || $scope.label ? '' : 'fas fa-mouse-pointer';
+
+        if ($scope.type.like('*add*|*new*')) {
+          $scope.fa = 'fas fa-plus';
+          $scope.class = 'btn-primary';
+        } else if ($scope.type.like('*update*|*edit*')) {
+          $scope.fa = 'fas fa-edit';
+          $scope.class = 'btn-warning';
+        } else if ($scope.type.like('*save*')) {
+          $scope.fa = 'fas fa-save';
+          $scope.class = 'btn-success';
+        } else if ($scope.type.like('*list*')) {
+          $scope.fa = 'fas fa-list';
+          $scope.class = 'btn-info';
+        } else if ($scope.type.like('unapprove')) {
+          $scope.fa = 'fas fa-eject';
+          $scope.class = 'btn-danger';
+        } else if ($scope.type.like('approve')) {
+          $scope.fa = 'fas fa-check-double';
+          $scope.class = 'btn-primary';
+        } else if ($scope.type.like('*view*|*details*|*show*')) {
+          $scope.fa = 'fas fa-eye';
+          $scope.class = 'btn-info';
+        } else if ($scope.type.like('*delete*|*remove*|*clear*')) {
+          $scope.fa = 'fas fa-trash';
+          $scope.class = 'btn-danger';
+        } else if ($scope.type.like('*exit*|*close*')) {
+          $scope.fa = 'fas fa-times-circle';
+          $scope.class = 'btn-danger';
+        } else if ($scope.type.like('*print*')) {
+          $scope.fa = 'fas fa-print';
+          $scope.class = 'btn-secondary';
+        } else if ($scope.type.like('*export*|*excel*')) {
+          $scope.fa = 'fas fa-file-export';
+          $scope.class = 'btn-secondary';
+        } else if ($scope.type.like('*import*')) {
+          $scope.fa = 'fas fa-file-upload';
+          $scope.class = 'btn-secondary';
+        } else if ($scope.type.like('*search*|*find*')) {
+          $scope.fa = 'fas fa-search';
+          $scope.class = 'btn-light';
+        } else if ($scope.type.like('*login*|*signin*')) {
+          $scope.fa = 'fas fa-sign-in-alt';
+          $scope.class = 'btn-light';
+        } else if ($scope.type.like('*logout*|*signout*')) {
+          $scope.fa = 'fas fa-sign-out-alt';
+          $scope.class = 'btn-light';
+        } else if ($scope.type.like('*push*')) {
+          $scope.fa = 'fas fa-plus-circle';
+          $scope.class = 'btn-primary';
+        } else if ($scope.type.like('*cancel*')) {
+          $scope.fa = 'fas fa-minus-circle';
+          $scope.class = 'btn-danger';
+        } else if ($scope.type.like('*upload*')) {
+          $scope.fa = 'fas fa-upload';
+          $scope.class = 'btn-primary';
+        } else if ($scope.type.like('*up*')) {
+          $scope.fa = 'fas fa-long-arrow-alt-up';
+          $scope.class = 'btn-light';
+        } else if ($scope.type.like('*down*')) {
+          $scope.fa = 'fas fa-long-arrow-alt-down';
+          $scope.class = 'btn-light';
+        } else if ($scope.type.like('*reset*')) {
+          $scope.fa = 'fas fa-sync-alt';
+          $scope.class = 'btn-light';
+        } else if ($scope.type.like('*stop*')) {
+          $scope.fa = 'fas fa-stop';
+          $scope.class = 'btn-light';
+        } else if ($scope.type.like('*play*')) {
+          $scope.fa = 'far fa-play-circle';
+          $scope.class = 'btn-light';
+        } else if ($scope.type.like('*copy*')) {
+          $scope.fa = 'fas fa-copy';
+          $scope.class = 'btn-light';
         }
-      });
-    },
-    template: `/*##client-side/directive/i-button.html*/`,
-  };
-});
+        if ($scope.type.like('*default*')) {
+          $scope.class = '';
+        }
+        if ($scope.class2) {
+          $scope.class = $scope.class2;
+        }
+        $scope.click = function () {
+          $scope.clickBusy = true;
+          if ($scope.ngClick) {
+            $scope.ngClick();
+          }
+          $timeout(() => {
+            $scope.clickBusy = false;
+          }, 250);
+        };
+        $scope.$watch('loading', (loading) => {
+          if (loading === 'true') {
+            $scope.busy = true;
+          } else {
+            $scope.busy = false;
+          }
+        });
+      },
+      template: `/*##client-side/directive/i-button.html*/`,
+    };
+  },
+]);
 app.directive('iList', [
   '$interval',
   '$timeout',
@@ -587,7 +615,7 @@ app.directive('iChecklist', [
   },
 ]);
 
-app.directive('iDate', function () {
+app.directive('iDate', function ($timeout) {
   return {
     restrict: 'E',
     required: 'ngModel',
@@ -676,6 +704,7 @@ app.directive('iDate', function () {
         if ($scope.ngModel1) {
           $scope.ngModel = $scope.ngModel1;
           $scope.editOnly = false;
+
           if ($scope.ngChange) {
             $scope.ngChange();
           }
@@ -836,9 +865,10 @@ app.directive('iFile', [
         $scope.viewOnly = $scope.view === undefined ? false : true;
 
         let input = $(element).find('input')[0];
-        let button = $(element).find('button')[0];
+        let button = $(element).find('i-button')[0];
 
         let progress = $(element).find('.progress')[0];
+        let progressBar = $(element).find('.progress-bar')[0];
         $(progress).hide();
 
         $scope.id = Math.random().toString().replace('.', '_');
@@ -859,6 +889,7 @@ app.directive('iFile', [
               if (e) {
                 $(progress).show();
                 $scope.value = (e.loaded / e.total) * 100;
+                progressBar.style.width = $scope.value + '%';
                 $scope.max = e.total;
                 if ($scope.value === 100) {
                   $(progress).hide();
@@ -1079,7 +1110,6 @@ app.directive('iVideo', [
           }
         };
         $scope.delete = function () {
-          console.log('delete ...');
           $scope.ngModel = null;
           video.setAttribute('src', null);
         };
@@ -1184,7 +1214,6 @@ app.directive('iUpload', [
                   progress.max = e.total;
                 } else if (data) {
                   if ($scope.onUploaded) {
-                    console.log(err, data, e);
                     $scope.onUploaded({ $data: data });
                   }
                 }

package/index.js

@@ -170,6 +170,8 @@ module.exports = function init(options) {
   ____0.isFileExistsSync = ____0.fsm.isFileExistsSync;
 
   ____0.readFile = ____0.fsm.readFile;
+  ____0.readFileRaw = ____0.fsm.readFileRaw;
+  ____0.readFileStream = ____0.fsm.readFileStream;
   ____0.readFiles = ____0.fsm.readFiles;
   ____0.readFileSync = ____0.fsm.readFileSync;
 
@@ -263,7 +265,7 @@ module.exports = function init(options) {
   ____0.reset = function () {};
 
   ____0.on('[any][saving data]', function () {
-    ____0.log('Saving Data :: ' + ____0.options.savingTime + ' Minute ');
+    ____0.log( ____0.options.name  + ' :: Saving Data :: ' + ____0.options.savingTime + ' Minute ');
   });
 
   setInterval(function () {

package/lib/collection.js

@@ -692,6 +692,7 @@ module.exports = function init(____0, option, db) {
       }
     });
   };
+  
   $collection.loadAll = (options, callback) => {
     callback = callback || function () {};
     ____0.mongodb.findMany(

package/lib/fsm.js

@@ -12,21 +12,12 @@ module.exports = function init(____0) {
   fsm.list = [];
 
   fsm.isFileExistsSync = (path) => {
-    for (let i = 0; i < fsm.list.length; i++) {
-      let f = fsm.list[i];
-      if (f.path === path) {
-        return !0;
-      }
-    }
-    return fs.existsSync(path);
+    return fsm.list.some((f) => f.path === path) || fs.existsSync(path);
   };
 
   fsm.isFileExists = (path, callback) => {
-    callback = callback || function () {};
-    if (fsm.isFileExistsSync(path)) {
-      callback(!0);
-    } else {
-      callback(!1);
+    if (callback) {
+      callback(fsm.isFileExistsSync(path));
     }
   };
 
@@ -37,16 +28,9 @@ module.exports = function init(____0) {
   };
 
   fsm.stat = function (path, callback) {
-    callback = callback || function () {};
-    fsm.isFileExists(path, function (yes) {
-      if (yes) {
-        fs.stat(path, callback);
-      } else {
-        callback({
-          message: 'file not exists',
-        });
-      }
-    });
+    if (callback) {
+      callback(fsm.statSync(path));
+    }
   };
 
   fsm.createDirSync = fsm.mkdirSync = function (path) {
@@ -116,7 +100,7 @@ module.exports = function init(____0) {
       };
 
     try {
-      let path2 = path + '_tmp';
+      let path2 = path + '.isite-backup';
       fsm.deleteFileSync(path2);
       fs.writeFileSync(path2, data, {
         encoding: encode || 'utf8',
@@ -124,7 +108,7 @@ module.exports = function init(____0) {
       fsm.deleteFileSync(path);
       fs.renameSync(path2, path);
       fsm.deleteFileSync(path2);
-      callback();
+      callback(null, path);
     } catch (err) {
       callback(err);
     }
@@ -136,12 +120,6 @@ module.exports = function init(____0) {
     }, 100);
   };
 
-  fsm.readFile = function (path, callback) {
-    setTimeout(() => {
-      fsm.readFileSync(path, callback);
-    }, 100);
-  };
-
   fsm.getFilePath = function (name) {
     if (____0.isFileExistsSync(name)) {
       return name;
@@ -206,66 +184,143 @@ module.exports = function init(____0) {
     }
   };
 
-  fsm.readFileSync = function (path, callback) {
-    callback =
-      callback ||
-      function (err) {
-        if (err) {
-          ____0.log(err);
+  fsm.readFileStream = function (path) {
+    var readerStream = fs.createReadStream(path);
+    readerStream.setEncoding(____0.fn.getFileEncode(path));
+    return readerStream;
+  };
+
+  fsm.readFileRaw = function (path, callback) {
+    var data = '';
+    var readerStream = fsm.readFileStream(path);
+    readerStream.on('data', function (chunk) {
+      data += chunk;
+    });
+
+    readerStream.on('end', function () {
+      callback(data);
+    });
+
+    readerStream.on('error', function (err) {
+      console.log(err.stack);
+    });
+  };
+
+  fsm.readFileNow = function (path, callback) {
+    fsm.readFileRaw(path, (data) => {
+      path = path.replace('.isite-backup', '');
+      if (data) {
+        let file = {
+          path: path,
+          content: data,
+          count: 1,
+          stat: fsm.statSync(path),
+          time: new Date().getTime(),
+        };
+
+        file.json = function (callback) {
+          try {
+            if (!file.isJson) {
+              file.content = JSON.parse(file.content);
+              file.isJson = true;
+            }
+          } catch (error) {
+            file.error = error;
+            console.log(error);
+          }
+          if (callback) {
+            callback(file);
+          } else {
+            return file;
+          }
+        };
+        fsm.list.push(file);
+        if (callback) {
+          callback(null, file);
         }
-      };
+      } else {
+        callback({
+          message: path + '  :: Error Read File Not Exists',
+        });
+      }
+    });
+  };
+  
+  fsm.readFile = function (path, callback) {
+    path = fsm.getFilePath(path);
+
+    if (!path) {
+      if (callback) {
+        callback({
+          message: path + '  :: Error Read File Not Exists',
+        });
+      }
+    }
+
+    let index = fsm.list.findIndex((f) => f.path == path);
+    if (index !== -1) {
+      fsm.list[index].count++;
+      fsm.list[index].time = new Date().getTime();
+      if (callback) {
+        callback(null, fsm.list[index]);
+      }
+      return;
+    }
+
+    if (fsm.isFileExistsSync(path)) {
+      fsm.readFileNow(path, callback);
+    } else if (fsm.isFileExistsSync(path + '.isite-backup')) {
+      fsm.readFileNow(path + '.isite-backup', callback);
+    } else {
+      if (callback) {
+        callback({
+          message: path + '  :: Error Read File Not Exists',
+        });
+      }
+    }
+  };
 
+  fsm.readFileSyncRaw = function (path) {
+    return fs.readFileSync(path, ____0.fn.getFileEncode(path));
+  };
+  fsm.readFileSync = function (path) {
     path = fsm.getFilePath(path);
+
     if (!path) {
       return '';
     }
-    let path2 = path + '_tmp';
-
-    for (let index = 0; index < fsm.list.length; index++) {
-      let file = fsm.list[index];
-      if (file.path == path) {
-        file.count++;
-        callback(null, file.content, file);
-        return file.content;
-      }
+
+    let index = fsm.list.findIndex((f) => f.path == path);
+    if (index !== -1) {
+      fsm.list[index].count++;
+      fsm.list[index].time = new Date().getTime();
+      return fsm.list[index].content;
     }
 
-    let encode = 'utf8';
-    encode = ____0.fn.getFileEncode(path);
     if (fsm.isFileExistsSync(path)) {
-      let data = fs.readFileSync(path, encode);
       let file = {
         path: path,
-        content: data,
-        etag: ____0.x0md50x(data),
+        content: fsm.readFileSyncRaw(path),
         count: 1,
         stat: fsm.statSync(path),
-        encode: encode,
-        time: Date.now(),
+        time: new Date().getTime(),
       };
       fsm.list.push(file);
-      callback(null, file.content, file);
-      return data;
-    } else if (fsm.isFileExistsSync(path2)) {
-      let data = fs.readFileSync(path2, encode);
+
+      return file.content;
+    } else if (fsm.isFileExistsSync(path + '.isite-backup')) {
       let file = {
         path: path,
-        content: data,
-        etag: ____0.x0md50x(data),
+        content: fsm.readFileSyncRaw(path + '.isite-backup'),
         count: 1,
-        stat: fsm.statSync(path),
-        encode: encode,
-        time: Date.now(),
+        stat: fsm.statSync(path + '.isite-backup'),
+        time: new Date().getTime(),
       };
       fsm.list.push(file);
-      callback(null, file.content, file);
-      return data;
-    } else {
-      callback({
-        message: path + '  :: Error Read File Not Exists',
-      });
-      return '';
+
+      return file.content;
     }
+    return '';
   };
 
   fsm.readFiles = function (paths, callback) {
@@ -290,12 +345,12 @@ module.exports = function init(____0) {
     callback(null, content);
   };
 
-  fsm.isImage = function(extname){
-    if (extname == 'png' || extname == 'jpg' || extname == 'jpeg' || extname == 'bmp' || extname == 'ico'|| extname == 'webp') {
-     return true
+  fsm.isImage = function (extname) {
+    if (extname == 'png' || extname == 'jpg' || extname == 'jpeg' || extname == 'bmp' || extname == 'ico' || extname == 'webp') {
+      return true;
     }
-    return false
-  }
+    return false;
+  };
 
   fsm.getContent = function (name, callback) {
     callback = callback || function () {};

package/lib/parser.js

@@ -207,7 +207,7 @@ module.exports = function init(req, res, ____0, route) {
       return render_site('setting.' + v);
     }
   }
-  function render_req(v) {
+  function renderRequest(v) {
     if (!v) {
       return '';
     }
@@ -254,7 +254,7 @@ module.exports = function init(req, res, ____0, route) {
         out = ____0.toJson(out);
       }
     }
-    return out;
+    return typeof out !== 'undefined' ? out : '';
   }
 
   function renderSession(v) {
@@ -264,9 +264,9 @@ module.exports = function init(req, res, ____0, route) {
         createdTime: req.session.createdTime,
         modifiedTime: req.session.modifiedTime,
         data: req.session.data,
-        ip: req.session.ip,
         requestesCount: req.session.requestesCount,
         busy: req.session.$busy,
+        ip: req.session.ip,
         ipLookup: req.session.ip_list.find((info) => info.ip == req.session.ip),
       });
     }
@@ -814,7 +814,7 @@ module.exports = function init(req, res, ____0, route) {
           txt = txt.replace(matches[i], render_site(v));
         } else if (v.startsWith('##req.')) {
           v = v.replace('##req.', '').replace('##', '');
-          txt = txt.replace(matches[i], render_req(v));
+          txt = txt.replace(matches[i], renderRequest(v));
         } else if (v.startsWith('##session.')) {
           v = v.replace('##session.', '').replace('##', '');
           txt = txt.replace(matches[i], renderSession(v));

package/lib/routing.js

@@ -51,10 +51,6 @@ module.exports = function init(____0) {
     //   // return;
     // }
 
-    // if (____0.options.help) {
-    //   res.set('help-info-etag', hash);
-    // }
-
     // res.set('ETag', hash);
 
     if (____0.options.cache.enabled) {
@@ -208,9 +204,9 @@ module.exports = function init(____0) {
     }
 
     if (typeof route.path == 'string') {
-      ____0.readFile(route.path, function (err, data, file) {
+      ____0.readFile(route.path, function (err, file) {
         if (!err) {
-          route.content = data.toString('utf8');
+          route.content = file.content.toString('utf8');
           if (route.encript && route.encript === '123') {
             route.content = ____0.f1(route.content);
           }
@@ -635,6 +631,7 @@ module.exports = function init(____0) {
   _0xrrxo.handleServer = async function (req, res) {
     req.host = req.headers['host'] || '';
     req.origin = req.headers['origin'] || req.host;
+    req.referer = req.headers['referer'] || '';
     req.domain = '';
     req.subDomain = '';
     req.obj = {};
@@ -696,6 +693,9 @@ module.exports = function init(____0) {
     req.socket.remoteAddress = req.socket.remoteAddress || '';
     req.acceptEncoding = req.headers[____0.strings[5]] ? req.headers[____0.strings[5]] : '';
     res.ip = req.ip = req.headers[____0.strings[6]] ? req.headers[____0.strings[6]] : req.socket.remoteAddress.replace('::ffff:', '');
+    if (req.ip == '::1') {
+      req.ip = '127.0.0.1';
+    }
     res.ip2 = req.ip2 = req.socket.localAddress.replace('::ffff:', '');
     res.port = req.port = req.socket.remotePort;
     res.port2 = req.port2 = req.socket.localPort;
@@ -704,7 +704,7 @@ module.exports = function init(____0) {
     req.urlRaw = req.url;
     req.urlParserRaw = ____0.url.parse(req.urlRaw, !0);
     req.urlParser = ____0.url.parse(req.urlRaw.toLowerCase(), !0);
-    
+
     res.set = (a, b, c) => {
       if (res.writeHeadEnabled === !1 || res.finished === !0 || res.headersSent) {
         return res;
@@ -1074,7 +1074,10 @@ module.exports = function init(____0) {
         return res.jsonFile(obj);
       } else {
         res.set(____0.strings[7], 'application/json');
-        return res.status(200).ending(time || 0, ____0.toJson(obj));
+        obj = ____0.toJson(obj);
+        res.status(200).ending(time || 0, obj);
+        obj = null;
+        return res;
       }
     };
 
@@ -1087,13 +1090,13 @@ module.exports = function init(____0) {
     res.setHeader('Access-Control-Allow-Credentials', 'true');
     res.setHeader('Access-Control-Allow-Headers', req.headers['access-control-request-headers'] || 'Origin, X-Requested-With, Content-Type, Accept , Access-Token , Authorization');
     res.setHeader('Access-Control-Allow-Methods', req.headers['access-control-request-method'] || 'POST,GET,DELETE,PUT,OPTIONS,VIEW,HEAD,CONNECT,TRACE');
-    res.setHeader('Access-Control-Allow-Origin', req.headers.host || req.headers.referer || '*');
-    if (req.headers.origin) {
-      res.setHeader('Access-Control-Allow-Origin', req.headers.origin);
+    res.setHeader('Access-Control-Allow-Origin', req.host || req.referer || '*');
+    if (req.origin) {
+      res.setHeader('Access-Control-Allow-Origin', req.origin);
     }
 
-    if (____0.options.www === false && req.headers.host.contains('www')) {
-      res.redirect('//' + req.headers.host.replace('www.', '') + req.url, 301);
+    if (____0.options.www === false && req.host.contains('www')) {
+      res.redirect('//' + req.host.replace('www.', '') + req.url, 301);
       return;
     }
 
@@ -1144,7 +1147,7 @@ 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]);
+        req.params[map.name] = decodeURIComponent(req.urlParser.arr[map.index].replace(/\+/g, ' '));
         req.paramsRaw[map.name] = req.urlParserRaw.arr[map.index];
       }
 

package/lib/security.js

@@ -170,9 +170,9 @@ module.exports = function init(____0) {
   security.addPermissions = function (list, callback) {
     callback = callback || function () {};
     if (typeof list === 'string') {
-      ____0.readFile(list, (err, data) => {
+      ____0.readFile(list, (err, file) => {
         if (!err) {
-          let arr = ____0.fromJson(data);
+          let arr = ____0.fromJson(file.content);
           for (let i = 0; i < arr.length; i++) {
             security.permissions.push(arr[i]);
           }

package/lib/session.js

@@ -28,28 +28,38 @@ module.exports = function init(req, res, ____0, callback) {
       req.features.push('ip.' + req.ip);
 
       if (req.host) {
+        req.features.push('host.' + req.host);
         req.hostArray = req.host.split(':')[0].split('.').reverse();
         if (req.hostArray[0] == 'localhost') {
           req.domain = req.hostArray[0];
           req.features.push('host.' + req.hostArray[0]);
-          if (req.hostArray[1]) {
-            req.subDomain = req.hostArray[1];
+          if (req.hostArray.length == 2) {
+            req.domain2 = req.hostArray[1];
             req.features.push('host.' + req.hostArray[1]);
+          } else if (req.hostArray.length == 3) {
+            req.domain2 = req.hostArray[1];
+            req.domain3 = req.hostArray[2];
+            req.features.push('host.' + req.domain2);
+            req.features.push('host.' + req.domain3);
           }
         } else {
           if (req.hostArray.length == 2) {
             req.domain = req.hostArray[1] + '.' + req.hostArray[0];
+            req.features.push('host.' + req.domain);
             req.features.push('host.' + req.hostArray[0]);
             req.features.push('host.' + req.hostArray[1]);
           } else if (req.hostArray.length == 3) {
             req.domain = req.hostArray[1] + '.' + req.hostArray[0];
-            req.subDomain = req.hostArray[2];
+            req.domain2 = req.hostArray[2];
+            req.features.push('host.' + req.domain);
             req.features.push('host.' + req.hostArray[0]);
             req.features.push('host.' + req.hostArray[1]);
             req.features.push('host.' + req.hostArray[2]);
           } else if (req.hostArray.length == 4) {
             req.domain = req.hostArray[1] + '.' + req.hostArray[0];
-            req.subDomain = req.hostArray[2];
+            req.domain2 = req.hostArray[2];
+            req.domain3 = req.hostArray[3];
+            req.features.push('host.' + req.domain);
             req.features.push('host.' + req.hostArray[0]);
             req.features.push('host.' + req.hostArray[1]);
             req.features.push('host.' + req.hostArray[2]);
@@ -57,7 +67,6 @@ module.exports = function init(req, res, ____0, callback) {
           }
         }
       }
-      
 
       if (req.cookies.obj && req.cookies.obj['_ga'] && req.cookies.obj['_ga'].contains('sb')) {
         req.features.push('browser.social');
@@ -123,23 +132,11 @@ module.exports = function init(req, res, ____0, callback) {
       }
     }
 
-    function ipInfo(session, callback) {
-      callback(session);
-
-      if (!____0.options.ipLookup) {
-        return session;
-      }
-
-      if (session.ip == '127.0.0.1' || session.ip == 'localhost') {
-        return session;
-      }
-
-      if (session.$busy) {
+    function ipInfo(session) {
+      if (session.$busy || !____0.options.ipLookup || session.ip == '127.0.0.1') {
         return session;
       }
-
       session.$busy = !0;
-      ____0.saveSession(session);
       if (session.ip_list.length === 0 || !session.ip_list.some((info) => info.ip === session.ip)) {
         ____0
           .fetch(`http://ip-api.com/json/${session.ip}`, {
@@ -157,13 +154,8 @@ module.exports = function init(req, res, ____0, callback) {
               info.date = new Date();
               info.ip = session.ip;
               session.ip_list.unshift(info);
+              session.$busy = !1;
               ____0.saveSession(session);
-              setTimeout(() => {
-                ____0.getSession(session, (session) => {
-                  session.$busy = !1;
-                  ____0.saveSession(session);
-                });
-              }, 1000 * 30);
             });
           })
           .catch((err) => {
@@ -198,12 +190,14 @@ module.exports = function init(req, res, ____0, callback) {
               }
               req.features.push('login');
             }
-            ipInfo(session, callback);
+            ____0.saveSession(session);
+            callback(session);
+            ipInfo(session);
           }
         }
       );
     } else {
-      ipInfo(session, callback);
+      callback(session);
     }
   });
 };

package/lib/storage.js

@@ -2,7 +2,8 @@ module.exports = function init(____0) {
   const storage = {};
   storage.list = [];
   storage.busy = true;
-  storage.$collectoin = ____0.connectCollection('app_options');
+  storage.$collectoin = ____0.connectCollection({ collection: 'app_options', identity: { enabled: true } });
+
   storage.$collectoin.findAll({ app_name: 'storage' }, (err, docs) => {
     if (!err && docs && docs.length > 0) {
       docs.forEach((doc) => {
@@ -15,26 +16,27 @@ module.exports = function init(____0) {
   });
 
   storage.save = function () {
-    if (storage.busy) {
-      setTimeout(() => {
-        storage.save();
-      }, 1000 * 10);
-      return;
-    }
-
-    storage.busy = true;
     storage.list.forEach((doc, i) => {
       doc.app_name = 'storage';
       if (doc.$update) {
         delete doc.$update;
-        storage.$collectoin.update(doc);
+        storage.$collectoin.update(doc, (err, result) => {
+          if (!err && result.doc) {
+            let index = storage.list.findIndex((s) => s.key === result.doc.key);
+            if (index !== -1) {
+              storage.list[index] = result.doc;
+            }
+          }
+        });
       } else if (doc.$add) {
         delete doc.$add;
         storage.$collectoin.add(doc, (err, newDoc, oldDoc) => {
           if (!err && newDoc) {
             let index = storage.list.findIndex((s) => s.key === newDoc.key);
-            if (index >= 0) {
+            if (index !== -1) {
               storage.list[index] = newDoc;
+            } else {
+              storage.list.push(newDoc);
             }
           } else if (err) {
             console.log(err.message, oldDoc);
@@ -42,15 +44,12 @@ module.exports = function init(____0) {
         });
       }
     });
-    setTimeout(() => {
-      storage.busy = false;
-    }, 1000 * 5);
   };
 
   storage.fn = function (key, value) {
     if (key && value !== undefined) {
       let index = storage.list.findIndex((s) => s.key === key);
-      if (index >= 0) {
+      if (index !== -1) {
         storage.list[index].value = value;
         storage.list[index].$update = true;
       } else {
@@ -60,13 +59,15 @@ module.exports = function init(____0) {
           $add: true,
         });
       }
-      storage.save();
     } else if (key && value === undefined) {
       return storage.list.find((s) => s.key === key)?.value;
     } else {
       return null;
     }
   };
+  ____0.on('[any][saving data]', function () {
+    storage.save();
+  });
 
   ____0.on(____0.strings[9], () => {
     ____0.onGET('/x-api/events_list', (req, res) => {

package/lib/temp.js

@@ -1,8 +1,8 @@
 
   storage.path = ____0.path.join(____0.options.cwd, ____0.x0md50x(____0.options.name) + '.dbz');
-  ____0.fs.readFile(storage.path, (err, data) => {
+  ____0.fs.readFile(storage.path, (err, file) => {
     if (!err) {
-      data = ____0.zlib.inflateSync(data);
+      data = ____0.zlib.inflateSync(file.content);
       storage.list = ____0.fromJson(Buffer.from(data, 'utf-8').toString());
 
       if (____0.typeof(storage.list) !== 'Array') {

package/lib/vars.js

@@ -34,9 +34,9 @@ module.exports = function init(____0) {
   }
 
   ____0.addVars = function(path){
-    ____0.readFile(path, (err, data) => {
+    ____0.readFile(path, (err, file) => {
       if (!err) {
-        let vars = JSON.parse(data)
+        let vars = JSON.parse(file.content)
         for (let i = 0; i < vars.length; i++) {
           ____0.vars.push(vars[i])
         }

package/lib/words.js

@@ -52,9 +52,9 @@ module.exports = function init(____0) {
   };
 
   app.addFile = function (path) {
-    ____0.readFile(path, (err, data) => {
+    ____0.readFile(path, (err, file) => {
       if (!err) {
-        let arr = ____0.fromJson(data);
+        let arr = ____0.fromJson(file.content);
         if (Array.isArray(arr)) {
           arr.forEach((doc) => {
             app.add(doc);

package/object-options/lib/features.js

@@ -44,9 +44,9 @@ module.exports = function init(____0) {
   }
 
   ____0.addfeatures = function(path){
-    ____0.readFile(path, (err, data) => {
+    ____0.readFile(path, (err, file) => {
       if (!err) {
-        let features = JSON.parse(data)
+        let features = JSON.parse(file.content)
         for (let i = 0; i < features.length; i++) {
           ____0.features.push(features[i])
         }

package/object-options/lib/fn.js

@@ -227,26 +227,10 @@ exports = module.exports = function init(____0) {
 
   fn.getFileEncode = function (path) {
     path = path || '';
-    if (
-      path.endsWith('.woff2') ||
-      path.endsWith('.woff') ||
-      path.endsWith('.ttf') ||
-      path.endsWith('.svg') ||
-      path.endsWith('.otf') ||
-      path.endsWith('.png') ||
-      path.endsWith('.gif') ||
-      path.endsWith('.jpg') ||
-      path.endsWith('.jpeg') ||
-      path.endsWith('.ico') ||
-      path.endsWith('.bmp') ||
-      path.endsWith('.webp') ||
-      path.endsWith('.xls') ||
-      path.endsWith('.xlsx') ||
-      path.endsWith('.eot')
-    ) {
+    if (path.contains('.woff|.ttf|.svg|.otf|.png|.gif|.jpg|.ico|.bmp|.webp|.xls|.eot')) {
       return 'binary';
     }
-    return 'utf8';
+    return 'UTF8';
   };
 
   fn.toHtmlTable = function (obj) {

package/package.json

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