isite 2025.1.15 → 2025.1.17

package/index.js

@@ -329,7 +329,7 @@ module.exports = function init(options) {
         }
     };
     ____0.importApp = function (app_path, name2) {
-        ____0.log('===  Importing App : ' + app_path);
+        ____0.log('\n===  Importing App : ' + app_path);
         if (____0.isFileExistsSync(app_path + '/site_files/json/words.json')) {
             ____0.words.addFile(app_path + '/site_files/json/words.json');
         }
@@ -372,10 +372,10 @@ module.exports = function init(options) {
 
     if (____0.options.apps === !0) {
         if (____0.isFileExistsSync(____0.options.apps_dir) && ____0.fs.lstatSync(____0.options.apps_dir).isDirectory()) {
-            ____0.log('=== Auto Loading Default Apps ===');
+            ____0.log('\n=== Auto Loading Default Apps ===');
             ____0.fs.readdirSync(____0.options.apps_dir).forEach((file) => {
                 if (____0.fs.lstatSync(____0.options.apps_dir + '/' + file).isDirectory()) {
-                    ____0.importApp(____0.options.apps_dir + '/' + file);
+                    ____0.loadApp(file);
                 }
             });
         }

package/lib/routing.js

@@ -226,7 +226,6 @@ module.exports = function init(____0) {
             res.status(200);
             _0xrrxo.endResponse(req, res);
         }
-
         if (typeof route.path == 'string') {
             ____0.readFile(route.path, function (err, file) {
                 if (!err) {
@@ -261,7 +260,7 @@ module.exports = function init(____0) {
                     return;
                 }
             });
-        } else if (typeof route.path == 'object') {
+        } else if (Array.isArray(route.path)) {
             ____0.readFiles(route.path, function (err, data) {
                 if (!err) {
                     if (____0.options.help) {
@@ -1417,7 +1416,7 @@ module.exports = function init(____0) {
     };
     ____0.servers = [];
     ____0.server = null;
-
+    ____0.serverCount = 0;
     _0xrrxo.start = function (_ports, callback) {
         ____0.startTime = Date.now();
         ____0.ws.wsSupport();
@@ -1433,14 +1432,15 @@ module.exports = function init(____0) {
 
         const ports = [];
 
-        if (typeof _ports === 'number') {
-            ports.some((p0) => p0 == _ports) || ports.push(_ports);
-        } else if (Array.isArray(_ports)) {
-            _ports.forEach((p) => {
-                ports.some((p0) => p0 == p) || ports.push(p);
-            });
+        if (ports.length === 0) {
+            if (typeof _ports === 'number') {
+                ports.some((p0) => p0 == _ports) || ports.push(_ports);
+            } else if (Array.isArray(_ports)) {
+                _ports.forEach((p) => {
+                    ports.some((p0) => p0 == p) || ports.push(p);
+                });
+            }
         }
-
         if (ports.length === 0) {
             if (typeof ____0.options.port === 'number') {
                 ports.some((p0) => p0 == ____0.options.port) || ports.push(____0.options.port);
@@ -1475,12 +1475,14 @@ module.exports = function init(____0) {
                     server.maxHeadersCount = 0;
                     server.timeout = 1000 * ____0.options.responseTimeout;
                     server.on('error', (e) => {
+                        ____0.serverCount++;
                         if (e.code === 'EADDRINUSE') {
                             ____0.log('Address in use, Closing Server : ' + p);
                             server.close();
                         }
                     });
                     server.listen(p, function () {
+                        ____0.serverCount++;
                         if (!____0.server) {
                             ____0.server = server;
                         }
@@ -1488,11 +1490,6 @@ module.exports = function init(____0) {
                         ____0.log('\n-----------------------------------------');
                         ____0.log(` ( ${____0.options.name} ) Running on : http://${____0.options.hostname}:${p} `);
                         ____0.log('-----------------------------------------\n');
-
-                        if (callback) {
-                            callback(____0.servers);
-                        }
-                        ____0.call(____0.strings[9]);
                     });
                 }
             } catch (error) {
@@ -1529,6 +1526,16 @@ module.exports = function init(____0) {
             }
         }
 
+        ____0.readyInterval = setInterval(() => {
+            if (____0.serverCount == ports.length) {
+                clearInterval(____0.readyInterval);
+                ____0.call(____0.strings[9]);
+                if (callback) {
+                    callback(____0.servers);
+                }
+            }
+        }, 100);
+
         return ____0.server;
     };
 

package/lib/ws.js

@@ -59,6 +59,7 @@ module.exports = function init(____0) {
   }, 1000 * 30);
 
   ____0.on(____0.strings[9], () => {
+    console.log('\n Server Ready \n')
     ____0.servers.forEach((server) => {
       server.on('upgrade', function upgrade(request, socket, head) {
         let pathname = ____0.url.parse(request.url).pathname;

package/package.json

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