vona-core 5.1.40 → 5.1.42

package/dist/index.js

@@ -234,11 +234,16 @@ class AppUtil extends BeanSimple {
   }
   get protocol() {
     const config = this.ctx ? this.ctx.config : this.app.config;
-    return config.server.serve.protocol || this.ctx?.protocol;
+    return config.server.serve.protocol || this.ctx?.protocol || 'http';
   }
   get host() {
     const config = this.ctx ? this.ctx.config : this.app.config;
-    return config.server.serve.host || this.ctx?.host;
+    let host = config.server.serve.host || this.ctx?.host;
+    if (!host) {
+      const port = this.app.meta.env.SERVER_LISTEN_PORT;
+      host = port ? `localhost:${port}` : 'localhost';
+    }
+    return host;
   }
   getAbsoluteUrl(path) {
     const prefix = this.host ? `${this.protocol}://${this.host}` : '';
@@ -2294,7 +2299,7 @@ const contextBase = {
     } : statusOrOptions ?? {};
     // checkOrigin
     if (!url.startsWith('/') && !options.trustedExternal) {
-      const origin = cast(self.app.bean).security.checkOrigin(url, self.host);
+      const origin = cast(self.app.bean).security.checkOrigin(url, self.app.util.host);
       if (!origin) self.app.throw(403);
     }
     // throw
@@ -2678,22 +2683,28 @@ class VonaApplication extends KoaApplication {
     if (req) {
       request = req;
     } else {
-      const host = `localhost:${this.meta.env.SERVER_LISTEN_PORT}`;
+      const protocol = 'http';
+      const port = this.meta.env.SERVER_LISTEN_PORT;
+      const host = port ? `localhost:${port}` : 'localhost';
+      const hostname = new URL(`${protocol}://${host}`).hostname;
       request = {
         headers: {
           'host': host,
-          'x-forwarded-for': host
+          'x-forwarded-for': '127.0.0.1',
+          'x-forwarded-host': host,
+          'x-forwarded-proto': protocol
         },
         query: {},
         querystring: '',
         host,
-        hostname: 'localhost',
-        protocol: 'http',
-        secure: 'false',
+        hostname,
+        protocol,
+        secure: false,
         method: 'POST',
         url: '',
         path: '',
         socket: {
+          encrypted: false,
           remoteAddress: '127.0.0.1',
           remotePort: 7001
         }