From 37e60153a93c5316c55edc2f2a596158af75702f Mon Sep 17 00:00:00 2001
From: srgooglo <srgooglo@ragestudio.net>
Date: Wed, 28 Jul 2021 09:45:37 +0200
Subject: [PATCH] refactor map generator

---
 bin/server.js       |  3 ---
 src/client/index.js |  4 +++-
 src/server/index.js | 34 ++++++++++------------------------
 3 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/bin/server.js b/bin/server.js
index e8f839f..4b87a39 100644
--- a/bin/server.js
+++ b/bin/server.js
@@ -5,7 +5,4 @@ const random = require("corenode/dist/libs/random")
 new cloudlink.Server({
     autoInit: true,
     id: runtime.args.id ?? random.generateName(),
-})
-
-new cloudlink.Client.createInterface("http://localhost:3010").then((client) => {
 })
\ No newline at end of file
diff --git a/src/client/index.js b/src/client/index.js
index 750de25..2e8a7ee 100644
--- a/src/client/index.js
+++ b/src/client/index.js
@@ -115,11 +115,13 @@ async function createInterface(address, getContext) {
 
     Object.keys(map).forEach((method) => {
         method = method.toLowerCase()
+
         if (typeof objects[method] !== "object") {
             objects[method] = Object()
         }
 
-        Object.keys(map[method]).forEach((route) => {
+        map[method].forEach((endpoint) => {
+            const route = endpoint.route
             const tree = route.split("/")
             const hasTree = tree.length >= 1
             let nameKey = route
diff --git a/src/server/index.js b/src/server/index.js
index 64fcda2..1112427 100644
--- a/src/server/index.js
+++ b/src/server/index.js
@@ -40,10 +40,9 @@ class Server {
         }
 
         //* set params jails
-        this.routes = []
         this.endpoints = {}
         this.serverMiddlewares = [...this.params.serverMiddlewares ?? [], ...defaultMiddlewares]
-        this.middlewares = { ...this.params.middlewares }
+        this.middlewares = { ...this.params.middlewares, ...middlewares }
         this.controllers = { ...this.params.controllers }
         this.headers = { ...defaultHeaders, ...this.params.headers }
 
@@ -94,15 +93,14 @@ class Server {
         if (typeof endpoint.controller === "function") {
             endpoint.controller = new classes.Controller(endpoint.route, endpoint.controller)
         }
-        
+
         endpoint.method = endpoint.method.toLowerCase()
 
-        if (typeof this.endpoints[endpoint.method] !== "object") {
+        if (typeof this.endpoints[endpoint.method] === "undefined") {
             this.endpoints[endpoint.method] = Object()
         }
 
         this.endpoints[endpoint.method][endpoint.route] = endpoint
-        this.routes.push(endpoint.route)
 
         const routeModel = [endpoint.route]
 
@@ -177,21 +175,6 @@ class Server {
             }
         })
 
-        this.registerEndpoint({
-            method: "PUT",
-            route: "/session",
-            controller: (req, res) => {
-                res.send("bruh")
-            }
-        })
-        this.registerEndpoint({
-            method: "DELETE",
-            route: "/session",
-            controller: (req, res) => {
-                res.send("deleted bruh")
-            }
-        })
-
         this.registerEndpoint({
             method: "get",
             route: "/map",
@@ -199,15 +182,18 @@ class Server {
                 const map = {}
 
                 Object.keys(this.endpoints).forEach((method) => {
-                    if (typeof map[method] !== "object") {
-                        map[method] = Object()
+                    if (typeof map[method] === "undefined") {
+                        map[method] = []
                     }
 
                     Object.keys(this.endpoints[method]).forEach((route) => {
-                        map[method] = route
+                        map[method].push({
+                            route: route,
+                            method: method
+                        })
                     })
                 })
-               
+
                 res.json(map)
             }
         })