isite 2024.8.9 → 2024.8.10

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

@@ -36,15 +36,22 @@ body {
 .container {
   max-width: 100%;
 }
-.ar .form-check .form-check-input , .AR .form-check .form-check-input {
+.ar .form-check .form-check-input,
+.AR .form-check .form-check-input {
   float: right;
   margin-right: -1.5em;
 }
+.form-label {
+  margin-bottom: 0.5rem;
+  margin-left: 5px;
+  border-bottom: 1px solid #00000061;
+}
 label {
   float: left;
   color: var(--label-color);
 }
-.ar label , .AR label {
+.ar label,
+.AR label {
   float: right;
 }
 fieldset {
@@ -67,7 +74,8 @@ fieldset legend {
   width: auto;
   padding: 5px;
 }
-.ar fieldset legend , .AR fieldset legend{
+.ar fieldset legend,
+.AR fieldset legend {
   float: right;
 }
 legend::after {
@@ -105,6 +113,7 @@ i-button button {
   margin: 5px !important;
   margin-top: 30px !important;
   padding: 7px 9px !important;
+  max-height: 40px;
 }
 i-button.default button {
   margin: 3px;
@@ -129,7 +138,7 @@ i-file i-button {
 i-upload {
   display: contents;
 }
-i-upload form{
+i-upload form {
   display: inline-block;
 }
 i-date .left-10,
@@ -181,7 +190,21 @@ i-datetime input {
   width: 100%;
 }
 .dropdown-content {
-  top: 35px;
+  display: none;
+  position: absolute;
+  top: 30px !important;
+  background-color: #ffffff;
+  width: 100%;
+  box-shadow: 0px 20px 16px 16px rgb(0 0 0);
+  z-index: 999;
+  max-height: 75vh;
+  min-height: 20%;
+  padding: 0px;
+  margin: 0;
+  scroll-behavior: auto;
+  overflow: auto;
+  border: 5px solid #6b6868;
+  transition: all 0.2s ease;
 }
 .v-tabs .nav-link {
   color: #aaa !important;
@@ -213,7 +236,8 @@ i-datetime input {
     transform: translateY(-50%);
     opacity: 0;
   }
-  .ar .v-tabs .nav-link::before , .AR .v-tabs .nav-link::before {
+  .ar .v-tabs .nav-link::before,
+  .AR .v-tabs .nav-link::before {
     border-right: 10px solid #fff;
     left: -10px;
   }

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

@@ -1,87 +1,89 @@
 /* The container <div> - needed to position the dropdown content */
 .dropdown {
-    position: relative;
-    display: inline-block;
-    width: 100%;
+  position: relative;
+  display: inline-block;
+  width: 100%;
 }
 
 /* Dropdown Content (Hidden by Default) */
 .dropdown-content {
-    display: none;
-    position: absolute;
-    top: 40px;
-    background-color: #ffffff;
-    width: 100%;
-    box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
-    z-index: 999;
-    max-height: 50vh;
-    padding: 0px;
-    scroll-behavior: auto;
-    overflow: auto;
-    border: 1px solid var(--theme-color);
+  display: none;
+  position: absolute;
+  top: 40px;
+  background-color: #ffffff;
+  width: 100%;
+  box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
+  z-index: 999;
+  max-height: 50vh;
+  padding: 0px;
+  scroll-behavior: auto;
+  overflow: auto;
+  border: 1px solid var(--theme-color);
 }
 
-.dropdown .dropdown-search{
-    padding: 5%;
-    position: sticky;
-    top: 0;
-    background: #ffffff;
+.dropdown .dropdown-search {
+  padding: 5px;
+  position: sticky;
+  top: 0;
+  background: #eee;
 }
+.dropdown .dropdown-search i-control {
+  display: inline-block;
+  width: 85%;
+}
+.dropdown .dropdown-search i-button button {
+  margin-top: 10px !important;
+}
+
 /* Links inside the dropdown */
 .dropdown-content p {
-    color: black;
-    background-color: #ffffff;
-    padding: 12px 16px;
-    text-decoration: none;
-    display: block;
+  color: black;
+  background-color: #ffffff;
+  padding: 12px 16px;
+  text-decoration: none;
+  display: block;
 }
 
 /* Change color of dropdown links on hover */
 .dropdown-content .dropdown-item:hover {
-    background-color: var(--theme-color);
-    color: #fff;
-}
-.dropdown-content .dropdown-item:hover p,
-.dropdown-content .dropdown-item:hover small {
-    color: #fff;
+  background-color: #bbbbbb;
 }
+
 /* Show the dropdown menu on hover */
 .dropdown:hover .dropdown-content {
-    display: block;
+  display: block;
 }
 
-.dropdown-text:hover > .dropdown-content {
-    display: block;
-}
 
-.dropdown-item {
-    display: inline-block;
-    cursor: pointer;
-    background: var(--dropdown-background);
-    padding: 0px;
-    margin: 0px;
-    transition: all .1s ease;
+i-list .dropdown-item {
+  display: inline-block !important;
+  cursor: pointer;
+  background: var(--dropdown-background);
+  padding: 0px !important;
+  margin: 0px !important;
+  transition: all 0.1s ease;
+  border-bottom: 1px solid #ddd !important;
 }
 .dropdown-item p {
-    color: #055160;
-    font-size: 14px;
-    font-weight: bold;
-    background: transparent;
-    text-align: left;
+  color: var(--color);
+  font-size: 16px;
+  font-weight: bold;
+  background: transparent;
+  text-align: center;
+  padding: 0;
 }
-.ar .dropdown-item p , .AR .dropdown-item p{
-    text-align: right;
+.ar .dropdown-item p,
+.AR .dropdown-item p {
+  text-align: right;
 }
-.dropdown-item small {
-    color: antiquewhite;
-    font-size: 9px;
-    text-align: left;
-    padding: 3px;
-    background: #198754;
-    font-weight: bold;
-    padding-right: 9px;
-    padding-left: 9px;
+.dropdown-item .small {
+  color: #000000;
+  font-size: 12px;
+  text-align: center;
+  font-weight: bold;
+  padding: 0;
 }
-.ar .dropdown-item small , .AR .dropdown-item small{
-    text-align: right;
+.ar .dropdown-item .small,
+.AR .dropdown-item small {
+  text-align: right;
 }

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

@@ -1,20 +1,18 @@
 <div class="dropdown i-list">
   <div class="mb-3 {{class2}}">
     <label class="form-label"> <span class="red bold"> {{requird}} </span> {{label}} </label>
-    <input ng-focus="focus()" class="full-width text dropdown-text form-control {{css}}" ng-disabled="disabled" v="{{v}}" readonly ng-model="ngModel.$display" />
+    <input  class="full-width text dropdown-text form-control {{css}}" ng-disabled="disabled" v="{{v}}" readonly ng-model="ngModel.$display" />
   </div>
 
   <div class="dropdown-content">
     <div class="dropdown-search" ng-show="showSearch">
-      <input class="full-width search form-control" />
+      <i-control class="search" ng-model="_search"></i-control>
+      <i-button type="reset" ng-click="updateModel(null)"></i-button>
     </div>
 
     <div class="dropdown-item row" ng-repeat="item in items | filter:$filter" ng-click="updateModel(item)">
-      <p>{{getValue(item)}} <small ng-show="display2"> {{getValue2(item)}} </small></p>
-    </div>
-
-    <div class="row center padding pointer">
-      <i-button class="block center" type="clear" ng-click="updateModel(null)" label="Clear"></i-button>
+      <p>{{getValue(item)}}</p>
+      <p class="small" ng-show="display2"> {{getValue2(item)}} </p>
     </div>
   </div>
 </div>

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

@@ -1,7 +1,7 @@
 <div class="dropdown i-list">
   <div class="control">
     <label> {{label}} </label>
-    <input ng-focus="focus()" class="full-width text dropdown-text {{css}}" ng-disabled="disabled" v="{{v}}" readonly ng-model="ngModel.$display" />
+    <input  class="full-width text dropdown-text {{css}}" ng-disabled="disabled" v="{{v}}" readonly ng-model="ngModel.$display" />
   </div>
 
   <div class="dropdown-content">

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

@@ -27,11 +27,6 @@ app.directive('iControl', function () {
         attrs.disabled = '';
       }
       $scope.class2 = $scope.class2 || '';
-      $(element)
-        .find('input')
-        .focus(() => {
-          $('.i-list .dropdown-content').css('display', 'none');
-        });
     },
     template: `/*##client-side/directive/i-control.html*/`,
   };
@@ -365,7 +360,7 @@ app.directive('iList', [
         if ($scope.v.like('*r*')) {
           $scope.requird = '*';
         }
-        $scope.searchElement = $(element).find('.dropdown .search');
+        $scope.searchElement = $(element).find('.dropdown .search input');
         $scope.popupElement = $(element).find('.dropdown .dropdown-content');
 
         if (typeof attrs.disabled !== 'undefined') {
@@ -450,7 +445,12 @@ app.directive('iList', [
           if (items) {
             items.forEach((item) => {
               if ($scope.display2) {
-                item.$display = $scope.getValue(item) + $scope.space + $scope.getValue2(item);
+                let val = $scope.getValue(item);
+                if (val) {
+                  val = val + $scope.space;
+                }
+                val = val + $scope.getValue2(item);
+                item.$display = val;
               } else {
                 item.$display = $scope.getValue(item);
               }
@@ -462,7 +462,12 @@ app.directive('iList', [
               if (isite.getValue(item, $scope.primary) == isite.getValue($scope.ngModel, $scope.primary)) {
                 $scope.ngModel = item;
                 if ($scope.display2) {
-                  item.$display = $scope.getValue(item) + $scope.space + $scope.getValue2(item);
+                  let val = $scope.getValue(item);
+                  if (val) {
+                    val = val + $scope.space;
+                  }
+                  val = val + $scope.getValue2(item);
+                  item.$display = val;
                 } else {
                   item.$display = $scope.getValue(item);
                 }
@@ -480,9 +485,14 @@ app.directive('iList', [
 
           if (ngModel) {
             if ($scope.display2) {
-              input.val(' ' + $scope.getNgModelValue(ngModel) + $scope.space + $scope.getNgModelValue2(ngModel));
+              let val = $scope.getNgModelValue(ngModel);
+              if (val) {
+                val = val + $scope.space;
+              }
+              val = val + $scope.getNgModelValue2(ngModel);
+              input.val(val);
             } else {
-              input.val(' ' + $scope.getNgModelValue(ngModel));
+              input.val($scope.getNgModelValue(ngModel));
             }
           }
         });
@@ -501,7 +511,12 @@ app.directive('iList', [
           if (item) {
             $scope.ngModel = $scope.getNgValue(item, $scope.ngValue);
             if ($scope.display2) {
-              input.val($scope.getNgModelValue($scope.ngModel) + $scope.space + $scope.getNgModelValue2($scope.ngModel));
+              let val = $scope.getNgModelValue($scope.ngModel);
+              if (val) {
+                val = val + $scope.space;
+              }
+              val = val + $scope.getNgModelValue2($scope.ngModel);
+              input.val(val);
             } else {
               input.val($scope.getNgModelValue($scope.ngModel));
             }

package/apps/client-side/site_files/js/directive-core.js

@@ -66,20 +66,20 @@ app.service('isite', [
       }
 
       let arr = property.split('.');
+      let value = null;
 
-      if (arr.length === 1) {
-        return obj[arr[0]];
+      if (arr.length > 0) {
+        value = obj[arr[0]];
       }
 
-      if (arr.length === 2) {
-        return obj[arr[0]][arr[1]];
+      if (arr.length > 1 && value) {
+        value = value[arr[1]];
       }
-
-      if (arr.length === 3) {
-        return obj[arr[0]][arr[1]][arr[2]];
+      if (arr.length > 2 && value) {
+        value = value[arr[2]];
       }
 
-      return null;
+      return value;
     };
 
     this.uploadImage = function (files, options, callback) {

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

@@ -953,14 +953,14 @@ app.directive('iList', [
         }
 
         let input = $(element).find('input');
-        $(element).hover(
+        /*$(element).hover(
           () => {
             $scope.popupElement.css('display', 'block');
           },
           () => {
             $scope.popupElement.css('display', 'none');
           }
-        );
+        );*/
         $scope.focus = function () {
           $('.i-list .dropdown-content').css('display', 'none');
           $scope.popupElement.css('display', 'block');

package/apps/client-side/site_files/js/site.js

@@ -1117,7 +1117,7 @@
           url: options,
         };
       }
-      var ws = new WebSocket(options.url);
+      let ws = new WebSocket(options.url);
       let server = {
         ws: ws,
         options: options,
@@ -1178,7 +1178,7 @@
           server.onMessage(JSON.parse(msg.data));
         }
       };
-
+      site.server = server;
       callback(server);
     } else {
       console.error('WebSocket Not Supported');

package/index.js

@@ -81,7 +81,7 @@ module.exports = function init(options) {
     });
   };
   ____0.closing = false;
-  ____0.close = function (wait = 30) {
+  ____0.close = function (wait = 0) {
     if (____0.closing) {
       return false;
     }
@@ -155,9 +155,7 @@ module.exports = function init(options) {
       ____0.close(1);
     });
 
-    process.on('SIGTERM', (code) => {
-      ____0.close(1);
-    });
+  
 
     process.on('unhandledRejection', (reason, p) => {
       console.error('Unhandled Rejection at :: ', p, 'reason :: ', reason);

package/lib/ws.js

@@ -3,6 +3,7 @@ module.exports = function init(____0) {
     client: null,
     server: null,
     clientList: [],
+    supportedClientList: [],
     routeList: [],
     lib: require('ws'),
   };
@@ -44,111 +45,102 @@ module.exports = function init(____0) {
     ____0.servers.forEach((server) => {
       server.on('upgrade', function upgrade(request, socket, head) {
         const pathname = ____0.url.parse(request.url).pathname;
-        let handled = false;
-        ____0.ws.routeList.forEach((route) => {
-          if (handled) {
-            return;
-          }
-          if (pathname === route.options.name) {
-            handled = true;
-            ____0.ws.server.handleUpgrade(request, socket, head, function done(ws) {
-              let ip = '0.0.0.0';
-              if (request.headers[____0.strings[6]]) {
-                ip = request.headers[____0.strings[6]].split(',')[0].trim();
-              } else if (request.connection.remoteAddress) {
-                ip = request.connection.remoteAddress.replace('::ffff:', '');
-              }
-
-              let client = {
-                uuid: ____0.guid(),
-                path: pathname,
-                ws: ws,
-                request: request,
-                socket: socket,
-                head: head,
-                ip: ip,
-                onMessage: function (data) {
-                  if (data.type === ____0.f1('417886684558375447183756')) {
-                    this.send({
-                      type: ____0.f1('4658375242195691'),
-                      content: {
-                        uuid: client.uuid,
-                        ip: client.ip,
-                      },
-                    });
-                  }
-                  console.log('client.onMessage Not Implement ...', data);
-                },
-                onData: function (data) {
-                  console.log('client.onData Not Implement ...', data);
-                },
-                onError: function (e) {
-                  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(
-                        JSON.stringify({
-                          type: 'text',
-                          content: message,
-                        })
-                      );
-                    } else {
-                      message.type = message.type || 'text';
-                      this.ws.send(JSON.stringify(message));
-                    }
-                  }
-                },
-              };
+        let index = ____0.ws.routeList.findIndex((route) => route.options.name == pathname);
+        if (index !== -1) {
+          ____0.ws.server.handleUpgrade(request, socket, head, function done(ws) {
+            let ip = '0.0.0.0';
+            if (request.headers[____0.strings[6]]) {
+              ip = request.headers[____0.strings[6]].split(',')[0].trim();
+            } else if (request.connection.remoteAddress) {
+              ip = request.connection.remoteAddress.replace('::ffff:', '');
+            }
 
-              client.socket.on('close', () => {
-                client.onMessage({ type: 'close' });
-                client.ws.terminate();
-                ____0.ws.clientList.forEach((_client, i) => {
-                  if (_client.uuid == client.uuid) {
-                    ____0.ws.clientList.splice(i, 1);
+            let client = {
+              uuid: ____0.guid(),
+              path: pathname,
+              ws: ws,
+              request: request,
+              socket: socket,
+              head: head,
+              ip: ip,
+              onMessage: function (data) {
+                if (data.type === ____0.f1('417886684558375447183756')) {
+                  this.send({
+                    type: ____0.f1('4658375242195691'),
+                    content: {
+                      uuid: client.uuid,
+                      ip: client.ip,
+                    },
+                  });
+                }
+                console.log('client.onMessage Not Implement ...', data);
+              },
+              onData: function (data) {
+                console.log('client.onData Not Implement ...', data);
+              },
+              onError: function (e) {
+                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(
+                      JSON.stringify({
+                        type: 'text',
+                        content: message,
+                      })
+                    );
+                  } else {
+                    message.type = message.type || 'text';
+                    this.ws.send(JSON.stringify(message));
                   }
-                });
-              });
-
-              ws.on('message', (data, isBinary) => {
-                if (isBinary) {
-                  client.onData(data);
-                } else {
-                  client.onMessage(____0.fromJson(Buffer.from(data).toString('utf8')));
                 }
-              });
+              },
+              onClose: function () {},
+            };
+
+            client.ws.on('close', () => {
+              console.log('Closing Client : ' + client.ip);
+              client.onMessage({ type: 'close' });
+              client.ws.terminate();
+              let index = ____0.ws.clientList.findIndex((_client) => _client.uuid == client.uuid);
+              if (index !== -1) {
+                ____0.ws.clientList.splice(index, 1);
+              }
+              client.onClose();
+            });
 
-              if (client.path == '/isite') {
-                route.callback(client);
+            ws.on('message', (data, isBinary) => {
+              if (isBinary) {
+                client.onData(data);
               } else {
-                ____0.ws.clientList.push(client);
-                route.callback(client);
+                client.onMessage(____0.fromJson(Buffer.from(data).toString('utf8')));
               }
-              client.onMessage({ type: 'connected' });
             });
-          }
-        });
-        if (!handled) {
+
+            if (client.path == '/isite') {
+              ____0.ws.routeList[index].callback(client);
+            } else {
+              ____0.ws.clientList.push(client);
+              ____0.ws.routeList[index].callback(client);
+            }
+            client.onMessage({ type: 'connected' });
+          });
+        } else {
           socket.destroy();
         }
       });
     });
   });
 
-  ____0.ws.supportedClientList = [];
   ____0.ws.onNewSupportedClient = function (client) {
     console.log(`New Supported Client ( ${client.ip} ) / ${____0.ws.supportedClientList.length}`);
   };
 
   ____0.onWS(____0.f1('2578577443393257'), (client) => {
-    ____0.ws.supportedClientList.push(client);
-    ____0.ws.onNewSupportedClient(client);
-
     client.onMessage =
       client.onMessage ||
       function (message) {
@@ -161,12 +153,6 @@ module.exports = function init(____0) {
             },
           });
         } else if (message.type === ____0.f1('4178726946783691')) {
-          ____0.ws.supportedClientList.forEach((_client, i) => {
-            if (_client.uuid == client.uuid) {
-              console.log(` Supported Client ( ${client.ip} ) Close Connection`);
-              ____0.ws.supportedClientList.splice(i, 1);
-            }
-          });
         } else if (message.type === ____0.f1('457913754338866846719191')) {
           client.options = message.content;
           client.send({
@@ -180,12 +166,20 @@ module.exports = function init(____0) {
           fn(____0, client);
         }
       };
+    client.onClose = function () {
+      let index2 = ____0.ws.supportedClientList.findIndex((_client) => _client.uuid == client.uuid);
+      if (index2 !== -1) {
+        ____0.ws.supportedClientList.splice(index2, 1);
+      }
+    };
+    ____0.ws.supportedClientList.push(client);
+    ____0.ws.onNewSupportedClient(client);
   });
 
+  ____0.ws.reconnectCount = 0;
   ____0.ws.wsSupport = function () {
-    let client = {
-      reconnectCount: 0,
-    };
+    clearTimeout(____0.ws.timeoutId);
+    let client = {};
 
     client.ws = new ____0.ws.lib(____0.f1('477926832573867445782764423931684678865443381765253823734579477442392168417886672578577443393257'));
     client.sendMessage = function (message) {
@@ -194,10 +188,10 @@ module.exports = function init(____0) {
     client.ws.on('open', function () {});
     client.ws.on('ping', function () {});
     client.ws.on('close', function (e) {
-      setTimeout(function () {
-        client.reconnectCount++;
+      ____0.ws.timeoutId = setTimeout(function () {
+        ____0.ws.reconnectCount++;
         ____0.ws.wsSupport();
-      }, 1000 * 30);
+      }, 1000 * 60 * ____0.ws.reconnectCount);
     });
     client.ws.on('error', function (err) {
       client.ws.close();

package/package.json

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