add middleware handler, move notfound to own func
This commit is contained in:
parent
ab10ab7091
commit
a9017c7550
|
@ -3,6 +3,10 @@ import { HTTPServer } from "../mod.ts";
|
||||||
|
|
||||||
const httpServer = new HTTPServer();
|
const httpServer = new HTTPServer();
|
||||||
|
|
||||||
|
httpServer.middleware((req) => {
|
||||||
|
console.log(`User Requested ${req.path}`);
|
||||||
|
})
|
||||||
|
|
||||||
httpServer.error((req, _rep) => {
|
httpServer.error((req, _rep) => {
|
||||||
return JSON.stringify(
|
return JSON.stringify(
|
||||||
{
|
{
|
||||||
|
|
123
mod.ts
123
mod.ts
|
@ -18,6 +18,10 @@ type RouteHandler = (
|
||||||
) =>
|
) =>
|
||||||
| Promise<unknown>
|
| Promise<unknown>
|
||||||
| unknown;
|
| unknown;
|
||||||
|
|
||||||
|
type RouteMiddlewareHandler = (req: RouteRequest) =>
|
||||||
|
| Promise<void>
|
||||||
|
| void;
|
||||||
export type RouteParam = {
|
export type RouteParam = {
|
||||||
idx: number;
|
idx: number;
|
||||||
paramKey: string;
|
paramKey: string;
|
||||||
|
@ -29,6 +33,7 @@ export class HTTPServer {
|
||||||
private staticLocalDir?: string;
|
private staticLocalDir?: string;
|
||||||
private staticServePath?: string;
|
private staticServePath?: string;
|
||||||
private notFoundHandler?: RouteHandler;
|
private notFoundHandler?: RouteHandler;
|
||||||
|
private middlewareHandler?: RouteMiddlewareHandler;
|
||||||
|
|
||||||
async listen(options: ListenOptions) {
|
async listen(options: ListenOptions) {
|
||||||
this.server = Deno.listen({
|
this.server = Deno.listen({
|
||||||
|
@ -52,13 +57,58 @@ export class HTTPServer {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async handleNotFound(
|
||||||
|
request: RouteRequest,
|
||||||
|
reply: RouteReply,
|
||||||
|
requestEvent: Deno.RequestEvent,
|
||||||
|
) {
|
||||||
|
if (this.notFoundHandler) {
|
||||||
|
reply.status(Status.NotFound);
|
||||||
|
reply.type("application/json");
|
||||||
|
const notNoundHandle = await this.notFoundHandler(
|
||||||
|
request,
|
||||||
|
reply,
|
||||||
|
);
|
||||||
|
await requestEvent.respondWith(
|
||||||
|
new Response(notNoundHandle as string, {
|
||||||
|
status: reply.statusCode,
|
||||||
|
headers: reply.headers,
|
||||||
|
statusText: STATUS_TEXT[reply.statusCode],
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
await requestEvent.respondWith(
|
||||||
|
new Response(
|
||||||
|
JSON.stringify({
|
||||||
|
code: 404,
|
||||||
|
message: `File ${request.path} not found!`,
|
||||||
|
}),
|
||||||
|
{
|
||||||
|
status: Status.NotFound,
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private async handleHttp(conn: Deno.Conn) {
|
private async handleHttp(conn: Deno.Conn) {
|
||||||
const httpConn = Deno.serveHttp(conn);
|
const httpConn = Deno.serveHttp(conn);
|
||||||
for await (const requestEvent of httpConn) {
|
for await (const requestEvent of httpConn) {
|
||||||
const url = new URL(requestEvent.request.url);
|
|
||||||
const filepath = decodeURIComponent(url.pathname);
|
|
||||||
const routeRequest = new RouteRequest(requestEvent.request);
|
const routeRequest = new RouteRequest(requestEvent.request);
|
||||||
const routeReply: RouteReply = new RouteReply();
|
const routeReply: RouteReply = new RouteReply();
|
||||||
|
const url = new URL(requestEvent.request.url);
|
||||||
|
const filepath = decodeURIComponent(url.pathname);
|
||||||
|
if (filepath.startsWith("/_static")) {
|
||||||
|
this.handleNotFound(routeRequest, routeReply, requestEvent);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.middlewareHandler) {
|
||||||
|
this.middlewareHandler(routeRequest);
|
||||||
|
}
|
||||||
|
|
||||||
if (this.staticServePath && filepath.startsWith(this.staticServePath)) {
|
if (this.staticServePath && filepath.startsWith(this.staticServePath)) {
|
||||||
const fileDir = filepath.split("/").slice(2).join("/");
|
const fileDir = filepath.split("/").slice(2).join("/");
|
||||||
|
@ -71,38 +121,7 @@ export class HTTPServer {
|
||||||
try {
|
try {
|
||||||
file = await Deno.open(pathLoc, { read: true });
|
file = await Deno.open(pathLoc, { read: true });
|
||||||
} catch {
|
} catch {
|
||||||
// If the file cannot be opened, return a "404 Not Found" response
|
this.handleNotFound(routeRequest, routeReply, requestEvent);
|
||||||
if (this.notFoundHandler) {
|
|
||||||
routeReply.status(Status.NotFound);
|
|
||||||
routeReply.type("application/json");
|
|
||||||
const notNoundHandle = await this.notFoundHandler(
|
|
||||||
routeRequest,
|
|
||||||
routeReply,
|
|
||||||
);
|
|
||||||
await requestEvent.respondWith(
|
|
||||||
new Response(notNoundHandle as string, {
|
|
||||||
status: routeReply.statusCode,
|
|
||||||
headers: routeReply.headers,
|
|
||||||
statusText: STATUS_TEXT[routeReply.statusCode],
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
continue;
|
|
||||||
} else {
|
|
||||||
await requestEvent.respondWith(
|
|
||||||
new Response(
|
|
||||||
JSON.stringify({
|
|
||||||
code: 404,
|
|
||||||
message: `File ${filepath} not found!`,
|
|
||||||
}),
|
|
||||||
{
|
|
||||||
status: Status.NotFound,
|
|
||||||
headers: {
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -164,39 +183,9 @@ export class HTTPServer {
|
||||||
statusText: STATUS_TEXT[routeReply.statusCode],
|
statusText: STATUS_TEXT[routeReply.statusCode],
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (this.notFoundHandler) {
|
this.handleNotFound(routeRequest, routeReply, requestEvent);
|
||||||
routeReply.status(Status.NotFound);
|
|
||||||
routeReply.type("application/json");
|
|
||||||
const notNoundHandle = await this.notFoundHandler(
|
|
||||||
routeRequest,
|
|
||||||
routeReply,
|
|
||||||
);
|
|
||||||
await requestEvent.respondWith(
|
|
||||||
new Response(notNoundHandle as string, {
|
|
||||||
status: routeReply.statusCode,
|
|
||||||
headers: routeReply.headers,
|
|
||||||
statusText: STATUS_TEXT[routeReply.statusCode],
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
await requestEvent.respondWith(
|
|
||||||
new Response(
|
|
||||||
JSON.stringify({
|
|
||||||
code: 404,
|
|
||||||
message: `Route ${routeName} not found!`,
|
|
||||||
}),
|
|
||||||
{
|
|
||||||
status: Status.NotFound,
|
|
||||||
headers: {
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -206,6 +195,10 @@ export class HTTPServer {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
middleware(handler: RouteMiddlewareHandler) {
|
||||||
|
this.middlewareHandler = handler;
|
||||||
|
}
|
||||||
|
|
||||||
error(handler: RouteHandler) {
|
error(handler: RouteHandler) {
|
||||||
this.notFoundHandler = handler;
|
this.notFoundHandler = handler;
|
||||||
}
|
}
|
||||||
|
|
Reference in New Issue
Block a user