roster-server 1.2.6 → 1.3.0

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
 ```
 

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

@@ -1,33 +1,18 @@
-const https = require('https');
 const { Server } = require('socket.io');
 
-const server = https.createServer();
+const attach = new Server();
 
-// Initialize Socket.IO with the HTTPS server
-const io = new Server(server, {
-    cors: {
-        origin: "*",
-        methods: ["GET", "POST"]
-    },
-    allowEIO3: true,
-    transports: ['websocket', 'polling']
-});
-
-// Handle socket connections
-io.on('connection', (socket) => {
+attach.on('connection', (socket) => {
     console.log('A user connected');
 
-    // 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);
     });
 
-    // Handle disconnection
     socket.on('disconnect', () => {
         console.log('User disconnected');
     });
 });
 
-module.exports = server;
+module.exports = { attach };

package/index.js

@@ -20,7 +20,6 @@ class Roster {
                 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;
@@ -29,16 +28,13 @@ class Roster {
                     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 = typeof module === 'function' ? module() : module;
                         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 => {
@@ -46,6 +42,9 @@ class Roster {
                     });
 
                     console.log(`✅ Loaded site: ${domain} (using ${loadedFile})`);
+                    if (siteApp.attach) {
+                        console.log(`🔌 Attachable server detected for ${domain}`);
+                    }
                 } else {
                     console.warn(`⚠️ No index file (js/mjs/cjs) found in ${domainPath}`);
                 }
@@ -150,23 +149,24 @@ class Roster {
     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) {
+            if (siteApp.attach) {
+                // Para servidores attachables (como Socket.IO)
+                res.writeHead(200);
+                res.end('Server running');
+            } else if (siteApp.emit) {
+                // Para servidores http/https (como subdomain.example.com)
                 siteApp.emit('request', req, res);
             } else {
+                // Para funciones de manejo directo (como example.com)
                 siteApp(req, res);
             }
         } else {
@@ -184,9 +184,11 @@ class Roster {
             staging: this.staging,
             manager: { module: "@greenlock/manager" },
             approveDomains: (opts, certs, cb) => {
+                // If certs is defined, we already have a certificate and are renewing it
                 if (certs) {
                     opts.domains = certs.altnames;
                 } else {
+                    // If it's a new request, verify if the domain is in our list
                     if (this.domains.includes(opts.domain)) {
                         opts.email = this.maintainerEmail;
                         opts.agreeTos = true;
@@ -204,15 +206,13 @@ class Roster {
                 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);
+            // Attach any servers to the HTTPS server
+            for (const [host, siteApp] of Object.entries(this.sites)) {
+                if (siteApp.attach) {
+                    siteApp.attach.attach(httpsServer);
+                    console.log(`🔌 Server attached for ${host}`);
                 }
-            });
+            }
 
             httpsServer.listen(443, "0.0.0.0", () => {
                 console.info("ℹ️ HTTPS Listening on", httpsServer.address());

package/package.json

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