From 20e82a0c506f7f46c7c393d85773d16e926fa94e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20J=C4=99drusiak?= <kuba23031999@gmail.com>
Date: Mon, 21 Oct 2024 21:07:55 +0200
Subject: [PATCH] 0.3.2

---
 NEWS.md                                       |   6 +++
 velesresearch/models.py                       |   2 +
 velesresearch/website_template/bun.lockb      | Bin 24889 -> 25577 bytes
 velesresearch/website_template/package.json   |   1 +
 .../website_template/public/index.html        |   1 +
 .../website_template/public/reload.js         |  12 ++++++
 velesresearch/website_template/server.ts      |  36 ++++++++++++++++--
 7 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 velesresearch/website_template/public/reload.js

diff --git a/NEWS.md b/NEWS.md
index 5a50177..64cadf6 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,6 +2,12 @@
 
 ## future release
 
+## 0.3.2
+
+* Moved building code to a .ts file.
+* Extensively changed the development server so building now happens only when invoked by the user and the window reloads automatically when the survey is updated.
+* The node_modules folder is not copied even if it exists in the website_template folder for any reason.
+
 ## 0.3.0
 
 * Added a functional `index.css` file.
diff --git a/velesresearch/models.py b/velesresearch/models.py
index ba61370..0c56cf0 100644
--- a/velesresearch/models.py
+++ b/velesresearch/models.py
@@ -980,6 +980,8 @@ def build(self, path: str | Path = os.getcwd(), folderName: str = "survey"):
         # main file structure
         if not os.path.exists(path / "package.json"):
             template = str(files("velesresearch.website_template"))
+            if "node_modules" in template:
+                template.remove("node_modules")
             shutil.copytree(
                 template,
                 path,
diff --git a/velesresearch/website_template/bun.lockb b/velesresearch/website_template/bun.lockb
index 072acda656a29b4b640916c52dc754aed2e4a9a4..51d747dadd93c92e5a5a37ff5adb1cd6a5cb2726 100755
GIT binary patch
delta 2084
zcmd^=Z%kWN6u|F&w6sOK(myPHgN?!xV9>tOLTL-5r7i6?-heVcbdVt;EL$N2ZCuvH
zL|6oeGNX88LZjIhKDcCwiRtE?$^OJYu*{h_qlPA$IHTFnL=wY{$xQX!wl98}OH8I;
zJn66Jo_o)`_uO~iJ?G*Fbak1&B5a#^Cb5z@EDEW8!^$L=S50^A&mXhYnV-A18dHu<
z3q6A*BZ1jS8F#_|PW%il8ay~Q5*-?d#r6*j4Mk&5f{8QIb#QZKo9^leQ4uoX*Awyx
z>SL%2QM>iY822tMI&k&Hz7ntX{fe^J`OOu3W|Gyir`0MKddS!^P+m|AMRKKzXbH*m
z!fAz*b7>)=^~eunryt%_Hq(p1>%5#?2faEE*RF$v&O;|4rSsA&!0Wv<4Ly1<*P(}m
z-a`RW*!2bQ2CqtKAfyLZ!<FPtZqxt?L(@3MNEm9wgixd$Ve(Hjd#(audMm=@K{^k|
zD+wtetg#KDFj`zS&K|cQOdh0-I3CP+JyboOnetzl_;2TB8xG|*5+d34GaYPT2f`t{
zat`;?%&$G?w;MIHI}j#JGrKdVyHHDV--FMs|6iQ^Uk8s7)gUZTh!>as-@k$W><O`t
zg1wT5{tYBk#^1H$Czs#q4o_-+nG33V$M%kV{c-fEN3Ba=4bF!y-9CHy*7V|uA(>|M
z!oH8@Umg+PJNwgjPOhuI!~R-c_mB5hKCHZfp;407q)|Jv0cZYY*Xrwk)yzc~YUGnw
z7Mo~Q{?Vz%)Z!ua0R41_I`EAzthlaF%)H8{Kig2awjkI}EQGGV@j~a`wZy^ciKX)!
zOJTIu2w&ES)CuLa5vVq+VX9W7Zn%lo3R(`cNSooPIReubHT-~93)n0Xa0zOdvxw9S
zx6rzSR!|VB4`zi3^(R+_E;*c%RVQ5y&lf`2`h+Tw4cica<<=Hc)=2-66=wO7)|}JM
zHrV1D)?$Ls+(mXKJCPvF`TBd?uw_D67Q>WA%m}+(m~KfivJqkVibpmfB}gf<8QFrc
z+bbgM60jQ_XA`2F3*w@cJd4AJY)6_AEDgkoG{Thso}ImX*3*Qzkrt#C@gUxuW_!Am
zOKLxNz}taujZzttYLb$r8I<JlwuXG8RNSOW#nHzaggU_nm)jdl*0B=dZ{pJN^^jrh
z$P!0c;7sm<M&uoC+`9_L7eARla&q|dC`X@l2@b(lN2J0yYwdlh@_dUMN9;JOU2q+P
zK9T4AdWehm0vAhHDDh4>C$_?GVqMh$zDrh0CtZ#kG`=ByCg;*Um~}1Ke#qr9+2Crx
sm^`ri`yyW2pVeZOnwIPq%EM*F(*AH%YFZlLW_T++-mggR>ARixCldWfr2qf`

delta 1668
zcmeH{TS!zv7{_OhZl<~6o;{1}TJ37&rPi~TQjdGTxL#V<=pmMRNy12c2p=kxASEn<
zN|KL2p%)|R@)if9r7Y^95(>m834)NIq8mbiU9`S$_XrDtR8UWSoZtNCn{#I7%zQK7
z>xVpbpP!Sf@5Z{{z3&;i&|_QQWx2J`J-hCrXW~fJ_~|+0-1sA}c(sG2Ej*mG3X`Gh
zy;nFm1v4LnR>5jHAu^WF*uV_x8q{JVV}+<wqIz7o!PS=BLwfLuK3$%Hu?S4A_VQLp
zi9zAK0ltU<;i&;U#sDvZK4XyYfE1QP@Yxs?o{8X*0(>L%NkQHTDJhsgf@AN-u^EJQ
z^}?bNJSI;+&dUfrVnsM&L&$9D^4FC5l_8|%TECSv2fx|Gn1xZL3ZahGnr=pAuxP66
zr;42lv}`q_-<WRwtD2twUrdx<ehe2RAkEssnptN4tcJ`!wP+u1N2Ps>YaK|*Z__lP
zwUhi&pgXkzY*|VZlp&-mMVPwKdo9xc1D!dkv~52JI!L>f9r@o3v^rYy%>XfboY%sz
zJqe0k51-Jhhj2|2UZFQ$6Xy*ukKRa)9(Kub?u9Wq2`#c7bdEUp!%jyM7SNkOF9_V3
zgewlcy5AYqsnfM53-iO7f0V*-FXFc>ea{#*h6wF-C;}Uz-FiC1w9F>N4x`b%Wmc@w
zMaNsuwjgvMF(WYvF(JiJ(pYMtquq*7Dxl-t6Tt%QQWS@+Fom#6d*wkIkU9ic-1t?d
znu63LUL=6{5WlAMx3f`n(5}VdPVBjQv&p>*aueI?1~IwfGcbAPW0Ulu?}5P683?~z
z&d*2R9(Zy}d{ZuPm+X?aIvJZ1;b6jCx}3O&9ed7JO!ylFe$4HZU2a(^hOtD6FeAe4
zgu7rtyP`@PZk_~%?e<*y5m4HlmGfH8A5>}|^WL>fU37iX#yZl%3Ver^fXxNdF|&HP
Q{Y4QJ?aNbzj+Z$<02D9SF8}}l

diff --git a/velesresearch/website_template/package.json b/velesresearch/website_template/package.json
index 4278587..ad75bfd 100644
--- a/velesresearch/website_template/package.json
+++ b/velesresearch/website_template/package.json
@@ -10,6 +10,7 @@
     "@types/react": "^18.3.11",
     "@types/react-dom": "^18.3.1",
     "@types/showdown": "^2.0.6",
+    "chokidar": "^4.0.1",
     "esbuild": "^0.24.0",
     "hono": "^4.6.5",
     "mustache": "^4.2.0"
diff --git a/velesresearch/website_template/public/index.html b/velesresearch/website_template/public/index.html
index 8891e5f..202effd 100644
--- a/velesresearch/website_template/public/index.html
+++ b/velesresearch/website_template/public/index.html
@@ -6,6 +6,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <script id="recaptchaScript" src="https://www.google.com/recaptcha/api.js?render={{ RECAPTCHA_SITE_KEY }}"></script>
+  <script src="reload.js"></script>
   <script type="module" src="/main.js"></script>
   <style>
     #tryAgainButton {
diff --git a/velesresearch/website_template/public/reload.js b/velesresearch/website_template/public/reload.js
new file mode 100644
index 0000000..3dbb200
--- /dev/null
+++ b/velesresearch/website_template/public/reload.js
@@ -0,0 +1,12 @@
+const ws = new WebSocket('ws://localhost:8080');
+
+ws.onmessage = (event) => {
+    if (event.data === 'reload') {
+        console.log('Reloading page due to file change...');
+        window.location.reload();  // Reload the page when the server signals a change
+    }
+};
+
+ws.onopen = () => {
+    console.log('WebSocket connection established');
+};
\ No newline at end of file
diff --git a/velesresearch/website_template/server.ts b/velesresearch/website_template/server.ts
index 1c9d9e5..8978144 100644
--- a/velesresearch/website_template/server.ts
+++ b/velesresearch/website_template/server.ts
@@ -1,7 +1,8 @@
 import { Hono } from 'hono'
 import { readFileSync } from 'fs';
 import Mustache from 'mustache';
-import buildMain from './build.ts';
+import chokidar from 'chokidar';
+import type { ServerWebSocket } from 'bun';
 const recaptchaKeys = require("./recaptchaKeys.json");
 
 async function createResults(req: any) {
@@ -41,8 +42,11 @@ app.get('/', (c) => {
     return c.html(Mustache.render(templateContent, { "RECAPTCHA_SITE_KEY": recaptchaKeys.RECAPTCHA_SITE_KEY }), 200)
 })
 app.get('/main.js', async (c) => {
-    await buildMain();
-    const jsContent = await readFileSync('./build/main.js', 'utf-8');
+    const jsContent = readFileSync('./build/main.js', 'utf-8');
+    return c.text(jsContent, 200, { "Content-Type": "application/javascript" });
+})
+app.get('/reload.js', (c) => {
+    const jsContent = readFileSync('./public/reload.js', 'utf-8');
     return c.text(jsContent, 200, { "Content-Type": "application/javascript" });
 })
 
@@ -53,14 +57,40 @@ app.post("/submit/", async (c) => {
 
 export default app;
 
+const clients = new Set<ServerWebSocket<unknown>>();
+
 if (import.meta.main) {
     Bun.serve({
         fetch: app.fetch,
         port: 3000,
         development: true,
     });
+
+    Bun.serve({
+        fetch(req, server) {
+            const success = server.upgrade(req);
+            if (success) return undefined;
+            return new Response("WebSocket server", { status: 200 })
+        },
+        port: 8080,
+        websocket: {
+            message(ws, message) { },
+            open(ws) { clients.add(ws) },
+            close(ws) { clients.delete(ws) },
+        }
+    })
     console.log(`Welcome to \x1b[1mVeles\x1b[0m!`);
     console.log(`Listening on:\n`);
     console.log(`\x1b[1;38;2;25;179;148mhttp://localhost:3000\x1b[0m`);
     console.log("\nPress Ctrl+C to stop the server...");
+
+    const watcher = chokidar.watch('./build/main.js');
+    watcher.on('change', () => {
+        clients.forEach(client => {
+            if (client.readyState === WebSocket.OPEN) {
+                client.send('reload');
+                console.log("main.js changed, reloading...");
+            }
+        });
+    });
 }
\ No newline at end of file