Handle port being either a string or number at runtime. Use string pr…

…imative not String object wrapper which works with parseInt
CatalysmsServerManager · Apr 23, 2020 · 54cb4ff · 54cb4ff
1 parent 04b2706
commit 54cb4ff
Show file tree

Hide file tree

Showing 16 changed files with 67 additions and 67 deletions.
diff --git a/lib/index.ts b/lib/index.ts
@@ -2,20 +2,20 @@ import fetch, { RequestInit } from "node-fetch"
 import * as responses from './responses'
 
 export interface SdtdServer {
-    ip: String,
-    port: String,
+    ip: string,
+    port: string,
     forceHttps?: Boolean,
-    adminUser: String,
-    adminToken: String
+    adminUser: string,
+    adminToken: string
 }
 
-export function getBaseUrl(server: SdtdServer): String {
+export function getBaseUrl(server: SdtdServer): string {
     let scheme = "http";
     if (server.forceHttps === true) {
         scheme = "https"
     } else if (server.forceHttps === false) {
         scheme = "http"
-    } else if (server.port === "443") {
+    } else if (parseInt(server.port) === 443) {
         scheme = "https"
     }
     return `${scheme}://${server.ip}:${server.port}`;

diff --git a/test/executeConsoleCommand.test.ts b/test/executeConsoleCommand.test.ts
@@ -9,10 +9,10 @@ require('dotenv').config()
 chai.use(chaiAsPromised)
 
 let testServer: SdtdServer = {
-    ip: process.env.TESTIP as String,
-    port: process.env.TESTPORT as String,
-    adminUser: process.env.TESTADMINUSER as String,
-    adminToken: process.env.TESTADMINTOKEN as String
+    ip: process.env.TESTIP as string,
+    port: process.env.TESTPORT as string,
+    adminUser: process.env.TESTADMINUSER as string,
+    adminToken: process.env.TESTADMINTOKEN as string
 }
 
 describe('/api/executeconsolecommand', async () => {

diff --git a/test/getAllowedCommands.test.ts b/test/getAllowedCommands.test.ts
@@ -2,17 +2,17 @@
 import * as chai from 'chai'
 import * as chaiAsPromised from 'chai-as-promised'
 import { SdtdServer } from '../lib/index'
-let SdtdApi = require('../lib/index.js');
+let SdtdApi = require('../lib/index');
 
 require('dotenv').config()
 
 chai.use(chaiAsPromised)
 
 let testServer: SdtdServer = {
-    ip: process.env.TESTIP as String,
-    port: process.env.TESTPORT as String,
-    adminUser: process.env.TESTADMINUSER as String,
-    adminToken: process.env.TESTADMINTOKEN as String
+    ip: process.env.TESTIP as string,
+    port: process.env.TESTPORT as string,
+    adminUser: process.env.TESTADMINUSER as string,
+    adminToken: process.env.TESTADMINTOKEN as string
 }
 
 describe('/api/getAllowedCommands', async () => {

diff --git a/test/getAnimalsLocation.test.ts b/test/getAnimalsLocation.test.ts
@@ -9,10 +9,10 @@ require('dotenv').config()
 chai.use(chaiAsPromised)
 
 let testServer: SdtdServer = {
-    ip: process.env.TESTIP as String,
-    port: process.env.TESTPORT as String,
-    adminUser: process.env.TESTADMINUSER as String,
-    adminToken: process.env.TESTADMINTOKEN as String
+    ip: process.env.TESTIP as string,
+    port: process.env.TESTPORT as string,
+    adminUser: process.env.TESTADMINUSER as string,
+    adminToken: process.env.TESTADMINTOKEN as string
 }
 
 describe('/api/getAnimalsLocation', async () => {

diff --git a/test/getBaseUrl.test.ts b/test/getBaseUrl.test.ts
@@ -6,10 +6,10 @@ import { getBaseUrl, SdtdServer } from '../lib/index'
 chai.use(chaiAsPromised)
 
 let testServer: SdtdServer = {
-    ip: process.env.TESTIP as String,
-    port: process.env.TESTPORT as String,
-    adminUser: process.env.TESTADMINUSER as String,
-    adminToken: process.env.TESTADMINTOKEN as String
+    ip: process.env.TESTIP as string,
+    port: process.env.TESTPORT as string,
+    adminUser: process.env.TESTADMINUSER as string,
+    adminToken: process.env.TESTADMINTOKEN as string
 }
 
 describe('getBaseUrl', async () => {

diff --git a/test/getHostileLocation.test.ts b/test/getHostileLocation.test.ts
@@ -9,10 +9,10 @@ require('dotenv').config()
 chai.use(chaiAsPromised)
 
 let testServer: SdtdServer = {
-    ip: process.env.TESTIP as String,
-    port: process.env.TESTPORT as String,
-    adminUser: process.env.TESTADMINUSER as String,
-    adminToken: process.env.TESTADMINTOKEN as String
+    ip: process.env.TESTIP as string,
+    port: process.env.TESTPORT as string,
+    adminUser: process.env.TESTADMINUSER as string,
+    adminToken: process.env.TESTADMINTOKEN as string
 }
 
 describe('/api/getHostileLocation', async () => {

diff --git a/test/getLandClaims.test.ts b/test/getLandClaims.test.ts
@@ -9,10 +9,10 @@ require('dotenv').config()
 chai.use(chaiAsPromised)
 
 let testServer: SdtdServer = {
-    ip: process.env.TESTIP as String,
-    port: process.env.TESTPORT as String,
-    adminUser: process.env.TESTADMINUSER as String,
-    adminToken: process.env.TESTADMINTOKEN as String
+    ip: process.env.TESTIP as string,
+    port: process.env.TESTPORT as string,
+    adminUser: process.env.TESTADMINUSER as string,
+    adminToken: process.env.TESTADMINTOKEN as string
 }
 
 describe('/api/getLandClaims', async () => {

diff --git a/test/getLog.test.ts b/test/getLog.test.ts
@@ -9,10 +9,10 @@ require('dotenv').config()
 chai.use(chaiAsPromised)
 
 const testServer: SdtdServer = {
-    ip: process.env.TESTIP as String,
-    port: process.env.TESTPORT as String,
-    adminUser: process.env.TESTADMINUSER as String,
-    adminToken: process.env.TESTADMINTOKEN as String
+    ip: process.env.TESTIP as string,
+    port: process.env.TESTPORT as string,
+    adminUser: process.env.TESTADMINUSER as string,
+    adminToken: process.env.TESTADMINTOKEN as string
 }
 
 describe('/api/getLog', async () => {

diff --git a/test/getOnlinePlayers.test.ts b/test/getOnlinePlayers.test.ts
@@ -9,10 +9,10 @@ require('dotenv').config()
 chai.use(chaiAsPromised)
 
 let testServer: SdtdServer = {
-    ip: process.env.TESTIP as String,
-    port: process.env.TESTPORT as String,
-    adminUser: process.env.TESTADMINUSER as String,
-    adminToken: process.env.TESTADMINTOKEN as String
+    ip: process.env.TESTIP as string,
+    port: process.env.TESTPORT as string,
+    adminUser: process.env.TESTADMINUSER as string,
+    adminToken: process.env.TESTADMINTOKEN as string
 }
 
 describe('/api/getOnlinePlayers', async () => {

diff --git a/test/getPlayerInventories.test.ts b/test/getPlayerInventories.test.ts
@@ -9,10 +9,10 @@ require('dotenv').config()
 chai.use(chaiAsPromised)
 
 let testServer: SdtdServer = {
-    ip: process.env.TESTIP as String,
-    port: process.env.TESTPORT as String,
-    adminUser: process.env.TESTADMINUSER as String,
-    adminToken: process.env.TESTADMINTOKEN as String
+    ip: process.env.TESTIP as string,
+    port: process.env.TESTPORT as string,
+    adminUser: process.env.TESTADMINUSER as string,
+    adminToken: process.env.TESTADMINTOKEN as string
 }
 
 describe('/api/getPlayerInventories', async () => {

diff --git a/test/getPlayerInventory.test.ts b/test/getPlayerInventory.test.ts
@@ -9,10 +9,10 @@ require('dotenv').config()
 chai.use(chaiAsPromised)
 
 let testServer: SdtdServer = {
-    ip: process.env.TESTIP as String,
-    port: process.env.TESTPORT as String,
-    adminUser: process.env.TESTADMINUSER as String,
-    adminToken: process.env.TESTADMINTOKEN as String
+    ip: process.env.TESTIP as string,
+    port: process.env.TESTPORT as string,
+    adminUser: process.env.TESTADMINUSER as string,
+    adminToken: process.env.TESTADMINTOKEN as string
 }
 describe('/api/getPlayerInventory', async () => {
     it('Returns a playername, bag, belt and equipment', async () => {

diff --git a/test/getPlayerList.test.ts b/test/getPlayerList.test.ts
@@ -9,10 +9,10 @@ require('dotenv').config()
 chai.use(chaiAsPromised)
 
 let testServer: SdtdServer = {
-    ip: process.env.TESTIP as String,
-    port: process.env.TESTPORT as String,
-    adminUser: process.env.TESTADMINUSER as String,
-    adminToken: process.env.TESTADMINTOKEN as String
+    ip: process.env.TESTIP as string,
+    port: process.env.TESTPORT as string,
+    adminUser: process.env.TESTADMINUSER as string,
+    adminToken: process.env.TESTADMINTOKEN as string
 }
 describe('/api/getPlayerList', async () => {
     it('Returns expected output', async () => {

diff --git a/test/getPlayersLocation.test.ts b/test/getPlayersLocation.test.ts
@@ -9,10 +9,10 @@ require('dotenv').config()
 chai.use(chaiAsPromised)
 
 let testServer: SdtdApi.SdtdServer = {
-    ip: process.env.TESTIP as String,
-    port: process.env.TESTPORT as String,
-    adminUser: process.env.TESTADMINUSER as String,
-    adminToken: process.env.TESTADMINTOKEN as String
+    ip: process.env.TESTIP as string,
+    port: process.env.TESTPORT as string,
+    adminUser: process.env.TESTADMINUSER as string,
+    adminToken: process.env.TESTADMINTOKEN as string
 }
 
 describe('/api/getPlayersLocation', async () => {

diff --git a/test/getServerInfo.test.ts b/test/getServerInfo.test.ts
@@ -9,10 +9,10 @@ require('dotenv').config()
 chai.use(chaiAsPromised)
 
 let testServer: SdtdServer = {
-    ip: process.env.TESTIP as String,
-    port: process.env.TESTPORT as String,
-    adminUser: process.env.TESTADMINUSER as String,
-    adminToken: process.env.TESTADMINTOKEN as String
+    ip: process.env.TESTIP as string,
+    port: process.env.TESTPORT as string,
+    adminUser: process.env.TESTADMINUSER as string,
+    adminToken: process.env.TESTADMINTOKEN as string
 }
 describe('/api/getServerInfo', async () => {
     it('Returns expected output', async () => {

diff --git a/test/getStats.test.ts b/test/getStats.test.ts
@@ -9,10 +9,10 @@ require('dotenv').config()
 chai.use(chaiAsPromised)
 
 let testServer: SdtdServer = {
-    ip: process.env.TESTIP as String,
-    port: process.env.TESTPORT as String,
-    adminUser: process.env.TESTADMINUSER as String,
-    adminToken: process.env.TESTADMINTOKEN as String
+    ip: process.env.TESTIP as string,
+    port: process.env.TESTPORT as string,
+    adminUser: process.env.TESTADMINUSER as string,
+    adminToken: process.env.TESTADMINTOKEN as string
 }
 
 describe('/api/getstats', async () => {

diff --git a/test/getWebUIUpdates.test.ts b/test/getWebUIUpdates.test.ts
@@ -9,10 +9,10 @@ require('dotenv').config()
 chai.use(chaiAsPromised)
 
 let testServer: SdtdServer = {
-    ip: process.env.TESTIP as String,
-    port: process.env.TESTPORT as String,
-    adminUser: process.env.TESTADMINUSER as String,
-    adminToken: process.env.TESTADMINTOKEN as String
+    ip: process.env.TESTIP as string,
+    port: process.env.TESTPORT as string,
+    adminUser: process.env.TESTADMINUSER as string,
+    adminToken: process.env.TESTADMINTOKEN as string
 }
 
 describe('/api/getWebUIUpdates', async () => {