.gitmodules

@@ -1,6 +1,3 @@
 [submodule "packages/ts-common"]
 	path = packages/ts-common
 	url = https://git.cubetiqs.com/CUBETIQ/ts-common.git
-[submodule "packages/cubetiq-express-server"]
-	path = packages/cubetiq-express-server
-	url = https://git.cubetiqs.com/CUBETIQ/cubetiq-express-server.git

README.md

@@ -136,4 +136,4 @@ export const controllers = [IndexController, PersonController, HomeController]
 
 ### Contributors
 
--   Sambo Chea <sombochea@cubetiqs.com> [4099C19544D3FF79]
+-   Sambo Chea <sombochea@cubetiqs.com>

package.json

@@ -18,8 +18,7 @@
     },
     "keywords": [
         "Express",
-        "Nodejs",
+        "Nodejs"
-        "Typescript"
     ],
     "author": "Sambo Chea <sombochea@cubetiqs.com>",
     "license": "ISC",
@@ -42,8 +41,8 @@
     },
     "dependencies": {
         "@cubetiq/ts-common": "1.0.0",
-        "@cubetiq/express-server": "1.0.0",
+        "express": "^4.17.1",
-        "express": "^4.17.1"
+        "reflect-metadata": "^0.1.13"
     },
     "lint-staged": {
         "**/*": "prettier --write --ignore-unknown"

packages/cubetiq-express-server

@@ -1 +0,0 @@
-Subproject commit 558626d0e4d955d0b702365b507d2697ef83196d

packages/ts-common

@@ -1 +1 @@
-Subproject commit d011f4547ebe4f1b36dc12fbb06b626e7345dc65
+Subproject commit c42964407eaa35f0beea28926d234f74678b6cfc

src/app.ts

@@ -1,28 +1,8 @@
 // app config
 import "./dotenv"
 
-import { createServer } from "http"
+// reflection metadata for decorator
-import { SERVER_PORT } from "./app.config"
+import "reflect-metadata"
-import { info } from "@cubetiq/ts-common/dist/log"
-import application from "./server"
 
-// get current host id
+// core app
-const hostId = `${require("os").hostname()}#${process.pid}`
+import "./server"
-const startedAt = new Date()
-
-const app = application.instance
-const httpServer = createServer(app)
-
-info(
-    `Application server running on: ${hostId} at port: ${SERVER_PORT} and started at: ${startedAt}`
-)
-httpServer.listen(SERVER_PORT)
-
-app.get("/info", (req, res) => {
-    res.type("json")
-    res.send({
-        startedAt,
-        message: `Instance id: ${hostId}`,
-        status: "OK",
-    })
-})

src/application.ts

@@ -0,0 +1,54 @@
+import express, { Application as ExpressApp, Handler } from "express"
+import { controllers } from "./controller"
+import { RouteHandler } from "./decorators/handlers.decorator"
+import { MetadataKeys } from "./constants/metadata.keys"
+
+class Application {
+    private readonly _instance: ExpressApp
+
+    get instance(): ExpressApp {
+        return this._instance
+    }
+
+    constructor() {
+        this._instance = express()
+        this._instance.use(express.json())
+        this._instance.use(express.urlencoded({ extended: false }))
+        this.registerRoutes()
+    }
+
+    private registerRoutes(): void {
+        const info: Array<{ api: string; handler: string }> = []
+
+        controllers.forEach((controller) => {
+            const controllerInstance: { [handlerName: string]: Handler } =
+                new controller() as any
+            const basePath: string = Reflect.getMetadata(
+                MetadataKeys.BASE_PATH,
+                controller
+            )
+            const routers: RouteHandler[] = Reflect.getMetadata(
+                MetadataKeys.ROUTERS,
+                controller
+            )
+            const exRouter = express.Router()
+
+            routers.forEach(({ method, path, handlerName }) => {
+                exRouter[method](
+                    path,
+                    controllerInstance[String(handlerName)]
+                ).bind(controllerInstance)
+                info.push({
+                    api: `${method.toLocaleUpperCase()} ${basePath + path}`,
+                    handler: `${controller.name}.${String(handlerName)}`,
+                })
+            })
+
+            this._instance.use(basePath, exRouter)
+        })
+
+        console.table(info)
+    }
+}
+
+export default new Application()

src/constants/metadata.keys.ts

@@ -0,0 +1,4 @@
+export enum MetadataKeys {
+    BASE_PATH = "base_path",
+    ROUTERS = "routers",
+}

src/controller/index.controller.ts

@@ -1,5 +1,5 @@
 import { Request, Response } from "express"
-import { Controller, Get } from "@cubetiq/express-server/dist/decorators"
+import { Controller, Get } from "../decorators"
 
 @Controller("/hello")
 export default class IndexController {

src/controller/person.controller.ts

@@ -1,10 +1,5 @@
 import { Request, Response } from "express"
-import {
+import { Controller, Delete, Get, Post } from "../decorators"
-    Controller,
-    Delete,
-    Get,
-    Post,
-} from "@cubetiq/express-server/dist/decorators"
 
 const persons: Array<any> = [
     {

src/decorators/controller.decorator.ts

@@ -0,0 +1,7 @@
+import { MetadataKeys } from "../constants/metadata.keys"
+
+export const Controller = (basePath: string): ClassDecorator => {
+    return (target: any) => {
+        Reflect.defineMetadata(MetadataKeys.BASE_PATH, basePath, target)
+    }
+}

src/decorators/handlers.decorator.ts

@@ -0,0 +1,47 @@
+import { MetadataKeys } from "../constants/metadata.keys"
+
+export enum Method {
+    GET = "get",
+    POST = "post",
+    PUT = "put",
+    DELETE = "delete",
+    PATCH = "patch",
+}
+
+export interface RouteHandler {
+    method: Method
+    path: string
+    handlerName: string | symbol
+}
+
+const methodDecoratorFactory = (method: Method) => {
+    return (path: string = ""): MethodDecorator => {
+        return (target: any, propertyKey: string | symbol): void => {
+            const controllerClass = target.constructor
+            const routers: RouteHandler[] = Reflect.hasMetadata(
+                MetadataKeys.ROUTERS,
+                controllerClass
+            )
+                ? Reflect.getMetadata(MetadataKeys.ROUTERS, controllerClass)
+                : []
+
+            routers.push({
+                method,
+                path,
+                handlerName: propertyKey,
+            })
+
+            Reflect.defineMetadata(
+                MetadataKeys.ROUTERS,
+                routers,
+                controllerClass
+            )
+        }
+    }
+}
+
+export const Get = methodDecoratorFactory(Method.GET)
+export const Post = methodDecoratorFactory(Method.POST)
+export const Put = methodDecoratorFactory(Method.PUT)
+export const Delete = methodDecoratorFactory(Method.DELETE)
+export const Patch = methodDecoratorFactory(Method.PATCH)

src/decorators/index.ts

@@ -0,0 +1,2 @@
+export * from "./controller.decorator"
+export * from "./handlers.decorator"

src/server.ts

@@ -1,9 +1,25 @@
-import Application from "@cubetiq/express-server/dist"
+import { createServer } from "http"
-import { controllers as AllControllers } from "./controller"
+import { SERVER_PORT } from "./app.config"
-class Server extends Application {
+import { info } from "@cubetiq/ts-common/dist/log"
-    get controllers(): any[] {
+import application from "./application"
-        return AllControllers
-    }
-}
 
-export default new Server()
+// get current host id
+const hostId = `${require("os").hostname()}#${process.pid}`
+const startedAt = new Date()
+
+const app = application.instance
+const httpServer = createServer(app)
+
+info(
+    `Application server running on: ${hostId} at port: ${SERVER_PORT} and started at: ${startedAt}`
+)
+httpServer.listen(SERVER_PORT)
+
+app.get("/info", (req, res) => {
+    res.type("json")
+    res.send({
+        startedAt,
+        message: `Instance id: ${hostId}`,
+        status: "OK",
+    })
+})