Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-09-19 20:38:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

API: Minor followup changes for #1059 (#1135)

Browse Source
This commit is contained in:
Snarling 2024-03-05 19:42:55 -05:00 committed by GitHub
parent 4aaf845fca
commit d61e12fdd1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Netscript/TypeAssertion.ts
View File

@ -26,3 +26,7 @@ export const debugType = (v: unknown): string => {
export function assertString(ctx: NetscriptContext, argName: string, v: unknown): asserts v is string {
if (typeof v !== "string") throw errorMessage(ctx, `${argName} expected to be a string. ${debugType(v)}`, "TYPE");
}
export function assertFunction(ctx: NetscriptContext, argName: string, v: unknown): asserts v is () => void {
if (typeof v !== "function") throw errorMessage(ctx, `${argName} expected to be a function ${debugType(v)}`, "TYPE");
}

7
src/Netscript/killWorkerScript.ts
View File

@ -47,12 +47,11 @@ function stopAndCleanUpWorkerScript(ws: WorkerScript): void {
//so the map must be cleared before looping
ws.atExit = new Map();
for (const key of atExit.keys()) {
for (const [id, callback] of atExit) {
try {
const callback = atExit.get(key);
if (typeof callback == "function") callback();
callback();
} catch (e: unknown) {
handleUnknownError(e, ws, "Error running atExit function.\n\n");
handleUnknownError(e, ws, `Error running atExit function with id ${id}.\n\n`);
}
}

21
src/NetscriptFunctions.ts
View File

@ -108,6 +108,7 @@ import { getRamCost } from "./Netscript/RamCostGenerator";
import { getEnumHelper } from "./utils/EnumHelper";
import { setDeprecatedProperties, deprecationWarning } from "./utils/DeprecationHelper";
import { ServerConstants } from "./Server/data/Constants";
import { assertFunction } from "./Netscript/TypeAssertion";
export const enums: NSEnums = {
CityName,
@ -1708,21 +1709,11 @@ export const ns: InternalAPI<NSFull> = {
sinceInstall: Object.assign({}, Player.moneySourceA),
sinceStart: Object.assign({}, Player.moneySourceB),
}),
atExit:
(ctx) =>
(f, id = "default") => {
if (typeof f !== "function") {
throw helpers.errorMessage(ctx, "argument should be function");
}
if (typeof id !== "string") {
throw helpers.errorMessage(ctx, "id should be a string");
}
ctx.workerScript.atExit.set(id, () => {
f();
}); // Wrap the user function to prevent WorkerScript leaking as 'this'
},
atExit: (ctx) => (callback, _id) => {
const id = _id ? helpers.string(ctx, "id", _id) : "default";
assertFunction(ctx, "callback", callback);
ctx.workerScript.atExit.set(id, callback);
},
mv: (ctx) => (_host, _source, _destination) => {
const hostname = helpers.string(ctx, "host", _host);
const server = helpers.getServer(ctx, hostname);