Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add HTTPS option #19

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Add HTTPS option #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ce3cbab
Add HTTPS option
CheyenneForbes Nov 21, 2021
d586c7c
Merge pull request #1 from AvapnoHelpingHand/https-patch
CheyenneForbes Nov 21, 2021
1786299
Update ducky-api-config.class.ts
CheyenneForbes Nov 26, 2021
937dc13
Merge pull request #2 from AvapnoHelpingHand/https-patch2
CheyenneForbes Nov 26, 2021
700cc62
Update main.ts
CheyenneForbes Nov 26, 2021
4aaea88
Update main.ts
CheyenneForbes Nov 27, 2021
8b119f4
Update main.ts
CheyenneForbes Nov 27, 2021
75341e8
Update main.ts
CheyenneForbes Nov 27, 2021
7ffcaec
Update main.ts
CheyenneForbes Nov 27, 2021
6c8c714
Update ducky-api-config.class.ts
CheyenneForbes Jan 14, 2022
63cf0d2
Merge branch 'master' into https-patch
CheyenneForbes Jan 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/config/ducky-api-config.class.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,4 +148,14 @@ export class DuckyApiConfig {
@IsNumber()
@Min(0)
DELAY: number

@IsOptional()
@IsNotEmpty()
@IsString()
TLS_KEY_PATH: string
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
TLS_KEY_PATH: string
TLS_KEY_PATH?: string


@IsOptional()
@IsNotEmpty()
@IsString()
TLS_CERT_PATH: string
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
TLS_CERT_PATH: string
TLS_CERT_PATH?: string

}
24 changes: 22 additions & 2 deletions src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import fs from 'fs'
import Helmet from 'helmet'
import { resolve } from 'path'
import { promisify } from 'util'
import { ExpressAdapter } from '@nestjs/platform-express'
import * as express from 'express';

import { AppModule } from './app.module'
import { UnauthorizedExceptionFilter } from './common/filters/unauthorized-exception.filter'
Expand All @@ -15,7 +17,12 @@ const writeFile = promisify(fs.writeFile)
declare const module: any

async function bootstrap(): Promise<void> {
const app = await NestFactory.create(AppModule)
const server = express.default()
const app = await NestFactory.create(
AppModule,
new ExpressAdapter(server)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only reason to do it this way I can see from the documention if for starting multiple servers at the same time (for example an http server next to an https server), which is not something that's happening right now. Is there a reason you did it this way as opposed to the standard nestjs config?

)

const config: ConfigService = app.get('ConfigService')

if (config.SERVE_DUCKYPANEL) {
Expand Down Expand Up @@ -55,8 +62,21 @@ async function bootstrap(): Promise<void> {
displayOperationId: true,
},
})

await app.init()

await app.listen(config.PORT)
if (config.TLS_KEY_PATH && config.TLS_CERT_PATH) {
const https = require('https')
const fs = require('fs')
Comment on lines +69 to +70
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please make these import statements at the top of the file instead of requires.

await https.createServer({
key: fs.readFileSync(config.TLS_KEY_PATH),
cert: fs.readFileSync(config.TLS_CERT_PATH)
}, server).listen(config.PORT)
}
else {
const http = require('http')
await http.createServer(server).listen(config.PORT)
}

if (module.hot) {
module.hot.accept()
Expand Down