waibu-mpa 2.1.10 → 2.2.0

package/extend/waibu/boot.js

@@ -5,13 +5,12 @@ import collectThemes from '../../lib/collect-themes.js'
 import collectIconsets from '../../lib/collect-iconsets.js'
 import handleSession from '../../lib/session/setup.js'
 import subApp from '../../lib/sub-app.js'
-import notFound from '../../lib/not-found.js'
-import error from '../../lib/error.js'
+import errorHandler from '../../lib/error-handler.js'
 
 const boot = {
   level: 10,
-  handler: async function (ctx, prefix) {
-    this.ctx = ctx
+  errorHandler,
+  handler: async function (prefix) {
     const { importPkg, importModule } = this.app.bajo
     const bodyParser = await importPkg('waibu:@fastify/formbody')
     const routeHook = await importModule('waibu:/lib/webapp-scope/route-hook.js')
@@ -21,22 +20,20 @@ const boot = {
     const handleCompress = await importModule('waibu:/lib/webapp-scope/handle-compress.js')
     const handleRateLimit = await importModule('waibu:/lib/webapp-scope/handle-rate-limit.js')
 
-    await ctx.register(bodyParser)
-    await handleRateLimit.call(this, ctx, this.config.rateLimit)
-    await handleCors.call(this, ctx, this.config.cors)
-    await handleHelmet.call(this, ctx, this.config.helmet)
-    await handleCompress.call(this, ctx, this.config.compress)
-    await handleMultipart.call(this, ctx, this.config.multipart)
-    await decorate.call(this, ctx)
-    await handleSession.call(this, ctx)
+    await this.webAppCtx.register(bodyParser)
+    await handleRateLimit.call(this, this.config.rateLimit)
+    await handleCors.call(this, this.config.cors)
+    await handleHelmet.call(this, this.config.helmet)
+    await handleCompress.call(this, this.config.compress)
+    await handleMultipart.call(this, this.config.multipart)
+    await decorate.call(this)
+    await handleSession.call(this)
     await routeHook.call(this, this.ns)
-    await error.call(this, ctx)
-    await collectViewEngines.call(this, ctx)
-    await collectThemes.call(this, ctx)
-    await collectIconsets.call(this, ctx)
-    await buildRoutes.call(this, ctx, prefix)
-    await subApp.call(this, ctx)
-    await notFound.call(this, ctx)
+    await collectViewEngines.call(this)
+    await collectThemes.call(this)
+    await collectIconsets.call(this)
+    await buildRoutes.call(this, prefix)
+    await subApp.call(this)
   }
 }
 

package/extend/waibuMpa/theme.js

@@ -1,4 +1,4 @@
-async function theme (ctx) {
+async function theme () {
   const css = [
     'waibuMpa.virtual:/purecss/pure-min.css'
   ]

package/lib/build-page/inject-elements/meta.js

@@ -7,7 +7,7 @@ const names = ['description', 'keywords', 'robots', 'viewport', 'author', 'publi
 
 async function meta (options) {
   const { runHook, importPkg } = this.app.bajo
-  const { map, uniq, isArray, merge, kebabCase, keys, omit, get, isFunction } = this.app.lib._
+  const { map, uniq, isArray, kebabCase, keys, omit, get, isFunction } = this.app.lib._
   const { sprintf } = this.app.lib
   const { $, theme, req, locals } = options ?? {}
   const { page = {} } = locals
@@ -22,10 +22,22 @@ async function meta (options) {
       content: isArray(page[attr]) ? page[attr].join(', ') : page[attr]
     })
   }
-  // link
+  // links
   for (const attr of links) {
     if (!page[attr]) continue
-    items.push(merge({}, page[attr], { rel: kebabCase(attr), tag: 'link' }))
+    const all = isArray(page[attr]) ? page[attr] : page[attr] = [page[attr]]
+    for (const a of all) {
+      const [href, ...params] = a.split('|')
+      const item = {
+        tag: 'link',
+        rel: kebabCase(attr),
+        href
+      }
+      for (const p of params ?? []) {
+        item[p] = true
+      }
+      items.push(item)
+    }
   }
   if (this.config.theme && this.config.theme.autoInsert.meta) {
     await runHook(`${this.ns}.${theme.name}:beforeInjectMeta`, { meta: theme.meta, items, req })

package/lib/build-routes.js

@@ -57,7 +57,7 @@ export async function build ({ files, pathPrefix, dir, ns, cfg, parent, urlPrefi
   return mods
 }
 
-async function addRoutes ({ appPrefix, prefix, mods, ctx, appCtx, cfg }) {
+async function addRoutes ({ appPrefix, prefix, mods, appCtx, cfg }) {
   const { importModule } = this.app.bajo
   const isRouteDisabled = await importModule('waibu:/lib/webapp-scope/is-route-disabled.js')
   const reroutedPath = await importModule('waibu:/lib/webapp-scope/rerouted-path.js')
@@ -72,12 +72,12 @@ async function addRoutes ({ appPrefix, prefix, mods, ctx, appCtx, cfg }) {
       this.log.warn('rerouted%s%s', `${prefix}${fullPath}`, `${prefix}${rpath}`)
       mod.url = rpath
       mod.pathReroutedTo = rpath
-      await ctx.route(mod)
+      await this.webAppCtx.route(mod)
     } else await appCtx.route(mod)
   }
 }
 
-async function buildRoutes (ctx, prefix) {
+async function buildRoutes (prefix) {
   const { eachPlugins, runHook } = this.app.bajo
   const { getPluginPrefix } = this.app.waibu
   const { fastGlob } = this.app.lib
@@ -88,7 +88,7 @@ async function buildRoutes (ctx, prefix) {
   const appCtxs = {}
   let subRoutes = []
   const names = this.app.getAllNs()
-  await runHook(`${this.ns}:beforeBuildRoutes`, ctx)
+  await runHook(`${this.ns}:beforeBuildRoutes`, this.webAppCtx)
   await eachPlugins(async function ({ dir }) {
     const { ns } = this
     let appPrefix = getPluginPrefix(ns)
@@ -103,11 +103,11 @@ async function buildRoutes (ctx, prefix) {
       subRoutes.push({ file, ns: sns, sns: ns, dir })
     }
     if (files.length === 0) return undefined
-    await ctx.register(async (appCtx) => {
+    await me.webAppCtx.register(async (appCtx) => {
       appCtxs[ns] = appCtx
       await runHook(`${me.ns}.${this.ns}:beforeBuildRoutes`, appCtx, appPrefix)
       const mods = await build.call(this, { appCtx, files, appPrefix, pathPrefix, dir, ns, cfg, parent: me.ns })
-      await addRoutes.call(me, { appPrefix, prefix, mods, ctx, appCtx, cfg })
+      await addRoutes.call(me, { appPrefix, prefix, mods, appCtx, cfg })
       await runHook(`${me.ns}.${this.ns}:afterBuildRoutes`, appCtx, appPrefix)
     }, { prefix: appPrefix })
   })
@@ -128,13 +128,13 @@ async function buildRoutes (ctx, prefix) {
         const pathPrefix = `waibuMpa/extend/${ns}/route/`
         const urlPrefix = getPluginPrefix(sns)
         const mods = await build.call(scope, { appCtx, files: [file], pathPrefix, dir, ns, cfg, parent: me.ns, urlPrefix, subRoute: sns })
-        await addRoutes.call(me, { appPrefix, prefix, mods, ctx, appCtx, cfg })
+        await addRoutes.call(me, { appPrefix, prefix, mods, appCtx, cfg })
       }
       await runHook(`${me.ns}.${k}:afterBuildSubRoutes`, appCtx, appPrefix)
     }
   }
 
-  await runHook(`${this.ns}:afterBuildRoutes`, ctx)
+  await runHook(`${this.ns}:afterBuildRoutes`, this.webAppCtx)
 }
 
 export default buildRoutes

package/lib/collect-iconsets.js

@@ -1,7 +1,7 @@
 import iconsetFactory from './class/iconset.js'
 import loadResource from './load-resource.js'
 
-async function collectIconsets (ctx) {
+async function collectIconsets () {
   const { eachPlugins, importModule, runHook } = this.app.bajo
   const { omit, isFunction, isArray, pullAt, findIndex, cloneDeep } = this.app.lib._
 
@@ -16,7 +16,7 @@ async function collectIconsets (ctx) {
   await eachPlugins(async function ({ file }) {
     const { ns } = this
     let mod = await importModule(file)
-    if (isFunction(mod)) mod = await mod.call(this, ctx)
+    if (isFunction(mod)) mod = await mod.call(this, me.webAppCtx)
     if (!isArray(mod)) mod = [mod]
     for (const m of mod) {
       for (const key of ['css', 'links', 'scripts']) {

package/lib/collect-themes.js

@@ -55,7 +55,7 @@ async function build (mod, fw) {
   await runHook(`${this.ns}.${mod.name}:afterCollectTheme`, theme)
 }
 
-async function collectThemes (ctx) {
+async function collectThemes () {
   const { eachPlugins, importModule } = this.app.bajo
   const { isFunction, isArray, find, without } = this.app.lib._
 
@@ -67,10 +67,11 @@ async function collectThemes (ctx) {
   this.log.debug('collect%s', this.t('themes'))
   const modso = []
   const modsf = []
+  const me = this
   await eachPlugins(async function ({ file }) {
     const plugin = this
     let mod = await importModule(file)
-    if (isFunction(mod)) mod = await mod.call(this, ctx)
+    if (isFunction(mod)) mod = await mod.call(this, me.webAppCtx)
     if (!isArray(mod)) mod = [mod]
     mod = mod.map(m => Object.assign(m, { plugin }))
     for (const m of mod) {

package/lib/collect-view-engines.js

@@ -1,6 +1,6 @@
 import viewEngineFactory from './class/view-engine.js'
 
-async function collectViewEngines (ctx) {
+async function collectViewEngines () {
   const { eachPlugins, importModule, join, runHook } = this.app.bajo
   const { isFunction, omit, isArray } = this.app.lib._
   this.viewEngines = []
@@ -9,7 +9,7 @@ async function collectViewEngines (ctx) {
   await eachPlugins(async function ({ file }) {
     const { ns } = this
     let mod = await importModule(file)
-    if (isFunction(mod)) mod = await mod.call(this, ctx)
+    if (isFunction(mod)) mod = await mod.call(this, me.webAppCtx)
     if (!isArray(mod)) mod = [mod]
     for (const m of mod) {
       await runHook(`${me.ns}.${mod.name}:beforeCollectViewEngine`, m)

package/lib/decorate.js

@@ -1,17 +1,17 @@
 import path from 'path'
 
-async function decorate (ctx) {
+async function decorate () {
   const { importPkg } = this.app.bajo
   const { isEmpty } = this.app.lib._
   const mime = await importPkg('waibu:mime')
   const cfg = this.config
   const me = this
-  ctx.decorateRequest('theme', cfg.theme.set)
-  ctx.decorateRequest('iconset', cfg.iconset.set)
-  ctx.decorateRequest('darkMode', cfg.darkMode.set)
-  ctx.decorateRequest('referer', '')
-  ctx.decorateReply('ctags', null)
-  ctx.decorateReply('view', async function (tpl, params = {}, opts = {}) {
+  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 = {}) {
     let ext = path.extname(tpl)
     if (ext === '.md') ext = '.html'
     let mimeType = isEmpty(ext) ? 'text/html' : mime.getType(ext)

package/lib/{error.js → error-handler.js}

@@ -1,6 +1,6 @@
 import { handler } from './not-found.js'
 
-const extHandler = async function (err, req, reply) {
+async function errorHandler (err, req, reply) {
   const { getPluginFile } = this.app.bajo
   const { fs } = this.app.lib
   const { resolveTemplate } = this.app.bajoTemplate
@@ -33,10 +33,4 @@ const extHandler = async function (err, req, reply) {
   return result
 }
 
-async function error (ctx) {
-  const { importModule } = this.app.bajo
-  const errorHandler = await importModule('waibu:/lib/webapp-scope/error-handler.js')
-  await errorHandler.call(this, ctx, extHandler)
-}
-
-export default error
+export default errorHandler

package/lib/session/setup.js

@@ -1,6 +1,6 @@
 import Store from './store.js'
 
-async function sessionSetup (ctx) {
+async function sessionSetup () {
   const { importPkg, runHook } = this.app.bajo
   const [cookie, session, flash] = await importPkg('waibu:@fastify/cookie',
     'waibu:@fastify/session', 'waibu:@fastify/flash')
@@ -11,10 +11,10 @@ async function sessionSetup (ctx) {
     this.sessionStore = new Store(this)
     cfg.store = this.sessionStore
   }
-  ctx.register(cookie)
-  ctx.register(session, cfg)
-  ctx.register(flash)
-  await runHook(`${this.ns}:afterSessionSetup`, ctx)
+  this.webAppCtx.register(cookie)
+  this.webAppCtx.register(session, cfg)
+  this.webAppCtx.register(flash)
+  await runHook(`${this.ns}:afterSessionSetup`, this.webAppCtx)
 }
 
 export default sessionSetup

package/lib/sub-app.js

@@ -1,17 +1,17 @@
-async function subApp (ctx) {
+async function subApp () {
   const { importModule, runHook } = this.app.bajo
-  const { collect } = await importModule('waibu:/lib/app.js', { asDefaultImport: false })
-  await runHook(`${this.ns}:beforeSubApp`, ctx)
+  const { collect } = await importModule('waibu:/lib/web-app.js', { asDefaultImport: false })
+  await runHook(`${this.ns}:beforeSubApp`, this.webAppCtx)
   const mods = await collect.call(this.app[this.ns], 'boot.js', 'waibuMpa')
   for (const m of mods) {
     this.log.debug('bootSubApp%s', m.ns)
-    await ctx.register(async (subCtx) => {
+    await this.webAppCtx.register(async (subCtx) => {
       this.app[m.ns].instance = subCtx
       await runHook(`${this.ns}.${m.alias}:afterCreateContext`, subCtx, m.prefix)
       await m.handler.call(this.app[m.ns], subCtx, m.prefix)
     }, { prefix: m.prefix })
   }
-  await runHook(`${this.ns}:afterSubApp`, ctx)
+  await runHook(`${this.ns}:afterSubApp`, this.webAppCtx)
 }
 
 export default subApp

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## 2026-02-05
+
+- [2.1.11] Bug fix on rendering ```preconnect```
+
 ## 2026-01-21
 
 - [2.1.8] Add ```getPluginTitle()```