Compare commits

...

30 Commits

Author SHA1 Message Date
b99827a84b Fix root server function, file name was wrong 2023-11-14 22:33:38 -04:00
62b1d6edfd Add remove files program 2023-11-13 14:27:28 -04:00
78d8153f8e Improve comments 2023-11-13 14:16:29 -04:00
461775a92f Add comments 2023-11-13 14:15:01 -04:00
70ec4d9463 Update state for first run 2023-11-13 14:13:14 -04:00
1d3ce073f6 Minor code refactoring 2023-11-13 14:11:46 -04:00
9bacf4f97f Add check for if new programs have begun to exist 2023-11-13 14:08:16 -04:00
9b4042af40 Move filtering to after logging 2023-11-13 13:38:39 -04:00
e6aca2e998 Improve logging 2023-11-13 13:36:25 -04:00
df2d550eb6 Filter instead of remove 2023-11-13 13:32:57 -04:00
c320b31ac3 Fix case where you jump too many levels at once 2023-11-13 13:31:52 -04:00
f0d4017711 Add potential guard clause 2023-11-13 13:26:43 -04:00
2ca91f574f Change filtering logic 2023-11-13 13:19:20 -04:00
7de44a3c2f Remove unneeded code and enable sorting on server list 2023-11-13 12:58:51 -04:00
afa44d0ea4 Don't sort recursive scan 2023-11-07 15:53:52 -04:00
83ba1af0cc Refactor hacknet logic 2023-11-06 20:20:36 -04:00
fad1c1a7c4 Fix number sort 2023-11-06 19:58:40 -04:00
ab6635d00e Sort arrays 2023-11-06 19:48:27 -04:00
116daf3781 Small fix for starting conditions 2023-11-06 17:39:47 -04:00
1af46c5d6f Fix hack all bug 2023-11-04 17:14:34 -03:00
f52af72140 Improve watcher slightly 2023-11-04 16:48:17 -03:00
12d9165162 Improve watcher 2023-11-03 22:55:07 -03:00
5febd7ed3b Fix logic error 2023-11-03 22:21:54 -03:00
8dff0b71d6 Fix wrong function call 2023-11-03 22:20:50 -03:00
f7fa595d71 Remove redundant check 2023-11-03 22:17:40 -03:00
6e1b576bcf Fix logic bugs 2023-11-03 22:17:05 -03:00
6c6f8b0b70 Formatting changes 2023-11-03 21:57:09 -03:00
90fef7e53a Move call outside the scope of watcher 2023-11-03 21:56:55 -03:00
92ad2da7b7 add program 2023-11-03 21:53:18 -03:00
a3bdb2ccd1 watcher improvements 2023-11-03 21:53:07 -03:00
7 changed files with 161 additions and 79 deletions

View File

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

View File

@ -1,11 +1,15 @@
import { executeScriptOnServerFromAnother, recursiveScan } from './utils' import { executeScriptOnServerFromAnother, recursiveScan } from "./utils"
export async function main(ns: NS) { export async function main(ns: NS) {
let servers: string[] = recursiveScan(ns) let servers: string[] = recursiveScan(ns)
for (const server of servers) { for (const server of servers) {
let numThreads = ns.getServerMaxRam(server) / ns.getScriptRam('hack.js') // 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) numThreads = Math.floor(numThreads)
executeScriptOnServerFromAnother(ns, server, 'hack.js', numThreads, [server]) numThreads = Math.max(numThreads, 1) // Make sure we have at least 1 thread
executeScriptOnServerFromAnother(ns, server, "hack.js", numThreads, [server])
} }
} }

View File

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

View File

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

View File

@ -1,15 +1,32 @@
import { recursiveScan } from "./utils" import { recursiveHackingRequired, recursiveScan, removeFilesOnAllServers } from "./utils"
export async function main(ns: NS) { export async function main(ns: NS) {
switch (ns.args[0]) { switch (ns.args[0]) {
case "getServers": case "getServers":
getServers(ns); getServers(ns)
break; break
case "getHackingLevels":
getHackingLevels(ns)
break
case "removeFiles":
removeFilesOnAllServersFromArgs(ns)
break
default: default:
ns.tprint("Invalid program name"); ns.tprint("Invalid program name")
break; break
} }
} }
function getServers(ns: NS) { function getServers(ns: NS) {
ns.tprint(recursiveScan(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)
} }

View File

@ -7,14 +7,14 @@
*/ */
export function recursiveScan(ns: NS) { export function recursiveScan(ns: NS) {
// Starting case // Starting case
let servers = ns.scan('home') let servers = ns.scan("home")
// Add all servers to the list // Add all servers to the list
let allServers: string[] = [] let allServers: string[] = []
while (servers.length > 0) { while (servers.length > 0) {
let server = servers.shift() let server = servers.pop()
if (server) { if (server) {
let newServers = ns.scan(server) let newServers = ns.scan(server)
for (let newServer of newServers) { for (const newServer of newServers) {
if (!allServers.includes(newServer)) { if (!allServers.includes(newServer)) {
allServers.push(newServer) allServers.push(newServer)
servers.push(newServer) servers.push(newServer)
@ -22,10 +22,23 @@ export function recursiveScan(ns: NS) {
} }
} }
} }
// Remove the current server // Remove the home server from the list
allServers.splice(allServers.indexOf('home'), 1) return allServers.filter(server => server !== "home").sort()
// Print all servers }
return allServers
/**
* 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)
} }
/** /**
@ -55,27 +68,27 @@ export function removeFilesOnAllServers(ns: NS, files: string[]) {
*/ */
export function rootServer(ns: NS, server: string) { export function rootServer(ns: NS, server: string) {
let counter = 0 let counter = 0
if (ns.fileExists('BruteSSH.exe', 'home')) { if (ns.fileExists("BruteSSH.exe", "home")) {
ns.brutessh(server) ns.brutessh(server)
counter++ counter++
} }
if (ns.fileExists('FTPCrack.exe', 'home')) { if (ns.fileExists("FTPCrack.exe", "home")) {
ns.ftpcrack(server) ns.ftpcrack(server)
counter++ counter++
} }
if (ns.fileExists('SMTPCrack.exe', 'home')) { if (ns.fileExists("relaySMTP.exe", "home")) {
ns.relaysmtp(server) ns.relaysmtp(server)
counter++ counter++
} }
if (ns.fileExists('HTTPWorm.exe', 'home')) { if (ns.fileExists("HTTPWorm.exe", "home")) {
ns.httpworm(server) ns.httpworm(server)
counter++ counter++
} }
if (ns.fileExists('SQLInject.exe', 'home')) { if (ns.fileExists("SQLInject.exe", "home")) {
ns.sqlinject(server) ns.sqlinject(server)
counter++ counter++
} }
if (ns.getServer(server).openPortCount <= counter) { if (counter >= ns.getServerNumPortsRequired(server)) {
ns.nuke(server) ns.nuke(server)
} }
return counter return counter
@ -95,17 +108,13 @@ export function performFunctionIfCapable(ns: NS, server: string, func: CallableF
ns.print(`Not enough hacking level to hack ${server}`) ns.print(`Not enough hacking level to hack ${server}`)
return false return false
} }
if (ns.getServerNumPortsRequired(server) < ns.getServer(server).openPortCount) { if (ns.getServer(server).openPortCount <= ns.getServerNumPortsRequired(server)) {
ns.print(`Not enough ports, trying to root ${server}`) ns.print(`Not enough ports, trying to root ${server}`)
}
if (rootServer(ns, server) < ns.getServerNumPortsRequired(server)) { if (rootServer(ns, server) < ns.getServerNumPortsRequired(server)) {
ns.print(`Need more port opening programs to root ${server}`)
return false
}
if (!ns.hasRootAccess(server)) {
ns.print(`Failed to root ${server}`) ns.print(`Failed to root ${server}`)
return false return false
} }
}
let result = func(...args) let result = func(...args)
if (result === undefined) { if (result === undefined) {
return true return true
@ -126,7 +135,8 @@ export function executeScriptOnServerFromAnother(ns: NS, server: string, script:
ns.scp(script, server) ns.scp(script, server)
performFunctionIfCapable(ns, server, ns.exec, [script, server, threads, ...args]) performFunctionIfCapable(ns, server, ns.exec, [script, server, threads, ...args])
ns.atExit(() => { ns.atExit(() => {
ns.rm(script, server) // Remove the script from the server when the program exits
// ns.rm(script, server)
}) })
} }
@ -136,11 +146,38 @@ export function executeScriptOnServerFromAnother(ns: NS, server: string, script:
* @param time=5 The number of seconds to calculate the MPS over * @param time=5 The number of seconds to calculate the MPS over
*/ */
export async function calculateMPS(ns: NS, time: number = 5) { export async function calculateMPS(ns: NS, time: number = 5) {
let start = ns.getServerMoneyAvailable('home') let start = ns.getServerMoneyAvailable("home")
let data: number[] = [] let data: number[] = []
for (let i = 0; i < time; i++) { for (let i = 0; i < time; i++) {
await ns.sleep(1000) await ns.sleep(1000)
data.push(ns.getServerMoneyAvailable('home') - start) data.push(ns.getServerMoneyAvailable("home") - start)
} }
return data.reduce((a, b) => a + b, 0) / time 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
}

View File

@ -1,16 +1,42 @@
import { checkForNewPrograms, ProgramState, recursiveHackingRequired } from "./utils"
export async function main(ns: NS) { export async function main(ns: NS) {
ns.run('hackallservers.js') let levels = recursiveHackingRequired(ns)
let hackingLevel = ns.getHackingLevel() let hackingLevel = ns.getHackingLevel()
while (hackingLevel < 9999) {
let oldHackingLevel = hackingLevel let state: ProgramState[] = [
hackingLevel = ns.getHackingLevel() { program: "BruteSSH.exe", exists: false },
if (oldHackingLevel !== hackingLevel) { { program: "FTPCrack.exe", exists: false },
ns.tprint(`Hacking level increased from ${oldHackingLevel} to ${hackingLevel}`) { program: "relaySMTP.exe", exists: false },
ns.run('killall.js') { program: "HTTPWorm.exe", exists: false },
await ns.sleep(1000) // 1 second { program: "SQLInject.exe", exists: false },
ns.run('hackallservers.js') ]
// 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 // Wait 1 second before checking again
await ns.sleep(1000) await ns.sleep(1000)
} } while (hackingLevel <= Math.max(...levels))
} }