Merge pull request #2925 from Ornedan/necro-script-fix

Necro script fix

src/Netscript/ScriptDeath.ts

@@ -0,0 +1,37 @@
+import { WorkerScript } from "./WorkerScript";
+
+/**
+ * Script death marker.
+ *
+ * IMPORTANT: the game engine should not base any of it's decisions on the data
+ * carried in a ScriptDeath instance.
+ *
+ * This is because ScriptDeath instances are thrown through player code when a
+ * script is killed. Which grants the player access to the class and the ability
+ * to construct new instances with arbitrary data.
+ */
+export class ScriptDeath {
+  /** Process ID number. */
+  pid: number;
+
+  /** Filename of the script. */
+  name: string;
+
+  /** IP Address on which the script was running */
+  hostname: string;
+
+  /** Status message in case of script error. */
+  errorMessage = "";
+
+  constructor(ws: WorkerScript) {
+    this.pid = ws.pid;
+    this.name = ws.name;
+    this.hostname = ws.hostname;
+    this.errorMessage = ws.errorMessage;
+
+    Object.freeze(this);
+  }
+}
+
+Object.freeze(ScriptDeath);
+Object.freeze(ScriptDeath.prototype);

src/Netscript/WorkerScript.ts

@@ -60,7 +60,7 @@ export class WorkerScript {
   env: Environment;
 
   /**
-   * Status message in case of script error. Currently unused I think
+   * Status message in case of script error.
    */
   errorMessage = "";
 

src/Netscript/killWorkerScript.ts

@@ -2,6 +2,7 @@
  * Stops an actively-running script (represented by a WorkerScript object)
  * and removes it from the global pool of active scripts.
  */
+import { ScriptDeath } from "./ScriptDeath";
 import { WorkerScript } from "./WorkerScript";
 import { workerScripts } from "./WorkerScripts";
 import { WorkerScriptStartStopEventEmitter } from "./WorkerScriptStartStopEventEmitter";
@@ -139,7 +140,7 @@ function killNetscriptDelay(workerScript: WorkerScript): void {
     if (workerScript.delay) {
       clearTimeout(workerScript.delay);
       if (workerScript.delayReject) {
-        workerScript.delayReject(workerScript);
+        workerScript.delayReject(new ScriptDeath(workerScript));
       }
     }
   }