foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-26 00:59:24 -05:00
Code Issues Packages 1 Wiki Activity

File server logging (denoland/deno_std#17)

Browse source 
Original: 108127178b
This commit is contained in:
Bartek Iwańczuk 2018-12-12 10:38:46 +01:00 committed by Ryan Dahl
parent b945303329
commit 0212401974
1 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
file_server.ts
View file

@ -5,7 +5,7 @@
// TODO Add tests like these:
// https://github.com/indexzero/http-server/blob/master/test/http-server-test.js
import { listenAndServe, ServerRequest, setContentLength } from "./http";
import { listenAndServe, ServerRequest, setContentLength, Response } from "./http";
import { cwd, readFile, DenoError, ErrorKind, args, stat, readDir } from "deno";
const dirViewerTemplate = `
@ -143,7 +143,7 @@ async function serveDir(req: ServerRequest, dirPath: string, dirName: string) {
headers
};
setContentLength(res);
await req.respond(res);
return res;
}
async function serveFile(req: ServerRequest, filename: string) {
@ -156,7 +156,7 @@ async function serveFile(req: ServerRequest, filename: string) {
body: file,
headers
};
await req.respond(res);
return res;
}
async function serveFallback(req: ServerRequest, e: Error) {
@ -164,31 +164,45 @@ async function serveFallback(req: ServerRequest, e: Error) {
e instanceof DenoError &&
(e as DenoError<any>).kind === ErrorKind.NotFound
) {
await req.respond({ status: 404, body: encoder.encode("Not found") });
return {
status: 404,
body: encoder.encode("Not found")
};
} else {
await req.respond({
return {
status: 500,
body: encoder.encode("Internal server error")
});
};
}
}
function serverLog(req: ServerRequest, res: Response) {
const d = new Date().toISOString();
const dateFmt = `[${d.slice(0, 10)} ${d.slice(11, 19)}]`;
const s = `${dateFmt} "${req.method} ${req.url} ${req.proto}" ${res.status}`;
console.log(s);
}
listenAndServe(addr, async req => {
const fileName = req.url.replace(/\/$/, "");
const filePath = currentDir + fileName;
let response: Response;
try {
const fileInfo = await stat(filePath);
if (fileInfo.isDirectory()) {
// Bug with deno.stat: name and path not populated
// Yuck!
await serveDir(req, filePath, fileName);
response = await serveDir(req, filePath, fileName);
} else {
await serveFile(req, filePath);
response = await serveFile(req, filePath);
}
} catch (e) {
await serveFallback(req, e);
return;
response = await serveFallback(req, e);
} finally {
serverLog(req, response);
req.respond(response);
}
});