waibu 1.1.22 → 1.2.1

package/{plugin/factory.js → index.js}

@@ -1,15 +1,15 @@
-import collectRoutePathHandlers from '../lib/collect-route-path-handlers.js'
+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 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 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) {
@@ -22,7 +22,7 @@ async function factory (pkgName) {
       this.dependencies = ['bajo-logger', 'bajo-extra']
       this.config = {
         server: {
-          host: '127.0.0.1',
+          host: '0.0.0.0',
           port: 7771
         },
         factory: {
@@ -64,7 +64,15 @@ async function factory (pkgName) {
         noIcon: true,
         underPressure: false,
         forwardOpts: {
-          disableRequestLogging: true
+          disableRequestLogging: true,
+          undici: {
+            connections: 128,
+            pipelining: 1,
+            keepAliveTimeout: 60 * 1000,
+            tls: {
+              rejectUnauthorized: false
+            }
+          }
         }
       }
       this.escapeChars = {
@@ -134,7 +142,9 @@ async function factory (pkgName) {
       const { outmatch } = this.lib
       const { find } = this.lib._
       const { breakNsPath } = this.app.bajo
-      const { ns, subNs = '', path } = breakNsPath(route)
+      let { ns, subNs = '', path } = breakNsPath(route)
+      const params = path.split('|')
+      if (params.length > 1) path = params[0]
       return find(this.routes, r => {
         if (r.path.startsWith('*')) return false
         r.config = r.config ?? {}

package/lib/handle-forward.js

@@ -15,13 +15,11 @@ async function handleForward (ctx) {
   const options = defaultsDeep({ base }, this.config.forwardOpts)
   await ctx.register(replyFrom, options)
 
-  ctx.decorateReply('forwardTo', async function (url, options = {}) {
-    if (url.startsWith('http')) this.redirectTo(url)
-    else {
-      this.from(me.routePath(url, options), {
-        rewriteHeaders
-      })
-    }
+  ctx.decorateReply('forwardTo', function (url, options = {}) {
+    if (url.startsWith('http')) return this.redirectTo(url)
+    this.from(me.routePath(url, options), {
+      rewriteHeaders
+    })
     return this
   })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu",
-  "version": "1.1.22",
+  "version": "1.2.1",
   "description": "Web Framework for Bajo",
   "main": "index.js",
   "scripts": {