waibu-rest-api 1.0.4 → 1.0.6
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/bajo/config.json +2 -3
- package/bajo/hook/waibu-rest-api@pre-parsing.js +3 -3
- package/bajo/intl/en-US.json +6 -0
- package/bajo/intl/id.json +6 -0
- package/bajo/method/doc-schema/model.js +3 -3
- package/lib/decorate.js +0 -1
- package/lib/error.js +1 -1
- package/lib/not-found.js +1 -1
- package/lib/route-by-verb.js +2 -2
- package/lib/sub-app.js +1 -1
- package/package.json +1 -1
- package/waibu/boot.js +2 -2
- package/bajoI18N/resource/id.json +0 -3
package/bajo/config.json
CHANGED
|
@@ -2,12 +2,12 @@ const waibuRestApiPreParsing = {
|
|
|
2
2
|
level: 9,
|
|
3
3
|
handler: async function (req, reply) {
|
|
4
4
|
const { importModule } = this.app.bajo
|
|
5
|
-
const attachI18N = await importModule('waibu:/lib/webapp-scope/attach-
|
|
6
|
-
await attachI18N.call(this, this.config.
|
|
5
|
+
const attachI18N = await importModule('waibu:/lib/webapp-scope/attach-intl.js')
|
|
6
|
+
await attachI18N.call(this, this.config.intl.detectors, req, reply)
|
|
7
7
|
reply.header('Content-Language', req.lang)
|
|
8
8
|
if (this.config.format.asExt && req.params.format) {
|
|
9
9
|
if (!this.config.format.supported.includes(req.params.format)) {
|
|
10
|
-
throw this.error('
|
|
10
|
+
throw this.error('unsupportedFormat%s', req.params.format, { statusCode: 406 })
|
|
11
11
|
}
|
|
12
12
|
}
|
|
13
13
|
}
|
|
@@ -66,18 +66,18 @@ async function buildResponse ({ ctx, schema, method, options }) {
|
|
|
66
66
|
|
|
67
67
|
const result = {
|
|
68
68
|
'2xx': {
|
|
69
|
-
description: this.print.write('
|
|
69
|
+
description: this.print.write('successfulResponse'),
|
|
70
70
|
type: 'object'
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
73
|
if (['create', 'update', 'replace'].includes(method)) {
|
|
74
74
|
result['4xx'] = {
|
|
75
|
-
description: this.print.write('
|
|
75
|
+
description: this.print.write('docErrorResponse'),
|
|
76
76
|
$ref: '4xxResp#'
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
79
|
result['5xx'] = {
|
|
80
|
-
description: this.print.write('
|
|
80
|
+
description: this.print.write('generalErrorResponse'),
|
|
81
81
|
$ref: '5xxResp#'
|
|
82
82
|
}
|
|
83
83
|
if (cfgWdb.dbModel.dataOnly) {
|
package/lib/decorate.js
CHANGED
package/lib/error.js
CHANGED
|
@@ -3,7 +3,7 @@ import { handler } from './not-found.js'
|
|
|
3
3
|
const extHandler = async function (err, req, reply, ctx) {
|
|
4
4
|
const code = err.statusCode ?? 500
|
|
5
5
|
const msg = err.message
|
|
6
|
-
if (msg === '
|
|
6
|
+
if (msg === '_notFound') {
|
|
7
7
|
return handler.call(this, req, reply, ctx)
|
|
8
8
|
}
|
|
9
9
|
const data = ctx.httpErrors.createError(code, msg)
|
package/lib/not-found.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export function handler (ctx, req, reply) {
|
|
2
|
-
const msg = this.print.write('
|
|
2
|
+
const msg = this.print.write('routeNotFound%s%s', req.url, req.method)
|
|
3
3
|
const data = ctx.httpErrors.createError(404, msg)
|
|
4
4
|
return this.transformResult({ data, req, reply })
|
|
5
5
|
}
|
package/lib/route-by-verb.js
CHANGED
|
@@ -28,12 +28,12 @@ async function routeByVerb ({ file, ctx, appCtx, dir, pathPrefix, ns, alias, par
|
|
|
28
28
|
}
|
|
29
29
|
if (['create', 'update', 'replace'].includes(action)) {
|
|
30
30
|
defSchema.response['4xx'] = {
|
|
31
|
-
description: this.print.write('
|
|
31
|
+
description: this.print.write('docErrorResponse'),
|
|
32
32
|
$ref: '4xxResp#'
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
35
|
defSchema.response['5xx'] = {
|
|
36
|
-
description: this.print.write('
|
|
36
|
+
description: this.print.write('generalErrorResponse'),
|
|
37
37
|
$ref: '5xxResp#'
|
|
38
38
|
}
|
|
39
39
|
if (action === 'find') defSchema.querystring = { $ref: 'qsFilter#' }
|
package/lib/sub-app.js
CHANGED
|
@@ -3,7 +3,7 @@ async function subApp (ctx) {
|
|
|
3
3
|
const { collect } = await importModule('waibu:/lib/app.js', { asDefaultImport: false })
|
|
4
4
|
const mods = await collect.call(this.app[this.name], 'boot.js', 'waibuRestApi')
|
|
5
5
|
for (const m of mods) {
|
|
6
|
-
this.log.debug('
|
|
6
|
+
this.log.debug('bootSubApp%s', m.ns)
|
|
7
7
|
await ctx.register(async (subCtx) => {
|
|
8
8
|
this.app[m.ns].instance = subCtx
|
|
9
9
|
await runHook(`${this.name}.${m.alias}:afterCreateContext`, subCtx)
|
package/package.json
CHANGED
package/waibu/boot.js
CHANGED
|
@@ -68,14 +68,14 @@ const boot = {
|
|
|
68
68
|
const fullPath = appPrefix === '/' ? mod.url : (appPrefix + mod.url)
|
|
69
69
|
const isRouteDisabled = await importModule('waibu:/lib/webapp-scope/is-route-disabled.js')
|
|
70
70
|
if (await isRouteDisabled.call(this, fullPath, mod.method, me.config.disabled)) {
|
|
71
|
-
this.log.warn('
|
|
71
|
+
this.log.warn('routeDisabled%s%s', `${prefix}${fullPath}`, mod.method)
|
|
72
72
|
continue
|
|
73
73
|
}
|
|
74
74
|
const rpath = await reroutedPath.call(this, fullPath, me.config.rerouted)
|
|
75
75
|
if (me.config.format.asExt) mod.url = formatExt(mod.url)
|
|
76
76
|
if (rpath) {
|
|
77
77
|
mod.config.pathReroutedTo = rpath
|
|
78
|
-
this.log.warn('
|
|
78
|
+
this.log.warn('rerouted%s%s', `${prefix}${fullPath}`, `${prefix}${rpath}`)
|
|
79
79
|
mod.url = me.config.format.asExt ? formatExt(rpath) : rpath
|
|
80
80
|
await ctx.route(mod)
|
|
81
81
|
} else await appCtx.route(mod)
|