Creating res.json() for interop with express

README.md

@@ -55,6 +55,9 @@ http2.createSecureServer({
 ##### res.error (status[, body, headers])
 Sends an error response.
 
+##### res.json (body, [status = 200, headers])
+Sends a JSON response.
+
 ##### res.redirect (uri[, perm = false])
 Sends a redirection response.
 

lib/regex.js

@@ -8,5 +8,6 @@ module.exports = {
 	isParam: /^:/,
 	isOptions: /^OPTIONS$/,
 	slashEnd: /\/$/,
-	slashStart: /^\//
+	slashStart: /^\//,
+	wrappedQuotes: /^".*"$/
 };

lib/woodland.js

@@ -76,6 +76,7 @@ class Woodland {
 
 		if (this.http2) {
 			res._headers = {};
+			res.statusCode = 200;
 			res.hasHeader = key => key in res._headers;
 			res.getHeader = key => res.hasHeader(key) ? clone(res._headers[key]) : void 0;
 			res.getHeaders = () => clone(res._headers);
@@ -93,15 +94,34 @@ class Woodland {
 			res.send = (...args) => this.http2Send(req, res, ...args);
 		} else {
 			res.send = (body, status = 200, headers) => {
-				res.statusCode = status;
-				res.writeHead(status, headers);
+				if (res.statusCode < status) {
+					res.statusCode = status;
+				}
+
+				res.writeHead(res.statusCode, headers);
 				res.end(body);
 			};
 		}
 
 		res.error = (status, body, headers) => res.send(body, status, headers);
 		res.redirect = (uri, perm = true) => res.send("", perm ? 301 : 302, {"location:": uri});
 
+		res.json = arg => {
+			let x = arg;
+
+			try {
+				if (typeof x === "string") {
+					x = regex.wrappedQuotes.test(x) ? x : JSON.stringify(x);
+				} else {
+					x = JSON.stringify(x);
+				}
+			} catch (e) {
+				void 0;
+			}
+
+			res.send(x, void 0, {"content-type": "application/json"});
+		};
+
 		// Express interop
 		res.header = res.setHeader;
 		res.locals = {};
@@ -144,8 +164,9 @@ class Woodland {
 		return mmh3(arg, this.seed);
 	}
 
-	http2Send (req, res, body, status = 200, headers = null) {
-		const output = {":status": status},
+	http2Send (req, res, body, nstatus = 200, headers = null) {
+		const status = res.statusCode < nstatus ? nstatus : res.statusCode,
+			output = {":status": status},
 			empty = regex.isHead.test(req.method) || status === 204 || status === 304;
 
 		each(Object.keys(res._headers).filter(i => invalidHttp2Headers.test(i) === false), i => {
@@ -160,7 +181,9 @@ class Woodland {
 			});
 		}
 
-		res.statusCode = status;
+		if (res.statusCode < status) {
+			res.statusCode = status;
+		}
 
 		if (req.file === void 0 || empty) {
 			res.respond(output);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "woodland",
-  "version": "4.0.6",
+  "version": "4.1.0",
   "description": "Lightweight HTTP/HTTPS/HTTP2 router with automatic `Allow` & `CORS` headers",
   "main": "index.js",
   "scripts": {

test/test.js

@@ -12,6 +12,8 @@ const http = require("http"),
 
 router.onconnect = (req, res) => res.header("x-onconnect", "true");
 router.use("/", (req, res) => res.send(req.method !== "OPTIONS" ? "Hello World!" : ""));
+router.use("/json1", (req, res) => res.json({text: "Hello World!"}));
+router.use("/json2", (req, res) => res.json("Hello World!"));
 router.use("/echo/:echo", (req, res) => res.send(req.params.echo));
 router.use("/echo/:echo", (req, res) => res.send("The entity will be echoed back to you"), "OPTIONS");
 
@@ -51,6 +53,26 @@ describe("Valid Requests", function () {
 			.end();
 	});
 
+	it("GET /json1 (200 / 'Success')", function () {
+		return tinyhttptest({url: "http://localhost:8001/json1"})
+			.expectStatus(200)
+			.expectHeader("allow", "GET, HEAD, OPTIONS")
+			.expectHeader("cache-control", "no-cache")
+			.expectHeader("content-type", "application/json")
+			.expectBody(arg => JSON.stringify(arg) !== void 0)
+			.end();
+	});
+
+	it("GET /json2 (200 / 'Success')", function () {
+		return tinyhttptest({url: "http://localhost:8001/json2"})
+			.expectStatus(200)
+			.expectHeader("allow", "GET, HEAD, OPTIONS")
+			.expectHeader("cache-control", "no-cache")
+			.expectHeader("content-type", "application/json")
+			.expectBody(arg => JSON.stringify(arg) !== void 0)
+			.end();
+	});
+
 	it("GET / CORS Pre-flight (200 / 'Success')", function () {
 		return tinyhttptest({url: "http://localhost:8001/", method: "OPTIONS"})
 			.cors("http://not.localhost:8001")

test/test2.js

@@ -14,6 +14,8 @@ const http2 = require("http2"),
 
 router.onconnect = (req, res) => res.header("x-onconnect", "true");
 router.use("/", (req, res) => res.send(req.method !== "OPTIONS" ? "Hello World!" : ""));
+router.use("/json1", (req, res) => res.json({text: "Hello World!"}));
+router.use("/json2", (req, res) => res.json("Hello World!"));
 router.use("/echo/:echo", (req, res) => res.send(req.params.echo));
 router.use("/echo/:echo", (req, res) => res.send("The entity will be echoed back to you"), "OPTIONS");
 
@@ -56,6 +58,26 @@ describe("Valid Requests (HTTP2)", function () {
 			.end();
 	});
 
+	it("GET /json1 (200 / 'Success')", function () {
+		return tinyhttptest({http2: true, url: "https://localhost:8002/json1"})
+			.expectStatus(200)
+			.expectHeader("allow", "GET, HEAD, OPTIONS")
+			.expectHeader("cache-control", "no-cache")
+			.expectHeader("content-type", "application/json")
+			.expectBody(arg => JSON.stringify(arg) !== void 0)
+			.end();
+	});
+
+	it("GET /json2 (200 / 'Success')", function () {
+		return tinyhttptest({http2: true, url: "https://localhost:8002/json2"})
+			.expectStatus(200)
+			.expectHeader("allow", "GET, HEAD, OPTIONS")
+			.expectHeader("cache-control", "no-cache")
+			.expectHeader("content-type", "application/json")
+			.expectBody(arg => JSON.stringify(arg) !== void 0)
+			.end();
+	});
+
 	it("GET / CORS Pre-flight (200 / 'Success')", function () {
 		return tinyhttptest({http2: true, url: "https://localhost:8002/", method: "OPTIONS"})
 			.cors("https://not.localhost:8002")