chore: 优化https server重启

This commit is contained in:
xiaojunnuo
2024-10-26 18:01:06 +08:00
parent 513a5b49c1
commit be2f0aa435
7 changed files with 78 additions and 58 deletions
@@ -4,7 +4,7 @@ import { SysInstallInfo, SysSettingsService } from '@certd/lib-server';
import { getVersion } from '../../utils/version.js';
import dayjs from 'dayjs';
import { Application } from '@midwayjs/koa';
import { HttpsServerOptions, startHttpsServer } from './https/server.js';
import { httpsServer, HttpsServerOptions } from './https/server.js';
@Autoload()
@Scope(ScopeEnum.Singleton)
@@ -41,7 +41,7 @@ export class AutoZPrint {
logger.info('Https server is not enabled');
return;
}
await startHttpsServer({
httpsServer.start({
...this.httpsConfig,
app: this.app,
});
@@ -12,38 +12,67 @@ export type HttpsServerOptions = {
cert: string;
};
export async function startHttpsServer(opts: HttpsServerOptions) {
logger.info('=========================================');
if (!opts.key || !opts.cert) {
logger.error('证书路径未配置,无法启动https服务,请先配置:koa.https.key和koa.https.cert');
return;
export class HttpsServer {
server: https.Server;
opts: HttpsServerOptions;
constructor() {}
async restart() {
await this.close();
return this.start(this.opts);
}
if (!fs.existsSync(opts.key) || !fs.existsSync(opts.cert)) {
logger.info('证书文件不存在,将生成自签名证书');
createSelfCertificate({
crtPath: opts.cert,
keyPath: opts.key,
async close() {
return new Promise((resolve, reject) => {
this.server.close(() => {
resolve(true);
});
});
}
logger.info('准备启动https服务');
const httpServer = https.createServer(
{
cert: fs.readFileSync(opts.cert),
key: fs.readFileSync(opts.key),
},
opts.app.callback()
);
const hostname = '0.0.0.0';
// A function that runs in the context of the http server
// and reports what type of server listens on which port
function listeningReporter() {
// `this` refers to the http server here
logger.info(`Https server is listening on https://${hostname}:${opts.port}`);
}
try {
httpServer.listen(opts.port, hostname, listeningReporter);
} catch (e) {
logger.error('启动https服务失败', e);
start(opts: HttpsServerOptions) {
if (!opts) {
logger.error('https配置不能为空');
return;
}
this.opts = opts;
logger.info('=========================================');
if (!opts.key || !opts.cert) {
logger.error('证书路径未配置,无法启动https服务,请先配置:koa.https.key和koa.https.cert');
return;
}
if (!fs.existsSync(opts.key) || !fs.existsSync(opts.cert)) {
logger.info('证书文件不存在,将生成自签名证书');
createSelfCertificate({
crtPath: opts.cert,
keyPath: opts.key,
});
}
logger.info('准备启动https服务');
const httpServer = https.createServer(
{
cert: fs.readFileSync(opts.cert),
key: fs.readFileSync(opts.key),
},
opts.app.callback()
);
this.server = httpServer;
const hostname = '0.0.0.0';
// A function that runs in the context of the http server
// and reports what type of server listens on which port
function listeningReporter() {
// `this` refers to the http server here
logger.info(`Https server is listening on https://${hostname}:${opts.port}`);
}
try {
httpServer.listen(opts.port, hostname, listeningReporter);
return httpServer;
} catch (e) {
logger.error('启动https服务失败', e);
}
}
}
export const httpsServer = new HttpsServer();