|
@@ -5,6 +5,9 @@ import {
|
|
getQueriesCount,
|
|
getQueriesCount,
|
|
handleError,
|
|
handleError,
|
|
escape,
|
|
escape,
|
|
|
|
+ jsonSerializer,
|
|
|
|
+ worldObjectSerializer,
|
|
|
|
+ sortByMessage
|
|
} from "./utils.js";
|
|
} from "./utils.js";
|
|
|
|
|
|
let db;
|
|
let db;
|
|
@@ -22,7 +25,8 @@ webserver.get("/plaintext", (response) => {
|
|
webserver.get("/json", (response) => {
|
|
webserver.get("/json", (response) => {
|
|
addBenchmarkHeaders(response);
|
|
addBenchmarkHeaders(response);
|
|
response.writeHeader("Content-Type", "application/json");
|
|
response.writeHeader("Content-Type", "application/json");
|
|
- response.end(JSON.stringify({ message: "Hello, World!" }));
|
|
|
|
|
|
+ // response.end(JSON.stringify({ message: "Hello, World!" }));
|
|
|
|
+ response.end(jsonSerializer({ message: "Hello, World!" }));
|
|
});
|
|
});
|
|
|
|
|
|
if (db) {
|
|
if (db) {
|
|
@@ -32,7 +36,7 @@ if (db) {
|
|
});
|
|
});
|
|
|
|
|
|
try {
|
|
try {
|
|
- const rows = await db.find(generateRandomNumber());
|
|
|
|
|
|
+ const row = await db.find(generateRandomNumber());
|
|
|
|
|
|
if (response.aborted) {
|
|
if (response.aborted) {
|
|
return;
|
|
return;
|
|
@@ -41,7 +45,8 @@ if (db) {
|
|
response.cork(() => {
|
|
response.cork(() => {
|
|
addBenchmarkHeaders(response);
|
|
addBenchmarkHeaders(response);
|
|
response.writeHeader("Content-Type", "application/json");
|
|
response.writeHeader("Content-Type", "application/json");
|
|
- response.end(JSON.stringify(rows));
|
|
|
|
|
|
+ // response.end(JSON.stringify(rows));
|
|
|
|
+ response.end(worldObjectSerializer(row));
|
|
});
|
|
});
|
|
} catch (error) {
|
|
} catch (error) {
|
|
if (response.aborted) {
|
|
if (response.aborted) {
|
|
@@ -85,6 +90,8 @@ if (db) {
|
|
handleError(error, response);
|
|
handleError(error, response);
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
+
|
|
|
|
+ const extra = { id: 0, message: "Additional fortune added at request time." };
|
|
|
|
|
|
webserver.get("/fortunes", async (response) => {
|
|
webserver.get("/fortunes", async (response) => {
|
|
response.onAborted(() => {
|
|
response.onAborted(() => {
|
|
@@ -92,18 +99,19 @@ if (db) {
|
|
});
|
|
});
|
|
|
|
|
|
try {
|
|
try {
|
|
- const rows = await db.fortunes();
|
|
|
|
|
|
+ const rows = [extra, ...await db.fortunes()];
|
|
|
|
|
|
if (response.aborted) {
|
|
if (response.aborted) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
- rows.push({
|
|
|
|
- id: 0,
|
|
|
|
- message: "Additional fortune added at request time.",
|
|
|
|
- });
|
|
|
|
|
|
+ // rows.push({
|
|
|
|
+ // id: 0,
|
|
|
|
+ // message: "Additional fortune added at request time.",
|
|
|
|
+ // });
|
|
|
|
|
|
- rows.sort((a, b) => (a.message < b.message) ? -1 : 1);
|
|
|
|
|
|
+ // rows.sort((a, b) => (a.message < b.message) ? -1 : 1);
|
|
|
|
+ sortByMessage(rows)
|
|
|
|
|
|
const n = rows.length
|
|
const n = rows.length
|
|
|
|
|