waibu-mpa 2.10.1 → 2.12.0

package/extend/dobo/model/session.json

@@ -4,5 +4,6 @@
     "session,object"
   ],
   "features": ["dobo:createdAt", "dobo:updatedAt"],
-  "attachment": false
+  "attachment": false,
+  "cache": false
 }

package/index.js

@@ -33,12 +33,16 @@ async function factory (pkgName) {
           prefix: ''
         },
         waibuAdmin: {
-          modelDisabled: ['session']
+          menuHandler: false,
+          modelDisabled: '*'
         },
         mountMainAsRoot: true,
         page: {
           charset: 'utf-8',
-          cacheMaxAge: 0,
+          cache: {
+            ttlDur: 0,
+            urls: []
+          },
           insertWarning: false,
           usePluginTitle: false,
           scriptsAtEndOfBody: true
@@ -63,7 +67,6 @@ async function factory (pkgName) {
         },
         emoji: true,
         viewEngine: {
-          cacheMaxAge: 0,
           layout: {
             default: 'waibuMpa:/default.html',
             fallback: true
@@ -81,7 +84,7 @@ async function factory (pkgName) {
           },
           component: {
             unknownTag: 'replaceWithDiv',
-            cacheMaxAgeDur: '1m'
+            ttlDur: '1m'
           }
         },
         iconset: {
@@ -95,7 +98,7 @@ async function factory (pkgName) {
           }
         },
         concatResource: {
-          cacheMaxAge: 0,
+          ttlDur: 0,
           excluded: [],
           css: false,
           scripts: false,
@@ -144,13 +147,10 @@ async function factory (pkgName) {
       }
 
       this.configProd = {
-        viewEngine: {
-          cacheMaxAge: 300
-        },
         theme: {
           component: {
             unknownTag: 'remove',
-            cacheMaxAge: 300
+            ttlDur: '5m'
           }
         },
         prettier: false,
@@ -509,7 +509,6 @@ async function factory (pkgName) {
       const ext = path.extname(tpl)
       if (['.json', '.js', '.css'].includes(ext)) opts.partial = true
       opts.ext = ext
-      opts.cacheMaxAge = this.config.page.cacheMaxAgeDur
       const viewEngine = this.getViewEngine(ext)
       return await viewEngine.render(tpl, locals, opts)
     }

package/lib/build-page/concat-resources.js

@@ -7,22 +7,19 @@ async function apply ({ $, req, tag, attr, type }) {
   const { routePath } = this.app.waibu
   const { hash, fetch } = this.app.bajoExtra
   const { isEmpty, map, without } = this.app.lib._
-  const cache = this.app.bajoCache
+  const { get: getCache, set: setCache } = this.app.bajoCache ?? {}
+  const prefix = this.app.bajoCache.config.exportPrefix
   const excluded = map(this.config.concatResource.excluded, item => routePath(item))
-  let cachePrefix = this.app.bajoCache.config.externalPrefix
-  if (!cachePrefix) return
-  cachePrefix += ':'
-
   const baseUrl = `${req.protocol}://${req.hostname}${req.port ? `:${req.port}` : ''}` // TODO: auth, if any
   const items = []
   $(`${tag}[${attr}]`).each(function () {
     items.push(this.attribs[attr])
   })
   if (items.length === 0) return
-  const key = cachePrefix + await hash(items)
-  const cached = await cache.get({ key })
   let keys = []
   const notKeys = []
+  const key = `${prefix}-waibu-mpa-concat-resource-${await hash(items)}`
+  const cached = await getCache({ key })
   if (!cached) {
     const contents = []
     for (const item of items) {
@@ -46,14 +43,13 @@ async function apply ({ $, req, tag, attr, type }) {
     }
     if (isEmpty(contents)) return
     $(map(keys, k => `${tag}[${attr}="${k}"]`).join(',')).remove()
-    // await cache.set({ key, value: contents.join('\n'), ttl: this.config.page.cacheMaxAge * 1000 })
     const value = { contents, notKeys, type, tag, attr }
-    await cache.set({ key, value, ttl: this.config.concatResource.cacheMaxAge * 1000 })
+    await setCache({ key, value, ttl: this.config.concatResource.ttlDur })
   } else {
     keys = without(items, ...cached.notKeys)
     $(map(keys, k => `${tag}[${attr}="${k}"]`).join(',')).remove()
   }
-  const rsc = `bajoCache:/external/${key.replace(cachePrefix, '')}.${type}`
+  const rsc = `bajoCache:/external/${key.slice(prefix.length + 1)}.${type}`
   if (tag === 'link') $('head').prepend(printLink.call(this, rsc))
   else if (tag === 'script') $('body').append(printScript.call(this, rsc))
 }
@@ -61,7 +57,7 @@ async function apply ({ $, req, tag, attr, type }) {
 async function concatResources (options) {
   const { $, req } = options ?? {}
   if (!(this.app.bajoExtra && this.app.bajoCache)) return
-  if (this.config.concatResource.cacheMaxAge < 1) return
+  if (this.config.concatResource.ttlDur === 0) return
   if (this.config.concatResource.css) await apply.call(this, { $, req, tag: 'link', attr: 'href', type: 'css' })
   if (this.config.concatResource.links) await apply.call(this, { $, req, tag: 'link', attr: 'href', type: 'css' })
   if (this.config.concatResource.scripts) await apply.call(this, { $, req, tag: 'script', attr: 'src', type: 'js' })

package/lib/build-routes.js

@@ -3,7 +3,7 @@ import path from 'path'
 export async function build ({ files, pathPrefix, dir, ns, cfg, parent, urlPrefix, subRoute }) {
   const { defaultsDeep } = this.app.lib.aneka
   const { importModule, readJson } = this.app.bajo
-  const { isFunction, isPlainObject, pick, last, camelCase } = this.app.lib._
+  const { isFunction, isPlainObject, pick, last, camelCase, omit } = this.app.lib._
   const { titleize } = this.app.lib.aneka
   const { getPluginPrefix } = this.app.waibu
   const mergeRouteHooks = await importModule('waibu:/lib/webapp-scope/merge-route-hooks.js')
@@ -45,10 +45,14 @@ export async function build ({ files, pathPrefix, dir, ns, cfg, parent, urlPrefi
       m.config.prefix = getPluginPrefix(ns)
       m.config.pathSrc = m.url
       m.config.webApp = parent ?? ns
+      m.config.interSite = m.interSite
       m.config.ns = ns
       m.config.subNs = ''
       m.config.title = m.title ?? camelCase(last(m.url.split('/')))
       m.config.subRoute = subRoute
+      if (m.cache === true) m.cache = omit(me.config.page.cache, ['urls'])
+      m.config.cache = defaultsDeep(m.cache ?? {}, { ttlDur: 0 })
+
       delete m.title
       m = defaultsDeep(pick(cfg, ['exposeHeadRoute', 'bodyLimit']), m)
       mods.push(m)

package/lib/class/component.js

@@ -11,7 +11,7 @@ async function componentFactory () {
       this.locals = locals
       this.reply = reply
       this.req = req
-      this.cacheMaxAge = get(plugin, 'app.waibuMpa.config.theme.component.cacheMaxAgeDur', 0)
+      this.ttlDur = get(plugin, 'app.waibuMpa.config.theme.component.ttlDur', 0)
       this.namespace = 'c:'
       this.noTags = []
       this.scriptBlock = scriptBlock
@@ -118,7 +118,7 @@ async function componentFactory () {
       if (isEmpty(params.html)) return await this.render(params)
 
       const merged = merge({}, params.locals, { attr: params.attr })
-      const result = await compile(params.html, merged, { ttl: this.cacheMaxAge })
+      const result = await compile(params.html, merged, { ttl: this.ttlDur })
       params.html = result
       return await this.render(params)
     }

package/lib/decorate.js

@@ -1,17 +1,45 @@
 import path from 'path'
 
+async function isCacheable (req, cachedUrls) {
+  const { hash } = this.app.bajoExtra
+  const { get, omit, isFunction } = this.app.lib._
+  const ns = get(req, 'routeOptions.config.ns')
+  let cache = get(req, 'routeOptions.config.cache', omit(this.config.page.cache, ['urls']))
+  cache.methods = cache.methods ?? ['GET']
+  if (!ns || (!this.app.bajoCache) || (!req.site) || !cache.methods.includes(req.method)) return { ttl: 0 }
+  if (isFunction(cache)) {
+    cache = await cache.call(this.app[ns], req, cachedUrls)
+  }
+  const url = req.url.split('?')[0].split('#')[0]
+  for (const item of cachedUrls) {
+    if (item.isMatch(url)) cache.ttlDur = item.ttlDur ?? cache.ttlDur
+  }
+  const key = `waibu-mpa-page-${req.site.id}-${cache.key ?? (await hash(req.url))}`
+  return { key, ttl: cache.ttlDur }
+}
+
 async function decorate () {
   const { importPkg } = this.app.bajo
-  const { isEmpty } = this.app.lib._
+  const { isString, cloneDeep, isEmpty } = this.app.lib._
+  const { get: getCache, set: setCache } = this.app.bajoCache ?? {}
+  const { outmatch } = this.app.lib
+  const { routePath } = this.app.waibu
   const mime = await importPkg('waibu:mime')
   const cfg = this.config
   const me = this
+  const cachedUrls = cloneDeep(this.config.page.cache.urls).map(item => {
+    if (isString(item)) item = { url: item }
+    item.url = routePath(item.url)
+    item.isMatch = outmatch(item.url)
+    return item
+  })
   this.webAppCtx.decorateRequest('theme', cfg.theme.set)
   this.webAppCtx.decorateRequest('iconset', cfg.iconset.set)
   this.webAppCtx.decorateRequest('darkMode', cfg.darkMode.set)
   this.webAppCtx.decorateRequest('referer', '')
   this.webAppCtx.decorateReply('ctags', null)
   this.webAppCtx.decorateReply('view', async function (tpl, params = {}, opts = {}) {
+    // this = fastify context!
     let ext = path.extname(tpl)
     if (ext === '.md') ext = '.html'
     let mimeType = isEmpty(ext) ? 'text/html' : mime.getType(ext)
@@ -24,7 +52,16 @@ async function decorate () {
       if (!this.request[item]) this.request[item] = me[item + 's'][0].name
       if (me[item + 's'].length === 1) this.request[item] = me[item + 's'][0].name
     }
+    const { key, ttl } = await isCacheable.call(me, this.request, cachedUrls)
+    if (ttl > 0) {
+      const cached = await getCache({ key })
+      if (cached) {
+        this.header('X-Wmpa-Cached', true)
+        return cached
+      }
+    }
     const result = await me.render(tpl, params, opts)
+    if (ttl > 0) await setCache({ key, value: result, ttl })
     if (this.request.session) {
       ext = path.extname(this.request.url)
       if (isEmpty(ext) || ['.html'].includes(ext)) {

package/lib/load-resource.js

@@ -19,7 +19,7 @@ async function loadResource (mod = [], item) {
     } else items.push(mod[item][i])
   }
   for (const c of extItems) {
-    let emod = await readConfig(`${c.ns}:${c.path}`, { ns: c.ns })
+    let emod = await readConfig(`${c.ns}:${c.path}`, { ns: c.ns, ignoreError: false })
     if (!isArray(emod)) emod = [emod]
     for (const m of emod) {
       items.push(m)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu-mpa",
-  "version": "2.10.1",
+  "version": "2.12.0",
   "description": "MPA support for Waibu Framework",
   "main": "index.js",
   "scripts": {

package/wiki/CHANGES.md

@@ -1,5 +1,14 @@
 # Changes
 
+## 2026-03-30
+
+- [2.12.0] Add inter site module support
+
+## 2026-03-27
+
+- [2.11.0] Add options to enable cache with Bajo Cache module
+- [2.11.0] Change all ```cacheMaxAge``` keys to ```ttlDur``` to align with above mentioned cache engine
+
 ## 2026-03-22
 
 - [2.10.1] Bug fix in applying routes to ```webCtx```