Fix root server function, file name was wrong

.editorconfig

@@ -0,0 +1,10 @@
+# All files
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = tab
+indent_size = 2
+
+# Markup files
+[*.{json,yml}]
+indent_style = space

.gitattributes

@@ -0,0 +1,215 @@
+## GITATTRIBUTES FOR WEB PROJECTS
+#
+# These settings are for any web project.
+#
+# Details per file setting:
+#   text    These files should be normalized (i.e. convert CRLF to LF).
+#   binary  These files are binary and should be left untouched.
+#
+# Note that binary is a macro for -text -diff.
+######################################################################
+
+# Auto detect
+##   Handle line endings automatically for files detected as
+##   text and leave all files detected as binary untouched.
+##   This will handle all files NOT defined below.
+*                 text=auto
+
+# Source code
+*.bash            text eol=lf
+*.bat             text eol=crlf
+*.cmd             text eol=crlf
+*.coffee          text
+*.css             text diff=css
+*.htm             text diff=html
+*.html            text diff=html
+*.inc             text
+*.ini             text
+*.js              text
+*.json            text
+*.jsx             text
+*.less            text
+*.ls              text
+*.map             text -diff
+*.od              text
+*.onlydata        text
+*.php             text diff=php
+*.pl              text
+*.ps1             text eol=crlf
+*.py              text diff=python
+*.rb              text diff=ruby
+*.sass            text
+*.scm             text
+*.scss            text diff=css
+*.sh              text eol=lf
+.husky/*          text eol=lf
+*.sql             text
+*.styl            text
+*.tag             text
+*.ts              text
+*.tsx             text
+*.xml             text
+*.xhtml           text diff=html
+
+# Docker
+Dockerfile        text
+
+# Documentation
+*.ipynb           text eol=lf
+*.markdown        text diff=markdown
+*.md              text diff=markdown
+*.mdwn            text diff=markdown
+*.mdown           text diff=markdown
+*.mkd             text diff=markdown
+*.mkdn            text diff=markdown
+*.mdtxt           text
+*.mdtext          text
+*.txt             text
+AUTHORS           text
+CHANGELOG         text
+CHANGES           text
+CONTRIBUTING      text
+COPYING           text
+copyright         text
+*COPYRIGHT*       text
+INSTALL           text
+license           text
+LICENSE           text
+NEWS              text
+readme            text
+*README*          text
+TODO              text
+
+# Templates
+*.dot             text
+*.ejs             text
+*.erb             text
+*.haml            text
+*.handlebars      text
+*.hbs             text
+*.hbt             text
+*.jade            text
+*.latte           text
+*.mustache        text
+*.njk             text
+*.phtml           text
+*.svelte          text
+*.tmpl            text
+*.tpl             text
+*.twig            text
+*.vue             text
+
+# Configs
+*.cnf             text
+*.conf            text
+*.config          text
+.editorconfig     text
+.env              text
+.gitattributes    text
+.gitconfig        text
+.htaccess         text
+*.lock            text -diff
+package.json      text eol=lf
+package-lock.json text eol=lf -diff
+pnpm-lock.yaml    text eol=lf -diff
+.prettierrc       text
+yarn.lock         text -diff
+*.toml            text
+*.yaml            text
+*.yml             text
+browserslist      text
+Makefile          text
+makefile          text
+# Fixes syntax highlighting on GitHub to allow comments
+tsconfig.json     linguist-language=JSON-with-Comments
+
+# Heroku
+Procfile          text
+
+# Graphics
+*.ai              binary
+*.bmp             binary
+*.eps             binary
+*.gif             binary
+*.gifv            binary
+*.ico             binary
+*.jng             binary
+*.jp2             binary
+*.jpg             binary
+*.jpeg            binary
+*.jpx             binary
+*.jxr             binary
+*.pdf             binary
+*.png             binary
+*.psb             binary
+*.psd             binary
+# SVG treated as an asset (binary) by default.
+*.svg             text
+# If you want to treat it as binary,
+# use the following line instead.
+# *.svg           binary
+*.svgz            binary
+*.tif             binary
+*.tiff            binary
+*.wbmp            binary
+*.webp            binary
+
+# Audio
+*.kar             binary
+*.m4a             binary
+*.mid             binary
+*.midi            binary
+*.mp3             binary
+*.ogg             binary
+*.ra              binary
+
+# Video
+*.3gpp            binary
+*.3gp             binary
+*.as              binary
+*.asf             binary
+*.asx             binary
+*.avi             binary
+*.fla             binary
+*.flv             binary
+*.m4v             binary
+*.mng             binary
+*.mov             binary
+*.mp4             binary
+*.mpeg            binary
+*.mpg             binary
+*.ogv             binary
+*.swc             binary
+*.swf             binary
+*.webm            binary
+
+# Archives
+*.7z              binary
+*.gz              binary
+*.jar             binary
+*.rar             binary
+*.tar             binary
+*.zip             binary
+
+# Fonts
+*.ttf             binary
+*.eot             binary
+*.otf             binary
+*.woff            binary
+*.woff2           binary
+
+# Executables
+*.exe             binary
+*.pyc             binary
+# Prevents massive diffs caused by vendored, minified files
+**/.yarn/releases/**   binary
+**/.yarn/plugins/**    binary
+
+# RC files (like .babelrc or .eslintrc)
+*.*rc             text
+
+# Ignore files (like .npmignore or .gitignore)
+*.*ignore         text
+
+# Prevents massive diffs from built files
+dist/*            binary

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>

servers/home/autoexec.ts

@@ -1,4 +1,5 @@
 export async function main(ns: NS) {
+	ns.run("hackallservers.js")
 	ns.run("watcher.js")
 	ns.run("hacknet.js")
 }

servers/home/hack.ts

@@ -1,23 +1,14 @@
 export async function main(ns: NS) {
-	const server: string = <string>ns.args[0];
+	const server: string = <string> ns.args[0]
 	while (true) {
-		/* This code checks conditions that are not needed with smart scheduling
-		const moneyThresh: number = <number>ns.args[1];
-		const securityThresh: number = <number>ns.args[2];
-		if (ns.getServerSecurityLevel(server) > securityThresh) {
-			await ns.weaken(server);
-		} else if (ns.getServerMoneyAvailable(server) < moneyThresh) {
-			await ns.grow(server);
-		} else {
-			await ns.hack(server);
-		}
-		 */
+		// Guide https://darktechnomancer.github.io/#glossary-of-terms
 
-		// Guide
-		// https://darktechnomancer.github.io/#glossary-of-terms
-		await ns.weaken(server);
-		await ns.grow(server);
-		await ns.weaken(server);
-		await ns.hack(server);
+		if (ns.getServerSecurityLevel(server) > 5) {
+			await ns.weaken(server)
+		} else if (ns.getServerMoneyAvailable(server) < ns.getServerMaxMoney(server) * 0.95) {
+			await ns.grow(server)
+		} else {
+			await ns.hack(server)
+		}
 	}
 }

servers/home/hackallservers.ts

@@ -1,15 +1,15 @@
-import {recursiveScan} from "./utils";
-import {executeScriptOnServerFromAnother} from "./utils";
+import { executeScriptOnServerFromAnother, recursiveScan } from "./utils"
+
 export async function main(ns: NS) {
-	let servers: string[] = recursiveScan(ns);
+	let servers: string[] = recursiveScan(ns)
 
 	for (const server of servers) {
-		// Commented out code is not needed with smart scheduling
-		//let moneyThresh = ns.getServerMaxMoney(server) * 0.75;
-		//let securityThresh = ns.getServerMinSecurityLevel(server) + 5;
+		// Guard clause for story servers, but hacking xp is nice. Can probably be enabled when XP is easy to get
+		// if (ns.getServerMaxMoney(server) === 0) { continue }
+
 		let numThreads = ns.getServerMaxRam(server) / ns.getScriptRam("hack.js")
-		numThreads = Math.floor(numThreads);
-		//executeScriptOnServerFromAnother(ns, server, "hack.js", numThreads, [server, moneyThresh, securityThresh])
+		numThreads = Math.floor(numThreads)
+		numThreads = Math.max(numThreads, 1) // Make sure we have at least 1 thread
 		executeScriptOnServerFromAnother(ns, server, "hack.js", numThreads, [server])
 	}
 }

servers/home/hacknet.ts

@@ -13,34 +13,35 @@
  *   If the upgrade mps is less than the average mps, then buy a new node.
  */
 
-enum Type {
-	newNode = "node",
-	level = "level",
-	ram = "ram",
-	core = "code"
+enum UpgradeType {
+	level = "level", ram = "ram", core = "code",
 }
 
 export async function main(ns: NS) {
-	let timeout: number = <number>ns.args[0]
+	let timeout: number = <number> ns.args[0]
 
 	let nodes = ns.hacknet.numNodes()
-	let costs: {type: Type, cost: number}[] = []
+	// If there are no nodes, buyUpgrade one
+	if (nodes === 0) {
+		ns.hacknet.purchaseNode()
+		nodes = 1
+	}
+
+	let costs: { type: UpgradeType, cost: number }[] = []
 	while (true) {
 		costs = []
 		// Go through each node and get the cheapest upgrade
 		for (let i = 0; i < nodes; i++) {
 			costs.push(getCheapestCost(ns, i))
 		}
-		// Buy the cheapest upgrade from all nodes
-		let cheapest = Math.min(...costs.map(c => c.cost))
-		// Find the index of the cheapest cost in the list
-		let index = costs.findIndex(c => c.cost === cheapest)
-		// Wait to buy the cheapest upgrade
-		try {
-			await buy(ns, costs[index].type, costs[index].cost, index, timeout)
-		} catch (e) {
-			ns.tprint(e)
-			ns.exit()
+		// Get the cheapest upgrade object
+		let cheapest = costs.reduce((prev, curr) => prev.cost < curr.cost ? prev : curr)
+
+		// Nodes have a lot more value, so only need node price to be 1/10th the cost of the cheapest upgrade
+		if (ns.hacknet.getPurchaseNodeCost() / 10 < cheapest.cost) {
+			await buyNode(ns, ns.hacknet.getPurchaseNodeCost(), timeout)
+		} else {
+			await buyUpgrade(ns, cheapest.type, cheapest.cost, costs.indexOf(cheapest), timeout)
 		}
 		// Make sure that the number of nodes is up-to-date
 		nodes = ns.hacknet.numNodes()
@@ -48,7 +49,7 @@ export async function main(ns: NS) {
 }
 
 /**
- * Wait until the player has enough money to buy something
+ * Wait until the player has enough money to buyUpgrade something
  * @param ns Global NS object
  * @param money Amount of money to wait for
  * @param timeout=-1 Number of seconds to wait before timing out.
@@ -61,43 +62,42 @@ async function waitUntilMoney(ns: NS, money: number, timeout: number = -1) {
 		if (timeout == 0) {
 			throw new Error("Timed out waiting for money")
 		} else if (timeout > -1) {
-			timeout--;
+			timeout--
 		}
 	}
 }
 
-async function buy(ns: NS, type: Type, cost: number, node: number, timeout: number) {
+async function buyUpgrade(ns: NS, type: UpgradeType, cost: number, node: number, timeout: number) {
 	await waitUntilMoney(ns, cost, timeout)
 	switch (type) {
-		case Type.newNode:
-			ns.hacknet.purchaseNode()
-			break
-		case Type.level:
+		case UpgradeType.level:
 			ns.hacknet.upgradeLevel(node)
 			break
-		case Type.ram:
+		case UpgradeType.ram:
 			ns.hacknet.upgradeRam(node)
 			break
-		case Type.core:
+		case UpgradeType.core:
 			ns.hacknet.upgradeCore(node)
 			break
 	}
 }
 
+async function buyNode(ns: NS, cost: number, timeout: number) {
+	await waitUntilMoney(ns, cost, timeout)
+	ns.hacknet.purchaseNode()
+}
+
 function getCheapestCost(ns: NS, node: number) {
-	let nodeCost = ns.hacknet.getPurchaseNodeCost()
 	let levelCost = ns.hacknet.getLevelUpgradeCost(node)
 	let ramCost = ns.hacknet.getRamUpgradeCost(node)
 	let coreCost = ns.hacknet.getCoreUpgradeCost(node)
-	let cheapest = Math.min(nodeCost, levelCost, ramCost, coreCost)
+	let cheapest = Math.min(levelCost, ramCost, coreCost)
 	switch (cheapest) {
-		case nodeCost:
-			return {type: Type.newNode, cost: nodeCost}
 		case levelCost:
-			return {type: Type.level, cost: levelCost}
+			return { type: UpgradeType.level, cost: levelCost }
 		case ramCost:
-			return {type: Type.ram, cost: ramCost}
+			return { type: UpgradeType.ram, cost: ramCost }
 		case coreCost:
-			return {type: Type.core, cost: coreCost}
+			return { type: UpgradeType.core, cost: coreCost }
 	}
 }

servers/home/killall.ts

@@ -1,4 +1,5 @@
-import {recursiveScan} from "./utils";
+import { recursiveScan } from "./utils"
+
 export async function main(ns: NS) {
 	let servers: string[] = recursiveScan(ns)
 	for (const server of servers) {

servers/home/programs.ts

@@ -0,0 +1,32 @@
+import { recursiveHackingRequired, recursiveScan, removeFilesOnAllServers } from "./utils"
+
+export async function main(ns: NS) {
+	switch (ns.args[0]) {
+		case "getServers":
+			getServers(ns)
+			break
+		case "getHackingLevels":
+			getHackingLevels(ns)
+			break
+		case "removeFiles":
+			removeFilesOnAllServersFromArgs(ns)
+			break
+		default:
+			ns.tprint("Invalid program name")
+			break
+	}
+}
+
+function getServers(ns: NS) {
+	ns.tprint(recursiveScan(ns))
+}
+
+function getHackingLevels(ns: NS) {
+	ns.tprint(recursiveHackingRequired(ns))
+}
+
+function removeFilesOnAllServersFromArgs(ns: NS) {
+	let args = ns.args.slice(1)
+	let files = args.map((file) => file.toString())
+	removeFilesOnAllServers(ns, files)
+}

servers/home/utils.ts

@@ -1,30 +1,44 @@
 // noinspection JSUnusedGlobalSymbols
+
 /**
  * Recursively scans all servers connected to the current server, excluding home
  * @param ns global NS object
  * @returns A list of all servers connected to the current server
  */
 export function recursiveScan(ns: NS) {
-    // Starting case
-	let servers = ns.scan("home");
-    // Add all servers to the list
-    let allServers: string[] = [];
-    while (servers.length > 0) {
-        let server = servers.shift();
-        if(server) {
-            let newServers = ns.scan(server);
-            for (let newServer of newServers) {
-                if (!allServers.includes(newServer)) {
-                    allServers.push(newServer);
-                    servers.push(newServer);
-                }
-            }
-        }
-    }
-    // Remove the current server
-    allServers.splice(allServers.indexOf("home"), 1);
-    // Print all servers
-    return allServers;
+	// Starting case
+	let servers = ns.scan("home")
+	// Add all servers to the list
+	let allServers: string[] = []
+	while (servers.length > 0) {
+		let server = servers.pop()
+		if (server) {
+			let newServers = ns.scan(server)
+			for (const newServer of newServers) {
+				if (!allServers.includes(newServer)) {
+					allServers.push(newServer)
+					servers.push(newServer)
+				}
+			}
+		}
+	}
+	// Remove the home server from the list
+	return allServers.filter(server => server !== "home").sort()
+}
+
+/**
+ * Recursively scans all servers connected to the current server for the set of all levels that hackable servers require
+ * @param ns
+ * @returns A set of every hacking level required to hack a new server
+ */
+export function recursiveHackingRequired(ns: NS) {
+	let servers = recursiveScan(ns)
+	let levels: number[] = []
+	for (let server of servers) {
+		levels.push(ns.getServerRequiredHackingLevel(server))
+	}
+	// Sort and remove duplicates, need custom sort because built-in sort only works alphabetically 💀
+	return [...new Set(levels)].sort((a, b) => a - b)
 }
 
 /**
@@ -38,12 +52,12 @@ export function recursiveScan(ns: NS) {
  * you will need to modify each file path to match the server you are removing it from.
  */
 export function removeFilesOnAllServers(ns: NS, files: string[]) {
-    let hosts = recursiveScan(ns);
-    for(const host of hosts) {
-        for (const file of files) {
-            ns.rm(file, host)
-        }
-    }
+	let hosts = recursiveScan(ns)
+	for (const host of hosts) {
+		for (const file of files) {
+			ns.rm(file, host)
+		}
+	}
 }
 
 /**
@@ -53,29 +67,31 @@ export function removeFilesOnAllServers(ns: NS, files: string[]) {
  * @returns The number of programs used to gain root access
  */
 export function rootServer(ns: NS, server: string) {
-    let counter = 0;
-    if (ns.fileExists("BruteSSH.exe", "home")) {
-        ns.brutessh(server);
-        counter++;
-    }
-    if (ns.fileExists("FTPCrack.exe", "home")) {
-        ns.ftpcrack(server);
-        counter++;
-    }
-    if (ns.fileExists("SMTPCrack.exe", "home")) {
-        ns.relaysmtp(server);
-        counter++;
-    }
-    if (ns.fileExists("HTTPWorm.exe", "home")) {
-        ns.httpworm(server);
-        counter++;
-    }
-    if (ns.fileExists("SQLInject.exe", "home")) {
-        ns.sqlinject(server);
-        counter++;
-    }
-    ns.nuke(server)
-    return counter;
+	let counter = 0
+	if (ns.fileExists("BruteSSH.exe", "home")) {
+		ns.brutessh(server)
+		counter++
+	}
+	if (ns.fileExists("FTPCrack.exe", "home")) {
+		ns.ftpcrack(server)
+		counter++
+	}
+	if (ns.fileExists("relaySMTP.exe", "home")) {
+		ns.relaysmtp(server)
+		counter++
+	}
+	if (ns.fileExists("HTTPWorm.exe", "home")) {
+		ns.httpworm(server)
+		counter++
+	}
+	if (ns.fileExists("SQLInject.exe", "home")) {
+		ns.sqlinject(server)
+		counter++
+	}
+	if (counter >= ns.getServerNumPortsRequired(server)) {
+		ns.nuke(server)
+	}
+	return counter
 }
 
 /**
@@ -87,24 +103,24 @@ export function rootServer(ns: NS, server: string) {
  * @returns The result of the function if it is performed or true if the function does not return anything, otherwise false
  */
 export function performFunctionIfCapable(ns: NS, server: string, func: CallableFunction, args: any[]) {
-    if (ns.getHackingLevel() < ns.getServerRequiredHackingLevel(server)) {
-        return false;
-    }
-    if (ns.getServerNumPortsRequired(server) < ns.getServer(server).openPortCount) {
-        if (rootServer(ns, server) < ns.getServerNumPortsRequired(server)) {
-            return false;
-        }
-    }
-    if (!ns.hasRootAccess(server)) {
-        return false;
-
-    }
-    let result = func(...args);
-    if (result === undefined) {
-        return true;
-    } else {
-        return result;
-    }
+	ns.print(`Performing function on ${server}`)
+	if (ns.getHackingLevel() < ns.getServerRequiredHackingLevel(server)) {
+		ns.print(`Not enough hacking level to hack ${server}`)
+		return false
+	}
+	if (ns.getServer(server).openPortCount <= ns.getServerNumPortsRequired(server)) {
+		ns.print(`Not enough ports, trying to root ${server}`)
+		if (rootServer(ns, server) < ns.getServerNumPortsRequired(server)) {
+			ns.print(`Failed to root ${server}`)
+			return false
+		}
+	}
+	let result = func(...args)
+	if (result === undefined) {
+		return true
+	} else {
+		return result
+	}
 }
 
 /**
@@ -116,13 +132,12 @@ export function performFunctionIfCapable(ns: NS, server: string, func: CallableF
  * @param args The arguments to pass to the script
  */
 export function executeScriptOnServerFromAnother(ns: NS, server: string, script: string, threads: number = 1, args: any[]) {
-    ns.scp(script, server);
-    performFunctionIfCapable(ns, server, ns.exec, [script, server, threads, ...args])
-    ns.atExit(
-        () => {
-            ns.rm(script, server);
-        }
-    )
+	ns.scp(script, server)
+	performFunctionIfCapable(ns, server, ns.exec, [script, server, threads, ...args])
+	ns.atExit(() => {
+		// Remove the script from the server when the program exits
+		// ns.rm(script, server)
+	})
 }
 
 /**
@@ -131,11 +146,38 @@ export function executeScriptOnServerFromAnother(ns: NS, server: string, script:
  * @param time=5 The number of seconds to calculate the MPS over
  */
 export async function calculateMPS(ns: NS, time: number = 5) {
-    let start = ns.getServerMoneyAvailable("home");
-    let data: number[] = [];
-    for (let i = 0; i < time; i++) {
-        await ns.sleep(1000);
-        data.push(ns.getServerMoneyAvailable("home") - start);
-    }
-    return data.reduce((a, b) => a + b, 0) / time;
+	let start = ns.getServerMoneyAvailable("home")
+	let data: number[] = []
+	for (let i = 0; i < time; i++) {
+		await ns.sleep(1000)
+		data.push(ns.getServerMoneyAvailable("home") - start)
+	}
+	return data.reduce((a, b) => a + b, 0) / time
+}
+
+/**
+ * Type that represents a program and whether it exists on the home server
+ */
+export type ProgramState = {
+	program: string
+	exists: boolean
+}
+
+/**
+ * Checks if any of the programs passed in now exist on the home server, and updates the exists property of the program
+ * @param ns Global NS object
+ * @param programs The programs to check
+ * @returns true if any of the programs now exist, otherwise false
+ */
+export function checkForNewPrograms(ns: NS, programs: ProgramState[]) {
+	let result = false
+	for (const program of programs) {
+		if (program.exists == false) {
+			program.exists = ns.fileExists(program.program)
+			if (program.exists) {
+				result = true
+			}
+		}
+	}
+	return result
 }

servers/home/watcher.ts

@@ -1,15 +1,42 @@
+import { checkForNewPrograms, ProgramState, recursiveHackingRequired } from "./utils"
+
 export async function main(ns: NS) {
-	let hackingLevel = ns.getHackingLevel();
-	while (hackingLevel < 9999) {
-		let oldHackingLevel = hackingLevel;
-		hackingLevel = ns.getHackingLevel();
-		if(oldHackingLevel !== hackingLevel) {
-			ns.tprint(`Hacking level increased from ${oldHackingLevel} to ${hackingLevel}`);
-			ns.run("killall.js");
-			await ns.sleep(1000) // 1 second
-			ns.run("hackallservers.js");
+	let levels = recursiveHackingRequired(ns)
+	let hackingLevel = ns.getHackingLevel()
+
+	let state: ProgramState[] = [
+		{ program: "BruteSSH.exe", exists: false },
+		{ program: "FTPCrack.exe", exists: false },
+		{ program: "relaySMTP.exe", exists: false },
+		{ program: "HTTPWorm.exe", exists: false },
+		{ program: "SQLInject.exe", exists: false },
+	]
+	// Update state with existing programs
+	checkForNewPrograms(ns, state)
+
+	// Remove levels that are already hacked
+	levels = levels.filter(level => level > hackingLevel)
+
+	do {
+		let restart = false
+		if (Math.min(...levels) <= hackingLevel) {
+			ns.tprint(`Hacking level increased to/past ${Math.min(...levels)}, is now ${hackingLevel}`)
+			ns.tprint(`Remaining levels to hack: ${levels}`)
+			// remove the level from the list, so we don't try to hack it again
+			levels = levels.filter(level => level > hackingLevel)
+			restart = true
 		}
+		if (checkForNewPrograms(ns, state)) {
+			ns.tprint(`New programs found: ${state.filter(program => program.exists).map(program => program.program)}`)
+			restart = true
+		}
+		if (restart) {
+			ns.run("killall.js")
+			await ns.sleep(1000) // 1 second
+			ns.run("hackallservers.js")
+		}
+		hackingLevel = ns.getHackingLevel()
 		// Wait 1 second before checking again
 		await ns.sleep(1000)
-	}
+	} while (hackingLevel <= Math.max(...levels))
 }