@lidofinance/next-api-wrapper 0.35.0 → 0.37.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.cjs +1 -1
- package/dist/index.cjs.map +1 -1
- package/dist/index.mjs +1 -1
- package/dist/index.mjs.map +1 -1
- package/package.json +11 -5
package/dist/index.cjs
CHANGED
|
@@ -54,7 +54,7 @@ const $d48d8f2703fa966d$var$isErrorWithStatus = (error)=>{
|
|
|
54
54
|
return "status" in error;
|
|
55
55
|
};
|
|
56
56
|
const $d48d8f2703fa966d$export$74226d5f34b9550e = (args)=>async (req, res, next)=>{
|
|
57
|
-
const { errorMessage: errorMessage = (0, $b042f7e98544cfc1$export$c982278a0ddc4dbe), serverLogger: serverLogger } = args || {};
|
|
57
|
+
const { errorMessage: errorMessage = (0, $b042f7e98544cfc1$export$c982278a0ddc4dbe), serverLogger: serverLogger = console } = args || {};
|
|
58
58
|
try {
|
|
59
59
|
await next?.(req, res, next);
|
|
60
60
|
} catch (error) {
|
package/dist/index.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"mappings":";;;;;;;;;;;;;;;;;;;;;;;;ACEO,MAAM,4CACX,CAAW,WACX,CAAC,iBACC,SAAS,OAAO,CAAC,KAAK,MAAQ,CAAC,KAAK,MAAQ,IAAI,KAAK,KAAK,IAAM,IAAI,KAAK,OAAO;;;;;;;;;;;;;;AEL7E,MAAM,4CAA4B;AAElC,MAAM,4CAAwB;AAC9B,MAAM,4CAA8B;;;;ACDpC,MAAM,4CAAsB,CAAC,OAAgB;IAClD,IAAI,OAAO,UAAU,UAAU,OAAO;IACtC,IAAI,iBAAiB,OAAO,OAAO,MAAM;IACzC,OAAO,kBAAkB,CAAA,GAAA,yCAAwB;AACnD;;;AFGA,MAAM,0CAAoB,CAAC;IACzB,IAAI,OAAO,UAAU,YAAY,UAAU,MAAM,OAAO;IACxD,OAAO,YAAY;AACrB;AAGO,MAAM,4CACX,CAAC,OACD,OAAO,KAAK,KAAK;QACf,MAAM,gBAAE,eAAe,CAAA,GAAA,yCAAwB,iBAAG,
|
|
1
|
+
{"mappings":";;;;;;;;;;;;;;;;;;;;;;;;ACEO,MAAM,4CACX,CAAW,WACX,CAAC,iBACC,SAAS,OAAO,CAAC,KAAK,MAAQ,CAAC,KAAK,MAAQ,IAAI,KAAK,KAAK,IAAM,IAAI,KAAK,OAAO;;;;;;;;;;;;;;AEL7E,MAAM,4CAA4B;AAElC,MAAM,4CAAwB;AAC9B,MAAM,4CAA8B;;;;ACDpC,MAAM,4CAAsB,CAAC,OAAgB;IAClD,IAAI,OAAO,UAAU,UAAU,OAAO;IACtC,IAAI,iBAAiB,OAAO,OAAO,MAAM;IACzC,OAAO,kBAAkB,CAAA,GAAA,yCAAwB;AACnD;;;AFGA,MAAM,0CAAoB,CAAC;IACzB,IAAI,OAAO,UAAU,YAAY,UAAU,MAAM,OAAO;IACxD,OAAO,YAAY;AACrB;AAGO,MAAM,4CACX,CAAC,OACD,OAAO,KAAK,KAAK;QACf,MAAM,gBAAE,eAAe,CAAA,GAAA,yCAAwB,iBAAG,eAAe,SAAS,GAAG,QAAQ,CAAC;QACtF,IAAI;YACF,MAAM,OAAO,KAAK,KAAK;QACzB,EAAE,OAAO,OAAO;YACd,MAAM,eAAe,IAAI,eAAe;YACxC,MAAM,SAAS,eAAe,MAAM,IAAI,cAAc;YAEtD,IAAI,wCAAkB,QAAQ;gBAC5B,cAAc,MAAM,CAAA,GAAA,yCAAkB,EAAE,OAAO;gBAC/C,IAAI,OAAO,MAAM,QAAQ,KAAK;oBAAE,SAAS,CAAA,GAAA,yCAAkB,EAAE,OAAO;gBAAc;YACpF,OAAO,IAAI,iBAAiB,OAAO;gBACjC,cAAc,MAAM,CAAA,GAAA,yCAAkB,EAAE,OAAO;gBAC/C,IAAI,OAAO,QAAQ,KAAK;oBAAE,SAAS,CAAA,GAAA,yCAAkB,EAAE,OAAO;gBAAc;YAC9E,OACE,IAAI,OAAO,QAAQ,KAAK;gBAAE,SAAS;YAAa;QAEpD;IACF;AAEK,MAAM,4CACX,CAAC,OACD,OAAO,KAAK,KAAK;QACf,MAAM,WAAE,UAAU,CAAA,GAAA,yCAAoB,iBAAG,eAAe,CAAA,GAAA,yCAA0B,GAAG,GAAG,QAAQ,CAAC;QACjG,IAAI;YACF,IAAI,UAAU,iBAAiB;YAE/B,MAAM,OAAO,KAAK,KAAK;QACzB,EAAE,OAAO,OAAO;YACd,0CAA0C;YAC1C,sDAAsD;YACtD,IAAI,UAAU,iBAAiB;YAE/B,2BAA2B;YAC3B,MAAM;QACR;IACF;AAEK,MAAM,4CACX,CAAC,SAA4B,QAC7B,OAAO,KAAK,KAAK;QACf,IAAI,SAAS;QACb,MAAM,YAAY,QAAQ,WAAW;mBAAE;QAAM;QAE7C,IAAI;YACF,MAAM,OAAO,KAAK,KAAK;YACvB,SAAS,CAAA,GAAA,2CAAa,EAAE,IAAI;QAC9B,EAAE,OAAO,OAAO;YACd,SAAS,CAAA,GAAA,2CAAa,EAAE,IAAI;YAC5B,2BAA2B;YAC3B,MAAM;QACR,SAAU;YACR,UAAU;wBAAE;YAAO;QACrB;IACF;;;;;;","sources":["packages/next/api-wrapper/src/index.ts","packages/next/api-wrapper/src/wrapRequest.ts","packages/next/api-wrapper/src/wrappers.ts","packages/next/api-wrapper/src/constants.ts","packages/next/api-wrapper/src/utils.ts","packages/next/api-wrapper/src/types.ts"],"sourcesContent":["export * from './wrapRequest'\nexport * from './wrappers'\nexport * from './constants'\nexport * from './types'\n","import { RequestWrapper, API } from './types'\n\nexport const wrapRequest =\n <T = void>(wrappers: RequestWrapper<T>[]) =>\n (requestHandler: API<T>) =>\n wrappers.reduce((acc, cur) => (req, res) => cur(req, res, () => acc(req, res)), requestHandler)\n","import { Histogram } from 'prom-client'\nimport { getStatusLabel } from '@lidofinance/api-metrics'\n\nimport { DEFAULT_API_ERROR_MESSAGE, CACHE_DEFAULT_ERROR_HEADERS, CACHE_DEFAULT_HEADERS } from './constants'\nimport { extractErrorMessage } from './utils'\nimport { RequestWrapper, DefaultErrorHandlerArgs, CacheControlArgs } from './types'\n\ntype ErrorWithStatus = Error & { status: number }\n\nconst isErrorWithStatus = (error: unknown): error is ErrorWithStatus => {\n if (typeof error !== 'object' || error === null) return false\n return 'status' in error\n}\n\n// must be last in the wrapper stack\nexport const defaultErrorHandler =\n (args?: DefaultErrorHandlerArgs): RequestWrapper =>\n async (req, res, next) => {\n const { errorMessage = DEFAULT_API_ERROR_MESSAGE, serverLogger = console } = args || {}\n try {\n await next?.(req, res, next)\n } catch (error) {\n const isInnerError = res.statusCode === 200\n const status = isInnerError ? 500 : res.statusCode || 500\n\n if (isErrorWithStatus(error)) {\n serverLogger?.error(extractErrorMessage(error, errorMessage))\n res.status(error.status).json({ message: extractErrorMessage(error, errorMessage) })\n } else if (error instanceof Error) {\n serverLogger?.error(extractErrorMessage(error, errorMessage))\n res.status(status).json({ message: extractErrorMessage(error, errorMessage) })\n } else {\n res.status(status).json({ message: errorMessage })\n }\n }\n }\n\nexport const cacheControl =\n (args?: CacheControlArgs): RequestWrapper =>\n async (req, res, next) => {\n const { headers = CACHE_DEFAULT_HEADERS, errorHeaders = CACHE_DEFAULT_ERROR_HEADERS } = args || {}\n try {\n res.setHeader('Cache-Control', headers)\n\n await next?.(req, res, next)\n } catch (error) {\n // for requests with cache-control headers\n // need set new headers otherwise error will be cached\n res.setHeader('Cache-Control', errorHeaders)\n\n // throw error up the stack\n throw error\n }\n }\n\nexport const responseTimeMetric =\n (metrics: Histogram<string>, route: string): RequestWrapper =>\n async (req, res, next) => {\n let status = '2xx'\n const endMetric = metrics.startTimer({ route })\n\n try {\n await next?.(req, res, next)\n status = getStatusLabel(res.statusCode)\n } catch (error) {\n status = getStatusLabel(res.statusCode)\n // throw error up the stack\n throw error\n } finally {\n endMetric({ status })\n }\n }\n","export const DEFAULT_API_ERROR_MESSAGE = 'Something went wrong.'\n\nexport const CACHE_DEFAULT_HEADERS = 'public, max-age=180, stale-if-error=1200, stale-while-revalidate=60'\nexport const CACHE_DEFAULT_ERROR_HEADERS = 'no-store, must-revalidate'\n","import { DEFAULT_API_ERROR_MESSAGE } from './constants'\n\nexport const extractErrorMessage = (error: unknown, defaultMessage?: string): string => {\n if (typeof error === 'string') return error\n if (error instanceof Error) return error.message\n return defaultMessage ?? DEFAULT_API_ERROR_MESSAGE\n}\n","import { NextApiResponse, NextApiRequest } from 'next'\nimport { ServerLogger } from '@lidofinance/api-logger'\n\nexport type API<T = void> = (req: NextApiRequest, res: NextApiResponse) => Promise<T> | T\n\nexport type RequestWrapper<T = void> = (\n req: NextApiRequest,\n res: NextApiResponse,\n next?: API<T> | RequestWrapper<T>,\n) => Promise<T> | T\n\nexport type MixedWrapper = <T = void>(api: API<T>) => RequestWrapper<T>\n\nexport type DefaultErrorHandlerArgs = {\n errorMessage?: string\n serverLogger?: ServerLogger\n}\n\nexport type CacheControlArgs = {\n headers?: string\n errorHeaders?: string\n}\n"],"names":[],"version":3,"file":"index.cjs.map"}
|
package/dist/index.mjs
CHANGED
|
@@ -38,7 +38,7 @@ const $6ca930aaa4992525$var$isErrorWithStatus = (error)=>{
|
|
|
38
38
|
return "status" in error;
|
|
39
39
|
};
|
|
40
40
|
const $6ca930aaa4992525$export$74226d5f34b9550e = (args)=>async (req, res, next)=>{
|
|
41
|
-
const { errorMessage: errorMessage = (0, $b2dbcaa42773f73a$export$c982278a0ddc4dbe), serverLogger: serverLogger } = args || {};
|
|
41
|
+
const { errorMessage: errorMessage = (0, $b2dbcaa42773f73a$export$c982278a0ddc4dbe), serverLogger: serverLogger = console } = args || {};
|
|
42
42
|
try {
|
|
43
43
|
await next?.(req, res, next);
|
|
44
44
|
} catch (error) {
|
package/dist/index.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"mappings":";;;;;;;;ACEO,MAAM,4CACX,CAAW,WACX,CAAC,iBACC,SAAS,OAAO,CAAC,KAAK,MAAQ,CAAC,KAAK,MAAQ,IAAI,KAAK,KAAK,IAAM,IAAI,KAAK,OAAO;;;;;;;;;;;;;;AEL7E,MAAM,4CAA4B;AAElC,MAAM,4CAAwB;AAC9B,MAAM,4CAA8B;;;;ACDpC,MAAM,4CAAsB,CAAC,OAAgB;IAClD,IAAI,OAAO,UAAU,UAAU,OAAO;IACtC,IAAI,iBAAiB,OAAO,OAAO,MAAM;IACzC,OAAO,kBAAkB,CAAA,GAAA,yCAAwB;AACnD;;;AFGA,MAAM,0CAAoB,CAAC;IACzB,IAAI,OAAO,UAAU,YAAY,UAAU,MAAM,OAAO;IACxD,OAAO,YAAY;AACrB;AAGO,MAAM,4CACX,CAAC,OACD,OAAO,KAAK,KAAK;QACf,MAAM,gBAAE,eAAe,CAAA,GAAA,yCAAwB,iBAAG,
|
|
1
|
+
{"mappings":";;;;;;;;ACEO,MAAM,4CACX,CAAW,WACX,CAAC,iBACC,SAAS,OAAO,CAAC,KAAK,MAAQ,CAAC,KAAK,MAAQ,IAAI,KAAK,KAAK,IAAM,IAAI,KAAK,OAAO;;;;;;;;;;;;;;AEL7E,MAAM,4CAA4B;AAElC,MAAM,4CAAwB;AAC9B,MAAM,4CAA8B;;;;ACDpC,MAAM,4CAAsB,CAAC,OAAgB;IAClD,IAAI,OAAO,UAAU,UAAU,OAAO;IACtC,IAAI,iBAAiB,OAAO,OAAO,MAAM;IACzC,OAAO,kBAAkB,CAAA,GAAA,yCAAwB;AACnD;;;AFGA,MAAM,0CAAoB,CAAC;IACzB,IAAI,OAAO,UAAU,YAAY,UAAU,MAAM,OAAO;IACxD,OAAO,YAAY;AACrB;AAGO,MAAM,4CACX,CAAC,OACD,OAAO,KAAK,KAAK;QACf,MAAM,gBAAE,eAAe,CAAA,GAAA,yCAAwB,iBAAG,eAAe,SAAS,GAAG,QAAQ,CAAC;QACtF,IAAI;YACF,MAAM,OAAO,KAAK,KAAK;QACzB,EAAE,OAAO,OAAO;YACd,MAAM,eAAe,IAAI,eAAe;YACxC,MAAM,SAAS,eAAe,MAAM,IAAI,cAAc;YAEtD,IAAI,wCAAkB,QAAQ;gBAC5B,cAAc,MAAM,CAAA,GAAA,yCAAkB,EAAE,OAAO;gBAC/C,IAAI,OAAO,MAAM,QAAQ,KAAK;oBAAE,SAAS,CAAA,GAAA,yCAAkB,EAAE,OAAO;gBAAc;YACpF,OAAO,IAAI,iBAAiB,OAAO;gBACjC,cAAc,MAAM,CAAA,GAAA,yCAAkB,EAAE,OAAO;gBAC/C,IAAI,OAAO,QAAQ,KAAK;oBAAE,SAAS,CAAA,GAAA,yCAAkB,EAAE,OAAO;gBAAc;YAC9E,OACE,IAAI,OAAO,QAAQ,KAAK;gBAAE,SAAS;YAAa;QAEpD;IACF;AAEK,MAAM,4CACX,CAAC,OACD,OAAO,KAAK,KAAK;QACf,MAAM,WAAE,UAAU,CAAA,GAAA,yCAAoB,iBAAG,eAAe,CAAA,GAAA,yCAA0B,GAAG,GAAG,QAAQ,CAAC;QACjG,IAAI;YACF,IAAI,UAAU,iBAAiB;YAE/B,MAAM,OAAO,KAAK,KAAK;QACzB,EAAE,OAAO,OAAO;YACd,0CAA0C;YAC1C,sDAAsD;YACtD,IAAI,UAAU,iBAAiB;YAE/B,2BAA2B;YAC3B,MAAM;QACR;IACF;AAEK,MAAM,4CACX,CAAC,SAA4B,QAC7B,OAAO,KAAK,KAAK;QACf,IAAI,SAAS;QACb,MAAM,YAAY,QAAQ,WAAW;mBAAE;QAAM;QAE7C,IAAI;YACF,MAAM,OAAO,KAAK,KAAK;YACvB,SAAS,CAAA,GAAA,qBAAa,EAAE,IAAI;QAC9B,EAAE,OAAO,OAAO;YACd,SAAS,CAAA,GAAA,qBAAa,EAAE,IAAI;YAC5B,2BAA2B;YAC3B,MAAM;QACR,SAAU;YACR,UAAU;wBAAE;YAAO;QACrB;IACF;;;;;;","sources":["packages/next/api-wrapper/src/index.ts","packages/next/api-wrapper/src/wrapRequest.ts","packages/next/api-wrapper/src/wrappers.ts","packages/next/api-wrapper/src/constants.ts","packages/next/api-wrapper/src/utils.ts","packages/next/api-wrapper/src/types.ts"],"sourcesContent":["export * from './wrapRequest'\nexport * from './wrappers'\nexport * from './constants'\nexport * from './types'\n","import { RequestWrapper, API } from './types'\n\nexport const wrapRequest =\n <T = void>(wrappers: RequestWrapper<T>[]) =>\n (requestHandler: API<T>) =>\n wrappers.reduce((acc, cur) => (req, res) => cur(req, res, () => acc(req, res)), requestHandler)\n","import { Histogram } from 'prom-client'\nimport { getStatusLabel } from '@lidofinance/api-metrics'\n\nimport { DEFAULT_API_ERROR_MESSAGE, CACHE_DEFAULT_ERROR_HEADERS, CACHE_DEFAULT_HEADERS } from './constants'\nimport { extractErrorMessage } from './utils'\nimport { RequestWrapper, DefaultErrorHandlerArgs, CacheControlArgs } from './types'\n\ntype ErrorWithStatus = Error & { status: number }\n\nconst isErrorWithStatus = (error: unknown): error is ErrorWithStatus => {\n if (typeof error !== 'object' || error === null) return false\n return 'status' in error\n}\n\n// must be last in the wrapper stack\nexport const defaultErrorHandler =\n (args?: DefaultErrorHandlerArgs): RequestWrapper =>\n async (req, res, next) => {\n const { errorMessage = DEFAULT_API_ERROR_MESSAGE, serverLogger = console } = args || {}\n try {\n await next?.(req, res, next)\n } catch (error) {\n const isInnerError = res.statusCode === 200\n const status = isInnerError ? 500 : res.statusCode || 500\n\n if (isErrorWithStatus(error)) {\n serverLogger?.error(extractErrorMessage(error, errorMessage))\n res.status(error.status).json({ message: extractErrorMessage(error, errorMessage) })\n } else if (error instanceof Error) {\n serverLogger?.error(extractErrorMessage(error, errorMessage))\n res.status(status).json({ message: extractErrorMessage(error, errorMessage) })\n } else {\n res.status(status).json({ message: errorMessage })\n }\n }\n }\n\nexport const cacheControl =\n (args?: CacheControlArgs): RequestWrapper =>\n async (req, res, next) => {\n const { headers = CACHE_DEFAULT_HEADERS, errorHeaders = CACHE_DEFAULT_ERROR_HEADERS } = args || {}\n try {\n res.setHeader('Cache-Control', headers)\n\n await next?.(req, res, next)\n } catch (error) {\n // for requests with cache-control headers\n // need set new headers otherwise error will be cached\n res.setHeader('Cache-Control', errorHeaders)\n\n // throw error up the stack\n throw error\n }\n }\n\nexport const responseTimeMetric =\n (metrics: Histogram<string>, route: string): RequestWrapper =>\n async (req, res, next) => {\n let status = '2xx'\n const endMetric = metrics.startTimer({ route })\n\n try {\n await next?.(req, res, next)\n status = getStatusLabel(res.statusCode)\n } catch (error) {\n status = getStatusLabel(res.statusCode)\n // throw error up the stack\n throw error\n } finally {\n endMetric({ status })\n }\n }\n","export const DEFAULT_API_ERROR_MESSAGE = 'Something went wrong.'\n\nexport const CACHE_DEFAULT_HEADERS = 'public, max-age=180, stale-if-error=1200, stale-while-revalidate=60'\nexport const CACHE_DEFAULT_ERROR_HEADERS = 'no-store, must-revalidate'\n","import { DEFAULT_API_ERROR_MESSAGE } from './constants'\n\nexport const extractErrorMessage = (error: unknown, defaultMessage?: string): string => {\n if (typeof error === 'string') return error\n if (error instanceof Error) return error.message\n return defaultMessage ?? DEFAULT_API_ERROR_MESSAGE\n}\n","import { NextApiResponse, NextApiRequest } from 'next'\nimport { ServerLogger } from '@lidofinance/api-logger'\n\nexport type API<T = void> = (req: NextApiRequest, res: NextApiResponse) => Promise<T> | T\n\nexport type RequestWrapper<T = void> = (\n req: NextApiRequest,\n res: NextApiResponse,\n next?: API<T> | RequestWrapper<T>,\n) => Promise<T> | T\n\nexport type MixedWrapper = <T = void>(api: API<T>) => RequestWrapper<T>\n\nexport type DefaultErrorHandlerArgs = {\n errorMessage?: string\n serverLogger?: ServerLogger\n}\n\nexport type CacheControlArgs = {\n headers?: string\n errorHeaders?: string\n}\n"],"names":[],"version":3,"file":"index.mjs.map"}
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"description": "Wrapper for next server api requests",
|
|
4
4
|
"repository": "git@github.com:lidofinance/warehouse.git",
|
|
5
5
|
"license": "MIT",
|
|
6
|
-
"version": "0.
|
|
6
|
+
"version": "0.37.0",
|
|
7
7
|
"files": [
|
|
8
8
|
"dist"
|
|
9
9
|
],
|
|
@@ -15,6 +15,12 @@
|
|
|
15
15
|
"main": "dist/index.cjs",
|
|
16
16
|
"module": "dist/index.mjs",
|
|
17
17
|
"types": "dist/index.d.ts",
|
|
18
|
+
"exports": {
|
|
19
|
+
".": {
|
|
20
|
+
"import": "./dist/index.mjs",
|
|
21
|
+
"require": "./dist/index.cjs"
|
|
22
|
+
}
|
|
23
|
+
},
|
|
18
24
|
"scripts": {
|
|
19
25
|
"build": "parcel build",
|
|
20
26
|
"lint": "eslint . && prettier --check src",
|
|
@@ -23,14 +29,14 @@
|
|
|
23
29
|
"test": "jest"
|
|
24
30
|
},
|
|
25
31
|
"peerDependencies": {
|
|
26
|
-
"@lidofinance/api-metrics": "~0.
|
|
32
|
+
"@lidofinance/api-metrics": "~0.37.0",
|
|
27
33
|
"next": "^12.2.0",
|
|
28
34
|
"prom-client": "^14.0.0"
|
|
29
35
|
},
|
|
30
36
|
"devDependencies": {
|
|
31
|
-
"@lidofinance/api-logger": "~0.
|
|
32
|
-
"@lidofinance/api-metrics": "~0.
|
|
33
|
-
"@lidofinance/config-prettier": "~0.
|
|
37
|
+
"@lidofinance/api-logger": "~0.37.0",
|
|
38
|
+
"@lidofinance/api-metrics": "~0.37.0",
|
|
39
|
+
"@lidofinance/config-prettier": "~0.37.0",
|
|
34
40
|
"@types/jest": "^29.2.4",
|
|
35
41
|
"@types/node": "^18.11.17",
|
|
36
42
|
"jest": "^29.3.1",
|