npm - roster-server - Versions diffs - 2.3.0 → 2.3.2 - Mend

roster-server 2.3.0 → 2.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/lib/static-site-handler.js +15 -5
package/package.json +1 -1
package/test/roster-server.test.js +27 -0

package/lib/static-site-handler.js CHANGED Viewed

@@ -97,14 +97,24 @@ function createStaticHandler(rootPath) {
             }
             const stat = fs.statSync(filePath);
+            let servePath = filePath;
             if (!stat.isFile()) {
-                res.writeHead(404, { 'Content-Type': 'text/plain' });
-                res.end('Not Found');
-                return;
+                if (!stat.isDirectory()) {
+                    res.writeHead(404, { 'Content-Type': 'text/plain' });
+                    res.end('Not Found');
+                    return;
+                }
+                const indexInDir = path.join(filePath, 'index.html');
+                if (!fs.existsSync(indexInDir) || !fs.statSync(indexInDir).isFile()) {
+                    res.writeHead(404, { 'Content-Type': 'text/plain' });
+                    res.end('Not Found');
+                    return;
+                }
+                servePath = indexInDir;
             }
-            const contentType = getContentType(filePath);
-            const content = fs.readFileSync(filePath);
+            const contentType = getContentType(servePath);
+            const content = fs.readFileSync(servePath);
             res.writeHead(200, {
                 'Content-Type': contentType,

package/package.json CHANGED Viewed

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

package/test/roster-server.test.js CHANGED Viewed

@@ -626,6 +626,33 @@ describe('Roster loadSites', () => {
             fs.rmSync(tmpDir, { recursive: true, force: true });
         }
     });
+    it('static site serves index.html for subpath directory (/en/)', async () => {
+        const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'roster-test-'));
+        const wwwPath = path.join(tmpDir, 'www');
+        const siteDir = path.join(wwwPath, 'subpath.example');
+        fs.mkdirSync(siteDir, { recursive: true });
+        fs.writeFileSync(path.join(siteDir, 'index.html'), '<html>root</html>', 'utf8');
+        const enDir = path.join(siteDir, 'en');
+        fs.mkdirSync(enDir, { recursive: true });
+        fs.writeFileSync(path.join(enDir, 'index.html'), '<html><body>en page</body></html>', 'utf8');
+        const roster = new Roster({ wwwPath, local: true, minLocalPort: 19220, maxLocalPort: 19229 });
+        try {
+            await roster.start();
+            const port = roster.domainPorts['subpath.example'];
+            assert.ok(typeof port === 'number');
+            await new Promise((r) => setTimeout(r, 50));
+            const resultSlash = await httpGet('localhost', port, '/en/');
+            assert.strictEqual(resultSlash.statusCode, 200);
+            assert.ok(resultSlash.body.includes('en page'));
+            const resultNoSlash = await httpGet('localhost', port, '/en');
+            assert.strictEqual(resultNoSlash.statusCode, 200);
+            assert.ok(resultNoSlash.body.includes('en page'));
+        } finally {
+            closePortServers(roster);
+            fs.rmSync(tmpDir, { recursive: true, force: true });
+        }
+    });
 });
 describe('Roster generateConfigJson', () => {