unexport AllServers

src/Server/ServerHelpers.ts

@@ -1,4 +1,4 @@
-import { AllServers, createUniqueRandomIp, ipExists } from "./AllServers";
+import { GetAllServers, GetServerByIP, createUniqueRandomIp, ipExists } from "./AllServers";
 import { Server, IConstructorParams } from "./Server";
 import { BaseServer } from "./BaseServer";
 import { calculateServerGrowth } from "./formulas/grow";
@@ -121,12 +121,10 @@ export function prestigeHomeComputer(homeComp: Server): void {
 
 //Returns server object with corresponding hostname
 //    Relatively slow, would rather not use this a lot
-export function GetServerByHostname(hostname: string): Server | HacknetServer | null {
-  for (const ip in AllServers) {
-    if (AllServers.hasOwnProperty(ip)) {
-      if (AllServers[ip].hostname == hostname) {
-        return AllServers[ip];
-      }
+export function GetServerByHostname(hostname: string): BaseServer | null {
+  for (const server of GetAllServers()) {
+    if (server.hostname == hostname) {
+      return server;
     }
   }
 
@@ -134,12 +132,13 @@ export function GetServerByHostname(hostname: string): Server | HacknetServer |
 }
 
 //Get server by IP or hostname. Returns null if invalid
-export function getServer(s: string): Server | HacknetServer | null {
+export function getServer(s: string): BaseServer | null {
   if (!isValidIPAddress(s)) {
     return GetServerByHostname(s);
   }
-  if (AllServers[s] !== undefined) {
-    return AllServers[s];
+  const server = GetServerByIP(s);
+  if (server !== undefined) {
+    return server;
   }
 
   return null;
@@ -148,17 +147,17 @@ export function getServer(s: string): Server | HacknetServer | null {
 // Returns the i-th server on the specified server's network
 // A Server's serverOnNetwork property holds only the IPs. This function returns
 // the actual Server object
-export function getServerOnNetwork(server: BaseServer, i: number): Server | HacknetServer | null {
+export function getServerOnNetwork(server: BaseServer, i: number): BaseServer | null {
   if (i > server.serversOnNetwork.length) {
     console.error("Tried to get server on network that was out of range");
     return null;
   }
 
-  return AllServers[server.serversOnNetwork[i]];
+  return getServer(server.serversOnNetwork[i]);
 }
 
-export function isBackdoorInstalled(server: Server | HacknetServer): boolean {
-  if ("backdoorInstalled" in server) {
+export function isBackdoorInstalled(server: BaseServer): boolean {
+  if (server instanceof Server) {
     return server.backdoorInstalled;
   }
   return false;