Leahnaya/nxapi
1
0
Fork 0
mirror of https://github.com/samuelthomas2774/nxapi.git synced 2026-09-13 22:05:21 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add Retry-After header for temporary errors

Browse Source
This commit is contained in:
Samuel Elliott
2022-10-30 17:47:10 +00:00
parent 516349e5df
commit 2776c936a1
2 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/cli/nso/http-server.ts
View File

@@ -193,14 +193,7 @@ class Server extends HttpServer {
if (result) this.sendJsonResponse(res, result);
else res.end();
} catch (err) {
if (err instanceof ResponseError) {
err.sendResponse(req, res);
} else {
this.sendJsonResponse(res, {
error: err,
error_message: (err as Error).message,
}, 500);
}
this.handleRequestError(req, res, err);
}
};
}

45
src/cli/util/http-server.ts
View File

@@ -13,14 +13,7 @@ export class HttpServer {
if (result) this.sendJsonResponse(res, result);
else res.end();
} catch (err) {
if (err instanceof ResponseError) {
err.sendResponse(req, res);
} else {
this.sendJsonResponse(res, {
error: err,
error_message: (err as Error).message,
}, 500);
}
this.handleRequestError(req, res, err);
}
};
}
@@ -34,14 +27,7 @@ export class HttpServer {
next();
} catch (err) {
if (err instanceof ResponseError) {
err.sendResponse(req, res);
} else {
this.sendJsonResponse(res, {
error: err,
error_message: (err as Error).message,
}, 500);
}
this.handleRequestError(req, res, err);
}
};
}
@@ -52,6 +38,33 @@ export class HttpServer {
res.end(res.req.headers['accept']?.match(/\/html\b/i) ?
JSON.stringify(data, null, 4) : JSON.stringify(data));
}
protected handleRequestError(req: Request, res: Response, err: unknown) {
if (err instanceof ErrorResponse) {
const retry_after = err.response.headers.get('Retry-After');
if (retry_after && /^\d+$/.test(retry_after)) {
res.setHeader('Retry-After', retry_after);
}
}
if (err && 'type' in err && 'code' in err && (err as any).type === 'system') {
const code: string = (err as any).code;
if (code === 'ETIMEDOUT' || code === 'ENOTFOUND' || code === 'EAI_AGAIN') {
res.setHeader('Retry-After', '60');
}
}
if (err instanceof ResponseError) {
err.sendResponse(req, res);
} else {
this.sendJsonResponse(res, {
error: err,
error_message: (err as Error).message,
}, 500);
}
}
}
export class ResponseError extends Error {