Update recordHelper to use undefined instead of null

Update requirement versions
Fix bug in HTTP response parsing
2023-06-18 23:40:51 -04:00 · 2023-06-18 23:21:18 -04:00 · 2023-06-18 22:53:23 -04:00
6 changed files with 199 additions and 1996 deletions
--- a/Client/package-lock.json
+++ b/Client/package-lock.json
--- a/Client/package.json
+++ b/Client/package.json
@@ -17,7 +17,7 @@
    "express": "~4.16.1",
    "http-errors": "~1.6.3",
    "morgan": "~1.9.1",
-    "replace-in-file": "~6.3.5",
+    "replace-in-file": "~7.0.1",
    "@discordjs/builders": "^1.4.0",
    "@discordjs/rest": "^1.4.0",
    "discord.js": "^14.7.1"
--- a/Client/utilities/httpRequests.js
+++ b/Client/utilities/httpRequests.js
@@ -5,11 +5,16 @@ const log = new DebugBuilder("client", "httpRequests");
 require('dotenv').config();
 // Modules
 const http = require("http");
+const { isJsonString } = require("./utilities.js");

 exports.requestOptions = class requestOptions {
-    constructor(path, method, hostname = undefined, headers = undefined, port = undefined) {        
+    constructor(path, method, hostname = undefined, headers = undefined, port = undefined) {
        if (method === "POST"){
-            this.hostname = hostname ?? process.env.SERVER_HOSTNAME ?? process.env.SERVER_IP;
+            log.DEBUG("Hostname Vars: ", hostname, process.env.SERVER_HOSTNAME, process.env.SERVER_IP);
+            if (hostname) this.hostname = hostname;
+            if (process.env.SERVER_HOSTNAME) this.hostname = process.env.SERVER_HOSTNAME;
+            if (process.env.SERVER_IP) this.hostname = process.env.SERVER_IP;
+            if (!this.hostname) throw new Error("No server hostname / IP was given when creating a request");
            this.path = path;
            this.port = port ?? process.env.SERVER_PORT;
            this.method = method;
@@ -31,31 +36,27 @@ exports.sendHttpRequest = function sendHttpRequest(requestOptions, data, callbac
    // Create the request
    const req = http.request(requestOptions, res => {
        res.on('data', (data) => {
-            if (res.statusCode >= 200 && res.statusCode <= 299) {
-                const responseObject = {
-                    "statusCode": res.statusCode,
-                    "body": JSON.parse(data)
-                };
-                log.DEBUG("Response Object: ", responseObject);
-                callback(responseObject);
-            }
-            if (res.statusCode >= 300) {                                
-                const responseObject = {
-                    "statusCode": res.statusCode,
-                    "body": data
-                };
-                log.DEBUG("Response Object: ", responseObject);
-                callback(responseObject);                
-            }
+            log.DEBUG("Response data from new node: ", data);
+            const responseObject = {
+                "statusCode": res.statusCode,
+                "body": (isJsonString(data.toString())) ? JSON.parse(data.toString()) : data.toString()
+            };
+            log.DEBUG("Response Object: ", responseObject);
+            callback(responseObject);
        })
    }).on('error', err => {
-        log.ERROR('Error: ', err.message)
+        if (err.code === "ECONNREFUSED"){
+            // Bot refused connection, assumed offline
+            log.WARN("Connection Refused");
+        }
+        else log.ERROR('Error: ', err.message, err);
+        callback(undefined);
        // TODO need to handle if the server is down
    })

    // Write the data to the request and send it
-    req.write(data)
-    req.end()
+    req.write(data);
+    req.end();
 }

 exports.onHttpError = function onHttpError(httpStatusCode) {
--- a/Server/package-lock.json
+++ b/Server/package-lock.json
@@ -26,7 +26,7 @@
        "jsdoc": "^4.0.2",
        "jsonfile": "^6.1.0",
        "morgan": "^1.10.0",
-        "mysql": "^2.18.1",
+        "mysql2": "^3.3.5",
        "node-html-markdown": "^1.3.0",
        "node-html-parser": "^6.1.5",
        "openai": "^3.2.1",
@@ -489,14 +489,6 @@
      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
    },
-    "node_modules/bignumber.js": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.0.tgz",
-      "integrity": "sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A==",
-      "engines": {
-        "node": "*"
-      }
-    },
    "node_modules/bluebird": {
      "version": "3.7.2",
      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
@@ -736,11 +728,6 @@
      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
    },
-    "node_modules/core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
-    },
    "node_modules/css-select": {
      "version": "5.1.0",
      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
@@ -805,6 +792,14 @@
        "node": ">=0.4.0"
      }
    },
+    "node_modules/denque": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz",
+      "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==",
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
    "node_modules/depd": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -1284,6 +1279,14 @@
      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
    },
+    "node_modules/generate-function": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz",
+      "integrity": "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==",
+      "dependencies": {
+        "is-property": "^1.0.2"
+      }
+    },
    "node_modules/get-intrinsic": {
      "version": "1.2.1",
      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
@@ -1510,10 +1513,10 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
-    "node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+    "node_modules/is-property": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
+      "integrity": "sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g=="
    },
    "node_modules/jake": {
      "version": "10.8.7",
@@ -1662,6 +1665,11 @@
      "resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz",
      "integrity": "sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw=="
    },
+    "node_modules/long": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
+      "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q=="
+    },
    "node_modules/lru-cache": {
      "version": "6.0.0",
      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -1846,24 +1854,69 @@
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
    },
-    "node_modules/mysql": {
-      "version": "2.18.1",
-      "resolved": "https://registry.npmjs.org/mysql/-/mysql-2.18.1.tgz",
-      "integrity": "sha512-Bca+gk2YWmqp2Uf6k5NFEurwY/0td0cpebAucFpY/3jhrwrVGuxU2uQFCHjU19SJfje0yQvi+rVWdq78hR5lig==",
+    "node_modules/mysql2": {
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.3.5.tgz",
+      "integrity": "sha512-ZTQGAzxGeaX1PyeSiZFCgQ34uiXguaEpn3aTFN9Enm9JDnbwWo+4/CJnDdQZ3n0NaMeysi8vwtW/jNUb9VqVDw==",
      "dependencies": {
-        "bignumber.js": "9.0.0",
-        "readable-stream": "2.3.7",
-        "safe-buffer": "5.1.2",
-        "sqlstring": "2.3.1"
+        "denque": "^2.1.0",
+        "generate-function": "^2.3.1",
+        "iconv-lite": "^0.6.3",
+        "long": "^5.2.1",
+        "lru-cache": "^8.0.0",
+        "named-placeholders": "^1.1.3",
+        "seq-queue": "^0.0.5",
+        "sqlstring": "^2.3.2"
      },
+      "engines": {
+        "node": ">= 8.0"
+      }
+    },
+    "node_modules/mysql2/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mysql2/node_modules/lru-cache": {
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-8.0.5.tgz",
+      "integrity": "sha512-MhWWlVnuab1RG5/zMRRcVGXZLCXrZTgfwMikgzCegsPnG62yDQo5JnqKkrK4jO5iKqDAZGItAqN5CtKBCBWRUA==",
+      "engines": {
+        "node": ">=16.14"
+      }
+    },
+    "node_modules/mysql2/node_modules/sqlstring": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.3.tgz",
+      "integrity": "sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==",
      "engines": {
        "node": ">= 0.6"
      }
    },
-    "node_modules/mysql/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    "node_modules/named-placeholders": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.3.tgz",
+      "integrity": "sha512-eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w==",
+      "dependencies": {
+        "lru-cache": "^7.14.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/named-placeholders/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "engines": {
+        "node": ">=12"
+      }
    },
    "node_modules/negotiator": {
      "version": "0.6.3",
@@ -2209,11 +2262,6 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-    },
    "node_modules/proxy-addr": {
      "version": "2.0.7",
      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@@ -2319,25 +2367,6 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
-    "node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/readable-stream/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
    "node_modules/readable-web-to-node-stream": {
      "version": "3.0.2",
      "resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz",
@@ -2475,6 +2504,11 @@
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
    },
+    "node_modules/seq-queue": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/seq-queue/-/seq-queue-0.0.5.tgz",
+      "integrity": "sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q=="
+    },
    "node_modules/serve-static": {
      "version": "1.15.0",
      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
@@ -2546,14 +2580,6 @@
        "node": "*"
      }
    },
-    "node_modules/sqlstring": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz",
-      "integrity": "sha512-ooAzh/7dxIG5+uDik1z/Rd1vli0+38izZhGzSa34FwR7IbelPWCCKSNIl8jlL/F7ERvy8CB2jNeM1E9i9mXMAQ==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
    "node_modules/statuses": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
--- a/Server/utilities/httpRequests.js
+++ b/Server/utilities/httpRequests.js
@@ -40,7 +40,7 @@ exports.sendHttpRequest = function sendHttpRequest(requestOptions, data, callbac
        res.on('data', (data) => {
            const responseObject = {
                "statusCode": res.statusCode,
-                "body": (isJsonString(data.toString)) ? JSON.parse(data) : data.toString()
+                "body": (isJsonString(data.toString())) ? JSON.parse(data.toString()) : data.toString()
            };
            log.DEBUG("Response Object: ", responseObject);
            callback(responseObject);
--- a/Server/utilities/recordHelper.js
+++ b/Server/utilities/recordHelper.js
@@ -112,7 +112,7 @@ class nodeObject {
     * @param {*} param0._online True/False if the node is online or offline 
     * @param {*} param0._nearbySystems An object array of nearby systems     
     */
-    constructor({ _id = null, _name = null, _ip = null, _port = null, _location = null, _nearbySystems = null, _online = null }) {
+    constructor({ _id = undefined, _name = undefined, _ip = undefined, _port = undefined, _location = undefined, _nearbySystems = undefined, _online = undefined }) {
        this.id = _id;
        this.name = _name;        
        this.ip = _ip;
@@ -135,7 +135,7 @@ class clientObject {
     * @param {*} param0._name The name of the bot associated with the IDs
     * @param {*} param0._client_id The client ID of the bot needed to connect to Discord
     */
-    constructor({_discord_id = null, _name = null, _client_id = null,}) {
+    constructor({_discord_id = undefined, _name = undefined, _client_id = undefined,}) {
        this.discordId = _discord_id;
        this.name = _name;
        this.clientId = _client_id;
@@ -154,7 +154,7 @@ class connectionObject {
     * @param {*} param0._node The node associated with the connection
     * @param {*} param0._client_object The client object associated with the connection
     */
-    constructor({_connection_id = null, _node = null, _client_object}) {
+    constructor({_connection_id = undefined, _node = undefined, _client_object}) {
        this.connectionId = _connection_id;
        this.node = _node;
        this.clientObject = _client_object;
Author	SHA1	Message	Date
Logan Cusano	b180f90973	Update recordHelper to use undefined instead of null	2023-06-18 23:40:51 -04:00
Logan Cusano	fd7435c7bc	Update requirement versions	2023-06-18 23:21:18 -04:00
Logan Cusano	e062cf5794	Fix bug in HTTP response parsing	2023-06-18 22:53:23 -04:00