From c639a51f8e9a05f908a7894b446a87d1d28287b3 Mon Sep 17 00:00:00 2001
From: srgooglo <srgooglo@ragestudio.net>
Date: Fri, 6 May 2022 14:26:33 +0200
Subject: [PATCH] move to lib

---
 src/client/bridge.js                                     | 9 ++++-----
 src/client/index.js                                      | 2 --
 .../generateHTTPRequestDispatcher/index.js}              | 6 ++++--
 .../generateWSRequestDispatcher/index.js}                | 6 ++++--
 src/client/lib/index.js                                  | 4 ++++
 5 files changed, 16 insertions(+), 11 deletions(-)
 rename src/client/{generateRequestDispatcher.js => lib/generateHTTPRequestDispatcher/index.js} (90%)
 rename src/client/{generateWSRequestDispatcher.js => lib/generateWSRequestDispatcher/index.js} (78%)
 create mode 100644 src/client/lib/index.js

diff --git a/src/client/bridge.js b/src/client/bridge.js
index 842a343..b4cac19 100644
--- a/src/client/bridge.js
+++ b/src/client/bridge.js
@@ -1,9 +1,8 @@
 const axios = require("axios")
-const WSInterface = require("../classes/ClientWSInterface")
 const camalize = require("@corenode/utils/dist/camalize").default
 
-const generateRequestDispatcher = require("./generateRequestDispatcher")
-const generateWSRequestDispatcher = require("./generateWSRequestDispatcher")
+const { WSInterface } = require("./classes")
+const { generateHTTPRequestDispatcher, generateWSRequestDispatcher } = require("./lib")
 
 const FixedMethods = {
     "del": "delete"
@@ -18,7 +17,7 @@ module.exports = class Bridge {
         this.events = events
 
         this.origin = this.params.origin
-        this.headers = { 
+        this.headers = {
             ...DefaultHeaders,
             ...this.params.headers,
         }
@@ -127,7 +126,7 @@ module.exports = class Bridge {
                     nameKey = "index"
                 }
 
-                this.endpoints[fixedMethod][nameKey] = generateRequestDispatcher(
+                this.endpoints[fixedMethod][nameKey] = generateHTTPRequestDispatcher(
                     this.httpInterface,
                     fixedMethod,
                     route,
diff --git a/src/client/index.js b/src/client/index.js
index 7df6fee..38a59ed 100755
--- a/src/client/index.js
+++ b/src/client/index.js
@@ -1,9 +1,7 @@
 const Controller = require("./controller")
 const Bridge = require("./bridge")
-const generateRequestDispatcher = require("./generateRequestDispatcher")
 
 module.exports = {
     Bridge,
     Controller,
-    generateRequestDispatcher,
 }
\ No newline at end of file
diff --git a/src/client/generateRequestDispatcher.js b/src/client/lib/generateHTTPRequestDispatcher/index.js
similarity index 90%
rename from src/client/generateRequestDispatcher.js
rename to src/client/lib/generateHTTPRequestDispatcher/index.js
index 111d1d0..1ddafa2 100644
--- a/src/client/generateRequestDispatcher.js
+++ b/src/client/lib/generateHTTPRequestDispatcher/index.js
@@ -1,4 +1,4 @@
-module.exports = function generateRequestDispatcher(instance, method, route, handleRequestContext, handleResponse) {
+function generateHTTPRequestDispatcher(instance, method, route, handleRequestContext, handleResponse) {
     return function (body, query, options) {
         return new Promise(async (resolve, reject) => {
             let requestParams = {
@@ -47,4 +47,6 @@ module.exports = function generateRequestDispatcher(instance, method, route, han
             return resolve(result)
         })
     }
-}
\ No newline at end of file
+}
+
+module.exports = generateHTTPRequestDispatcher
\ No newline at end of file
diff --git a/src/client/generateWSRequestDispatcher.js b/src/client/lib/generateWSRequestDispatcher/index.js
similarity index 78%
rename from src/client/generateWSRequestDispatcher.js
rename to src/client/lib/generateWSRequestDispatcher/index.js
index e0f47fb..3188735 100644
--- a/src/client/generateWSRequestDispatcher.js
+++ b/src/client/lib/generateWSRequestDispatcher/index.js
@@ -1,4 +1,4 @@
-module.exports = function generateWSRequestDispatcher(instance, channel) {
+function generateWSRequestDispatcher(instance, channel) {
     return function (...payload) {
         return new Promise(async (resolve, reject) => {
             const req = instance.emit(channel, ...payload)
@@ -12,4 +12,6 @@ module.exports = function generateWSRequestDispatcher(instance, channel) {
             })
         })
     }
-}
\ No newline at end of file
+}
+
+module.exports = generateWSRequestDispatcher
\ No newline at end of file
diff --git a/src/client/lib/index.js b/src/client/lib/index.js
new file mode 100644
index 0000000..13273a8
--- /dev/null
+++ b/src/client/lib/index.js
@@ -0,0 +1,4 @@
+module.exports = {
+    generateHTTPRequestDispatcher: require("./generateHTTPRequestDispatcher"),
+    generateWSRequestDispatcher: require("./generateWSRequestDispatcher"),
+}
\ No newline at end of file