mirror of
https://github.com/bitburner-official/bitburner-src.git
synced 2024-12-20 05:05:47 +01:00
Wrap all the API
This commit is contained in:
parent
ae38b11ede
commit
972abcbdc8
@ -43,9 +43,14 @@ type NetscriptHelpers = {
|
||||
number: (funcName: string, argName: string, v: unknown) => number;
|
||||
city: (funcName: string, argName: string, v: unknown) => CityName;
|
||||
boolean: (v: unknown) => boolean;
|
||||
getServer: (hostname: string, callingFnName: string) => BaseServer;
|
||||
getServer: (hostname: string, ctx: NetscriptContext) => BaseServer;
|
||||
checkSingularityAccess: (func: string) => void;
|
||||
hack: (hostname: any, manual: any, { threads: requestedThreads, stock }?: any) => Promise<number>;
|
||||
hack: (
|
||||
ctx: NetscriptContext,
|
||||
hostname: any,
|
||||
manual: any,
|
||||
{ threads: requestedThreads, stock }?: any,
|
||||
) => Promise<number>;
|
||||
getValidPort: (funcName: string, port: any) => IPort;
|
||||
};
|
||||
|
||||
@ -88,7 +93,7 @@ function wrapFunction(
|
||||
number: (argName: string, v: unknown) => helpers.number(functionPath, argName, v),
|
||||
city: (argName: string, v: unknown) => helpers.city(functionPath, argName, v),
|
||||
boolean: helpers.boolean,
|
||||
getServer: (hostname: string) => helpers.getServer(hostname, functionPath),
|
||||
getServer: (hostname: string) => helpers.getServer(hostname, ctx),
|
||||
checkSingularityAccess: () => helpers.checkSingularityAccess(functionName),
|
||||
hack: helpers.hack,
|
||||
getValidPort: (port: any) => helpers.getValidPort(functionPath, port),
|
||||
|
@ -2,6 +2,7 @@ import { isString } from "./utils/helpers/isString";
|
||||
import { GetServer } from "./Server/AllServers";
|
||||
import { ScriptDeath } from "./Netscript/ScriptDeath";
|
||||
import { WorkerScript } from "./Netscript/WorkerScript";
|
||||
import { NetscriptContext } from "./Netscript/APIWrapper";
|
||||
|
||||
export function netscriptDelay(time: number, workerScript: WorkerScript): Promise<void> {
|
||||
// Cancel any pre-existing netscriptDelay'ed function call
|
||||
@ -36,26 +37,22 @@ export function makeRuntimeRejectMsg(workerScript: WorkerScript, msg: string): s
|
||||
return "|DELIMITER|" + server.hostname + "|DELIMITER|" + workerScript.name + "|DELIMITER|" + msg;
|
||||
}
|
||||
|
||||
export function resolveNetscriptRequestedThreads(
|
||||
workerScript: WorkerScript,
|
||||
functionName: string,
|
||||
requestedThreads: number,
|
||||
): number {
|
||||
const threads = workerScript.scriptRef.threads;
|
||||
export function resolveNetscriptRequestedThreads(ctx: NetscriptContext, requestedThreads: number): number {
|
||||
const threads = ctx.workerScript.scriptRef.threads;
|
||||
if (!requestedThreads) {
|
||||
return isNaN(threads) || threads < 1 ? 1 : threads;
|
||||
}
|
||||
const requestedThreadsAsInt = requestedThreads | 0;
|
||||
if (isNaN(requestedThreads) || requestedThreadsAsInt < 1) {
|
||||
throw makeRuntimeRejectMsg(
|
||||
workerScript,
|
||||
`Invalid thread count passed to ${functionName}: ${requestedThreads}. Threads must be a positive number.`,
|
||||
ctx.workerScript,
|
||||
`Invalid thread count passed to ${ctx.function}: ${requestedThreads}. Threads must be a positive number.`,
|
||||
);
|
||||
}
|
||||
if (requestedThreadsAsInt > threads) {
|
||||
throw makeRuntimeRejectMsg(
|
||||
workerScript,
|
||||
`Too many threads requested by ${functionName}. Requested: ${requestedThreads}. Has: ${threads}.`,
|
||||
ctx.workerScript,
|
||||
`Too many threads requested by ${ctx.function}. Requested: ${requestedThreads}. Has: ${threads}.`,
|
||||
);
|
||||
}
|
||||
return requestedThreadsAsInt;
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,6 @@
|
||||
import { CityName } from "src/Locations/data/CityNames";
|
||||
import { NetscriptContext } from "src/Netscript/APIWrapper";
|
||||
import { IPort } from "src/NetscriptPort";
|
||||
import { BaseServer } from "../Server/BaseServer";
|
||||
|
||||
export interface INetscriptHelper {
|
||||
@ -8,7 +10,8 @@ export interface INetscriptHelper {
|
||||
number(funcName: string, argName: string, v: unknown): number;
|
||||
city(funcName: string, argName: string, v: unknown): CityName;
|
||||
boolean(v: unknown): boolean;
|
||||
getServer(ip: any, fn: any): BaseServer;
|
||||
getServer(ip: any, ctx: NetscriptContext): BaseServer;
|
||||
checkSingularityAccess(func: string): void;
|
||||
hack(hostname: string, manual: boolean): Promise<number>;
|
||||
hack(ctx: NetscriptContext, hostname: string, manual: boolean): Promise<number>;
|
||||
getValidPort(funcName: string, port: number): IPort;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user