waibu 1.0.9 → 1.0.11

package/bajo/config.json

@@ -27,6 +27,10 @@
     "title": "My Website",
     "orgName": "My Organization"
   },
+  "cors": {},
+  "compress": {},
+  "helmet": {},
+  "rateLimit": {},
   "multipart": {
     "attachFieldsToBody": true,
     "limits": {

package/bajo/hook/on-close.js

@@ -1,5 +1,5 @@
 async function onClose () {
-  this.log.info('Server is closed')
+  this.log.info('serverIs%s', this.print.write('closedL'))
 }
 
 export default onClose

package/bajo/hook/on-ready.js

@@ -1,5 +1,5 @@
 async function onReady () {
-  this.log.info('Server is ready!')
+  this.log.info('serverIs%s', this.print.write('readyL'))
 }
 
 export default onReady

package/bajo/intl/en-US.json

@@ -0,0 +1,15 @@
+{
+  "pluginPrefixConflic%s%s%s": "Plugin prefix '%s' conflict between '%s' and '%s'",
+  "serverIs%s": "Server is %s",
+  "closedL": "closed",
+  "readyL": "ready",
+  "allRoutesConfigDisabled%s": "All '%s' routes are disabled by config",
+  "bootApp%s": "Boot app: %s",
+  "cantParseXmlBodyWithout%s": "Can't parse XML body unless package '%s' is loaded first",
+  "routesL": "routes",
+  "routeDisabled%s%s": "Route %s (%s) is disabled",
+  "rerouted%s%s": "Rerouted %s -> %s",
+  "bootSubApp%s": "Boot sub app: %s",
+  "routeNotFound%s%s": "Route '%s (%s)' not found",
+  "middlewareDisabled%s": "Middleware '%s' is disabled"
+}

package/bajo/intl/id.json

@@ -1,46 +1,15 @@
 {
-  "[%s] Server is closed": "[%s] Penyelia telah tertutup",
-  "[%s] Server is ready!": "[%s] Penyelia telah siap!",
-  "Route '%s (%s)' not found": "Rute '%s (%s)' tidak ditemukan",
-  "Bad Request": "",
-  "Unauthorized": "Tidak Terautentikasi",
-  "Payment Required": "Pembayaran Disyaratkan",
-  "Forbidden": "Dilarang",
-  "Not Found": "Tidak Ditemukan",
-  "Method Not Allowed": "Metode Tidak Diperkenankan",
-  "Not Acceptable": "Tidak Bisa Diterima",
-  "Proxy Authentication Required": "",
-  "Request Timeout": "",
-  "Conflict": "",
-  "Gone": "",
-  "Length Required": "",
-  "Precondition Failed": "",
-  "Payload Too Large": "",
-  "URI Too Long": "",
-  "Unsupported Media Type": "",
-  "Range Not Satisfiable": "",
-  "Expectation Failed": "",
-  "Im A Teapot": "",
-  "Misdirected Request": "",
-  "Unprocessable Entity": "",
-  "Locked": "",
-  "Failed Dependency": "",
-  "Too Early": "",
-  "Upgrade Required": "",
-  "Precondition Required": "",
-  "Too Many Requests": "",
-  "Request Header Fields Too Large": "",
-  "Unavailable For Legal Reasons": "",
-  "Internal Server Error": "Kesalahan Internal Server",
-  "Not Implemented": "",
-  "Bad Gateway": "",
-  "Service Unavailable": "",
-  "Gateway Timeout": "",
-  "HTTP Version Not Supported": "",
-  "Variant Also Negotiates": "",
-  "Insufficient Storage": "",
-  "Loop Detected": "",
-  "Bandwidth Limit Exceeded": "",
-  "Not Extended": "",
-  "Network Authentication Require": ""
+  "pluginPrefixConflic%s%s%s": "Ada konflik di prefiks '%s' antara '%s' dan '%s'",
+  "serverIs%s": "Server %s",
+  "closedL": "tertutup",
+  "readyL": "siap sedia",
+  "allRoutesConfigDisabled%s": "Semua jalur '%s' dimatikan via konfigurasi",
+  "bootApp%s": "Jalankan aplikasi: %s",
+  "cantParseXmlBodyWithout%s": "Tidak bisa memparse bodi XML sebelum paket '%s' dimuat terlebih dahulu",
+  "routesL": "jalur",
+  "routeDisabled%s%s": "Jalur %s (%s) dimatikan",
+  "rerouted%s%s": "Jalur dipindahkan %s -> %s",
+  "bootSubApp%s": "Boot sub app: %s",
+  "routeNotFound%s%s": "Jalur '%s (%s)' tidak ditemukan",
+  "middlewareDisabled%s": "Middleware '%s' dimatikan"
 }

package/bajo/method/not-found.js

@@ -1,5 +1,5 @@
 function notFound (name, options) {
-  throw this.error('notFound', { path: name })
+  throw this.error('_notFound', { path: name })
 }
 
 export default notFound

package/lib/app.js

@@ -18,7 +18,7 @@ export async function collect (glob = 'boot.js', baseNs) {
   mods.forEach(m => {
     if (!prefixes[m.prefix]) prefixes[m.prefix] = []
     prefixes[m.prefix].push(m.plugin)
-    if (prefixes[m.prefix].length > 1) this.fatal('Plugin prefix \'%s\' conflic between \'%s\' and \'%s\'', m.prefix, prefixes[m.prefix][0], prefixes[m.prefix][1])
+    if (prefixes[m.prefix].length > 1) this.fatal('pluginPrefixConflic%s%s%s', m.prefix, prefixes[m.prefix][0], prefixes[m.prefix][1])
   })
   return orderBy(mods, ['level'])
 }
@@ -30,11 +30,11 @@ export async function boot () {
   for (const m of mods) {
     const disabled = this.app[m.ns].config.disabled
     if (Array.isArray(disabled) && disabled.length === 1 && ['*', 'all'].includes(disabled[0])) {
-      this.log.warn('All %s routes are disabled by config', m.ns)
+      this.log.warn('allRoutesConfigDisabled%s', m.ns)
       continue
     }
     await runHook(`${this.name}.${m.ns}:beforeAppBoot`)
-    this.log.debug('Boot app: %s', m.ns)
+    this.log.debug('bootApp%s', m.ns)
     await this.instance.register(async (ctx) => {
       const plugin = this.app[m.ns]
       plugin.instance = ctx

package/lib/handle-xml-body.js

@@ -2,7 +2,7 @@
 
 async function xmlBodyParser (ctx, opts = {}) {
   if (!this.app.bajoExtra) {
-    this.log.warn('Can\'t parse XML body unless package \'%s\' is loaded first', 'bajo-extra')
+    this.log.warn('cantParseXmlBodyWithout%s', 'bajo-extra')
     return
   }
   const { importPkg } = this.app.bajo

package/lib/log-routes.js

@@ -10,7 +10,7 @@ function printRoutes () {
     }
   })
   items = orderBy(items, ['url'])
-  this.log.debug('Loaded routes')
+  this.log.debug('loaded%s', this.print.write('routesL'))
   items.forEach(item => {
     this.log.debug('- %s (%s)', item.url, item.methods.join('|'))
   })

package/lib/webapp-scope/attach-intl.js

@@ -53,10 +53,12 @@ async function attachIntl (detector = [], req, reply) {
   detect.call(this, detector, req, reply)
   const defNs = get(req, 'routeOptions.config.ns', this.name)
   req.t = (text, ...args) => {
-    return this.app[defNs].print.write(text, req.lang, ...args)
+    args.push({ lang: req.lang })
+    return this.app[defNs].print.write(text, ...args)
   }
-  req.format = (value, type = 'auto', opts) => {
-    return this.app.bajo.format(value, type, req.lang, opts)
+  req.format = (value, type = 'auto', opts = {}) => {
+    opts.lang = opts.lang ?? req.lang
+    return this.app.bajo.format(value, type, opts)
   }
 }
 

package/lib/webapp-scope/error-handler.js

@@ -6,9 +6,9 @@ async function errorHandler (ctx, extHandler) {
       reply.send(err.print)
       return
     }
-    if (me.app.bajo.config.log.level === 'trace' && !['notfound', 'redirect'].includes(err.message.toLowerCase())) console.error(err)
+    if (me.app.bajo.config.log.level === 'trace' && !['_notFound', '_redirect'].includes(err.message.toLowerCase())) console.error(err)
     if (extHandler) return await extHandler.call(me, err, req, reply, ctx)
-    if (err.message.toLowerCase() === 'notfound' || err.statusCode === 404) {
+    if (err.message === '_notFound' || err.statusCode === 404) {
       reply.code(err.statusCode)
       return
     }

package/lib/webapp-scope/handle-compress.js

@@ -1,8 +1,10 @@
 import compress from '@fastify/compress'
 
 async function handleCompress (ctx, options = {}) {
-  if (!options) return
-  await ctx.register(compress, options)
+  const { defaultsDeep } = this.app.bajo
+  if (options === false) return this.log.warn('middlewareDisabled%s', 'compress')
+  const opts = defaultsDeep(options, this.app.waibu.config.compress)
+  await ctx.register(compress, opts)
 }
 
 export default handleCompress

package/lib/webapp-scope/handle-cors.js

@@ -1,8 +1,10 @@
 import cors from '@fastify/cors'
 
 async function handleCors (ctx, options = {}) {
-  if (!options) return
-  await ctx.register(cors, options)
+  const { defaultsDeep } = this.app.bajo
+  if (options === false) return this.log.warn('middlewareDisabled%s', 'cors')
+  const opts = defaultsDeep(options, this.app.waibu.config.cors)
+  await ctx.register(cors, opts)
 }
 
 export default handleCors

package/lib/webapp-scope/handle-helmet.js

@@ -1,8 +1,10 @@
 import helmet from '@fastify/helmet'
 
 async function handleHelmet (ctx, options = {}) {
-  if (!options) return
-  await ctx.register(helmet, options)
+  const { defaultsDeep } = this.app.bajo
+  if (options === false) return this.log.warn('middlewareDisabled%s', 'helmet')
+  const opts = defaultsDeep(options, this.app.waibu.config.helmet)
+  await ctx.register(helmet, opts)
 }
 
 export default handleHelmet

package/lib/webapp-scope/handle-multipart-body.js

@@ -7,7 +7,7 @@ const pump = promisify(pipeline)
 async function onFileHandler () {
   const { getPluginDataDir } = this.app.bajo
   const { fs } = this.app.bajo.lib
-  const dir = `${getPluginDataDir(this.name)}/upload`
+  const dir = `${getPluginDataDir('waibu')}/upload`
   return async function (part) {
     // 'this' is the fastify context here
     const filePath = `${dir}/${this.id}/${part.fieldname}@${part.filename}`
@@ -20,7 +20,8 @@ async function handleMultipartBody (ctx, options = {}) {
   const { defaultsDeep, importPkg, isSet } = this.app.bajo
   const { isArray, map, trim, isPlainObject, isEmpty } = this.app.bajo.lib._
   const parseVar = await importPkg('dotenv-parse-variables')
-  const opts = defaultsDeep(options, this.config.multipart)
+  if (options === false) return this.log.warn('middlewareDisabled%s', 'multipart')
+  const opts = defaultsDeep(options, this.app.waibu.config.multipart)
   const onFile = await onFileHandler.call(this)
   opts.onFile = onFile
   await ctx.register(multipart, opts)

package/lib/webapp-scope/handle-rate-limit.js

@@ -2,8 +2,10 @@ import rateLimit from '@fastify/rate-limit'
 
 async function handleRateLimit (ctx, options = {}) {
   const { cloneDeep } = this.app.bajo.lib._
-  if (!options) return
-  await ctx.register(rateLimit, cloneDeep(options))
+  const { defaultsDeep } = this.app.bajo
+  if (options === false) return this.log.warn('middlewareDisabled%s', 'rateLimit')
+  const opts = defaultsDeep(options, this.app.waibu.config.rateLimit)
+  await ctx.register(rateLimit, cloneDeep(opts))
 }
 
 export default handleRateLimit

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Web Framework for Bajo",
   "main": "index.js",
   "scripts": {