diff --git a/src/index.js b/src/index.js index eb17609..5a3bd44 100644 --- a/src/index.js +++ b/src/index.js @@ -1,11 +1,8 @@ const path = require('path') -// patch corenode global runtime -global.runtime = process.runtime - //* set globals global.IS_DEV = process.runtime.helpers.isDevMode() -global.RELIC_ORIGIN = require('./relicOrigin.json') +global.RELIC_ORIGIN = "https://relic.ragestudio.net" global.SERVER_VERSION = process.runtime.helpers.getVersion() global.SERVER_MANIFEST = "server.manifest" diff --git a/src/lib/nethub/index.js b/src/lib/nethub/index.js index 1b092ae..8e3cd01 100644 --- a/src/lib/nethub/index.js +++ b/src/lib/nethub/index.js @@ -1,11 +1,11 @@ //* LIBRARIES const axios = require('axios') -const { websocket } = require('corenode/dist/net') +const { websocket } = require('corenode/net') //* constables -const NETHUB_HOSTNAME = IS_DEV ? "localhost" : global.NETHUB_HOSTNAME = "nethub.ragestudio.net" +const NETHUB_HOSTNAME = IS_DEV ? `http://localhost:1010` : `https://nethub.ragestudio.net` const nethubRequest = axios.create({ - baseURL: IS_DEV ? `http://localhost:1010` : `https://${NETHUB_HOSTNAME}` + baseURL: NETHUB_HOSTNAME }) //* HANDLERS diff --git a/src/lib/serverManifest/index.js b/src/lib/serverManifest/index.js index d795ce8..4ded627 100644 --- a/src/lib/serverManifest/index.js +++ b/src/lib/serverManifest/index.js @@ -1,4 +1,4 @@ -const tokenizer = require("corenode/dist/libs/tokenizer") +const tokenizer = require("corenode/libs/tokenizer") const path = require("path") const fs = require("fs") diff --git a/src/server/http/index.js b/src/server/http/index.js index e435973..bdc5003 100644 --- a/src/server/http/index.js +++ b/src/server/http/index.js @@ -1,10 +1,9 @@ const fs = require("fs") const express = require("express") -const { objectToArrayMap } = require("@corenode/utils") const { nanoid } = require("nanoid") -const tokenizer = require("corenode/dist/libs/tokenizer") -const net = require("corenode/dist/net") +const tokenizer = require("corenode/libs/tokenizer") +const net = require("corenode/net") const classes = require("../../classes") const nethub = require("../../lib/nethub") @@ -152,8 +151,8 @@ class Server { next() }) this.httpServer.use((req, res, next) => { - objectToArrayMap(this.headers).forEach((entry) => { - res.setHeader(entry.key, entry.value) + Object.keys(this.headers).forEach((key) => { + res.setHeader(key, this.headers[key]) }) next() diff --git a/src/server/websocket/index.js b/src/server/websocket/index.js index c69396a..29108ac 100644 --- a/src/server/websocket/index.js +++ b/src/server/websocket/index.js @@ -3,8 +3,8 @@ const socketIo = require('socket.io') class WSServer { constructor(params) { - this.params = { ...params } + this.params = { ...params } this.io = socketIo({ serveClient: false, }) @@ -43,7 +43,7 @@ class WSServer { pingTimeout: 5000, cookie: false }) - + this.httpServer.listen(this.listenPort) console.log("WSS Listen on " + this.listenPort) } @@ -53,7 +53,7 @@ class WSServer { return this.namespaces[namespace] } - + } module.exports = WSServer \ No newline at end of file