typescript-express-starter 6.0.0 → 6.3.0

package/lib/knex/ecosystem.config.js

@@ -1,43 +1,57 @@
-module.exports = {
-    apps: [
-        {
-            name: 'myapp',
-            // package.json에 정의된 npm run start를 실행하게 해서 PM2로 관리하게 한다.
-            script: 'npm',
-            args: 'run dev',
-            instances: 2,
-            autorestart: true,
-            watch: false,
-            max_memory_restart: '1G',
-            // development mode
-            // pm2 start ecosystem.config.js
-            env: {
-                HOST: '0.0.0.0',
-                PORT: 3000,
-                NODE_ENV: 'development'
-            },
-            // production mode
-            // pm2 start ecosystem.config.js --env production
-            env_production: {
-                HOST: '0.0.0.0',
-                PORT: 3000,
-                NODE_ENV: 'production'
-            },
-            output: './logs/console.log',
-            error: './logs/consoleError.log'
-        }
-    ],
-
-    deploy: {
-        production: {
-            // sample
-            user: 'node',
-            host: '123.12.123.1',
-            ref: 'origin/master',
-            repo: 'git@github.com:repo.git',
-            path: '/var/www/production',
-            'post-deploy':
-                'npm install && pm2 reload ecosystem.config.js --env production'
-        }
-    }
-}
+/**
+ * @description pm2 configuration file.
+ * @example
+ *  production mode :: pm2 start ecosystem.config.js --only prod
+ *  development mode :: pm2 start ecosystem.config.js --only dev
+ */
+ module.exports = {
+  apps: [
+    {
+      name: 'prod', // pm2 start App name
+      script: 'dist/server.js',
+      exec_mode: 'cluster', // 'cluster' or 'fork'
+      instance_var: 'INSTANCE_ID', // instance variable
+      instances: 2, // pm2 instance count
+      autorestart: true, // auto restart if process crash
+      watch: false, // files change automatic restart
+      ignore_watch: ['node_modules', 'logs'], // ignore files change
+      max_memory_restart: '1G', // restart if process use more than 1G memory
+      merge_logs: true, // if true, stdout and stderr will be merged and sent to pm2 log
+      output: './logs/access.log', // pm2 log file
+      error: './logs/error.log', // pm2 error log file
+      env: { // environment variable
+        PORT: 3000,
+        NODE_ENV: 'production',
+      },
+    },
+    {
+      name: 'dev', // pm2 start App name
+      script: 'ts-node', // ts-node
+      args: '-r tsconfig-paths/register --transpile-only src/server.ts', // ts-node args
+      exec_mode: 'cluster', // 'cluster' or 'fork'
+      instance_var: 'INSTANCE_ID', // instance variable
+      instances: 2, // pm2 instance count
+      autorestart: true, // auto restart if process crash
+      watch: false, // files change automatic restart
+      ignore_watch: ['node_modules', 'logs'], // ignore files change
+      max_memory_restart: '1G', // restart if process use more than 1G memory
+      merge_logs: true, // if true, stdout and stderr will be merged and sent to pm2 log
+      output: './logs/access.log', // pm2 log file
+      error: './logs/error.log', // pm2 error log file
+      env: { // environment variable
+        PORT: 3000,
+        NODE_ENV: 'development',
+      },
+    },
+  ],
+  deploy: {
+    production: {
+      user: 'user',
+      host: '0.0.0.0',
+      ref: 'origin/master',
+      repo: 'git@github.com:repo.git',
+      path: 'dist/server.js',
+      'post-deploy': 'npm install && npm run build && pm2 reload ecosystem.config.js --only prod',
+    },
+  },
+};

package/lib/knex/knexfile.ts

@@ -3,17 +3,17 @@ process.env['NODE_CONFIG_DIR'] = __dirname + '/src/configs';
 import config from 'config';
 import { dbConfig } from './src/interfaces/db.interface';
 
-const db: dbConfig = config.get('dbConfig');
+const { host, user, password, database, port }: dbConfig = config.get('dbConfig');
 export = {
   client: 'mysql',
   connection: {
     charset: 'utf8',
     timezone: 'UTC',
-    host: db.host,
-    user: db.user,
-    password: db.password,
-    database: db.database,
-    port: db.port,
+    host: host,
+    user: user,
+    password: password,
+    database: database,
+    port: port,
   },
   migrations: {
     directory: 'src/databases/migrations',

package/lib/knex/nodemon.json

@@ -5,8 +5,8 @@
     ],
     "ext": "js,ts,json",
     "ignore": [
-        "src/**/*.spec.ts",
-        "src/**/*.test.ts"
+        "src/logs/*",
+        "src/**/*.{spec,test}.ts"
     ],
     "exec": "ts-node -r tsconfig-paths/register --transpile-only src/server.ts"
 }

package/lib/knex/package.json

@@ -7,7 +7,8 @@
   "scripts": {
     "start": "npm run build && cross-env NODE_ENV=production node dist/server.js",
     "dev": "cross-env NODE_ENV=development nodemon",
-    "build": "tsc && npx tsc-alias",
+    "build": "swc src -d dist --source-maps --copy-files",
+    "build:tsc": "tsc && tsc-alias",
     "test": "jest --forceExit --detectOpenHandles",
     "lint": "eslint --ignore-path .gitignore --ext .ts src/",
     "lint:fix": "npm run lint -- --fix",
@@ -15,7 +16,9 @@
     "migrate": "knex migrate:latest --knexfile=knexfile.ts --verbose",
     "rollback": "knex migrate:rollback --knexfile=knexfile.ts --verbose",
     "make:seeder": "knex seed:make --knexfile=knexfile.ts -x ts --env development",
-    "make:migration": "knex migrate:make --knexfile=knexfile.ts -x ts --env development"
+    "make:migration": "knex migrate:make --knexfile=knexfile.ts -x ts --env development",
+    "deploy:prod": "npm run build && pm2 start ecosystem.config.js --only prod",
+    "deploy:dev": "pm2 start ecosystem.config.js --only dev"
   },
   "dependencies": {
     "bcrypt": "^5.0.1",
@@ -25,7 +28,6 @@
     "config": "^3.3.6",
     "cookie-parser": "^1.4.5",
     "cors": "^2.8.5",
-    "cross-env": "^7.0.3",
     "dotenv": "^9.0.2",
     "envalid": "^7.1.0",
     "express": "^4.17.1",
@@ -42,6 +44,8 @@
     "winston-daily-rotate-file": "^4.5.5"
   },
   "devDependencies": {
+    "@swc/cli": "^0.1.51",
+    "@swc/core": "^1.2.108",
     "@types/bcrypt": "^5.0.0",
     "@types/compression": "^1.7.0",
     "@types/config": "0.0.38",
@@ -62,21 +66,23 @@
     "@types/winston": "^2.4.4",
     "@typescript-eslint/eslint-plugin": "^4.23.0",
     "@typescript-eslint/parser": "^4.23.0",
+    "cross-env": "^7.0.3",
     "eslint": "^7.26.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^3.4.0",
     "husky": "^6.0.0",
     "jest": "^27.0.6",
-    "jest-extended": "^0.11.5",
     "lint-staged": "^11.0.0",
     "node-config": "0.0.2",
     "node-gyp": "^8.0.0",
     "nodemon": "^2.0.7",
+    "pm2": "^5.1.0",
     "prettier": "^2.3.0",
     "supertest": "^6.1.3",
-    "ts-jest": "^27.0.3",
-    "ts-node": "^10.1.0",
-    "tsconfig-paths": "^3.9.0",
-    "typescript": "^4.3.5"
+    "ts-jest": "^27.0.7",
+    "ts-node": "^10.4.0",
+    "tsc-alias": "^1.4.1",
+    "tsconfig-paths": "^3.10.1",
+    "typescript": "^4.5.2"
   }
 }

package/lib/knex/src/app.ts

@@ -1,9 +1,8 @@
-process.env['NODE_CONFIG_DIR'] = __dirname + '/configs';
-
+import '@/index';
+import config from 'config';
 import compression from 'compression';
 import cookieParser from 'cookie-parser';
 import cors from 'cors';
-import config from 'config';
 import express from 'express';
 import helmet from 'helmet';
 import hpp from 'hpp';

package/lib/knex/src/databases/index.ts

@@ -2,17 +2,17 @@ import config from 'config';
 import Knex from 'knex';
 import { dbConfig } from '@interfaces/db.interface';
 
-const db: dbConfig = config.get('dbConfig');
+const { host, port, user, password, database }: dbConfig = config.get('dbConfig');
 const dbConnection = {
   client: 'mysql',
   connection: {
     charset: 'utf8',
     timezone: 'UTC',
-    host: db.host,
-    user: db.user,
-    password: db.password,
-    database: db.database,
-    port: db.port,
+    host: host,
+    port: port,
+    user: user,
+    password: password,
+    database: database,
   },
   pool: {
     min: 2,

package/lib/knex/src/http/auth.http

@@ -1,35 +1,32 @@
-# auth API
-
-###
 # baseURL
 @baseURL = http://localhost:3000
 
 ###
-# signup
-POST {{baseURL}}/signup
+# User Signup
+POST {{ baseURL }}/signup
 Content-Type: application/json
 
 {
-    "email": "example@gmail.com",
-	"password": "qwer1234"
+    "email": "example@email.com",
+    "password": "password"
 }
 
 ###
-# Login
-POST {{baseURL}}/login
+# User Login
+POST {{ baseURL }}/login
 Content-Type: application/json
 
 {
-    "email": "lim@gmail.com",
-	"password": "q1w2e3r4"
+    "email": "example@email.com",
+    "password": "password"
 }
 
 ###
-# Logout
-POST {{baseURL}}/logout
+# User Logout
+POST {{ baseURL }}/logout
 Content-Type: application/json
 
 {
-    "email": "lim@gmail.com",
-	"password": "q1w2e3r4"
+    "email": "example@email.com",
+    "password": "password"
 }

package/lib/knex/src/http/users.http

@@ -1,38 +1,34 @@
-# users API
-
-###
 # baseURL
 @baseURL = http://localhost:3000
 
 ###
 # Find All Users
-GET {{baseURL}}/users
+GET {{ baseURL }}/users
 
 ###
 # Find User By Id
-GET {{baseURL}}/users/1
-
+GET {{ baseURL }}/users/1
 
 ###
-# Add User
-POST {{baseURL}}/users
+# Create User
+POST {{ baseURL }}/users
 Content-Type: application/json
 
 {
-    "email": "example@gmail.com",
-	"password": "qwer1234"
+    "email": "example@email.com",
+    "password": "password"
 }
 
 ###
-# Edit User By Id
-PUT {{baseURL}}/users/1
+# Modify User By Id
+PUT {{ baseURL }}/users/1
 Content-Type: application/json
 
 {
-    "email": "example@gmail.com",
-	"password": "qwer1234"
+    "email": "example@email.com",
+    "password": "password"
 }
 
 ###
-# Del User By Id
-DELETE {{baseURL}}/users/1
+# Delete User By Id
+DELETE {{ baseURL }}/users/1

package/lib/knex/src/index.ts

@@ -0,0 +1 @@
+process.env['NODE_CONFIG_DIR'] = __dirname + '/configs';

package/lib/knex/src/middlewares/auth.middleware.ts

@@ -1,18 +1,18 @@
 import config from 'config';
 import { NextFunction, Response } from 'express';
-import jwt from 'jsonwebtoken';
+import { verify } from 'jsonwebtoken';
 import { HttpException } from '@exceptions/HttpException';
 import { DataStoredInToken, RequestWithUser } from '@interfaces/auth.interface';
-import { User } from '@/interfaces/users.interface';
+import { User } from '@interfaces/users.interface';
 import { Users } from '@models/users.model';
 
 const authMiddleware = async (req: RequestWithUser, res: Response, next: NextFunction) => {
   try {
-    const Authorization = req.cookies['Authorization'] || req.header('Authorization').split('Bearer ')[1] || null;
+    const Authorization = req.cookies['Authorization'] || (req.header('Authorization') ? req.header('Authorization').split('Bearer ')[1] : null);
 
     if (Authorization) {
       const secretKey: string = config.get('secretKey');
-      const verificationResponse = (await jwt.verify(Authorization, secretKey)) as DataStoredInToken;
+      const verificationResponse = (await verify(Authorization, secretKey)) as DataStoredInToken;
       const userId = verificationResponse.id;
       const findUser: User = await Users.query().findById(userId);
 

package/lib/knex/src/server.ts

@@ -1,6 +1,5 @@
-process.env['NODE_CONFIG_DIR'] = __dirname + '/configs';
-
 import 'dotenv/config';
+import '@/index';
 import App from '@/app';
 import AuthRoute from '@routes/auth.route';
 import IndexRoute from '@routes/index.route';

package/lib/knex/src/services/auth.service.ts

@@ -1,6 +1,6 @@
-import bcrypt from 'bcrypt';
+import { hash, compare } from 'bcrypt';
 import config from 'config';
-import jwt from 'jsonwebtoken';
+import { sign } from 'jsonwebtoken';
 import { CreateUserDto } from '@dtos/users.dto';
 import { HttpException } from '@exceptions/HttpException';
 import { DataStoredInToken, TokenData } from '@interfaces/auth.interface';
@@ -15,7 +15,7 @@ class AuthService {
     const findUser: Users = await Users.query().select().from('users').where('email', '=', userData.email).first();
     if (findUser) throw new HttpException(409, `You're email ${userData.email} already exists`);
 
-    const hashedPassword = await bcrypt.hash(userData.password, 10);
+    const hashedPassword = await hash(userData.password, 10);
     const createUserData: User = await Users.query()
       .insert({ ...userData, password: hashedPassword })
       .into('users');
@@ -29,7 +29,7 @@ class AuthService {
     const findUser: User = await Users.query().select().from('users').where('email', '=', userData.email).first();
     if (!findUser) throw new HttpException(409, `You're email ${userData.email} not found`);
 
-    const isPasswordMatching: boolean = await bcrypt.compare(userData.password, findUser.password);
+    const isPasswordMatching: boolean = await compare(userData.password, findUser.password);
     if (!isPasswordMatching) throw new HttpException(409, "You're password not matching");
 
     const tokenData = this.createToken(findUser);
@@ -58,7 +58,7 @@ class AuthService {
     const secretKey: string = config.get('secretKey');
     const expiresIn: number = 60 * 60;
 
-    return { expiresIn, token: jwt.sign(dataStoredInToken, secretKey, { expiresIn }) };
+    return { expiresIn, token: sign(dataStoredInToken, secretKey, { expiresIn }) };
   }
 
   public createCookie(tokenData: TokenData): string {

package/lib/knex/src/services/users.service.ts

@@ -1,4 +1,4 @@
-import bcrypt from 'bcrypt';
+import { hash } from 'bcrypt';
 import { CreateUserDto } from '@dtos/users.dto';
 import { HttpException } from '@exceptions/HttpException';
 import { User } from '@interfaces/users.interface';
@@ -24,7 +24,7 @@ class UserService {
     const findUser: User = await Users.query().select().from('users').where('email', '=', userData.email).first();
     if (findUser) throw new HttpException(409, `You're email ${userData.email} already exists`);
 
-    const hashedPassword = await bcrypt.hash(userData.password, 10);
+    const hashedPassword = await hash(userData.password, 10);
     const createUserData: User = await Users.query()
       .insert({ ...userData, password: hashedPassword })
       .into('users');
@@ -38,7 +38,7 @@ class UserService {
     const findUser: User[] = await Users.query().select().from('users').where('id', '=', userId);
     if (!findUser) throw new HttpException(409, "You're not user");
 
-    const hashedPassword = await bcrypt.hash(userData.password, 10);
+    const hashedPassword = await hash(userData.password, 10);
     await Users.query()
       .update({ ...userData, password: hashedPassword })
       .where('id', '=', userId)

package/lib/knex/src/tests/auth.test.ts

@@ -1,7 +1,7 @@
 import request from 'supertest';
 import App from '@/app';
-import { CreateUserDto } from '@/dtos/users.dto';
-import AuthRoute from '@/routes/auth.route';
+import { CreateUserDto } from '@dtos/users.dto';
+import AuthRoute from '@routes/auth.route';
 
 afterAll(async () => {
   await new Promise<void>(resolve => setTimeout(() => resolve(), 500));

package/lib/knex/src/tests/index.test.ts

@@ -1,6 +1,6 @@
 import request from 'supertest';
 import App from '@/app';
-import IndexRoute from '@/routes/index.route';
+import IndexRoute from '@routes/index.route';
 
 afterAll(async () => {
   await new Promise<void>(resolve => setTimeout(() => resolve(), 500));

package/lib/knex/src/tests/users.test.ts

@@ -1,7 +1,7 @@
 import request from 'supertest';
 import App from '@/app';
-import { CreateUserDto } from '@/dtos/users.dto';
-import UserRoute from '@/routes/users.route';
+import { CreateUserDto } from '@dtos/users.dto';
+import UserRoute from '@routes/users.route';
 
 afterAll(async () => {
   await new Promise<void>(resolve => setTimeout(() => resolve(), 500));

package/lib/knex/src/utils/logger.ts

@@ -1,14 +1,14 @@
 import config from 'config';
-import fs from 'fs';
-import path from 'path';
+import { existsSync, mkdirSync } from 'fs';
+import { join } from 'path';
 import winston from 'winston';
 import winstonDaily from 'winston-daily-rotate-file';
 
 // logs dir
-const logDir: string = path.join(__dirname, config.get('log.dir'));
+const logDir: string = join(__dirname, config.get('log.dir'));
 
-if (!fs.existsSync(logDir)) {
-  fs.mkdirSync(logDir);
+if (!existsSync(logDir)) {
+  mkdirSync(logDir);
 }
 
 // Define log format

package/lib/knex/src/utils/util.ts

@@ -9,7 +9,7 @@ export const isEmpty = (value: string | number | object): boolean => {
     return true;
   } else if (typeof value !== 'number' && value === '') {
     return true;
-  } else if (value === 'undefined' || value === undefined) {
+  } else if (typeof value === 'undefined' || value === undefined) {
     return true;
   } else if (value !== null && typeof value === 'object' && !Object.keys(value).length) {
     return true;

package/lib/knex/tsconfig.json

@@ -13,7 +13,7 @@
     "pretty": true,
     "sourceMap": true,
     "declaration": true,
-    "outDir": "./dist",
+    "outDir": "dist",
     "allowJs": true,
     "noEmit": false,
     "esModuleInterop": true,
@@ -35,5 +35,5 @@
     }
   },
   "include": ["src/**/*.ts", "src/**/*.json", ".env"],
-  "exclude": ["node_modules"]
+  "exclude": ["node_modules", "src/http", "src/logs", "src/tests"]
 }

package/lib/mongoose/.swcrc

@@ -0,0 +1,39 @@
+{
+  "jsc": {
+    "parser": {
+      "syntax": "typescript",
+      "tsx": false,
+      "dynamicImport": true,
+      "decorators": true
+    },
+    "transform": {
+      "legacyDecorator": true,
+      "decoratorMetadata": true
+    },
+    "target": "es2017",
+    "externalHelpers": false,
+    "keepClassNames": true,
+    "loose": false,
+    "minify": {
+      "compress": false,
+      "mangle": false
+    },
+    "baseUrl": "src",
+    "paths": {
+      "@/*": ["*"],
+      "@controllers/*": ["controllers/*"],
+      "@databases": ["databases"],
+      "@dtos/*": ["dtos/*"],
+      "@exceptions/*": ["exceptions/*"],
+      "@interfaces/*": ["interfaces/*"],
+      "@middlewares/*": ["middlewares/*"],
+      "@models/*": ["models/*"],
+      "@routes/*": ["routes/*"],
+      "@services/*": ["services/*"],
+      "@utils/*": ["utils/*"]
+    }
+  },
+  "module": {
+    "type": "commonjs"
+  }
+}

package/lib/mongoose/Dockerfile

@@ -9,7 +9,7 @@ RUN npm install
 
 EXPOSE 3000
 
-# Dvelopment build stage
+# Development build stage
 FROM common-build-stage as development-build-stage
 
 ENV NODE_ENV development

package/lib/mongoose/docker-compose.yml

@@ -19,10 +19,6 @@ services:
     container_name: server
     ports:
       - '3000:3000'
-    environment:
-      MONGO_HOST: mongo
-      MONGO_PORT: 27017
-      MONGO_DATABASE: mongoose
     volumes:
       - ./:/app
       - /app/node_modules