npm - waibu-mpa - Versions diffs - 2.20.2 → 2.21.1 - Mend

waibu-mpa 2.20.2 → 2.21.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/extend/bajoTemplate/template/403.html +14 -0
package/extend/waibuMpa/route/wmpa.js +1 -1
package/index.js +72 -0
package/lib/decorate.js +1 -70
package/lib/error-handler.js +3 -5
package/lib/not-found-handler.js +7 -13
package/package.json +1 -1
package/wiki/CHANGES.md +12 -0

package/extend/bajoTemplate/template/403.html ADDED Viewed

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="stylesheet" href="<%= _routePath('waibuMpa.virtual:/purecss/pure-min.css') %>" />
+    <link rel="stylesheet" href="<%= _routePath('waibuMpa.asset:/css/default.css') %>" />
+    <title><%= _t('accessDenied') %></title>
+  </head>
+  <body>
+    <div class="container-center">
+      <p><%= _t('accessDenied') %></p>
+    </div>
+  </body>
+</html>

package/extend/waibuMpa/route/wmpa.js CHANGED Viewed

@@ -22,7 +22,7 @@ const wmpa = {
       api = {
         prefix: this.app.waibuRestApi ? this.app.waibuRestApi.config.waibu.prefix : '',
         ext: this.app.waibuRestApi ? (this.app.waibuRestApi.config.format.asExt ? '.json' : '') : '',
-        headerKey: this.app.waibuRestApi ? this.app.sumba.config.auth.common.jwt.headerKey : '',
+        headerKey: this.app.waibuRestApi ? this.app.sumba._getAuthSetting('jwt', 'waibuRestApi').headerKey : '',
         dataKey: this.app.waibuRestApi ? this.app.waibuRestApi.config.responseKey.data : '',
         rateLimitDelay: 2000,
         rateLimitRetry: 2

package/index.js CHANGED Viewed

@@ -629,6 +629,78 @@ async function factory (pkgName) {
       if (!iconset) return iconset
       return nameOnly ? iconset.name : iconset
     }
+    renderView = async ({ tpl, params = {}, opts = {}, reply } = {}) => {
+      const { importModule } = this.app.bajo
+      const buildLocals = await importModule('waibu:/lib/build-locals.js')
+      const { importPkg } = this.app.bajo
+      const { isString, cloneDeep, isEmpty, get } = this.app.lib._
+      const { get: getCache, set: setCache } = this.app.bajoCache ?? {}
+      const { outmatch } = this.app.lib
+      const { routePath } = this.app.waibu
+      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 }
+      }
+      const mime = await importPkg('waibu:mime')
+      const cfg = this.config
+      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
+      })
+      let ext = path.extname(tpl)
+      if (ext === '.md') ext = '.html'
+      let mimeType = isEmpty(ext) ? 'text/html' : mime.getType(ext)
+      mimeType += `; charset=${cfg.page.charset}`
+      reply.header('Content-Type', mimeType)
+      reply.header('Content-Language', reply.request.lang)
+      reply.header('X-Req-Id', reply.request.id)
+      opts.req = reply.request
+      opts.reply = reply
+      for (const item of ['theme', 'iconset']) {
+        if (!reply.request[item]) reply.request[item] = this[item + 's'][0].name
+        if (this[item + 's'].length === 1) reply.request[item] = this[item + 's'][0].name
+      }
+      const { key, ttl } = await isCacheable.call(this, reply.request, cachedUrls)
+      if (ttl > 0) {
+        const cached = await getCache({ key })
+        if (cached) {
+          reply.header('X-Wmpa-Cached', true)
+          return cached
+        }
+      }
+      const locals = await buildLocals.call(this, { tpl, params, opts })
+      if (!get(reply.request, 'routeOptions.config.noCacheReq')) {
+        await this.app.cache.save(`${this.ns}.req:/${opts.req.id}-locals.json`, locals, this.config.reqTtlDur)
+      }
+      const result = await this.render(tpl, locals, opts)
+      if (ttl > 0) await setCache({ key, value: result, ttl })
+      if (reply.request.session) {
+        ext = path.extname(reply.request.url)
+        if (isEmpty(ext) || ['.html'].includes(ext)) {
+          if (reply.request.session.prevUrl !== reply.request.url) reply.request.session.prevUrl = reply.request.url
+          else reply.request.session.prevUrl = ''
+        }
+      }
+      return result
+    }
   }
   return WaibuMpa

package/lib/decorate.js CHANGED Viewed

@@ -1,82 +1,13 @@
-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 { importModule } = this.app.bajo
-  const buildLocals = await importModule('waibu:/lib/build-locals.js')
-  const { importPkg } = this.app.bajo
-  const { isString, cloneDeep, isEmpty, get } = 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)
-    mimeType += `; charset=${cfg.page.charset}`
-    this.header('Content-Type', mimeType)
-    this.header('Content-Language', this.request.lang)
-    this.header('X-Req-Id', this.request.id)
-    opts.req = this.request
-    opts.reply = this
-    for (const item of ['theme', 'iconset']) {
-      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 locals = await buildLocals.call(me, { tpl, params, opts })
-    if (!get(this.request, 'routeOptions.config.noCacheReq')) {
-      await me.app.cache.save(`${me.ns}.req:/${opts.req.id}-locals.json`, locals, me.config.reqTtlDur)
-    }
-    const result = await me.render(tpl, locals, 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)) {
-        if (this.request.session.prevUrl !== this.request.url) this.request.session.prevUrl = this.request.url
-        else this.request.session.prevUrl = ''
-      }
-    }
-    return result
+    return await me.renderView({ reply: this, tpl, params, opts })
   })
 }

package/lib/error-handler.js CHANGED Viewed

@@ -7,21 +7,19 @@ async function errorHandler (err, req, reply) {
   reply.code(err.statusCode)
   reply.header('Content-Type', `text/html; charset=${this.config.page.charset}`)
   reply.header('Content-Language', req.lang)
   if (err.message === '_notFound' || err.statusCode === 404) {
     return await notFoundHandler.call(this, err, req, reply)
   }
   if (err.noContent) return ''
-  const ns = err.ns ?? this.ns
-  // let result
-  let tpl = `${ns}.template:/${err.statusCode ?? 500}.html`
+  let tpl = `${this.ns}.template:/${err.statusCode}.html`
   try {
     resolveTemplate(tpl)
   } catch (err) {
     tpl = `${this.ns}.template:/500.html`
   }
   try {
-    return await reply.view(tpl, { error: err }, { noFlash: true })
+    req.webApp = this.ns
+    return await this.renderView({ reply, tpl, params: { error: err }, opts: { noFlash: true } })
   } catch (err) {
     // only going here if something happened in reply.view
     const content = fs.readFileSync(resolveTemplate(tpl).file, 'utf8')

package/lib/not-found-handler.js CHANGED Viewed

@@ -1,24 +1,18 @@
 async function notFoundHandler (err, req, reply) {
   const welcome = req.url.split('?')[0] === '/'
-  const { fs } = this.app.lib
-  const { resolveTemplate, compile } = this.app.bajoTemplate
   const msg = req.t('routeNotFound%s%s', req.url, req.method)
   const error = err ?? this.error(msg)
   if (err) error.message = msg
-  error.statusCode = 404
-  if (!welcome) reply.code(404)
+  if (!welcome) {
+    error.statusCode = 404
+    reply.code(404)
+  }
   reply.header('Content-Type', `text/html; charset=${this.config.page.charset}`)
   reply.header('Content-Language', req.lang)
   if (error.noContent) return ''
-  const ns = error.ns ?? this.ns
-  let tpl = welcome ? `${this.ns}.template:/welcome.html` : `${ns}.template:/404.html`
-  try {
-    tpl = resolveTemplate(tpl)
-  } catch (err) {
-    tpl = resolveTemplate(`${this.ns}.template:/404.html`)
-  }
-  const content = fs.readFileSync(tpl.file, 'utf8')
-  return await compile(content, { error: err })
+  const tpl = welcome ? `${this.ns}.template:/welcome.html` : `${this.ns}.template:/404.html`
+  req.webApp = this.ns
+  return await this.renderView({ reply, tpl, params: { error } })
 }
 export default notFoundHandler

package/package.json CHANGED Viewed

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

package/wiki/CHANGES.md CHANGED Viewed

@@ -1,5 +1,17 @@
 # Changes
+## 2026-06-30
+- [2.21.1] Bug fix in ```wmpa.js```
+## 2026-06-20
+- [2.21.0] Add ```renderView()```
+- [2.21.0] Change ```reply.view()``` to use ```renderView()``` above
+- [2.21.0] Add ```403.html```
+- [2.21.0] Bug fix in ```error-handler.js```
+- [2.21.0] Bug fix in ```not-found-handler.js```
 ## 2026-06-19
 - [2.20.2] Bug fix in ```not-found-handler.js```