From 05da28d73e5eb741aec25bf8b1459d86542f90ea Mon Sep 17 00:00:00 2001
From: Martin Berg Alstad <600878@stud.hvl.no>
Date: Tue, 21 Mar 2023 23:29:53 +0100
Subject: [PATCH] Experimented with fetch in a web-worker

---
 src/functions/fetch.ts  | 21 +++++++++++++++++++++
 src/truth-table.tsx     | 39 +++++++++++++++++++++++++++++++++------
 src/types/interfaces.ts | 13 +++++++++++++
 3 files changed, 67 insertions(+), 6 deletions(-)
 create mode 100644 src/functions/fetch.ts

diff --git a/src/functions/fetch.ts b/src/functions/fetch.ts
new file mode 100644
index 0000000..6cd92be
--- /dev/null
+++ b/src/functions/fetch.ts
@@ -0,0 +1,21 @@
+/* @refresh reload */
+import type { FetchResultsProps, WebWorkerProps } from '../types/interfaces';
+
+onmessage = async (e) => {
+    console.log("Worker: Message received from main script")
+    const { expression, simplifyEnabled, hideValue, sortValue, hideIntermediates }: WebWorkerProps = e.data;
+
+    const result: FetchResultsProps = {
+        fetchResult: null,
+        error: null,
+    };
+
+    await fetch(`https://api.martials.no/simplify-truths/do/simplify/table?exp=${ encodeURIComponent(expression) }&
+simplify=${ simplifyEnabled }&hide=${ hideValue }&sort=${ sortValue }&caseSensitive=false&
+hideIntermediate=${ hideIntermediates }`)
+        .then(res => res.json())
+        .then(res => result.fetchResult = res)
+        .catch(err => result.error = err.toString());
+
+    postMessage(result);
+};
diff --git a/src/truth-table.tsx b/src/truth-table.tsx
index 3c194ae..3f609e1 100644
--- a/src/truth-table.tsx
+++ b/src/truth-table.tsx
@@ -6,7 +6,7 @@ import TruthTable from "./components/truth-table";
 import { InfoBox, MyDisclosure, MyDisclosureContainer } from "./components/output";
 import { diffChars } from "diff";
 import MyMenu from "./components/menu";
-import type { FetchResult } from "./types/interfaces";
+import type { FetchResultsProps, FetchResult, WebWorkerProps } from "./types/interfaces";
 import { type Accessor, type Component, createSignal, JSX, onMount, Show } from "solid-js";
 import { For, render } from "solid-js/web";
 import Row from "./components/row";
@@ -107,13 +107,40 @@ hide=${ hideValues().value }&sort=${ sortValues().value }&hideIntermediate=${ hi
             setError(null);
             setIsLoaded(false);
 
-            fetch(`https://api.martials.no/simplify-truths/do/simplify/table?exp=${ encodeURIComponent(exp) }&
+            if (window.Worker) {
+                const worker = new Worker(new URL("./functions/fetch.ts", import.meta.url));
+
+                const input: WebWorkerProps = {
+                    expression: exp,
+                    simplifyEnabled: simplifyEnabled(),
+                    hideValue: hideValues().value,
+                    sortValue: sortValues().value,
+                    hideIntermediates: hideIntermediates()
+                };
+
+                worker.postMessage(input);
+
+                worker.onmessage = (e): void => {
+                    const data: FetchResultsProps = e.data;
+                    setIsLoaded(true);
+                    if (data.fetchResult) {
+                        setFetchResult(data.fetchResult);
+                    }
+                    else if (data.error) {
+                        setError(data.error);
+                    }
+                    worker.terminate();
+                };
+            }
+            else {
+                fetch(`https://api.martials.no/simplify-truths/do/simplify/table?exp=${ encodeURIComponent(exp) }&
 simplify=${ simplifyEnabled() }&hide=${ hideValues().value }&sort=${ sortValues().value }&caseSensitive=false&
 hideIntermediate=${ hideIntermediates() }`)
-                .then(res => res.json())
-                .then(res => setFetchResult(res))
-                .catch(err => setError(err.toString()))
-                .finally(() => setIsLoaded(true));
+                    .then(res => res.json())
+                    .then(res => setFetchResult(res))
+                    .catch(err => setError(err.toString()))
+                    .finally(() => setIsLoaded(true));
+            }
         }
     }
 
diff --git a/src/types/interfaces.ts b/src/types/interfaces.ts
index 014c5dc..7b48876 100644
--- a/src/types/interfaces.ts
+++ b/src/types/interfaces.ts
@@ -71,3 +71,16 @@ export type FetchResult = {
         truthMatrix: Table,
     } | null,
 };
+
+export type WebWorkerProps = {
+    expression: string,
+    simplifyEnabled: boolean,
+    hideValue: string,
+    sortValue: string,
+    hideIntermediates: boolean
+};
+
+export type FetchResultsProps = {
+    fetchResult: FetchResult | null,
+    error: string | null,
+}