waibu-mpa 1.2.8 → 1.2.10

package/lib/class/component.js

@@ -251,8 +251,9 @@ class Component {
    * @returns {string} The built URL.
    */
   buildUrl = ({ exclude, prefix, base, url, params = {}, prettyUrl }) => {
+    const { isEmpty } = this.plugin.lib._
     const { buildUrl } = this.plugin.app.waibuMpa
-    url = url ?? this.req.referer ?? this.req.url
+    url = url ?? (isEmpty(this.req.referer) ? this.req.url : this.req.referer)
     return buildUrl({ exclude, prefix, base, url, params, prettyUrl })
   }
 

package/package.json

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

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

@@ -1,23 +1,20 @@
-import path from 'path'
-
-async function logo (req, reply) {
-  const { importPkg } = this.app.bajo
-  const mime = await importPkg('waibu:mime')
+async function resolveFile (req) {
   const { getPlugin } = this.app.bajo
   const { camelCase } = this.lib._
-  const { fastGlob, fs } = this.lib
+  const { fastGlob } = this.lib
   const id = camelCase(req.params.id)
   const plugin = getPlugin(id)
   let type = ''
   if (req.query.type) type = `-${req.query.type}`
   const files = await fastGlob(`${plugin.dir.pkg}/logo${type}.*`)
   if (files.length === 0) throw this.error('_notFound')
-  const file = files[0]
-  const mimeType = mime.getType(path.extname(file))
-  reply.header('Content-Type', mimeType)
-  const stream = fs.createReadStream(file)
-  reply.send(stream)
-  return reply
+  return files[0]
+}
+
+async function logo (req, reply) {
+  const { importModule } = this.app.bajo
+  const handler = await importModule('waibu:/lib/handle-download.js')
+  return await handler.call(this, resolveFile, req, reply)
 }
 
 export default logo