waibu-mpa 2.9.1 → 2.9.2

package/extend/waibuMpa/route/logo/@id.js

@@ -3,21 +3,31 @@ async function resolveFile (req) {
   const { camelCase } = this.app.lib._
   const { fastGlob } = this.app.lib
   const id = camelCase(req.params.id)
-  const plugin = getPlugin(id)
   let type = ''
+  let files
   if (req.query.type) type = `-${req.query.type}`
-  if (id === 'main' && req.site) {
-    // check site logo first, if any
-    const dir = getPluginDataDir('dobo')
-    const files = await fastGlob(`${dir}/attachment/SumbaSite/${req.site.id}/file/logo${type}.*`)
+  if (id !== 'main') {
+    const plugin = getPlugin(id)
+    files = await fastGlob(`${plugin.dir.pkg}/logo${type}.*`)
     if (files.length > 0) return files[0]
+    throw this.error('_notFound')
   }
-  let files = await fastGlob(`${plugin.dir.pkg}/logo${type}.*`)
-  if (files.length === 0) {
-    files = await fastGlob(`${getPlugin('waibu').dir.pkg}/logo${type}.*`)
-    if (files.length === 0) throw this.error('_notFound')
-  }
-  return files[0]
+  // 1. main
+  files = await fastGlob(`${this.app.main.dir.pkg}/logo${type}.*`)
+  // 2. site attachment
+  if (files.length > 0) return files[0]
+  let dir = getPluginDataDir('dobo')
+  files = await fastGlob(`${dir}/attachment/SumbaSite/${req.site.id}/file/logo${type}.*`)
+  if (files.length > 0) return files[0]
+  // 3. theme
+  const theme = this.app.waibuMpa.themes.find(item => item.name === req.theme)
+  files = await fastGlob(`${theme.plugin.dir.pkg}/extend/waibuStatic/asset/logo${type}.*`)
+  if (files.length > 0) return files[0]
+  // 4. default
+  dir = this.app.waibu.dir.pkg
+  files = await fastGlob(`${dir}/logo${type}.*`)
+  if (files.length > 0) return files[0]
+  throw this.error('_notFound')
 }
 
 async function logo (req, reply) {

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

@@ -34,10 +34,10 @@ async function meta (options) {
   else pageTitle = sprintf(formatter, title, this.app.waibuMpa.getAppTitle(req))
   $('head').append(`<title>${pageTitle}</title>`)
   // favicon
-  const favicon = this.app.waibu.config.favicon
+  const favicon = this.app.waibuMpa.config.favicon
   if (favicon) {
     const mime = await importPkg('waibu:mime')
-    const ext = favicon === true ? '.ico' : path.extname(favicon)
+    const ext = favicon === true ? '.png' : path.extname(favicon)
     const type = mime.getType(ext)
     items.push({ tag: 'link', href: `/favicon${ext}`, rel: 'icon', type })
   }

package/lib/favicon.js

@@ -1,18 +1,24 @@
 async function handleFavicon () {
   if (!this.config.favicon) return
   const { getPluginFile, importModule, getPluginDataDir } = this.app.bajo
-  const { fs, fastGlob } = this.app.lib
+  const { fs } = this.app.lib
   const handleDownload = await importModule('waibu:/lib/handle-download.js')
   const me = this
   this.webAppCtx.get('/favicon.:ext', async function (req, reply) {
-    let file = getPluginFile('main:/favicon.png')
-    if (!fs.existsSync(file)) file = getPluginFile('waibu:/favicon.png')
-    if (req.site) {
+    // 1. main favicon
+    let file = getPluginFile(`main:/favicon.${req.params.ext}`)
+    if (!fs.existsSync(file)) {
       const dir = getPluginDataDir('dobo')
-      const files = await fastGlob(`${dir}/attachment/SumbaSite/${req.site.id}/file/favicon.*`)
-      if (files.length > 0) file = files[0]
+      // 2. site attachment
+      file = `${dir}/attachment/SumbaSite/${req.site.id}/file/favicon.${req.params.ext}`
+    }
+    if (!fs.existsSync(file)) {
+      const theme = me.app.waibuMpa.themes.find(item => item.name === req.theme)
+      // 3. static dir of theme
+      file = `${theme.plugin.dir.pkg}/extend/waibuStatic/asset/favicon.${req.params.ext}`
     }
-    if (!fs.existsSync(file)) return reply.code(404).send()
+    // 4. Default
+    if (!fs.existsSync(file)) file = getPluginFile('waibu:/favicon.png')
     reply.header('cache-control', 'max-age=86400')
     return await handleDownload.call(me, file, req, reply)
   })

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,10 @@
 # Changes
 
+## 2026-03-15
+
+- [2.9.2] Bug fix in ```favicon``` handler
+- [2.9.2] Bug fix in ```logo``` route
+
 ## 2026-03-13
 
 - [2.9.1] Bug fix in route ```logo```. If nothing found at all, defaults to waibu logos