orator-static-server 2.0.1 → 2.0.4

package/package.json

@@ -1,13 +1,13 @@
 {
     "name": "orator-static-server",
-    "version": "2.0.1",
+    "version": "2.0.4",
     "description": "Static file serving for Orator API servers.",
     "main": "source/Orator-Static-Server.js",
     "scripts": {
-        "test": "./node_modules/mocha/bin/_mocha --exit -u tdd -R spec",
-        "coverage": "./node_modules/.bin/nyc --reporter=lcov --reporter=text-lcov ./node_modules/mocha/bin/_mocha -- -u tdd -R spec",
+        "test": "npx quack test",
+        "coverage": "npx quack coverage",
         "start": "node debug/Harness.js",
-        "tests": "npx mocha -u tdd --exit -R spec --grep"
+        "tests": "npx quack test -g"
     },
     "mocha": {
         "diff": true,
@@ -38,17 +38,15 @@
     },
     "homepage": "https://github.com/stevenvelozo/orator-static-server#readme",
     "dependencies": {
-        "fable-serviceproviderbase": "^3.0.18",
+        "fable-serviceproviderbase": "^3.0.19",
         "finalhandler": "^1.3.1",
         "mime": "^3.0.0",
         "serve-static": "^1.16.2"
     },
     "devDependencies": {
-        "chai": "^4.3.7",
-        "fable": "^3.1.55",
-        "mocha": "^10.2.0",
+        "fable": "^3.1.57",
         "orator": "^6.0.1",
         "orator-serviceserver-restify": "^2.0.7",
-        "quackage": "^1.0.51"
+        "quackage": "^1.0.58"
     }
 }

package/source/Orator-Static-Server.js

@@ -161,15 +161,12 @@ class OratorStaticServer extends libFableServiceProviderBase
 							return pRequest.url;
 					};
 
-					// When the URL is a directory (e.g. '/' or '/docs/'), use the default file for MIME detection
-					// so the browser gets text/html instead of application/octet-stream
-					let tmpMimeTarget = pRequest.url;
-					if (tmpMimeTarget.endsWith('/') || tmpMimeTarget.indexOf('.') < 0)
-					{
-						tmpMimeTarget = tmpDefaultFile;
-					}
-					this.setMimeHeader(tmpMimeTarget, pResponse);
-
+					// Let serve-static handle Content-Type detection.  It resolves
+					// the actual file path first (e.g. / → /index.html) and then
+					// sets the correct MIME type with charset.  Pre-setting the
+					// header here would prevent serve-static from overriding it
+					// because the underlying `send` library skips Content-Type
+					// when the header is already present.
 					const tmpServe = libServeStatic(servePath, Object.assign({ index: tmpDefaultFile }, pParams));
 					tmpServe(pRequest, pResponse, libFinalHandler(pRequest, pResponse));
 					// TODO: This may break things if a post request send handler is setup...

package/test/Orator-Static-Server_tests.js

@@ -1308,6 +1308,175 @@ suite
 			}
 		);
 
+		suite
+		(
+			'MIME Type Resolution by serve-static',
+			() =>
+			{
+				test
+				(
+					'serve-static should set content-type with charset for HTML files',
+					(fDone) =>
+					{
+						let tmpPort = getNextTestPort();
+						let tmpHarness = createHarness(tmpPort);
+
+						startHarness(tmpHarness,
+							(pError) =>
+							{
+								tmpHarness.orator.addStaticRoute(_StaticContentPath, 'index.html', '/mime/*', '/mime/');
+
+								makeRequest(tmpPort, '/mime/index.html',
+									(pError, pStatusCode, pHeaders, pBody) =>
+									{
+										Expect(pError).to.equal(null);
+										Expect(pStatusCode).to.equal(200);
+										// serve-static sets charset on text types; a manual setMimeHeader would not
+										Expect(pHeaders['content-type']).to.equal('text/html; charset=UTF-8');
+										tmpHarness.orator.log.info(`HTML content-type with charset: ${pHeaders['content-type']}`);
+										tmpHarness.orator.stopService(
+											() =>
+											{
+												return fDone();
+											});
+									});
+							});
+					}
+				);
+
+				test
+				(
+					'serve-static should set content-type with charset for CSS files',
+					(fDone) =>
+					{
+						let tmpPort = getNextTestPort();
+						let tmpHarness = createHarness(tmpPort);
+
+						startHarness(tmpHarness,
+							(pError) =>
+							{
+								tmpHarness.orator.addStaticRoute(_StaticContentPath, 'index.html', '/mimecss/*', '/mimecss/');
+
+								makeRequest(tmpPort, '/mimecss/style.css',
+									(pError, pStatusCode, pHeaders, pBody) =>
+									{
+										Expect(pError).to.equal(null);
+										Expect(pStatusCode).to.equal(200);
+										// serve-static adds charset for text/* types
+										Expect(pHeaders['content-type']).to.equal('text/css; charset=UTF-8');
+										tmpHarness.orator.log.info(`CSS content-type with charset: ${pHeaders['content-type']}`);
+										tmpHarness.orator.stopService(
+											() =>
+											{
+												return fDone();
+											});
+									});
+							});
+					}
+				);
+
+				test
+				(
+					'directory request to / should get text/html from serve-static not application/octet-stream',
+					(fDone) =>
+					{
+						let tmpPort = getNextTestPort();
+						let tmpHarness = createHarness(tmpPort);
+
+						startHarness(tmpHarness,
+							(pError) =>
+							{
+								tmpHarness.orator.addStaticRoute(_StaticContentPath, 'index.html', '/*', '/');
+
+								makeRequest(tmpPort, '/',
+									(pError, pStatusCode, pHeaders, pBody) =>
+									{
+										Expect(pError).to.equal(null);
+										Expect(pStatusCode).to.equal(200);
+										// The core bug: mime.getType('/') returns null, falling back to
+										// application/octet-stream. serve-static resolves / to /index.html
+										// and correctly determines text/html with charset.
+										Expect(pHeaders['content-type']).to.equal('text/html; charset=UTF-8');
+										Expect(pHeaders['content-type']).to.not.contain('octet-stream');
+										Expect(pBody).to.contain('Test Index');
+										tmpHarness.orator.log.info(`Root / content-type: ${pHeaders['content-type']}`);
+										tmpHarness.orator.stopService(
+											() =>
+											{
+												return fDone();
+											});
+									});
+							});
+					}
+				);
+
+				test
+				(
+					'directory request to /subdir/ should get text/html from serve-static',
+					(fDone) =>
+					{
+						let tmpPort = getNextTestPort();
+						let tmpHarness = createHarness(tmpPort);
+
+						startHarness(tmpHarness,
+							(pError) =>
+							{
+								tmpHarness.orator.addStaticRoute(_StaticContentPath, 'index.html', '/app/*', '/app/');
+
+								makeRequest(tmpPort, '/app/subsite/',
+									(pError, pStatusCode, pHeaders, pBody) =>
+									{
+										Expect(pError).to.equal(null);
+										Expect(pStatusCode).to.equal(200);
+										// serve-static resolves /subsite/ to /subsite/index.html
+										Expect(pHeaders['content-type']).to.equal('text/html; charset=UTF-8');
+										Expect(pBody).to.contain('Subsite');
+										tmpHarness.orator.log.info(`Subdir / content-type: ${pHeaders['content-type']}`);
+										tmpHarness.orator.stopService(
+											() =>
+											{
+												return fDone();
+											});
+									});
+							});
+					}
+				);
+
+				test
+				(
+					'JSON file should get application/json content-type from serve-static',
+					(fDone) =>
+					{
+						let tmpPort = getNextTestPort();
+						let tmpHarness = createHarness(tmpPort);
+
+						startHarness(tmpHarness,
+							(pError) =>
+							{
+								tmpHarness.orator.addStaticRoute(_StaticContentPath, 'index.html', '/mj/*', '/mj/');
+
+								makeRequest(tmpPort, '/mj/data.json',
+									(pError, pStatusCode, pHeaders, pBody) =>
+									{
+										Expect(pError).to.equal(null);
+										Expect(pStatusCode).to.equal(200);
+										// JSON should not have charset added by serve-static
+										Expect(pHeaders['content-type']).to.contain('application/json');
+										let tmpParsed = JSON.parse(pBody);
+										Expect(tmpParsed.TestKey).to.equal('TestValue');
+										tmpHarness.orator.log.info(`JSON content-type: ${pHeaders['content-type']}`);
+										tmpHarness.orator.stopService(
+											() =>
+											{
+												return fDone();
+											});
+									});
+							});
+					}
+				);
+			}
+		);
+
 		suite
 		(
 			'addStaticRoute Parameter Defaults',