From 3bd71f8bc33934bc536410458b27767b564430b4 Mon Sep 17 00:00:00 2001 From: Harry Chen Date: Sat, 21 Sep 2024 21:04:54 +0800 Subject: [PATCH] fix: showcase of ssl with mwtsc (#4082) --- packages/mock/app.js | 2 +- packages/web-express/src/framework.ts | 1 + packages/web-koa/src/framework.ts | 1 + packages/web/src/framework/web.ts | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/mock/app.js b/packages/mock/app.js index 907f1895fbdb..624c45f014b2 100644 --- a/packages/mock/app.js +++ b/packages/mock/app.js @@ -24,7 +24,7 @@ const { join } = require('path'); process.send({ title: 'server-ready', port: process.env.MIDWAY_HTTP_PORT, - ssl: args.ssl, + ssl: args.ssl || process.env.MIDWAY_HTTP_SSL === 'true', }); function onSignal() { diff --git a/packages/web-express/src/framework.ts b/packages/web-express/src/framework.ts index 8f11aabffb3b..358d14d6aff1 100644 --- a/packages/web-express/src/framework.ts +++ b/packages/web-express/src/framework.ts @@ -169,6 +169,7 @@ export class MidwayExpressFramework extends BaseFramework< serverOptions.key = PathFileUtil.getFileContentSync(serverOptions.key); serverOptions.cert = PathFileUtil.getFileContentSync(serverOptions.cert); serverOptions.ca = PathFileUtil.getFileContentSync(serverOptions.ca); + process.env.MIDWAY_HTTP_SSL = 'true'; if (serverOptions.http2) { this.server = require('http2').createSecureServer( diff --git a/packages/web-koa/src/framework.ts b/packages/web-koa/src/framework.ts index f53f71058895..dad48799c63d 100644 --- a/packages/web-koa/src/framework.ts +++ b/packages/web-koa/src/framework.ts @@ -269,6 +269,7 @@ export class MidwayKoaFramework extends BaseFramework< serverOptions.key = PathFileUtil.getFileContentSync(serverOptions.key); serverOptions.cert = PathFileUtil.getFileContentSync(serverOptions.cert); serverOptions.ca = PathFileUtil.getFileContentSync(serverOptions.ca); + process.env.MIDWAY_HTTP_SSL = 'true'; if (serverOptions.http2) { this.server = require('http2').createSecureServer( diff --git a/packages/web/src/framework/web.ts b/packages/web/src/framework/web.ts index 7139d56ba64f..b70dcb6e792b 100644 --- a/packages/web/src/framework/web.ts +++ b/packages/web/src/framework/web.ts @@ -237,6 +237,7 @@ export class MidwayWebFramework extends BaseFramework< serverOptions.cert ); serverOptions.ca = PathFileUtil.getFileContentSync(serverOptions.ca); + process.env.MIDWAY_HTTP_SSL = 'true'; if (serverOptions.http2) { this.server = require('http2').createSecureServer(