waibu 1.1.0 → 1.1.2

package/bajo/hook/on-request.js

@@ -4,10 +4,11 @@ const onRequest = {
     const { get } = this.app.bajo.lib._
 
     req.site = this.config.siteInfo
-    req.ns = get(reply.request, 'routeOptions.config.ns')
+    req.ns = get(reply.request, 'routeOptions.config.ns') ?? this.name
+    const ns = get(reply.request, 'routeOptions.config.webApp') ?? this.name
     let msg = '< %s:%s from IP %s'
     if (req.headers['content-length']) msg += ', content length: %s'
-    this.log.info(msg, req.method, req.url, this.getIp(req), req.headers['content-length'])
+    this.app[ns].log.info(msg, req.method, req.url, this.getIp(req), req.headers['content-length'])
     if (Object.keys(this.config.paramsCharMap).length === 0) return
     for (const key in req.params) {
       let val = req.params[key]

package/bajo/hook/on-response.js

@@ -1,10 +1,12 @@
 const onResponse = {
   level: 5,
   handler: async function onResponse (req, reply) {
+    const { get } = this.app.bajo.lib._
     let method = 'info'
     if (reply.statusCode >= 300 && reply.statusCode < 400) method = 'warn'
     else if (reply.statusCode >= 400) method = 'error'
-    this.log[method]('> %s:%s with a %d-status took %dms', req.method, req.url, reply.statusCode,
+    const ns = get(reply.request, 'routeOptions.config.webApp') ?? this.name
+    this.app[ns].log[method]('> %s:%s with a %d-status took %dms', req.method, req.url, reply.statusCode,
       (reply.elapsedTime ?? 0).toFixed(3))
   }
 }

package/lib/webapp-scope/error-handler.js

@@ -6,7 +6,8 @@ async function errorHandler (ctx, extHandler) {
       reply.send(err.print)
       return
     }
-    if (me.app.bajo.config.log.level === 'trace' && !['_notFound', '_redirect'].includes(err.message.toLowerCase())) console.error(err)
+    if (me.app.bajo.config.env !== 'prod' && me.app.bajo.config.log.level === 'trace' &&
+      !['_notFound', '_redirect'].includes(err.message.toLowerCase())) console.error(err)
     if (extHandler) return await extHandler.call(me, err, req, reply, ctx)
     if (err.message === '_notFound' || err.statusCode === 404) {
       reply.code(err.statusCode)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Web Framework for Bajo",
   "main": "index.js",
   "scripts": {
@@ -39,10 +39,10 @@
     "@fastify/reply-from": "^12.0.1",
     "@fastify/sensible": "^6.0.2",
     "@fastify/session": "^11.1.0",
-    "@fastify/static": "^8.0.4",
     "@fastify/under-pressure": "^9.0.3",
     "fastify": "^5.2.1",
     "fastify-no-icon": "^7.0.0",
-    "query-string": "^9.1.1"
+    "query-string": "^9.1.1",
+    "waibu-fastify-static": "^1.1.0"
   }
 }

package/plugin/factory.js

@@ -0,0 +1,306 @@
+import collectRoutePathHandlers from '../lib/collect-route-path-handlers.js'
+import fastify from 'fastify'
+import appHook from '../lib/app-hook.js'
+import routeHook from '../lib/webapp-scope/route-hook.js'
+import logRoutes from '../lib/log-routes.js'
+import { boot } from '../lib/app.js'
+import sensible from '@fastify/sensible'
+import noIcon from 'fastify-no-icon'
+import underPressure from '@fastify/under-pressure'
+import handleForward from '../lib/handle-forward.js'
+import handleRedirect from '../lib/handle-redirect.js'
+import buildLocals from '../lib/build-locals.js'
+import queryString from 'query-string'
+
+async function factory (pkgName) {
+  const me = this
+
+  return class Waibu extends this.lib.BajoPlugin {
+    constructor () {
+      super(pkgName, me.app)
+      this.alias = 'w'
+      this.dependencies = ['bajo-logger', 'bajo-extra']
+      this.config = {
+        server: {
+          host: 'localhost',
+          port: 7771
+        },
+        factory: {
+          trustProxy: true,
+          bodyLimit: 10485760
+        },
+        prefixVirtual: '~',
+        qsKey: {
+          bbox: 'bbox',
+          bboxLatField: 'bboxLatField',
+          bboxLngField: 'bboxLngField',
+          query: 'query',
+          match: 'match',
+          skip: 'skip',
+          page: 'page',
+          limit: 'limit',
+          sort: 'sort',
+          fields: 'fields',
+          lang: 'lang'
+        },
+        paramsCharMap: {},
+        logRoutes: false,
+        siteInfo: {
+          title: 'My Website',
+          orgName: 'My Organization'
+        },
+        cors: {},
+        compress: {},
+        helmet: {},
+        rateLimit: {},
+        multipart: {
+          attachFieldsToBody: true,
+          limits: {
+            parts: 100,
+            fileSize: 10485760
+          }
+        },
+        noIcon: true,
+        underPressure: false,
+        forwardOpts: {
+          disableRequestLogging: true
+        }
+      }
+      this.escapeChars = {
+        '<': '&lt;',
+        '>': '&gt;',
+        '"': '&quot;',
+        "'": '&apos;'
+      }
+      this.qs = {
+        parse: (item) => {
+          return queryString.parse(item, {
+            parseBooleans: true,
+            parseNumbers: true
+          })
+        },
+        parseUrl: queryString.parseUrl,
+        stringify: queryString.stringify,
+        stringifyUrl: queryString.stringifyUrl
+      }
+      this.hookTypes = ['onRequest', 'onResponse', 'preParsing', 'preValidation', 'preHandler',
+        'preSerialization', 'onSend', 'onTimeout', 'onError']
+    }
+
+    init = async () => {
+      if (this.config.home === '/') this.config.home = false
+      await collectRoutePathHandlers.call(this)
+    }
+
+    start = async () => {
+      const { generateId, runHook } = this.app.bajo
+      const cfg = this.getConfig()
+      cfg.factory.loggerInstance = this.app.bajoLogger.instance.child(
+        {},
+        { msgPrefix: '[waibu] ' }
+      )
+      cfg.factory.genReqId = req => generateId()
+      cfg.factory.disableRequestLogging = true
+      cfg.factory.querystringParser = str => this.qs.parse(str)
+
+      const instance = fastify(cfg.factory)
+      instance.decorateRequest('lang', null)
+      instance.decorateRequest('t', () => {})
+      instance.decorateRequest('format', () => {})
+      instance.decorateRequest('langDetector', null)
+      instance.decorateRequest('site', null)
+      instance.decorateRequest('ns', null)
+      this.instance = instance
+      this.routes = this.routes || []
+      await runHook('waibu:afterCreateContext', instance)
+      await instance.register(sensible)
+      if (cfg.underPressure) await instance.register(underPressure)
+      if (cfg.noIcon) await instance.register(noIcon)
+      await handleRedirect.call(this, instance)
+      await handleForward.call(this, instance)
+      await appHook.call(this)
+      await routeHook.call(this, this.name)
+      await boot.call(this)
+      await instance.listen(cfg.server)
+      if (cfg.logRoutes) logRoutes.call(this)
+    }
+
+    exit = async () => {
+      this.instance.close()
+    }
+
+    escape = (text) => {
+      const { forOwn } = this.app.bajo.lib._
+      forOwn(this.escapeChars, (v, k) => {
+        text = text.replaceAll(k, v)
+      })
+      return text
+    }
+
+    fetch = async (url, opts = {}, extra = {}) => {
+      const { fetch } = this.app.bajoExtra
+      extra.rawResponse = true
+
+      url = this.routePath(url, { guessHost: true })
+      const resp = await fetch(url, opts, extra)
+      const result = await resp.json()
+      if (!resp.ok) {
+        throw this.error(result.message, {
+          statusCode: resp.status,
+          success: false
+        })
+      }
+      return result
+    }
+
+    getIp = (req) => {
+      let fwd = req.headers['x-forwarded-for'] ?? ''
+      if (!Array.isArray(fwd)) fwd = fwd.split(',').map(ip => ip.trim())
+      return fwd[0] ?? req.ip
+    }
+
+    getPluginByPrefix = (prefix) => {
+      const { get } = this.app.bajo.lib._
+      let plugin
+      for (const p of this.app.bajo.pluginNames) {
+        if (get(this, `app.${p}.config.waibu.prefix`) === prefix) {
+          plugin = this.app[p]
+          break
+        }
+      }
+      return plugin
+    }
+
+    getPluginPrefix = (base, webApp = 'waibuMpa') => {
+      const { get, trim } = this.app.bajo.lib._
+      let prefix = get(this, `app.${base}.config.waibu.prefix`, this.app[base].alias)
+      if (base === 'main') {
+        const cfg = this.app[webApp].config
+        if (cfg.mountMainAsRoot) prefix = ''
+      }
+
+      return trim(prefix, '/')
+    }
+
+    getRoutes = (grouped, lite) => {
+      const { groupBy, orderBy, mapValues, map, pick } = this.app.bajo.lib._
+      const all = this.routes
+      let routes
+      if (grouped) {
+        const group = groupBy(orderBy(all, ['url', 'method']), 'url')
+        routes = lite ? mapValues(group, (v, k) => map(v, 'method')) : group
+      } else if (lite) routes = map(all, a => pick(a, ['url', 'method']))
+      else routes = all
+      return routes
+    }
+
+    getUploadedFiles = async (reqId, fileUrl, returnDir) => {
+      const { getPluginDataDir, resolvePath } = this.app.bajo
+      const { fastGlob } = this.app.bajo.lib
+      const dir = `${getPluginDataDir(this.name)}/upload/${reqId}`
+      const result = await fastGlob(`${dir}/*`)
+      if (!fileUrl) return returnDir ? { dir, files: result } : result
+      const files = result.map(f => resolvePath(f, true))
+      return returnDir ? { dir, files } : files
+    }
+
+    isIntlPath = (ns) => {
+      const { get } = this.app.bajo.lib._
+      return get(this.app[ns], 'config.intl.detectors', []).includes('path')
+    }
+
+    notFound = (name, options) => {
+      throw this.error('_notFound', { path: name })
+    }
+
+    parseFilter = (req) => {
+      const result = {}
+      const items = Object.keys(this.config.qsKey)
+      for (const item of items) {
+        result[item] = req.query[this.config.qsKey[item]]
+      }
+      return result
+    }
+
+    routeDir = (ns, base) => {
+      const { get } = this.app.bajo.lib._
+      if (!base) base = ns
+      const cfg = this.app[base].config
+      const prefix = get(cfg, 'waibu.prefix', this.app[base].alias)
+      const dir = prefix === '' ? '' : `/${prefix}`
+      if (!ns) return dir
+      const cfgMpa = get(this, 'app.waibuMpa.config')
+      if (ns === this.app.bajo.mainNs && cfgMpa.mountMainAsRoot) return ''
+      if (ns === base) return dir
+      return dir + `/${get(this.app[ns].config, 'waibu.prefix', this.app[ns].alias)}`
+    }
+
+    routePath = (name = '', { query = {}, base = 'waibuMpa', params = {}, guessHost } = {}) => {
+      const { defaultsDeep, getPlugin } = this.app.bajo
+      const { isEmpty, get, trimEnd, trimStart } = this.app.bajo.lib._
+      const { breakNsPath } = this.app.bajo
+
+      const plugin = getPlugin(base)
+      const cfg = plugin.config ?? {}
+      let info = {}
+      if (name.startsWith('mailto:') || name.startsWith('tel:')) return name
+      if (['%', '.', '/', '?', '#'].includes(name[0]) || name.slice(1, 2) === ':') info.path = name
+      else if (['~'].includes(name[0])) info.path = name.slice(1)
+      else {
+        info = breakNsPath(name)
+      }
+      if (info.path.slice(0, 2) === './') info.path = info.path.slice(2)
+      if (this.routePathHandlers[info.subNs]) return this.routePathHandlers[info.subNs](name)
+      if (info.path.includes('//')) return info.path
+
+      info.path = info.path.split('/').map(p => {
+        return p[0] === ':' && params[p.slice(1)] ? params[p.slice(1)] : p
+      }).join('/')
+      let url = info.path
+      const langDetector = get(cfg, 'intl.detectors', [])
+      if (info.ns) url = trimEnd(langDetector.includes('path') ? `/${params.lang ?? ''}${this.routeDir(info.ns)}${info.path}` : `${this.routeDir(info.ns)}${info.path}`, '/')
+      info.qs = defaultsDeep({}, query, info.qs)
+      if (!isEmpty(info.qs)) url += '?' + this.qs.stringify(info.qs)
+      if (!url.startsWith('http') && guessHost) url = `http://${this.config.server.host}:${this.config.server.port}/${trimStart(url, '/')}`
+      return url
+    }
+
+    sendMail = async (tpl, { to, cc, bcc, from, subject, data = {}, conn, options = {} }) => {
+      if (!this.app.masohiMail) return
+      const { get, isString } = this.app.bajo.lib._
+      const { generateId } = this.app.bajo
+      const { render } = this.app.bajoTemplate
+      if (isString(tpl)) tpl = [tpl]
+      const locals = await buildLocals.call(this, { tpl, params: data, opts: options })
+      const opts = {
+        lang: get(options, 'req.lang'),
+        groupId: get(options, 'req.id', generateId())
+      }
+      const message = await render(tpl[0], locals, opts)
+      if (tpl[1]) opts.messageText = await render(tpl[1], locals, opts)
+      await this.app.masohi.send({ to, cc, bcc, from, subject, message, conn, options: opts })
+    }
+
+    unescapeBlock = (content, start, end, startReplacer, endReplacer) => {
+      const { extractText } = this.app.bajo
+      const { result } = extractText(content, start, end)
+      if (result.length === 0) return content
+      const unescaped = this.unescape(result)
+      const token = `${start}${result}${end}`
+      const replacer = `${startReplacer}${unescaped}${endReplacer}`
+      const block = content.replaceAll(token, replacer)
+      return this.unescapeBlock(block, start, end, startReplacer, endReplacer)
+    }
+
+    unescape = (text) => {
+      const { forOwn, invert } = this.app.bajo.lib._
+      const mapping = invert(this.escapeChars)
+      forOwn(mapping, (v, k) => {
+        text = text.replaceAll(k, v)
+      })
+      return text
+    }
+  }
+}
+
+export default factory

package/plugin/.alias

@@ -1 +0,0 @@
-w

package/plugin/.dependencies

@@ -1 +0,0 @@
-bajo-logger

package/plugin/config.json

@@ -1,46 +0,0 @@
-{
-  "server": {
-    "host": "localhost",
-    "port": 7777
-  },
-  "factory": {
-    "trustProxy": true,
-    "bodyLimit": 10485760
-  },
-  "prefixVirtual": "~",
-  "qsKey": {
-    "bbox": "bbox",
-    "bboxLatField": "bboxLatField",
-    "bboxLngField": "bboxLngField",
-    "query": "query",
-    "match": "match",
-    "skip": "skip",
-    "page": "page",
-    "limit": "limit",
-    "sort": "sort",
-    "fields": "fields",
-    "lang": "lang"
-  },
-  "paramsCharMap": {},
-  "logRoutes": false,
-  "siteInfo": {
-    "title": "My Website",
-    "orgName": "My Organization"
-  },
-  "cors": {},
-  "compress": {},
-  "helmet": {},
-  "rateLimit": {},
-  "multipart": {
-    "attachFieldsToBody": true,
-    "limits": {
-      "parts": 100,
-      "fileSize": 10485760
-    }
-  },
-  "noIcon": true,
-  "underPressure": false,
-  "forwardOpts": {
-    "disableRequestLogging": true
-  }
-}

package/plugin/exit.js

@@ -1,3 +0,0 @@
-export default async function () {
-  this.instance.close()
-}

package/plugin/init.js

@@ -1,8 +0,0 @@
-import collectRoutePathHandlers from '../lib/collect-route-path-handlers.js'
-
-async function init () {
-  if (this.config.home === '/') this.config.home = false
-  await collectRoutePathHandlers.call(this)
-}
-
-export default init

package/plugin/method/escape-chars.js

@@ -1,6 +0,0 @@
-export default {
-  '<': '&lt;',
-  '>': '&gt;',
-  '"': '&quot;',
-  "'": '&apos;'
-}

package/plugin/method/escape.js

@@ -1,11 +0,0 @@
-import escapeChars from './escape-chars.js'
-
-function escape (text) {
-  const { forOwn } = this.app.bajo.lib._
-  forOwn(escapeChars, (v, k) => {
-    text = text.replaceAll(k, v)
-  })
-  return text
-}
-
-export default escape

package/plugin/method/fetch.js

@@ -1,19 +0,0 @@
-async function fetch (url, opts = {}, extra = {}) {
-  const { getPlugin } = this.app.bajo
-  getPlugin('bajoExtra')
-  const { fetch } = this.app.bajoExtra
-  extra.rawResponse = true
-
-  url = this.routePath(url, { guessHost: true })
-  const resp = await fetch(url, opts, extra)
-  const result = await resp.json()
-  if (!resp.ok) {
-    throw this.error(result.message, {
-      statusCode: resp.status,
-      success: false
-    })
-  }
-  return result
-}
-
-export default fetch

package/plugin/method/get-ip.js

@@ -1,7 +0,0 @@
-function getIp (req) {
-  let fwd = req.headers['x-forwarded-for'] ?? ''
-  if (!Array.isArray(fwd)) fwd = fwd.split(',').map(ip => ip.trim())
-  return fwd[0] ?? req.ip
-}
-
-export default getIp

package/plugin/method/get-plugin-by-prefix.js

@@ -1,13 +0,0 @@
-function getPluginByPrefix (prefix) {
-  const { get } = this.app.bajo.lib._
-  let plugin
-  for (const p of this.app.bajo.pluginNames) {
-    if (get(this, `app.${p}.config.waibu.prefix`) === prefix) {
-      plugin = this.app[p]
-      break
-    }
-  }
-  return plugin
-}
-
-export default getPluginByPrefix

package/plugin/method/get-plugin-prefix.js

@@ -1,12 +0,0 @@
-function getPluginPrefix (base, webApp = 'waibuMpa') {
-  const { get, trim } = this.app.bajo.lib._
-  let prefix = get(this, `app.${base}.config.waibu.prefix`, this.app[base].alias)
-  if (base === 'main') {
-    const cfg = this.app[webApp].config
-    if (cfg.mountMainAsRoot) prefix = ''
-  }
-
-  return trim(prefix, '/')
-}
-
-export default getPluginPrefix

package/plugin/method/get-routes.js

@@ -1,13 +0,0 @@
-function getRoutes (grouped, lite) {
-  const { groupBy, orderBy, mapValues, map, pick } = this.app.bajo.lib._
-  const all = this.routes
-  let routes
-  if (grouped) {
-    const group = groupBy(orderBy(all, ['url', 'method']), 'url')
-    routes = lite ? mapValues(group, (v, k) => map(v, 'method')) : group
-  } else if (lite) routes = map(all, a => pick(a, ['url', 'method']))
-  else routes = all
-  return routes
-}
-
-export default getRoutes

package/plugin/method/get-uploaded-files.js

@@ -1,11 +0,0 @@
-async function getUploadedFiles (reqId, fileUrl, returnDir) {
-  const { getPluginDataDir, resolvePath } = this.app.bajo
-  const { fastGlob } = this.app.bajo.lib
-  const dir = `${getPluginDataDir(this.name)}/upload/${reqId}`
-  const result = await fastGlob(`${dir}/*`)
-  if (!fileUrl) return returnDir ? { dir, files: result } : result
-  const files = result.map(f => resolvePath(f, true))
-  return returnDir ? { dir, files } : files
-}
-
-export default getUploadedFiles

package/plugin/method/hook-types.js

@@ -1,4 +0,0 @@
-const hookTypes = ['onRequest', 'onResponse', 'preParsing', 'preValidation', 'preHandler',
-  'preSerialization', 'onSend', 'onTimeout', 'onError']
-
-export default hookTypes

package/plugin/method/isIntlPath.js

@@ -1,6 +0,0 @@
-function isIntlPath (ns) {
-  const { get } = this.app.bajo.lib._
-  return get(this.app[ns], 'config.intl.detectors', []).includes('path')
-}
-
-export default isIntlPath

package/plugin/method/not-found.js

@@ -1,5 +0,0 @@
-function notFound (name, options) {
-  throw this.error('_notFound', { path: name })
-}
-
-export default notFound

package/plugin/method/parse-filter.js

@@ -1,10 +0,0 @@
-function parseFilter (req) {
-  const result = {}
-  const items = Object.keys(this.config.qsKey)
-  for (const item of items) {
-    result[item] = req.query[this.config.qsKey[item]]
-  }
-  return result
-}
-
-export default parseFilter

package/plugin/method/qs.js

@@ -1,17 +0,0 @@
-import queryString from 'query-string'
-
-function parse (item) {
-  return queryString.parse(item, {
-    parseBooleans: true,
-    parseNumbers: true
-  })
-}
-
-const qs = {
-  parse,
-  parseUrl: queryString.parseUrl,
-  stringify: queryString.stringify,
-  stringifyUrl: queryString.stringifyUrl
-}
-
-export default qs

package/plugin/method/route-dir.js

@@ -1,14 +0,0 @@
-function routeDir (ns, base) {
-  const { get } = this.app.bajo.lib._
-  if (!base) base = ns
-  const cfg = this.app[base].config
-  const prefix = get(cfg, 'waibu.prefix', this.app[base].alias)
-  const dir = prefix === '' ? '' : `/${prefix}`
-  if (!ns) return dir
-  const cfgMpa = get(this, 'app.waibuMpa.config')
-  if (ns === this.app.bajo.mainNs && cfgMpa.mountMainAsRoot) return ''
-  if (ns === base) return dir
-  return dir + `/${get(this.app[ns].config, 'waibu.prefix', this.app[ns].alias)}`
-}
-
-export default routeDir

package/plugin/method/route-path.js

@@ -1,31 +0,0 @@
-function routePath (name = '', { query = {}, base = 'waibuMpa', params = {}, guessHost } = {}) {
-  const { defaultsDeep, getPlugin } = this.app.bajo
-  const { isEmpty, get, trimEnd, trimStart } = this.app.bajo.lib._
-  const { breakNsPath } = this.app.bajo
-
-  const plugin = getPlugin(base)
-  const cfg = plugin.config ?? {}
-  let info = {}
-  if (name.startsWith('mailto:') || name.startsWith('tel:')) return name
-  if (['%', '.', '/', '?', '#'].includes(name[0]) || name.slice(1, 2) === ':') info.path = name
-  else if (['~'].includes(name[0])) info.path = name.slice(1)
-  else {
-    info = breakNsPath(name)
-  }
-  if (info.path.slice(0, 2) === './') info.path = info.path.slice(2)
-  if (this.routePathHandlers[info.subNs]) return this.routePathHandlers[info.subNs](name)
-  if (info.path.includes('//')) return info.path
-
-  info.path = info.path.split('/').map(p => {
-    return p[0] === ':' && params[p.slice(1)] ? params[p.slice(1)] : p
-  }).join('/')
-  let url = info.path
-  const langDetector = get(cfg, 'intl.detectors', [])
-  if (info.ns) url = trimEnd(langDetector.includes('path') ? `/${params.lang ?? ''}${this.routeDir(info.ns)}${info.path}` : `${this.routeDir(info.ns)}${info.path}`, '/')
-  info.qs = defaultsDeep({}, query, info.qs)
-  if (!isEmpty(info.qs)) url += '?' + this.qs.stringify(info.qs)
-  if (!url.startsWith('http') && guessHost) url = `http://${this.config.server.host}:${this.config.server.port}/${trimStart(url, '/')}`
-  return url
-}
-
-export default routePath

package/plugin/method/send-mail.js

@@ -1,19 +0,0 @@
-import buildLocals from '../../lib/build-locals.js'
-
-async function sendMail (tpl, { to, cc, bcc, from, subject, data = {}, conn, options = {} }) {
-  if (!this.app.masohiMail) return
-  const { get, isString } = this.app.bajo.lib._
-  const { generateId } = this.app.bajo
-  const { render } = this.app.bajoTemplate
-  if (isString(tpl)) tpl = [tpl]
-  const locals = await buildLocals.call(this, { tpl, params: data, opts: options })
-  const opts = {
-    lang: get(options, 'req.lang'),
-    groupId: get(options, 'req.id', generateId())
-  }
-  const message = await render(tpl[0], locals, opts)
-  if (tpl[1]) opts.messageText = await render(tpl[1], locals, opts)
-  await this.app.masohi.send({ to, cc, bcc, from, subject, message, conn, options: opts })
-}
-
-export default sendMail

package/plugin/method/unescape-block.js

@@ -1,12 +0,0 @@
-function unescapeBlock (content, start, end, startReplacer, endReplacer) {
-  const { extractText } = this.app.bajo
-  const { result } = extractText(content, start, end)
-  if (result.length === 0) return content
-  const unescaped = this.unescape(result)
-  const token = `${start}${result}${end}`
-  const replacer = `${startReplacer}${unescaped}${endReplacer}`
-  const block = content.replaceAll(token, replacer)
-  return unescapeBlock.call(this, block, start, end, startReplacer, endReplacer)
-}
-
-export default unescapeBlock

package/plugin/method/unescape.js

@@ -1,12 +0,0 @@
-import escapeChars from './escape-chars.js'
-
-function unescape (text) {
-  const { forOwn, invert } = this.app.bajo.lib._
-  const mapping = invert(escapeChars)
-  forOwn(mapping, (v, k) => {
-    text = text.replaceAll(k, v)
-  })
-  return text
-}
-
-export default unescape

package/plugin/start.js

@@ -1,45 +0,0 @@
-import fastify from 'fastify'
-import appHook from '../lib/app-hook.js'
-import routeHook from '../lib/webapp-scope/route-hook.js'
-import logRoutes from '../lib/log-routes.js'
-import { boot } from '../lib/app.js'
-import sensible from '@fastify/sensible'
-import noIcon from 'fastify-no-icon'
-import underPressure from '@fastify/under-pressure'
-import handleForward from '../lib/handle-forward.js'
-import handleRedirect from '../lib/handle-redirect.js'
-
-async function start () {
-  const { generateId, runHook } = this.app.bajo
-  const cfg = this.getConfig()
-  cfg.factory.loggerInstance = this.app.bajoLogger.instance.child(
-    {},
-    { msgPrefix: '[waibu] ' }
-  )
-  cfg.factory.genReqId = req => generateId()
-  cfg.factory.disableRequestLogging = true
-  cfg.factory.querystringParser = str => this.qs.parse(str)
-
-  const instance = fastify(cfg.factory)
-  instance.decorateRequest('lang', null)
-  instance.decorateRequest('t', () => {})
-  instance.decorateRequest('format', () => {})
-  instance.decorateRequest('langDetector', null)
-  instance.decorateRequest('site', null)
-  instance.decorateRequest('ns', null)
-  this.instance = instance
-  this.routes = this.routes || []
-  await runHook('waibu:afterCreateContext', instance)
-  await instance.register(sensible)
-  if (cfg.underPressure) await instance.register(underPressure)
-  if (cfg.noIcon) await instance.register(noIcon)
-  await handleRedirect.call(this, instance)
-  await handleForward.call(this, instance)
-  await appHook.call(this)
-  await routeHook.call(this, this.name)
-  await boot.call(this)
-  await instance.listen(cfg.server)
-  if (cfg.logRoutes) logRoutes.call(this)
-}
-
-export default start