@midwayjs/koa 3.20.12 → 3.20.15

package/dist/framework.js

@@ -183,7 +183,6 @@ let MidwayKoaFramework = class MidwayKoaFramework extends core_1.BaseFramework {
         return mwIns.resolve();
     }
     async run() {
-        var _a;
         // load controller
         await this.loadMidwayController();
         // restore use method
@@ -219,22 +218,27 @@ let MidwayKoaFramework = class MidwayKoaFramework extends core_1.BaseFramework {
         if (core_1.Types.isNumber(this.configurationOptions.serverTimeout)) {
             this.server.setTimeout(this.configurationOptions.serverTimeout);
         }
+        this.configurationOptions.listenOptions = {
+            port: this.configurationOptions.port,
+            host: this.configurationOptions.hostname,
+            ...this.configurationOptions.listenOptions,
+        };
         // set port and listen server
-        let customPort = (_a = process.env.MIDWAY_HTTP_PORT) !== null && _a !== void 0 ? _a : this.configurationOptions.port;
-        if (customPort === 0) {
+        let customPort = process.env.MIDWAY_HTTP_PORT ||
+            this.configurationOptions.listenOptions.port;
+        if (customPort === 0 || customPort === '0') {
             customPort = await (0, utils_1.getFreePort)();
+            this.logger.info(`Midway koa is listening on port ${customPort} (auto assigned)`);
         }
-        if (customPort) {
+        this.configurationOptions.listenOptions.port = Number(customPort);
+        if (this.configurationOptions.listenOptions.port) {
             new Promise(resolve => {
-                const args = [customPort];
-                if (this.configurationOptions.hostname) {
-                    args.push(this.configurationOptions.hostname);
-                }
-                args.push(() => {
+                // 使用 ListenOptions 对象启动服务器
+                this.server.listen(this.configurationOptions.listenOptions, () => {
                     resolve();
                 });
-                this.server.listen(...args);
-                process.env.MIDWAY_HTTP_PORT = String(customPort);
+                // 设置环境变量
+                process.env.MIDWAY_HTTP_PORT = String(this.configurationOptions.listenOptions.port);
             });
         }
     }
@@ -242,6 +246,7 @@ let MidwayKoaFramework = class MidwayKoaFramework extends core_1.BaseFramework {
         if (this.server) {
             new Promise(resolve => {
                 this.server.close(resolve);
+                process.env.MIDWAY_HTTP_PORT = '';
             });
         }
     }

package/dist/interface.d.ts

@@ -1,10 +1,12 @@
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node" />
 import { IConfigurationOptions, IMidwayApplication, IMidwayContext } from '@midwayjs/core';
 import * as koa from 'koa';
 import { Context as KoaContext, DefaultState, Middleware, Next } from 'koa';
 import { RouterParamValue } from '@midwayjs/core';
 import * as qs from 'qs';
+import { ListenOptions } from 'net';
 export interface State extends DefaultState {
 }
 export type IMidwayKoaContext = IMidwayContext<KoaContext>;
@@ -15,6 +17,10 @@ export type IMidwayKoaApplication = IMidwayApplication<IMidwayKoaContext, koa<St
      * @param middlewareId
      */
     generateMiddleware(middlewareId: any): Promise<Middleware<State, IMidwayKoaContext>>;
+    /**
+     * Get the port that the application is listening on
+     */
+    getPort(): string;
 }>;
 /**
  * @deprecated use NextFunction definition
@@ -86,7 +92,14 @@ export interface IMidwayKoaConfigurationOptions extends IConfigurationOptions {
      * qs options
      */
     queryParseOptions?: qs.IParseOptions;
+    /**
+     * https/https/http2 server options
+     */
     serverOptions?: Record<string, any>;
+    /**
+     * listen options
+     */
+    listenOptions?: ListenOptions;
 }
 export type MiddlewareParamArray = Array<Middleware<DefaultState, IMidwayKoaContext>>;
 export interface IWebMiddleware {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/koa",
-  "version": "3.20.12",
+  "version": "3.20.15",
   "description": "Midway Web Framework for KOA",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -26,6 +26,7 @@
   "devDependencies": {
     "@midwayjs/mock": "^3.20.11",
     "@types/koa-router": "7.4.8",
+    "axios": "1.8.4",
     "fs-extra": "11.3.0"
   },
   "dependencies": {
@@ -47,5 +48,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "de297e0d18cbfd86b3043c4ad0c1a7c991415711"
+  "gitHead": "a603d2348d6141f8f723901498f03a162a037708"
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2013 - Now midwayjs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.