roster-server 1.4.2 → 1.4.6

package/README.md

@@ -26,6 +26,7 @@ Your project should look something like this:
 
 ```
 /srv/
+├── greenlock.d/
 ├── roster/server.js
 └── www/
     ├── example.com/
@@ -42,9 +43,8 @@ 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
+    greenlockStorePath: '/srv/greenlock.d', // Path to your Greenlock configuration directory
+    wwwPath: '/srv/www' // Path to your 'www' directory (default: '../www')
 };
 
 const server = new Roster(options);
@@ -61,7 +61,7 @@ I'll help analyze the example files shown. You have 3 different implementations
 
 1. **Basic HTTP Handler**:
 ```javascript:demo/www/example.com/index.js
-module.exports = (server) => {
+module.exports = (httpsServer) => {
     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á."');
@@ -73,7 +73,7 @@ module.exports = (server) => {
 ```javascript:demo/www/express.example.com/index.js
 const express = require('express');
 
-module.exports = (server) => {
+module.exports = (httpsServer) => {
     const app = express();
     app.get('/', (req, res) => {
         res.setHeader('Content-Type', 'text/plain; charset=utf-8');
@@ -88,8 +88,8 @@ module.exports = (server) => {
 ```javascript:demo/www/sio.example.com/index.js
 const { Server } = require('socket.io');
 
-module.exports = (server) => {
-    const io = new Server(server);
+module.exports = (httpsServer) => {
+    const io = new Server(httpsServer);
 
     io.on('connection', (socket) => {
         console.log('A user connected');
@@ -140,7 +140,7 @@ 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.
-- `greenlockConfigDir` (string): Directory for Greenlock configuration.
+- `greenlockStorePath` (string): Directory for Greenlock configuration.
 - `staging` (boolean): Set to `true` to use Let's Encrypt's staging environment (for testing).
 
 ## 🧂 A Touch of Magic

package/demo/roster/server.js

@@ -2,7 +2,7 @@ const Roster = require('../../index.js');
 const path = require('path');
 
 const roster = new Roster({
-    maintainerEmail: 'mclasen@blyts.com',
+    maintainerEmail: 'admin@example.com',
     wwwPath: path.join(__dirname, '..', 'www'),
 });
 

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

@@ -1,4 +1,4 @@
-module.exports = (server) => {
+module.exports = (httpsServer) => {
     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

@@ -1,6 +1,6 @@
 const express = require('express');
 
-module.exports = (server) => {
+module.exports = (httpsServer) => {
     const app = express();
     app.get('/', (req, res) => {
         res.setHeader('Content-Type', 'text/plain; charset=utf-8');

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

@@ -1,7 +1,7 @@
 const { Server } = require('socket.io');
 
-module.exports = (server) => {
-    const io = new Server(server);
+module.exports = (httpsServer) => {
+    const io = new Server(httpsServer);
 
     io.on('connection', (socket) => {
         console.log('A user connected');

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

@@ -1,4 +1,4 @@
-module.exports = (server) => {
+module.exports = (httpsServer) => {
     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

@@ -5,11 +5,19 @@ const Greenlock = require('greenlock-express');
 class Roster {
     constructor(options = {}) {
         this.maintainerEmail = options.maintainerEmail || 'admin@example.com';
-        this.wwwPath = options.wwwPath || path.join(__dirname, '..', '..', '..', 'www');
-        this.greenlockConfigDir = options.greenlockConfigDir || path.join(__dirname, '..', '..', 'greenlock.d');
+        const basePath = options.basePath || path.join(__dirname, '..', '..', '..');
+        this.wwwPath = options.wwwPath || path.join(basePath, 'www');
+        this.greenlockStorePath = options.greenlockStorePath || path.join(basePath, 'greenlock.d');
         this.staging = options.staging || false;
+        this.cluster = options.cluster || false;
         this.domains = [];
         this.sites = {};
+
+        const port = options.port || 443;
+        if (port === 80) {
+            throw new Error('Port 80 is reserved for ACME challenge. Please use a different port.');
+        }
+        this.port = port;
     }
 
     loadSites() {
@@ -47,7 +55,7 @@ class Roster {
     }
 
     generateConfigJson() {
-        const configDir = this.greenlockConfigDir;
+        const configDir = this.greenlockStorePath;
         const configPath = path.join(configDir, 'config.json');
 
         if (!fs.existsSync(configDir)) {
@@ -95,7 +103,7 @@ class Roster {
             defaults: {
                 store: {
                     module: "greenlock-store-fs",
-                    basePath: this.greenlockConfigDir
+                    basePath: this.greenlockStorePath
                 },
                 challenges: {
                     "http-01": {
@@ -179,9 +187,9 @@ class Roster {
 
         const greenlock = Greenlock.init({
             packageRoot: __dirname,
-            configDir: this.greenlockConfigDir,
+            configDir: this.greenlockStorePath,
             maintainerEmail: this.maintainerEmail,
-            cluster: false,
+            cluster: this.cluster,
             staging: this.staging
         });
 
@@ -192,7 +200,7 @@ class Roster {
                     const { httpsServer, httpServer } = this.initServers(glx);
 
                     // Primero iniciar el servidor HTTPS
-                    httpsServer.listen(443, '0.0.0.0', () => {
+                    httpsServer.listen(this.port, '0.0.0.0', () => {
                         console.log('ℹ️ HTTPS server listening on port 443');
 
                         // Después iniciar el servidor HTTP

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "roster-server",
-    "version": "1.4.2",
+    "version": "1.4.6",
     "description": "👾 RosterServer - A domain host router to host multiple HTTPS.",
     "main": "index.js",
     "scripts": {
@@ -19,6 +19,11 @@
         "hosting",
         "ssl",
         "host",
+        "vhost",
+        "virtual-host",
+        "socket.io",
+        "websocket",
+        "express",
         "greenlock-express",
         "clasen"
     ],