roster-server 1.2.6 → 1.4.2

package/README.md

@@ -30,7 +30,7 @@ Your project should look something like this:
 └── www/
     ├── example.com/
     │   └── index.js
-    └── anotherdomain.com/
+    └── subdomain.example.com/
         └── index.js
 ```
 
@@ -38,10 +38,11 @@ Your project should look something like this:
 
 ```javascript
 // /srv/roster/server.js
-const Roster = require('roster-express');
+const Roster = require('roster-server');
 
 const options = {
     maintainerEmail: 'admin@example.com',
+    greenlockConfigDir: '/srv/greenlock.d', // Path to your Greenlock configuration directory
     wwwPath: '/srv/www', // Path to your 'www' directory (default: '../www')
     staging: false // Set to true for Let's Encrypt staging environment
 };
@@ -54,12 +55,59 @@ server.start();
 
 Each domain should have its own folder under `www`, containing an `index.js` that exports a request handler function.
 
-For example, `www/example.com/index.js`:
+### Examples
 
-```javascript
-module.exports = (req, res) => {
-    res.writeHead(200, { 'Content-Type': 'text/plain' });
-    res.end('Hello from example.com!');
+I'll help analyze the example files shown. You have 3 different implementations demonstrating various ways to handle requests in RosterServer:
+
+1. **Basic HTTP Handler**:
+```javascript:demo/www/example.com/index.js
+module.exports = (server) => {
+    return (req, res) => {
+        res.writeHead(200, { 'Content-Type': 'text/plain; charset=utf-8' });
+        res.end('"Loco de pensar, queriendo entrar en razón, y el corazón tiene razones que la propia razón nunca entenderá."');
+    };
+};
+```
+
+2. **Express App**:
+```javascript:demo/www/express.example.com/index.js
+const express = require('express');
+
+module.exports = (server) => {
+    const app = express();
+    app.get('/', (req, res) => {
+        res.setHeader('Content-Type', 'text/plain; charset=utf-8');
+        res.send('"Loco de pensar, queriendo entrar en razón, y el corazón tiene razones que la propia razón nunca entenderá."');
+    });
+
+    return app;
+}
+```
+
+3. **Socket.IO Server**:
+```javascript:demo/www/sio.example.com/index.js
+const { Server } = require('socket.io');
+
+module.exports = (server) => {
+    const io = new Server(server);
+
+    io.on('connection', (socket) => {
+        console.log('A user connected');
+
+        socket.on('chat:message', (msg) => {
+            console.log('Message received:', msg);
+            io.emit('chat:message', msg);
+        });
+
+        socket.on('disconnect', () => {
+            console.log('User disconnected');
+        });
+    });
+
+    return (req, res) => {
+        res.writeHead(200);
+        res.end('Socket.IO server running');
+    };
 };
 ```
 
@@ -76,7 +124,7 @@ And that's it! Your server is now hosting multiple HTTPS-enabled sites. 🎉
 
 ### Automatic SSL Certificate Management
 
-RosterExpress uses [greenlock-express](https://www.npmjs.com/package/greenlock-express) to automatically obtain and renew SSL certificates from Let's Encrypt. No need to manually manage certificates ever again. Unless you enjoy that sort of thing. 🧐
+RosterServer uses [greenlock-express](https://www.npmjs.com/package/greenlock-express) to automatically obtain and renew SSL certificates from Let's Encrypt. No need to manually manage certificates ever again. Unless you enjoy that sort of thing. 🧐
 
 ### Redirects from `www`
 
@@ -84,11 +132,11 @@ All requests to `www.yourdomain.com` are automatically redirected to `yourdomain
 
 ### Dynamic Site Loading
 
-Add a new site? Just drop it into the `www` folder with an `index.js` file, and RosterExpress will handle the rest. No need to restart the server. Well, you might need to restart the server. But that's what `nodemon` is for, right? 😅
+Add a new site? Just drop it into the `www` folder with an `index.js` file, and RosterServer will handle the rest. No need to restart the server. Well, you might need to restart the server. But that's what `nodemon` is for, right? 😅
 
 ## ⚙️ Configuration Options 
 
-When creating a new `RosterExpress` instance, you can pass the following options:
+When creating a new `RosterServer` instance, you can pass the following options:
 
 - `maintainerEmail` (string): Your email for Let's Encrypt notifications.
 - `wwwPath` (string): Path to your `www` directory containing your sites.
@@ -97,14 +145,14 @@ When creating a new `RosterExpress` instance, you can pass the following options
 
 ## 🧂 A Touch of Magic
 
-You might be thinking, "But setting up HTTPS and virtual hosts is supposed to be complicated and time-consuming!" Well, not anymore. With RosterExpress, you can get back to writing code that matters, like defending Earth from alien invaders! 👾👾👾
+You might be thinking, "But setting up HTTPS and virtual hosts is supposed to be complicated and time-consuming!" Well, not anymore. With RosterServer, you can get back to writing code that matters, like defending Earth from alien invaders! 👾👾👾
 
 
 ## 🤝 Contributing
 
 Feel free to submit issues or pull requests. Or don't. I'm not your boss. 😜
 
-If you find any issues or have suggestions for improvement, please open an issue or submit a pull request on the [GitHub repository](https://github.com/clasen/RosterExpress).
+If you find any issues or have suggestions for improvement, please open an issue or submit a pull request on the [GitHub repository](https://github.com/clasen/RosterServer).
 
 ## 🙏 Acknowledgments 
 

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

@@ -1,4 +1,6 @@
-module.exports = (req, res) => {
-    res.writeHead(200, { 'Content-Type': 'text/plain; charset=utf-8' });
-    res.end('"Loco de pensar, queriendo entrar en razón, y el corazón tiene razones que la propia razón nunca entenderá."');
+module.exports = (server) => {
+    return (req, res) => {
+        res.writeHead(200, { 'Content-Type': 'text/plain; charset=utf-8' });
+        res.end('"Loco de pensar, queriendo entrar en razón, y el corazón tiene razones que la propia razón nunca entenderá."');
+    };
 };

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

@@ -0,0 +1,11 @@
+const express = require('express');
+
+module.exports = (server) => {
+    const app = express();
+    app.get('/', (req, res) => {
+        res.setHeader('Content-Type', 'text/plain; charset=utf-8');
+        res.send('"Loco de pensar, queriendo entrar en razón, y el corazón tiene razones que la propia razón nunca entenderá."');
+    });
+
+    return app;
+}

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

@@ -1,7 +1,7 @@
 const { io } = require("socket.io-client");
 
 // Connect to the server
-const socket = io('https://test.zentara.group', {
+const socket = io('https://sio.example.com', {
     rejectUnauthorized: false  // Only use this in development
 });
 

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

@@ -1,33 +1,24 @@
-const https = require('https');
 const { Server } = require('socket.io');
 
-const server = https.createServer();
+module.exports = (server) => {
+    const io = new Server(server);
 
-// Initialize Socket.IO with the HTTPS server
-const io = new Server(server, {
-    cors: {
-        origin: "*",
-        methods: ["GET", "POST"]
-    },
-    allowEIO3: true,
-    transports: ['websocket', 'polling']
-});
+    io.on('connection', (socket) => {
+        console.log('A user connected');
 
-// Handle socket connections
-io.on('connection', (socket) => {
-    console.log('A user connected');
+        socket.on('chat:message', (msg) => {
+            console.log('Message received:', msg);
+            io.emit('chat:message', msg);
+        });
 
-    // Handle chat messages
-    socket.on('chat:message', (msg) => {
-        console.log('Message received:', msg);
-        // Broadcast the message to all connected clients
-        io.emit('chat:message', msg);
+        socket.on('disconnect', () => {
+            console.log('User disconnected');
+        });
     });
 
-    // Handle disconnection
-    socket.on('disconnect', () => {
-        console.log('User disconnected');
-    });
-});
-
-module.exports = server;
+    // Devolvemos el handler para las peticiones HTTP
+    return (req, res) => {
+        res.writeHead(200);
+        res.end('Socket.IO server running');
+    };
+};

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

@@ -1,8 +1,6 @@
-const https = require('https');
-
-const server = https.createServer((req, res) => {
-    res.writeHead(200, { 'Content-Type': 'text/plain; charset=utf-8' });
-    res.end('"Loco de pensar, queriendo entrar en razón, y el corazón tiene razones que la propia razón nunca entenderá."');
-});
-
-module.exports = server;
+module.exports = (server) => {
+    return (req, res) => {
+        res.writeHead(200, { 'Content-Type': 'text/plain; charset=utf-8' });
+        res.end('"Loco de pensar, queriendo entrar en razón, y el corazón tiene razones que la propia razón nunca entenderá."');
+    };
+};

package/index.js

@@ -7,20 +7,18 @@ class Roster {
         this.maintainerEmail = options.maintainerEmail || 'admin@example.com';
         this.wwwPath = options.wwwPath || path.join(__dirname, '..', '..', '..', 'www');
         this.greenlockConfigDir = options.greenlockConfigDir || path.join(__dirname, '..', '..', 'greenlock.d');
-        this.staging = options.staging || false; // Set to true for testing
+        this.staging = options.staging || false;
         this.domains = [];
         this.sites = {};
     }
 
-    // Function to dynamically load domain applications
     loadSites() {
         fs.readdirSync(this.wwwPath, { withFileTypes: true })
             .filter(dirent => dirent.isDirectory())
             .forEach((dirent) => {
                 const domain = dirent.name;
                 const domainPath = path.join(this.wwwPath, domain);
-                
-                // Check for different module file extensions
+
                 const possibleIndexFiles = ['index.js', 'index.mjs', 'index.cjs'];
                 let siteApp;
                 let loadedFile;
@@ -28,17 +26,13 @@ class Roster {
                 for (const indexFile of possibleIndexFiles) {
                     const indexPath = path.join(domainPath, indexFile);
                     if (fs.existsSync(indexPath)) {
-                        const module = require(indexPath);
-                        // Si el módulo es una función o un servidor, usarlo directamente
-                        siteApp = typeof module === 'function' ? module : 
-                               (module.handleRequest || module.handle || module);
+                        siteApp = require(indexPath);
                         loadedFile = indexFile;
                         break;
                     }
                 }
 
                 if (siteApp) {
-                    // Add the main domain and 'www' subdomain by default
                     const domainEntries = [domain, `www.${domain}`];
                     this.domains.push(...domainEntries);
                     domainEntries.forEach(d => {
@@ -56,7 +50,6 @@ class Roster {
         const configDir = this.greenlockConfigDir;
         const configPath = path.join(configDir, 'config.json');
 
-        // Create the directory if it does not exist
         if (!fs.existsSync(configDir)) {
             fs.mkdirSync(configDir, { recursive: true });
         }
@@ -69,10 +62,8 @@ class Roster {
             uniqueDomains.add(rootDomain);
         });
 
-        // Read the existing config.json if it exists
         let existingConfig = {};
         if (fs.existsSync(configPath)) {
-            // Read the current content
             const currentConfigContent = fs.readFileSync(configPath, 'utf8');
             existingConfig = JSON.parse(currentConfigContent);
         }
@@ -83,7 +74,6 @@ class Roster {
                 altnames.push(`www.${domain}`);
             }
 
-            // Find the existing site to preserve renewAt
             let existingSite = null;
             if (existingConfig.sites) {
                 existingSite = existingConfig.sites.find(site => site.subject === domain);
@@ -94,7 +84,6 @@ class Roster {
                 altnames: altnames
             };
 
-            // Preserve renewAt if it exists
             if (existingSite && existingSite.renewAt) {
                 siteConfig.renewAt = existingSite.renewAt;
             }
@@ -122,115 +111,101 @@ class Roster {
             sites: sitesConfig
         };
 
-        // Check if config.json already exists and compare
         if (fs.existsSync(configPath)) {
-            // Read the current content
             const currentConfigContent = fs.readFileSync(configPath, 'utf8');
             const currentConfig = JSON.parse(currentConfigContent);
 
-            // Compare the entire configurations
             const newConfigContent = JSON.stringify(newConfig, null, 2);
             const currentConfigContentFormatted = JSON.stringify(currentConfig, null, 2);
 
             if (newConfigContent === currentConfigContentFormatted) {
                 console.log('ℹ️ Configuration has not changed. config.json will not be overwritten.');
-                return; // Exit the function without overwriting
-            } else {
-                console.log('🔄 Configuration has changed. config.json will be updated.');
+                return;
             }
+            console.log('🔄 Configuration has changed. config.json will be updated.');
         } else {
             console.log('🆕 config.json does not exist. A new one will be created.');
         }
 
-        // Write the new config.json
         fs.writeFileSync(configPath, JSON.stringify(newConfig, null, 2));
         console.log(`📁 config.json generated at ${configPath}`);
     }
 
     handleRequest(req, res) {
         const host = req.headers.host || '';
-        
-        // Eliminar el puerto del host si está presente
-        const cleanHost = host.split(':')[0];
-        
-        // Handle www redirect
-        if (cleanHost.startsWith('www.')) {
-            const newHost = cleanHost.slice(4);
+
+        if (host.startsWith('www.')) {
+            const newHost = host.slice(4);
             res.writeHead(301, { Location: `https://${newHost}${req.url}` });
             res.end();
             return;
         }
 
-        // Find and execute the appropriate site handler
-        const siteApp = this.sites[cleanHost];
+        const siteApp = this.sites[host];
         if (siteApp) {
-            if (siteApp.emit) {
-                siteApp.emit('request', req, res);
-            } else {
-                siteApp(req, res);
-            }
+            siteApp(req, res);
         } else {
             res.writeHead(404);
             res.end('Site not found');
         }
     }
 
-    initGreenlock() {
-        Greenlock.init({
-            packageRoot: __dirname,
-            configDir: this.greenlockConfigDir,
-            maintainerEmail: this.maintainerEmail,
-            cluster: false,
-            staging: this.staging,
-            manager: { module: "@greenlock/manager" },
-            approveDomains: (opts, certs, cb) => {
-                if (certs) {
-                    opts.domains = certs.altnames;
-                } else {
-                    if (this.domains.includes(opts.domain)) {
-                        opts.email = this.maintainerEmail;
-                        opts.agreeTos = true;
-                        opts.domains = [opts.domain];
-                    } else {
-                        console.warn(`⚠️ Domain not approved: ${opts.domain}`);
-                        return cb(new Error(`Domain not approved: ${opts.domain}`));
-                    }
-                }
-                cb(null, { options: opts, certs });
-            }
-        }).ready((glx) => {
-            // Setup HTTPS server
-            const httpsServer = glx.httpsServer(null, (req, res) => {
-                this.handleRequest(req, res);
-            });
-
-            // Agregar soporte para WebSocket
-            httpsServer.on('upgrade', (req, socket, head) => {
-                const host = req.headers.host?.split(':')[0] || '';
-                const siteApp = this.sites[host];
-                
-                if (siteApp && siteApp.upgrade) {
-                    siteApp.upgrade(req, socket, head);
-                }
-            });
-
-            httpsServer.listen(443, "0.0.0.0", () => {
-                console.info("ℹ️ HTTPS Listening on", httpsServer.address());
-            });
+    initServers(glx) {
+        const app = (req, res) => {
+            this.handleRequest(req, res);
+        };
 
-            // Setup HTTP server for ACME challenges
-            const httpServer = glx.httpServer();
+        // 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}`);
+            }
+        }
 
-            httpServer.listen(80, "0.0.0.0", () => {
-                console.info("ℹ️ HTTP Listening on", httpServer.address());
-            });
-        });
+        // Retornar los servidores para iniciarlos después
+        return { httpsServer, httpServer };
     }
 
     start() {
         this.loadSites();
         this.generateConfigJson();
-        this.initGreenlock();
+
+        const greenlock = Greenlock.init({
+            packageRoot: __dirname,
+            configDir: this.greenlockConfigDir,
+            maintainerEmail: this.maintainerEmail,
+            cluster: false,
+            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(443, '0.0.0.0', () => {
+                        console.log('ℹ️ HTTPS server listening on port 443');
+
+                        // 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);
+            }
+        });
     }
 }
 

package/package.json

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