totole/sapper
1
0
Fork 0
mirror of https://github.com/kevin-DL/sapper.git synced 2026-01-17 21:24:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

handle errors

Browse Source
This commit is contained in:
Rich Harris
2018-07-16 14:49:47 -04:00
parent 34cf953fde
commit af0bd1580d
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/middleware.ts
View File

@@ -204,7 +204,6 @@ function get_server_route_handler(routes: ServerRoute[]) {
const handle_next = (err?: Error) => { const handle_next = (err?: Error) => {
if (err) { if (err) {
console.error(err.stack);
res.statusCode = 500; res.statusCode = 500;
res.end(err.message); res.end(err.message);
} else { } else {
@@ -273,11 +272,10 @@ function get_page_handler(routes: RouteObject, store_getter: (req: Req) => Store
const store = store_getter ? store_getter(req) : null; const store = store_getter ? store_getter(req) : null;
const props = { query: req.query, path: req.path }; const props = { query: req.query, path: req.path };
// TODO reinstate this! if (error) {
// if (page.error) { props.error = error instanceof Error ? error : { message: error };
// props.error = error instanceof Error ? error : { message: error }; props.status = status;
// props.status = status; }
// }
let redirect: { statusCode: number, location: string }; let redirect: { statusCode: number, location: string };
let preload_error: { statusCode: number, message: Error | string }; let preload_error: { statusCode: number, message: Error | string };
@@ -286,7 +284,7 @@ function get_page_handler(routes: RouteObject, store_getter: (req: Req) => Store
return part.component.preload return part.component.preload
? part.component.preload.call({ ? part.component.preload.call({
redirect: (statusCode: number, location: string) => { redirect: (statusCode: number, location: string) => {
if (redirect && redirect.statusCode !== statusCode || redirect.location !== location) { if (redirect && (redirect.statusCode !== statusCode || redirect.location !== location)) {
throw new Error(`Conflicting redirects`); throw new Error(`Conflicting redirects`);
} }
redirect = { statusCode, location }; redirect = { statusCode, location };
@@ -345,9 +343,13 @@ function get_page_handler(routes: RouteObject, store_getter: (req: Req) => Store
} }
if (preload_error) { if (preload_error) {
// TODO reinstate this! handle_page({
// handle_page(error_route, req, res, preload_error.statusCode, preload_error.message); pattern: null,
res.end('oops'); parts: [
{ component: error_route }
]
}, req, res, preload_error.statusCode, preload_error.message);
return; return;
} }
@@ -417,6 +419,9 @@ function get_page_handler(routes: RouteObject, store_getter: (req: Req) => Store
body body
}); });
} }
}).catch(err => {
res.statusCode = 500;
res.end(err.message);
}); });
} }
@@ -430,7 +435,12 @@ function get_page_handler(routes: RouteObject, store_getter: (req: Req) => Store
} }
} }
handle_page(error_route, req, res, 404, 'Not found'); handle_page({
pattern: null,
parts: [
{ component: error_route }
]
}, req, res, 404, 'Not found');
}; };
} }