waibu 2.16.2 → 2.18.0

package/extend/bajo/intl/en-US.json

@@ -8,7 +8,7 @@
   "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",
+  "routeDisabled%s": "Route '%s' is disabled",
   "rerouted%s%s": "Rerouted %s -> %s",
   "bootSubApp%s": "Boot sub app: %s",
   "routeNotFound%s%s": "Route '%s (%s)' not found",

package/extend/bajo/intl/id.json

@@ -8,7 +8,7 @@
   "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",
+  "routeDisabled%s": "Jalur '%s' dimatikan",
   "rerouted%s%s": "Jalur dipindahkan %s -> %s",
   "bootSubApp%s": "Boot sub app: %s",
   "routeNotFound%s%s": "Jalur '%s (%s)' tidak ditemukan",

package/index.js

@@ -110,7 +110,10 @@ async function factory (pkgName) {
           lang: 'lang'
         },
         paramsCharMap: {},
-        printRoutes: true,
+        route: {
+          print: true,
+          disabled: []
+        },
         pageTitleFormat: '%s : %s',
         siteInfo: {
           title: 'My Website',
@@ -184,7 +187,7 @@ async function factory (pkgName) {
       }
       cfg.factory.genReqId = req => generateId()
       cfg.factory.disableRequestLogging = true
-      cfg.factory.querystringParser = str => this.qs.parse(str)
+      cfg.factory.routerOptions.querystringParser = str => this.qs.parse(str)
 
       this.instance = fastify(cfg.factory)
       this.routes = this.routes || []
@@ -201,7 +204,7 @@ async function factory (pkgName) {
       await handleHome.call(this)
       await handleNotFound.call(this)
       await this.instance.listen(cfg.server)
-      if (cfg.printRoutes) printRoutes.call(this)
+      if (cfg.route.print) printRoutes.call(this)
     }
 
     /**
@@ -391,10 +394,9 @@ async function factory (pkgName) {
      * @returns {(Object|Array)} - Returns object if ```returnDir``` is ```true```, array of files otherwise
      */
     getUploadedFiles = async (reqId, fileUrl = false, returnDir = false) => {
-      const { getPluginDataDir } = this.app.bajo
       const { resolvePath } = this.app.lib.aneka
       const { fastGlob } = this.app.lib
-      const dir = `${getPluginDataDir(this.ns)}/upload/${reqId}`
+      const dir = `${this.app.getPluginDataDir(this.ns)}/upload/${reqId}`
       const result = await fastGlob(`${dir}/*`)
       if (!fileUrl) return returnDir ? { dir, files: result } : result
       const files = result.map(f => resolvePath(f, true))
@@ -468,16 +470,17 @@ async function factory (pkgName) {
      * @returns {string}
      */
     routePath = (name = '', options = {}) => {
-      const { getPlugin } = this.app.bajo
       const { defaultsDeep } = this.app.lib.aneka
       const { isEmpty, get, trimEnd, trimStart } = this.app.lib._
       const { breakNsPath } = this.app.bajo
       const { query = {}, ns = this.ns, params = {}, guessHost, defaults = {}, uriEncoded } = options
 
-      const plugin = getPlugin(ns)
+      const plugin = this.app.getPlugin(ns)
       const cfg = plugin.config ?? {}
       let info = {}
+      const neg = name[0] === '!'
       if (name.startsWith('mailto:') || name.startsWith('tel:')) return name
+      if (neg) name = name.slice(1)
       if (name.slice(0, 2) === ':/') name = ns + name
       if (['%', '.', '/', '?', '#'].includes(name[0]) || name.slice(1, 2) === ':') info.path = name
       else if (['~'].includes(name[0])) info.path = name.slice(1)
@@ -485,8 +488,8 @@ async function factory (pkgName) {
         info = breakNsPath(name)
       }
       if (info.path.slice(0, 2) === './') info.path = info.path.slice(2)
-      if (this.routePathHandlers[info.subNs]) return this.routePathHandlers[info.subNs].handler(name, options)
-      if (info.path.includes('//')) return info.path
+      if (this.routePathHandlers[info.subNs]) return (neg ? '!' : '') + this.routePathHandlers[info.subNs].handler(name, options)
+      if (info.path.includes('//')) return (neg ? '!' : '') + info.path
 
       info.path = info.path.split('/').map(p => {
         if (!(p[0] === ':' || (p[0] === '{' && p[p.length - 1] === '}'))) return p
@@ -503,7 +506,7 @@ async function factory (pkgName) {
       info.qs = defaultsDeep({}, query, info.qs)
       if (!isEmpty(info.qs)) url += '?' + this.qs.stringify(info.qs)
       if (!url.startsWith('http') && guessHost) url = `http://${this.config.server.host}:${this.config.server.port}/${trimStart(url, '/')}`
-      return url
+      return (neg ? '!' : '') + url
     }
 
     /**
@@ -605,6 +608,16 @@ async function factory (pkgName) {
       if (isPlainObject(cfgValue) || isArray(cfgValue)) return defaultsDeep({}, reqValue, cfgValue, defValue)
       return reqValue ?? cfgValue ?? defValue
     }
+
+    isRouteDisabled = (path, warning = true) => {
+      const { outmatch } = this.app.lib
+      path = this.routePath(path)
+      const result = this.config.route.disabled.find(item => {
+        return outmatch(this.routePath(item))(path)
+      })
+      if (result && warning) this.log.warn('routeDisabled%s', path)
+      return result
+    }
   }
 
   return Waibu

package/lib/handle-not-found.js

@@ -1,10 +1,9 @@
 export function writeHtml (req, reply, tpl, payload) {
-  const { getPluginFile } = this.app.bajo
   const { fs } = this.app.lib
   const { template } = this.app.lib._
   reply.header('Content-Type', 'text/html')
   reply.header('Content-Language', req.lang)
-  const file = getPluginFile(tpl)
+  const file = this.app.getPluginFile(tpl)
   const content = fs.readFileSync(file, 'utf8')
   const compiled = template(content)
   return compiled(payload)

package/lib/web-app.js

@@ -8,7 +8,7 @@ export async function collect (glob = 'boot.js', baseNs) {
     const { ns, alias, config } = this
     const mod = await importModule(file, { asHandler: true })
     mod.prefix = get(config, 'waibu.prefix', alias)
-    if (get(config, 'intl.detectors', []).includes('path')) mod.prefix = `/:lang${mod.prefix}`
+    if (get(config, 'intl.detectors', []).includes('path')) mod.prefix = `:lang${mod.prefix === '' ? '' : ('/' + mod.prefix)}`
     mod.ns = ns
     mod.alias = alias
     mods.push(mod)
@@ -28,11 +28,6 @@ async function webApp () {
   await runHook(`${this.ns}:beforeAppBoot`)
   // build routes
   for (const m of this.webApps) {
-    const disabled = this.app[m.ns].config.disabled
-    if (Array.isArray(disabled) && disabled.length === 1 && ['*', 'all'].includes(disabled[0])) {
-      this.log.warn('allRoutesConfigDisabled%s', m.ns)
-      continue
-    }
     const plugin = this.app[m.ns]
     await runHook(`${this.ns}.${m.ns}:beforeAppBoot`)
     this.log.debug('bootApp%s', m.ns)

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

@@ -13,9 +13,8 @@ function normalizeValue (value) {
 }
 
 async function onFileHandler () {
-  const { getPluginDataDir } = this.app.bajo
   const { fs } = this.app.lib
-  const dir = `${getPluginDataDir('waibu')}/upload`
+  const dir = `${this.app.getPluginDataDir('waibu')}/upload`
   return async function (part) {
     // 'this' is the fastify context here
     const filePath = `${dir}/${this.id}/${part.fieldname}@${part.filename}`

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,16 @@
 # Changes
 
+## 2026-06-12
+
+- [2.18.0] Necessary updates to ```bajo@2.18.0``` specs
+
+## 2026-06-10
+
+- [2.17.0] Add ```config.print```
+- [2.17.0] Bug fix in ```factory.routeOptions```
+- [2.17.0] Add support for inversed route in ```routePath()```
+- [2.17.0] Disabled routes now handled directly by ```waibu```, not its web apps
+
 ## 2026-06-05
 
 - [2.16.2] Bug fix in ```build-locals.js```

package/lib/webapp-scope/is-route-disabled.js

@@ -1,33 +0,0 @@
-function santizeMethods (methods = '*') {
-  if (['*', 'all'].includes(methods)) methods = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE']
-  else methods = methods.split(',').map(s => s.trim())
-  return methods
-}
-
-async function isRouteDisabled (url, method, matchers = []) {
-  const { outmatch } = this.app.lib
-  const { isString, intersection, cloneDeep } = this.app.lib._
-  const items = []
-  for (let m of cloneDeep(matchers)) {
-    if (isString(m)) m = { path: m }
-    try {
-      m.path = this.app.waibu.routePath(m.path)
-      m.methods = santizeMethods(m.methods)
-      items.push(m)
-    } catch (err) {
-      throw this.error(`${m.path}: ${err.message}`)
-    }
-  }
-  const matcher = items.find(i => {
-    const isMatch = outmatch(i.path)
-    return isMatch(url)
-  })
-  if (!matcher) return false
-  if (Array.isArray(method)) {
-    const result = intersection(method, matcher.methods)
-    return result.length > 0
-  }
-  return matcher.methods.includes(method)
-}
-
-export default isRouteDisabled