From 0e14fe1632ef1d4a1f8b310ce79f9d86e9bd65f0 Mon Sep 17 00:00:00 2001 From: MrNuggelz Date: Wed, 28 Jun 2017 11:47:42 +0200 Subject: [PATCH 1/5] Netscript reimplementation --- index.html | 1 + src/NetscriptEnvironment.js | 8 +- src/NetscriptEvaluator.js | 1154 ++++------- src/NetscriptFunctions.js | 908 ++++----- src/NetscriptInputStream.js | 25 - src/NetscriptParser.js | 326 ---- src/NetscriptTokenizer.js | 168 -- src/NetscriptWorker.js | 5 +- utils/acorn.js | 3606 +++++++++++++++++++++++++++++++++++ 9 files changed, 4482 insertions(+), 1719 deletions(-) delete mode 100644 src/NetscriptInputStream.js delete mode 100644 src/NetscriptParser.js delete mode 100644 src/NetscriptTokenizer.js create mode 100644 utils/acorn.js diff --git a/index.html b/index.html index f9cd95be5..f32080b3c 100644 --- a/index.html +++ b/index.html @@ -35,6 +35,7 @@ + diff --git a/src/NetscriptEnvironment.js b/src/NetscriptEnvironment.js index 632a9381e..3f0960436 100644 --- a/src/NetscriptEnvironment.js +++ b/src/NetscriptEnvironment.js @@ -1,8 +1,12 @@ /* Environment * NetScript program environment */ -function Environment(parent) { - this.vars = Object.create(parent ? parent.vars : null); +function Environment(workerScript,parent) { + if (parent){ + this.vars = parent.vars; + } else { + this.vars = NetscriptFunctions(workerScript); + } this.parent = parent; this.stopFlag = false; } diff --git a/src/NetscriptEvaluator.js b/src/NetscriptEvaluator.js index a939af495..f089897ca 100644 --- a/src/NetscriptEvaluator.js +++ b/src/NetscriptEvaluator.js @@ -14,138 +14,15 @@ function evaluate(exp, workerScript) { setTimeout(function() { if (env.stopFlag) {return reject(workerScript);} switch (exp.type) { - case "num": - case "str": - case "bool": - resolve(exp.value); - break; - case "var": - if (exp.value == "hacknetnodes") { - var pEvaluateHacknetNode = evaluateHacknetNode(exp, workerScript); - pEvaluateHacknetNode.then(function(res) { - resolve(res); - }, function(e) { - reject(e); - }); - return; - } else if (exp.value == "args") { - if (exp.index) { - var iPromise = evaluate(exp.index.value, workerScript); - iPromise.then(function(i) { - if (isNaN(i)) { - reject(makeRuntimeRejectMsg(workerScript, "Invalid access to args array. Index is not a number: " + i)); - } else if (i >= workerScript.args.length || i < 0) { - reject(makeRuntimeRejectMsg(workerScript, "Out of bounds: Invalid index in [] operator")); - } else { - resolve(workerScript.args[i]); - } - }, function(e) { - reject(e); - }); - } else if (exp.op && exp.op.type == "var" && exp.op.value == "length") { - resolve(workerScript.args.length); - } else { - reject(makeRuntimeRejectMsg(workerScript, "Invalid access to args array")); - } - return; - } else if (exp.value == "array") { - //A raw array. This will be called under something like this: - // x = Array[1, 2, 3]; - if (exp.array && exp.array instanceof Array) { - resolve(exp.array); - } else { - reject(makeRuntimeRejectMsg(workerScript, "Invalid array instantiation")); - } - return; - } - try { - var res = env.get(exp.value); - if (res.constructor === Array || res instanceof Array) { - var evalArrayPromise = netscriptArray(exp, workerScript); - evalArrayPromise.then(function(res) { - resolve(res); - }, function(e) { - reject(e); - }); - } else { - resolve(res); - } - } catch (e) { - reject("|" + workerScript.serverIp + "|" + workerScript.name + "|" + e.toString()); - } - break; - //Can currently only assign to "var"s - case "assign": - var p = netscriptAssign(exp, workerScript); - p.then(function(res) { - resolve(res); - }).catch(function(e) { - reject(e); - }); - break; - case "binary": - var p = netscriptBinary(exp, workerScript); - p.then(function(res) { - resolve(res); - }).catch(function(e) { - reject(e); - }); - break; - case "if": - var numConds = exp.cond.length; - var numThens = exp.then.length; - if (numConds == 0 || numThens == 0 || numConds != numThens) { - reject("|" + workerScript.serverIp + "|" + workerScript.name + "|Number of conds and thens in if structure don't match (or there are none)"); - } - - var evalIfPromise = evaluateIf(exp, workerScript, 0); - evalIfPromise.then(function(res) { - if (res) { - //One of the if/elif statements evaluated to true - resolve("if statement done"); - } else { - //None of the if/elif statements were true. Evaluate else if there is one - if (exp.else) { - var elseEval = evaluate(exp.else, workerScript); - elseEval.then(function(res) { - resolve("if statement done with else"); - }, function(e) { - reject(e); - }); - } else { - resolve("if statement done"); - } - } - }, function(e) { - reject(e); - }); - break; - case "for": - var pInit = evaluate(exp.init, workerScript); - pInit.then(function(expInit) { - return evaluateFor(exp, workerScript); - }).then(function(forLoopRes) { - resolve("forLoopDone"); - }).catch(function(e) { - reject(e); - }); - break; - case "while": - var pEvaluateWhile = evaluateWhile(exp, workerScript); - pEvaluateWhile.then(function(whileLoopRes) { - resolve(whileLoopRes); - }, function(e) { - reject(e); - }); - break; - case "prog": - var evaluateProgPromise = evaluateProg(exp, workerScript, 0); + case "BlockStatement": + case "Program": + var evaluateProgPromise = evaluateProg(exp, workerScript, 0); //TODO: make every block/program use individual enviroment evaluateProgPromise.then(function(w) { resolve(workerScript); }, function(e) { if (typeof e === 'string' || e instanceof String) { workerScript.errorMessage = e; - reject(workerScript); + reject(workerScript); } else if (e instanceof WorkerScript) { reject(e); } else { @@ -153,534 +30,171 @@ function evaluate(exp, workerScript) { } }); break; - case "call": - if (exp.func.value == "hack") { - var p = netscriptHack(exp, workerScript); - p.then(function(res) { - resolve(res); - }, function(e) { + case "Literal": + resolve(exp.value); + break; + case "Identifier": + if (!(exp.name in env.vars)){ + reject(makeRuntimeRejectMsg(workerScript, "variable " + exp.name + " not definied")); + } + resolve(env.get(exp.name)) + break; + case "ExpressionStatement": + var e = evaluate(exp.expression, workerScript); + e.then(function(res) { + resolve("expression done"); + }, function(e) { + reject(e); + }); + break; + case "ArrayExpression": + var argPromises = exp.elements.map(function(arg) { + return evaluate(arg, workerScript); + }); + Promise.all(argPromises).then(function(array) { + resolve(array) + }).catch(function(e) { + reject(e); + }); + break; + case "CallExpression": + evaluate(exp.callee, workerScript).then(function(func) { + var argPromises = exp.arguments.map(function(arg) { + return evaluate(arg, workerScript); + }); + Promise.all(argPromises).then(function(args) { + if (exp.callee.type == "MemberExpression"){ + evaluate(exp.callee.object, workerScript).then(function(object) { + try { + resolve(func.apply(object,args)); + } catch (e) { + reject(makeRuntimeRejectMsg(workerScript, e)); + } + }).catch(function(e) { + reject(e); + }); + } else { + try { + var out = func.apply(null,args); + if (out instanceof Promise){ + out.then(function(res) { + resolve(res) + }).catch(function(e) { + reject(e); + }); + } else { + resolve(out); + } + } catch (e) { + reject(makeRuntimeRejectMsg(workerScript, e)); + } + } + }).catch(function(e) { reject(e); }); - } else if (exp.func.value == "sleep") { - if (exp.args.length != 1) { - return reject(makeRuntimeRejectMsg(workerScript, "sleep() call has incorrect number of arguments. Takes 1 argument.")); - } - var sleepTimePromise = evaluate(exp.args[0], workerScript); - sleepTimePromise.then(function(sleepTime) { - workerScript.scriptRef.log("Sleeping for " + sleepTime + " milliseconds"); - return netscriptDelay(sleepTime).then(function() { - return Promise.resolve(true); + }).catch(function(e) { + reject(e); + }); + break; + case "MemberExpression": + var pObject = evaluate(exp.object, workerScript); + pObject.then(function(object) { + if (exp.computed){ + var p = evaluate(exp.property, workerScript); + p.then(function(index) { + resolve(object[index]); + }).catch(function(e) { + reject(makeRuntimeRejectMsg(workerScript, "Invalid MemberExpression")); }); - }).then(function(res) { - resolve(true); - }).catch(function(e) { - reject(e); - }); - } else if (exp.func.value == "print") { - if (exp.args.length != 1) { - return reject(makeRuntimeRejectMsg(workerScript, "print() call has incorrect number of arguments. Takes 1 argument")); - } - - var evaluatePromise = evaluate(exp.args[0], workerScript); - evaluatePromise.then(function(res) { - workerScript.scriptRef.log(res.toString()); - resolve(true); - }).catch(function(e) { - reject(e); - }); - } else if (exp.func.value == "grow") { - var p = netscriptGrow(exp, workerScript); - p.then(function(res) { - resolve(res); - }, function(e) { - reject(e); - }); - } else if (exp.func.value == "weaken") { - var p = netscriptWeaken(exp, workerScript); - p.then(function(res) { - resolve(res); - }, function(e) { - reject(e); - }); - - } else if (exp.func.value == "scan") { - if (exp.args.length != 0) { - return reject(makeRuntimeRejectMsg(workerScript, "scan() call has incorrect number of arguments. Takes 0 arguments")); - } - var currServ = getServer(workerScript.serverIp); - if (currServ == null) { - return reject(makeRuntimeRejectMsg(workerScript, "Could not find server ip for this script. This is a bug please contact game developer")); - } - var res = []; - for (var i = 0; i < currServ.serversOnNetwork.length; ++i) { - var thisServ = getServer(currServ.serversOnNetwork[i]); - if (thisServ == null) {continue;} - res.push({type:"str", value: thisServ.hostname}); + } else { + try { + resolve(object[exp.property.name]) + } catch (e) { + return reject(makeRuntimeRejectMsg(workerScript, "Failed to get property: " + e.toString())); + } } + }).catch(function(e) { + reject(e); + }); + break; + case "LogicalExpression": + case "BinaryExpression": + var p = evalBinary(exp, workerScript, resolve, reject); + p.then(function(res) { resolve(res); - } else if (exp.func.value == "nuke") { - var p = netscriptRunProgram(exp, workerScript, Programs.NukeProgram); - p.then(function(res) { - resolve(res); - }, function(e) { - reject(e); - }); - } else if (exp.func.value == "brutessh") { - var p = netscriptRunProgram(exp, workerScript, Programs.BruteSSHProgram); - p.then(function(res) { - resolve(res); - }, function(e) { - reject(e); - }); - } else if (exp.func.value == "ftpcrack") { - var p = netscriptRunProgram(exp, workerScript, Programs.FTPCrackProgram); - p.then(function(res) { - resolve(res); - }, function(e) { - reject(e); - }); - } else if (exp.func.value == "relaysmtp") { - var p = netscriptRunProgram(exp, workerScript, Programs.RelaySMTPProgram); - p.then(function(res) { - resolve(res); - }, function(e) { - reject(e); - }); - } else if (exp.func.value == "httpworm") { - var p = netscriptRunProgram(exp, workerScript, Programs.HTTPWormProgram); - p.then(function(res) { - resolve(res); - }, function(e) { - reject(e); - }); - } else if (exp.func.value == "sqlinject") { - var p = netscriptRunProgram(exp, workerScript, Programs.SQLInjectProgram); - p.then(function(res) { - resolve(res); - }, function(e) { - reject(e); - }); - } else if (exp.func.value == "hasRootAccess") { - if (env.stopFlag) {return reject(workerScript);} - if (exp.args.length != 1) { - return reject(makeRuntimeRejectMsg(workerScript, "hasRootAccess() call has incorrect number of arguments. Takes 1 argument")); - } - var ipPromise = evaluate(exp.args[0], workerScript); - ipPromise.then(function(ip) { - if (env.stopFlag) {return reject(workerScript);} - var server = getServer(ip); - if (server == null) { - workerScript.scriptRef.log("hasRootAccess() failed. Invalid IP or hostname passed in: " + ip); - return reject(makeRuntimeRejectMsg(workerScript, "Invalid IP or hostname passed into hasRootAccess() command")); + }).catch(function(e) { + reject(e); + }); + break; + case "AssignmentExpression": + var p = evalAssignment(exp, workerScript); + p.then(function(res) { + resolve(res); + }).catch(function(e) { + reject(e); + }); + break; + case "UpdateExpression": + if (exp.argument.type==="Identifier"){ + if (exp.argument.name in env.vars){ + if (exp.prefix){ + resolve(env.get(exp.argument.name)) } - workerScript.scriptRef.log("hasRootAccess() returned " + server.hasAdminRights); - resolve(server.hasAdminRights); - }, function(e) { - reject(e); - }); - } else if (exp.func.value == "run") { - if (exp.args.length < 1) { - return reject(makeRuntimeRejectMsg(workerScript, "run() call has incorrect number of arguments. Usage: run(scriptname, [numThreads], [arg1], [arg2]...)")); - } - var argPromises = exp.args.map(function(arg) { - return evaluate(arg, workerScript); - }); - - Promise.all(argPromises).then(function(args) { - if (env.stopFlag) {return reject(workerScript);} - var scriptname = args[0]; - var threads = 1; - if (exp.args.length >= 2) { - threads = args[1]; - } - var argsForNewScript = []; - for (var i = 2; i < exp.args.length; ++i) { - argsForNewScript.push(args[i]); - } - - if (isNaN(threads) || threads < 1) { - return reject(makeRuntimeRejectMsg(workerScript, "Invalid argument for thread count passed into run(). Must be numeric and greater than 0")); - } - var scriptServer = getServer(workerScript.serverIp); - if (scriptServer == null) { - return reject(makeRuntimeRejectMsg(workerScript, "Could not find server. This is a bug in the game. Report to game dev")); - } - - var runScriptPromise = runScriptFromScript(scriptServer, scriptname, argsForNewScript, workerScript, threads); - return runScriptPromise; - }).then(function(res) { - resolve(res); - }).catch(function(e) { - reject(e); - }); - } else if (exp.func.value == "exec") { - if (exp.args.length < 2) { - return reject(makeRuntimeRejectMsg(workerScript, "exec() call has incorrect number of arguments. Usage: exec(scriptname, server, [numThreads], [arg1], [arg2]...)")); - } - var argPromises = exp.args.map(function(arg) { - return evaluate(arg, workerScript); - }); - - Promise.all(argPromises).then(function(args) { - if (env.stopFlag) {return reject(workerScript);} - var threads = 1; - if (exp.args.length >= 3) { - threads = args[2]; - } - var argsForNewScript = []; - for (var i = 3; i < exp.args.length; ++i) { - argsForNewScript.push(args[i]); - } - - if (isNaN(threads) || threads < 1) { - return reject(makeRuntimeRejectMsg(workerScript, "Invalid argument for thread count passed into exec(). Must be numeric and greater than 0")); - } - var server = getServer(args[1]); - if (server == null) { - return reject(makeRuntimeRejectMsg(workerScript, "Invalid hostname/ip passed into exec() command: " + args[1])); - } - - return runScriptFromScript(server, args[0], argsForNewScript, workerScript, threads); - }).then(function(res) { - resolve(res); - }).catch(function(e) { - reject(e); - }); - } else if (exp.func.value == "kill") { - if (exp.args.length < 2) { - return reject(makeRuntimeRejectMsg(workerScript, "kill() call has incorrect number of arguments. Usage: kill(scriptname, server, [arg1], [arg2]...)")); - } - var argPromises = exp.args.map(function(arg) { - return evaluate(arg, workerScript); - }); - - Promise.all(argPromises).then(function(args) { - if (env.stopFlag) {return reject(workerScript);} - var filename = args[0]; - var server = getServer(args[1]); - if (server == null) { - workerScript.scriptRef.log("kill() failed. Invalid IP or hostname passed in: " + ip); - return reject(makeRuntimeRejectMsg(workerScript, "Invalid IP or hostname passed into kill() command")); - } - var argsForKillTarget = []; - for (var i = 2; i < exp.args.length; ++i) { - argsForKillTarget.push(args[i]); - } - var runningScriptObj = findRunningScript(filename, argsForKillTarget, server); - if (runningScriptObj == null) { - workerScript.scriptRef.log("kill() failed. No such script "+ filename + " on " + server.hostname + " with args: " + printArray(argsForKillTarget)); - return Promise.resolve(false); - } - var res = killWorkerScript(runningScriptObj, server.ip); - if (res) { - workerScript.scriptRef.log("Killing " + filename + " on " + server.hostname + " with args: " + printArray(argsForKillTarget) + ". May take up to a few minutes for the scripts to die..."); - return Promise.resolve(true); - } else { - workerScript.scriptRef.log("kill() failed. No such script "+ filename + " on " + server.hostname + " with args: " + printArray(argsForKillTarget)); - return Promise.resolve(false); - } - }).then(function(res) { - resolve(res); - }).catch(function(e) { - reject(e); - }); - } else if (exp.func.value == "killall") { - if (exp.args.length != 1) { - return reject(makeRuntimeRejectMsg(workerScript, "killall() call has incorrect number of arguments. Takes 1 argument")); - } - var ipPromise = evaluate(exp.args[0], workerScript); - ipPromise.then(function(ip) { - if (env.stopFlag) {return reject(workerScript);} - var server = getServer(ip); - if (server == null) { - workerScript.scriptRef.log("killall() failed. Invalid IP or hostname passed in: " + ip); - return reject(makeRuntimeRejectMsg(workerScript, "Invalid IP or hostname passed into killall() command")); - } - for (var i = server.runningScripts.length-1; i >= 0; --i) { - killWorkerScript(server.runningScripts[i], server.ip); - } - workerScript.scriptRef.log("killall(): Killing all scripts on " + server.hostname + ". May take a few minutes for the scripts to die"); - resolve(true); - }, function(e) { - reject(e); - }); - } else if (exp.func.value == "scp") { - if (exp.args.length != 2) { - return reject(makeRuntimeRejectMsg(workerScript, "scp() call has incorrect number of arguments. Takes 2 arguments")); - } - - var argPromises = exp.args.map(function(arg) { - return evaluate(arg, workerScript); - }); - - Promise.all(argPromises).then(function(args) { - if (env.stopFlag) {return reject(workerScript);} - var scriptname = args[0]; - var ip = args[1]; - var destServer = getServer(ip); - if (destServer == null) { - return reject(makeRuntimeRejectMsg(workerScript, "Invalid hostname/ip passed into scp() command: " + ip)); - } - - var currServ = getServer(workerScript.serverIp); - if (currServ == null) { - return reject(makeRuntimeRejectMsg(workerScript, "Could not find server ip for this script. This is a bug please contact game developer")); - } - - var sourceScript = null; - for (var i = 0; i < currServ.scripts.length; ++i) { - if (scriptname == currServ.scripts[i].filename) { - sourceScript = currServ.scripts[i]; + switch (exp.operator){ + case "++": + env.set(exp.argument.name,env.get(exp.argument.name)+1); break; - } + case "--": + env.set(exp.argument.name,env.get(exp.argument.name)-1); + break; + default: + reject(makeRuntimeRejectMsg(workerScript, "Unrecognized token: " + exp.type + ". This is a bug please report to game developer")); } - if (sourceScript == null) { - workerScript.scriptRef.log(scriptname + " does not exist. scp() failed"); - return Promise.resolve(false); + if (env.prefix){ + return; } - - //Overwrite script if it already exists - for (var i = 0; i < destServer.scripts.length; ++i) { - if (scriptname == destServer.scripts[i].filename) { - workerScript.scriptRef.log("WARNING: " + scriptname + " already exists on " + destServer.hostname + " and it will be overwritten."); - workerScript.scriptRef.log(scriptname + " overwritten on " + destServer.hostname); - var oldScript = destServer.scripts[i]; - oldScript.code = sourceScript.code; - oldScript.ramUsage = sourceScript.ramUsage; - return Promise.resolve(true); - } - } - - //Create new script if it does not already exist - var newScript = new Script(); - newScript.filename = scriptname; - newScript.code = sourceScript.code; - newScript.ramUsage = sourceScript.ramUsage; - newScript.server = destServer.ip; - destServer.scripts.push(newScript); - workerScript.scriptRef.log(scriptname + " copied over to " + destServer.hostname); - return Promise.resolve(true); - return; - }).then(function(res) { - resolve(res); - }).catch(function(e) { - reject(e); - }); - } else if (exp.func.value == "getHostname") { - if (exp.args.length != 0) { - return reject(makeRuntimeRejectMsg(workerScript, "getHostname() call has incorrect number of arguments. Takes 0 arguments")); + resolve(env.get(exp.argument.name)) + } else { + reject(makeRuntimeRejectMsg(workerScript, "variable " + exp.argument.name + " not definied")); } - var scriptServer = getServer(workerScript.serverIp); - if (scriptServer == null) { - return reject(makeRuntimeRejectMsg(workerScript, "Could not find server. This is a bug in the game. Report to game dev")); - } - resolve(scriptServer.hostname); - } else if (exp.func.value == "getHackingLevel") { - if (exp.args.length != 0) { - return reject(makeRuntimeRejectMsg(workerScript, "getHackingLevel() call has incorrect number of arguments. Takes 0 arguments")); - } - Player.updateSkillLevels(); - workerScript.scriptRef.log("getHackingLevel() returned " + Player.hacking_skill); - resolve(Player.hacking_skill); - } else if (exp.func.value == "getServerMoneyAvailable") { - if (exp.args.length != 1) { - return reject(makeRuntimeRejectMsg(workerScript, "getServerMoneyAvailable() call has incorrect number of arguments. Takes 1 arguments")); - } - var ipPromise = evaluate(exp.args[0], workerScript); - ipPromise.then(function(ip) { - var server = getServer(ip); - if (server == null) { - workerScript.scriptRef.log("Cannot getServerMoneyAvailable(). Invalid IP or hostname passed in: " + ip); - return reject(makeRuntimeRejectMsg(workerScript, "Invalid IP or hostname passed into getServerMoneyAvailable() command")); - } - workerScript.scriptRef.log("getServerMoneyAvailable() returned " + formatNumber(server.moneyAvailable, 2) + " for " + server.hostname); - resolve(server.moneyAvailable); - }, function(e) { - reject(e); - }); - } else if (exp.func.value == "getServerSecurityLevel") { - if (exp.args.length != 1) { - return reject(makeRuntimeRejectMsg(workerScript, "getServerSecurityLevel() call has incorrect number of arguments. Takes 1 arguments")); - } - var ipPromise = evaluate(exp.args[0], workerScript); - ipPromise.then(function(ip) { - var server = getServer(ip); - if (server == null) { - workerScript.scriptRef.log("getServerSecurityLevel() failed. Invalid IP or hostname passed in: " + ip); - return reject(makeRuntimeRejectMsg(workerScript, "Invalid IP or hostname passed into getServerSecurityLevel() command"));; - } - workerScript.scriptRef.log("getServerSecurityLevel() returned " + formatNumber(server.hackDifficulty, 3) + " for " + server.hostname); - resolve(server.hackDifficulty); - }, function(e) { - reject(e); - }); - } else if (exp.func.value == "getServerBaseSecurityLevel") { - if (exp.args.length != 1) { - return reject(makeRuntimeRejectMsg(workerScript, "getServerBaseSecurityLevel() call has incorrect number of arguments. Takes 1 arguments")); - } - var ipPromise = evaluate(exp.args[0], workerScript); - ipPromise.then(function(ip) { - var server = getServer(ip); - if (server == null) { - workerScript.scriptRef.log("getServerBaseSecurityLevel() failed. Invalid IP or hostname passed in: " + ip); - return reject(makeRuntimeRejectMsg(workerScript, "Invalid IP or hostname passed into getServerBaseSecurityLevel() command"));; - } - workerScript.scriptRef.log("getServerBaseSecurityLevel() returned " + formatNumber(server.baseDifficulty, 3) + " for " + server.hostname); - resolve(server.baseDifficulty); - }, function(e) { - reject(e); - }); - } else if (exp.func.value == "getServerRequiredHackingLevel") { - if (exp.args.length != 1) { - return reject(makeRuntimeRejectMsg(workerScript, "getServerRequiredHackingLevel() call has incorrect number of arguments. Takes 1 argument")); - } - var ipPromise = evaluate(exp.args[0], workerScript); - ipPromise.then(function(ip) { - var server = getServer(ip); - if (server == null) { - workerScript.scriptRef.log("getServerRequiredHackingLevel() failed. Invalid IP or hostname passed in: " + ip); - return reject(makeRuntimeRejectMsg(workerScript, "Invalid IP or hostname passed into getServerRequiredHackingLevel() command")); - } - workerScript.scriptRef.log("getServerRequiredHackingLevel returned " + formatNumber(server.requiredHackingSkill, 0) + " for " + server.hostname); - resolve(server.requiredHackingSkill); - }, function(e) { - reject(e); - }); - } else if (exp.func.value == "getServerMaxMoney") { - if (exp.args.length != 1) { - return reject(makeRuntimeRejectMsg(workerScript, "getServerMaxMoney() call has incorrect number of arguments. Takes 1 argument")); - } - var ipPromise = evaluate(exp.args[0], workerScript); - ipPromise.then(function(ip) { - var server = getServer(ip); - if (server == null) { - workerScript.scriptRef.log("getServerMaxMoney() failed. Invalid IP or hostname passed in: " + ip); - return reject(makeRuntimeRejectMsg(workerScript, "Invalid IP or hostname passed into getServerMaxMoney() command")); - } - workerScript.scriptRef.log("getServerMaxMoney() returned " + formatNumber(server.moneyMax, 0) + " for " + server.hostname); - resolve(server.moneyMax); - }, function(e) { - reject(e); - }); - } else if (exp.func.value == "getServerNumPortsRequired") { - if (exp.args.length != 1) { - return reject(makeRuntimeRejectMsg(workerScript, "getServerNumPortsRequired() call has incorrect number of arguments. Takes 1 argument")); - } - var ipPromise = evaluate(exp.args[0], workerScript); - ipPromise.then(function(ip) { - var server = getServer(ip); - if (server == null) { - workerScript.scriptRef.log("getServerNumPortsRequired() failed. Invalid IP or hostname passed in: " + ip); - return reject(makeRuntimeRejectMsg(workerScript, "Invalid IP or hostname passed into getServerNumPortsRequired() command")); - } - workerScript.scriptRef.log("getServerNumPortsRequired() returned " + formatNumber(server.numOpenPortsRequired, 0) + " for " + server.hostname); - resolve(server.numOpenPortsRequired); - }, function(e) { - reject(e); - }); - } else if (exp.func.value == "fileExists") { - if (exp.args.length != 1 && exp.args.length != 2) { - return reject(makeRuntimeRejectMsg(workerScript, "fileExists() call has incorrect number of arguments. Takes 1 or 2 arguments")); - } - var argPromises = exp.args.map(function(arg) { - return evaluate(arg, workerScript); - }); - - var filename = ""; - Promise.all(argPromises).then(function(args) { - if (env.stopFlag) {return reject(workerScript);} - filename = args[0]; - if (exp.args.length == 1) { - return Promise.resolve(workerScript.serverIp); - } else { - return evaluate(exp.args[1], workerScript); - } - }).then(function(ip) { - var server = getServer(ip); - if (server == null) { - workerScript.scriptRef.log("fileExists() failed. Invalid IP or hostname passed in: " + ip); - return reject(makeRuntimeRejectMsg(workerScript, "Invalid IP or hostname passed into fileExists() command")); - } - - for (var i = 0; i < server.scripts.length; ++i) { - if (filename == server.scripts[i].filename) { - return resolve(true); - } - } - if (Player.hasProgram(filename)) { - return resolve(true); - } - return resolve(false); - }).catch(function(e) { - reject(e); - }); - } else if (exp.func.value == "isRunning") { - if (exp.args.length < 2) { - return reject(makeRuntimeRejectMsg(workerScript, "isRunning() call has incorrect number of arguments. Usage: isRunning(scriptname, server, [arg1], [arg2]...)")); - } - var argPromises = exp.args.map(function(arg) { - return evaluate(arg, workerScript); - }); - - var filename = ""; - var argsForTargetScript = []; - Promise.all(argPromises).then(function(args) { - if (env.stopFlag) {return reject(workerScript);} - filename = args[0]; - var ip = args[1]; - for (var i = 2; i < args.length; ++i) { - argsForTargetScript.push(args[i]); - } - var server = getServer(ip); - if (server == null) { - workerScript.scriptRef.log("isRunning() failed. Invalid IP or hostname passed in: " + ip); - return reject(makeRuntimeRejectMsg(workerScript, "Invalid IP or hostname passed into isRunning() command")); - } - var runningScriptObj = findRunningScript(filename, argsForTargetScript, server); - if (runningScriptObj != null) { - return resolve(true); - } - return resolve(false); - }).catch(function(e) { - reject(e); - }); - } else if (exp.func.value == "purchaseHacknetNode") { - if (exp.args.length != 0) { - return reject(makeRuntimeRejectMsg(workerScript, "purchaseHacknetNode() call has incorrect number of arguments. Takes 0 arguments")); - } - var cost = getCostOfNextHacknetNode(); - if (isNaN(cost)) { - return reject(makeRuntimeRejectMsg(workerScript, "Could not calculate cost in purchaseHacknetNode(). This is a bug please report to game dev")); - } - if (cost > Player.money) { - workerScript.scriptRef.log("Could not afford to purchase new Hacknet Node"); - return resolve(false); - } - - //Auto generate a name for the node for now...TODO - var numOwned = Player.hacknetNodes.length; - var name = "hacknet-node-" + numOwned; - var node = new HacknetNode(name); - node.updateMoneyGainRate(); - - Player.loseMoney(cost); - Player.hacknetNodes.push(node); - displayHacknetNodesContent(); - workerScript.scriptRef.log("Purchased new Hacknet Node with name: " + name); - resolve(numOwned); - } else if (exp.func.value == "val") { - if (exp.args.length != 1) { - return reject(makeRuntimeRejectMsg(workerScript, "val() call has incorrect number of arguments. Takes 1 arguments")); - } - var valPromise = evaluate(exp.args[0], workerScript); - valPromise.then(function(val) { - resolve(val); - }, function(e) { - reject(e); - }); } else { - reject(makeRuntimeRejectMsg(workerScript, "Invalid function: " + exp.func.value)); - } + reject(makeRuntimeRejectMsg(workerScript, "argument must be an identifier")); + } + break; + case "EmptyStatement": + resolve(false); + break; + case "ReturnStatement": + reject(makeRuntimeRejectMsg(workerScript, "Not implemented ReturnStatement")); + break; + case "BreakStatement": + reject(makeRuntimeRejectMsg(workerScript, "Not implemented BreakStatement")); + break; + case "IfStatement": + evaluateIf(exp, workerScript).then(function(forLoopRes) { + resolve("forLoopDone"); + }).catch(function(e) { + reject(e); + }); + break; + case "SwitchStatement": + reject(makeRuntimeRejectMsg(workerScript, "Not implemented SwitchStatement")); + break;e + case "WhileStatement": + evaluateWhile(exp, workerScript).then(function(forLoopRes) { + resolve("forLoopDone"); + }).catch(function(e) { + reject(e); + }); + break; + case "ForStatement": + evaluate(exp.init, workerScript).then(function(expInit) { + return evaluateFor(exp, workerScript); + }).then(function(forLoopRes) { + resolve("forLoopDone"); + }).catch(function(e) { + reject(e); + }); break; default: reject(makeRuntimeRejectMsg(workerScript, "Unrecognized token: " + exp.type + ". This is a bug please report to game developer")); @@ -691,41 +205,210 @@ function evaluate(exp, workerScript) { }); // End Promise } +function evalFunction(exp, workerScript){ + return new Promise(function(resolve, reject) { + if (exp.callee.type!="Identifier"){ + reject(makeRuntimeRejectMsg(workerScript, "callee must be an Identifier")); + return; + } + switch(exp.callee.name){ + case "print": + if (exp.arguments.length != 1) { + return reject(makeRuntimeRejectMsg(workerScript, "print() call has incorrect number of arguments. Takes 1 argument")); + } + var evaluatePromise = evaluate(exp.arguments[0], workerScript); + evaluatePromise.then(function(res) { + workerScript.scriptRef.log(res.toString()); + resolve(true); + }).catch(function(e) { + reject(e); + }); + break; + case "scan": + if (exp.arguments.length != 1) { + exp.arguments = [{value:Player.getCurrentServer().hostname,type:"Literal"}]; + } + var ipPromise = evaluate(exp.arguments[0], workerScript); + ipPromise.then(function (ip) { + var server = getServer(ip); + if (server == null) { + workerScript.scriptRef.log('getServerOpenPortsCount() failed. Invalid IP or hostname passed in: ' + ip); + return reject(makeRuntimeRejectMsg(workerScript, 'Invalid IP or hostname passed into getServerOpenPortsCount() command')); + } + var out = []; + for (var i = 0; i < server.serversOnNetwork.length; i++) { + var entry = server.getServerOnNetwork(i).hostname; + if (entry == null) { + continue; + } + out.push(entry); + } + workerScript.scriptRef.log('scan() returned ' + server.serversOnNetwork.length + ' connections for ' + server.hostname); + resolve(out); + }).catch(function(e) { + reject(e); + }); + break; + default: + reject(makeRuntimeRejectMsg(workerScript, "Invalid function: " + exp.callee)); + } + }); +} + +function evalBinary(exp, workerScript){ + return new Promise(function(resolve, reject) { + var expLeftPromise = evaluate(exp.left, workerScript); + expLeftPromise.then(function(expLeft) { + var expRightPromise = evaluate(exp.right, workerScript); + expRightPromise.then(function(expRight) { + switch (exp.operator){ + case "===": + case "==": + resolve(expLeft===expRight); + break; + case "!==": + case "!=": + resolve(expLeft!==expRight); + break; + case "<": + resolve(expLeft": + resolve(expLeft>expRight); + break; + case ">=": + resolve(expLeft>=expRight); + break; + case "+": + resolve(expLeft+expRight); + break; + case "-": + resolve(expLeft-expRight); + break; + case "*": + resolve(expLeft*expRight); + break; + case "/": + resolve(expLeft/expRight); + break; + case "%": + resolve(expLeft%expRight); + break; + case "in": + resolve(expLeft in expRight); + break; + case "instanceof": + resolve(expLeft instanceof expRight); + break; + case "||": + resolve(expLeft || expRight); + break; + case "&&": + resolve(expLeft && expRight); + break; + default: + reject(makeRuntimeRejectMsg(workerScript, "Bitwise operators are not implemented")); + } + }, function(e) { + reject(e); + }); + }, function(e) { + reject(e); + }); + }); +} + +function evalUnary(exp, workerScript){ + return new Promise(function(resolve, reject) { + var expLeftPromise = evaluate(exp.left, workerScript); + expLeftPromise.then(function(expLeft) { + switch(exp.operator){ + case "++": + break + case "--": + break; + } + }, function(e) { + reject(e); + }); + }); +} + +function evalAssignment(exp, workerScript) { + var env = workerScript.env; + return new Promise(function(resolve, reject) { + if (env.stopFlag) {return reject(workerScript);} + + if (exp.left.type != "Identifier") { + return reject(makeRuntimeRejectMsg(workerScript, "Cannot assign to " + JSON.stringify(exp.left))); + } + + if (exp.operator !== "=" && !(exp.left.name in env.vars)){ + return reject(makeRuntimeRejectMsg(workerScript, "variable " + exp.left.name + " not definied")); + } + + var expRightPromise = evaluate(exp.right, workerScript); + expRightPromise.then(function(expRight) { + try { + switch (exp.operator) { + case "=": + env.set(exp.left.name,expRight); + break; + case "+=": + env.set(exp.left.name,env.get(exp.left.name) + expRight); + break; + case "-=": + env.set(exp.left.name,env.get(exp.left.name) - expRight); + break; + case "*=": + env.set(exp.left.name,env.get(exp.left.name) * expRight); + break; + case "/=": + env.set(exp.left.name,env.get(exp.left.name) / expRight); + break; + case "%=": + env.set(exp.left.name,env.get(exp.left.name) % expRight); + break; + default: + reject(makeRuntimeRejectMsg(workerScript, "Bitwise assignment is not implemented")); + } + } catch (e) { + return reject(makeRuntimeRejectMsg(workerScript, "Failed to set environment variable: " + e.toString())); + } + resolve(false); //Return false so this doesnt cause conditionals to evaluate + }, function(e) { + reject(e); + }); + }); +} + //Returns true if any of the if statements evaluated, false otherwise. Therefore, the else statement //should evaluate if this returns false function evaluateIf(exp, workerScript, i) { var env = workerScript.env; return new Promise(function(resolve, reject) { - if (i >= exp.cond.length) { - //Catch out of bounds errors - resolve(false); - } else { - var cond = evaluate(exp.cond[i], workerScript); - cond.then(function(condRes) { - if (condRes) { - var evalThen = evaluate(exp.then[i], workerScript); - evalThen.then(function(res) { - resolve(true); - }, function(e) { - reject(e); - }); - } else { - //If this if statement isnt true, go on the next elif, or recursively resolve - if (i == exp.cond.length-1) { - resolve(false); - } else { - var recursiveCall = evaluateIf(exp, workerScript, i+1); - recursiveCall.then(function(res) { - resolve(res); - }, function(e) { - reject(e); - }); - } - } - }, function(e) { - reject(e); - }); - } + evaluate(exp.test, workerScript).then(function(condRes) { + if (condRes) { + evaluate(exp.consequent, workerScript).then(function(res) { + resolve(true); + }, function(e) { + reject(e); + }); + } else if (exp.alternate) { + evaluate(exp.alternate, workerScript).then(function(res) { + resolve(true); + }, function(e) { + reject(e); + }); + } else { + resolve("endIf") + } + }, function(e) { + reject(e); + }); }); } @@ -735,45 +418,15 @@ function evaluateFor(exp, workerScript) { return new Promise(function(resolve, reject) { if (env.stopFlag) {reject(workerScript); return;} - var pCond = new Promise(function(resolve, reject) { - setTimeout(function() { - var evaluatePromise = evaluate(exp.cond, workerScript); - evaluatePromise.then(function(resCond) { - resolve(resCond); - }, function(e) { - reject(e); - }); - }, CONSTANTS.CodeInstructionRunTime); - }); - + var pCond = evaluate(exp.test, workerScript); pCond.then(function(resCond) { if (resCond) { //Run the for loop code - var pCode = new Promise(function(resolve, reject) { - setTimeout(function() { - var evaluatePromise = evaluate(exp.code, workerScript); - evaluatePromise.then(function(resCode) { - resolve(resCode); - }, function(e) { - reject(e); - }); - }, CONSTANTS.CodeInstructionRunTime); - }); - + var pBody = evaluate(exp.body, workerScript); //After the code executes make a recursive call - pCode.then(function(resCode) { - var pPostLoop = new Promise(function(resolve, reject) { - setTimeout(function() { - var evaluatePromise = evaluate(exp.postloop, workerScript); - evaluatePromise.then(function(foo) { - resolve("postLoopFinished"); - }, function(e) { - reject(e); - }); - }, CONSTANTS.CodeInstructionRunTime); - }); - - pPostLoop.then(function(resPostloop) { + pBody.then(function(resCode) { + var pUpdate = evaluate(exp.update, workerScript); + pUpdate.then(function(resPostloop) { var recursiveCall = evaluateFor(exp, workerScript); recursiveCall.then(function(foo) { resolve("endForLoop"); @@ -783,7 +436,6 @@ function evaluateFor(exp, workerScript) { }, function(e) { reject(e); }); - }, function(e) { reject(e); }); @@ -804,7 +456,7 @@ function evaluateWhile(exp, workerScript) { var pCond = new Promise(function(resolve, reject) { setTimeout(function() { - var evaluatePromise = evaluate(exp.cond, workerScript); + var evaluatePromise = evaluate(exp.test, workerScript); evaluatePromise.then(function(resCond) { resolve(resCond); }, function(e) { @@ -818,7 +470,7 @@ function evaluateWhile(exp, workerScript) { //Run the while loop code var pCode = new Promise(function(resolve, reject) { setTimeout(function() { - var evaluatePromise = evaluate(exp.code, workerScript); + var evaluatePromise = evaluate(exp.body, workerScript); evaluatePromise.then(function(resCode) { resolve(resCode); }, function(e) { @@ -957,13 +609,13 @@ function evaluateProg(exp, workerScript, index) { return new Promise(function(resolve, reject) { if (env.stopFlag) {reject(workerScript); return;} - if (index >= exp.prog.length) { + if (index >= exp.body.length) { resolve("progFinished"); } else { //Evaluate this line of code in the prog var code = new Promise(function(resolve, reject) { setTimeout(function() { - var evaluatePromise = evaluate(exp.prog[index], workerScript); + var evaluatePromise = evaluate(exp.body[index], workerScript); evaluatePromise.then(function(evalRes) { resolve(evalRes); }, function(e) { @@ -1028,47 +680,43 @@ function apply_op(op, a, b) { //Run a script from inside a script using run() command function runScriptFromScript(server, scriptname, args, workerScript, threads=1) { - return new Promise(function(resolve, reject) { - var env = workerScript.env; - if (env.stopFlag) {reject(workerScript); return;} - setTimeout(function() { - //Check if the script is already running - var runningScriptObj = findRunningScript(scriptname, args, server); - if (runningScriptObj != null) { - workerScript.scriptRef.log(scriptname + " is already running on " + server.hostname); - return resolve(false); - } - - //Check if the script exists and if it does run it - for (var i = 0; i < server.scripts.length; ++i) { - if (server.scripts[i].filename == scriptname) { - //Check for admin rights and that there is enough RAM availble to run - var script = server.scripts[i]; - var ramUsage = script.ramUsage; - ramUsage = ramUsage * threads * Math.pow(CONSTANTS.MultithreadingRAMCost, threads-1); - var ramAvailable = server.maxRam - server.ramUsed; - - if (server.hasAdminRights == false) { - workerScript.scriptRef.log("Cannot run script " + scriptname + " on " + server.hostname + " because you do not have root access!"); - return resolve(false); - } else if (ramUsage > ramAvailable){ - workerScript.scriptRef.log("Cannot run script " + scriptname + "(t=" + threads + ") on " + server.hostname + " because there is not enough available RAM!"); - return resolve(false); - } else { - //Able to run script - workerScript.scriptRef.log("Running script: " + scriptname + " on " + server.hostname + " with " + threads + " threads and args: " + printArray(args) + ". May take a few seconds to start up..."); - var runningScriptObj = new RunningScript(script, args); - runningScriptObj.threads = threads; - server.runningScripts.push(runningScriptObj); //Push onto runningScripts - addWorkerScript(runningScriptObj, server); - return resolve(true); - } + setTimeout(function() { + //Check if the script is already running + var runningScriptObj = findRunningScript(scriptname, args, server); + if (runningScriptObj != null) { + workerScript.scriptRef.log(scriptname + " is already running on " + server.hostname); + return false; + } + + //Check if the script exists and if it does run it + for (var i = 0; i < server.scripts.length; ++i) { + if (server.scripts[i].filename == scriptname) { + //Check for admin rights and that there is enough RAM availble to run + var script = server.scripts[i]; + var ramUsage = script.ramUsage; + ramUsage = ramUsage * threads * Math.pow(CONSTANTS.MultithreadingRAMCost, threads-1); + var ramAvailable = server.maxRam - server.ramUsed; + + if (server.hasAdminRights == false) { + workerScript.scriptRef.log("Cannot run script " + scriptname + " on " + server.hostname + " because you do not have root access!"); + return false; + } else if (ramUsage > ramAvailable){ + workerScript.scriptRef.log("Cannot run script " + scriptname + "(t=" + threads + ") on " + server.hostname + " because there is not enough available RAM!"); + return false; + } else { + //Able to run script + workerScript.scriptRef.log("Running script: " + scriptname + " on " + server.hostname + " with " + threads + " threads and args: " + printArray(args) + ". May take a few seconds to start up..."); + var runningScriptObj = new RunningScript(script, args); + runningScriptObj.threads = threads; + server.runningScripts.push(runningScriptObj); //Push onto runningScripts + addWorkerScript(runningScriptObj, server); + return true; } } - workerScript.scriptRef.log("Could not find script " + scriptname + " on " + server.hostname); - resolve(false); - }, CONSTANTS.CodeInstructionRunTime); - }); + } + workerScript.scriptRef.log("Could not find script " + scriptname + " on " + server.hostname); + resolve(false); + }, CONSTANTS.CodeInstructionRunTime); } function isScriptErrorMessage(msg) { diff --git a/src/NetscriptFunctions.js b/src/NetscriptFunctions.js index 250e66bba..1d55ff4be 100644 --- a/src/NetscriptFunctions.js +++ b/src/NetscriptFunctions.js @@ -1,453 +1,475 @@ -/* Netscript Functions - * Implementation for Netscript features */ -function netscriptArray(exp, workerScript) { - var env = workerScript.env; - var arr = env.get(exp.value); - return new Promise(function(resolve, reject) { - if (exp.index == null || exp.index == undefined) { - if ((exp.op.type == "call" && exp.op.func.value == "length") || - (exp.op.type == "var" && exp.op.value == "length")) { - return resolve(arr.length); - } else if ((exp.op.type == "call" && exp.op.func.value == "clear") || - (exp.op.type == "var" && exp.op.value == "clear")) { - arr.length = 0; - return resolve(true); - } else if (exp.op.type == "call" && exp.op.func.value == "push") { - if (exp.op.args.length == 1) { - var entry = Object.assign({}, exp.op.args[0]); - arr.push(entry); - return resolve(true); - } else { - return reject(makeRuntimeRejectMsg(workerScript, "Invalid number of arguments passed into array.push() command. Takes 1 argument")); - } - } else { - return reject(makeRuntimeRejectMsg(workerScript, "Invalid operation on an array")); +function NetscriptFunctions(workerScript) { + return { + hacknetnodes : Player.hacknetNodes, + scan : function(ip=workerScript.serverIp){ + var server = getServer(ip); + if (server == null) { + throw makeRuntimeRejectMsg(workerScript, 'Invalid IP or hostname passed into scan() command'); + } + var out = []; + for (var i = 0; i < server.serversOnNetwork.length; i++) { + var entry = server.getServerOnNetwork(i).hostname; + if (entry == null) { + continue; + } + out.push(entry); + } + workerScript.scriptRef.log('scan() returned ' + server.serversOnNetwork.length + ' connections for ' + server.hostname); + return out; + }, + hack : function(ip){ + if (ip === undefined) { + throw makeRuntimeRejectMsg(workerScript, "Hack() call has incorrect number of arguments. Takes 1 argument"); + } + var threads = workerScript.scriptRef.threads; + if (isNaN(threads) || threads < 1) {threads = 1;} + var server = getServer(ip); + if (server == null) { + throw workerScript.scriptRef.log("hack() error. Invalid IP or hostname passed in: " + ip + ". Stopping..."); } - } - //The array is being indexed - var indexPromise = evaluate(exp.index.value, workerScript); - indexPromise.then(function(i) { - if (isNaN(i)) { - return reject(makeRuntimeRejectMsg(workerScript, "Invalid access to array. Index is not a number: " + idx)); - } else if (i >= arr.length || i < 0) { - return reject(makeRuntimeRejectMsg(workerScript, "Out of bounds: Invalid index in [] operator")); - } else { - if (exp.op && exp.op.type == "call") { - switch(exp.op.func.value) { - case "insert": - if (exp.op.args.length == 1) { - var entry = Object.assign({}, exp.op.args[0]); - arr.splice(i, 0, entry); - return resolve(arr.length); - } else { - return reject(makeRuntimeRejectMsg(workerScript, "Invalid number of arguments passed into array insert() call. Takes 1 argument")); - } - break; - case "remove": - if (exp.op.args.length == 0) { - return resolve(arr.splice(i, 1)); - } else { - return reject(makeRuntimeRejectMsg(workerScript, "Invalid number of arguments passed into array remove() call. Takes 1 argument")); - } - break; - default: - return reject(makeRuntimeRejectMsg(workerScript, "Invalid call on array element: " + exp.op.func.value)); - break; + //Calculate the hacking time + var hackingTime = scriptCalculateHackingTime(server); //This is in seconds + + //No root access or skill level too low + if (server.hasAdminRights == false) { + throw workerScript.scriptRef.log("Cannot hack this server (" + server.hostname + ") because user does not have root access"); + } + + if (server.requiredHackingSkill > Player.hacking_skill) { + throw workerScript.scriptRef.log("Cannot hack this server (" + server.hostname + ") because user's hacking skill is not high enough"); + } + + workerScript.scriptRef.log("Attempting to hack " + ip + " in " + hackingTime.toFixed(3) + " seconds (t=" + threads + ")"); + //console.log("Hacking " + server.hostname + " after " + hackingTime.toString() + " seconds (t=" + threads + ")"); + return netscriptDelay(hackingTime* 1000).then(function() { + if (workerScript.env.stopFlag) {return Promise.reject(workerScript);} + var hackChance = scriptCalculateHackingChance(server); + var rand = Math.random(); + var expGainedOnSuccess = scriptCalculateExpGain(server) * threads; + var expGainedOnFailure = (expGainedOnSuccess / 4); + if (rand < hackChance) { //Success! + var moneyGained = scriptCalculatePercentMoneyHacked(server); + moneyGained = Math.floor(server.moneyAvailable * moneyGained) * threads; + + //Over-the-top safety checks + if (moneyGained <= 0) { + moneyGained = 0; + expGainedOnSuccess = expGainedOnFailure; } - } else { - //Return the indexed element - var resPromise = evaluate(arr[i], workerScript); - resPromise.then(function(res) { - resolve(res); - }, function(e) { - reject(e); - }); + if (moneyGained > server.moneyAvailable) {moneyGained = server.moneyAvailable;} + server.moneyAvailable -= moneyGained; + if (server.moneyAvailable < 0) {server.moneyAvailable = 0;} + + Player.gainMoney(moneyGained); + workerScript.scriptRef.onlineMoneyMade += moneyGained; + workerScript.scriptRef.recordHack(server.ip, moneyGained, threads); + Player.gainHackingExp(expGainedOnSuccess); + workerScript.scriptRef.onlineExpGained += expGainedOnSuccess; + //console.log("Script successfully hacked " + server.hostname + " for $" + formatNumber(moneyGained, 2) + " and " + formatNumber(expGainedOnSuccess, 4) + " exp"); + workerScript.scriptRef.log("Script SUCCESSFULLY hacked " + server.hostname + " for $" + formatNumber(moneyGained, 2) + " and " + formatNumber(expGainedOnSuccess, 4) + " exp (t=" + threads + ")"); + server.fortify(CONSTANTS.ServerFortifyAmount * threads); + return Promise.resolve(true); + } else { + //Player only gains 25% exp for failure? TODO Can change this later to balance + Player.gainHackingExp(expGainedOnFailure); + workerScript.scriptRef.onlineExpGained += expGainedOnFailure; + //console.log("Script unsuccessful to hack " + server.hostname + ". Gained " + formatNumber(expGainedOnFailure, 4) + " exp"); + workerScript.scriptRef.log("Script FAILED to hack " + server.hostname + ". Gained " + formatNumber(expGainedOnFailure, 4) + " exp (t=" + threads + ")"); + return Promise.resolve(false); } - } - }, function(e) { - reject(e); - }); - }); -} - -function netscriptAssign(exp, workerScript) { - var env = workerScript.env; - return new Promise(function(resolve, reject) { - if (env.stopFlag) {return reject(workerScript);} - - if (exp.left.type != "var") { - return reject(makeRuntimeRejectMsg(workerScript, "Cannot assign to " + JSON.stringify(exp.left))); - } - - //Assigning an element in an array - if (exp.left.index) { - try { - var res = env.get(exp.left.value); - if (res.constructor === Array || res instanceof Array) { - var i = 0; - var iPromise = evaluate(exp.left.index.value, workerScript); - iPromise.then(function(idx) { - if (isNaN(idx)) { - return reject(makeRuntimeRejectMsg(workerScript, "Invalid access to array. Index is not a number: " + idx)); - } else if (idx >= res.length || idx < 0) { - return reject(makeRuntimeRejectMsg(workerScript, "Out of bounds: Invalid index in [] operator")); - } else { - //Clone res to be exp.right - i = idx; - res[i] = Object.assign({}, exp.right); - return evaluate(exp.right, workerScript); - } - }).then(function(finalRes) { - resolve(finalRes); - }).catch(function(e) { - return reject(e); - }); - } else { - return reject(makeRuntimeRejectMsg(workerScript, "Trying to access a non-array variable using the [] operator")); - } - } catch(e) { - return reject(makeRuntimeRejectMsg(workerScript, e.toString())); - } - } else { - var expRightPromise = evaluate(exp.right, workerScript); - expRightPromise.then(function(expRight) { - try { - env.set(exp.left.value, expRight); - } catch (e) { - return reject(makeRuntimeRejectMsg(workerScript, "Failed to set environment variable: " + e.toString())); - } - resolve(false); //Return false so this doesnt cause conditionals to evaluate - }, function(e) { - reject(e); }); - } - }); -} - -function netscriptBinary(exp, workerScript) { - var env = workerScript.env; - if (env.stopFlag) {return Promise.reject(workerScript);} - - var opPromises = [evaluate(exp.left, workerScript), evaluate(exp.right, workerScript)]; - return Promise.all(opPromises).then(function (ops) { - try { - var result = apply_op(exp.operator, ops[0], ops[1]); - return Promise.resolve(result); - } catch(e) { - return Promise.reject(e); - } - }).catch(function(e) { - return Promise.reject(e); - }); -} - -function netscriptHack(exp, workerScript) { - var env = workerScript.env; - if (env.stopFlag) {return Promise.reject(workerScript);} - var threads = workerScript.scriptRef.threads; - if (isNaN(threads) || threads < 1) {threads = 1;} - - if (exp.args.length != 1) { - return Promise.reject(makeRuntimeRejectMsg(workerScript, "Hack() call has incorrect number of arguments. Takes 1 argument")); - } - var ipPromise = evaluate(exp.args[0], workerScript); - return ipPromise.then(function(ip) { - var server = getServer(ip); - if (server == null) { - workerScript.scriptRef.log("hack() error. Invalid IP or hostname passed in: " + ip + ". Stopping..."); - return Promise.reject(makeRuntimeRejectMsg(workerScript, "Invalid IP or hostname passed into hack() command")); - } - - //Calculate the hacking time - var hackingTime = scriptCalculateHackingTime(server); //This is in seconds - - //No root access or skill level too low - if (server.hasAdminRights == false) { - workerScript.scriptRef.log("Cannot hack this server (" + server.hostname + ") because user does not have root access"); - return Promise.reject(makeRuntimeRejectMsg(workerScript, "Script crashed because it did not have root access to " + server.hostname)); - } - - if (server.requiredHackingSkill > Player.hacking_skill) { - workerScript.scriptRef.log("Cannot hack this server (" + server.hostname + ") because user's hacking skill is not high enough"); - return Promise.reject(makeRuntimeRejectMsg(workerScript, "Script crashed because player's hacking skill is not high enough to hack " + server.hostname)); - } - - workerScript.scriptRef.log("Attempting to hack " + ip + " in " + hackingTime.toFixed(3) + " seconds (t=" + threads + ")"); - return Promise.resolve([server, hackingTime]); - }).then(function([server, hackingTime]) { - //console.log("Hacking " + server.hostname + " after " + hackingTime.toString() + " seconds (t=" + threads + ")"); - return netscriptDelay(hackingTime* 1000).then(function() { - if (env.stopFlag) {return Promise.reject(workerScript);} - var hackChance = scriptCalculateHackingChance(server); - var rand = Math.random(); - var expGainedOnSuccess = scriptCalculateExpGain(server) * threads; - var expGainedOnFailure = (expGainedOnSuccess / 4); - if (rand < hackChance) { //Success! - var moneyGained = scriptCalculatePercentMoneyHacked(server); - moneyGained = Math.floor(server.moneyAvailable * moneyGained) * threads; - - //Over-the-top safety checks - if (moneyGained <= 0) { - moneyGained = 0; - expGainedOnSuccess = expGainedOnFailure; - } - if (moneyGained > server.moneyAvailable) {moneyGained = server.moneyAvailable;} - server.moneyAvailable -= moneyGained; - if (server.moneyAvailable < 0) {server.moneyAvailable = 0;} - - Player.gainMoney(moneyGained); - workerScript.scriptRef.onlineMoneyMade += moneyGained; - workerScript.scriptRef.recordHack(server.ip, moneyGained, threads); - Player.gainHackingExp(expGainedOnSuccess); - workerScript.scriptRef.onlineExpGained += expGainedOnSuccess; - //console.log("Script successfully hacked " + server.hostname + " for $" + formatNumber(moneyGained, 2) + " and " + formatNumber(expGainedOnSuccess, 4) + " exp"); - workerScript.scriptRef.log("Script SUCCESSFULLY hacked " + server.hostname + " for $" + formatNumber(moneyGained, 2) + " and " + formatNumber(expGainedOnSuccess, 4) + " exp (t=" + threads + ")"); - server.fortify(CONSTANTS.ServerFortifyAmount * threads); + }, + sleep : function(time){ + if (time === undefined) { + throw makeRuntimeRejectMsg(workerScript, "sleep() call has incorrect number of arguments. Takes 1 argument"); + } + workerScript.scriptRef.log("Sleeping for " + sleepTime + " milliseconds"); + return netscriptDelay(sleepTime).then(function() { return Promise.resolve(true); - } else { - //Player only gains 25% exp for failure? TODO Can change this later to balance - Player.gainHackingExp(expGainedOnFailure); - workerScript.scriptRef.onlineExpGained += expGainedOnFailure; - //console.log("Script unsuccessful to hack " + server.hostname + ". Gained " + formatNumber(expGainedOnFailure, 4) + " exp"); - workerScript.scriptRef.log("Script FAILED to hack " + server.hostname + ". Gained " + formatNumber(expGainedOnFailure, 4) + " exp (t=" + threads + ")"); - return Promise.resolve(false); + }); + }, + grow : function(ip){ + var threads = workerScript.scriptRef.threads; + if (isNaN(threads) || threads < 1) {threads = 1;} + if (ip === undefined) { + throw makeRuntimeRejectMsg(workerScript, "grow() call has incorrect number of arguments. Takes 1 argument"); } - }); - }).then(function(res) { - return Promise.resolve(res); - }).catch(function(e) { - return Promise.reject(e); - }); -} - -function netscriptGrow(exp, workerScript) { - var env = workerScript.env; - if (env.stopFlag) {return Promise.reject(workerScript);} - var threads = workerScript.scriptRef.threads; - if (isNaN(threads) || threads < 1) {threads = 1;} - if (exp.args.length != 1) { - return Promise.reject(makeRuntimeRejectMsg(workerScript, "grow() call has incorrect number of arguments. Takes 1 argument")); - } - var ipPromise = evaluate(exp.args[0], workerScript); - return ipPromise.then(function(ip) { - if (env.stopFlag) {return Promise.reject(workerScript);} - var server = getServer(ip); - if (server == null) { - workerScript.scriptRef.log("Cannot grow(). Invalid IP or hostname passed in: " + ip); - return Promise.reject(makeRuntimeRejectMsg(workerScript, "Invalid IP or hostname passed into grow() command")); - } - - //No root access or skill level too low - if (server.hasAdminRights == false) { - workerScript.scriptRef.log("Cannot grow this server (" + server.hostname + ") because user does not have root access"); - return Promise.reject(makeRuntimeRejectMsg(workerScript, "Script crashed because it did not have root access to " + server.hostname)); - } - - var growTime = scriptCalculateGrowTime(server); - //console.log("Executing grow() on server " + server.hostname + " in " + formatNumber(growTime/1000, 3) + " seconds") - workerScript.scriptRef.log("Executing grow() on server " + server.hostname + " in " + formatNumber(growTime/1000, 3) + " seconds (t=" + threads + ")"); - - return Promise.resolve([server, growTime]); - }).then(function([server, growTime]) { - if (env.stopFlag) {return Promise.reject(workerScript);} - return netscriptDelay(growTime).then(function() { - if (env.stopFlag) {return Promise.reject(workerScript);} - server.moneyAvailable += (1 * threads); //It can be grown even if it has no money - var growthPercentage = processSingleServerGrowth(server, 450 * threads); - workerScript.scriptRef.recordGrow(server.ip, threads); - var expGain = scriptCalculateExpGain(server) * threads; - if (growthPercentage == 1) { - expGain = 0; + var server = getServer(ip); + if (server == null) { + throw workerScript.scriptRef.log("Cannot grow(). Invalid IP or hostname passed in: " + ip); } - workerScript.scriptRef.log("Available money on " + server.hostname + " grown by " - + formatNumber(growthPercentage*100 - 100, 6) + "%. Gained " + - formatNumber(expGain, 4) + " hacking exp (t=" + threads +")"); - workerScript.scriptRef.onlineExpGained += expGain; - Player.gainHackingExp(expGain); - return Promise.resolve(growthPercentage); - }); - }).then(function(res) { - return Promise.resolve(res); - }).catch(function(e) { - return Promise.reject(e); - }) + + //No root access or skill level too low + if (server.hasAdminRights == false) { + throw workerScript.scriptRef.log("Cannot grow this server (" + server.hostname + ") because user does not have root access"); + } + + var growTime = scriptCalculateGrowTime(server); + //console.log("Executing grow() on server " + server.hostname + " in " + formatNumber(growTime/1000, 3) + " seconds") + workerScript.scriptRef.log("Executing grow() on server " + server.hostname + " in " + formatNumber(growTime/1000, 3) + " seconds (t=" + threads + ")"); + return netscriptDelay(growTime).then(function() { + if (workerScript.env.stopFlag) {return Promise.reject(workerScript);} + server.moneyAvailable += (1 * threads); //It can be grown even if it has no money + var growthPercentage = processSingleServerGrowth(server, 450 * threads); + workerScript.scriptRef.recordGrow(server.ip, threads); + var expGain = scriptCalculateExpGain(server) * threads; + if (growthPercentage == 1) { + expGain = 0; + } + workerScript.scriptRef.log("Available money on " + server.hostname + " grown by " + + formatNumber(growthPercentage*100 - 100, 6) + "%. Gained " + + formatNumber(expGain, 4) + " hacking exp (t=" + threads +")"); + workerScript.scriptRef.onlineExpGained += expGain; + Player.gainHackingExp(expGain); + return Promise.resolve(growthPercentage); + }); + }, + weaken : function(ip){ + var threads = workerScript.scriptRef.threads; + if (isNaN(threads) || threads < 1) {threads = 1;} + if (ip === undefined) { + throw makeRuntimeRejectMsg(workerScript, "weaken() call has incorrect number of arguments. Takes 1 argument"); + } + var server = getServer(ip); + if (server == null) { + throw workerScript.scriptRef.log("Cannot weaken(). Invalid IP or hostname passed in: " + ip); + } + + //No root access or skill level too low + if (server.hasAdminRights == false) { + throw workerScript.scriptRef.log("Cannot weaken this server (" + server.hostname + ") because user does not have root access"); + } + + var weakenTime = scriptCalculateWeakenTime(server); + //console.log("Executing weaken() on server " + server.hostname + " in " + formatNumber(weakenTime/1000, 3) + " seconds") + workerScript.scriptRef.log("Executing weaken() on server " + server.hostname + " in " + + formatNumber(weakenTime/1000, 3) + " seconds (t=" + threads + ")"); + return netscriptDelay(weakenTime).then(function() { + if (workerScript.env.stopFlag) {return Promise.reject(workerScript);} + server.weaken(CONSTANTS.ServerWeakenAmount * threads); + workerScript.scriptRef.recordWeaken(server.ip, threads); + var expGain = scriptCalculateExpGain(server) * threads; + workerScript.scriptRef.log("Server security level on " + server.hostname + " weakened to " + server.hackDifficulty + + ". Gained " + formatNumber(expGain, 4) + " hacking exp (t=" + threads + ")"); + workerScript.scriptRef.onlineExpGained += expGain; + Player.gainHackingExp(expGain); + return Promise.resolve(CONSTANTS.ServerWeakenAmount * threads); + }); + }, + print : function(args){ + if (args === undefined) { + throw makeRuntimeRejectMsg(workerScript, "print() call has incorrect number of arguments. Takes 1 argument"); + } + workerScript.scriptRef.log(args.toString()); + }, + nuke : function(ip){ + if (ip === undefined) { + throw makeRuntimeRejectMsg(workerScript, "Program call has incorrect number of arguments. Takes 1 argument"); + } + var server = getServer(ip); + if (server == null) { + throw workerScript.scriptRef.log("Cannot call " + programName + ". Invalid IP or hostname passed in: " + ip); + } + if (server.openPortCount < server.numOpenPortsRequired) { + throw makeRuntimeRejectMsg(workerScript, "Not enough ports opened to use NUKE.exe virus"); + } + if (server.hasAdminRights) { + workerScript.scriptRef.log("Already have root access to " + server.hostname); + } else { + server.hasAdminRights = true; + workerScript.scriptRef.log("Executed NUKE.exe virus on " + server.hostname + " to gain root access"); + } + return true; + }, + brutessh : function(ip){ + if (ip === undefined) { + throw makeRuntimeRejectMsg(workerScript, "Program call has incorrect number of arguments. Takes 1 argument"); + } + var server = getServer(ip); + if (server == null) { + throw workerScript.scriptRef.log("Cannot call " + programName + ". Invalid IP or hostname passed in: " + ip); + } + if (!server.sshPortOpen) { + workerScript.scriptRef.log("Executed BruteSSH.exe virus on " + server.hostname + " to open SSH port (22)"); + server.sshPortOpen = true; + ++server.openPortCount; + } else { + workerScript.scriptRef.log("SSH Port (22) already opened on " + server.hostname); + } + return true; + }, + ftpcrack : function(ip){ + if (ip === undefined) { + throw makeRuntimeRejectMsg(workerScript, "Program call has incorrect number of arguments. Takes 1 argument"); + } + var server = getServer(ip); + if (server == null) { + throw workerScript.scriptRef.log("Cannot call " + programName + ". Invalid IP or hostname passed in: " + ip); + } + if (!server.ftpPortOpen) { + workerScript.scriptRef.log("Executed FTPCrack.exe virus on " + server.hostname + " to open FTP port (21)"); + server.ftpPortOpen = true; + ++server.openPortCount; + } else { + workerScript.scriptRef.log("FTP Port (21) already opened on " + server.hostname); + } + return true; + }, + relaysmtp : function(ip){ + if (ip === undefined) { + throw makeRuntimeRejectMsg(workerScript, "Program call has incorrect number of arguments. Takes 1 argument"); + } + var server = getServer(ip); + if (server == null) { + throw workerScript.scriptRef.log("Cannot call " + programName + ". Invalid IP or hostname passed in: " + ip); + } + if (!server.smtpPortOpen) { + workerScript.scriptRef.log("Executed relaySMTP.exe virus on " + server.hostname + " to open SMTP port (25)"); + server.smtpPortOpen = true; + ++server.openPortCount; + } else { + workerScript.scriptRef.log("SMTP Port (25) already opened on " + server.hostname); + } + return true; + }, + httpworm : function(ip){ + if (ip === undefined) { + throw makeRuntimeRejectMsg(workerScript, "Program call has incorrect number of arguments. Takes 1 argument"); + } + var server = getServer(ip); + if (server == null) { + throw workerScript.scriptRef.log("Cannot call " + programName + ". Invalid IP or hostname passed in: " + ip); + } + if (!server.httpPortOpen) { + workerScript.scriptRef.log("Executed HTTPWorm.exe virus on " + server.hostname + " to open HTTP port (80)"); + server.httpPortOpen = true; + ++server.openPortCount; + } else { + workerScript.scriptRef.log("HTTP Port (80) already opened on " + server.hostname); + } + return true; + }, + sqlinject : function(ip){ + if (ip === undefined) { + throw makeRuntimeRejectMsg(workerScript, "Program call has incorrect number of arguments. Takes 1 argument"); + } + var server = getServer(ip); + if (server == null) { + throw workerScript.scriptRef.log("Cannot call " + programName + ". Invalid IP or hostname passed in: " + ip); + } + if (!server.sqlPortOpen) { + workerScript.scriptRef.log("Executed SQLInject.exe virus on " + server.hostname + " to open SQL port (1433)"); + server.sqlPortOpen = true; + ++server.openPortCount; + } else { + workerScript.scriptRef.log("SQL Port (1433) already opened on " + server.hostname); + } + return true; + }, + run : function(scriptname,threads = 1,argsForNewScript=[]){ + if (scriptname === undefined) { + throw makeRuntimeRejectMsg(workerScript, "run() call has incorrect number of arguments. Usage: run(scriptname, [numThreads], [arg1], [arg2]...)"); + } + if (isNaN(threads) || threads < 1) { + throw makeRuntimeRejectMsg(workerScript, "Invalid argument for thread count passed into run(). Must be numeric and greater than 0"); + } + var scriptServer = getServer(workerScript.serverIp); + if (scriptServer == null) { + throw makeRuntimeRejectMsg(workerScript, "Could not find server. This is a bug in the game. Report to game dev"); + } + + return runScriptFromScript(scriptServer, scriptname, argsForNewScript, workerScript, threads); + }, + exec : function(scriptname,ip,threads = 1,argsForNewScript=[]){ + if (scriptname === undefined || ip === undefined) { + throw makeRuntimeRejectMsg(workerScript, "exec() call has incorrect number of arguments. Usage: exec(scriptname, server, [numThreads], [arg1], [arg2]...)"); + } + if (isNaN(threads) || threads < 1) { + throw makeRuntimeRejectMsg(workerScript, "Invalid argument for thread count passed into exec(). Must be numeric and greater than 0"); + } + var server = getServer(ip); + if (server == null) { + throw makeRuntimeRejectMsg(workerScript, "Invalid hostname/ip passed into exec() command: " + args[1]); + } + + return runScriptFromScript(server, scriptname, argsForNewScript, workerScript, threads); + }, + kill : function(filename,ip,argsForKillTarget=[]){ + if (filename === undefined || ip === undefined) { + throw makeRuntimeRejectMsg(workerScript, "kill() call has incorrect number of arguments. Usage: kill(scriptname, server, [arg1], [arg2]...)"); + } + var server = getServer(ip); + if (server == null) { + throw workerScript.scriptRef.log("kill() failed. Invalid IP or hostname passed in: " + ip); + } + var runningScriptObj = findRunningScript(filename, argsForKillTarget, server); + if (runningScriptObj == null) { + workerScript.scriptRef.log("kill() failed. No such script "+ filename + " on " + server.hostname + " with args: " + printArray(argsForKillTarget)); + return false; + } + var res = killWorkerScript(runningScriptObj, server.ip); + if (res) { + workerScript.scriptRef.log("Killing " + filename + " on " + server.hostname + " with args: " + printArray(argsForKillTarget) + ". May take up to a few minutes for the scripts to die..."); + return true; + } else { + workerScript.scriptRef.log("kill() failed. No such script "+ filename + " on " + server.hostname + " with args: " + printArray(argsForKillTarget)); + return false; + } + }, + killall : function(ip){ + if (ip === undefined) { + throw makeRuntimeRejectMsg(workerScript, "killall() call has incorrect number of arguments. Takes 1 argument"); + } + var server = getServer(ip); + if (server == null) { + throw workerScript.scriptRef.log("killall() failed. Invalid IP or hostname passed in: " + ip); + } + for (var i = server.runningScripts.length-1; i >= 0; --i) { + killWorkerScript(server.runningScripts[i], server.ip); + } + workerScript.scriptRef.log("killall(): Killing all scripts on " + server.hostname + ". May take a few minutes for the scripts to die"); + return true; + }, + scp : function(scriptname,ip){ + if (scriptname === undefined || ip === undefined) { + throw makeRuntimeRejectMsg(workerScript, "scp() call has incorrect number of arguments. Takes 2 arguments"); + } + var destServer = getServer(ip); + if (destServer == null) { + throw makeRuntimeRejectMsg(workerScript, "Invalid hostname/ip passed into scp() command: " + ip); + } + + var currServ = getServer(workerScript.serverIp); + if (currServ == null) { + throw makeRuntimeRejectMsg(workerScript, "Could not find server ip for this script. This is a bug please contact game developer"); + } + + var sourceScript = null; + for (var i = 0; i < currServ.scripts.length; ++i) { + if (scriptname == currServ.scripts[i].filename) { + sourceScript = currServ.scripts[i]; + break; + } + } + if (sourceScript == null) { + workerScript.scriptRef.log(scriptname + " does not exist. scp() failed"); + return false; + } + + //Overwrite script if it already exists + for (var i = 0; i < destServer.scripts.length; ++i) { + if (scriptname == destServer.scripts[i].filename) { + workerScript.scriptRef.log("WARNING: " + scriptname + " already exists on " + destServer.hostname + " and it will be overwritten."); + workerScript.scriptRef.log(scriptname + " overwritten on " + destServer.hostname); + var oldScript = destServer.scripts[i]; + oldScript.code = sourceScript.code; + oldScript.ramUsage = sourceScript.ramUsage; + return true; + } + } + + //Create new script if it does not already exist + var newScript = new Script(); + newScript.filename = scriptname; + newScript.code = sourceScript.code; + newScript.ramUsage = sourceScript.ramUsage; + newScript.server = destServer.ip; + destServer.scripts.push(newScript); + workerScript.scriptRef.log(scriptname + " copied over to " + destServer.hostname); + return true; + }, + hasRootAccess : function(ip){ + if (ip===undefinied){ + throw makeRuntimeRejectMsg(workerScript, "hasRootAccess() call has incorrect number of arguments. Takes 1 argument"); + } + var server = getServer(ip); + if (server == null){ + throw workerScript.scriptRef.log("hasRootAccess() failed. Invalid IP or hostname passed in: " + ip); + } + return server.hasAdimRights; + }, + getHostname : function(){ + var scriptServer = getServer(workerScript.serverIp); + if (scriptServer == null) { + throw makeRuntimeRejectMsg(workerScript, "Could not find server. This is a bug in the game. Report to game dev"); + } + return scriptServer.hostname; + }, + getHackingLevel : function(){ + Player.updateSkillLevels(); + workerScript.scriptRef.log("getHackingLevel() returned " + Player.hacking_skill); + return Player.hacking_skill; + }, + getServerMoneyAvailable : function(ip){ + var server = getServer(ip); + if (server == null) { + throw workerScript.scriptRef.log("Cannot getServerMoneyAvailable(). Invalid IP or hostname passed in: " + ip); + } + workerScript.scriptRef.log("getServerMoneyAvailable() returned " + formatNumber(server.moneyAvailable, 2) + " for " + server.hostname); + return server.moneyAvailable; + }, + getServerSecurityLevel : function(ip){ + var server = getServer(ip); + if (server == null) { + throw workerScript.scriptRef.log("getServerSecurityLevel() failed. Invalid IP or hostname passed in: " + ip); + } + workerScript.scriptRef.log("getServerSecurityLevel() returned " + formatNumber(server.hackDifficulty, 3) + " for " + server.hostname); + return server.hackDifficulty; + }, + getServerBaseSecurityLevel : function(ip){ + var server = getServer(ip); + if (server == null) { + throw workerScript.scriptRef.log("getServerBaseSecurityLevel() failed. Invalid IP or hostname passed in: " + ip); + } + workerScript.scriptRef.log("getServerBaseSecurityLevel() returned " + formatNumber(server.baseDifficulty, 3) + " for " + server.hostname); + return server.baseDifficulty; + }, + getServerRequiredHackingLevel : function(ip){ + var server = getServer(ip); + if (server == null) { + throw workerScript.scriptRef.log("getServerRequiredHackingLevel() failed. Invalid IP or hostname passed in: " + ip); + } + workerScript.scriptRef.log("getServerRequiredHackingLevel returned " + formatNumber(server.requiredHackingSkill, 0) + " for " + server.hostname); + return server.requiredHackingSkill; + }, + getServerMaxMoney : function(ip){ + var server = getServer(ip); + if (server == null) { + throw workerScript.scriptRef.log("getServerRequiredHackingLevel() failed. Invalid IP or hostname passed in: " + ip); + } + workerScript.scriptRef.log("getServerMaxMoney() returned " + formatNumber(server.moneyMax, 0) + " for " + server.hostname); + return server.moneyMax; + }, + fileExists : function(filename,ip=workerScript.serverIp){ + if (filename === undefined) { + throw makeRuntimeRejectMsg(workerScript, "fileExists() call has incorrect number of arguments. Usage: fileExists(scriptname, [server])"); + } + var server = getServer(ip); + if (server == null) { + throw workerScript.scriptRef.log("fileExists() failed. Invalid IP or hostname passed in: " + ip); + } + for (var i = 0; i < server.scripts.length; ++i) { + if (filename == server.scripts[i].filename) { + return true; + } + } + if (Player.hasProgram(filename)) { + return true; //wrong? + } + return false; + }, + isRunning : function(filename,ip,argsForTargetScript=[]){ + if (filename === undefined || ip === undefined) { + throw makeRuntimeRejectMsg(workerScript, "isRunning() call has incorrect number of arguments. Usage: isRunning(scriptname, server, [arg1], [arg2]...)"); + } + var server = getServer(ip); + if (server == null) { + throw workerScript.scriptRef.log("isRunning() failed. Invalid IP or hostname passed in: " + ip); + } + return findRunningScript(filename, argsForTargetScript, server) != null; + }, + purchaseHacknetNode : purchaseHacknet + } } -function netscriptWeaken(exp, workerScript) { - var env = workerScript.env; - if (env.stopFlag) {return Promise.reject(workerScript);} - var threads = workerScript.scriptRef.threads; - if (isNaN(threads) || threads < 1) {threads = 1;} - if (exp.args.length != 1) { - return Promise.reject(makeRuntimeRejectMsg(workerScript, "weaken() call has incorrect number of arguments. Takes 1 argument")); - } - var ipPromise = evaluate(exp.args[0], workerScript); - return ipPromise.then(function(ip) { - if (env.stopFlag) {return Promise.reject(workerScript);} - var server = getServer(ip); - if (server == null) { - workerScript.scriptRef.log("Cannot weaken(). Invalid IP or hostname passed in: " + ip); - return Promise.reject(makeRuntimeRejectMsg(workerScript, "Invalid IP or hostname passed into weaken() command")); - } - - //No root access or skill level too low - if (server.hasAdminRights == false) { - workerScript.scriptRef.log("Cannot weaken this server (" + server.hostname + ") because user does not have root access"); - return Promise.reject(makeRuntimeRejectMsg(workerScript, "Script crashed because it did not have root access to " + server.hostname)); - } - - var weakenTime = scriptCalculateWeakenTime(server); - //console.log("Executing weaken() on server " + server.hostname + " in " + formatNumber(weakenTime/1000, 3) + " seconds") - workerScript.scriptRef.log("Executing weaken() on server " + server.hostname + " in " + - formatNumber(weakenTime/1000, 3) + " seconds (t=" + threads + ")"); - - return Promise.resolve([server, weakenTime]); - }).then(function([server, weakenTime]) { - if (env.stopFlag) {return Promise.reject(workerScript);} - return netscriptDelay(weakenTime).then(function() { - if (env.stopFlag) {return Promise.reject(workerScript);} - server.weaken(CONSTANTS.ServerWeakenAmount * threads); - workerScript.scriptRef.recordWeaken(server.ip, threads); - var expGain = scriptCalculateExpGain(server) * threads; - workerScript.scriptRef.log("Server security level on " + server.hostname + " weakened to " + server.hackDifficulty + - ". Gained " + formatNumber(expGain, 4) + " hacking exp (t=" + threads + ")"); - workerScript.scriptRef.onlineExpGained += expGain; - Player.gainHackingExp(expGain); - return Promise.resolve(CONSTANTS.ServerWeakenAmount * threads); - }); - }).then(function(res) { - return Promise.resolve(res); - }).catch(function(e) { - return Promise.reject(e); - }); -} - -function netscriptRunProgram(exp, workerScript, programName) { - var env = workerScript.env; - if (env.stopFlag) {return Promise.reject(workerScript);} - if (exp.args.length != 1) { - return Promise.reject(makeRuntimeRejectMsg(workerScript, "Program call has incorrect number of arguments. Takes 1 argument")); - } - var ipPromise = evaluate(exp.args[0], workerScript); - return ipPromise.then(function(ip) { - if (env.stopFlag) {return Promise.reject(workerScript);} - var server = getServer(ip); - if (server == null) { - workerScript.scriptRef.log("Cannot call " + programName + ". Invalid IP or hostname passed in: " + ip); - return Promise.reject(makeRuntimeRejectMsg(workerScript, "Invalid IP or hostname passed into " + programName + " command")); - } - - if (!Player.hasProgram(programName)) { - return Promise.reject(makeRuntimeRejectMsg(workerScript, "Player does not have " + programName + " on home computer")); - } - - switch(programName) { - case Programs.NukeProgram: - return netscriptRunNukeProgram(exp, workerScript, server); - break; - case Programs.BruteSSHProgram: - return netscriptRunBrutesshProgram(exp, workerScript, server); - break; - case Programs.FTPCrackProgram: - return netscriptRunFtpcrackProgram(exp, workerScript, server); - break; - case Programs.RelaySMTPProgram: - return netscriptRunRelaysmtpProgram(exp, workerScript, server); - break; - case Programs.HTTPWormProgram: - return netscriptRunHttpwormProgram(exp, workerScript, server); - break; - case Programs.SQLInjectProgram: - return netscriptRunSqlinjectProgram(exp, workerScript, server); - break; - default: - return Promise.reject(makeRuntimeRejectMsg(workerScript, "Invalid program. This is a bug please contact game dev")); - break; - } - }).then(function(res) { - return Promise.resolve(res); - }).catch(function(e) { - return Promise.reject(e); - }); -} - -function netscriptRunNukeProgram(exp, workerScript, server) { - var env = workerScript.env; - if (env.stopFlag) {return Promise.reject(workerScript);} - if (server.openPortCount < server.numOpenPortsRequired) { - return Promise.reject(makeRuntimeRejectMsg(workerScript, "Not enough ports opened to use NUKE.exe virus")); - } - if (server.hasAdminRights) { - workerScript.scriptRef.log("Already have root access to " + server.hostname); - } else { - server.hasAdminRights = true; - workerScript.scriptRef.log("Executed NUKE.exe virus on " + server.hostname + " to gain root access"); - } - return Promise.resolve(true); -} - -function netscriptRunBrutesshProgram(exp, workerScript, server) { - var env = workerScript.env; - if (env.stopFlag) {return Promise.reject(workerScript);} - if (!server.sshPortOpen) { - workerScript.scriptRef.log("Executed BruteSSH.exe virus on " + server.hostname + " to open SSH port (22)"); - server.sshPortOpen = true; - ++server.openPortCount; - } else { - workerScript.scriptRef.log("SSH Port (22) already opened on " + server.hostname); - } - return Promise.resolve(true); -} - -function netscriptRunFtpcrackProgram(exp, workerScript, server) { - var env = workerScript.env; - if (env.stopFlag) {return Promise.reject(workerScript);} - if (!server.ftpPortOpen) { - workerScript.scriptRef.log("Executed FTPCrack.exe virus on " + server.hostname + " to open FTP port (21)"); - server.ftpPortOpen = true; - ++server.openPortCount; - } else { - workerScript.scriptRef.log("FTP Port (21) already opened on " + server.hostname); - } - return Promise.resolve(true); -} - -function netscriptRunRelaysmtpProgram(exp, workerScript, server) { - var env = workerScript.env; - if (env.stopFlag) {return Promise.reject(workerScript);} - if (!server.smtpPortOpen) { - workerScript.scriptRef.log("Executed relaySMTP.exe virus on " + server.hostname + " to open SMTP port (25)"); - server.smtpPortOpen = true; - ++server.openPortCount; - } else { - workerScript.scriptRef.log("SMTP Port (25) already opened on " + server.hostname); - } - return Promise.resolve(true); -} - -function netscriptRunHttpwormProgram(exp, workerScript, server) { - var env = workerScript.env; - if (env.stopFlag) {return Promise.reject(workerScript);} - if (!server.httpPortOpen) { - workerScript.scriptRef.log("Executed HTTPWorm.exe virus on " + server.hostname + " to open HTTP port (80)"); - server.httpPortOpen = true; - ++server.openPortCount; - } else { - workerScript.scriptRef.log("HTTP Port (80) already opened on " + server.hostname); - } - return Promise.resolve(true); -} - -function netscriptRunSqlinjectProgram(exp, workerScript, server) { - var env = workerScript.env; - if (env.stopFlag) {return Promise.reject(workerScript);} - if (!server.sqlPortOpen) { - workerScript.scriptRef.log("Executed SQLInject.exe virus on " + server.hostname + " to open SQL port (1433)"); - server.sqlPortOpen = true; - ++server.openPortCount; - } else { - workerScript.scriptRef.log("SQL Port (1433) already opened on " + server.hostname); - } - return Promise.resolve(true); -} \ No newline at end of file diff --git a/src/NetscriptInputStream.js b/src/NetscriptInputStream.js deleted file mode 100644 index 99ffddbb7..000000000 --- a/src/NetscriptInputStream.js +++ /dev/null @@ -1,25 +0,0 @@ -/* InputStream class. Creates a "stream object" that provides operations to read - * from a string. */ -function InputStream(input) { - var pos = 0, line = 1, col = 0; - return { - next : next, - peek : peek, - eof : eof, - croak : croak, - }; - function next() { - var ch = input.charAt(pos++); - if (ch == "\n") line++, col = 0; else col++; - return ch; - } - function peek() { - return input.charAt(pos); - } - function eof() { - return peek() == ""; - } - function croak(msg) { - throw new Error(msg + " (" + line + ":" + col + ")"); - } -} \ No newline at end of file diff --git a/src/NetscriptParser.js b/src/NetscriptParser.js deleted file mode 100644 index 07498697d..000000000 --- a/src/NetscriptParser.js +++ /dev/null @@ -1,326 +0,0 @@ -/* Parser - * Creates Abstract Syntax Tree Nodes - * Operates on a stream of tokens from the Tokenizer - */ - -var FALSE = {type: "bool", value: false}; - -function Parser(input) { - var PRECEDENCE = { - "=": 1, - "||": 2, - "&&": 3, - "<": 7, ">": 7, "<=": 7, ">=": 7, "==": 7, "!=": 7, - "+": 10, "-": 10, - "*": 20, "/": 20, "%": 20, - }; - return parse_toplevel(); - - //Returns true if the next token is a punc type with value ch - function is_punc(ch) { - var tok = input.peek(); - return tok && tok.type == "punc" && (!ch || tok.value == ch) && tok; - } - - //Returns true if the next token is the kw keyword - function is_kw(kw) { - var tok = input.peek(); - return tok && tok.type == "kw" && (!kw || tok.value == kw) && tok; - } - - //Returns true if the next token is an op type with the given op value - function is_op(op) { - var tok = input.peek(); - return tok && tok.type == "op" && (!op || tok.value == op) && tok; - } - - //Checks that the next character is the given punctuation character and throws - //an error if it's not. If it is, skips over it in the input - function checkPuncAndSkip(ch) { - if (is_punc(ch)) input.next(); - else input.croak("Expecting punctuation: \"" + ch + "\""); - } - - //Checks that the next character is the given keyword and throws an error - //if its not. If it is, skips over it in the input - function checkKeywordAndSkip(kw) { - if (is_kw(kw)) input.next(); - else input.croak("Expecting keyword: \"" + kw + "\""); - } - - //Checks that the next character is the given operator and throws an error - //if its not. If it is, skips over it in the input - function checkOpAndSkip(op) { - if (is_op(op)) input.next(); - else input.croak("Expecting operator: \"" + op + "\""); - } - - function unexpected() { - input.croak("Unexpected token: " + JSON.stringify(input.peek())); - } - - function maybe_binary(left, my_prec) { - var tok = is_op(); - if (tok) { - var his_prec = PRECEDENCE[tok.value]; - if (his_prec > my_prec) { - input.next(); - return maybe_binary({ - type : tok.value == "=" ? "assign" : "binary", - operator : tok.value, - left : left, - right : maybe_binary(parse_atom(), his_prec) - }, my_prec); - } - } - return left; - } - - function delimited(start, stop, separator, parser) { - var a = [], first = true; - checkPuncAndSkip(start); - while (!input.eof()) { - if (is_punc(stop)) break; - if (first) first = false; else checkPuncAndSkip(separator); - if (is_punc(stop)) break; - a.push(parser()); - } - checkPuncAndSkip(stop); - return a; - } - - function parse_call(func) { - return { - type: "call", - func: func, - args: delimited("(", ")", ",", parse_expression), - }; - } - - function parse_varname() { - var name = input.next(); - if (name.type != "var") input.croak("Expecting variable name"); - return name.value; - } - - /* type: "if", - * cond: [ {"type": "var", "value": "cond1"}, {"type": "var", "value": "cond2"}...] - * then: [ {"type": "var", "value": "then1"}, {"type": "var", "value": "then2"}...] - * else: {"type": "var", "value": "foo"} - */ - function parse_if() { - checkKeywordAndSkip("if"); - - //Conditional - var cond = parse_expression(); - - //Body - var then = parse_expression(); - var ret = { - type: "if", - cond: [], - then: [], - }; - ret.cond.push(cond); - ret.then.push(then); - - // Parse all elif branches - while (is_kw("elif")) { - input.next(); - var cond = parse_expression(); - var then = parse_expression(); - ret.cond.push(cond); - ret.then.push(then); - } - - // Parse else branch, if it exists - if (is_kw("else")) { - input.next(); - ret.else = parse_expression(); - } - - return ret; - } - - /* for (init, cond, postloop) {code;} - * - * type: "for", - * init: assign node, - * cond: var node, - * postloop: assign node - * code: prog node - */ - function parse_for() { - checkKeywordAndSkip("for"); - - temp = delimited("(", ")", ";", parse_expression); - var splitExpressions = temp.slice(); - code = parse_expression(); - - if (splitExpressions.length != 3) { - throw new Error("for statement has incorrect number of arguments"); - } - - //TODO Check type of the init, cond, and postloop nodes - return { - type: "for", - init: splitExpressions[0], - cond: splitExpressions[1], - postloop: splitExpressions[2], - code: code - } - } - - /* while (cond) {} - * - * type: "while", - * cond: var node - * code: prog node - */ - function parse_while() { - checkKeywordAndSkip("while"); - - var cond = parse_expression(); - var code = parse_expression(); - return { - type: "while", - cond: cond, - code: code - } - } - - /* hacknetnodes[i].operator - */ - function parse_hacknetnodes() { - var index = null; - if (is_punc("[")) { - index = parse_expression(); - if (index.type != "index") { - unexpected(); - } - } - - if (is_punc(".")) { - checkPuncAndSkip("."); - var op = maybe_call(function() { - var tok = input.next(); - return tok; - }); - return { - type: "var", - value: "hacknetnodes", - index: index, - op: op, - }; - } - unexpected(); - } - - //Declaring a new array with Array[1,2,3] - function parse_arraydecl() { - var array = delimited("[", "]", ",", parse_expression); - return {type: "var", - value: "array", - array: array - }; - } - - //Parsing an operation on an array, such as accessing, push(), etc. - //tok is a reference to a token of type var - function parse_arrayop(tok) { - //Returns a variable node except with an extra "index" field so - //we can identify it as an index - if (is_punc("[")) { - var index = parse_arrayindex(); - if (index.type != "index") { - unexpected(); - } - } - - var op = null; - if (is_punc(".")) { - checkPuncAndSkip("."); - op = maybe_call(function() { - var callTok = input.next(); - return callTok; - }); - } - tok.index = index; - tok.op = op; //Will be null if no operation - return tok; - } - - function parse_arrayindex() { - var index = delimited("[", "]", ";", parse_expression); - var val = 0; - if (index.length == 1) { - val = index[0]; - } else { - unexpected(); - } - - return { type: "index", value: val }; - } - - function parse_bool() { - return { - type : "bool", - value : input.next().value == "true" - }; - } - - function maybe_call(expr) { - expr = expr(); - return is_punc("(") ? parse_call(expr) : expr; - } - - function parse_atom() { - return maybe_call(function(){ - if (is_punc("(")) { - input.next(); - var exp = parse_expression(); - checkPuncAndSkip(")"); - return exp; - } - if (is_punc("{")) return parse_prog(); - if (is_punc("[")) return parse_arrayindex(); - if (is_kw("if")) return parse_if(); - if (is_kw("for")) return parse_for(); - if (is_kw("while")) return parse_while(); - if (is_kw("true") || is_kw("false")) return parse_bool(); - - var tok = input.next(); - if (tok.type == "var" && tok.value == "hacknetnodes") return parse_hacknetnodes(); - if (tok.type == "var" && tok.value == "Array") return parse_arraydecl(); - if (tok.type == "var" && (is_punc("[") || is_punc("."))) { - return parse_arrayop(tok); - } - if (tok.type == "var" || tok.type == "num" || tok.type == "str") - return tok; - unexpected(); - }); - } - - function parse_toplevel() { - var prog = []; - while (!input.eof()) { - prog.push(parse_expression()); - if (!input.eof()) checkPuncAndSkip(";"); - } - //Return the top level Abstract Syntax Tree, where the top node is a "prog" node - return { type: "prog", prog: prog }; - } - - function parse_prog() { - var prog = delimited("{", "}", ";", parse_expression); - if (prog.length == 0) return FALSE; - if (prog.length == 1) return prog[0]; - return { type: "prog", prog: prog }; - } - - function parse_expression() { - return maybe_call(function(){ - return maybe_binary(parse_atom(), 0); - }); - } -} \ No newline at end of file diff --git a/src/NetscriptTokenizer.js b/src/NetscriptTokenizer.js deleted file mode 100644 index 38d591ed0..000000000 --- a/src/NetscriptTokenizer.js +++ /dev/null @@ -1,168 +0,0 @@ -/* Tokenizer - * Acts on top of the InputStream class. Takes in a character input stream and and parses it into tokens. - * Tokens can be accessed with peek() and next(). - * - * Token types: - * {type: "punc", value: "(" } // punctuation: parens, comma, semicolon etc. - * {type: "num", value: 5 } // numbers (including floats) - * {type: "str", value: "Hello World!" } // strings - * {type: "kw", value: "for/if/..." } // keywords, see defs below - * {type: "var", value: "a" } // identifiers/variables - * {type: "op", value: "!=" } // operator characters - * {type: "bool", value: "true" } // Booleans - * - */ - -function Tokenizer(input) { - var current = null; - var keywords = " if elif else true false while for "; - - return { - next : next, - peek : peek, - eof : eof, - croak : input.croak - } - - function is_keyword(x) { - return keywords.indexOf(" " + x + " ") >= 0; - } - - function is_digit(ch) { - return /[0-9]/i.test(ch); - } - - //An identifier can start with any letter or an underscore - function is_id_start(ch) { - return /[a-z_]/i.test(ch); - } - - function is_id(ch) { - return is_id_start(ch) || "?!-<>=0123456789".indexOf(ch) >= 0; - } - - function is_op_char(ch) { - return "+-*/%=&|<>!".indexOf(ch) >= 0; - } - - function is_punc(ch) { - return ",;(){}[].".indexOf(ch) >= 0; - } - - function is_whitespace(ch) { - return " \t\n".indexOf(ch) >= 0; - } - - function read_while(predicate) { - var str = ""; - while (!input.eof() && predicate(input.peek())) - str += input.next(); - return str; - } - - function read_number() { - var has_dot = false; - //Reads the number from the input. Checks for only a single decimal point - var number = read_while(function(ch){ - if (ch == ".") { - if (has_dot) return false; - has_dot = true; - return true; - } - return is_digit(ch); - }); - return { type: "num", value: parseFloat(number) }; - } - - //This function also checks the identifier against a list of known keywords (defined at the top) - //and will return a kw object rather than identifier if it is one - function read_ident() { - //Identifier must start with a letter or underscore..and can contain anything from ?!-<>=0123456789 - var id = read_while(is_id); - return { - type : is_keyword(id) ? "kw" : "var", - value : id - }; - } - - function read_escaped(end) { - var escaped = false, str = ""; - input.next(); //Skip the quotation mark - while (!input.eof()) { - var ch = input.next(); - if (escaped) { - str += ch; - escaped = false; - } else if (ch == "\\") { - escaped = true; - } else if (ch == end) { - break; - } else { - str += ch; - } - } - return str; - } - - function read_string(ch) { - if (ch == '"') { - return { type: "str", value: read_escaped('"') }; - } else if (ch == '\'') { - return { type: "str", value: read_escaped('\'') }; - } - } - - //Only supports single-line comments right now - function skip_comment() { - read_while(function(ch){ return ch != "\n" }); - input.next(); - } - - //Gets the next token - function read_next() { - //Skip over whitespace - read_while(is_whitespace); - - if (input.eof()) return null; - - //Peek the next character and decide what to do based on what that - //next character is - var ch = input.peek(); - - if (ch == "//") { - skip_comment(); - return read_next(); - } - - if (ch == '"' || ch == '\'') return read_string(ch); - if (is_digit(ch)) return read_number(); - if (is_id_start(ch)) return read_ident(); - if (is_punc(ch)) return { - type : "punc", - value : input.next() - } - if (is_op_char(ch)) return { - type : "op", - value : read_while(is_op_char) - } - - } - - function peek() { - //Returns current token, unless its null in which case it grabs the next one - //and returns it - return current || (current = read_next()); - } - - function next() { - //The token might have been peaked already, in which case read_next() was already - //called so just return current - var tok = current; - current = null; - return tok || read_next(); - } - - function eof() { - return peek() == null; - } -} diff --git a/src/NetscriptWorker.js b/src/NetscriptWorker.js index 17459a422..a497a08be 100644 --- a/src/NetscriptWorker.js +++ b/src/NetscriptWorker.js @@ -8,7 +8,8 @@ function WorkerScript(runningScriptObj) { this.running = false; this.serverIp = null; this.code = runningScriptObj.scriptRef.code; - this.env = new Environment(); + this.env = new Environment(this); + this.env.set("args", runningScriptObj.args); this.output = ""; this.ramUsage = 0; this.scriptRef = runningScriptObj; @@ -31,7 +32,7 @@ function runScriptsLoop() { //If it isn't running, start the script if (workerScripts[i].running == false && workerScripts[i].env.stopFlag == false) { try { - var ast = Parser(Tokenizer(InputStream(workerScripts[i].code))); + var ast = acorn.parse(workerScripts[i].code); //console.log(ast); } catch (e) { console.log("Error parsing script: " + workerScripts[i].name); diff --git a/utils/acorn.js b/utils/acorn.js new file mode 100644 index 000000000..ce66e72fe --- /dev/null +++ b/utils/acorn.js @@ -0,0 +1,3606 @@ +(function (global, factory) { + typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) : + typeof define === 'function' && define.amd ? define(['exports'], factory) : + (factory((global.acorn = global.acorn || {}))); +}(this, (function (exports) { 'use strict'; + +// Reserved word lists for various dialects of the language + +var reservedWords = { + 3: "abstract boolean byte char class double enum export extends final float goto implements import int interface long native package private protected public short static super synchronized throws transient volatile", + 5: "class enum extends super const export import", + 6: "enum", + strict: "implements interface let package private protected public static yield", + strictBind: "eval arguments" +} + +// And the keywords + +var ecma5AndLessKeywords = "break case catch continue debugger default do else finally for function if return switch throw try var while with null true false instanceof typeof void delete new in this" + +var keywords = { + 5: ecma5AndLessKeywords, + 6: ecma5AndLessKeywords + " const class extends export import super" +} + +// ## Character categories + +// Big ugly regular expressions that match characters in the +// whitespace, identifier, and identifier-start categories. These +// are only applied when a character is found to actually have a +// code point above 128. +// Generated by `bin/generate-identifier-regex.js`. + +var nonASCIIidentifierStartChars = "\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u037f\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u052f\u0531-\u0556\u0559\u0561-\u0587\u05d0-\u05ea\u05f0-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u08a0-\u08b4\u08b6-\u08bd\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0af9\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c39\u0c3d\u0c58-\u0c5a\u0c60\u0c61\u0c80\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d54-\u0d56\u0d5f-\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f5\u13f8-\u13fd\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f8\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1877\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191e\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19b0-\u19c9\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1c80-\u1c88\u1ce9-\u1cec\u1cee-\u1cf1\u1cf5\u1cf6\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2118-\u211d\u2124\u2126\u2128\u212a-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309b-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\u31f0-\u31ff\u3400-\u4db5\u4e00-\u9fd5\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua69d\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua7ae\ua7b0-\ua7b7\ua7f7-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua8fd\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\ua9e0-\ua9e4\ua9e6-\ua9ef\ua9fa-\ua9fe\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa7e-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uab30-\uab5a\uab5c-\uab65\uab70-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc" +var nonASCIIidentifierChars = "\u200c\u200d\xb7\u0300-\u036f\u0387\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u0669\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u06f0-\u06f9\u0711\u0730-\u074a\u07a6-\u07b0\u07c0-\u07c9\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u08d4-\u08e1\u08e3-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09cb-\u09cd\u09d7\u09e2\u09e3\u09e6-\u09ef\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2\u0ae3\u0ae6-\u0aef\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c00-\u0c03\u0c3e-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0c66-\u0c6f\u0c81-\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0ce6-\u0cef\u0d01-\u0d03\u0d3e-\u0d44\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0d62\u0d63\u0d66-\u0d6f\u0d82\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0de6-\u0def\u0df2\u0df3\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0e50-\u0e59\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f3e\u0f3f\u0f71-\u0f84\u0f86\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102b-\u103e\u1040-\u1049\u1056-\u1059\u105e-\u1060\u1062-\u1064\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u1369-\u1371\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b4-\u17d3\u17dd\u17e0-\u17e9\u180b-\u180d\u1810-\u1819\u18a9\u1920-\u192b\u1930-\u193b\u1946-\u194f\u19d0-\u19da\u1a17-\u1a1b\u1a55-\u1a5e\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1ab0-\u1abd\u1b00-\u1b04\u1b34-\u1b44\u1b50-\u1b59\u1b6b-\u1b73\u1b80-\u1b82\u1ba1-\u1bad\u1bb0-\u1bb9\u1be6-\u1bf3\u1c24-\u1c37\u1c40-\u1c49\u1c50-\u1c59\u1cd0-\u1cd2\u1cd4-\u1ce8\u1ced\u1cf2-\u1cf4\u1cf8\u1cf9\u1dc0-\u1df5\u1dfb-\u1dff\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua620-\ua629\ua66f\ua674-\ua67d\ua69e\ua69f\ua6f0\ua6f1\ua802\ua806\ua80b\ua823-\ua827\ua880\ua881\ua8b4-\ua8c5\ua8d0-\ua8d9\ua8e0-\ua8f1\ua900-\ua909\ua926-\ua92d\ua947-\ua953\ua980-\ua983\ua9b3-\ua9c0\ua9d0-\ua9d9\ua9e5\ua9f0-\ua9f9\uaa29-\uaa36\uaa43\uaa4c\uaa4d\uaa50-\uaa59\uaa7b-\uaa7d\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uaaeb-\uaaef\uaaf5\uaaf6\uabe3-\uabea\uabec\uabed\uabf0-\uabf9\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f" + +var nonASCIIidentifierStart = new RegExp("[" + nonASCIIidentifierStartChars + "]") +var nonASCIIidentifier = new RegExp("[" + nonASCIIidentifierStartChars + nonASCIIidentifierChars + "]") + +nonASCIIidentifierStartChars = nonASCIIidentifierChars = null + +// These are a run-length and offset encoded representation of the +// >0xffff code points that are a valid part of identifiers. The +// offset starts at 0x10000, and each pair of numbers represents an +// offset to the next range, and then a size of the range. They were +// generated by bin/generate-identifier-regex.js + +// eslint-disable-next-line comma-spacing +var astralIdentifierStartCodes = [0,11,2,25,2,18,2,1,2,14,3,13,35,122,70,52,268,28,4,48,48,31,17,26,6,37,11,29,3,35,5,7,2,4,43,157,19,35,5,35,5,39,9,51,157,310,10,21,11,7,153,5,3,0,2,43,2,1,4,0,3,22,11,22,10,30,66,18,2,1,11,21,11,25,71,55,7,1,65,0,16,3,2,2,2,26,45,28,4,28,36,7,2,27,28,53,11,21,11,18,14,17,111,72,56,50,14,50,785,52,76,44,33,24,27,35,42,34,4,0,13,47,15,3,22,0,2,0,36,17,2,24,85,6,2,0,2,3,2,14,2,9,8,46,39,7,3,1,3,21,2,6,2,1,2,4,4,0,19,0,13,4,159,52,19,3,54,47,21,1,2,0,185,46,42,3,37,47,21,0,60,42,86,25,391,63,32,0,449,56,264,8,2,36,18,0,50,29,881,921,103,110,18,195,2749,1070,4050,582,8634,568,8,30,114,29,19,47,17,3,32,20,6,18,881,68,12,0,67,12,65,0,32,6124,20,754,9486,1,3071,106,6,12,4,8,8,9,5991,84,2,70,2,1,3,0,3,1,3,3,2,11,2,0,2,6,2,64,2,3,3,7,2,6,2,27,2,3,2,4,2,0,4,6,2,339,3,24,2,24,2,30,2,24,2,30,2,24,2,30,2,24,2,30,2,24,2,7,4149,196,60,67,1213,3,2,26,2,1,2,0,3,0,2,9,2,3,2,0,2,0,7,0,5,0,2,0,2,0,2,2,2,1,2,0,3,0,2,0,2,0,2,0,2,0,2,1,2,0,3,3,2,6,2,3,2,3,2,0,2,9,2,16,6,2,2,4,2,16,4421,42710,42,4148,12,221,3,5761,10591,541] + +// eslint-disable-next-line comma-spacing +var astralIdentifierCodes = [509,0,227,0,150,4,294,9,1368,2,2,1,6,3,41,2,5,0,166,1,1306,2,54,14,32,9,16,3,46,10,54,9,7,2,37,13,2,9,52,0,13,2,49,13,10,2,4,9,83,11,7,0,161,11,6,9,7,3,57,0,2,6,3,1,3,2,10,0,11,1,3,6,4,4,193,17,10,9,87,19,13,9,214,6,3,8,28,1,83,16,16,9,82,12,9,9,84,14,5,9,423,9,838,7,2,7,17,9,57,21,2,13,19882,9,135,4,60,6,26,9,1016,45,17,3,19723,1,5319,4,4,5,9,7,3,6,31,3,149,2,1418,49,513,54,5,49,9,0,15,0,23,4,2,14,1361,6,2,16,3,6,2,1,2,4,2214,6,110,6,6,9,792487,239] + +// This has a complexity linear to the value of the code. The +// assumption is that looking up astral identifier characters is +// rare. +function isInAstralSet(code, set) { + var pos = 0x10000 + for (var i = 0; i < set.length; i += 2) { + pos += set[i] + if (pos > code) return false + pos += set[i + 1] + if (pos >= code) return true + } +} + +// Test whether a given character code starts an identifier. + +function isIdentifierStart(code, astral) { + if (code < 65) return code === 36 + if (code < 91) return true + if (code < 97) return code === 95 + if (code < 123) return true + if (code <= 0xffff) return code >= 0xaa && nonASCIIidentifierStart.test(String.fromCharCode(code)) + if (astral === false) return false + return isInAstralSet(code, astralIdentifierStartCodes) +} + +// Test whether a given character is part of an identifier. + +function isIdentifierChar(code, astral) { + if (code < 48) return code === 36 + if (code < 58) return true + if (code < 65) return false + if (code < 91) return true + if (code < 97) return code === 95 + if (code < 123) return true + if (code <= 0xffff) return code >= 0xaa && nonASCIIidentifier.test(String.fromCharCode(code)) + if (astral === false) return false + return isInAstralSet(code, astralIdentifierStartCodes) || isInAstralSet(code, astralIdentifierCodes) +} + +// ## Token types + +// The assignment of fine-grained, information-carrying type objects +// allows the tokenizer to store the information it has about a +// token in a way that is very cheap for the parser to look up. + +// All token type variables start with an underscore, to make them +// easy to recognize. + +// The `beforeExpr` property is used to disambiguate between regular +// expressions and divisions. It is set on all token types that can +// be followed by an expression (thus, a slash after them would be a +// regular expression). +// +// The `startsExpr` property is used to check if the token ends a +// `yield` expression. It is set on all token types that either can +// directly start an expression (like a quotation mark) or can +// continue an expression (like the body of a string). +// +// `isLoop` marks a keyword as starting a loop, which is important +// to know when parsing a label, in order to allow or disallow +// continue jumps to that label. + +var TokenType = function TokenType(label, conf) { + if ( conf === void 0 ) conf = {}; + + this.label = label + this.keyword = conf.keyword + this.beforeExpr = !!conf.beforeExpr + this.startsExpr = !!conf.startsExpr + this.isLoop = !!conf.isLoop + this.isAssign = !!conf.isAssign + this.prefix = !!conf.prefix + this.postfix = !!conf.postfix + this.binop = conf.binop || null + this.updateContext = null +}; + +function binop(name, prec) { + return new TokenType(name, {beforeExpr: true, binop: prec}) +} +var beforeExpr = {beforeExpr: true}; +var startsExpr = {startsExpr: true}; +// Map keyword names to token types. + +var keywordTypes = {} + +// Succinct definitions of keyword token types +function kw(name, options) { + if ( options === void 0 ) options = {}; + + options.keyword = name + return keywordTypes[name] = new TokenType(name, options) +} + +var tt = { + num: new TokenType("num", startsExpr), + regexp: new TokenType("regexp", startsExpr), + string: new TokenType("string", startsExpr), + name: new TokenType("name", startsExpr), + eof: new TokenType("eof"), + + // Punctuation token types. + bracketL: new TokenType("[", {beforeExpr: true, startsExpr: true}), + bracketR: new TokenType("]"), + braceL: new TokenType("{", {beforeExpr: true, startsExpr: true}), + braceR: new TokenType("}"), + parenL: new TokenType("(", {beforeExpr: true, startsExpr: true}), + parenR: new TokenType(")"), + comma: new TokenType(",", beforeExpr), + semi: new TokenType(";", beforeExpr), + colon: new TokenType(":", beforeExpr), + dot: new TokenType("."), + question: new TokenType("?", beforeExpr), + arrow: new TokenType("=>", beforeExpr), + template: new TokenType("template"), + ellipsis: new TokenType("...", beforeExpr), + backQuote: new TokenType("`", startsExpr), + dollarBraceL: new TokenType("${", {beforeExpr: true, startsExpr: true}), + + // Operators. These carry several kinds of properties to help the + // parser use them properly (the presence of these properties is + // what categorizes them as operators). + // + // `binop`, when present, specifies that this operator is a binary + // operator, and will refer to its precedence. + // + // `prefix` and `postfix` mark the operator as a prefix or postfix + // unary operator. + // + // `isAssign` marks all of `=`, `+=`, `-=` etcetera, which act as + // binary operators with a very low precedence, that should result + // in AssignmentExpression nodes. + + eq: new TokenType("=", {beforeExpr: true, isAssign: true}), + assign: new TokenType("_=", {beforeExpr: true, isAssign: true}), + incDec: new TokenType("++/--", {prefix: true, postfix: true, startsExpr: true}), + prefix: new TokenType("prefix", {beforeExpr: true, prefix: true, startsExpr: true}), + logicalOR: binop("||", 1), + logicalAND: binop("&&", 2), + bitwiseOR: binop("|", 3), + bitwiseXOR: binop("^", 4), + bitwiseAND: binop("&", 5), + equality: binop("==/!=", 6), + relational: binop("", 7), + bitShift: binop("<>", 8), + plusMin: new TokenType("+/-", {beforeExpr: true, binop: 9, prefix: true, startsExpr: true}), + modulo: binop("%", 10), + star: binop("*", 10), + slash: binop("/", 10), + starstar: new TokenType("**", {beforeExpr: true}), + + // Keyword token types. + _break: kw("break"), + _case: kw("case", beforeExpr), + _catch: kw("catch"), + _continue: kw("continue"), + _debugger: kw("debugger"), + _default: kw("default", beforeExpr), + _do: kw("do", {isLoop: true, beforeExpr: true}), + _else: kw("else", beforeExpr), + _finally: kw("finally"), + _for: kw("for", {isLoop: true}), + _function: kw("function", startsExpr), + _if: kw("if"), + _return: kw("return", beforeExpr), + _switch: kw("switch"), + _throw: kw("throw", beforeExpr), + _try: kw("try"), + _var: kw("var"), + _const: kw("const"), + _while: kw("while", {isLoop: true}), + _with: kw("with"), + _new: kw("new", {beforeExpr: true, startsExpr: true}), + _this: kw("this", startsExpr), + _super: kw("super", startsExpr), + _class: kw("class"), + _extends: kw("extends", beforeExpr), + _export: kw("export"), + _import: kw("import"), + _null: kw("null", startsExpr), + _true: kw("true", startsExpr), + _false: kw("false", startsExpr), + _in: kw("in", {beforeExpr: true, binop: 7}), + _instanceof: kw("instanceof", {beforeExpr: true, binop: 7}), + _typeof: kw("typeof", {beforeExpr: true, prefix: true, startsExpr: true}), + _void: kw("void", {beforeExpr: true, prefix: true, startsExpr: true}), + _delete: kw("delete", {beforeExpr: true, prefix: true, startsExpr: true}) +} + +// Matches a whole line break (where CRLF is considered a single +// line break). Used to count lines. + +var lineBreak = /\r\n?|\n|\u2028|\u2029/ +var lineBreakG = new RegExp(lineBreak.source, "g") + +function isNewLine(code) { + return code === 10 || code === 13 || code === 0x2028 || code === 0x2029 +} + +var nonASCIIwhitespace = /[\u1680\u180e\u2000-\u200a\u202f\u205f\u3000\ufeff]/ + +var skipWhiteSpace = /(?:\s|\/\/.*|\/\*[^]*?\*\/)*/g + +var ref = Object.prototype; +var hasOwnProperty = ref.hasOwnProperty; +var toString = ref.toString; + +// Checks if an object has a property. + +function has(obj, propName) { + return hasOwnProperty.call(obj, propName) +} + +var isArray = Array.isArray || (function (obj) { return ( + toString.call(obj) === "[object Array]" +); }) + +// These are used when `options.locations` is on, for the +// `startLoc` and `endLoc` properties. + +var Position = function Position(line, col) { + this.line = line + this.column = col +}; + +Position.prototype.offset = function offset (n) { + return new Position(this.line, this.column + n) +}; + +var SourceLocation = function SourceLocation(p, start, end) { + this.start = start + this.end = end + if (p.sourceFile !== null) this.source = p.sourceFile +}; + +// The `getLineInfo` function is mostly useful when the +// `locations` option is off (for performance reasons) and you +// want to find the line/column position for a given character +// offset. `input` should be the code string that the offset refers +// into. + +function getLineInfo(input, offset) { + for (var line = 1, cur = 0;;) { + lineBreakG.lastIndex = cur + var match = lineBreakG.exec(input) + if (match && match.index < offset) { + ++line + cur = match.index + match[0].length + } else { + return new Position(line, offset - cur) + } + } +} + +// A second optional argument can be given to further configure +// the parser process. These options are recognized: + +var defaultOptions = { + // `ecmaVersion` indicates the ECMAScript version to parse. Must + // be either 3, 5, 6 (2015), 7 (2016), or 8 (2017). This influences support + // for strict mode, the set of reserved words, and support for + // new syntax features. The default is 7. + ecmaVersion: 7, + // `sourceType` indicates the mode the code should be parsed in. + // Can be either `"script"` or `"module"`. This influences global + // strict mode and parsing of `import` and `export` declarations. + sourceType: "script", + // `onInsertedSemicolon` can be a callback that will be called + // when a semicolon is automatically inserted. It will be passed + // th position of the comma as an offset, and if `locations` is + // enabled, it is given the location as a `{line, column}` object + // as second argument. + onInsertedSemicolon: null, + // `onTrailingComma` is similar to `onInsertedSemicolon`, but for + // trailing commas. + onTrailingComma: null, + // By default, reserved words are only enforced if ecmaVersion >= 5. + // Set `allowReserved` to a boolean value to explicitly turn this on + // an off. When this option has the value "never", reserved words + // and keywords can also not be used as property names. + allowReserved: null, + // When enabled, a return at the top level is not considered an + // error. + allowReturnOutsideFunction: false, + // When enabled, import/export statements are not constrained to + // appearing at the top of the program. + allowImportExportEverywhere: false, + // When enabled, hashbang directive in the beginning of file + // is allowed and treated as a line comment. + allowHashBang: false, + // When `locations` is on, `loc` properties holding objects with + // `start` and `end` properties in `{line, column}` form (with + // line being 1-based and column 0-based) will be attached to the + // nodes. + locations: false, + // A function can be passed as `onToken` option, which will + // cause Acorn to call that function with object in the same + // format as tokens returned from `tokenizer().getToken()`. Note + // that you are not allowed to call the parser from the + // callback—that will corrupt its internal state. + onToken: null, + // A function can be passed as `onComment` option, which will + // cause Acorn to call that function with `(block, text, start, + // end)` parameters whenever a comment is skipped. `block` is a + // boolean indicating whether this is a block (`/* */`) comment, + // `text` is the content of the comment, and `start` and `end` are + // character offsets that denote the start and end of the comment. + // When the `locations` option is on, two more parameters are + // passed, the full `{line, column}` locations of the start and + // end of the comments. Note that you are not allowed to call the + // parser from the callback—that will corrupt its internal state. + onComment: null, + // Nodes have their start and end characters offsets recorded in + // `start` and `end` properties (directly on the node, rather than + // the `loc` object, which holds line/column data. To also add a + // [semi-standardized][range] `range` property holding a `[start, + // end]` array with the same numbers, set the `ranges` option to + // `true`. + // + // [range]: https://bugzilla.mozilla.org/show_bug.cgi?id=745678 + ranges: false, + // It is possible to parse multiple files into a single AST by + // passing the tree produced by parsing the first file as + // `program` option in subsequent parses. This will add the + // toplevel forms of the parsed file to the `Program` (top) node + // of an existing parse tree. + program: null, + // When `locations` is on, you can pass this to record the source + // file in every node's `loc` object. + sourceFile: null, + // This value, if given, is stored in every node, whether + // `locations` is on or off. + directSourceFile: null, + // When enabled, parenthesized expressions are represented by + // (non-standard) ParenthesizedExpression nodes + preserveParens: false, + plugins: {} +} + +// Interpret and default an options object + +function getOptions(opts) { + var options = {} + + for (var opt in defaultOptions) + options[opt] = opts && has(opts, opt) ? opts[opt] : defaultOptions[opt] + + if (options.ecmaVersion >= 2015) + options.ecmaVersion -= 2009 + + if (options.allowReserved == null) + options.allowReserved = options.ecmaVersion < 5 + + if (isArray(options.onToken)) { + var tokens = options.onToken + options.onToken = function (token) { return tokens.push(token); } + } + if (isArray(options.onComment)) + options.onComment = pushComment(options, options.onComment) + + return options +} + +function pushComment(options, array) { + return function(block, text, start, end, startLoc, endLoc) { + var comment = { + type: block ? "Block" : "Line", + value: text, + start: start, + end: end + } + if (options.locations) + comment.loc = new SourceLocation(this, startLoc, endLoc) + if (options.ranges) + comment.range = [start, end] + array.push(comment) + } +} + +// Registered plugins +var plugins = {} + +function keywordRegexp(words) { + return new RegExp("^(" + words.replace(/ /g, "|") + ")$") +} + +var Parser = function Parser(options, input, startPos) { + this.options = options = getOptions(options) + this.sourceFile = options.sourceFile + this.keywords = keywordRegexp(keywords[options.ecmaVersion >= 6 ? 6 : 5]) + var reserved = "" + if (!options.allowReserved) { + for (var v = options.ecmaVersion;; v--) + if (reserved = reservedWords[v]) break + if (options.sourceType == "module") reserved += " await" + } + this.reservedWords = keywordRegexp(reserved) + var reservedStrict = (reserved ? reserved + " " : "") + reservedWords.strict + this.reservedWordsStrict = keywordRegexp(reservedStrict) + this.reservedWordsStrictBind = keywordRegexp(reservedStrict + " " + reservedWords.strictBind) + this.input = String(input) + + // Used to signal to callers of `readWord1` whether the word + // contained any escape sequences. This is needed because words with + // escape sequences must not be interpreted as keywords. + this.containsEsc = false + + // Load plugins + this.loadPlugins(options.plugins) + + // Set up token state + + // The current position of the tokenizer in the input. + if (startPos) { + this.pos = startPos + this.lineStart = this.input.lastIndexOf("\n", startPos - 1) + 1 + this.curLine = this.input.slice(0, this.lineStart).split(lineBreak).length + } else { + this.pos = this.lineStart = 0 + this.curLine = 1 + } + + // Properties of the current token: + // Its type + this.type = tt.eof + // For tokens that include more information than their type, the value + this.value = null + // Its start and end offset + this.start = this.end = this.pos + // And, if locations are used, the {line, column} object + // corresponding to those offsets + this.startLoc = this.endLoc = this.curPosition() + + // Position information for the previous token + this.lastTokEndLoc = this.lastTokStartLoc = null + this.lastTokStart = this.lastTokEnd = this.pos + + // The context stack is used to superficially track syntactic + // context to predict whether a regular expression is allowed in a + // given position. + this.context = this.initialContext() + this.exprAllowed = true + + // Figure out if it's a module code. + this.inModule = options.sourceType === "module" + this.strict = this.inModule || this.strictDirective(this.pos) + + // Used to signify the start of a potential arrow function + this.potentialArrowAt = -1 + + // Flags to track whether we are in a function, a generator, an async function. + this.inFunction = this.inGenerator = this.inAsync = false + // Positions to delayed-check that yield/await does not exist in default parameters. + this.yieldPos = this.awaitPos = 0 + // Labels in scope. + this.labels = [] + + // If enabled, skip leading hashbang line. + if (this.pos === 0 && options.allowHashBang && this.input.slice(0, 2) === "#!") + this.skipLineComment(2) + + // Scope tracking for duplicate variable names (see scope.js) + this.scopeStack = [] + this.enterFunctionScope() +}; + +// DEPRECATED Kept for backwards compatibility until 3.0 in case a plugin uses them +Parser.prototype.isKeyword = function isKeyword (word) { return this.keywords.test(word) }; +Parser.prototype.isReservedWord = function isReservedWord (word) { return this.reservedWords.test(word) }; + +Parser.prototype.extend = function extend (name, f) { + this[name] = f(this[name]) +}; + +Parser.prototype.loadPlugins = function loadPlugins (pluginConfigs) { + var this$1 = this; + + for (var name in pluginConfigs) { + var plugin = plugins[name] + if (!plugin) throw new Error("Plugin '" + name + "' not found") + plugin(this$1, pluginConfigs[name]) + } +}; + +Parser.prototype.parse = function parse () { + var node = this.options.program || this.startNode() + this.nextToken() + return this.parseTopLevel(node) +}; + +var pp = Parser.prototype + +// ## Parser utilities + +var literal = /^(?:'((?:[^']|\.)*)'|"((?:[^"]|\.)*)"|;)/ +pp.strictDirective = function(start) { + var this$1 = this; + + for (;;) { + skipWhiteSpace.lastIndex = start + start += skipWhiteSpace.exec(this$1.input)[0].length + var match = literal.exec(this$1.input.slice(start)) + if (!match) return false + if ((match[1] || match[2]) == "use strict") return true + start += match[0].length + } +} + +// Predicate that tests whether the next token is of the given +// type, and if yes, consumes it as a side effect. + +pp.eat = function(type) { + if (this.type === type) { + this.next() + return true + } else { + return false + } +} + +// Tests whether parsed token is a contextual keyword. + +pp.isContextual = function(name) { + return this.type === tt.name && this.value === name +} + +// Consumes contextual keyword if possible. + +pp.eatContextual = function(name) { + return this.value === name && this.eat(tt.name) +} + +// Asserts that following token is given contextual keyword. + +pp.expectContextual = function(name) { + if (!this.eatContextual(name)) this.unexpected() +} + +// Test whether a semicolon can be inserted at the current position. + +pp.canInsertSemicolon = function() { + return this.type === tt.eof || + this.type === tt.braceR || + lineBreak.test(this.input.slice(this.lastTokEnd, this.start)) +} + +pp.insertSemicolon = function() { + if (this.canInsertSemicolon()) { + if (this.options.onInsertedSemicolon) + this.options.onInsertedSemicolon(this.lastTokEnd, this.lastTokEndLoc) + return true + } +} + +// Consume a semicolon, or, failing that, see if we are allowed to +// pretend that there is a semicolon at this position. + +pp.semicolon = function() { + if (!this.eat(tt.semi) && !this.insertSemicolon()) this.unexpected() +} + +pp.afterTrailingComma = function(tokType, notNext) { + if (this.type == tokType) { + if (this.options.onTrailingComma) + this.options.onTrailingComma(this.lastTokStart, this.lastTokStartLoc) + if (!notNext) + this.next() + return true + } +} + +// Expect a token of a given type. If found, consume it, otherwise, +// raise an unexpected token error. + +pp.expect = function(type) { + this.eat(type) || this.unexpected() +} + +// Raise an unexpected token error. + +pp.unexpected = function(pos) { + this.raise(pos != null ? pos : this.start, "Unexpected token") +} + +var DestructuringErrors = function DestructuringErrors() { + this.shorthandAssign = this.trailingComma = this.parenthesizedAssign = this.parenthesizedBind = -1 +}; + +pp.checkPatternErrors = function(refDestructuringErrors, isAssign) { + if (!refDestructuringErrors) return + if (refDestructuringErrors.trailingComma > -1) + this.raiseRecoverable(refDestructuringErrors.trailingComma, "Comma is not permitted after the rest element") + var parens = isAssign ? refDestructuringErrors.parenthesizedAssign : refDestructuringErrors.parenthesizedBind + if (parens > -1) this.raiseRecoverable(parens, "Parenthesized pattern") +} + +pp.checkExpressionErrors = function(refDestructuringErrors, andThrow) { + var pos = refDestructuringErrors ? refDestructuringErrors.shorthandAssign : -1 + if (!andThrow) return pos >= 0 + if (pos > -1) this.raise(pos, "Shorthand property assignments are valid only in destructuring patterns") +} + +pp.checkYieldAwaitInDefaultParams = function() { + if (this.yieldPos && (!this.awaitPos || this.yieldPos < this.awaitPos)) + this.raise(this.yieldPos, "Yield expression cannot be a default value") + if (this.awaitPos) + this.raise(this.awaitPos, "Await expression cannot be a default value") +} + +pp.isSimpleAssignTarget = function(expr) { + if (expr.type === "ParenthesizedExpression") + return this.isSimpleAssignTarget(expr.expression) + return expr.type === "Identifier" || expr.type === "MemberExpression" +} + +var pp$1 = Parser.prototype + +// ### Statement parsing + +// Parse a program. Initializes the parser, reads any number of +// statements, and wraps them in a Program node. Optionally takes a +// `program` argument. If present, the statements will be appended +// to its body instead of creating a new node. + +pp$1.parseTopLevel = function(node) { + var this$1 = this; + + var exports = {} + if (!node.body) node.body = [] + while (this.type !== tt.eof) { + var stmt = this$1.parseStatement(true, true, exports) + node.body.push(stmt) + } + this.next() + if (this.options.ecmaVersion >= 6) { + node.sourceType = this.options.sourceType + } + return this.finishNode(node, "Program") +} + +var loopLabel = {kind: "loop"}; +var switchLabel = {kind: "switch"}; +pp$1.isLet = function() { + if (this.type !== tt.name || this.options.ecmaVersion < 6 || this.value != "let") return false + skipWhiteSpace.lastIndex = this.pos + var skip = skipWhiteSpace.exec(this.input) + var next = this.pos + skip[0].length, nextCh = this.input.charCodeAt(next) + if (nextCh === 91 || nextCh == 123) return true // '{' and '[' + if (isIdentifierStart(nextCh, true)) { + var pos = next + 1 + while (isIdentifierChar(this.input.charCodeAt(pos), true)) ++pos + var ident = this.input.slice(next, pos) + if (!this.isKeyword(ident)) return true + } + return false +} + +// check 'async [no LineTerminator here] function' +// - 'async /*foo*/ function' is OK. +// - 'async /*\n*/ function' is invalid. +pp$1.isAsyncFunction = function() { + if (this.type !== tt.name || this.options.ecmaVersion < 8 || this.value != "async") + return false + + skipWhiteSpace.lastIndex = this.pos + var skip = skipWhiteSpace.exec(this.input) + var next = this.pos + skip[0].length + return !lineBreak.test(this.input.slice(this.pos, next)) && + this.input.slice(next, next + 8) === "function" && + (next + 8 == this.input.length || !isIdentifierChar(this.input.charAt(next + 8))) +} + +// Parse a single statement. +// +// If expecting a statement and finding a slash operator, parse a +// regular expression literal. This is to handle cases like +// `if (foo) /blah/.exec(foo)`, where looking at the previous token +// does not help. + +pp$1.parseStatement = function(declaration, topLevel, exports) { + var starttype = this.type, node = this.startNode(), kind + + if (this.isLet()) { + starttype = tt._var + kind = "let" + } + + // Most types of statements are recognized by the keyword they + // start with. Many are trivial to parse, some require a bit of + // complexity. + + switch (starttype) { + case tt._break: case tt._continue: return this.parseBreakContinueStatement(node, starttype.keyword) + case tt._debugger: return this.parseDebuggerStatement(node) + case tt._do: return this.parseDoStatement(node) + case tt._for: return this.parseForStatement(node) + case tt._function: + if (!declaration && this.options.ecmaVersion >= 6) this.unexpected() + return this.parseFunctionStatement(node, false) + case tt._class: + if (!declaration) this.unexpected() + return this.parseClass(node, true) + case tt._if: return this.parseIfStatement(node) + case tt._return: return this.parseReturnStatement(node) + case tt._switch: return this.parseSwitchStatement(node) + case tt._throw: return this.parseThrowStatement(node) + case tt._try: return this.parseTryStatement(node) + case tt._const: case tt._var: + kind = kind || this.value + if (!declaration && kind != "var") this.unexpected() + return this.parseVarStatement(node, kind) + case tt._while: return this.parseWhileStatement(node) + case tt._with: return this.parseWithStatement(node) + case tt.braceL: return this.parseBlock() + case tt.semi: return this.parseEmptyStatement(node) + case tt._export: + case tt._import: + if (!this.options.allowImportExportEverywhere) { + if (!topLevel) + this.raise(this.start, "'import' and 'export' may only appear at the top level") + if (!this.inModule) + this.raise(this.start, "'import' and 'export' may appear only with 'sourceType: module'") + } + return starttype === tt._import ? this.parseImport(node) : this.parseExport(node, exports) + + // If the statement does not start with a statement keyword or a + // brace, it's an ExpressionStatement or LabeledStatement. We + // simply start parsing an expression, and afterwards, if the + // next token is a colon and the expression was a simple + // Identifier node, we switch to interpreting it as a label. + default: + if (this.isAsyncFunction() && declaration) { + this.next() + return this.parseFunctionStatement(node, true) + } + + var maybeName = this.value, expr = this.parseExpression() + if (starttype === tt.name && expr.type === "Identifier" && this.eat(tt.colon)) + return this.parseLabeledStatement(node, maybeName, expr) + else return this.parseExpressionStatement(node, expr) + } +} + +pp$1.parseBreakContinueStatement = function(node, keyword) { + var this$1 = this; + + var isBreak = keyword == "break" + this.next() + if (this.eat(tt.semi) || this.insertSemicolon()) node.label = null + else if (this.type !== tt.name) this.unexpected() + else { + node.label = this.parseIdent() + this.semicolon() + } + + // Verify that there is an actual destination to break or + // continue to. + var i = 0 + for (; i < this.labels.length; ++i) { + var lab = this$1.labels[i] + if (node.label == null || lab.name === node.label.name) { + if (lab.kind != null && (isBreak || lab.kind === "loop")) break + if (node.label && isBreak) break + } + } + if (i === this.labels.length) this.raise(node.start, "Unsyntactic " + keyword) + return this.finishNode(node, isBreak ? "BreakStatement" : "ContinueStatement") +} + +pp$1.parseDebuggerStatement = function(node) { + this.next() + this.semicolon() + return this.finishNode(node, "DebuggerStatement") +} + +pp$1.parseDoStatement = function(node) { + this.next() + this.labels.push(loopLabel) + node.body = this.parseStatement(false) + this.labels.pop() + this.expect(tt._while) + node.test = this.parseParenExpression() + if (this.options.ecmaVersion >= 6) + this.eat(tt.semi) + else + this.semicolon() + return this.finishNode(node, "DoWhileStatement") +} + +// Disambiguating between a `for` and a `for`/`in` or `for`/`of` +// loop is non-trivial. Basically, we have to parse the init `var` +// statement or expression, disallowing the `in` operator (see +// the second parameter to `parseExpression`), and then check +// whether the next token is `in` or `of`. When there is no init +// part (semicolon immediately after the opening parenthesis), it +// is a regular `for` loop. + +pp$1.parseForStatement = function(node) { + this.next() + this.labels.push(loopLabel) + this.enterLexicalScope() + this.expect(tt.parenL) + if (this.type === tt.semi) return this.parseFor(node, null) + var isLet = this.isLet() + if (this.type === tt._var || this.type === tt._const || isLet) { + var init$1 = this.startNode(), kind = isLet ? "let" : this.value + this.next() + this.parseVar(init$1, true, kind) + this.finishNode(init$1, "VariableDeclaration") + if ((this.type === tt._in || (this.options.ecmaVersion >= 6 && this.isContextual("of"))) && init$1.declarations.length === 1 && + !(kind !== "var" && init$1.declarations[0].init)) + return this.parseForIn(node, init$1) + return this.parseFor(node, init$1) + } + var refDestructuringErrors = new DestructuringErrors + var init = this.parseExpression(true, refDestructuringErrors) + if (this.type === tt._in || (this.options.ecmaVersion >= 6 && this.isContextual("of"))) { + this.toAssignable(init) + this.checkLVal(init) + this.checkPatternErrors(refDestructuringErrors, true) + return this.parseForIn(node, init) + } else { + this.checkExpressionErrors(refDestructuringErrors, true) + } + return this.parseFor(node, init) +} + +pp$1.parseFunctionStatement = function(node, isAsync) { + this.next() + return this.parseFunction(node, true, false, isAsync) +} + +pp$1.isFunction = function() { + return this.type === tt._function || this.isAsyncFunction() +} + +pp$1.parseIfStatement = function(node) { + this.next() + node.test = this.parseParenExpression() + // allow function declarations in branches, but only in non-strict mode + node.consequent = this.parseStatement(!this.strict && this.isFunction()) + node.alternate = this.eat(tt._else) ? this.parseStatement(!this.strict && this.isFunction()) : null + return this.finishNode(node, "IfStatement") +} + +pp$1.parseReturnStatement = function(node) { + if (!this.inFunction && !this.options.allowReturnOutsideFunction) + this.raise(this.start, "'return' outside of function") + this.next() + + // In `return` (and `break`/`continue`), the keywords with + // optional arguments, we eagerly look for a semicolon or the + // possibility to insert one. + + if (this.eat(tt.semi) || this.insertSemicolon()) node.argument = null + else { node.argument = this.parseExpression(); this.semicolon() } + return this.finishNode(node, "ReturnStatement") +} + +pp$1.parseSwitchStatement = function(node) { + var this$1 = this; + + this.next() + node.discriminant = this.parseParenExpression() + node.cases = [] + this.expect(tt.braceL) + this.labels.push(switchLabel) + this.enterLexicalScope() + + // Statements under must be grouped (by label) in SwitchCase + // nodes. `cur` is used to keep the node that we are currently + // adding statements to. + + var cur + for (var sawDefault = false; this.type != tt.braceR;) { + if (this$1.type === tt._case || this$1.type === tt._default) { + var isCase = this$1.type === tt._case + if (cur) this$1.finishNode(cur, "SwitchCase") + node.cases.push(cur = this$1.startNode()) + cur.consequent = [] + this$1.next() + if (isCase) { + cur.test = this$1.parseExpression() + } else { + if (sawDefault) this$1.raiseRecoverable(this$1.lastTokStart, "Multiple default clauses") + sawDefault = true + cur.test = null + } + this$1.expect(tt.colon) + } else { + if (!cur) this$1.unexpected() + cur.consequent.push(this$1.parseStatement(true)) + } + } + this.exitLexicalScope() + if (cur) this.finishNode(cur, "SwitchCase") + this.next() // Closing brace + this.labels.pop() + return this.finishNode(node, "SwitchStatement") +} + +pp$1.parseThrowStatement = function(node) { + this.next() + if (lineBreak.test(this.input.slice(this.lastTokEnd, this.start))) + this.raise(this.lastTokEnd, "Illegal newline after throw") + node.argument = this.parseExpression() + this.semicolon() + return this.finishNode(node, "ThrowStatement") +} + +// Reused empty array added for node fields that are always empty. + +var empty = [] + +pp$1.parseTryStatement = function(node) { + this.next() + node.block = this.parseBlock() + node.handler = null + if (this.type === tt._catch) { + var clause = this.startNode() + this.next() + this.expect(tt.parenL) + clause.param = this.parseBindingAtom() + this.enterLexicalScope() + this.checkLVal(clause.param, "let") + this.expect(tt.parenR) + clause.body = this.parseBlock(false) + this.exitLexicalScope() + node.handler = this.finishNode(clause, "CatchClause") + } + node.finalizer = this.eat(tt._finally) ? this.parseBlock() : null + if (!node.handler && !node.finalizer) + this.raise(node.start, "Missing catch or finally clause") + return this.finishNode(node, "TryStatement") +} + +pp$1.parseVarStatement = function(node, kind) { + this.next() + this.parseVar(node, false, kind) + this.semicolon() + return this.finishNode(node, "VariableDeclaration") +} + +pp$1.parseWhileStatement = function(node) { + this.next() + node.test = this.parseParenExpression() + this.labels.push(loopLabel) + node.body = this.parseStatement(false) + this.labels.pop() + return this.finishNode(node, "WhileStatement") +} + +pp$1.parseWithStatement = function(node) { + if (this.strict) this.raise(this.start, "'with' in strict mode") + this.next() + node.object = this.parseParenExpression() + node.body = this.parseStatement(false) + return this.finishNode(node, "WithStatement") +} + +pp$1.parseEmptyStatement = function(node) { + this.next() + return this.finishNode(node, "EmptyStatement") +} + +pp$1.parseLabeledStatement = function(node, maybeName, expr) { + var this$1 = this; + + for (var i = 0; i < this.labels.length; ++i) + if (this$1.labels[i].name === maybeName) this$1.raise(expr.start, "Label '" + maybeName + "' is already declared") + var kind = this.type.isLoop ? "loop" : this.type === tt._switch ? "switch" : null + for (var i$1 = this.labels.length - 1; i$1 >= 0; i$1--) { + var label = this$1.labels[i$1] + if (label.statementStart == node.start) { + label.statementStart = this$1.start + label.kind = kind + } else break + } + this.labels.push({name: maybeName, kind: kind, statementStart: this.start}) + node.body = this.parseStatement(true) + if (node.body.type == "ClassDeclaration" || + node.body.type == "VariableDeclaration" && node.body.kind != "var" || + node.body.type == "FunctionDeclaration" && (this.strict || node.body.generator)) + this.raiseRecoverable(node.body.start, "Invalid labeled declaration") + this.labels.pop() + node.label = expr + return this.finishNode(node, "LabeledStatement") +} + +pp$1.parseExpressionStatement = function(node, expr) { + node.expression = expr + this.semicolon() + return this.finishNode(node, "ExpressionStatement") +} + +// Parse a semicolon-enclosed block of statements, handling `"use +// strict"` declarations when `allowStrict` is true (used for +// function bodies). + +pp$1.parseBlock = function(createNewLexicalScope) { + var this$1 = this; + if ( createNewLexicalScope === void 0 ) createNewLexicalScope = true; + + var node = this.startNode() + node.body = [] + this.expect(tt.braceL) + if (createNewLexicalScope) { + this.enterLexicalScope() + } + while (!this.eat(tt.braceR)) { + var stmt = this$1.parseStatement(true) + node.body.push(stmt) + } + if (createNewLexicalScope) { + this.exitLexicalScope() + } + return this.finishNode(node, "BlockStatement") +} + +// Parse a regular `for` loop. The disambiguation code in +// `parseStatement` will already have parsed the init statement or +// expression. + +pp$1.parseFor = function(node, init) { + node.init = init + this.expect(tt.semi) + node.test = this.type === tt.semi ? null : this.parseExpression() + this.expect(tt.semi) + node.update = this.type === tt.parenR ? null : this.parseExpression() + this.expect(tt.parenR) + this.exitLexicalScope() + node.body = this.parseStatement(false) + this.labels.pop() + return this.finishNode(node, "ForStatement") +} + +// Parse a `for`/`in` and `for`/`of` loop, which are almost +// same from parser's perspective. + +pp$1.parseForIn = function(node, init) { + var type = this.type === tt._in ? "ForInStatement" : "ForOfStatement" + this.next() + node.left = init + node.right = this.parseExpression() + this.expect(tt.parenR) + this.exitLexicalScope() + node.body = this.parseStatement(false) + this.labels.pop() + return this.finishNode(node, type) +} + +// Parse a list of variable declarations. + +pp$1.parseVar = function(node, isFor, kind) { + var this$1 = this; + + node.declarations = [] + node.kind = kind + for (;;) { + var decl = this$1.startNode() + this$1.parseVarId(decl, kind) + if (this$1.eat(tt.eq)) { + decl.init = this$1.parseMaybeAssign(isFor) + } else if (kind === "const" && !(this$1.type === tt._in || (this$1.options.ecmaVersion >= 6 && this$1.isContextual("of")))) { + this$1.unexpected() + } else if (decl.id.type != "Identifier" && !(isFor && (this$1.type === tt._in || this$1.isContextual("of")))) { + this$1.raise(this$1.lastTokEnd, "Complex binding patterns require an initialization value") + } else { + decl.init = null + } + node.declarations.push(this$1.finishNode(decl, "VariableDeclarator")) + if (!this$1.eat(tt.comma)) break + } + return node +} + +pp$1.parseVarId = function(decl, kind) { + decl.id = this.parseBindingAtom(kind) + this.checkLVal(decl.id, kind, false) +} + +// Parse a function declaration or literal (depending on the +// `isStatement` parameter). + +pp$1.parseFunction = function(node, isStatement, allowExpressionBody, isAsync) { + this.initFunction(node) + if (this.options.ecmaVersion >= 6 && !isAsync) + node.generator = this.eat(tt.star) + if (this.options.ecmaVersion >= 8) + node.async = !!isAsync + + if (isStatement) { + node.id = isStatement === "nullableID" && this.type != tt.name ? null : this.parseIdent() + if (node.id) { + this.checkLVal(node.id, "var") + } + } + + var oldInGen = this.inGenerator, oldInAsync = this.inAsync, + oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos, oldInFunc = this.inFunction + this.inGenerator = node.generator + this.inAsync = node.async + this.yieldPos = 0 + this.awaitPos = 0 + this.inFunction = true + this.enterFunctionScope() + + if (!isStatement) + node.id = this.type == tt.name ? this.parseIdent() : null + + this.parseFunctionParams(node) + this.parseFunctionBody(node, allowExpressionBody) + + this.inGenerator = oldInGen + this.inAsync = oldInAsync + this.yieldPos = oldYieldPos + this.awaitPos = oldAwaitPos + this.inFunction = oldInFunc + return this.finishNode(node, isStatement ? "FunctionDeclaration" : "FunctionExpression") +} + +pp$1.parseFunctionParams = function(node) { + this.expect(tt.parenL) + node.params = this.parseBindingList(tt.parenR, false, this.options.ecmaVersion >= 8, true) + this.checkYieldAwaitInDefaultParams() +} + +// Parse a class declaration or literal (depending on the +// `isStatement` parameter). + +pp$1.parseClass = function(node, isStatement) { + var this$1 = this; + + this.next() + + this.parseClassId(node, isStatement) + this.parseClassSuper(node) + var classBody = this.startNode() + var hadConstructor = false + classBody.body = [] + this.expect(tt.braceL) + while (!this.eat(tt.braceR)) { + if (this$1.eat(tt.semi)) continue + var method = this$1.startNode() + var isGenerator = this$1.eat(tt.star) + var isAsync = false + var isMaybeStatic = this$1.type === tt.name && this$1.value === "static" + this$1.parsePropertyName(method) + method.static = isMaybeStatic && this$1.type !== tt.parenL + if (method.static) { + if (isGenerator) this$1.unexpected() + isGenerator = this$1.eat(tt.star) + this$1.parsePropertyName(method) + } + if (this$1.options.ecmaVersion >= 8 && !isGenerator && !method.computed && + method.key.type === "Identifier" && method.key.name === "async" && this$1.type !== tt.parenL && + !this$1.canInsertSemicolon()) { + isAsync = true + this$1.parsePropertyName(method) + } + method.kind = "method" + var isGetSet = false + if (!method.computed) { + var key = method.key; + if (!isGenerator && !isAsync && key.type === "Identifier" && this$1.type !== tt.parenL && (key.name === "get" || key.name === "set")) { + isGetSet = true + method.kind = key.name + key = this$1.parsePropertyName(method) + } + if (!method.static && (key.type === "Identifier" && key.name === "constructor" || + key.type === "Literal" && key.value === "constructor")) { + if (hadConstructor) this$1.raise(key.start, "Duplicate constructor in the same class") + if (isGetSet) this$1.raise(key.start, "Constructor can't have get/set modifier") + if (isGenerator) this$1.raise(key.start, "Constructor can't be a generator") + if (isAsync) this$1.raise(key.start, "Constructor can't be an async method") + method.kind = "constructor" + hadConstructor = true + } + } + this$1.parseClassMethod(classBody, method, isGenerator, isAsync) + if (isGetSet) { + var paramCount = method.kind === "get" ? 0 : 1 + if (method.value.params.length !== paramCount) { + var start = method.value.start + if (method.kind === "get") + this$1.raiseRecoverable(start, "getter should have no params") + else + this$1.raiseRecoverable(start, "setter should have exactly one param") + } else { + if (method.kind === "set" && method.value.params[0].type === "RestElement") + this$1.raiseRecoverable(method.value.params[0].start, "Setter cannot use rest params") + } + } + } + node.body = this.finishNode(classBody, "ClassBody") + return this.finishNode(node, isStatement ? "ClassDeclaration" : "ClassExpression") +} + +pp$1.parseClassMethod = function(classBody, method, isGenerator, isAsync) { + method.value = this.parseMethod(isGenerator, isAsync) + classBody.body.push(this.finishNode(method, "MethodDefinition")) +} + +pp$1.parseClassId = function(node, isStatement) { + node.id = this.type === tt.name ? this.parseIdent() : isStatement === true ? this.unexpected() : null +} + +pp$1.parseClassSuper = function(node) { + node.superClass = this.eat(tt._extends) ? this.parseExprSubscripts() : null +} + +// Parses module export declaration. + +pp$1.parseExport = function(node, exports) { + var this$1 = this; + + this.next() + // export * from '...' + if (this.eat(tt.star)) { + this.expectContextual("from") + node.source = this.type === tt.string ? this.parseExprAtom() : this.unexpected() + this.semicolon() + return this.finishNode(node, "ExportAllDeclaration") + } + if (this.eat(tt._default)) { // export default ... + this.checkExport(exports, "default", this.lastTokStart) + var isAsync + if (this.type === tt._function || (isAsync = this.isAsyncFunction())) { + var fNode = this.startNode() + this.next() + if (isAsync) this.next() + node.declaration = this.parseFunction(fNode, "nullableID", false, isAsync) + } else if (this.type === tt._class) { + var cNode = this.startNode() + node.declaration = this.parseClass(cNode, "nullableID") + } else { + node.declaration = this.parseMaybeAssign() + this.semicolon() + } + return this.finishNode(node, "ExportDefaultDeclaration") + } + // export var|const|let|function|class ... + if (this.shouldParseExportStatement()) { + node.declaration = this.parseStatement(true) + if (node.declaration.type === "VariableDeclaration") + this.checkVariableExport(exports, node.declaration.declarations) + else + this.checkExport(exports, node.declaration.id.name, node.declaration.id.start) + node.specifiers = [] + node.source = null + } else { // export { x, y as z } [from '...'] + node.declaration = null + node.specifiers = this.parseExportSpecifiers(exports) + if (this.eatContextual("from")) { + node.source = this.type === tt.string ? this.parseExprAtom() : this.unexpected() + } else { + // check for keywords used as local names + for (var i = 0; i < node.specifiers.length; i++) { + if (this$1.keywords.test(node.specifiers[i].local.name) || this$1.reservedWords.test(node.specifiers[i].local.name)) { + this$1.unexpected(node.specifiers[i].local.start) + } + } + + node.source = null + } + this.semicolon() + } + return this.finishNode(node, "ExportNamedDeclaration") +} + +pp$1.checkExport = function(exports, name, pos) { + if (!exports) return + if (has(exports, name)) + this.raiseRecoverable(pos, "Duplicate export '" + name + "'") + exports[name] = true +} + +pp$1.checkPatternExport = function(exports, pat) { + var this$1 = this; + + var type = pat.type + if (type == "Identifier") + this.checkExport(exports, pat.name, pat.start) + else if (type == "ObjectPattern") + for (var i = 0; i < pat.properties.length; ++i) + this$1.checkPatternExport(exports, pat.properties[i].value) + else if (type == "ArrayPattern") + for (var i$1 = 0; i$1 < pat.elements.length; ++i$1) { + var elt = pat.elements[i$1] + if (elt) this$1.checkPatternExport(exports, elt) + } + else if (type == "AssignmentPattern") + this.checkPatternExport(exports, pat.left) + else if (type == "ParenthesizedExpression") + this.checkPatternExport(exports, pat.expression) +} + +pp$1.checkVariableExport = function(exports, decls) { + var this$1 = this; + + if (!exports) return + for (var i = 0; i < decls.length; i++) + this$1.checkPatternExport(exports, decls[i].id) +} + +pp$1.shouldParseExportStatement = function() { + return this.type.keyword === "var" || + this.type.keyword === "const" || + this.type.keyword === "class" || + this.type.keyword === "function" || + this.isLet() || + this.isAsyncFunction() +} + +// Parses a comma-separated list of module exports. + +pp$1.parseExportSpecifiers = function(exports) { + var this$1 = this; + + var nodes = [], first = true + // export { x, y as z } [from '...'] + this.expect(tt.braceL) + while (!this.eat(tt.braceR)) { + if (!first) { + this$1.expect(tt.comma) + if (this$1.afterTrailingComma(tt.braceR)) break + } else first = false + + var node = this$1.startNode() + node.local = this$1.parseIdent(true) + node.exported = this$1.eatContextual("as") ? this$1.parseIdent(true) : node.local + this$1.checkExport(exports, node.exported.name, node.exported.start) + nodes.push(this$1.finishNode(node, "ExportSpecifier")) + } + return nodes +} + +// Parses import declaration. + +pp$1.parseImport = function(node) { + this.next() + // import '...' + if (this.type === tt.string) { + node.specifiers = empty + node.source = this.parseExprAtom() + } else { + node.specifiers = this.parseImportSpecifiers() + this.expectContextual("from") + node.source = this.type === tt.string ? this.parseExprAtom() : this.unexpected() + } + this.semicolon() + return this.finishNode(node, "ImportDeclaration") +} + +// Parses a comma-separated list of module imports. + +pp$1.parseImportSpecifiers = function() { + var this$1 = this; + + var nodes = [], first = true + if (this.type === tt.name) { + // import defaultObj, { x, y as z } from '...' + var node = this.startNode() + node.local = this.parseIdent() + this.checkLVal(node.local, "let") + nodes.push(this.finishNode(node, "ImportDefaultSpecifier")) + if (!this.eat(tt.comma)) return nodes + } + if (this.type === tt.star) { + var node$1 = this.startNode() + this.next() + this.expectContextual("as") + node$1.local = this.parseIdent() + this.checkLVal(node$1.local, "let") + nodes.push(this.finishNode(node$1, "ImportNamespaceSpecifier")) + return nodes + } + this.expect(tt.braceL) + while (!this.eat(tt.braceR)) { + if (!first) { + this$1.expect(tt.comma) + if (this$1.afterTrailingComma(tt.braceR)) break + } else first = false + + var node$2 = this$1.startNode() + node$2.imported = this$1.parseIdent(true) + if (this$1.eatContextual("as")) { + node$2.local = this$1.parseIdent() + } else { + node$2.local = node$2.imported + if (this$1.isKeyword(node$2.local.name)) this$1.unexpected(node$2.local.start) + if (this$1.reservedWordsStrict.test(node$2.local.name)) this$1.raiseRecoverable(node$2.local.start, "The keyword '" + node$2.local.name + "' is reserved") + } + this$1.checkLVal(node$2.local, "let") + nodes.push(this$1.finishNode(node$2, "ImportSpecifier")) + } + return nodes +} + +var pp$2 = Parser.prototype + +// Convert existing expression atom to assignable pattern +// if possible. + +pp$2.toAssignable = function(node, isBinding) { + var this$1 = this; + + if (this.options.ecmaVersion >= 6 && node) { + switch (node.type) { + case "Identifier": + if (this.inAsync && node.name === "await") + this.raise(node.start, "Can not use 'await' as identifier inside an async function") + break + + case "ObjectPattern": + case "ArrayPattern": + break + + case "ObjectExpression": + node.type = "ObjectPattern" + for (var i = 0; i < node.properties.length; i++) { + var prop = node.properties[i] + if (prop.kind !== "init") this$1.raise(prop.key.start, "Object pattern can't contain getter or setter") + this$1.toAssignable(prop.value, isBinding) + } + break + + case "ArrayExpression": + node.type = "ArrayPattern" + this.toAssignableList(node.elements, isBinding) + break + + case "AssignmentExpression": + if (node.operator === "=") { + node.type = "AssignmentPattern" + delete node.operator + this.toAssignable(node.left, isBinding) + // falls through to AssignmentPattern + } else { + this.raise(node.left.end, "Only '=' operator can be used for specifying default value.") + break + } + + case "AssignmentPattern": + break + + case "ParenthesizedExpression": + node.expression = this.toAssignable(node.expression, isBinding) + break + + case "MemberExpression": + if (!isBinding) break + + default: + this.raise(node.start, "Assigning to rvalue") + } + } + return node +} + +// Convert list of expression atoms to binding list. + +pp$2.toAssignableList = function(exprList, isBinding) { + var this$1 = this; + + var end = exprList.length + if (end) { + var last = exprList[end - 1] + if (last && last.type == "RestElement") { + --end + } else if (last && last.type == "SpreadElement") { + last.type = "RestElement" + var arg = last.argument + this.toAssignable(arg, isBinding) + if (arg.type !== "Identifier" && arg.type !== "MemberExpression" && arg.type !== "ArrayPattern") + this.unexpected(arg.start) + --end + } + + if (isBinding && last && last.type === "RestElement" && last.argument.type !== "Identifier") + this.unexpected(last.argument.start) + } + for (var i = 0; i < end; i++) { + var elt = exprList[i] + if (elt) this$1.toAssignable(elt, isBinding) + } + return exprList +} + +// Parses spread element. + +pp$2.parseSpread = function(refDestructuringErrors) { + var node = this.startNode() + this.next() + node.argument = this.parseMaybeAssign(false, refDestructuringErrors) + return this.finishNode(node, "SpreadElement") +} + +pp$2.parseRest = function(allowNonIdent) { + var node = this.startNode() + this.next() + + // RestElement inside of a function parameter must be an identifier + if (allowNonIdent) node.argument = this.type === tt.name ? this.parseIdent() : this.unexpected() + else node.argument = this.type === tt.name || this.type === tt.bracketL ? this.parseBindingAtom() : this.unexpected() + + return this.finishNode(node, "RestElement") +} + +// Parses lvalue (assignable) atom. + +pp$2.parseBindingAtom = function() { + if (this.options.ecmaVersion < 6) return this.parseIdent() + switch (this.type) { + case tt.name: + return this.parseIdent() + + case tt.bracketL: + var node = this.startNode() + this.next() + node.elements = this.parseBindingList(tt.bracketR, true, true) + return this.finishNode(node, "ArrayPattern") + + case tt.braceL: + return this.parseObj(true) + + default: + this.unexpected() + } +} + +pp$2.parseBindingList = function(close, allowEmpty, allowTrailingComma, allowNonIdent) { + var this$1 = this; + + var elts = [], first = true + while (!this.eat(close)) { + if (first) first = false + else this$1.expect(tt.comma) + if (allowEmpty && this$1.type === tt.comma) { + elts.push(null) + } else if (allowTrailingComma && this$1.afterTrailingComma(close)) { + break + } else if (this$1.type === tt.ellipsis) { + var rest = this$1.parseRest(allowNonIdent) + this$1.parseBindingListItem(rest) + elts.push(rest) + if (this$1.type === tt.comma) this$1.raise(this$1.start, "Comma is not permitted after the rest element") + this$1.expect(close) + break + } else { + var elem = this$1.parseMaybeDefault(this$1.start, this$1.startLoc) + this$1.parseBindingListItem(elem) + elts.push(elem) + } + } + return elts +} + +pp$2.parseBindingListItem = function(param) { + return param +} + +// Parses assignment pattern around given atom if possible. + +pp$2.parseMaybeDefault = function(startPos, startLoc, left) { + left = left || this.parseBindingAtom() + if (this.options.ecmaVersion < 6 || !this.eat(tt.eq)) return left + var node = this.startNodeAt(startPos, startLoc) + node.left = left + node.right = this.parseMaybeAssign() + return this.finishNode(node, "AssignmentPattern") +} + +// Verify that a node is an lval — something that can be assigned +// to. +// bindingType can be either: +// 'var' indicating that the lval creates a 'var' binding +// 'let' indicating that the lval creates a lexical ('let' or 'const') binding +// 'none' indicating that the binding should be checked for illegal identifiers, but not for duplicate references + +pp$2.checkLVal = function(expr, bindingType, checkClashes) { + var this$1 = this; + + switch (expr.type) { + case "Identifier": + if (this.strict && this.reservedWordsStrictBind.test(expr.name)) + this.raiseRecoverable(expr.start, (bindingType ? "Binding " : "Assigning to ") + expr.name + " in strict mode") + if (checkClashes) { + if (has(checkClashes, expr.name)) + this.raiseRecoverable(expr.start, "Argument name clash") + checkClashes[expr.name] = true + } + if (bindingType && bindingType !== "none") { + if ( + bindingType === "var" && !this.canDeclareVarName(expr.name) || + bindingType !== "var" && !this.canDeclareLexicalName(expr.name) + ) { + this.raiseRecoverable(expr.start, ("Identifier '" + (expr.name) + "' has already been declared")) + } + if (bindingType === "var") { + this.declareVarName(expr.name) + } else { + this.declareLexicalName(expr.name) + } + } + break + + case "MemberExpression": + if (bindingType) this.raiseRecoverable(expr.start, (bindingType ? "Binding" : "Assigning to") + " member expression") + break + + case "ObjectPattern": + for (var i = 0; i < expr.properties.length; i++) + this$1.checkLVal(expr.properties[i].value, bindingType, checkClashes) + break + + case "ArrayPattern": + for (var i$1 = 0; i$1 < expr.elements.length; i$1++) { + var elem = expr.elements[i$1] + if (elem) this$1.checkLVal(elem, bindingType, checkClashes) + } + break + + case "AssignmentPattern": + this.checkLVal(expr.left, bindingType, checkClashes) + break + + case "RestElement": + this.checkLVal(expr.argument, bindingType, checkClashes) + break + + case "ParenthesizedExpression": + this.checkLVal(expr.expression, bindingType, checkClashes) + break + + default: + this.raise(expr.start, (bindingType ? "Binding" : "Assigning to") + " rvalue") + } +} + +// A recursive descent parser operates by defining functions for all +// syntactic elements, and recursively calling those, each function +// advancing the input stream and returning an AST node. Precedence +// of constructs (for example, the fact that `!x[1]` means `!(x[1])` +// instead of `(!x)[1]` is handled by the fact that the parser +// function that parses unary prefix operators is called first, and +// in turn calls the function that parses `[]` subscripts — that +// way, it'll receive the node for `x[1]` already parsed, and wraps +// *that* in the unary operator node. +// +// Acorn uses an [operator precedence parser][opp] to handle binary +// operator precedence, because it is much more compact than using +// the technique outlined above, which uses different, nesting +// functions to specify precedence, for all of the ten binary +// precedence levels that JavaScript defines. +// +// [opp]: http://en.wikipedia.org/wiki/Operator-precedence_parser + +var pp$3 = Parser.prototype + +// Check if property name clashes with already added. +// Object/class getters and setters are not allowed to clash — +// either with each other or with an init property — and in +// strict mode, init properties are also not allowed to be repeated. + +pp$3.checkPropClash = function(prop, propHash) { + if (this.options.ecmaVersion >= 6 && (prop.computed || prop.method || prop.shorthand)) + return + var key = prop.key; + var name + switch (key.type) { + case "Identifier": name = key.name; break + case "Literal": name = String(key.value); break + default: return + } + var kind = prop.kind; + if (this.options.ecmaVersion >= 6) { + if (name === "__proto__" && kind === "init") { + if (propHash.proto) this.raiseRecoverable(key.start, "Redefinition of __proto__ property") + propHash.proto = true + } + return + } + name = "$" + name + var other = propHash[name] + if (other) { + var redefinition + if (kind === "init") { + redefinition = this.strict && other.init || other.get || other.set + } else { + redefinition = other.init || other[kind] + } + if (redefinition) + this.raiseRecoverable(key.start, "Redefinition of property") + } else { + other = propHash[name] = { + init: false, + get: false, + set: false + } + } + other[kind] = true +} + +// ### Expression parsing + +// These nest, from the most general expression type at the top to +// 'atomic', nondivisible expression types at the bottom. Most of +// the functions will simply let the function(s) below them parse, +// and, *if* the syntactic construct they handle is present, wrap +// the AST node that the inner parser gave them in another node. + +// Parse a full expression. The optional arguments are used to +// forbid the `in` operator (in for loops initalization expressions) +// and provide reference for storing '=' operator inside shorthand +// property assignment in contexts where both object expression +// and object pattern might appear (so it's possible to raise +// delayed syntax error at correct position). + +pp$3.parseExpression = function(noIn, refDestructuringErrors) { + var this$1 = this; + + var startPos = this.start, startLoc = this.startLoc + var expr = this.parseMaybeAssign(noIn, refDestructuringErrors) + if (this.type === tt.comma) { + var node = this.startNodeAt(startPos, startLoc) + node.expressions = [expr] + while (this.eat(tt.comma)) node.expressions.push(this$1.parseMaybeAssign(noIn, refDestructuringErrors)) + return this.finishNode(node, "SequenceExpression") + } + return expr +} + +// Parse an assignment expression. This includes applications of +// operators like `+=`. + +pp$3.parseMaybeAssign = function(noIn, refDestructuringErrors, afterLeftParse) { + if (this.inGenerator && this.isContextual("yield")) return this.parseYield() + + var ownDestructuringErrors = false, oldParenAssign = -1, oldTrailingComma = -1 + if (refDestructuringErrors) { + oldParenAssign = refDestructuringErrors.parenthesizedAssign + oldTrailingComma = refDestructuringErrors.trailingComma + refDestructuringErrors.parenthesizedAssign = refDestructuringErrors.trailingComma = -1 + } else { + refDestructuringErrors = new DestructuringErrors + ownDestructuringErrors = true + } + + var startPos = this.start, startLoc = this.startLoc + if (this.type == tt.parenL || this.type == tt.name) + this.potentialArrowAt = this.start + var left = this.parseMaybeConditional(noIn, refDestructuringErrors) + if (afterLeftParse) left = afterLeftParse.call(this, left, startPos, startLoc) + if (this.type.isAssign) { + this.checkPatternErrors(refDestructuringErrors, true) + if (!ownDestructuringErrors) DestructuringErrors.call(refDestructuringErrors) + var node = this.startNodeAt(startPos, startLoc) + node.operator = this.value + node.left = this.type === tt.eq ? this.toAssignable(left) : left + refDestructuringErrors.shorthandAssign = -1 // reset because shorthand default was used correctly + this.checkLVal(left) + this.next() + node.right = this.parseMaybeAssign(noIn) + return this.finishNode(node, "AssignmentExpression") + } else { + if (ownDestructuringErrors) this.checkExpressionErrors(refDestructuringErrors, true) + } + if (oldParenAssign > -1) refDestructuringErrors.parenthesizedAssign = oldParenAssign + if (oldTrailingComma > -1) refDestructuringErrors.trailingComma = oldTrailingComma + return left +} + +// Parse a ternary conditional (`?:`) operator. + +pp$3.parseMaybeConditional = function(noIn, refDestructuringErrors) { + var startPos = this.start, startLoc = this.startLoc + var expr = this.parseExprOps(noIn, refDestructuringErrors) + if (this.checkExpressionErrors(refDestructuringErrors)) return expr + if (this.eat(tt.question)) { + var node = this.startNodeAt(startPos, startLoc) + node.test = expr + node.consequent = this.parseMaybeAssign() + this.expect(tt.colon) + node.alternate = this.parseMaybeAssign(noIn) + return this.finishNode(node, "ConditionalExpression") + } + return expr +} + +// Start the precedence parser. + +pp$3.parseExprOps = function(noIn, refDestructuringErrors) { + var startPos = this.start, startLoc = this.startLoc + var expr = this.parseMaybeUnary(refDestructuringErrors, false) + if (this.checkExpressionErrors(refDestructuringErrors)) return expr + return expr.start == startPos && expr.type === "ArrowFunctionExpression" ? expr : this.parseExprOp(expr, startPos, startLoc, -1, noIn) +} + +// Parse binary operators with the operator precedence parsing +// algorithm. `left` is the left-hand side of the operator. +// `minPrec` provides context that allows the function to stop and +// defer further parser to one of its callers when it encounters an +// operator that has a lower precedence than the set it is parsing. + +pp$3.parseExprOp = function(left, leftStartPos, leftStartLoc, minPrec, noIn) { + var prec = this.type.binop + if (prec != null && (!noIn || this.type !== tt._in)) { + if (prec > minPrec) { + var logical = this.type === tt.logicalOR || this.type === tt.logicalAND + var op = this.value + this.next() + var startPos = this.start, startLoc = this.startLoc + var right = this.parseExprOp(this.parseMaybeUnary(null, false), startPos, startLoc, prec, noIn) + var node = this.buildBinary(leftStartPos, leftStartLoc, left, right, op, logical) + return this.parseExprOp(node, leftStartPos, leftStartLoc, minPrec, noIn) + } + } + return left +} + +pp$3.buildBinary = function(startPos, startLoc, left, right, op, logical) { + var node = this.startNodeAt(startPos, startLoc) + node.left = left + node.operator = op + node.right = right + return this.finishNode(node, logical ? "LogicalExpression" : "BinaryExpression") +} + +// Parse unary operators, both prefix and postfix. + +pp$3.parseMaybeUnary = function(refDestructuringErrors, sawUnary) { + var this$1 = this; + + var startPos = this.start, startLoc = this.startLoc, expr + if (this.inAsync && this.isContextual("await")) { + expr = this.parseAwait(refDestructuringErrors) + sawUnary = true + } else if (this.type.prefix) { + var node = this.startNode(), update = this.type === tt.incDec + node.operator = this.value + node.prefix = true + this.next() + node.argument = this.parseMaybeUnary(null, true) + this.checkExpressionErrors(refDestructuringErrors, true) + if (update) this.checkLVal(node.argument) + else if (this.strict && node.operator === "delete" && + node.argument.type === "Identifier") + this.raiseRecoverable(node.start, "Deleting local variable in strict mode") + else sawUnary = true + expr = this.finishNode(node, update ? "UpdateExpression" : "UnaryExpression") + } else { + expr = this.parseExprSubscripts(refDestructuringErrors) + if (this.checkExpressionErrors(refDestructuringErrors)) return expr + while (this.type.postfix && !this.canInsertSemicolon()) { + var node$1 = this$1.startNodeAt(startPos, startLoc) + node$1.operator = this$1.value + node$1.prefix = false + node$1.argument = expr + this$1.checkLVal(expr) + this$1.next() + expr = this$1.finishNode(node$1, "UpdateExpression") + } + } + + if (!sawUnary && this.eat(tt.starstar)) + return this.buildBinary(startPos, startLoc, expr, this.parseMaybeUnary(null, false), "**", false) + else + return expr +} + +// Parse call, dot, and `[]`-subscript expressions. + +pp$3.parseExprSubscripts = function(refDestructuringErrors) { + var startPos = this.start, startLoc = this.startLoc + var expr = this.parseExprAtom(refDestructuringErrors) + var skipArrowSubscripts = expr.type === "ArrowFunctionExpression" && this.input.slice(this.lastTokStart, this.lastTokEnd) !== ")" + if (this.checkExpressionErrors(refDestructuringErrors) || skipArrowSubscripts) return expr + var result = this.parseSubscripts(expr, startPos, startLoc) + if (refDestructuringErrors && result.type === "MemberExpression") { + if (refDestructuringErrors.parenthesizedAssign >= result.start) refDestructuringErrors.parenthesizedAssign = -1 + if (refDestructuringErrors.parenthesizedBind >= result.start) refDestructuringErrors.parenthesizedBind = -1 + } + return result +} + +pp$3.parseSubscripts = function(base, startPos, startLoc, noCalls) { + var this$1 = this; + + var maybeAsyncArrow = this.options.ecmaVersion >= 8 && base.type === "Identifier" && base.name === "async" && + this.lastTokEnd == base.end && !this.canInsertSemicolon() + for (var computed;;) { + if ((computed = this$1.eat(tt.bracketL)) || this$1.eat(tt.dot)) { + var node = this$1.startNodeAt(startPos, startLoc) + node.object = base + node.property = computed ? this$1.parseExpression() : this$1.parseIdent(true) + node.computed = !!computed + if (computed) this$1.expect(tt.bracketR) + base = this$1.finishNode(node, "MemberExpression") + } else if (!noCalls && this$1.eat(tt.parenL)) { + var refDestructuringErrors = new DestructuringErrors, oldYieldPos = this$1.yieldPos, oldAwaitPos = this$1.awaitPos + this$1.yieldPos = 0 + this$1.awaitPos = 0 + var exprList = this$1.parseExprList(tt.parenR, this$1.options.ecmaVersion >= 8, false, refDestructuringErrors) + if (maybeAsyncArrow && !this$1.canInsertSemicolon() && this$1.eat(tt.arrow)) { + this$1.checkPatternErrors(refDestructuringErrors, false) + this$1.checkYieldAwaitInDefaultParams() + this$1.yieldPos = oldYieldPos + this$1.awaitPos = oldAwaitPos + return this$1.parseArrowExpression(this$1.startNodeAt(startPos, startLoc), exprList, true) + } + this$1.checkExpressionErrors(refDestructuringErrors, true) + this$1.yieldPos = oldYieldPos || this$1.yieldPos + this$1.awaitPos = oldAwaitPos || this$1.awaitPos + var node$1 = this$1.startNodeAt(startPos, startLoc) + node$1.callee = base + node$1.arguments = exprList + base = this$1.finishNode(node$1, "CallExpression") + } else if (this$1.type === tt.backQuote) { + var node$2 = this$1.startNodeAt(startPos, startLoc) + node$2.tag = base + node$2.quasi = this$1.parseTemplate() + base = this$1.finishNode(node$2, "TaggedTemplateExpression") + } else { + return base + } + } +} + +// Parse an atomic expression — either a single token that is an +// expression, an expression started by a keyword like `function` or +// `new`, or an expression wrapped in punctuation like `()`, `[]`, +// or `{}`. + +pp$3.parseExprAtom = function(refDestructuringErrors) { + var node, canBeArrow = this.potentialArrowAt == this.start + switch (this.type) { + case tt._super: + if (!this.inFunction) + this.raise(this.start, "'super' outside of function or class") + + case tt._this: + var type = this.type === tt._this ? "ThisExpression" : "Super" + node = this.startNode() + this.next() + return this.finishNode(node, type) + + case tt.name: + var startPos = this.start, startLoc = this.startLoc + var id = this.parseIdent(this.type !== tt.name) + if (this.options.ecmaVersion >= 8 && id.name === "async" && !this.canInsertSemicolon() && this.eat(tt._function)) + return this.parseFunction(this.startNodeAt(startPos, startLoc), false, false, true) + if (canBeArrow && !this.canInsertSemicolon()) { + if (this.eat(tt.arrow)) + return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), [id], false) + if (this.options.ecmaVersion >= 8 && id.name === "async" && this.type === tt.name) { + id = this.parseIdent() + if (this.canInsertSemicolon() || !this.eat(tt.arrow)) + this.unexpected() + return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), [id], true) + } + } + return id + + case tt.regexp: + var value = this.value + node = this.parseLiteral(value.value) + node.regex = {pattern: value.pattern, flags: value.flags} + return node + + case tt.num: case tt.string: + return this.parseLiteral(this.value) + + case tt._null: case tt._true: case tt._false: + node = this.startNode() + node.value = this.type === tt._null ? null : this.type === tt._true + node.raw = this.type.keyword + this.next() + return this.finishNode(node, "Literal") + + case tt.parenL: + var start = this.start, expr = this.parseParenAndDistinguishExpression(canBeArrow) + if (refDestructuringErrors) { + if (refDestructuringErrors.parenthesizedAssign < 0 && !this.isSimpleAssignTarget(expr)) + refDestructuringErrors.parenthesizedAssign = start + if (refDestructuringErrors.parenthesizedBind < 0) + refDestructuringErrors.parenthesizedBind = start + } + return expr + + case tt.bracketL: + node = this.startNode() + this.next() + node.elements = this.parseExprList(tt.bracketR, true, true, refDestructuringErrors) + return this.finishNode(node, "ArrayExpression") + + case tt.braceL: + return this.parseObj(false, refDestructuringErrors) + + case tt._function: + node = this.startNode() + this.next() + return this.parseFunction(node, false) + + case tt._class: + return this.parseClass(this.startNode(), false) + + case tt._new: + return this.parseNew() + + case tt.backQuote: + return this.parseTemplate() + + default: + this.unexpected() + } +} + +pp$3.parseLiteral = function(value) { + var node = this.startNode() + node.value = value + node.raw = this.input.slice(this.start, this.end) + this.next() + return this.finishNode(node, "Literal") +} + +pp$3.parseParenExpression = function() { + this.expect(tt.parenL) + var val = this.parseExpression() + this.expect(tt.parenR) + return val +} + +pp$3.parseParenAndDistinguishExpression = function(canBeArrow) { + var this$1 = this; + + var startPos = this.start, startLoc = this.startLoc, val, allowTrailingComma = this.options.ecmaVersion >= 8 + if (this.options.ecmaVersion >= 6) { + this.next() + + var innerStartPos = this.start, innerStartLoc = this.startLoc + var exprList = [], first = true, lastIsComma = false + var refDestructuringErrors = new DestructuringErrors, oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos, spreadStart, innerParenStart + this.yieldPos = 0 + this.awaitPos = 0 + while (this.type !== tt.parenR) { + first ? first = false : this$1.expect(tt.comma) + if (allowTrailingComma && this$1.afterTrailingComma(tt.parenR, true)) { + lastIsComma = true + break + } else if (this$1.type === tt.ellipsis) { + spreadStart = this$1.start + exprList.push(this$1.parseParenItem(this$1.parseRest())) + if (this$1.type === tt.comma) this$1.raise(this$1.start, "Comma is not permitted after the rest element") + break + } else { + if (this$1.type === tt.parenL && !innerParenStart) { + innerParenStart = this$1.start + } + exprList.push(this$1.parseMaybeAssign(false, refDestructuringErrors, this$1.parseParenItem)) + } + } + var innerEndPos = this.start, innerEndLoc = this.startLoc + this.expect(tt.parenR) + + if (canBeArrow && !this.canInsertSemicolon() && this.eat(tt.arrow)) { + this.checkPatternErrors(refDestructuringErrors, false) + this.checkYieldAwaitInDefaultParams() + if (innerParenStart) this.unexpected(innerParenStart) + this.yieldPos = oldYieldPos + this.awaitPos = oldAwaitPos + return this.parseParenArrowList(startPos, startLoc, exprList) + } + + if (!exprList.length || lastIsComma) this.unexpected(this.lastTokStart) + if (spreadStart) this.unexpected(spreadStart) + this.checkExpressionErrors(refDestructuringErrors, true) + this.yieldPos = oldYieldPos || this.yieldPos + this.awaitPos = oldAwaitPos || this.awaitPos + + if (exprList.length > 1) { + val = this.startNodeAt(innerStartPos, innerStartLoc) + val.expressions = exprList + this.finishNodeAt(val, "SequenceExpression", innerEndPos, innerEndLoc) + } else { + val = exprList[0] + } + } else { + val = this.parseParenExpression() + } + + if (this.options.preserveParens) { + var par = this.startNodeAt(startPos, startLoc) + par.expression = val + return this.finishNode(par, "ParenthesizedExpression") + } else { + return val + } +} + +pp$3.parseParenItem = function(item) { + return item +} + +pp$3.parseParenArrowList = function(startPos, startLoc, exprList) { + return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), exprList) +} + +// New's precedence is slightly tricky. It must allow its argument to +// be a `[]` or dot subscript expression, but not a call — at least, +// not without wrapping it in parentheses. Thus, it uses the noCalls +// argument to parseSubscripts to prevent it from consuming the +// argument list. + +var empty$1 = [] + +pp$3.parseNew = function() { + var node = this.startNode() + var meta = this.parseIdent(true) + if (this.options.ecmaVersion >= 6 && this.eat(tt.dot)) { + node.meta = meta + node.property = this.parseIdent(true) + if (node.property.name !== "target") + this.raiseRecoverable(node.property.start, "The only valid meta property for new is new.target") + if (!this.inFunction) + this.raiseRecoverable(node.start, "new.target can only be used in functions") + return this.finishNode(node, "MetaProperty") + } + var startPos = this.start, startLoc = this.startLoc + node.callee = this.parseSubscripts(this.parseExprAtom(), startPos, startLoc, true) + if (this.eat(tt.parenL)) node.arguments = this.parseExprList(tt.parenR, this.options.ecmaVersion >= 8, false) + else node.arguments = empty$1 + return this.finishNode(node, "NewExpression") +} + +// Parse template expression. + +pp$3.parseTemplateElement = function() { + var elem = this.startNode() + elem.value = { + raw: this.input.slice(this.start, this.end).replace(/\r\n?/g, "\n"), + cooked: this.value + } + this.next() + elem.tail = this.type === tt.backQuote + return this.finishNode(elem, "TemplateElement") +} + +pp$3.parseTemplate = function() { + var this$1 = this; + + var node = this.startNode() + this.next() + node.expressions = [] + var curElt = this.parseTemplateElement() + node.quasis = [curElt] + while (!curElt.tail) { + this$1.expect(tt.dollarBraceL) + node.expressions.push(this$1.parseExpression()) + this$1.expect(tt.braceR) + node.quasis.push(curElt = this$1.parseTemplateElement()) + } + this.next() + return this.finishNode(node, "TemplateLiteral") +} + +// Parse an object literal or binding pattern. + +pp$3.parseObj = function(isPattern, refDestructuringErrors) { + var this$1 = this; + + var node = this.startNode(), first = true, propHash = {} + node.properties = [] + this.next() + while (!this.eat(tt.braceR)) { + if (!first) { + this$1.expect(tt.comma) + if (this$1.afterTrailingComma(tt.braceR)) break + } else first = false + + var prop = this$1.startNode(), isGenerator, isAsync, startPos, startLoc + if (this$1.options.ecmaVersion >= 6) { + prop.method = false + prop.shorthand = false + if (isPattern || refDestructuringErrors) { + startPos = this$1.start + startLoc = this$1.startLoc + } + if (!isPattern) + isGenerator = this$1.eat(tt.star) + } + this$1.parsePropertyName(prop) + if (!isPattern && this$1.options.ecmaVersion >= 8 && !isGenerator && !prop.computed && + prop.key.type === "Identifier" && prop.key.name === "async" && this$1.type !== tt.parenL && + this$1.type !== tt.colon && !this$1.canInsertSemicolon()) { + isAsync = true + this$1.parsePropertyName(prop, refDestructuringErrors) + } else { + isAsync = false + } + this$1.parsePropertyValue(prop, isPattern, isGenerator, isAsync, startPos, startLoc, refDestructuringErrors) + this$1.checkPropClash(prop, propHash) + node.properties.push(this$1.finishNode(prop, "Property")) + } + return this.finishNode(node, isPattern ? "ObjectPattern" : "ObjectExpression") +} + +pp$3.parsePropertyValue = function(prop, isPattern, isGenerator, isAsync, startPos, startLoc, refDestructuringErrors) { + if ((isGenerator || isAsync) && this.type === tt.colon) + this.unexpected() + + if (this.eat(tt.colon)) { + prop.value = isPattern ? this.parseMaybeDefault(this.start, this.startLoc) : this.parseMaybeAssign(false, refDestructuringErrors) + prop.kind = "init" + } else if (this.options.ecmaVersion >= 6 && this.type === tt.parenL) { + if (isPattern) this.unexpected() + prop.kind = "init" + prop.method = true + prop.value = this.parseMethod(isGenerator, isAsync) + } else if (this.options.ecmaVersion >= 5 && !prop.computed && prop.key.type === "Identifier" && + (prop.key.name === "get" || prop.key.name === "set") && + (this.type != tt.comma && this.type != tt.braceR)) { + if (isGenerator || isAsync || isPattern) this.unexpected() + prop.kind = prop.key.name + this.parsePropertyName(prop) + prop.value = this.parseMethod(false) + var paramCount = prop.kind === "get" ? 0 : 1 + if (prop.value.params.length !== paramCount) { + var start = prop.value.start + if (prop.kind === "get") + this.raiseRecoverable(start, "getter should have no params") + else + this.raiseRecoverable(start, "setter should have exactly one param") + } else { + if (prop.kind === "set" && prop.value.params[0].type === "RestElement") + this.raiseRecoverable(prop.value.params[0].start, "Setter cannot use rest params") + } + } else if (this.options.ecmaVersion >= 6 && !prop.computed && prop.key.type === "Identifier") { + if (this.keywords.test(prop.key.name) || + (this.strict ? this.reservedWordsStrict : this.reservedWords).test(prop.key.name) || + (this.inGenerator && prop.key.name == "yield") || + (this.inAsync && prop.key.name == "await")) + this.raiseRecoverable(prop.key.start, "'" + prop.key.name + "' can not be used as shorthand property") + prop.kind = "init" + if (isPattern) { + prop.value = this.parseMaybeDefault(startPos, startLoc, prop.key) + } else if (this.type === tt.eq && refDestructuringErrors) { + if (refDestructuringErrors.shorthandAssign < 0) + refDestructuringErrors.shorthandAssign = this.start + prop.value = this.parseMaybeDefault(startPos, startLoc, prop.key) + } else { + prop.value = prop.key + } + prop.shorthand = true + } else this.unexpected() +} + +pp$3.parsePropertyName = function(prop) { + if (this.options.ecmaVersion >= 6) { + if (this.eat(tt.bracketL)) { + prop.computed = true + prop.key = this.parseMaybeAssign() + this.expect(tt.bracketR) + return prop.key + } else { + prop.computed = false + } + } + return prop.key = this.type === tt.num || this.type === tt.string ? this.parseExprAtom() : this.parseIdent(true) +} + +// Initialize empty function node. + +pp$3.initFunction = function(node) { + node.id = null + if (this.options.ecmaVersion >= 6) { + node.generator = false + node.expression = false + } + if (this.options.ecmaVersion >= 8) + node.async = false +} + +// Parse object or class method. + +pp$3.parseMethod = function(isGenerator, isAsync) { + var node = this.startNode(), oldInGen = this.inGenerator, oldInAsync = this.inAsync, + oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos, oldInFunc = this.inFunction + + this.initFunction(node) + if (this.options.ecmaVersion >= 6) + node.generator = isGenerator + if (this.options.ecmaVersion >= 8) + node.async = !!isAsync + + this.inGenerator = node.generator + this.inAsync = node.async + this.yieldPos = 0 + this.awaitPos = 0 + this.inFunction = true + this.enterFunctionScope() + + this.expect(tt.parenL) + node.params = this.parseBindingList(tt.parenR, false, this.options.ecmaVersion >= 8) + this.checkYieldAwaitInDefaultParams() + this.parseFunctionBody(node, false) + + this.inGenerator = oldInGen + this.inAsync = oldInAsync + this.yieldPos = oldYieldPos + this.awaitPos = oldAwaitPos + this.inFunction = oldInFunc + return this.finishNode(node, "FunctionExpression") +} + +// Parse arrow function expression with given parameters. + +pp$3.parseArrowExpression = function(node, params, isAsync) { + var oldInGen = this.inGenerator, oldInAsync = this.inAsync, + oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos, oldInFunc = this.inFunction + + this.enterFunctionScope() + this.initFunction(node) + if (this.options.ecmaVersion >= 8) + node.async = !!isAsync + + this.inGenerator = false + this.inAsync = node.async + this.yieldPos = 0 + this.awaitPos = 0 + this.inFunction = true + + node.params = this.toAssignableList(params, true) + this.parseFunctionBody(node, true) + + this.inGenerator = oldInGen + this.inAsync = oldInAsync + this.yieldPos = oldYieldPos + this.awaitPos = oldAwaitPos + this.inFunction = oldInFunc + return this.finishNode(node, "ArrowFunctionExpression") +} + +// Parse function body and check parameters. + +pp$3.parseFunctionBody = function(node, isArrowFunction) { + var isExpression = isArrowFunction && this.type !== tt.braceL + var oldStrict = this.strict, useStrict = false + + if (isExpression) { + node.body = this.parseMaybeAssign() + node.expression = true + this.checkParams(node, false) + } else { + var nonSimple = this.options.ecmaVersion >= 7 && !this.isSimpleParamList(node.params) + if (!oldStrict || nonSimple) { + useStrict = this.strictDirective(this.end) + // If this is a strict mode function, verify that argument names + // are not repeated, and it does not try to bind the words `eval` + // or `arguments`. + if (useStrict && nonSimple) + this.raiseRecoverable(node.start, "Illegal 'use strict' directive in function with non-simple parameter list") + } + // Start a new scope with regard to labels and the `inFunction` + // flag (restore them to their old value afterwards). + var oldLabels = this.labels + this.labels = [] + if (useStrict) this.strict = true + + // Add the params to varDeclaredNames to ensure that an error is thrown + // if a let/const declaration in the function clashes with one of the params. + this.checkParams(node, !oldStrict && !useStrict && !isArrowFunction && this.isSimpleParamList(node.params)) + node.body = this.parseBlock(false) + node.expression = false + this.labels = oldLabels + } + this.exitFunctionScope() + + if (this.strict && node.id) { + // Ensure the function name isn't a forbidden identifier in strict mode, e.g. 'eval' + this.checkLVal(node.id, "none") + } + this.strict = oldStrict +} + +pp$3.isSimpleParamList = function(params) { + for (var i = 0; i < params.length; i++) + if (params[i].type !== "Identifier") return false + return true +} + +// Checks function params for various disallowed patterns such as using "eval" +// or "arguments" and duplicate parameters. + +pp$3.checkParams = function(node, allowDuplicates) { + var this$1 = this; + + var nameHash = {} + for (var i = 0; i < node.params.length; i++) this$1.checkLVal(node.params[i], "var", allowDuplicates ? null : nameHash) +} + +// Parses a comma-separated list of expressions, and returns them as +// an array. `close` is the token type that ends the list, and +// `allowEmpty` can be turned on to allow subsequent commas with +// nothing in between them to be parsed as `null` (which is needed +// for array literals). + +pp$3.parseExprList = function(close, allowTrailingComma, allowEmpty, refDestructuringErrors) { + var this$1 = this; + + var elts = [], first = true + while (!this.eat(close)) { + if (!first) { + this$1.expect(tt.comma) + if (allowTrailingComma && this$1.afterTrailingComma(close)) break + } else first = false + + var elt + if (allowEmpty && this$1.type === tt.comma) + elt = null + else if (this$1.type === tt.ellipsis) { + elt = this$1.parseSpread(refDestructuringErrors) + if (refDestructuringErrors && this$1.type === tt.comma && refDestructuringErrors.trailingComma < 0) + refDestructuringErrors.trailingComma = this$1.start + } else { + elt = this$1.parseMaybeAssign(false, refDestructuringErrors) + } + elts.push(elt) + } + return elts +} + +// Parse the next token as an identifier. If `liberal` is true (used +// when parsing properties), it will also convert keywords into +// identifiers. + +pp$3.parseIdent = function(liberal) { + var node = this.startNode() + if (liberal && this.options.allowReserved == "never") liberal = false + if (this.type === tt.name) { + if (!liberal && (this.strict ? this.reservedWordsStrict : this.reservedWords).test(this.value) && + (this.options.ecmaVersion >= 6 || + this.input.slice(this.start, this.end).indexOf("\\") == -1)) + this.raiseRecoverable(this.start, "The keyword '" + this.value + "' is reserved") + if (this.inGenerator && this.value === "yield") + this.raiseRecoverable(this.start, "Can not use 'yield' as identifier inside a generator") + if (this.inAsync && this.value === "await") + this.raiseRecoverable(this.start, "Can not use 'await' as identifier inside an async function") + node.name = this.value + } else if (liberal && this.type.keyword) { + node.name = this.type.keyword + } else { + this.unexpected() + } + this.next() + return this.finishNode(node, "Identifier") +} + +// Parses yield expression inside generator. + +pp$3.parseYield = function() { + if (!this.yieldPos) this.yieldPos = this.start + + var node = this.startNode() + this.next() + if (this.type == tt.semi || this.canInsertSemicolon() || (this.type != tt.star && !this.type.startsExpr)) { + node.delegate = false + node.argument = null + } else { + node.delegate = this.eat(tt.star) + node.argument = this.parseMaybeAssign() + } + return this.finishNode(node, "YieldExpression") +} + +pp$3.parseAwait = function() { + if (!this.awaitPos) this.awaitPos = this.start + + var node = this.startNode() + this.next() + node.argument = this.parseMaybeUnary(null, true) + return this.finishNode(node, "AwaitExpression") +} + +var pp$4 = Parser.prototype + +// This function is used to raise exceptions on parse errors. It +// takes an offset integer (into the current `input`) to indicate +// the location of the error, attaches the position to the end +// of the error message, and then raises a `SyntaxError` with that +// message. + +pp$4.raise = function(pos, message) { + var loc = getLineInfo(this.input, pos) + message += " (" + loc.line + ":" + loc.column + ")" + var err = new SyntaxError(message) + err.pos = pos; err.loc = loc; err.raisedAt = this.pos + throw err +} + +pp$4.raiseRecoverable = pp$4.raise + +pp$4.curPosition = function() { + if (this.options.locations) { + return new Position(this.curLine, this.pos - this.lineStart) + } +} + +var pp$5 = Parser.prototype + +// Object.assign polyfill +var assign = Object.assign || function(target) { + var sources = [], len = arguments.length - 1; + while ( len-- > 0 ) sources[ len ] = arguments[ len + 1 ]; + + for (var i = 0; i < sources.length; i++) { + var source = sources[i] + for (var key in source) { + if (has(source, key)) { + target[key] = source[key] + } + } + } + return target +} + +// The functions in this module keep track of declared variables in the current scope in order to detect duplicate variable names. + +pp$5.enterFunctionScope = function() { + // var: a hash of var-declared names in the current lexical scope + // lexical: a hash of lexically-declared names in the current lexical scope + // childVar: a hash of var-declared names in all child lexical scopes of the current lexical scope (within the current function scope) + // parentLexical: a hash of lexically-declared names in all parent lexical scopes of the current lexical scope (within the current function scope) + this.scopeStack.push({var: {}, lexical: {}, childVar: {}, parentLexical: {}}) +} + +pp$5.exitFunctionScope = function() { + this.scopeStack.pop() +} + +pp$5.enterLexicalScope = function() { + var parentScope = this.scopeStack[this.scopeStack.length - 1] + var childScope = {var: {}, lexical: {}, childVar: {}, parentLexical: {}} + + this.scopeStack.push(childScope) + assign(childScope.parentLexical, parentScope.lexical, parentScope.parentLexical) +} + +pp$5.exitLexicalScope = function() { + var childScope = this.scopeStack.pop() + var parentScope = this.scopeStack[this.scopeStack.length - 1] + + assign(parentScope.childVar, childScope.var, childScope.childVar) +} + +/** + * A name can be declared with `var` if there are no variables with the same name declared with `let`/`const` + * in the current lexical scope or any of the parent lexical scopes in this function. + */ +pp$5.canDeclareVarName = function(name) { + var currentScope = this.scopeStack[this.scopeStack.length - 1] + + return !has(currentScope.lexical, name) && !has(currentScope.parentLexical, name) +} + +/** + * A name can be declared with `let`/`const` if there are no variables with the same name declared with `let`/`const` + * in the current scope, and there are no variables with the same name declared with `var` in the current scope or in + * any child lexical scopes in this function. + */ +pp$5.canDeclareLexicalName = function(name) { + var currentScope = this.scopeStack[this.scopeStack.length - 1] + + return !has(currentScope.lexical, name) && !has(currentScope.var, name) && !has(currentScope.childVar, name) +} + +pp$5.declareVarName = function(name) { + this.scopeStack[this.scopeStack.length - 1].var[name] = true +} + +pp$5.declareLexicalName = function(name) { + this.scopeStack[this.scopeStack.length - 1].lexical[name] = true +} + +var Node = function Node(parser, pos, loc) { + this.type = "" + this.start = pos + this.end = 0 + if (parser.options.locations) + this.loc = new SourceLocation(parser, loc) + if (parser.options.directSourceFile) + this.sourceFile = parser.options.directSourceFile + if (parser.options.ranges) + this.range = [pos, 0] +}; + +// Start an AST node, attaching a start offset. + +var pp$6 = Parser.prototype + +pp$6.startNode = function() { + return new Node(this, this.start, this.startLoc) +} + +pp$6.startNodeAt = function(pos, loc) { + return new Node(this, pos, loc) +} + +// Finish an AST node, adding `type` and `end` properties. + +function finishNodeAt(node, type, pos, loc) { + node.type = type + node.end = pos + if (this.options.locations) + node.loc.end = loc + if (this.options.ranges) + node.range[1] = pos + return node +} + +pp$6.finishNode = function(node, type) { + return finishNodeAt.call(this, node, type, this.lastTokEnd, this.lastTokEndLoc) +} + +// Finish node at given position + +pp$6.finishNodeAt = function(node, type, pos, loc) { + return finishNodeAt.call(this, node, type, pos, loc) +} + +// The algorithm used to determine whether a regexp can appear at a +// given point in the program is loosely based on sweet.js' approach. +// See https://github.com/mozilla/sweet.js/wiki/design + +var TokContext = function TokContext(token, isExpr, preserveSpace, override, generator) { + this.token = token + this.isExpr = !!isExpr + this.preserveSpace = !!preserveSpace + this.override = override + this.generator = !!generator +}; + +var types = { + b_stat: new TokContext("{", false), + b_expr: new TokContext("{", true), + b_tmpl: new TokContext("${", true), + p_stat: new TokContext("(", false), + p_expr: new TokContext("(", true), + q_tmpl: new TokContext("`", true, true, function (p) { return p.readTmplToken(); }), + f_expr: new TokContext("function", true), + f_expr_gen: new TokContext("function", true, false, null, true), + f_gen: new TokContext("function", false, false, null, true) +} + +var pp$7 = Parser.prototype + +pp$7.initialContext = function() { + return [types.b_stat] +} + +pp$7.braceIsBlock = function(prevType) { + if (prevType === tt.colon) { + var parent = this.curContext() + if (parent === types.b_stat || parent === types.b_expr) + return !parent.isExpr + } + if (prevType === tt._return) + return lineBreak.test(this.input.slice(this.lastTokEnd, this.start)) + if (prevType === tt._else || prevType === tt.semi || prevType === tt.eof || prevType === tt.parenR || prevType == tt.arrow) + return true + if (prevType == tt.braceL) + return this.curContext() === types.b_stat + return !this.exprAllowed +} + +pp$7.inGeneratorContext = function() { + var this$1 = this; + + for (var i = this.context.length - 1; i >= 0; i--) + if (this$1.context[i].generator) return true + return false +} + +pp$7.updateContext = function(prevType) { + var update, type = this.type + if (type.keyword && prevType == tt.dot) + this.exprAllowed = false + else if (update = type.updateContext) + update.call(this, prevType) + else + this.exprAllowed = type.beforeExpr +} + +// Token-specific context update code + +tt.parenR.updateContext = tt.braceR.updateContext = function() { + if (this.context.length == 1) { + this.exprAllowed = true + return + } + var out = this.context.pop(), cur + if (out === types.b_stat && (cur = this.curContext()) && cur.token === "function") { + this.context.pop() + this.exprAllowed = false + } else if (out === types.b_tmpl) { + this.exprAllowed = true + } else { + this.exprAllowed = !out.isExpr + } +} + +tt.braceL.updateContext = function(prevType) { + this.context.push(this.braceIsBlock(prevType) ? types.b_stat : types.b_expr) + this.exprAllowed = true +} + +tt.dollarBraceL.updateContext = function() { + this.context.push(types.b_tmpl) + this.exprAllowed = true +} + +tt.parenL.updateContext = function(prevType) { + var statementParens = prevType === tt._if || prevType === tt._for || prevType === tt._with || prevType === tt._while + this.context.push(statementParens ? types.p_stat : types.p_expr) + this.exprAllowed = true +} + +tt.incDec.updateContext = function() { + // tokExprAllowed stays unchanged +} + +tt._function.updateContext = function(prevType) { + if (prevType.beforeExpr && prevType !== tt.semi && prevType !== tt._else && + !((prevType === tt.colon || prevType === tt.braceL) && this.curContext() === types.b_stat)) + this.context.push(types.f_expr) + this.exprAllowed = false +} + +tt.backQuote.updateContext = function() { + if (this.curContext() === types.q_tmpl) + this.context.pop() + else + this.context.push(types.q_tmpl) + this.exprAllowed = false +} + +tt.star.updateContext = function(prevType) { + if (prevType == tt._function) { + if (this.curContext() === types.f_expr) + this.context[this.context.length - 1] = types.f_expr_gen + else + this.context.push(types.f_gen) + } + this.exprAllowed = true +} + +tt.name.updateContext = function(prevType) { + var allowed = false + if (this.options.ecmaVersion >= 6) { + if (this.value == "of" && !this.exprAllowed || + this.value == "yield" && this.inGeneratorContext()) + allowed = true + } + this.exprAllowed = allowed +} + +// Object type used to represent tokens. Note that normally, tokens +// simply exist as properties on the parser object. This is only +// used for the onToken callback and the external tokenizer. + +var Token = function Token(p) { + this.type = p.type + this.value = p.value + this.start = p.start + this.end = p.end + if (p.options.locations) + this.loc = new SourceLocation(p, p.startLoc, p.endLoc) + if (p.options.ranges) + this.range = [p.start, p.end] +}; + +// ## Tokenizer + +var pp$8 = Parser.prototype + +// Are we running under Rhino? +var isRhino = typeof Packages == "object" && Object.prototype.toString.call(Packages) == "[object JavaPackage]" + +// Move to the next token + +pp$8.next = function() { + if (this.options.onToken) + this.options.onToken(new Token(this)) + + this.lastTokEnd = this.end + this.lastTokStart = this.start + this.lastTokEndLoc = this.endLoc + this.lastTokStartLoc = this.startLoc + this.nextToken() +} + +pp$8.getToken = function() { + this.next() + return new Token(this) +} + +// If we're in an ES6 environment, make parsers iterable +if (typeof Symbol !== "undefined") + pp$8[Symbol.iterator] = function() { + var this$1 = this; + + return { + next: function () { + var token = this$1.getToken() + return { + done: token.type === tt.eof, + value: token + } + } + } + } + +// Toggle strict mode. Re-reads the next number or string to please +// pedantic tests (`"use strict"; 010;` should fail). + +pp$8.curContext = function() { + return this.context[this.context.length - 1] +} + +// Read a single token, updating the parser object's token-related +// properties. + +pp$8.nextToken = function() { + var curContext = this.curContext() + if (!curContext || !curContext.preserveSpace) this.skipSpace() + + this.start = this.pos + if (this.options.locations) this.startLoc = this.curPosition() + if (this.pos >= this.input.length) return this.finishToken(tt.eof) + + if (curContext.override) return curContext.override(this) + else this.readToken(this.fullCharCodeAtPos()) +} + +pp$8.readToken = function(code) { + // Identifier or keyword. '\uXXXX' sequences are allowed in + // identifiers, so '\' also dispatches to that. + if (isIdentifierStart(code, this.options.ecmaVersion >= 6) || code === 92 /* '\' */) + return this.readWord() + + return this.getTokenFromCode(code) +} + +pp$8.fullCharCodeAtPos = function() { + var code = this.input.charCodeAt(this.pos) + if (code <= 0xd7ff || code >= 0xe000) return code + var next = this.input.charCodeAt(this.pos + 1) + return (code << 10) + next - 0x35fdc00 +} + +pp$8.skipBlockComment = function() { + var this$1 = this; + + var startLoc = this.options.onComment && this.curPosition() + var start = this.pos, end = this.input.indexOf("*/", this.pos += 2) + if (end === -1) this.raise(this.pos - 2, "Unterminated comment") + this.pos = end + 2 + if (this.options.locations) { + lineBreakG.lastIndex = start + var match + while ((match = lineBreakG.exec(this.input)) && match.index < this.pos) { + ++this$1.curLine + this$1.lineStart = match.index + match[0].length + } + } + if (this.options.onComment) + this.options.onComment(true, this.input.slice(start + 2, end), start, this.pos, + startLoc, this.curPosition()) +} + +pp$8.skipLineComment = function(startSkip) { + var this$1 = this; + + var start = this.pos + var startLoc = this.options.onComment && this.curPosition() + var ch = this.input.charCodeAt(this.pos += startSkip) + while (this.pos < this.input.length && ch !== 10 && ch !== 13 && ch !== 8232 && ch !== 8233) { + ++this$1.pos + ch = this$1.input.charCodeAt(this$1.pos) + } + if (this.options.onComment) + this.options.onComment(false, this.input.slice(start + startSkip, this.pos), start, this.pos, + startLoc, this.curPosition()) +} + +// Called at the start of the parse and after every token. Skips +// whitespace and comments, and. + +pp$8.skipSpace = function() { + var this$1 = this; + + loop: while (this.pos < this.input.length) { + var ch = this$1.input.charCodeAt(this$1.pos) + switch (ch) { + case 32: case 160: // ' ' + ++this$1.pos + break + case 13: + if (this$1.input.charCodeAt(this$1.pos + 1) === 10) { + ++this$1.pos + } + case 10: case 8232: case 8233: + ++this$1.pos + if (this$1.options.locations) { + ++this$1.curLine + this$1.lineStart = this$1.pos + } + break + case 47: // '/' + switch (this$1.input.charCodeAt(this$1.pos + 1)) { + case 42: // '*' + this$1.skipBlockComment() + break + case 47: + this$1.skipLineComment(2) + break + default: + break loop + } + break + default: + if (ch > 8 && ch < 14 || ch >= 5760 && nonASCIIwhitespace.test(String.fromCharCode(ch))) { + ++this$1.pos + } else { + break loop + } + } + } +} + +// Called at the end of every token. Sets `end`, `val`, and +// maintains `context` and `exprAllowed`, and skips the space after +// the token, so that the next one's `start` will point at the +// right position. + +pp$8.finishToken = function(type, val) { + this.end = this.pos + if (this.options.locations) this.endLoc = this.curPosition() + var prevType = this.type + this.type = type + this.value = val + + this.updateContext(prevType) +} + +// ### Token reading + +// This is the function that is called to fetch the next token. It +// is somewhat obscure, because it works in character codes rather +// than characters, and because operator parsing has been inlined +// into it. +// +// All in the name of speed. +// +pp$8.readToken_dot = function() { + var next = this.input.charCodeAt(this.pos + 1) + if (next >= 48 && next <= 57) return this.readNumber(true) + var next2 = this.input.charCodeAt(this.pos + 2) + if (this.options.ecmaVersion >= 6 && next === 46 && next2 === 46) { // 46 = dot '.' + this.pos += 3 + return this.finishToken(tt.ellipsis) + } else { + ++this.pos + return this.finishToken(tt.dot) + } +} + +pp$8.readToken_slash = function() { // '/' + var next = this.input.charCodeAt(this.pos + 1) + if (this.exprAllowed) { ++this.pos; return this.readRegexp() } + if (next === 61) return this.finishOp(tt.assign, 2) + return this.finishOp(tt.slash, 1) +} + +pp$8.readToken_mult_modulo_exp = function(code) { // '%*' + var next = this.input.charCodeAt(this.pos + 1) + var size = 1 + var tokentype = code === 42 ? tt.star : tt.modulo + + // exponentiation operator ** and **= + if (this.options.ecmaVersion >= 7 && next === 42) { + ++size + tokentype = tt.starstar + next = this.input.charCodeAt(this.pos + 2) + } + + if (next === 61) return this.finishOp(tt.assign, size + 1) + return this.finishOp(tokentype, size) +} + +pp$8.readToken_pipe_amp = function(code) { // '|&' + var next = this.input.charCodeAt(this.pos + 1) + if (next === code) return this.finishOp(code === 124 ? tt.logicalOR : tt.logicalAND, 2) + if (next === 61) return this.finishOp(tt.assign, 2) + return this.finishOp(code === 124 ? tt.bitwiseOR : tt.bitwiseAND, 1) +} + +pp$8.readToken_caret = function() { // '^' + var next = this.input.charCodeAt(this.pos + 1) + if (next === 61) return this.finishOp(tt.assign, 2) + return this.finishOp(tt.bitwiseXOR, 1) +} + +pp$8.readToken_plus_min = function(code) { // '+-' + var next = this.input.charCodeAt(this.pos + 1) + if (next === code) { + if (next == 45 && this.input.charCodeAt(this.pos + 2) == 62 && + lineBreak.test(this.input.slice(this.lastTokEnd, this.pos))) { + // A `-->` line comment + this.skipLineComment(3) + this.skipSpace() + return this.nextToken() + } + return this.finishOp(tt.incDec, 2) + } + if (next === 61) return this.finishOp(tt.assign, 2) + return this.finishOp(tt.plusMin, 1) +} + +pp$8.readToken_lt_gt = function(code) { // '<>' + var next = this.input.charCodeAt(this.pos + 1) + var size = 1 + if (next === code) { + size = code === 62 && this.input.charCodeAt(this.pos + 2) === 62 ? 3 : 2 + if (this.input.charCodeAt(this.pos + size) === 61) return this.finishOp(tt.assign, size + 1) + return this.finishOp(tt.bitShift, size) + } + if (next == 33 && code == 60 && this.input.charCodeAt(this.pos + 2) == 45 && + this.input.charCodeAt(this.pos + 3) == 45) { + if (this.inModule) this.unexpected() + // ` - - - @@ -151,6 +148,7 @@
Save & Close (Ctrl + b) +

Netscript Documentation
@@ -747,7 +745,7 @@ you 'reset' by installing Augmentations.

- Buy Trade Information eXchange (TEX) API Access - COMING SOON + Buy Trade Information eXchange (TIX) API Access - COMING SOON

diff --git a/src/Augmentations.js b/src/Augmentations.js index bbb5c4bf4..f443087f1 100644 --- a/src/Augmentations.js +++ b/src/Augmentations.js @@ -162,7 +162,7 @@ initAugmentations = function() { //Combat stat augmentations var HemoRecirculator = new Augmentation(AugmentationNames.HemoRecirculator); HemoRecirculator.setInfo("A heart implant that greatly increases the body's ability to effectively use and pump " + - "blood.

This augmentation increases all of the player's combat stats by 10%.") + "blood.

This augmentation increases all of the player's combat stats by 8%.") HemoRecirculator.setRequirements(4000, 9000000); HemoRecirculator.addToFactions(["Tetrads", "The Dark Army", "The Syndicate"]); if (augmentationExists(AugmentationNames.HemoRecirculator)) { @@ -175,7 +175,7 @@ initAugmentations = function() { Targeting1.setInfo("This cranial implant is embedded within the player's inner ear structure and optic nerves. It regulates and enhances the user's " + "balance and hand-eye coordination. It is also capable of augmenting reality by projecting digital information " + "directly onto the retina. These enhancements allow the player to better lock-on and keep track of enemies.

" + - "This augmentation increases the player's dexterity by 15%."); + "This augmentation increases the player's dexterity by 10%."); Targeting1.addToFactions(["Slum Snakes", "The Dark Army", "The Syndicate", "Sector-12", "Volhaven", "Ishima", "OmniTek Incorporated", "KuaiGong International", "Blade Industries"]); if (augmentationExists(AugmentationNames.Targeting1)) { @@ -187,7 +187,7 @@ initAugmentations = function() { Targeting2.setRequirements(3500, 8500000); Targeting2.setInfo("This is an upgrade of the Augmented Targeting I cranial implant, which is capable of augmenting reality " + "and enhances the user's balance and hand-eye coordination.

This upgrade increases the player's dexterity " + - "by an additional 25%."); + "by an additional 20%."); Targeting2.addToFactions(["The Dark Army", "The Syndicate", "Sector-12", "Volhaven", "Ishima", "OmniTek Incorporated", "KuaiGong International", "Blade Industries"]); if (augmentationExists(AugmentationNames.Targeting2)) { @@ -199,7 +199,7 @@ initAugmentations = function() { Targeting3.setRequirements(11000, 23000000); Targeting3.setInfo("This is an upgrade of the Augmented Targeting II cranial implant, which is capable of augmenting reality " + "and enhances the user's balance and hand-eye coordination.

This upgrade increases the player's dexterity " + - "by an additional 40%."); + "by an additional 30%."); Targeting3.addToFactions(["The Dark Army", "The Syndicate", "OmniTek Incorporated", "KuaiGong International", "Blade Industries", "The Covenant"]); if (augmentationExists(AugmentationNames.Targeting3)) { @@ -233,7 +233,7 @@ initAugmentations = function() { AddToAugmentations(SynfibrilMuscle) var CombatRib1 = new Augmentation(AugmentationNames.CombatRib1); - CombatRib1.setRequirements(2500, 4500000); + CombatRib1.setRequirements(3000, 4750000); CombatRib1.setInfo("The human body's ribs are replaced with artificial ribs that automatically and continuously release cognitive " + "and performance-enhancing drugs into the bloodstream, improving the user's abilities in combat.

" + "This augmentation increases the player's strength and defense by 10%."); @@ -245,7 +245,7 @@ initAugmentations = function() { AddToAugmentations(CombatRib1); var CombatRib2 = new Augmentation(AugmentationNames.CombatRib2); - CombatRib2.setRequirements(7000, 12000000); + CombatRib2.setRequirements(7500, 13000000); CombatRib2.setInfo("This is an upgrade to the Combat Rib I augmentation, and is capable of releasing even more potent combat-enhancing " + "drugs into the bloodstream.

This upgrade increases the player's strength and defense by an additional 15%.") CombatRib2.addToFactions(["The Dark Army", "The Syndicate", "Sector-12", "Volhaven", "Ishima", @@ -256,7 +256,7 @@ initAugmentations = function() { AddToAugmentations(CombatRib2); var CombatRib3 = new Augmentation(AugmentationNames.CombatRib3); - CombatRib3.setRequirements(12000, 22000000); + CombatRib3.setRequirements(14000, 24000000); CombatRib3.setInfo("This is an upgrade to the Combat Rib II augmentation, and is capable of releasing even more potent combat-enhancing " + "drugs into the bloodstream

. This upgrade increases the player's strength and defense by an additional 20%."); CombatRib3.addToFactions(["The Dark Army", "The Syndicate", "OmniTek Incorporated", @@ -267,7 +267,7 @@ initAugmentations = function() { AddToAugmentations(CombatRib3); var NanofiberWeave = new Augmentation(AugmentationNames.NanofiberWeave); - NanofiberWeave.setRequirements(14000, 20000000); + NanofiberWeave.setRequirements(15000, 25000000); NanofiberWeave.setInfo("Synthetic nanofibers are woven into the skin's extracellular matrix using electrospinning. " + "This improves the skin's ability to regenerate itself and protect the body from external stresses and forces.

" + "This augmentation increases the player's strength and defense by 25%."); @@ -309,7 +309,7 @@ initAugmentations = function() { GrapheneBoneLacings.setRequirements(450000, 850000000); GrapheneBoneLacings.setInfo("A graphene-based material is grafted and fused into the user's bones, significantly increasing " + "their density and tensile strength.

" + - "This augmentation increases the player's strength and defense by 75%."); + "This augmentation increases the player's strength and defense by 70%."); GrapheneBoneLacings.addToFactions(["Fulcrum Secret Technologies", "The Covenant"]); if (augmentationExists(AugmentationNames.GrapheneBoneLacings)) { delete Augmentations[AugmentationNames.GrapheneBoneLacings]; @@ -322,7 +322,7 @@ initAugmentations = function() { "Not only is the Bionic Spine physically stronger than a human spine, but it is also capable of digitally " + "stimulating and regulating the neural signals that are sent and received by the spinal cord. This results in " + "greatly improved senses and reaction speeds.

" + - "This augmentation increases all of the player's combat stats by 18%."); + "This augmentation increases all of the player's combat stats by 16%."); BionicSpine.addToFactions(["Speakers for the Dead", "The Syndicate", "KuaiGong International", "OmniTek Incorporated", "Blade Industries"]); if (augmentationExists(AugmentationNames.BionicSpine)) { @@ -334,7 +334,7 @@ initAugmentations = function() { GrapheneBionicSpine.setRequirements(650000, 1200000000); GrapheneBionicSpine.setInfo("An upgrade to the Bionic Spine augmentation. It fuses the implant with an advanced graphene " + "material to make it much stronger and lighter.

" + - "This augmentation increases all of the player's combat stats by 65%."); + "This augmentation increases all of the player's combat stats by 60%."); GrapheneBionicSpine.addToFactions(["Fulcrum Secret Technologies", "ECorp"]); if (augmentationExists(AugmentationNames.GrapheneBionicSpine)) { delete Augmentations[AugmentationNames.GrapheneBionicSpine]; @@ -390,7 +390,7 @@ initAugmentations = function() { AddToAugmentations(TITN41Injection); var EnhancedSocialInteractionImplant = new Augmentation(AugmentationNames.EnhancedSocialInteractionImplant); - EnhancedSocialInteractionImplant.setRequirements(150000, 250000000); + EnhancedSocialInteractionImplant.setRequirements(150000, 275000000); EnhancedSocialInteractionImplant.setInfo("A cranial implant that greatly assists in the user's ability to analyze social situations " + "and interactions. The system uses a wide variety of factors such as facial expression, body " + "language, and the voice's tone/inflection to determine the best course of action during social" + @@ -751,7 +751,7 @@ initAugmentations = function() { FocusWire.setInfo("A cranial implant that stops procrastination by blocking specific neural pathways " + "in the brain.

" + "This augmentation:
" + - "Increases all experience gains by 10%
" + + "Increases all experience gains by 5%
" + "Increases the amount of money the player gains from working by 20%
" + "Increases the amount of reputation the player gains when working for a company by 10%"); FocusWire.addToFactions(["Bachman & Associates", "Clarke Incorporated", "Four Sigma", "KuaiGong International"]); @@ -775,7 +775,7 @@ initAugmentations = function() { AddToAugmentations(PCDNI); var PCDNIOptimizer = new Augmentation(AugmentationNames.PCDNIOptimizer); - PCDNIOptimizer.setRequirements(200000, 875000000); + PCDNIOptimizer.setRequirements(200000, 900000000); PCDNIOptimizer.setInfo("This is a submodule upgrade to the PC Direct-Neural Interface augmentation. It " + "improves the performance of the interface and gives the user more control options " + "to the connected computer.

" + @@ -789,7 +789,7 @@ initAugmentations = function() { AddToAugmentations(PCDNIOptimizer); var PCDNINeuralNetwork = new Augmentation(AugmentationNames.PCDNINeuralNetwork); - PCDNINeuralNetwork.setRequirements(600000, 1300000000); + PCDNINeuralNetwork.setRequirements(600000, 1500000000); PCDNINeuralNetwork.setInfo("This is an additional installation that upgrades the functionality of the " + "PC Direct-Neural Interface augmentation. When connected to a computer, " + "The NeuroNet Injector upgrade allows the user to use his/her own brain's " + @@ -922,7 +922,7 @@ initAugmentations = function() { AddToAugmentations(Neurotrainer1); var Neurotrainer2 = new Augmentation(AugmentationNames.Neurotrainer2); - Neurotrainer2.setRequirements(4000, 8500000); + Neurotrainer2.setRequirements(4000, 9000000); Neurotrainer2.setInfo("A decentralized cranial implant that improves the brain's ability to learn. This " + "is a more powerful version of the Neurotrainer I augmentation, but it does not " + "require Neurotrainer I to be installed as a prerequisite.

" + @@ -934,7 +934,7 @@ initAugmentations = function() { AddToAugmentations(Neurotrainer2); var Neurotrainer3 = new Augmentation(AugmentationNames.Neurotrainer3); - Neurotrainer3.setRequirements(10000, 25000000); + Neurotrainer3.setRequirements(10000, 26000000); Neurotrainer3.setInfo("A decentralized cranial implant that improves the brain's ability to learn. This " + "is a more powerful version of the Neurotrainer I and Neurotrainer II augmentation, " + "but it does not require either of them to be installed as a prerequisite.

" + @@ -983,7 +983,7 @@ initAugmentations = function() { "Increases the player's agility by 10%
" + "Increases the player's defense by 10%
" + "Increases the amount of money the player gains from crimes by 25%"); - LuminCloaking2.setRequirements(2000, 5000000); + LuminCloaking2.setRequirements(2000, 6000000); LuminCloaking2.addToFactions(["Slum Snakes", "Tetrads"]); if (augmentationExists(AugmentationNames.LuminCloaking2)) { delete Augmentations[AugmentationNames.LuminCloaking2]; @@ -997,7 +997,7 @@ initAugmentations = function() { "Increases the player's dexterity by 10%
" + "Increases the player's dexterity experience gain rate by 15%
" + "Increases the amount of money the player gains from crimes by 25%"); - SmartSonar.setRequirements(9000, 12000000); + SmartSonar.setRequirements(9000, 15000000); SmartSonar.addToFactions(["Slum Snakes"]); if (augmentationExists(AugmentationNames.SmartSonar)) { delete Augmentations[AugmentationNames.SmartSonar]; @@ -1011,7 +1011,7 @@ initAugmentations = function() { "This augmentation:
" + "Increases all of the player's stats by 5%
" + "Increases the player's experience gain rate for all stats by 10%"); - PowerRecirculator.setRequirements(10000, 33000000); + PowerRecirculator.setRequirements(10000, 36000000); PowerRecirculator.addToFactions(["Tetrads", "The Dark Army", "The Syndicate", "NWO"]); if (augmentationExists(AugmentationNames.PowerRecirculator)) { delete Augmentations[AugmentationNames.PowerRecirculator]; @@ -1032,7 +1032,7 @@ initAugmentations = function() { "Increases the player's hacking speed by 10%
" + "Increases the player's chance of successfully performing a hack by 30%
" + "Increases the amount of money the player gains from hacking by 100%"); - QLink.setRequirements(750000, 1200000000); + QLink.setRequirements(750000, 1300000000); QLink.addToFactions(["Illuminati"]); if (augmentationExists(AugmentationNames.QLink)) { delete Augmentations[AugmentationNames.QLink]; @@ -1058,7 +1058,7 @@ initAugmentations = function() { "This augmentation:
" + "Increases all of the player's combat stats by 75%
" + "Increases the player's hacking skill by 15%"); - SPTN97.setRequirements(500000, 950000000); + SPTN97.setRequirements(500000, 975000000); SPTN97.addToFactions(["The Covenant"]); if (augmentationExists(AugmentationNames.SPTN97)) { delete Augmentations[AugmentationNames.SPTN97]; @@ -1070,7 +1070,7 @@ initAugmentations = function() { HiveMind.setInfo("A brain implant developed by ECorp. They do not reveal what " + "exactly the implant does, but they promise that it will greatly " + "enhance your abilities."); - HiveMind.setRequirements(600000, 1000000000); + HiveMind.setRequirements(600000, 1100000000); HiveMind.addToFactions(["ECorp"]); if (augmentationExists(AugmentationNames.HiveMind)) { delete Augmentations[AugmentationNames.HiveMind]; @@ -1086,7 +1086,7 @@ initAugmentations = function() { "This augmentation:
" + "Increases all of the player's combat stats by 35%
" + "Increases all of the player's combat stat experience gain rate by 35%"); - CordiARCReactor.setRequirements(450000, 975000000); + CordiARCReactor.setRequirements(450000, 1000000000); CordiARCReactor.addToFactions(["MegaCorp"]); if (augmentationExists(AugmentationNames.CordiARCReactor)) { delete Augmentations[AugmentationNames.CordiARCReactor]; @@ -1103,7 +1103,7 @@ initAugmentations = function() { "Increases the player's charisma experience gain rate by 50%
" + "Increases the amount of reputation the player gains for a company by 25%
" + "Increases the amount of reputation the player gains for a faction by 25%"); - SmartJaw.setRequirements(150000, 500000000); + SmartJaw.setRequirements(150000, 550000000); SmartJaw.addToFactions(["Bachman & Associates"]); if (augmentationExists(AugmentationNames.SmartJaw)) { delete Augmentations[AugmentationNames.SmartJaw]; @@ -1117,7 +1117,7 @@ initAugmentations = function() { "body's skin and bone cells, granting them the ability to repair " + "and restructure themselves.

" + "This augmentation increases the player's strength and defense by 55%"); - Neotra.setRequirements(225000, 550000000); + Neotra.setRequirements(225000, 575000000); Neotra.addToFactions(["Blade Industries"]); if (augmentationExists(AugmentationNames.Neotra)) { delete Augmentations[AugmentationNames.Neotra]; @@ -1132,7 +1132,7 @@ initAugmentations = function() { "This augmentation:
" + "Increases all of the player's stats by 20%
" + "Increases the player's experience gain rate for all stats by 15%"); - Xanipher.setRequirements(350000, 800000000); + Xanipher.setRequirements(350000, 850000000); Xanipher.addToFactions(["NWO"]); if (augmentationExists(AugmentationNames.Xanipher)) { delete Augmentations[AugmentationNames.Xanipher]; @@ -1145,7 +1145,7 @@ initAugmentations = function() { "of negligible senescence, preventing the body from " + "deteriorating with age.

" + "This augmentation increases all of the player's stats by 20%"); - nextSENS.setRequirements(175000, 375000000); + nextSENS.setRequirements(175000, 385000000); nextSENS.addToFactions(["Clarke Incorporated"]); if (augmentationExists(AugmentationNames.nextSENS)) { delete Augmentations[AugmentationNames.nextSENS]; @@ -1160,7 +1160,7 @@ initAugmentations = function() { "This augmentation:
" + "Increases the player's hacking skill by 20%
" + "Increases the player's hacking experience gain rate by 25%"); - OmniTekInfoLoad.setRequirements(250000, 550000000) + OmniTekInfoLoad.setRequirements(250000, 575000000) OmniTekInfoLoad.addToFactions(["OmniTek Incorporated"]); if (augmentationExists(AugmentationNames.OmniTekInfoLoad)) { delete Augmentations[AugmentationNames.OmniTekInfoLoad]; @@ -1177,7 +1177,7 @@ initAugmentations = function() { "skin cells, allowing users to generate their own energy " + "and nutrition using solar power.

" + "This augmentation increases the player's strength, defense, and agility by 40%"); - PhotosyntheticCells.setRequirements(225000, 525000000); + PhotosyntheticCells.setRequirements(225000, 550000000); PhotosyntheticCells.addToFactions(["KuaiGong International"]); if (augmentationExists(AugmentationNames.PhotosyntheticCells)) { delete Augmentations[AugmentationNames.PhotosyntheticCells]; @@ -1195,7 +1195,7 @@ initAugmentations = function() { "Increases the player's chance of successfully performing a hack by 10%
" + "Increases the player's hacking speed by 5%
" + "Lets the player start with the FTPCrack.exe and relaySMTP.exe programs after a reset"); - Neurolink.setRequirements(350000, 850000000); + Neurolink.setRequirements(350000, 875000000); Neurolink.addToFactions(["BitRunners"]); if (augmentationExists(AugmentationNames.Neurolink)) { delete Augmentations[AugmentationNames.Neurolink]; @@ -1213,7 +1213,7 @@ initAugmentations = function() { "Increases the player's hacking skill by 10%
" + "Increases the player's hacking speed by 2%
" + "Increases the amount of money the player gains from hacking by 10%"); - TheBlackHand.setRequirements(40000, 100000000); + TheBlackHand.setRequirements(40000, 110000000); TheBlackHand.addToFactions(["The Black Hand"]); if (augmentationExists(AugmentationNames.TheBlackHand)) { delete Augmentations[AugmentationNames.TheBlackHand]; @@ -1396,13 +1396,13 @@ applyAugmentation = function(aug, reapply=false) { switch(aug.name) { //Combat stat augmentations case AugmentationNames.Targeting1: - Player.dexterity_mult *= 1.15; + Player.dexterity_mult *= 1.10; break; case AugmentationNames.Targeting2: - Player.dexterity_mult *= 1.25; + Player.dexterity_mult *= 1.20; break; case AugmentationNames.Targeting3: - Player.dexterity_mult *= 1.40; + Player.dexterity_mult *= 1.30; break; case AugmentationNames.SyntheticHeart: //High level Player.agility_mult *= 1.5; @@ -1436,20 +1436,20 @@ applyAugmentation = function(aug, reapply=false) { Player.dexterity_mult *= 1.05; break; case AugmentationNames.GrapheneBoneLacings: //High level - Player.strength_mult *= 1.75; - Player.defense_mult *= 1.75; + Player.strength_mult *= 1.7; + Player.defense_mult *= 1.7; break; case AugmentationNames.BionicSpine: //Med level - Player.strength_mult *= 1.18; - Player.defense_mult *= 1.18; - Player.agility_mult *= 1.18; - Player.dexterity_mult *= 1.18; + Player.strength_mult *= 1.16; + Player.defense_mult *= 1.16; + Player.agility_mult *= 1.16; + Player.dexterity_mult *= 1.16; break; case AugmentationNames.GrapheneBionicSpine: //High level - Player.strength_mult *= 1.65; - Player.defense_mult *= 1.65; - Player.agility_mult *= 1.65; - Player.dexterity_mult *= 1.65; + Player.strength_mult *= 1.6; + Player.defense_mult *= 1.6; + Player.agility_mult *= 1.6; + Player.dexterity_mult *= 1.6; break; case AugmentationNames.BionicLegs: //Med level Player.agility_mult *= 1.6; @@ -1579,12 +1579,12 @@ applyAugmentation = function(aug, reapply=false) { Player.charisma_mult *= 1.1; break; case AugmentationNames.FocusWire: //Med level - Player.hacking_exp_mult *= 1.1; - Player.strength_exp_mult *= 1.1; - Player.defense_exp_mult *= 1.1; - Player.dexterity_exp_mult *= 1.1; - Player.agility_exp_mult *= 1.1; - Player.charisma_exp_mult *= 1.1; + Player.hacking_exp_mult *= 1.05; + Player.strength_exp_mult *= 1.05; + Player.defense_exp_mult *= 1.05; + Player.dexterity_exp_mult *= 1.05; + Player.agility_exp_mult *= 1.05; + Player.charisma_exp_mult *= 1.05; Player.company_rep_mult *= 1.1; Player.work_money_mult *= 1.2; break; @@ -1710,10 +1710,10 @@ applyAugmentation = function(aug, reapply=false) { Player.crime_money_mult *= 1.25; break; case AugmentationNames.HemoRecirculator: - Player.strength_mult *= 1.1; - Player.defense_mult *= 1.1; - Player.agility_mult *= 1.1; - Player.dexterity_mult *= 1.1; + Player.strength_mult *= 1.08; + Player.defense_mult *= 1.08; + Player.agility_mult *= 1.08; + Player.dexterity_mult *= 1.08; break; case AugmentationNames.SmartSonar: Player.dexterity_mult *= 1.1; diff --git a/src/Constants.js b/src/Constants.js index 9a109fdff..b14fbc754 100644 --- a/src/Constants.js +++ b/src/Constants.js @@ -1,5 +1,5 @@ CONSTANTS = { - Version: "0.24.1", + Version: "0.25.0", //Max level for any skill, assuming no multipliers. Determined by max numerical value in javascript for experience //and the skill level formula in Player.js. Note that all this means it that when experience hits MAX_INT, then @@ -11,7 +11,7 @@ CONSTANTS = { /* Base costs */ BaseCostFor1GBOfRamHome: 32000, - BaseCostFor1GBOfRamServer: 55000, //1 GB of RAM + BaseCostFor1GBOfRamServer: 60000, //1 GB of RAM BaseCostFor1GBOfRamHacknetNode: 30000, BaseCostForHacknetNode: 1000, @@ -19,9 +19,9 @@ CONSTANTS = { /* Hacknet Node constants */ HacknetNodeMoneyGainPerLevel: 1.55, - HacknetNodePurchaseNextMult: 1.75, //Multiplier when purchasing an additional hacknet node - HacknetNodeUpgradeLevelMult: 1.045, //Multiplier for cost when upgrading level - HacknetNodeUpgradeRamMult: 1.28, //Multiplier for cost when upgrading RAM + HacknetNodePurchaseNextMult: 1.85, //Multiplier when purchasing an additional hacknet node + HacknetNodeUpgradeLevelMult: 1.05, //Multiplier for cost when upgrading level + HacknetNodeUpgradeRamMult: 1.29, //Multiplier for cost when upgrading RAM HacknetNodeUpgradeCoreMult: 1.49, //Multiplier for cost when buying another core HacknetNodeMaxLevel: 200, @@ -34,7 +34,7 @@ CONSTANTS = { /* Augmentation */ //NeuroFlux Governor cost multiplier as you level up - NeuroFluxGovernorLevelMult: 1.13, + NeuroFluxGovernorLevelMult: 1.14, /* Script related things */ //Time (ms) it takes to run one operation in Netscript. @@ -71,6 +71,10 @@ CONSTANTS = { ScriptHNUpgLevelRamCost: 0.4, ScriptHNUpgRamRamCost: 0.6, ScriptHNUpgCoreRamCost: 0.8, + ScriptGetStockRamCost: 2.0, + ScriptBuySellStockRamCost: 2.5, + ScriptPurchaseServerRamCost: 2.0, + ScriptRoundRamCost: 0.05, MultithreadingRAMCost: 1, @@ -96,8 +100,8 @@ CONSTANTS = { InfiltrationMoneyValue: 2000, //Convert "secret" value to money //Stock market constants - WSEAccountCost: 50000000, - TIXAPICost: 1000000000, + WSEAccountCost: 200000000, + TIXAPICost: 5000000000, StockMarketCommission: 100000, //Hospital/Health @@ -327,6 +331,10 @@ CONSTANTS = { "the execution of a script is when it saves/loads.

", TutorialNetscriptText: "Netscript is a programming language implemented for this game. The language has " + "your basic programming constructs and several built-in commands that are used to hack.

" + + "

Official Wiki and Documentation


" + + "Check out Bitburner's wiki for the official Netscript documentation" + + ". The wiki documentation will contain more details and " + + "code examples than this documentation page. Also, it can be opened up in another tab/window for convenience!

" + "

Variables and data types


" + "The following data types are supported by Netscript:
" + "numeric - Integers and floats (eg. 6, 10.4999)
" + @@ -354,7 +362,7 @@ CONSTANTS = { " ==
" + " !=

" + "

Arrays


" + - "Netscript arrays have the same properties and functions as javascript arrays. For information see javascripts array documentation.

"+ + "Netscript arrays have the same properties and functions as javascript arrays. For information see javascripts array documentation.

"+ "

Script Arguments


" + "Arguments passed into a script can be accessed using a special array called 'args'. The arguments can be accessed like a normal array using the [] " + "operator. (args[0], args[1], args[2]...)

" + @@ -393,9 +401,7 @@ CONSTANTS = { "any server, regardless of where the script is running. This command requires root access to the target server, but " + "there is no required hacking level to run the command. Returns " + "0.1. Works offline at a slower rate
Example: weaken('foodnstuff');

" + - "print(x)
Prints a value or a variable to the scripts logs (which can be viewed with the 'tail [script]' terminal command ).
" + - "WARNING: Do NOT call print() on an array. The script will crash. You can, however, call print on single elements of an array. For example, if " + - "the variable 'a' is an array, then do NOT call print(a), but it is okay to call print(a[0]).

" + + "print(x)
Prints a value or a variable to the scripts logs (which can be viewed with the 'tail [script]' terminal command ).

" + "scan(hostname/ip)
Returns an array containing the hostnames of all servers that are one node away from the specified server. " + "The argument must be a string containing the IP or hostname of the target server. The hostnames in the returned array are strings.

" + "nuke(hostname/ip)
Run NUKE.exe on the target server. NUKE.exe must exist on your home computer. Does NOT work while offline
Example: nuke('foodnstuff');

" + @@ -494,6 +500,14 @@ CONSTANTS = { "purchaseHacknetNode()
Purchases a new Hacknet Node. Returns a number with the index of the Hacknet Node. This index is equivalent to the number " + "at the end of the Hacknet Node's name (e.g The Hacknet Node named 'hacknet-node-4' will have an index of 4). If the player cannot afford to purchase " + "a new Hacknet Node then the function will return false. Does NOT work offline

" + + "purchaseServer(hostname, ram)
Purchases a server with the specified hostname and amount of RAM. The first argument can be any data type, " + + "but it will be converted to a string using Javascript's String function. Anything that resolves to an empty string will cause the function to fail. " + + "The second argument specified the amount of RAM (in GB) for the server. This argument must resolve to a numeric and it must be a power of 2 " + + "(2, 4, 8, etc...).

" + + "Purchasing a server using this Netscript function is twice as expensive as manually purchasing a server from a location in the World.

" + + "This function returns the hostname of the newly purchased server as a string. If the function fails to purchase a server, then it will return " + + "an empty string. The function will fail if the arguments passed in are invalid or if the player does not have enough money to purchase the specified server.

" + + "round(n)
Rounds the number n to the nearest integer. If the argument passed in is not a number, then the function will return 0.

" + "

Hacknet Nodes API


" + "Netscript provides the following API for accessing and upgrading your Hacknet Nodes through scripts. This API does NOT work offline.

" + "hacknetnodes
A special variable. This is an array that maps to the Player's Hacknet Nodes. The Hacknet Nodes are accessed through " + @@ -506,9 +520,9 @@ CONSTANTS = { "hacknetnodes[i].cores
Returns the number of cores on the corresponding Hacknet Node

" + "hacknetnodes[i].upgradeLevel(n)
Tries to upgrade the level of the corresponding Hacknet Node n times. The argument n must be a " + "positive integer. Returns true if the Hacknet Node's level is successfully upgraded n times or up to the max level (200), and false otherwise.

" + - "hacknetnodes[i].purchaseRamUpgrade()
Tries to upgrade the amount of RAM on the corresponding Hacknet Node. Returns true if the " + + "hacknetnodes[i].upgradeRam()
Tries to upgrade the amount of RAM on the corresponding Hacknet Node. Returns true if the " + "RAM is successfully upgraded, and false otherwise.

" + - "hacknetnodes[i].purchaseCoreUpgrade()
Attempts to purchase an additional core for the corresponding Hacknet Node. Returns true if the " + + "hacknetnodes[i].upgradeCore()
Attempts to purchase an additional core for the corresponding Hacknet Node. Returns true if the " + "additional core is successfully purchase, and false otherwise.

" + "Example: The following is an example of one way a script can be used to automate the purchasing and upgrading of Hacknet Nodes. " + "This script purchases new Hacknet Nodes until the player has four. Then, it iteratively upgrades each of those four Hacknet Nodes " + @@ -534,6 +548,26 @@ CONSTANTS = { "        sleep(10000);
" + "    }
" + "}

" + + "

Trade Information eXchange (TIX) API


" + + "getStockPrice(sym)
Returns the price of a stock. The argument passed in must be the stock's symbol (NOT THE COMPANY NAME!). The symbol " + + "is a sequence of two to four capital letters. The symbol argument must be a string.

" + + "Example: getStockPrice('FSIG');

" + + "getStockPosition(sym)
Returns an array of two elements that represents the player's position in a stock. The first element " + + "in the array is the number of shares the player owns of the specified stock. The second element in the array is the average price of the player's " + + "shares. Both elements are numbers. The argument passed in must be the stock's symbol, which is a sequence of two to four capital letters.

" + + "Example:

pos = getStockPosition('ECP');
shares = pos[0];
avgPx = pos[1];

"+ + "buyStock(sym, shares)
Attempts to purchase shares of a stock. The first argument must be a string with the stock's symbol. The second argument " + + "must be the number of shares to purchase.

" + + "If the player does not have enough money to purchase specified number of shares, then no shares will be purchased (it will not purchase the most you can afford). " + + "Remember that every transaction on the stock exchange costs a certain commission fee.

" + + "The function will return true if it successfully purchases the specified number of shares of stock, and false otherwise.

" + + "sellStock(sym, shares)
Attempts to sell shares of a stock. The first argument must be a string with the stock's symbol. The second argument " + + "must be the number of shares to sell.

" + + "If the specified number of shares in the function exceeds the amount that the player actually owns, then this function will sell all owned shares. " + + "Remember that every transaction on the stock exchange costs a certain commission fee.

" + + "The net profit made from selling stocks with this function is reflected in the script's statistics. This net profit is calculated as:

" + + "shares * (sell price - average price of purchased shares)

" + + "This function will return true if the shares of stock are successfully sold and false otherwise.

" + "

While loops


" + "A while loop is a control flow statement that repeatedly executes code as long as a condition is met.

" + "while ([cond]) {
    [code]
}

" + @@ -552,14 +586,14 @@ CONSTANTS = { " using a for loop:

" + "for (i = 0; i < 10; i = i++) {
    hack('foodnstuff');
}

" + "

If statements


" + - "If/Elif/Else statements are conditional statements used to perform different actions based on different conditions:

" + - "if (condition1) {
    code1
} elif (condition2) {
    code2
} else {
" + + "If/Else if/Else statements are conditional statements used to perform different actions based on different conditions:

" + + "if (condition1) {
    code1
} else if (condition2) {
    code2
} else {
" + "    code3
}

" + "In the code above, first condition1 will be checked. If this condition is true, then code1 will execute and the " + - "rest of the if/elif/else statement will be skipped. If condition1 is NOT true, then the code will then go on to check " + - "condition2. If condition2 is true, then code2 will be executed, and the rest of the if/elif/else statement " + + "rest of the if/else if/else statement will be skipped. If condition1 is NOT true, then the code will then go on to check " + + "condition2. If condition2 is true, then code2 will be executed, and the rest of the if/else if/else statement " + "will be skipped. If none of the conditions are true, then the code within the else block (code3) will be executed. " + - "Note that a conditional statement can have any number of elif statements.

" + + "Note that a conditional statement can have any number of 'else if' statements.

" + "Example:

" + "if(getServerMoneyAvailable('foodnstuff') > 200000) {
    hack('foodnstuff');
" + "} else {
    grow('foodnstuff');
}

" + @@ -665,6 +699,32 @@ CONSTANTS = { "World Stock Exchange account and TIX API Access
", Changelog: + "v0.25.0
" + + "-Refactored Netscript to use the open-source Acorns Parser. This re-implementation was done by Github users MrNuggelz. " + + "This has resulted in several changes in the Netscript language. Some scripts might break because of these changes. " + + "Changes listed below:
" + + "-Arrays are now fully functional Javascript arrays. You no longer need to use the 'Array' keyword to declare them.
" + + "-The length(), clear/clear(), insert(), and remove() functions no longer work for arrays.
" + + "-All Javascript array methods are available (splice(), push(), pop(), join(), shift(), indexOf(), etc. See documentation)
" + + "-Variables assigned to arrays are now passed by value rather than reference
" + + "-Incrementing/Decrementing are now available (i++, ++i)
" + + "-You no longer need semicolons at the end of block statements
" + + "-Netscript's Hacknet Node API functions no longer log anything
" + + "-Stock prices now update every ~6 seconds when the game is active (was 10 seconds before)
" + + "-Added a new mechanic that affects how stock prices change
" + + "-Script editor now has dynamic indicators for RAM Usage and Line number
" + + "-Augmentation Rebalancing - Many late game augmentations are now slightly more expensive. Several early game " + + "augmentations had their effects slightly decreased
" + + "-Increased the amount of rewards (both money and rep) you get from infiltration
" + + "-Purchasing servers is now slightly more expensive
" + + "-Calling the Netscript function getServerMoneyAvailable('home') now return's the player's money
" + + "-Added round(n) Netscript function - Rounds a number
" + + "-Added purchaseServer(hostname, ram) Netscript function
" + + "-Added the TIX API. This must be purchased in the WSE. It persists through resets. Access to the TIX API " + + "allows you to write scripts that perform automated algorithmic trading. See Netscript documentation
" + + "-Minor rebalancing in a lot of different areas
" + + "-Changed the format of IP Addresses so that they are smaller (will consist mostly of single digit numbers now). This will reduce " + + "the size of the game's save file.

" + "v0.24.1
" + "-Adjusted cost of upgrading home computer RAM. Should be a little cheaper for the first few upgrades (up to ~64GB), and " + "then will start being more expensive than before. High RAM upgrades should now be significantly more expensive than before.
" + @@ -891,36 +951,31 @@ CONSTANTS = { "-You can now see what an Augmentation does and its price even while its locked

", LatestUpdate: - "v0.24.1
" + - "-Adjusted cost of upgrading home computer RAM. Should be a little cheaper for the first few upgrades (up to ~64GB), and " + - "then will start being more expensive than before. High RAM upgrades should now be significantly more expensive than before.
" + - "-Slightly lowered the starting money available on most mid-game and end-game servers (servers with required hacking level " + - "greater than 200) by about 10-15%
" + - "-Rebalanced company/company position reputation gains and requirements
" + - "-Studying at a university now gives slightly more EXP and early jobs give slightly less EXP
" + - "-Studying at a university is now considerably more expensive
" + - "-Rebalanced stock market
" + - "-Significantly increased cost multiplier for purchasing additional Hacknet Nodes
" + - "-The rate at which facility security level increases during infiltration for each clearance level " + - "was lowered slightly for all companies
" + - "-Updated Faction descriptions
" + - "-Changed the way alias works. Normal aliases now only work at the start of a Terminal command (they will only " + - "replace the first word in the Terminal command). You can also create global aliases that work on any part of the " + - 'command, like before. Declare global aliases by entering the optional -g flag: alias -g name="value" - Courtesy of Github user MrNuggelz
' + - "-'top' Terminal command implemented courtesy of Github user LTCNugget. Currently, the formatting gets screwed up " + - "if your script names are really long.

" + - "v0.24.0
" + - "-Players now have HP, which is displayed in the top right. To regain HP, visit the hospital. Currently " + - "the only way to lose HP is through infiltration
" + - "-Infiltration - Attempt to infiltrate a company and steal their classified secrets. See 'Companies' documentation for more details
" + - "-Stock Market - Added the World Stock Exchange (WSE), a brokerage that lets you buy/sell stocks. To begin trading you must first purchase " + - "an account. A WSE account will persist even after resetting by installing Augmentations. How the stock market works should hopefully be " + - "self explanatory. There is no documentation about it currently, I will add some later. NOTE: Stock prices only change when the game is open. " + - "The Stock Market is reset when installing Augmentations, which means you will lose all your stocks
" + - "-Decreased money gained from hacking by ~12%
" + - "-Increased reputation required for all Augmentations by ~40%
" + - "-Cost increase when purchasing multiple augmentations increased from 75% to 90%
" + - "-Added basic variable runtime to Netscript operations. Basic commands run in 100ms. Any function incurs another 100ms in runtime (200ms total). " + - "Any function that starts with getServer incurs another 100ms runtime (300ms total). exec() and scp() require 400ms total.
" + - "-Slightly reduced the amount of experience gained from hacking
", + "v0.25.0
" + + "-Refactored Netscript to use the open-source Acorns Parser. This re-implementation was done by Github users MrNuggelz. " + + "This has resulted in several changes in the Netscript language. Some scripts might break because of these changes. " + + "Changes listed below:
" + + "-Arrays are now fully functional Javascript arrays. You no longer need to use the 'Array' keyword to declare them.
" + + "-The length(), clear/clear(), insert(), and remove() functions no longer work for arrays.
" + + "-All Javascript array methods are available (splice(), push(), pop(), join(), shift(), indexOf(), etc. See documentation)
" + + "-Variables assigned to arrays are now passed by value rather than reference
" + + "-Incrementing/Decrementing are now available (i++, ++i)
" + + "-You no longer need semicolons at the end of block statements
" + + "-Netscript's Hacknet Node API functions no longer log anything
" + + "-Stock prices now update every ~6 seconds when the game is active (was 10 seconds before)
" + + "-Added a new mechanic that affects how stock prices change
" + + "-Script editor now has dynamic indicators for RAM Usage and Line number
" + + "-Augmentation Rebalancing - Many late game augmentations are now slightly more expensive. Several early game " + + "augmentations had their effects slightly decreased
" + + "-Increased the amount of rewards (both money and rep) you get from infiltration
" + + "-Purchasing servers is now slightly more expensive
" + + "-Calling the Netscript function getServerMoneyAvailable('home') now return's the player's money
" + + "-Added round(n) Netscript function - Rounds a number
" + + "-Added purchaseServer(hostname, ram) Netscript function
" + + "-Added the TIX API. This must be purchased in the WSE. It persists through resets. Access to the TIX API " + + "allows you to write scripts that perform automated algorithmic trading. See Netscript documentation
" + + "-Minor rebalancing in a lot of different areas
" + + "-Changed the format of IP Addresses so that they are smaller (will consist mostly of single digit numbers now). This will reduce " + + "the size of the game's save file.
", + } diff --git a/src/HacknetNode.js b/src/HacknetNode.js index e4f97d581..348324e86 100644 --- a/src/HacknetNode.js +++ b/src/HacknetNode.js @@ -34,7 +34,7 @@ document.addEventListener("DOMContentLoaded", hacknetNodesInit, false); function HacknetNode(name) { this.level = 1; this.ram = 1; //GB - this.numCores = 1; + this.cores = 1; this.name = name; @@ -50,7 +50,7 @@ HacknetNode.prototype.updateMoneyGainRate = function() { this.moneyGainRatePerSecond = (this.level * gainPerLevel) * Math.pow(1.035, this.ram-1) * - ((this.numCores + 5) / 6) * Player.hacknet_node_money_mult; + ((this.cores + 5) / 6) * Player.hacknet_node_money_mult; if (isNaN(this.moneyGainRatePerSecond)) { this.moneyGainRatePerSecond = 0; dialogBoxCreate("Error in calculating Hacknet Node production. Please report to game developer"); @@ -85,6 +85,11 @@ HacknetNode.prototype.purchaseLevelUpgrade = function(levels=1) { return true; } +//Wrapper function for Netscript +HacknetNode.prototype.upgradeLevel = function(levels=1) { + return this.purchaseLevelUpgrade(levels); +} + HacknetNode.prototype.calculateRamUpgradeCost = function() { var numUpgrades = Math.log2(this.ram); @@ -106,23 +111,33 @@ HacknetNode.prototype.purchaseRamUpgrade = function() { return true; } +//Wrapper function for Netscript +HacknetNode.prototype.upgradeRam = function() { + return this.purchaseRamUpgrade(); +} + HacknetNode.prototype.calculateCoreUpgradeCost = function() { var coreBaseCost = CONSTANTS.BaseCostForHacknetNodeCore; var mult = CONSTANTS.HacknetNodeUpgradeCoreMult; - return coreBaseCost * Math.pow(mult, this.numCores-1) * Player.hacknet_node_core_cost_mult; + return coreBaseCost * Math.pow(mult, this.cores-1) * Player.hacknet_node_core_cost_mult; } HacknetNode.prototype.purchaseCoreUpgrade = function() { var cost = this.calculateCoreUpgradeCost(); if (isNaN(cost)) {return false;} if (cost > Player.money) {return false;} - if (this.numCores >= CONSTANTS.HacknetNodeMaxCores) {return false;} + if (this.cores >= CONSTANTS.HacknetNodeMaxCores) {return false;} Player.loseMoney(cost); - ++this.numCores; + ++this.cores; this.updateMoneyGainRate(); return true; } +//Wrapper function for Netscript +HacknetNode.prototype.upgradeCore = function() { + return this.purchaseCoreUpgrade(); +} + /* Saving and loading HackNets */ HacknetNode.prototype.toJSON = function() { return Generic_toJSON("HacknetNode", this); @@ -150,8 +165,8 @@ purchaseHacknet = function() { var cost = getCostOfNextHacknetNode(); if (isNaN(cost)) {throw new Error("Cost is NaN"); return;} if (cost > Player.money) { - dialogBoxCreate("You cannot afford to purchase a Hacknet Node!"); - return; + //dialogBoxCreate("You cannot afford to purchase a Hacknet Node!"); + return false; } //Auto generate a name for the node for now...TODO @@ -165,6 +180,7 @@ purchaseHacknet = function() { displayHacknetNodesContent(); updateTotalHacknetProduction(); + return numOwned; } //Calculates the total production from all HacknetNodes @@ -361,7 +377,7 @@ updateHacknetNodeDomElement = function(nodeObj) { " ($" + formatNumber(nodeObj.moneyGainRatePerSecond, 2) + " / second)
" + "Level: " + nodeObj.level + "
" + "RAM: " + nodeObj.ram + "GB
" + - "Cores: " + nodeObj.numCores; + "Cores: " + nodeObj.cores; //Upgrade level var upgradeLevelButton = document.getElementById("hacknet-node-upgrade-level-" + nodeName); @@ -408,7 +424,7 @@ updateHacknetNodeDomElement = function(nodeObj) { //Upgrade Cores var upgradeCoreButton = document.getElementById("hacknet-node-upgrade-core-" + nodeName); if (upgradeCoreButton == null) {throw new Error("Cannot find upgrade cores button element");} - if (nodeObj.numCores >= CONSTANTS.HacknetNodeMaxCores) { + if (nodeObj.cores >= CONSTANTS.HacknetNodeMaxCores) { upgradeCoreButton.innerHTML = "MAX CORES"; upgradeCoreButton.setAttribute("class", "a-link-button-inactive"); } else { diff --git a/src/Location.js b/src/Location.js index ab4f47597..d12bb9a41 100644 --- a/src/Location.js +++ b/src/Location.js @@ -369,7 +369,7 @@ displayLocationContent = function() { purchaseTor.style.display = "block"; purchaseHomeRam.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumECorp, - 6000, 100, 150, 13); + 6000, 106, 150, 13); break; case Locations.AevumBachmanAndAssociates: @@ -382,7 +382,7 @@ displayLocationContent = function() { businessJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumBachmanAndAssociates, - 1500, 36, 60, 9.5); + 1500, 38, 60, 9.5); break; case Locations.AevumClarkeIncorporated: @@ -395,7 +395,7 @@ displayLocationContent = function() { businessJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumClarkeIncorporated, - 2400, 28, 75, 9); + 2400, 30, 75, 9); break; case Locations.AevumFulcrumTechnologies: @@ -414,7 +414,7 @@ displayLocationContent = function() { purchaseTor.style.display = "block"; purchaseHomeRam.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumFulcrumTechnologies, - 6000, 84, 100, 15); + 6000, 88, 100, 15); break; case Locations.AevumAeroCorp: @@ -426,7 +426,7 @@ displayLocationContent = function() { networkEngineerJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumAeroCorp, - 2000, 26, 50, 10); + 2000, 28, 50, 10); break; case Locations.AevumGalacticCybersystems: @@ -439,7 +439,7 @@ displayLocationContent = function() { networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumGalacticCybersystems, - 1400, 24, 50, 9); + 1400, 26, 50, 9); break; case Locations.AevumWatchdogSecurity: @@ -453,7 +453,7 @@ displayLocationContent = function() { securityJob.style.display = "block"; agentJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumWatchdogSecurity, - 850, 12, 30, 7.5); + 850, 14, 30, 7.5); break; case Locations.AevumRhoConstruction: @@ -462,7 +462,7 @@ displayLocationContent = function() { softwareJob.style.display = "block"; businessJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumRhoConstruction, - 600, 8, 20, 4); + 600, 10, 20, 4); break; case Locations.AevumPolice: @@ -471,7 +471,7 @@ displayLocationContent = function() { softwareJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumPolice, - 700, 10, 25, 5); + 700, 12, 25, 5); break; case Locations.AevumNetLinkTechnologies: @@ -489,7 +489,7 @@ displayLocationContent = function() { purchaseTor.style.display = "block"; purchaseHomeRam.style.display = "block"; setInfiltrateButton(infiltrate, Locations.AevumNetLinkTechnologies, - 150, 5, 15, 3); + 160, 8, 15, 3); break; case Locations.AevumCrushFitnessGym: @@ -523,7 +523,7 @@ displayLocationContent = function() { businessJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.ChongqingKuaiGongInternational, - 5500, 42, 100, 14); + 5500, 44, 100, 14); break; case Locations.ChongqingSolarisSpaceSystems: @@ -564,7 +564,7 @@ displayLocationContent = function() { businessJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12MegaCorp, - 6000, 100, 125, 15); + 6000, 104, 125, 15); break; case Locations.Sector12BladeIndustries: @@ -577,7 +577,7 @@ displayLocationContent = function() { businessJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12BladeIndustries, - 3000, 40, 100, 10); + 3000, 42, 100, 10); break; case Locations.Sector12FourSigma: @@ -590,7 +590,7 @@ displayLocationContent = function() { businessJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12FourSigma, - 1500, 50, 100, 14.5); + 1500, 52, 100, 14.5); break; case Locations.Sector12IcarusMicrosystems: @@ -603,7 +603,7 @@ displayLocationContent = function() { networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12IcarusMicrosystems, - 900, 28, 70, 11); + 900, 30, 70, 11); break; case Locations.Sector12UniversalEnergy: @@ -616,7 +616,7 @@ displayLocationContent = function() { networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12UniversalEnergy, - 775, 20, 50, 9.5); + 775, 22, 50, 9.5); break; case Locations.Sector12DeltaOne: @@ -628,7 +628,7 @@ displayLocationContent = function() { networkEngineerJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12DeltaOne, - 1200, 30, 75, 10); + 1200, 34, 75, 10); break; case Locations.Sector12CIA: @@ -641,7 +641,7 @@ displayLocationContent = function() { securityJob.style.display = "block"; agentJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12CIA, - 1450, 38, 80, 12); + 1450, 40, 80, 12); break; case Locations.Sector12NSA: @@ -654,7 +654,7 @@ displayLocationContent = function() { securityJob.style.display = "block"; agentJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12NSA, - 1400, 34, 80, 11); + 1400, 36, 80, 11); break; case Locations.Sector12AlphaEnterprises: @@ -668,7 +668,7 @@ displayLocationContent = function() { purchaseTor.style.display = "block"; purchaseHomeRam.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12AlphaEnterprises, - 250, 10, 40, 4.5); + 250, 12, 40, 4.5); break; case Locations.Sector12CarmichaelSecurity: @@ -682,7 +682,7 @@ displayLocationContent = function() { securityJob.style.display = "block"; agentJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12CarmichaelSecurity, - 500, 14, 60, 4.5); + 500, 16, 60, 4.5); break; case Locations.Sector12FoodNStuff: @@ -698,7 +698,7 @@ displayLocationContent = function() { employeeJob.style.display = "block"; employeePartTimeJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.Sector12JoesGuns, - 100, 4, 20, 3.5); + 120, 6, 20, 3.5); break; case Locations.Sector12IronGym: @@ -731,7 +731,7 @@ displayLocationContent = function() { securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.NewTokyoDefComm, - 1300, 24, 70, 9); + 1300, 26, 70, 9); break; case Locations.NewTokyoVitaLife: @@ -744,7 +744,7 @@ displayLocationContent = function() { networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.NewTokyoVitaLife, - 750, 18, 100, 8); + 750, 20, 100, 8); break; case Locations.NewTokyoGlobalPharmaceuticals: @@ -758,7 +758,7 @@ displayLocationContent = function() { businessJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.NewTokyoGlobalPharmaceuticals, - 900, 20, 80, 8.5); + 900, 22, 80, 8.5); break; case Locations.NewTokyoNoodleBar: @@ -797,7 +797,7 @@ displayLocationContent = function() { purchase256gb.style.display = "block"; purchaseHomeRam.style.display = "block"; setInfiltrateButton(infiltrate, Locations.IshimaStormTechnologies, - 700, 20, 100, 10); + 700, 22, 100, 10); break; case Locations.IshimaNovaMedical: @@ -810,7 +810,7 @@ displayLocationContent = function() { networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.IshimaNovaMedical, - 600, 16, 50, 7.5); + 600, 18, 50, 7.5); break; case Locations.IshimaOmegaSoftware: @@ -828,7 +828,7 @@ displayLocationContent = function() { purchaseTor.style.display = "block"; purchaseHomeRam.style.display = "block"; setInfiltrateButton(infiltrate, Locations.IshimaOmegaSoftware, - 200, 5, 40, 4); + 200, 8, 40, 4); break; case Locations.VolhavenTravelAgency: @@ -861,7 +861,7 @@ displayLocationContent = function() { purchase512gb.style.display = "block"; purchase1tb.style.display = "block"; setInfiltrateButton(infiltrate, Locations.VolhavenOmniTekIncorporated, - 1500, 38, 100, 9.5); + 1500, 40, 100, 9.5); break; case Locations.VolhavenNWO: @@ -874,7 +874,7 @@ displayLocationContent = function() { businessJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.VolhavenNWO, - 1800, 48, 200, 11); + 1800, 50, 200, 11); break; case Locations.VolhavenHeliosLabs: @@ -886,7 +886,7 @@ displayLocationContent = function() { securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.VolhavenHeliosLabs, - 1200, 24, 75, 9); + 1200, 26, 75, 9); break; case Locations.VolhavenOmniaCybersystems: @@ -898,7 +898,7 @@ displayLocationContent = function() { networkEngineerJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.VolhavenOmniaCybersystems, - 900, 24, 90, 9.5); + 900, 26, 90, 9.5); break; case Locations.VolhavenLexoCorp: @@ -912,7 +912,7 @@ displayLocationContent = function() { businessJob.style.display = "block"; securityJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.VolhavenLexoCorp, - 500, 10, 40, 5.5); + 500, 12, 40, 5.5); break; case Locations.VolhavenSysCoreSecurities: @@ -923,7 +923,7 @@ displayLocationContent = function() { securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; setInfiltrateButton(infiltrate, Locations.VolhavenSysCoreSecurities, - 600, 12, 50, 6); + 600, 14, 50, 6); break; case Locations.VolhavenCompuTek: @@ -944,7 +944,7 @@ displayLocationContent = function() { purchaseTor.style.display = "block"; purchaseHomeRam.style.display = "block"; setInfiltrateButton(infiltrate, Locations.VolhavenCompuTek, - 300, 8, 35, 5); + 300, 10, 35, 5); break; case Locations.VolhavenMilleniumFitnessGym: diff --git a/src/NetscriptEnvironment.js b/src/NetscriptEnvironment.js index 3f0960436..e51a828a1 100644 --- a/src/NetscriptEnvironment.js +++ b/src/NetscriptEnvironment.js @@ -48,7 +48,20 @@ Environment.prototype = { } return (scope || this).vars[name] = value; }, - + + setArrayElement: function(name, idx, value) { + var scope = this.lookup(name); + if (!scope && this.parent) { + console.log("Here"); + throw new Error("Undefined variable " + name); + } + var arr = (scope || this).vars[name]; + if (!(arr.constructor === Array || arr instanceof Array)) { + throw new Error("Variable is not an array: " + name); + } + return (scope || this).vars[name][idx] = value; + }, + //Creates (or overwrites) a variable in the current scope def: function(name, value) { return this.vars[name] = value; diff --git a/src/NetscriptEvaluator.js b/src/NetscriptEvaluator.js index 85ed4b5b5..4ba49b719 100644 --- a/src/NetscriptEvaluator.js +++ b/src/NetscriptEvaluator.js @@ -66,7 +66,8 @@ function evaluate(exp, workerScript) { if (exp.callee.type == "MemberExpression"){ evaluate(exp.callee.object, workerScript).then(function(object) { try { - resolve(func.apply(object,args)); + var res = func.apply(object,args); + resolve(res); } catch (e) { reject(makeRuntimeRejectMsg(workerScript, e)); } @@ -86,7 +87,11 @@ function evaluate(exp, workerScript) { resolve(out); } } catch (e) { - reject(makeRuntimeRejectMsg(workerScript, e)); + if (isScriptErrorMessage(e)) { + reject(e); + } else { + reject(makeRuntimeRejectMsg(workerScript, e)); + } } } }).catch(function(e) { @@ -205,6 +210,7 @@ function evaluate(exp, workerScript) { }); // End Promise } +/* function evalFunction(exp, workerScript){ return new Promise(function(resolve, reject) { if (exp.callee.type!="Identifier"){ @@ -254,6 +260,7 @@ function evalFunction(exp, workerScript){ } }); } +*/ function evalBinary(exp, workerScript){ return new Promise(function(resolve, reject) { @@ -342,7 +349,7 @@ function evalAssignment(exp, workerScript) { return new Promise(function(resolve, reject) { if (env.stopFlag) {return reject(workerScript);} - if (exp.left.type != "Identifier") { + if (exp.left.type != "Identifier" && exp.left.type != "MemberExpression") { return reject(makeRuntimeRejectMsg(workerScript, "Cannot assign to " + JSON.stringify(exp.left))); } @@ -352,31 +359,59 @@ function evalAssignment(exp, workerScript) { var expRightPromise = evaluate(exp.right, workerScript); expRightPromise.then(function(expRight) { - try { - switch (exp.operator) { - case "=": - env.set(exp.left.name,expRight); - break; - case "+=": - env.set(exp.left.name,env.get(exp.left.name) + expRight); - break; - case "-=": - env.set(exp.left.name,env.get(exp.left.name) - expRight); - break; - case "*=": - env.set(exp.left.name,env.get(exp.left.name) * expRight); - break; - case "/=": - env.set(exp.left.name,env.get(exp.left.name) / expRight); - break; - case "%=": - env.set(exp.left.name,env.get(exp.left.name) % expRight); - break; - default: - reject(makeRuntimeRejectMsg(workerScript, "Bitwise assignment is not implemented")); + if (exp.left.type == "MemberExpression") { + //Assign to array element + //Array object designed by exp.left.object.name + //Index designated by exp.left.property + var name = exp.left.object.name; + if (!(name in env.vars)){ + reject(makeRuntimeRejectMsg(workerScript, "variable " + name + " not definied")); + } + var arr = env.get(name); + if (arr.constructor === Array || arr instanceof Array) { + var iPromise = evaluate(exp.left.property, workerScript); + iPromise.then(function(idx) { + if (isNaN(idx)) { + return reject(makeRuntimeRejectMsg(workerScript, "Invalid access to array. Index is not a number: " + idx)); + } else if (idx >= arr.length || idx < 0) { + return reject(makeRuntimeRejectMsg(workerScript, "Out of bounds: Invalid index in [] operator")); + } else { + env.setArrayElement(name, idx, expRight); + } + }).catch(function(e) { + return reject(e); + }); + } else { + return reject(makeRuntimeRejectMsg(workerScript, "Trying to access a non-array variable using the [] operator")); + } + } else { + //Other assignments + try { + switch (exp.operator) { + case "=": + env.set(exp.left.name,expRight); + break; + case "+=": + env.set(exp.left.name,env.get(exp.left.name) + expRight); + break; + case "-=": + env.set(exp.left.name,env.get(exp.left.name) - expRight); + break; + case "*=": + env.set(exp.left.name,env.get(exp.left.name) * expRight); + break; + case "/=": + env.set(exp.left.name,env.get(exp.left.name) / expRight); + break; + case "%=": + env.set(exp.left.name,env.get(exp.left.name) % expRight); + break; + default: + reject(makeRuntimeRejectMsg(workerScript, "Bitwise assignment is not implemented")); + } + } catch (e) { + return reject(makeRuntimeRejectMsg(workerScript, "Failed to set environment variable: " + e.toString())); } - } catch (e) { - return reject(makeRuntimeRejectMsg(workerScript, "Failed to set environment variable: " + e.toString())); } resolve(false); //Return false so this doesnt cause conditionals to evaluate }, function(e) { @@ -499,7 +534,9 @@ function evaluateWhile(exp, workerScript) { }); } +/* function evaluateHacknetNode(exp, workerScript) { + console.log("here"); var env = workerScript.env; return new Promise(function(resolve, reject) { setTimeout(function() { @@ -602,6 +639,7 @@ function evaluateHacknetNode(exp, workerScript) { reject(e); }); } +*/ function evaluateProg(exp, workerScript, index) { var env = workerScript.env; @@ -680,43 +718,41 @@ function apply_op(op, a, b) { //Run a script from inside a script using run() command function runScriptFromScript(server, scriptname, args, workerScript, threads=1) { - setTimeout(function() { - //Check if the script is already running - var runningScriptObj = findRunningScript(scriptname, args, server); - if (runningScriptObj != null) { - workerScript.scriptRef.log(scriptname + " is already running on " + server.hostname); - return false; - } + //Check if the script is already running + var runningScriptObj = findRunningScript(scriptname, args, server); + if (runningScriptObj != null) { + workerScript.scriptRef.log(scriptname + " is already running on " + server.hostname); + return Promise.resolve(false); + } - //Check if the script exists and if it does run it - for (var i = 0; i < server.scripts.length; ++i) { - if (server.scripts[i].filename == scriptname) { - //Check for admin rights and that there is enough RAM availble to run - var script = server.scripts[i]; - var ramUsage = script.ramUsage; - ramUsage = ramUsage * threads * Math.pow(CONSTANTS.MultithreadingRAMCost, threads-1); - var ramAvailable = server.maxRam - server.ramUsed; + //Check if the script exists and if it does run it + for (var i = 0; i < server.scripts.length; ++i) { + if (server.scripts[i].filename == scriptname) { + //Check for admin rights and that there is enough RAM availble to run + var script = server.scripts[i]; + var ramUsage = script.ramUsage; + ramUsage = ramUsage * threads * Math.pow(CONSTANTS.MultithreadingRAMCost, threads-1); + var ramAvailable = server.maxRam - server.ramUsed; - if (server.hasAdminRights == false) { - workerScript.scriptRef.log("Cannot run script " + scriptname + " on " + server.hostname + " because you do not have root access!"); - return false; - } else if (ramUsage > ramAvailable){ - workerScript.scriptRef.log("Cannot run script " + scriptname + "(t=" + threads + ") on " + server.hostname + " because there is not enough available RAM!"); - return false; - } else { - //Able to run script - workerScript.scriptRef.log("Running script: " + scriptname + " on " + server.hostname + " with " + threads + " threads and args: " + printArray(args) + ". May take a few seconds to start up..."); - var runningScriptObj = new RunningScript(script, args); - runningScriptObj.threads = threads; - server.runningScripts.push(runningScriptObj); //Push onto runningScripts - addWorkerScript(runningScriptObj, server); - return true; - } + if (server.hasAdminRights == false) { + workerScript.scriptRef.log("Cannot run script " + scriptname + " on " + server.hostname + " because you do not have root access!"); + return Promise.resolve(false); + } else if (ramUsage > ramAvailable){ + workerScript.scriptRef.log("Cannot run script " + scriptname + "(t=" + threads + ") on " + server.hostname + " because there is not enough available RAM!"); + return Promise.resolve(false); + } else { + //Able to run script + workerScript.scriptRef.log("Running script: " + scriptname + " on " + server.hostname + " with " + threads + " threads and args: " + printArray(args) + ". May take a few seconds to start up..."); + var runningScriptObj = new RunningScript(script, args); + runningScriptObj.threads = threads; + server.runningScripts.push(runningScriptObj); //Push onto runningScripts + addWorkerScript(runningScriptObj, server); + return Promise.resolve(true); } } - workerScript.scriptRef.log("Could not find script " + scriptname + " on " + server.hostname); - resolve(false); - }, CONSTANTS.CodeInstructionRunTime); + } + workerScript.scriptRef.log("Could not find script " + scriptname + " on " + server.hostname); + return Promise.resolve(false); } function isScriptErrorMessage(msg) { diff --git a/src/NetscriptFunctions.js b/src/NetscriptFunctions.js index 1d55ff4be..0a635c6e9 100644 --- a/src/NetscriptFunctions.js +++ b/src/NetscriptFunctions.js @@ -25,7 +25,8 @@ function NetscriptFunctions(workerScript) { if (isNaN(threads) || threads < 1) {threads = 1;} var server = getServer(ip); if (server == null) { - throw workerScript.scriptRef.log("hack() error. Invalid IP or hostname passed in: " + ip + ". Stopping..."); + workerScript.scriptRef.log("hack() error. Invalid IP or hostname passed in: " + ip + ". Stopping..."); + throw makeRuntimeRejectMsg(workerScript, "hack() error. Invalid IP or hostname passed in: " + ip + ". Stopping..."); } //Calculate the hacking time @@ -33,11 +34,13 @@ function NetscriptFunctions(workerScript) { //No root access or skill level too low if (server.hasAdminRights == false) { - throw workerScript.scriptRef.log("Cannot hack this server (" + server.hostname + ") because user does not have root access"); + workerScript.scriptRef.log("Cannot hack this server (" + server.hostname + ") because user does not have root access"); + throw makeRuntimeRejectMsg(workerScript, "Cannot hack this server (" + server.hostname + ") because user does not have root access"); } if (server.requiredHackingSkill > Player.hacking_skill) { - throw workerScript.scriptRef.log("Cannot hack this server (" + server.hostname + ") because user's hacking skill is not high enough"); + workerScript.scriptRef.log("Cannot hack this server (" + server.hostname + ") because user's hacking skill is not high enough"); + throw makeRuntimeRejectMsg(workerScript, "Cannot hack this server (" + server.hostname + ") because user's hacking skill is not high enough"); } workerScript.scriptRef.log("Attempting to hack " + ip + " in " + hackingTime.toFixed(3) + " seconds (t=" + threads + ")"); @@ -84,8 +87,8 @@ function NetscriptFunctions(workerScript) { if (time === undefined) { throw makeRuntimeRejectMsg(workerScript, "sleep() call has incorrect number of arguments. Takes 1 argument"); } - workerScript.scriptRef.log("Sleeping for " + sleepTime + " milliseconds"); - return netscriptDelay(sleepTime).then(function() { + workerScript.scriptRef.log("Sleeping for " + time + " milliseconds"); + return netscriptDelay(time).then(function() { return Promise.resolve(true); }); }, @@ -97,12 +100,14 @@ function NetscriptFunctions(workerScript) { } var server = getServer(ip); if (server == null) { - throw workerScript.scriptRef.log("Cannot grow(). Invalid IP or hostname passed in: " + ip); + workerScript.scriptRef.log("Cannot grow(). Invalid IP or hostname passed in: " + ip); + throw makeRuntimeRejectMsg(workerScript, "Cannot grow(). Invalid IP or hostname passed in: " + ip); } //No root access or skill level too low if (server.hasAdminRights == false) { - throw workerScript.scriptRef.log("Cannot grow this server (" + server.hostname + ") because user does not have root access"); + workerScript.scriptRef.log("Cannot grow this server (" + server.hostname + ") because user does not have root access"); + throw makeRuntimeRejectMsg(workerScript, "Cannot grow this server (" + server.hostname + ") because user does not have root access"); } var growTime = scriptCalculateGrowTime(server); @@ -133,12 +138,14 @@ function NetscriptFunctions(workerScript) { } var server = getServer(ip); if (server == null) { - throw workerScript.scriptRef.log("Cannot weaken(). Invalid IP or hostname passed in: " + ip); + workerScript.scriptRef.log("Cannot weaken(). Invalid IP or hostname passed in: " + ip); + throw makeRuntimeRejectMsg(workerScript, "Cannot weaken(). Invalid IP or hostname passed in: " + ip); } //No root access or skill level too low if (server.hasAdminRights == false) { - throw workerScript.scriptRef.log("Cannot weaken this server (" + server.hostname + ") because user does not have root access"); + workerScript.scriptRef.log("Cannot weaken this server (" + server.hostname + ") because user does not have root access"); + throw makeRuntimeRejectMsg(workerScript, "Cannot weaken this server (" + server.hostname + ") because user does not have root access"); } var weakenTime = scriptCalculateWeakenTime(server); @@ -169,7 +176,8 @@ function NetscriptFunctions(workerScript) { } var server = getServer(ip); if (server == null) { - throw workerScript.scriptRef.log("Cannot call " + programName + ". Invalid IP or hostname passed in: " + ip); + workerScript.scriptRef.log("Cannot call " + programName + ". Invalid IP or hostname passed in: " + ip); + throw makeRuntimeRejectMsg(workerScript, "Cannot call " + programName + ". Invalid IP or hostname passed in: " + ip); } if (server.openPortCount < server.numOpenPortsRequired) { throw makeRuntimeRejectMsg(workerScript, "Not enough ports opened to use NUKE.exe virus"); @@ -188,7 +196,8 @@ function NetscriptFunctions(workerScript) { } var server = getServer(ip); if (server == null) { - throw workerScript.scriptRef.log("Cannot call " + programName + ". Invalid IP or hostname passed in: " + ip); + workerScript.scriptRef.log("Cannot call " + programName + ". Invalid IP or hostname passed in: " + ip); + throw makeRuntimeRejectMsg(workerScript, "Cannot call " + programName + ". Invalid IP or hostname passed in: " + ip); } if (!server.sshPortOpen) { workerScript.scriptRef.log("Executed BruteSSH.exe virus on " + server.hostname + " to open SSH port (22)"); @@ -205,7 +214,8 @@ function NetscriptFunctions(workerScript) { } var server = getServer(ip); if (server == null) { - throw workerScript.scriptRef.log("Cannot call " + programName + ". Invalid IP or hostname passed in: " + ip); + workerScript.scriptRef.log("Cannot call " + programName + ". Invalid IP or hostname passed in: " + ip); + throw makeRuntimeRejectMsg(workerScript, "Cannot call " + programName + ". Invalid IP or hostname passed in: " + ip); } if (!server.ftpPortOpen) { workerScript.scriptRef.log("Executed FTPCrack.exe virus on " + server.hostname + " to open FTP port (21)"); @@ -222,7 +232,8 @@ function NetscriptFunctions(workerScript) { } var server = getServer(ip); if (server == null) { - throw workerScript.scriptRef.log("Cannot call " + programName + ". Invalid IP or hostname passed in: " + ip); + workerScript.scriptRef.log("Cannot call " + programName + ". Invalid IP or hostname passed in: " + ip); + throw makeRuntimeRejectMsg(workerScript, "Cannot call " + programName + ". Invalid IP or hostname passed in: " + ip); } if (!server.smtpPortOpen) { workerScript.scriptRef.log("Executed relaySMTP.exe virus on " + server.hostname + " to open SMTP port (25)"); @@ -239,7 +250,8 @@ function NetscriptFunctions(workerScript) { } var server = getServer(ip); if (server == null) { - throw workerScript.scriptRef.log("Cannot call " + programName + ". Invalid IP or hostname passed in: " + ip); + workerScript.scriptRef.log("Cannot call " + programName + ". Invalid IP or hostname passed in: " + ip); + throw makeRuntimeRejectMsg(workerScript, "Cannot call " + programName + ". Invalid IP or hostname passed in: " + ip); } if (!server.httpPortOpen) { workerScript.scriptRef.log("Executed HTTPWorm.exe virus on " + server.hostname + " to open HTTP port (80)"); @@ -256,7 +268,8 @@ function NetscriptFunctions(workerScript) { } var server = getServer(ip); if (server == null) { - throw workerScript.scriptRef.log("Cannot call " + programName + ". Invalid IP or hostname passed in: " + ip); + workerScript.scriptRef.log("Cannot call " + programName + ". Invalid IP or hostname passed in: " + ip); + throw makeRuntimeRejectMsg(workerScript, "Cannot call " + programName + ". Invalid IP or hostname passed in: " + ip); } if (!server.sqlPortOpen) { workerScript.scriptRef.log("Executed SQLInject.exe virus on " + server.hostname + " to open SQL port (1433)"); @@ -267,13 +280,17 @@ function NetscriptFunctions(workerScript) { } return true; }, - run : function(scriptname,threads = 1,argsForNewScript=[]){ + run : function(scriptname,threads = 1){ if (scriptname === undefined) { throw makeRuntimeRejectMsg(workerScript, "run() call has incorrect number of arguments. Usage: run(scriptname, [numThreads], [arg1], [arg2]...)"); } if (isNaN(threads) || threads < 1) { throw makeRuntimeRejectMsg(workerScript, "Invalid argument for thread count passed into run(). Must be numeric and greater than 0"); } + var argsForNewScript = []; + for (var i = 2; i < arguments.length; ++i) { + argsForNewScript.push(arguments[i]); + } var scriptServer = getServer(workerScript.serverIp); if (scriptServer == null) { throw makeRuntimeRejectMsg(workerScript, "Could not find server. This is a bug in the game. Report to game dev"); @@ -281,27 +298,35 @@ function NetscriptFunctions(workerScript) { return runScriptFromScript(scriptServer, scriptname, argsForNewScript, workerScript, threads); }, - exec : function(scriptname,ip,threads = 1,argsForNewScript=[]){ + exec : function(scriptname,ip,threads = 1){ if (scriptname === undefined || ip === undefined) { throw makeRuntimeRejectMsg(workerScript, "exec() call has incorrect number of arguments. Usage: exec(scriptname, server, [numThreads], [arg1], [arg2]...)"); } if (isNaN(threads) || threads < 1) { throw makeRuntimeRejectMsg(workerScript, "Invalid argument for thread count passed into exec(). Must be numeric and greater than 0"); } + var argsForNewScript = []; + for (var i = 3; i < arguments.length; ++i) { + argsForNewScript.push(arguments[i]); + } var server = getServer(ip); if (server == null) { throw makeRuntimeRejectMsg(workerScript, "Invalid hostname/ip passed into exec() command: " + args[1]); } - return runScriptFromScript(server, scriptname, argsForNewScript, workerScript, threads); }, - kill : function(filename,ip,argsForKillTarget=[]){ + kill : function(filename,ip){ if (filename === undefined || ip === undefined) { throw makeRuntimeRejectMsg(workerScript, "kill() call has incorrect number of arguments. Usage: kill(scriptname, server, [arg1], [arg2]...)"); } var server = getServer(ip); if (server == null) { - throw workerScript.scriptRef.log("kill() failed. Invalid IP or hostname passed in: " + ip); + workerScript.scriptRef.log("kill() failed. Invalid IP or hostname passed in: " + ip); + throw makeRuntimeRejectMsg(workerScript, "kill() failed. Invalid IP or hostname passed in: " + ip); + } + var argsForKillTarget = []; + for (var i = 2; i < arguments.length; ++i) { + argsForKillTarget.push(arguments[i]); } var runningScriptObj = findRunningScript(filename, argsForKillTarget, server); if (runningScriptObj == null) { @@ -323,7 +348,8 @@ function NetscriptFunctions(workerScript) { } var server = getServer(ip); if (server == null) { - throw workerScript.scriptRef.log("killall() failed. Invalid IP or hostname passed in: " + ip); + workerScript.scriptRef.log("killall() failed. Invalid IP or hostname passed in: " + ip); + throw makeRuntimeRejectMsg(workerScript, "killall() failed. Invalid IP or hostname passed in: " + ip); } for (var i = server.runningScripts.length-1; i >= 0; --i) { killWorkerScript(server.runningScripts[i], server.ip); @@ -380,14 +406,15 @@ function NetscriptFunctions(workerScript) { return true; }, hasRootAccess : function(ip){ - if (ip===undefinied){ + if (ip===undefined){ throw makeRuntimeRejectMsg(workerScript, "hasRootAccess() call has incorrect number of arguments. Takes 1 argument"); } var server = getServer(ip); if (server == null){ - throw workerScript.scriptRef.log("hasRootAccess() failed. Invalid IP or hostname passed in: " + ip); + workerScript.scriptRef.log("hasRootAccess() failed. Invalid IP or hostname passed in: " + ip); + throw makeRuntimeRejectMsg(workerScript, "hasRootAccess() failed. Invalid IP or hostname passed in: " + ip); } - return server.hasAdimRights; + return server.hasAdminRights; }, getHostname : function(){ var scriptServer = getServer(workerScript.serverIp); @@ -404,7 +431,13 @@ function NetscriptFunctions(workerScript) { getServerMoneyAvailable : function(ip){ var server = getServer(ip); if (server == null) { - throw workerScript.scriptRef.log("Cannot getServerMoneyAvailable(). Invalid IP or hostname passed in: " + ip); + workerScript.scriptRef.log("Cannot getServerMoneyAvailable(). Invalid IP or hostname passed in: " + ip); + throw makeRuntimeRejectMsg(workerScript, "Cannot getServerMoneyAvailable(). Invalid IP or hostname passed in: " + ip); + } + if (server.hostname == "home") { + //Return player's money + workerScript.scriptRef.log("getServerMoneyAvailable('home') returned player's money: $" + formatNumber(Player.money, 2)); + return Player.money; } workerScript.scriptRef.log("getServerMoneyAvailable() returned " + formatNumber(server.moneyAvailable, 2) + " for " + server.hostname); return server.moneyAvailable; @@ -412,7 +445,8 @@ function NetscriptFunctions(workerScript) { getServerSecurityLevel : function(ip){ var server = getServer(ip); if (server == null) { - throw workerScript.scriptRef.log("getServerSecurityLevel() failed. Invalid IP or hostname passed in: " + ip); + workerScript.scriptRef.log("getServerSecurityLevel() failed. Invalid IP or hostname passed in: " + ip); + throw makeRuntimeRejectMsg(workerScript, "getServerSecurityLevel() failed. Invalid IP or hostname passed in: " + ip); } workerScript.scriptRef.log("getServerSecurityLevel() returned " + formatNumber(server.hackDifficulty, 3) + " for " + server.hostname); return server.hackDifficulty; @@ -420,7 +454,8 @@ function NetscriptFunctions(workerScript) { getServerBaseSecurityLevel : function(ip){ var server = getServer(ip); if (server == null) { - throw workerScript.scriptRef.log("getServerBaseSecurityLevel() failed. Invalid IP or hostname passed in: " + ip); + workerScript.scriptRef.log("getServerBaseSecurityLevel() failed. Invalid IP or hostname passed in: " + ip); + throw makeRuntimeRejectMsg(workerScript, "getServerBaseSecurityLevel() failed. Invalid IP or hostname passed in: " + ip); } workerScript.scriptRef.log("getServerBaseSecurityLevel() returned " + formatNumber(server.baseDifficulty, 3) + " for " + server.hostname); return server.baseDifficulty; @@ -428,7 +463,8 @@ function NetscriptFunctions(workerScript) { getServerRequiredHackingLevel : function(ip){ var server = getServer(ip); if (server == null) { - throw workerScript.scriptRef.log("getServerRequiredHackingLevel() failed. Invalid IP or hostname passed in: " + ip); + workerScript.scriptRef.log("getServerRequiredHackingLevel() failed. Invalid IP or hostname passed in: " + ip); + throw makeRuntimeRejectMsg(workerScript, "getServerRequiredHackingLevel() failed. Invalid IP or hostname passed in: " + ip); } workerScript.scriptRef.log("getServerRequiredHackingLevel returned " + formatNumber(server.requiredHackingSkill, 0) + " for " + server.hostname); return server.requiredHackingSkill; @@ -436,40 +472,183 @@ function NetscriptFunctions(workerScript) { getServerMaxMoney : function(ip){ var server = getServer(ip); if (server == null) { - throw workerScript.scriptRef.log("getServerRequiredHackingLevel() failed. Invalid IP or hostname passed in: " + ip); + workerScript.scriptRef.log("getServerRequiredHackingLevel() failed. Invalid IP or hostname passed in: " + ip); + throw makeRuntimeRejectMsg(workerScript, "getServerRequiredHackingLevel() failed. Invalid IP or hostname passed in: " + ip); } workerScript.scriptRef.log("getServerMaxMoney() returned " + formatNumber(server.moneyMax, 0) + " for " + server.hostname); return server.moneyMax; }, + getServerNumPortsRequired : function(ip){ + var server = getServer(ip); + if (server == null) { + workerScript.scriptRef.log("getServerNumPortsRequired() failed. Invalid IP or hostname passed in: " + ip); + throw makeRuntimeRejectMsg(workerScript, "getServerNumPortsRequired() failed. Invalid IP or hostname passed in: " + ip); + } + workerScript.scriptRef.log("getServerNumPortsRequired() returned " + formatNumber(server.numOpenPortsRequired, 0) + " for " + server.hostname); + return server.numOpenPortsRequired; + }, fileExists : function(filename,ip=workerScript.serverIp){ if (filename === undefined) { throw makeRuntimeRejectMsg(workerScript, "fileExists() call has incorrect number of arguments. Usage: fileExists(scriptname, [server])"); } var server = getServer(ip); if (server == null) { - throw workerScript.scriptRef.log("fileExists() failed. Invalid IP or hostname passed in: " + ip); + workerScript.scriptRef.log("fileExists() failed. Invalid IP or hostname passed in: " + ip); + throw makeRuntimeRejectMsg(workerScript, "fileExists() failed. Invalid IP or hostname passed in: " + ip); } for (var i = 0; i < server.scripts.length; ++i) { if (filename == server.scripts[i].filename) { return true; } } - if (Player.hasProgram(filename)) { - return true; //wrong? + for (var i = 0; i < server.programs.length; ++i) { + if (filename.toLowerCase() == server.programs[i].toLowerCase()) { + return true; + } } return false; }, - isRunning : function(filename,ip,argsForTargetScript=[]){ + isRunning : function(filename,ip){ if (filename === undefined || ip === undefined) { throw makeRuntimeRejectMsg(workerScript, "isRunning() call has incorrect number of arguments. Usage: isRunning(scriptname, server, [arg1], [arg2]...)"); } var server = getServer(ip); if (server == null) { - throw workerScript.scriptRef.log("isRunning() failed. Invalid IP or hostname passed in: " + ip); + workerScript.scriptRef.log("isRunning() failed. Invalid IP or hostname passed in: " + ip); + throw makeRuntimeRejectMsg(workerScript, "isRunning() failed. Invalid IP or hostname passed in: " + ip); } - return findRunningScript(filename, argsForTargetScript, server) != null; + var argsForTargetScript = []; + for (var i = 2; i < arguments.length; ++i) { + argsForTargetScript.push(arguments[i]); + } + return (findRunningScript(filename, argsForTargetScript, server) != null); }, - purchaseHacknetNode : purchaseHacknet + purchaseHacknetNode : purchaseHacknet, + getStockPrice : function(symbol) { + if (!Player.hasTixApiAccess) { + throw makeRuntimeRejectMsg(workerScript, "You don't have TIX API Access! Cannot use getStockPrice()"); + } + var stock = SymbolToStockMap[symbol]; + if (stock == null) { + throw makeRuntimeRejectMsg(workerScript, "Invalid stock symbol passed into getStockPrice()"); + } + return parseFloat(stock.price.toFixed(3)); + }, + getStockPosition : function(symbol) { + if (!Player.hasTixApiAccess) { + throw makeRuntimeRejectMsg(workerScript, "You don't have TIX API Access! Cannot use getStockPosition()"); + } + var stock = SymbolToStockMap[symbol]; + if (stock == null) { + throw makeRuntimeRejectMsg(workerScript, "Invalid stock symbol passed into getStockPrice()"); + } + return [stock.playerShares, stock.playerAvgPx]; + }, + buyStock : function(symbol, shares) { + if (!Player.hasTixApiAccess) { + throw makeRuntimeRejectMsg(workerScript, "You don't have TIX API Access! Cannot use buyStock()"); + } + var stock = SymbolToStockMap[symbol]; + if (stock == null) { + throw makeRuntimeRejectMsg(workerScript, "Invalid stock symbol passed into getStockPrice()"); + } + if (shares == 0) {return false;} + if (stock == null || shares < 0 || isNaN(shares)) { + workerScript.scriptRef.log("Error: Invalid 'shares' argument passed to buyStock()"); + return false; + } + shares = Math.round(shares); + + var totalPrice = stock.price * shares; + if (Player.money < totalPrice + CONSTANTS.StockMarketCommission) { + workerScript.scriptRef.log("Not enough money to purchase " + formatNumber(shares, 0) + " shares of " + + symbol + ". Need $" + + formatNumber(totalPrice + CONSTANTS.StockMarketCommission, 2).toString()); + return false; + } + + var origTotal = stock.playerShares * stock.playerAvgPx; + Player.loseMoney(totalPrice + CONSTANTS.StockMarketCommission); + var newTotal = origTotal + totalPrice; + stock.playerShares += shares; + stock.playerAvgPx = newTotal / stock.playerShares; + if (Engine.currentPage == Engine.Page.StockMarket) { + updateStockPlayerPosition(stock); + } + workerScript.scriptRef.log("Bought " + formatNumber(shares, 0) + " shares of " + stock.symbol + " at $" + + formatNumber(stock.price, 2) + " per share"); + return true; + }, + sellStock : function(symbol, shares) { + if (!Player.hasTixApiAccess) { + throw makeRuntimeRejectMsg(workerScript, "You don't have TIX API Access! Cannot use sellStock()"); + } + var stock = SymbolToStockMap[symbol]; + if (stock == null) { + throw makeRuntimeRejectMsg(workerScript, "Invalid stock symbol passed into getStockPrice()"); + } + if (shares == 0) {return false;} + if (stock == null || shares < 0 || isNaN(shares)) { + workerScript.scriptRef.log("Error: Invalid 'shares' argument passed to sellStock()"); + return false; + } + if (shares > stock.playerShares) {shares = stock.playerShares;} + if (shares == 0) {return false;} + var gains = stock.price * shares - CONSTANTS.StockMarketCommission; + Player.gainMoney(gains); + + //Calculate net profit and add to script stats + var netProfit = ((stock.price - stock.playerAvgPx) * shares) - CONSTANTS.StockMarketCommission; + if (isNaN(netProfit)) {netProfit = 0;} + workerScript.scriptRef.onlineMoneyMade += netProfit; + + stock.playerShares -= shares; + if (stock.playerShares == 0) { + stock.playerAvgPx = 0; + } + if (Engine.currentPage == Engine.Page.StockMarket) { + updateStockPlayerPosition(stock); + } + workerScript.scriptRef.log("Sold " + formatNumber(shares, 0) + " shares of " + stock.symbol + " at $" + + formatNumber(stock.price, 2) + " per share. Gained " + + "$" + formatNumber(gains, 2)); + return true; + }, + purchaseServer : function(hostname, ram) { + var hostnameStr = String(hostname); + hostnameStr = hostnameStr.replace(/\s\s+/g, ''); + if (hostnameStr == "") { + workerScript.scriptRef.log("Error: Passed empty string for hostname argument of purchaseServer()"); + return ""; + } + + ram = Math.round(ram); + if (isNaN(ram) || !powerOfTwo(ram)) { + workerScript.scriptRef.log("Error: Invalid ram argument passed to purchaseServer(). Must be numeric and a power of 2"); + return ""; + } + + var cost = 2 * ram * CONSTANTS.BaseCostFor1GBOfRamServer; + if (cost > Player.money) { + workerScript.scriptRef.log("Error: Not enough money to purchase server. Need $" + formatNumber(cost, 2)); + return ""; + } + var newServ = new Server(); + newServ.init(createRandomIp(), hostnameStr, "", true, false, true, true, ram); + AddToAllServers(newServ); + + Player.purchasedServers.push(newServ.ip); + var homeComputer = Player.getHomeComputer(); + homeComputer.serversOnNetwork.push(newServ.ip); + newServ.serversOnNetwork.push(homeComputer.ip); + Player.loseMoney(cost); + workerScript.scriptRef.log("Purchased new server with hostname " + newServ.hostname + " for $" + formatNumber(cost, 2)); + return newServ.hostname; + }, + round : function(n) { + if (isNaN(n)) {return 0;} + return Math.round(n); + } } } diff --git a/src/Script.js b/src/Script.js index 211e9bd4d..bdcaa0690 100644 --- a/src/Script.js +++ b/src/Script.js @@ -33,6 +33,18 @@ function scriptEditorInit() { }; document.addEventListener("DOMContentLoaded", scriptEditorInit, false); +//Updates line number and RAM usage in script +function upgradeScriptEditorContent() { + var txt = $("#script-editor-text")[0]; + var lineNum = txt.value.substr(0, txt.selectionStart).split("\n").length; + + var code = document.getElementById("script-editor-text").value; + var codeCopy = code.repeat(1); + var ramUsage = calculateRamUsage(codeCopy); + document.getElementById("script-editor-status-text").innerText = + "Line Number: " + lineNum + ", RAM: " + formatNumber(ramUsage, 2).toString() + "GB"; +} + //Define key commands in script editor (ctrl o to save + close, etc.) $(document).keydown(function(e) { if (Engine.currentPage == Engine.Page.ScriptEditor) { @@ -126,10 +138,17 @@ Script.prototype.saveScript = function() { //Updates how much RAM the script uses when it is running. Script.prototype.updateRamUsage = function() { - var baseRam = 1.4; var codeCopy = this.code.repeat(1); + this.ramUsage = calculateRamUsage(codeCopy); + console.log("ram usage: " + this.ramUsage); + if (isNaN(this.ramUsage)) { + dialogBoxCreate("ERROR in calculating ram usage. This is a bug, please report to game develoepr"); + } +} + +function calculateRamUsage(codeCopy) { codeCopy = codeCopy.replace(/\s/g,''); //Remove all whitespace - + var baseRam = 1.4; var whileCount = numOccurrences(codeCopy, "while("); var forCount = numOccurrences(codeCopy, "for("); var ifCount = numOccurrences(codeCopy, "if("); @@ -150,6 +169,7 @@ Script.prototype.updateRamUsage = function() { var getHostnameCount = numOccurrences(codeCopy, "getHostname("); var getHackingLevelCount = numOccurrences(codeCopy, "getHackingLevel("); var getServerMoneyAvailableCount = numOccurrences(codeCopy, "getServerMoneyAvailable("); + var getServerMaxMoneyCount = numOccurrences(codeCopy, "getServerMaxMoney("); var getServerSecurityCount = numOccurrences(codeCopy, "getServerSecurityLevel("); var getServerBaseSecurityCount = numOccurrences(codeCopy, "getServerBaseSecurityLevel("); var getServerReqdHackingCount = numOccurrences(codeCopy, "getServerRequiredHackingLevel("); @@ -161,43 +181,50 @@ Script.prototype.updateRamUsage = function() { var hnUpgLevelCount = numOccurrences(codeCopy, ".upgradeLevel("); var hnUpgRamCount = numOccurrences(codeCopy, ".upgradeRam()"); var hnUpgCoreCount = numOccurrences(codeCopy, ".upgradeCore()"); + var scriptGetStockCount = numOccurrences(codeCopy, "getStockPrice(") + + numOccurrences(codeCopy, "getStockPosition("); + var scriptBuySellStockCount = numOccurrences(codeCopy, "buyStock(") + + numOccurrences(codeCopy, "sellStock("); + var scriptPurchaseServerCount = numOccurrences(codeCopy, "purchaseServer("); + var scriptRoundCount = numOccurrences(codeCopy, "round("); - this.ramUsage = baseRam + - ((whileCount * CONSTANTS.ScriptWhileRamCost) + - (forCount * CONSTANTS.ScriptForRamCost) + - (ifCount * CONSTANTS.ScriptIfRamCost) + - (hackCount * CONSTANTS.ScriptHackRamCost) + - (growCount * CONSTANTS.ScriptGrowRamCost) + - (weakenCount * CONSTANTS.ScriptWeakenRamCost) + - (scanCount * CONSTANTS.ScriptScanRamCost) + - (nukeCount * CONSTANTS.ScriptNukeRamCost) + - (brutesshCount * CONSTANTS.ScriptBrutesshRamCost) + - (ftpcrackCount * CONSTANTS.ScriptFtpcrackRamCost) + - (relaysmtpCount * CONSTANTS.ScriptRelaysmtpRamCost) + - (httpwormCount * CONSTANTS.ScriptHttpwormRamCost) + - (sqlinjectCount * CONSTANTS.ScriptSqlinjectRamCost) + - (runCount * CONSTANTS.ScriptRunRamCost) + - (execCount * CONSTANTS.ScriptExecRamCost) + - (scpCount * CONSTANTS.ScriptScpRamCost) + - (hasRootAccessCount * CONSTANTS.ScriptHasRootAccessRamCost) + - (getHostnameCount * CONSTANTS.ScriptGetHostnameRamCost) + - (getHackingLevelCount * CONSTANTS.ScriptGetHackingLevelRamCost) + - (getServerMoneyAvailableCount * CONSTANTS.ScriptGetServerMoneyRamCost) + - (getServerSecurityCount * CONSTANTS.ScriptGetServerSecurityRamCost) + - (getServerBaseSecurityCount * CONSTANTS.ScriptGetServerSecurityRamCost) + - (getServerReqdHackingCount * CONSTANTS.ScriptGetServerReqdHackRamCost) + - (fileExistsCount * CONSTANTS.ScriptFileExistsRamCost) + - (isRunningCount * CONSTANTS.ScriptIsRunningRamCost) + - (numOperators * CONSTANTS.ScriptOperatorRamCost) + - (purchaseHacknetCount * CONSTANTS.ScriptPurchaseHacknetRamCost) + - (hacknetnodesArrayCount * CONSTANTS.ScriptHacknetNodesRamCost) + - (hnUpgLevelCount * CONSTANTS.ScriptHNUpgLevelRamCost) + - (hnUpgRamCount * CONSTANTS.ScriptHNUpgRamRamCost) + - (hnUpgCoreCount * CONSTANTS.ScriptHNUpgCoreRamCost)); - console.log("ram usage: " + this.ramUsage); - if (isNaN(this.ramUsage)) { - dialogBoxCreate("ERROR in calculating ram usage. This is a bug, please report to game develoepr"); - } + return baseRam + + ((whileCount * CONSTANTS.ScriptWhileRamCost) + + (forCount * CONSTANTS.ScriptForRamCost) + + (ifCount * CONSTANTS.ScriptIfRamCost) + + (hackCount * CONSTANTS.ScriptHackRamCost) + + (growCount * CONSTANTS.ScriptGrowRamCost) + + (weakenCount * CONSTANTS.ScriptWeakenRamCost) + + (scanCount * CONSTANTS.ScriptScanRamCost) + + (nukeCount * CONSTANTS.ScriptNukeRamCost) + + (brutesshCount * CONSTANTS.ScriptBrutesshRamCost) + + (ftpcrackCount * CONSTANTS.ScriptFtpcrackRamCost) + + (relaysmtpCount * CONSTANTS.ScriptRelaysmtpRamCost) + + (httpwormCount * CONSTANTS.ScriptHttpwormRamCost) + + (sqlinjectCount * CONSTANTS.ScriptSqlinjectRamCost) + + (runCount * CONSTANTS.ScriptRunRamCost) + + (execCount * CONSTANTS.ScriptExecRamCost) + + (scpCount * CONSTANTS.ScriptScpRamCost) + + (hasRootAccessCount * CONSTANTS.ScriptHasRootAccessRamCost) + + (getHostnameCount * CONSTANTS.ScriptGetHostnameRamCost) + + (getHackingLevelCount * CONSTANTS.ScriptGetHackingLevelRamCost) + + (getServerMoneyAvailableCount * CONSTANTS.ScriptGetServerMoneyRamCost) + + (getServerMaxMoneyCount * CONSTANTS.ScriptGetServerMoneyRamCost) + + (getServerSecurityCount * CONSTANTS.ScriptGetServerSecurityRamCost) + + (getServerBaseSecurityCount * CONSTANTS.ScriptGetServerSecurityRamCost) + + (getServerReqdHackingCount * CONSTANTS.ScriptGetServerReqdHackRamCost) + + (fileExistsCount * CONSTANTS.ScriptFileExistsRamCost) + + (isRunningCount * CONSTANTS.ScriptIsRunningRamCost) + + (numOperators * CONSTANTS.ScriptOperatorRamCost) + + (purchaseHacknetCount * CONSTANTS.ScriptPurchaseHacknetRamCost) + + (hacknetnodesArrayCount * CONSTANTS.ScriptHacknetNodesRamCost) + + (hnUpgLevelCount * CONSTANTS.ScriptHNUpgLevelRamCost) + + (hnUpgRamCount * CONSTANTS.ScriptHNUpgRamRamCost) + + (hnUpgCoreCount * CONSTANTS.ScriptHNUpgCoreRamCost) + + (scriptGetStockCount * CONSTANTS.ScriptGetStockRamCost) + + (scriptBuySellStockCount * CONSTANTS.ScriptBuySellStockRamCost) + + (scriptPurchaseServerCount * CONSTANTS.ScriptPurchaseServerRamCost) + + (scriptRoundCount * CONSTANTS.ScriptRoundRamCost)); } Script.prototype.toJSON = function() { diff --git a/src/StockMarket.js b/src/StockMarket.js index d2b4c97c6..f102ea1c9 100644 --- a/src/StockMarket.js +++ b/src/StockMarket.js @@ -225,10 +225,20 @@ function initSymbolToStockMap() { } } +function stockMarketCycle() { + console.log("Cycling the Stock Market"); + for (var name in StockMarket) { + if (StockMarket.hasOwnProperty(name)) { + var stock = StockMarket[name]; + stock.b = !stock.b; + } + } +} + //Returns true if successful, false otherwise function buyStock(stock, shares) { if (shares == 0) {return false;} - if (stock == null || shares < 0) { + if (stock == null || shares < 0 || isNaN(shares)) { dialogBoxCreate("Failed to buy stock. This may be a bug, contact developer"); return false; } @@ -257,7 +267,7 @@ function buyStock(stock, shares) { //Returns true if successful and false otherwise function sellStock(stock, shares) { if (shares == 0) {return false;} - if (stock == null || shares < 0) { + if (stock == null || shares < 0 || isNaN(shares)) { dialogBoxCreate("Failed to sell stock. This may be a bug, contact developer"); return false; } @@ -328,8 +338,9 @@ function displayStockMarketContent() { if (Player.hasWseAccount == null) {Player.hasWseAccount = false;} if (Player.hasTixApiAccess == null) {Player.hasTixApiAccess = false;} + //Purchase WSE Account button var wseAccountButton = clearEventListeners("stock-market-buy-account"); - wseAccountButton.innerText = "Buy WSE Account - $" + formatNumber(CONSTANTS.WSEAccountCost, 2).toString() + wseAccountButton.innerText = "Buy WSE Account - $" + formatNumber(CONSTANTS.WSEAccountCost, 2).toString(); if (!Player.hasWseAccount && Player.money >= CONSTANTS.WSEAccountCost) { wseAccountButton.setAttribute("class", "a-link-button"); } else { @@ -343,6 +354,22 @@ function displayStockMarketContent() { return false; }); + //Purchase TIX API Access account + var tixApiAccessButton = clearEventListeners("stock-market-buy-tix-api"); + tixApiAccessButton.innerText = "Buy Trade Information eXchange (TIX) API Access - $" + + formatNumber(CONSTANTS.TIXAPICost, 2).toString(); + if (!Player.hasTixApiAccess && Player.money >= CONSTANTS.TIXAPICost) { + tixApiAccessButton.setAttribute("class", "a-link-button"); + } else { + tixApiAccessButton.setAttribute("class", "a-link-button-inactive"); + } + tixApiAccessButton.addEventListener("click", function() { + Player.hasTixApiAccess = true; + Player.loseMoney(CONSTANTS.TIXAPICost); + displayStockMarketContent(); + return false; + }); + var stockList = document.getElementById("stock-market-list"); if (stockList == null) {return;} diff --git a/src/engine.js b/src/engine.js index ee4592bb1..15f8ad3fd 100644 --- a/src/engine.js +++ b/src/engine.js @@ -116,6 +116,7 @@ var Engine = { document.getElementById("script-editor-text").value = code; } document.getElementById("script-editor-text").focus(); + upgradeScriptEditorContent(); Engine.currentPage = Engine.Page.ScriptEditor; }, @@ -568,7 +569,9 @@ var Engine = { checkFactionInvitations: 100, //Check whether you qualify for any faction invitations every 5 minutes passiveFactionGrowth: 600, messages: 300, - stockTick: 50, //Update stock prices + stockTick: 30, //Update stock prices + sCr: 1500, + updateScriptEditorDisplay: 5, }, decrementAllCounters: function(numCycles = 1) { @@ -648,7 +651,32 @@ var Engine = { if (Player.hasWseAccount) { updateStockPrices(); } - Engine.Counters.stockTick = 50; + Engine.Counters.stockTick = 30; + } + + if (Engine.Counters.sCr <= 0) { + //Assume 4Sig will always indicate state of market + if (Player.hasWseAccount) { + console.log("Determining stock market cycle"); + var thresh = 0.66; + var stock = StockMarket[Locations.Sector12FourSigma]; + if (stock == null) { + console.log("ERR: Could not find 4Sigma stock"); + return; + } + if (stock.b) {thresh = 0.34;} + if (Math.random() < thresh) { + stockMarketCycle(); + } + } + Engine.Counters.sCr = 1500; + } + + if (Engine.Counters.updateScriptEditorDisplay <= 0) { + if (Engine.currentPage == Engine.Page.ScriptEditor) { + upgradeScriptEditorContent(); + } + Engine.Counters.updateScriptEditorDisplay = 5; } }, diff --git a/utils/HelperFunctions.js b/utils/HelperFunctions.js index 0cc6c03d8..bd0f00d8c 100644 --- a/utils/HelperFunctions.js +++ b/utils/HelperFunctions.js @@ -50,4 +50,10 @@ function compareArrays(a1, a2) { function printArray(a) { return "[" + a.join(", ") + "]"; +} + +//Returns bool indicating whether or not its a power of 2 +function powerOfTwo(n) { + if (isNaN(n)) {return false;} + return n && (n & (n-1)) === 0; } \ No newline at end of file diff --git a/utils/IPAddress.js b/utils/IPAddress.js index 280437c85..3dc16c79c 100644 --- a/utils/IPAddress.js +++ b/utils/IPAddress.js @@ -3,10 +3,10 @@ //Generate a random IP address //Will not return an IP address that already exists in the AllServers array createRandomIp = function() { - var ip = createRandomByte() +'.' + - createRandomByte() +'.' + - createRandomByte() +'.' + - createRandomByte(); + var ip = createRandomByte(99) +'.' + + createRandomByte(9) +'.' + + createRandomByte(9) +'.' + + createRandomByte(9); //If the Ip already exists, recurse to create a new one if (ipExists(ip)) { @@ -27,8 +27,8 @@ ipExists = function(ip) { return false; } -createRandomByte = function() { - return Math.round(Math.random()*256); +createRandomByte = function(n=9) { + return Math.round(Math.random()*n); } isValidIPAddress = function(ipaddress) {