typescript-express-starter 6.0.0 → 6.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.kr.md +133 -52
- package/README.md +134 -54
- package/bin/cli.js +4 -3
- package/lib/default/.swcrc +41 -0
- package/lib/default/Dockerfile +1 -1
- package/lib/default/ecosystem.config.js +40 -24
- package/lib/default/nodemon.json +2 -2
- package/lib/default/package.json +15 -8
- package/lib/default/src/app.ts +1 -2
- package/lib/default/src/http/auth.http +12 -15
- package/lib/default/src/http/users.http +12 -16
- package/lib/default/src/index.ts +1 -0
- package/lib/default/src/middlewares/auth.middleware.ts +3 -3
- package/lib/default/src/models/users.model.ts +5 -5
- package/lib/default/src/server.ts +1 -2
- package/lib/default/src/services/auth.service.ts +5 -5
- package/lib/default/src/services/users.service.ts +3 -3
- package/lib/default/src/tests/auth.test.ts +4 -4
- package/lib/default/src/tests/users.test.ts +4 -4
- package/lib/default/src/utils/logger.ts +5 -5
- package/lib/default/src/utils/util.ts +1 -1
- package/lib/default/tsconfig.json +2 -2
- package/lib/knex/.swcrc +39 -0
- package/lib/knex/Dockerfile +1 -1
- package/lib/knex/ecosystem.config.js +57 -43
- package/lib/knex/knexfile.ts +6 -6
- package/lib/knex/nodemon.json +2 -2
- package/lib/knex/package.json +14 -8
- package/lib/knex/src/app.ts +2 -3
- package/lib/knex/src/databases/index.ts +6 -6
- package/lib/knex/src/http/auth.http +12 -15
- package/lib/knex/src/http/users.http +12 -16
- package/lib/knex/src/index.ts +1 -0
- package/lib/knex/src/middlewares/auth.middleware.ts +4 -4
- package/lib/knex/src/server.ts +1 -2
- package/lib/knex/src/services/auth.service.ts +5 -5
- package/lib/knex/src/services/users.service.ts +3 -3
- package/lib/knex/src/tests/auth.test.ts +2 -2
- package/lib/knex/src/tests/index.test.ts +1 -1
- package/lib/knex/src/tests/users.test.ts +2 -2
- package/lib/knex/src/utils/logger.ts +5 -5
- package/lib/knex/src/utils/util.ts +1 -1
- package/lib/knex/tsconfig.json +2 -2
- package/lib/mongoose/.swcrc +39 -0
- package/lib/mongoose/Dockerfile +1 -1
- package/lib/mongoose/docker-compose.yml +0 -4
- package/lib/mongoose/ecosystem.config.js +42 -27
- package/lib/mongoose/nodemon.json +2 -2
- package/lib/mongoose/package.json +15 -8
- package/lib/mongoose/src/app.ts +2 -3
- package/lib/mongoose/src/configs/development.json +1 -1
- package/lib/mongoose/src/configs/production.json +1 -1
- package/lib/mongoose/src/configs/test.json +1 -1
- package/lib/mongoose/src/http/auth.http +32 -0
- package/lib/mongoose/src/http/users.http +34 -0
- package/lib/mongoose/src/index.ts +1 -0
- package/lib/mongoose/src/middlewares/auth.middleware.ts +3 -3
- package/lib/mongoose/src/server.ts +1 -2
- package/lib/mongoose/src/services/auth.service.ts +5 -5
- package/lib/mongoose/src/services/users.service.ts +3 -3
- package/lib/mongoose/src/utils/logger.ts +5 -5
- package/lib/mongoose/src/utils/util.ts +1 -1
- package/lib/mongoose/tsconfig.json +2 -2
- package/lib/prisma/.env +1 -1
- package/lib/prisma/.swcrc +37 -0
- package/lib/prisma/Dockerfile +1 -1
- package/lib/prisma/docker-compose.yml +1 -6
- package/lib/prisma/ecosystem.config.js +40 -24
- package/lib/prisma/nodemon.json +2 -2
- package/lib/prisma/package.json +17 -10
- package/lib/prisma/src/app.ts +2 -3
- package/lib/prisma/src/http/auth.http +12 -15
- package/lib/prisma/src/http/users.http +12 -16
- package/lib/prisma/src/index.ts +1 -0
- package/lib/prisma/src/middlewares/auth.middleware.ts +4 -4
- package/lib/prisma/src/server.ts +1 -2
- package/lib/prisma/src/services/auth.service.ts +5 -5
- package/lib/prisma/src/services/users.service.ts +3 -3
- package/lib/prisma/src/utils/logger.ts +5 -5
- package/lib/prisma/src/utils/util.ts +1 -1
- package/lib/prisma/tsconfig.json +2 -2
- package/lib/routing-controllers/.swcrc +37 -0
- package/lib/routing-controllers/Dockerfile +1 -1
- package/lib/routing-controllers/ecosystem.config.js +40 -24
- package/lib/routing-controllers/nodemon.json +2 -2
- package/lib/routing-controllers/package.json +18 -11
- package/lib/routing-controllers/src/app.ts +33 -6
- package/lib/routing-controllers/src/http/auth.http +12 -15
- package/lib/routing-controllers/src/http/users.http +12 -16
- package/lib/routing-controllers/src/index.ts +1 -0
- package/lib/routing-controllers/src/middlewares/auth.middleware.ts +3 -3
- package/lib/routing-controllers/src/middlewares/validation.middleware.ts +10 -2
- package/lib/routing-controllers/src/models/users.model.ts +5 -5
- package/lib/routing-controllers/src/server.ts +1 -3
- package/lib/routing-controllers/src/services/auth.service.ts +5 -5
- package/lib/routing-controllers/src/services/users.service.ts +3 -3
- package/lib/routing-controllers/src/utils/logger.ts +5 -5
- package/lib/routing-controllers/src/utils/util.ts +1 -1
- package/lib/routing-controllers/tsconfig.json +2 -2
- package/lib/sequelize/.swcrc +39 -0
- package/lib/sequelize/Dockerfile +1 -1
- package/lib/sequelize/docker-compose.yml +1 -6
- package/lib/sequelize/ecosystem.config.js +42 -27
- package/lib/sequelize/nodemon.json +2 -2
- package/lib/sequelize/package.json +15 -8
- package/lib/sequelize/src/app.ts +1 -2
- package/lib/sequelize/src/configs/development.json +2 -2
- package/lib/sequelize/src/configs/production.json +1 -1
- package/lib/sequelize/src/configs/test.json +1 -1
- package/lib/sequelize/src/http/auth.http +32 -0
- package/lib/sequelize/src/http/users.http +34 -0
- package/lib/sequelize/src/index.ts +1 -0
- package/lib/sequelize/src/middlewares/auth.middleware.ts +4 -4
- package/lib/sequelize/src/server.ts +1 -2
- package/lib/sequelize/src/services/auth.service.ts +5 -5
- package/lib/sequelize/src/services/users.service.ts +3 -3
- package/lib/sequelize/src/utils/logger.ts +5 -5
- package/lib/sequelize/src/utils/util.ts +1 -1
- package/lib/sequelize/tsconfig.json +2 -2
- package/lib/starter.js +8 -12
- package/lib/typeorm/.swcrc +39 -0
- package/lib/typeorm/Dockerfile +1 -1
- package/lib/typeorm/docker-compose.yml +1 -1
- package/lib/typeorm/ecosystem.config.js +42 -27
- package/lib/typeorm/nodemon.json +2 -2
- package/lib/typeorm/package.json +15 -8
- package/lib/typeorm/src/app.ts +1 -2
- package/lib/typeorm/src/configs/development.json +1 -1
- package/lib/typeorm/src/configs/production.json +1 -1
- package/lib/typeorm/src/configs/test.json +1 -1
- package/lib/typeorm/src/databases/index.ts +5 -5
- package/lib/typeorm/src/{entity → entities}/users.entity.ts +3 -3
- package/lib/typeorm/src/http/auth.http +12 -15
- package/lib/typeorm/src/http/users.http +12 -16
- package/lib/typeorm/src/index.ts +1 -0
- package/lib/typeorm/src/middlewares/auth.middleware.ts +5 -9
- package/lib/typeorm/src/server.ts +1 -2
- package/lib/typeorm/src/services/auth.service.ts +13 -17
- package/lib/typeorm/src/services/users.service.ts +16 -22
- package/lib/typeorm/src/utils/logger.ts +5 -5
- package/lib/typeorm/src/utils/util.ts +1 -1
- package/lib/typeorm/tsconfig.json +3 -3
- package/package.json +12 -4
|
@@ -1,42 +1,57 @@
|
|
|
1
|
-
|
|
1
|
+
/**
|
|
2
|
+
* @description pm2 configuration file.
|
|
3
|
+
* @example
|
|
4
|
+
* production mode :: pm2 start ecosystem.config.js --only prod
|
|
5
|
+
* development mode :: pm2 start ecosystem.config.js --only dev
|
|
6
|
+
*/
|
|
7
|
+
module.exports = {
|
|
2
8
|
apps: [
|
|
3
9
|
{
|
|
4
|
-
name: '
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
instances: 2,
|
|
9
|
-
autorestart: true,
|
|
10
|
-
watch: false,
|
|
11
|
-
|
|
12
|
-
//
|
|
13
|
-
// pm2
|
|
14
|
-
|
|
15
|
-
|
|
10
|
+
name: 'prod', // pm2 start App name
|
|
11
|
+
script: 'dist/server.js',
|
|
12
|
+
exec_mode: 'cluster', // 'cluster' or 'fork'
|
|
13
|
+
instance_var: 'INSTANCE_ID', // instance variable
|
|
14
|
+
instances: 2, // pm2 instance count
|
|
15
|
+
autorestart: true, // auto restart if process crash
|
|
16
|
+
watch: false, // files change automatic restart
|
|
17
|
+
ignore_watch: ['node_modules', 'logs'], // ignore files change
|
|
18
|
+
max_memory_restart: '1G', // restart if process use more than 1G memory
|
|
19
|
+
merge_logs: true, // if true, stdout and stderr will be merged and sent to pm2 log
|
|
20
|
+
output: './logs/access.log', // pm2 log file
|
|
21
|
+
error: './logs/error.log', // pm2 error log file
|
|
22
|
+
env: { // environment variable
|
|
16
23
|
PORT: 3000,
|
|
17
|
-
NODE_ENV: '
|
|
24
|
+
NODE_ENV: 'production',
|
|
18
25
|
},
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
26
|
+
},
|
|
27
|
+
{
|
|
28
|
+
name: 'dev', // pm2 start App name
|
|
29
|
+
script: 'ts-node', // ts-node
|
|
30
|
+
args: '-r tsconfig-paths/register --transpile-only src/server.ts', // ts-node args
|
|
31
|
+
exec_mode: 'cluster', // 'cluster' or 'fork'
|
|
32
|
+
instance_var: 'INSTANCE_ID', // instance variable
|
|
33
|
+
instances: 2, // pm2 instance count
|
|
34
|
+
autorestart: true, // auto restart if process crash
|
|
35
|
+
watch: false, // files change automatic restart
|
|
36
|
+
ignore_watch: ['node_modules', 'logs'], // ignore files change
|
|
37
|
+
max_memory_restart: '1G', // restart if process use more than 1G memory
|
|
38
|
+
merge_logs: true, // if true, stdout and stderr will be merged and sent to pm2 log
|
|
39
|
+
output: './logs/access.log', // pm2 log file
|
|
40
|
+
error: './logs/error.log', // pm2 error log file
|
|
41
|
+
env: { // environment variable
|
|
23
42
|
PORT: 3000,
|
|
24
|
-
NODE_ENV: '
|
|
43
|
+
NODE_ENV: 'development',
|
|
25
44
|
},
|
|
26
|
-
output: './logs/console.log',
|
|
27
|
-
error: './logs/consoleError.log',
|
|
28
45
|
},
|
|
29
46
|
],
|
|
30
|
-
|
|
31
47
|
deploy: {
|
|
32
48
|
production: {
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
host: '123.12.123.1',
|
|
49
|
+
user: 'user',
|
|
50
|
+
host: '0.0.0.0',
|
|
36
51
|
ref: 'origin/master',
|
|
37
52
|
repo: 'git@github.com:repo.git',
|
|
38
|
-
path: '/
|
|
39
|
-
'post-deploy': 'npm install && pm2 reload ecosystem.config.js --
|
|
53
|
+
path: 'dist/server.js',
|
|
54
|
+
'post-deploy': 'npm install && npm run build && pm2 reload ecosystem.config.js --only prod',
|
|
40
55
|
},
|
|
41
56
|
},
|
|
42
57
|
};
|
|
@@ -7,10 +7,13 @@
|
|
|
7
7
|
"scripts": {
|
|
8
8
|
"start": "npm run build && cross-env NODE_ENV=production node dist/server.js",
|
|
9
9
|
"dev": "cross-env NODE_ENV=development nodemon",
|
|
10
|
-
"build": "
|
|
10
|
+
"build": "swc src -d dist --source-maps --copy-files",
|
|
11
|
+
"build:tsc": "tsc && tsc-alias",
|
|
11
12
|
"test": "jest --forceExit --detectOpenHandles",
|
|
12
13
|
"lint": "eslint --ignore-path .gitignore --ext .ts src/",
|
|
13
|
-
"lint:fix": "npm run lint -- --fix"
|
|
14
|
+
"lint:fix": "npm run lint -- --fix",
|
|
15
|
+
"deploy:prod": "npm run build && pm2 start ecosystem.config.js --only prod",
|
|
16
|
+
"deploy:dev": "pm2 start ecosystem.config.js --only dev"
|
|
14
17
|
},
|
|
15
18
|
"dependencies": {
|
|
16
19
|
"bcrypt": "^5.0.1",
|
|
@@ -20,25 +23,22 @@
|
|
|
20
23
|
"config": "^3.3.6",
|
|
21
24
|
"cookie-parser": "^1.4.5",
|
|
22
25
|
"cors": "^2.8.5",
|
|
23
|
-
"cross-env": "^7.0.3",
|
|
24
26
|
"dotenv": "^10.0.0",
|
|
25
27
|
"envalid": "^7.1.0",
|
|
26
28
|
"express": "^4.17.1",
|
|
27
29
|
"helmet": "^4.6.0",
|
|
28
30
|
"hpp": "^0.2.3",
|
|
29
|
-
"jest": "^27.0.6",
|
|
30
31
|
"jsonwebtoken": "^8.5.1",
|
|
31
32
|
"mongoose": "^5.10.1",
|
|
32
33
|
"morgan": "^1.10.0",
|
|
33
34
|
"swagger-jsdoc": "^6.0.0",
|
|
34
35
|
"swagger-ui-express": "^4.1.6",
|
|
35
|
-
"ts-jest": "^27.0.3",
|
|
36
|
-
"ts-node": "^10.0.0",
|
|
37
|
-
"typescript": "^4.3.5",
|
|
38
36
|
"winston": "^3.3.3",
|
|
39
37
|
"winston-daily-rotate-file": "^4.5.5"
|
|
40
38
|
},
|
|
41
39
|
"devDependencies": {
|
|
40
|
+
"@swc/cli": "^0.1.51",
|
|
41
|
+
"@swc/core": "^1.2.108",
|
|
42
42
|
"@types/bcrypt": "^5.0.0",
|
|
43
43
|
"@types/compression": "^1.7.1",
|
|
44
44
|
"@types/config": "^0.0.39",
|
|
@@ -59,16 +59,23 @@
|
|
|
59
59
|
"@types/winston": "^2.4.4",
|
|
60
60
|
"@typescript-eslint/eslint-plugin": "^4.28.2",
|
|
61
61
|
"@typescript-eslint/parser": "^4.28.2",
|
|
62
|
+
"cross-env": "^7.0.3",
|
|
62
63
|
"eslint": "^7.30.0",
|
|
63
64
|
"eslint-config-prettier": "^8.3.0",
|
|
64
65
|
"eslint-plugin-prettier": "^3.4.0",
|
|
65
66
|
"husky": "^7.0.1",
|
|
67
|
+
"jest": "^27.0.6",
|
|
66
68
|
"lint-staged": "^11.0.0",
|
|
67
69
|
"node-config": "^0.0.2",
|
|
68
70
|
"node-gyp": "^8.1.0",
|
|
69
71
|
"nodemon": "^2.0.9",
|
|
72
|
+
"pm2": "^5.1.0",
|
|
70
73
|
"prettier": "^2.3.2",
|
|
71
74
|
"supertest": "^6.1.3",
|
|
72
|
-
"
|
|
75
|
+
"ts-jest": "^27.0.7",
|
|
76
|
+
"ts-node": "^10.4.0",
|
|
77
|
+
"tsc-alias": "^1.4.1",
|
|
78
|
+
"tsconfig-paths": "^3.10.1",
|
|
79
|
+
"typescript": "^4.5.2"
|
|
73
80
|
}
|
|
74
81
|
}
|
package/lib/mongoose/src/app.ts
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
import '@/index';
|
|
2
|
+
import config from 'config';
|
|
3
3
|
import compression from 'compression';
|
|
4
4
|
import cookieParser from 'cookie-parser';
|
|
5
5
|
import cors from 'cors';
|
|
6
|
-
import config from 'config';
|
|
7
6
|
import express from 'express';
|
|
8
7
|
import helmet from 'helmet';
|
|
9
8
|
import hpp from 'hpp';
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
# baseURL
|
|
2
|
+
@baseURL = http://localhost:3000
|
|
3
|
+
|
|
4
|
+
###
|
|
5
|
+
# User Signup
|
|
6
|
+
POST {{ baseURL }}/signup
|
|
7
|
+
Content-Type: application/json
|
|
8
|
+
|
|
9
|
+
{
|
|
10
|
+
"email": "example@email.com",
|
|
11
|
+
"password": "password"
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
###
|
|
15
|
+
# User Login
|
|
16
|
+
POST {{ baseURL }}/login
|
|
17
|
+
Content-Type: application/json
|
|
18
|
+
|
|
19
|
+
{
|
|
20
|
+
"email": "example@email.com",
|
|
21
|
+
"password": "password"
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
###
|
|
25
|
+
# User Logout
|
|
26
|
+
POST {{ baseURL }}/logout
|
|
27
|
+
Content-Type: application/json
|
|
28
|
+
|
|
29
|
+
{
|
|
30
|
+
"email": "example@email.com",
|
|
31
|
+
"password": "password"
|
|
32
|
+
}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
# baseURL
|
|
2
|
+
@baseURL = http://localhost:3000
|
|
3
|
+
|
|
4
|
+
###
|
|
5
|
+
# Find All Users
|
|
6
|
+
GET {{ baseURL }}/users
|
|
7
|
+
|
|
8
|
+
###
|
|
9
|
+
# Find User By Id
|
|
10
|
+
GET {{ baseURL }}/users/1
|
|
11
|
+
|
|
12
|
+
###
|
|
13
|
+
# Create User
|
|
14
|
+
POST {{ baseURL }}/users
|
|
15
|
+
Content-Type: application/json
|
|
16
|
+
|
|
17
|
+
{
|
|
18
|
+
"email": "example@email.com",
|
|
19
|
+
"password": "password"
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
###
|
|
23
|
+
# Modify User By Id
|
|
24
|
+
PUT {{ baseURL }}/users/1
|
|
25
|
+
Content-Type: application/json
|
|
26
|
+
|
|
27
|
+
{
|
|
28
|
+
"email": "example@email.com",
|
|
29
|
+
"password": "password"
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
###
|
|
33
|
+
# Delete User By Id
|
|
34
|
+
DELETE {{ baseURL }}/users/1
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
process.env['NODE_CONFIG_DIR'] = __dirname + '/configs';
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import config from 'config';
|
|
2
2
|
import { NextFunction, Response } from 'express';
|
|
3
|
-
import
|
|
3
|
+
import { verify } from 'jsonwebtoken';
|
|
4
4
|
import { HttpException } from '@exceptions/HttpException';
|
|
5
5
|
import { DataStoredInToken, RequestWithUser } from '@interfaces/auth.interface';
|
|
6
6
|
import userModel from '@models/users.model';
|
|
7
7
|
|
|
8
8
|
const authMiddleware = async (req: RequestWithUser, res: Response, next: NextFunction) => {
|
|
9
9
|
try {
|
|
10
|
-
const Authorization = req.cookies['Authorization'] || req.header('Authorization').split('Bearer ')[1]
|
|
10
|
+
const Authorization = req.cookies['Authorization'] || (req.header('Authorization') ? req.header('Authorization').split('Bearer ')[1] : null);
|
|
11
11
|
|
|
12
12
|
if (Authorization) {
|
|
13
13
|
const secretKey: string = config.get('secretKey');
|
|
14
|
-
const verificationResponse = (await
|
|
14
|
+
const verificationResponse = (await verify(Authorization, secretKey)) as DataStoredInToken;
|
|
15
15
|
const userId = verificationResponse._id;
|
|
16
16
|
const findUser = await userModel.findById(userId);
|
|
17
17
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { hash, compare } from 'bcrypt';
|
|
2
2
|
import config from 'config';
|
|
3
|
-
import
|
|
3
|
+
import { sign } from 'jsonwebtoken';
|
|
4
4
|
import { CreateUserDto } from '@dtos/users.dto';
|
|
5
5
|
import { HttpException } from '@exceptions/HttpException';
|
|
6
6
|
import { DataStoredInToken, TokenData } from '@interfaces/auth.interface';
|
|
@@ -17,7 +17,7 @@ class AuthService {
|
|
|
17
17
|
const findUser: User = await this.users.findOne({ email: userData.email });
|
|
18
18
|
if (findUser) throw new HttpException(409, `You're email ${userData.email} already exists`);
|
|
19
19
|
|
|
20
|
-
const hashedPassword = await
|
|
20
|
+
const hashedPassword = await hash(userData.password, 10);
|
|
21
21
|
const createUserData: User = await this.users.create({ ...userData, password: hashedPassword });
|
|
22
22
|
|
|
23
23
|
return createUserData;
|
|
@@ -29,7 +29,7 @@ class AuthService {
|
|
|
29
29
|
const findUser: User = await this.users.findOne({ email: userData.email });
|
|
30
30
|
if (!findUser) throw new HttpException(409, `You're email ${userData.email} not found`);
|
|
31
31
|
|
|
32
|
-
const isPasswordMatching: boolean = await
|
|
32
|
+
const isPasswordMatching: boolean = await compare(userData.password, findUser.password);
|
|
33
33
|
if (!isPasswordMatching) throw new HttpException(409, "You're password not matching");
|
|
34
34
|
|
|
35
35
|
const tokenData = this.createToken(findUser);
|
|
@@ -52,7 +52,7 @@ class AuthService {
|
|
|
52
52
|
const secretKey: string = config.get('secretKey');
|
|
53
53
|
const expiresIn: number = 60 * 60;
|
|
54
54
|
|
|
55
|
-
return { expiresIn, token:
|
|
55
|
+
return { expiresIn, token: sign(dataStoredInToken, secretKey, { expiresIn }) };
|
|
56
56
|
}
|
|
57
57
|
|
|
58
58
|
public createCookie(tokenData: TokenData): string {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { hash } from 'bcrypt';
|
|
2
2
|
import { CreateUserDto } from '@dtos/users.dto';
|
|
3
3
|
import { HttpException } from '@exceptions/HttpException';
|
|
4
4
|
import { User } from '@interfaces/users.interface';
|
|
@@ -28,7 +28,7 @@ class UserService {
|
|
|
28
28
|
const findUser: User = await this.users.findOne({ email: userData.email });
|
|
29
29
|
if (findUser) throw new HttpException(409, `You're email ${userData.email} already exists`);
|
|
30
30
|
|
|
31
|
-
const hashedPassword = await
|
|
31
|
+
const hashedPassword = await hash(userData.password, 10);
|
|
32
32
|
const createUserData: User = await this.users.create({ ...userData, password: hashedPassword });
|
|
33
33
|
|
|
34
34
|
return createUserData;
|
|
@@ -43,7 +43,7 @@ class UserService {
|
|
|
43
43
|
}
|
|
44
44
|
|
|
45
45
|
if (userData.password) {
|
|
46
|
-
const hashedPassword = await
|
|
46
|
+
const hashedPassword = await hash(userData.password, 10);
|
|
47
47
|
userData = { ...userData, password: hashedPassword };
|
|
48
48
|
}
|
|
49
49
|
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import config from 'config';
|
|
2
|
-
import
|
|
3
|
-
import
|
|
2
|
+
import { existsSync, mkdirSync } from 'fs';
|
|
3
|
+
import { join } from 'path';
|
|
4
4
|
import winston from 'winston';
|
|
5
5
|
import winstonDaily from 'winston-daily-rotate-file';
|
|
6
6
|
|
|
7
7
|
// logs dir
|
|
8
|
-
const logDir: string =
|
|
8
|
+
const logDir: string = join(__dirname, config.get('log.dir'));
|
|
9
9
|
|
|
10
|
-
if (!
|
|
11
|
-
|
|
10
|
+
if (!existsSync(logDir)) {
|
|
11
|
+
mkdirSync(logDir);
|
|
12
12
|
}
|
|
13
13
|
|
|
14
14
|
// Define log format
|
|
@@ -9,7 +9,7 @@ export const isEmpty = (value: string | number | object): boolean => {
|
|
|
9
9
|
return true;
|
|
10
10
|
} else if (typeof value !== 'number' && value === '') {
|
|
11
11
|
return true;
|
|
12
|
-
} else if (value === 'undefined' || value === undefined) {
|
|
12
|
+
} else if (typeof value === 'undefined' || value === undefined) {
|
|
13
13
|
return true;
|
|
14
14
|
} else if (value !== null && typeof value === 'object' && !Object.keys(value).length) {
|
|
15
15
|
return true;
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"pretty": true,
|
|
14
14
|
"sourceMap": true,
|
|
15
15
|
"declaration": true,
|
|
16
|
-
"outDir": "
|
|
16
|
+
"outDir": "dist",
|
|
17
17
|
"allowJs": true,
|
|
18
18
|
"noEmit": false,
|
|
19
19
|
"esModuleInterop": true,
|
|
@@ -35,5 +35,5 @@
|
|
|
35
35
|
}
|
|
36
36
|
},
|
|
37
37
|
"include": ["src/**/*.ts", "src/**/*.json", ".env"],
|
|
38
|
-
"exclude": ["node_modules"]
|
|
38
|
+
"exclude": ["node_modules", "src/http", "src/logs", "src/tests"]
|
|
39
39
|
}
|
package/lib/prisma/.env
CHANGED
|
@@ -7,4 +7,4 @@ PORT=3000
|
|
|
7
7
|
# Prisma supports the native connection string format for PostgreSQL, MySQL and SQLite.
|
|
8
8
|
# See the documentation for all the connection string options: https://pris.ly/d/connection-strings
|
|
9
9
|
|
|
10
|
-
DATABASE_URL="mysql://root:password@localhost:3306/
|
|
10
|
+
DATABASE_URL="mysql://root:password@localhost:3306/test"
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
{
|
|
2
|
+
"jsc": {
|
|
3
|
+
"parser": {
|
|
4
|
+
"syntax": "typescript",
|
|
5
|
+
"tsx": false,
|
|
6
|
+
"dynamicImport": true,
|
|
7
|
+
"decorators": true
|
|
8
|
+
},
|
|
9
|
+
"transform": {
|
|
10
|
+
"legacyDecorator": true,
|
|
11
|
+
"decoratorMetadata": true
|
|
12
|
+
},
|
|
13
|
+
"target": "es2017",
|
|
14
|
+
"externalHelpers": false,
|
|
15
|
+
"keepClassNames": true,
|
|
16
|
+
"loose": false,
|
|
17
|
+
"minify": {
|
|
18
|
+
"compress": false,
|
|
19
|
+
"mangle": false
|
|
20
|
+
},
|
|
21
|
+
"baseUrl": "src",
|
|
22
|
+
"paths": {
|
|
23
|
+
"@/*": ["*"],
|
|
24
|
+
"@controllers/*": ["controllers/*"],
|
|
25
|
+
"@dtos/*": ["dtos/*"],
|
|
26
|
+
"@exceptions/*": ["exceptions/*"],
|
|
27
|
+
"@interfaces/*": ["interfaces/*"],
|
|
28
|
+
"@middlewares/*": ["middlewares/*"],
|
|
29
|
+
"@routes/*": ["routes/*"],
|
|
30
|
+
"@services/*": ["services/*"],
|
|
31
|
+
"@utils/*": ["utils/*"]
|
|
32
|
+
}
|
|
33
|
+
},
|
|
34
|
+
"module": {
|
|
35
|
+
"type": "commonjs"
|
|
36
|
+
}
|
|
37
|
+
}
|
package/lib/prisma/Dockerfile
CHANGED
|
@@ -19,11 +19,6 @@ services:
|
|
|
19
19
|
container_name: server
|
|
20
20
|
ports:
|
|
21
21
|
- '3000:3000'
|
|
22
|
-
environment:
|
|
23
|
-
MYSQL_USER: root
|
|
24
|
-
MYSQL_PASSWORD: password
|
|
25
|
-
MYSQL_HOST: mysql
|
|
26
|
-
MYSQL_DATABASE: prisma
|
|
27
22
|
volumes:
|
|
28
23
|
- ./:/app
|
|
29
24
|
- /app/node_modules
|
|
@@ -40,7 +35,7 @@ services:
|
|
|
40
35
|
environment:
|
|
41
36
|
MYSQL_ROOT_USER: root
|
|
42
37
|
MYSQL_ROOT_PASSWORD: password
|
|
43
|
-
MYSQL_DATABASE:
|
|
38
|
+
MYSQL_DATABASE: test
|
|
44
39
|
ports:
|
|
45
40
|
- '3306:3306'
|
|
46
41
|
networks:
|
|
@@ -1,41 +1,57 @@
|
|
|
1
|
-
|
|
1
|
+
/**
|
|
2
|
+
* @description pm2 configuration file.
|
|
3
|
+
* @example
|
|
4
|
+
* production mode :: pm2 start ecosystem.config.js --only prod
|
|
5
|
+
* development mode :: pm2 start ecosystem.config.js --only dev
|
|
6
|
+
*/
|
|
7
|
+
module.exports = {
|
|
2
8
|
apps: [
|
|
3
9
|
{
|
|
4
|
-
name: '
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
instances: 2,
|
|
9
|
-
autorestart: true,
|
|
10
|
-
watch: false,
|
|
11
|
-
|
|
12
|
-
//
|
|
13
|
-
// pm2
|
|
14
|
-
|
|
15
|
-
|
|
10
|
+
name: 'prod', // pm2 start App name
|
|
11
|
+
script: 'dist/server.js',
|
|
12
|
+
exec_mode: 'cluster', // 'cluster' or 'fork'
|
|
13
|
+
instance_var: 'INSTANCE_ID', // instance variable
|
|
14
|
+
instances: 2, // pm2 instance count
|
|
15
|
+
autorestart: true, // auto restart if process crash
|
|
16
|
+
watch: false, // files change automatic restart
|
|
17
|
+
ignore_watch: ['node_modules', 'logs'], // ignore files change
|
|
18
|
+
max_memory_restart: '1G', // restart if process use more than 1G memory
|
|
19
|
+
merge_logs: true, // if true, stdout and stderr will be merged and sent to pm2 log
|
|
20
|
+
output: './logs/access.log', // pm2 log file
|
|
21
|
+
error: './logs/error.log', // pm2 error log file
|
|
22
|
+
env: { // environment variable
|
|
16
23
|
PORT: 3000,
|
|
17
24
|
NODE_ENV: 'production',
|
|
18
25
|
},
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
26
|
+
},
|
|
27
|
+
{
|
|
28
|
+
name: 'dev', // pm2 start App name
|
|
29
|
+
script: 'ts-node', // ts-node
|
|
30
|
+
args: '-r tsconfig-paths/register --transpile-only src/server.ts', // ts-node args
|
|
31
|
+
exec_mode: 'cluster', // 'cluster' or 'fork'
|
|
32
|
+
instance_var: 'INSTANCE_ID', // instance variable
|
|
33
|
+
instances: 2, // pm2 instance count
|
|
34
|
+
autorestart: true, // auto restart if process crash
|
|
35
|
+
watch: false, // files change automatic restart
|
|
36
|
+
ignore_watch: ['node_modules', 'logs'], // ignore files change
|
|
37
|
+
max_memory_restart: '1G', // restart if process use more than 1G memory
|
|
38
|
+
merge_logs: true, // if true, stdout and stderr will be merged and sent to pm2 log
|
|
39
|
+
output: './logs/access.log', // pm2 log file
|
|
40
|
+
error: './logs/error.log', // pm2 error log file
|
|
41
|
+
env: { // environment variable
|
|
23
42
|
PORT: 3000,
|
|
24
43
|
NODE_ENV: 'development',
|
|
25
44
|
},
|
|
26
|
-
output: './logs/console.log',
|
|
27
|
-
error: './logs/consoleError.log',
|
|
28
45
|
},
|
|
29
46
|
],
|
|
30
47
|
deploy: {
|
|
31
48
|
production: {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
host: '123.12.123.1',
|
|
49
|
+
user: 'user',
|
|
50
|
+
host: '0.0.0.0',
|
|
35
51
|
ref: 'origin/master',
|
|
36
52
|
repo: 'git@github.com:repo.git',
|
|
37
|
-
path: '/
|
|
38
|
-
'post-deploy': 'npm install && pm2 reload ecosystem.config.js --
|
|
53
|
+
path: 'dist/server.js',
|
|
54
|
+
'post-deploy': 'npm install && npm run build && pm2 reload ecosystem.config.js --only prod',
|
|
39
55
|
},
|
|
40
56
|
},
|
|
41
57
|
};
|