Merge pull request #3764 from danielyxie/dev

Remove the infinite loop safety net completely

src/GameOptions/ui/CurrentOptionsPage.tsx

@@ -179,12 +179,6 @@ export const CurrentOptionsPage = (props: IProps): React.ReactElement => {
             </>
           }
         />
-        <OptionSwitch
-          checked={Settings.InfinityLoopSafety}
-          onChange={(newValue) => (Settings.InfinityLoopSafety = newValue)}
-          text="Script infinite loop safety net"
-          tooltip={<>If this is set the game will attempt to automatically kill scripts stuck in infinite loops.</>}
-        />
       </GameOptionsPage>
     ),
     [GameOptionsTab.INTERFACE]: (

src/Netscript/APIWrapper.ts

@@ -99,21 +99,8 @@ function wrapFunction(
       getValidPort: (port: any) => helpers.getValidPort(functionPath, port),
     },
   };
-  const safetyEnabled = Settings.InfinityLoopSafety;
   function wrappedFunction(...args: unknown[]): unknown {
     helpers.updateDynamicRam(ctx.function, getRamCost(Player, ...tree, ctx.function));
-    if (safetyEnabled) {
-      const now = performance.now();
-      if (
-        now - workerScript.infiniteLoopSafety > CONSTANTS.InfiniteLoopLimit &&
-        workerScript.scriptRef.filename.endsWith(".js")
-      ) {
-        throw new Error(
-          `Potential infinite loop without sleep detected. The game spent ${CONSTANTS.InfiniteLoopLimit}ms stuck in this script. (Are you using 'asleep' by mistake?)`,
-        );
-      }
-    }
-
     return func(ctx)(...args);
   }
   const parent = getNestedProperty(wrappedAPI, ...tree);

src/Netscript/WorkerScript.ts

@@ -112,11 +112,6 @@ export class WorkerScript {
    */
   atExit: any;
 
-  /**
-   * Once this counter reaches it's limit the script crashes. It is reset when a promise completes.
-   */
-  infiniteLoopSafety = performance.now();
-
   constructor(runningScriptObj: RunningScript, pid: number, nsFuncsGenerator?: (ws: WorkerScript) => NS) {
     this.name = runningScriptObj.filename;
     this.hostname = runningScriptObj.server;

src/NetscriptEvaluator.ts

@@ -14,8 +14,6 @@ export function netscriptDelay(time: number, workerScript: WorkerScript): Promis
     workerScript.delay = window.setTimeout(() => {
       workerScript.delay = null;
       workerScript.delayReject = undefined;
-
-      workerScript.infiniteLoopSafety = performance.now();
       if (workerScript.env.stopFlag) reject(new ScriptDeath(workerScript));
       else resolve();
     }, time);

src/Settings/Settings.ts

@@ -54,11 +54,6 @@ interface IDefaultSettings {
    */
   EnableBashHotkeys: boolean;
 
-  /**
-   * Infinite loop safety net
-   */
-  InfinityLoopSafety: boolean;
-
   /**
    * Timestamps format
    */
@@ -206,7 +201,6 @@ export const defaultSettings: IDefaultSettings = {
   DisableOverviewProgressBars: false,
   EnableBashHotkeys: false,
   TimestampsFormat: "",
-  InfinityLoopSafety: true,
   Locale: "en",
   MaxRecentScriptsCapacity: 50,
   MaxLogCapacity: 50,
@@ -247,7 +241,6 @@ export const Settings: ISettings & ISelfInitializer & ISelfLoading = {
   DisableOverviewProgressBars: defaultSettings.DisableOverviewProgressBars,
   EnableBashHotkeys: defaultSettings.EnableBashHotkeys,
   TimestampsFormat: defaultSettings.TimestampsFormat,
-  InfinityLoopSafety: defaultSettings.InfinityLoopSafety,
   Locale: "en",
   MaxRecentScriptsCapacity: defaultSettings.MaxRecentScriptsCapacity,
   MaxLogCapacity: defaultSettings.MaxLogCapacity,