roster-server 1.5.0 → 1.5.4

package/demo/www/manual.js

@@ -0,0 +1,14 @@
+const path = require('path');
+const file = path.join(__dirname, '..', '..', 'index.js');
+const Roster = require(file);
+
+const roster = new Roster({
+    email: 'admin@example.com',
+});
+
+roster.registerSite('zentara.group', (req, res) => {
+    res.writeHead(200);
+    res.end('Hello from example.com!');
+});
+
+roster.start();

package/demo/www/sio.example.com/index.js

@@ -23,8 +23,4 @@ const app = (httpsServer) => {
     };
 };
 
-app.config = {
-    port: 3334,
-};
-
 module.exports = app;

package/index.js

@@ -12,22 +12,30 @@ class Roster {
         this.cluster = options.cluster || false;
         this.domains = [];
         this.sites = {};
+        this.hostname = options.hostname || '0.0.0.0';
+        this.filename = options.filename || 'index';
 
         const port = options.port || 443;
         if (port === 80) {
-            throw new Error('Port 80 is reserved for ACME challenge. Please use a different port.');
+            throw new Error('⚠️  Port 80 is reserved for ACME challenge. Please use a different port.');
         }
         this.port = port;
     }
 
     loadSites() {
+        // Check if wwwPath exists
+        if (!fs.existsSync(this.wwwPath)) {
+            console.warn(`⚠️  WWW path does not exist: ${this.wwwPath}`);
+            return;
+        }
+
         fs.readdirSync(this.wwwPath, { withFileTypes: true })
             .filter(dirent => dirent.isDirectory())
             .forEach((dirent) => {
                 const domain = dirent.name;
                 const domainPath = path.join(this.wwwPath, domain);
 
-                const possibleIndexFiles = ['index.js', 'index.mjs', 'index.cjs'];
+                const possibleIndexFiles = ['js', 'mjs', 'cjs'].map(ext => `${this.filename}.${ext}`);
                 let siteApp;
                 let loadedFile;
 
@@ -47,9 +55,9 @@ class Roster {
                         this.sites[d] = siteApp;
                     });
 
-                    console.log(`✅ Loaded site: ${domain} (using ${loadedFile})`);
+                    console.log(`✅  Loaded site: ${domain} (using ${loadedFile})`);
                 } else {
-                    console.warn(`⚠️ No index file (js/mjs/cjs) found in ${domainPath}`);
+                    console.warn(`⚠️  No index file (js/mjs/cjs) found in ${domainPath}`);
                 }
             });
     }
@@ -127,16 +135,16 @@ class Roster {
             const currentConfigContentFormatted = JSON.stringify(currentConfig, null, 2);
 
             if (newConfigContent === currentConfigContentFormatted) {
-                console.log('ℹ️ Configuration has not changed. config.json will not be overwritten.');
+                console.log('ℹ️  Configuration has not changed. config.json will not be overwritten.');
                 return;
             }
-            console.log('🔄 Configuration has changed. config.json will be updated.');
+            console.log('🔄  Configuration has changed. config.json will be updated.');
         } else {
-            console.log('🆕 config.json does not exist. A new one will be created.');
+            console.log('🆕  config.json does not exist. A new one will be created.');
         }
 
         fs.writeFileSync(configPath, JSON.stringify(newConfig, null, 2));
-        console.log(`📁 config.json generated at ${configPath}`);
+        console.log(`📁  config.json generated at ${configPath}`);
     }
 
     handleRequest(req, res) {
@@ -158,27 +166,25 @@ class Roster {
         }
     }
 
-    initServers(glx) {
-        const app = (req, res) => {
-            this.handleRequest(req, res);
-        };
+    registerSite(domain, requestHandler) {
+        if (!domain) {
+            throw new Error('Domain is required');
+        }
+        if (typeof requestHandler !== 'function') {
+            throw new Error('requestHandler must be a function');
+        }
 
-        // Obtener los servidores sin iniciarlos
-        const httpsServer = glx.httpsServer(null, app);
-        const httpServer = glx.httpServer();
-
-        // Inicializar las aplicaciones Socket.IO con el servidor HTTPS
-        for (const [host, siteApp] of Object.entries(this.sites)) {
-            if (!host.startsWith('www.')) {
-                const appInstance = siteApp(httpsServer);
-                this.sites[host] = appInstance;
-                this.sites[`www.${host}`] = appInstance;
-                console.log(`🔧 Initialized server for ${host}`);
-            }
+        const domainEntries = [domain];
+        if ((domain.match(/\./g) || []).length < 2) {
+            domainEntries.push(`www.${domain}`);
         }
 
-        // Retornar los servidores para iniciarlos después
-        return { httpsServer, httpServer };
+        this.domains.push(...domainEntries);
+        domainEntries.forEach(d => {
+            this.sites[d] = requestHandler;
+        });
+
+        console.log(`✅  Manually registered site: ${domain}`);
     }
 
     start() {
@@ -193,26 +199,31 @@ class Roster {
             staging: this.staging
         });
 
-        // Usar una promesa para manejar la inicialización
-        return new Promise((resolve, reject) => {
-            try {
-                greenlock.ready((glx) => {
-                    const { httpsServer, httpServer } = this.initServers(glx);
-
-                    // Primero iniciar el servidor HTTPS
-                    httpsServer.listen(this.port, '0.0.0.0', () => {
-                        console.log('ℹ️ HTTPS server listening on port ' + this.port);
-
-                        // Después iniciar el servidor HTTP
-                        httpServer.listen(80, '0.0.0.0', () => {
-                            console.log('ℹ️ HTTP server listening on port 80');
-                            resolve({ httpsServer, httpServer });
-                        });
-                    });
-                });
-            } catch (error) {
-                reject(error);
+        const app = (req, res) => {
+            this.handleRequest(req, res);
+        };
+
+        greenlock.ready(glx => {
+            // Obtener los servidores sin iniciarlos
+            const httpsServer = glx.httpsServer(null, app);
+            const httpServer = glx.httpServer();
+
+            for (const [host, siteApp] of Object.entries(this.sites)) {
+                if (!host.startsWith('www.')) {
+                    const appInstance = siteApp(httpsServer);
+                    this.sites[host] = appInstance;
+                    this.sites[`www.${host}`] = appInstance;
+                    console.log(`🔧 Initialized server for ${host}`);
+                }
             }
+
+            httpServer.listen(80, this.hostname, () => {
+                console.log('ℹ️  HTTP server listening on port 80');
+            });
+
+            httpsServer.listen(this.port, this.hostname, () => {
+                console.log('ℹ️  HTTPS server listening on port ' + this.port);
+            });
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "roster-server",
-    "version": "1.5.0",
+    "version": "1.5.4",
     "description": "👾 RosterServer - A domain host router to host multiple HTTPS.",
     "main": "index.js",
     "scripts": {