waibu 1.0.10 → 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/intl/en-US.json

@@ -10,5 +10,6 @@
   "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"
+  "routeNotFound%s%s": "Route '%s (%s)' not found",
+  "middlewareDisabled%s": "Middleware '%s' is disabled"
 }

package/bajo/intl/id.json

@@ -10,5 +10,6 @@
   "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"
+  "routeNotFound%s%s": "Jalur '%s (%s)' tidak ditemukan",
+  "middlewareDisabled%s": "Middleware '%s' dimatikan"
 }

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.10",
+  "version": "1.0.11",
   "description": "Web Framework for Bajo",
   "main": "index.js",
   "scripts": {