typescript-express-starter 6.0.0 → 6.3.0

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

@@ -1,6 +1,6 @@
-import bcrypt from 'bcrypt';
+import { compare, hash } from 'bcrypt';
 import config from 'config';
-import jwt from 'jsonwebtoken';
+import { sign } from 'jsonwebtoken';
 import DB from '@databases';
 import { CreateUserDto } from '@dtos/users.dto';
 import { HttpException } from '@exceptions/HttpException';
@@ -17,7 +17,7 @@ class AuthService {
     const findUser: User = await this.users.findOne({ where: { email: userData.email } });
     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 this.users.create({ ...userData, password: hashedPassword });
 
     return createUserData;
@@ -29,7 +29,7 @@ class AuthService {
     const findUser: User = await this.users.findOne({ where: { email: userData.email } });
     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);
@@ -52,7 +52,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/sequelize/src/services/users.service.ts

@@ -1,4 +1,4 @@
-import bcrypt from 'bcrypt';
+import { hash } from 'bcrypt';
 import DB from '@databases';
 import { CreateUserDto } from '@dtos/users.dto';
 import { HttpException } from '@exceptions/HttpException';
@@ -28,7 +28,7 @@ class UserService {
     const findUser: User = await this.users.findOne({ where: { email: userData.email } });
     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 this.users.create({ ...userData, password: hashedPassword });
     return createUserData;
   }
@@ -39,7 +39,7 @@ class UserService {
     const findUser: User = await this.users.findByPk(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 this.users.update({ ...userData, password: hashedPassword }, { where: { id: userId } });
 
     const updateUser: User = await this.users.findByPk(userId);

package/lib/sequelize/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/sequelize/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/sequelize/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/starter.js

@@ -1,7 +1,8 @@
 /*****************************************************************
- * Create new typescript-express-starter project.
- * By AGUMON <ljlm0402@gmail.com>
- * December 18, 2019.
+ * Create Typescript Express Starter
+ * 2019.12.18 ~ 🎮
+ * Made By AGUMON 🦖
+ * https://github.com/ljlm0402/typescript-express-starter
  *****************************************************************/
 
 const chalk = require("chalk");
@@ -44,14 +45,11 @@ const createProject = async (projectName) => {
     spinner = ora();
     spinner.start();
 
-    // manage node_modules
     await installNodeModules(projectName, spinner);
     isUpdated && (await updateNodeModules(projectName, spinner));
     isDeduped && (await dedupeNodeModules(projectName, spinner));
-
     await postInstallScripts(projectName, template, spinner);
 
-    // set gitignore
     await createGitignore(projectName, spinner);
     await initGit(projectName);
 
@@ -153,7 +151,7 @@ const updatePackageJson = async (destination) => {
  */
 const installNodeModules = async (destination, spinner) => {
   spinner.text = "Install node_modules...\n";
-  await asyncExec("npm install", { cwd: destination });
+  await asyncExec("npm install --legacy-peer-deps", { cwd: destination });
 };
 
 /**
@@ -162,7 +160,7 @@ const installNodeModules = async (destination, spinner) => {
  */
 const updateNodeModules = async (destination, spinner) => {
   spinner.text = "Update node_modules...\n";
-  await asyncExec("npm update", { cwd: destination });
+  await asyncExec("npm update --legacy-peer-deps", { cwd: destination });
 };
 
 /**
@@ -171,7 +169,7 @@ const updateNodeModules = async (destination, spinner) => {
  */
 const dedupeNodeModules = async (destination, spinner) => {
   spinner.text = "Dedupe node_modules...\n";
-  await asyncExec("npm dedupe", { cwd: destination });
+  await asyncExec("npm dedupe --legacy-peer-deps", { cwd: destination });
 };
 
 /**
@@ -183,9 +181,7 @@ const postInstallScripts = async (destination, template, spinner) => {
     case "prisma":
       {
         spinner.text = "Run prisma generate...";
-        await asyncExec("./node_modules/.bin/prisma generate", {
-          cwd: destination,
-        });
+        await asyncExec("npm run prisma:generate", { cwd: destination });
       }
       break;
   }

package/lib/typeorm/.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/*"],
+      "@entities/*": ["entities/*"],
+      "@exceptions/*": ["exceptions/*"],
+      "@interfaces/*": ["interfaces/*"],
+      "@middlewares/*": ["middlewares/*"],
+      "@routes/*": ["routes/*"],
+      "@services/*": ["services/*"],
+      "@utils/*": ["utils/*"]
+    }
+  },
+  "module": {
+    "type": "commonjs"
+  }
+}

package/lib/typeorm/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/typeorm/docker-compose.yml

@@ -35,7 +35,7 @@ services:
     environment:
       POSTGRESQL_USERNAME: root
       POSTGRESQL_PASSWORD: password
-      POSTGRESQL_DATABASE: typeorm
+      POSTGRESQL_DATABASE: test
     ports:
       - '5432:5432'
     networks:

package/lib/typeorm/ecosystem.config.js

@@ -1,42 +1,57 @@
-module.exports = {
+/**
+ * @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: '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',
+      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: 'development',
+        NODE_ENV: 'production',
       },
-      // production mode
-      // pm2 start ecosystem.config.js --env production
-      env_production: {
-        HOST: '0.0.0.0',
+    },
+    {
+      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: 'production',
+        NODE_ENV: 'development',
       },
-      output: './logs/console.log',
-      error: './logs/consoleError.log',
     },
   ],
-
   deploy: {
     production: {
-      // sample
-      user: 'node',
-      host: '123.12.123.1',
+      user: 'user',
+      host: '0.0.0.0',
       ref: 'origin/master',
       repo: 'git@github.com:repo.git',
-      path: '/var/www/production',
-      'post-deploy': 'npm install && pm2 reload ecosystem.config.js --env production',
+      path: 'dist/server.js',
+      'post-deploy': 'npm install && npm run build && pm2 reload ecosystem.config.js --only prod',
     },
   },
 };

package/lib/typeorm/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/typeorm/package.json

@@ -7,10 +7,13 @@
   "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"
+    "lint:fix": "npm run lint -- --fix",
+    "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",
@@ -20,27 +23,24 @@
     "config": "^3.3.6",
     "cookie-parser": "^1.4.5",
     "cors": "^2.8.5",
-    "cross-env": "^7.0.3",
     "dotenv": "^10.0.0",
     "envalid": "^7.1.0",
     "express": "^4.17.1",
     "helmet": "^4.6.0",
     "hpp": "^0.2.3",
-    "jest": "^27.0.6",
     "jsonwebtoken": "^8.5.1",
     "morgan": "^1.10.0",
     "pg": "^8.6.0",
     "reflect-metadata": "^0.1.13",
     "swagger-jsdoc": "^6.0.0",
     "swagger-ui-express": "^4.1.6",
-    "ts-jest": "^27.0.3",
-    "ts-node": "^10.0.0",
     "typeorm": "^0.2.34",
-    "typescript": "^4.3.5",
     "winston": "^3.3.3",
     "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.1",
     "@types/config": "^0.0.39",
@@ -60,16 +60,23 @@
     "@types/winston": "^2.4.4",
     "@typescript-eslint/eslint-plugin": "^4.28.2",
     "@typescript-eslint/parser": "^4.28.2",
+    "cross-env": "^7.0.3",
     "eslint": "^7.30.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^3.4.0",
     "husky": "^7.0.1",
+    "jest": "^27.0.6",
     "lint-staged": "^11.0.0",
     "node-config": "^0.0.2",
     "node-gyp": "^8.1.0",
     "nodemon": "^2.0.9",
+    "pm2": "^5.1.0",
     "prettier": "^2.3.2",
     "supertest": "^6.1.3",
-    "tsconfig-paths": "^3.10.1"
+    "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/typeorm/src/app.ts

@@ -1,6 +1,5 @@
-process.env['NODE_CONFIG_DIR'] = __dirname + '/configs';
-
 import 'reflect-metadata';
+import '@/index';
 import cookieParser from 'cookie-parser';
 import cors from 'cors';
 import config from 'config';

package/lib/typeorm/src/configs/development.json

@@ -4,7 +4,7 @@
         "host": "localhost",
         "user": "root",
         "password": "password",
-        "database": "typeorm"
+        "database": "test"
     },
     "secretKey": "secretKey",
     "log": {

package/lib/typeorm/src/configs/production.json

@@ -4,7 +4,7 @@
         "host": "localhost",
         "user": "root",
         "password": "password",
-        "database": "typeorm"
+        "database": "test"
     },
     "secretKey": "secretKey",
     "log": {

package/lib/typeorm/src/configs/test.json

@@ -4,7 +4,7 @@
         "host": "localhost",
         "user": "root",
         "password": "password",
-        "database": "typeorm"
+        "database": "test"
     },
     "secretKey": "secretKey",
     "log": {

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

@@ -1,5 +1,5 @@
 import config from 'config';
-import path from 'path';
+import { join } from 'path';
 import { ConnectionOptions } from 'typeorm';
 import { dbConfig } from '@interfaces/db.interface';
 
@@ -13,11 +13,11 @@ export const dbConnection: ConnectionOptions = {
   database: database,
   synchronize: true,
   logging: false,
-  entities: [path.join(__dirname, '../**/*.entity{.ts,.js}')],
-  migrations: [path.join(__dirname, '../**/*.migration{.ts,.js}')],
-  subscribers: [path.join(__dirname, '../**/*.subscriber{.ts,.js}')],
+  entities: [join(__dirname, '../**/*.entity{.ts,.js}')],
+  migrations: [join(__dirname, '../**/*.migration{.ts,.js}')],
+  subscribers: [join(__dirname, '../**/*.subscriber{.ts,.js}')],
   cli: {
-    entitiesDir: 'src/entity',
+    entitiesDir: 'src/entities',
     migrationsDir: 'src/migration',
     subscribersDir: 'src/subscriber',
   },

package/lib/typeorm/src/{entity → entities}/users.entity.ts

@@ -1,15 +1,15 @@
 import { IsNotEmpty } from 'class-validator';
-import { Entity, PrimaryGeneratedColumn, Column, Unique, CreateDateColumn, UpdateDateColumn } from 'typeorm';
+import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, Unique, CreateDateColumn, UpdateDateColumn } from 'typeorm';
 import { User } from '@interfaces/users.interface';
 
 @Entity()
-@Unique(['email'])
-export class UserEntity implements User {
+export class UserEntity extends BaseEntity implements User {
   @PrimaryGeneratedColumn()
   id: number;
 
   @Column()
   @IsNotEmpty()
+  @Unique(['email'])
   email: string;
 
   @Column()

package/lib/typeorm/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/typeorm/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/typeorm/src/index.ts

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

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

@@ -1,22 +1,18 @@
 import config from 'config';
 import { NextFunction, Response } from 'express';
-import jwt from 'jsonwebtoken';
-import { getRepository } from 'typeorm';
-import { UserEntity } from '@entity/users.entity';
+import { verify } from 'jsonwebtoken';
+import { UserEntity } from '@entities/users.entity';
 import { HttpException } from '@exceptions/HttpException';
 import { DataStoredInToken, RequestWithUser } from '@interfaces/auth.interface';
 
 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 userId = verificationResponse.id;
-
-      const userRepository = getRepository(UserEntity);
-      const findUser = await userRepository.findOne(userId, { select: ['id', 'email', 'password'] });
+      const { id } = (await verify(Authorization, secretKey)) as DataStoredInToken;
+      const findUser = await UserEntity.findOne(id, { select: ['id', 'email', 'password'] });
 
       if (findUser) {
         req.user = findUser;

package/lib/typeorm/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';