Merge pull request #22 from leotaku/rework-frontend

Improve client side code somewhat

assets/polling.js

@@ -0,0 +1,33 @@
+(() => {
+  const inputs = document.currentScript.dataset;
+
+  const retry = (url) => {
+    const controller = new AbortController();
+    setTimeout(() => controller.abort(), 500);
+    fetch(url, { cache: "no-store", signal: controller.signal })
+      .then((resp) => {
+        if (!resp.ok) return Promise.reject();
+        console.log("[tower-livereload] reload...");
+        window.location.reload();
+      })
+      .catch(() => setTimeout(() => retry(url), inputs.reloadInterval));
+  };
+
+  addEventListener("pageshow", () => {
+    const controller = new AbortController();
+    var unloaded = false;
+    addEventListener("beforeunload", () => {
+      unloaded = true;
+      controller.abort();
+    });
+
+    console.log("[tower-livereload] connected...");
+    fetch(inputs.longPoll, { cache: "no-store", signal: controller.signal })
+      .then((rsp) => rsp.text())
+      .catch(() => null)
+      .then(() => {
+        console.log("[tower-livereload] disconnected...");
+        if (!unloaded) retry(inputs.backUp);
+      });
+  });
+})();

src/lib.rs

@@ -286,7 +286,8 @@ impl<S, ReqPred, ResPred> LiveReload<S, ReqPred, ResPred> {
         let inject = InjectService::new(
             service,
             format!(
-                include_str!("../assets/polling.html"),
+                r#"<script data-long-poll="{long_poll}" data-back-up="{back_up}" data-reload-interval="{reload_interval}">{code}</script>"#,
+                code = include_str!("../assets/polling.js"),
                 long_poll = long_poll_path,
                 back_up = back_up_path,
                 reload_interval = reload_interval.as_millis(),