Prep for different timeout strategy

Author: jcreedcmu

public/css/style.css

@@ -225,6 +225,12 @@ label {
   visibility: visible;
 }
 
+.server-status-timeout {
+  color: white;
+  background-image: linear-gradient(to bottom, #cacaca, #656565);
+  visibility: visible;
+}
+
 .control {
   display: flex;
   gap: 0.5rem;

src/index.ts

@@ -3,29 +3,38 @@ import { Diagnostic, lintGutter, setDiagnostics } from '@codemirror/lint';
 import { EditorView, basicSetup } from "codemirror";
 import { decode, encode } from "./encoding";
 import { twelfHighlightStyle, twelfLanguage } from './twelf-mode';
-import { Status, TwelfError } from './twelf-worker-types';
+import { TwelfStatus, TwelfError, TwelfExecStatus } from './twelf-worker-types';
 import { TwelfWorker, mkTwelfWorker } from './twelf-worker';
 
-function showStatus(status: Status) {
+function showStatus(status: TwelfExecStatus) {
   const serverStatus = (document.getElementById('server-status') as HTMLDivElement);
 
-  switch (status) {
-    case Status.OK: {
-      serverStatus.className = 'server-status server-status-ok';
-      serverStatus.innerText = 'Server OK';
-
-      setTimeout(() => {
-        serverStatus.classList.add('server-status-flash');
-      }, 10);
-    }
-      break;
-    case Status.ABORT: {
-      serverStatus.className = 'server-status server-status-abort';
-      serverStatus.innerText = 'Server ABORT';
+  switch (status.t) {
+    case 'twelfStatus': {
+      switch (status.status) {
+        case TwelfStatus.OK: {
+          serverStatus.className = 'server-status server-status-ok';
+          serverStatus.innerText = 'Server OK';
+
+          setTimeout(() => {
+            serverStatus.classList.add('server-status-flash');
+          }, 10);
+        }
+          break;
+        case TwelfStatus.ABORT: {
+          serverStatus.className = 'server-status server-status-abort';
+          serverStatus.innerText = 'Server ABORT';
+        } break;
+      }
     } break;
+    case 'timeout': {
+      serverStatus.className = 'server-status server-status-timeout';
+      serverStatus.innerText = 'Server TIMEOUT';
+    }
   }
 }
 
+
 // Initialize editor component
 function initEditor(): EditorView {
   const editor = new EditorView({

src/twelf-service.ts

@@ -1,11 +1,11 @@
-import { Status, TwelfError, TwelfExecResponse } from "./twelf-worker-types";
+import { TwelfStatus, TwelfError, TwelfExecResponse, TwelfSideEffectData } from "./twelf-worker-types";
 import { WasiSnapshotPreview1, args_get, args_sizes_get, clock_time_get, environ_sizes_get, fd_write } from "./wasi";
 
 type TwelfExports = {
   memory: WebAssembly.Memory;
   twelf_open(argc: number, argv: number): void;
   allocate(size: number): number;
-  execute(): Status;
+  execute(): TwelfStatus;
 };
 
 function debug(_x: string): void {
@@ -60,6 +60,34 @@ export class TwelfService {
 
   constructor(public instance: WebAssembly.Instance, public output: string[]) { }
 
+  timeoutStatus(): TwelfExecResponse {
+    return {
+      status: { t: 'timeout' },
+      ...this.getSideEffectData()
+    }
+  }
+
+  getSideEffectData(): TwelfSideEffectData {
+    const errorRegex = new RegExp('string:(\\d+?).(\\d+?)-(\\d+?).(\\d+?) Error: \n(.*)', 'g');
+    let m;
+    const errors: TwelfError[] = [];
+    while (m = errorRegex.exec(this.output.join(''))) {
+      errors.push({
+        range: {
+          line1: parseInt(m[1]),
+          col1: parseInt(m[2]),
+          line2: parseInt(m[3]),
+          col2: parseInt(m[4]),
+        },
+        text: m[5],
+      });
+    }
+    return {
+      output: [...this.output],
+      errors,
+    }
+  }
+
   async exec(input: string): Promise<TwelfExecResponse> {
     this.output.splice(0); // Erase output
 
@@ -81,24 +109,13 @@ export class TwelfService {
       }
       catch (e) {
         console.error(e);
-        return Status.ABORT;
+        return TwelfStatus.ABORT;
       }
     })();
 
-    const errorRegex = new RegExp('string:(\\d+?).(\\d+?)-(\\d+?).(\\d+?) Error: \n(.*)', 'g');
-    let m;
-    const errors: TwelfError[] = [];
-    while (m = errorRegex.exec(this.output.join(''))) {
-      errors.push({
-        range: {
-          line1: parseInt(m[1]),
-          col1: parseInt(m[2]),
-          line2: parseInt(m[3]),
-          col2: parseInt(m[4]),
-        },
-        text: m[5],
-      });
-    }
-    return { status, output: [...this.output], errors: errors };
+    return {
+      status: { t: 'twelfStatus', status },
+      ...this.getSideEffectData(),
+    };
   }
 }

src/twelf-worker-types.ts

@@ -1,8 +1,12 @@
-export enum Status {
+export enum TwelfStatus {
   OK = 0,
   ABORT = 1,
 }
 
+export type TwelfExecStatus =
+  | { t: 'twelfStatus', status: TwelfStatus }
+  | { t: 'timeout' }
+
 export type TwelfError = {
   range: { line1: number, col1: number, line2: number, col2: number },
   text: string,
@@ -14,11 +18,14 @@ export type TwelfExecRequest = {
   input: string,
 }
 
-export type TwelfExecResponse = {
-  status: Status,
+export type TwelfSideEffectData = {
   output: string[],
   errors: TwelfError[],
-}
+};
+
+export type TwelfExecResponse = {
+  status: TwelfExecStatus,
+} & TwelfSideEffectData;
 
 export type TwelfReadyResponse = {};
 

src/worker.ts

@@ -1,5 +1,5 @@
 import { mkTwelfService } from "./twelf-service";
-import { Status, TwelfExecRequest, TwelfExecResponse, TwelfResponse, WithId } from "./twelf-worker-types";
+import { TwelfStatus, TwelfExecRequest, TwelfExecResponse, TwelfResponse, WithId } from "./twelf-worker-types";
 
 async function go() {
   const service = await mkTwelfService('./twelf.wasm');