Inicio Explorar Axuda
Iniciar sesión
lenn
/
dioxus-mirror
réplica de https://github.com/DioxusLabs/dioxus.git
1
0
Fork 0
Ficheiros Incidencias 0 Wiki
Explorar o código

fix firefox refreshing loop in debug mode (#2214)

Evan Almloff hai 1 ano
pai
4c209e39fe
achega
11bf5ae34f
Modificáronse 4 ficheiros con 24 adicións e 91 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 22 18
      packages/cli/src/assets/autoreload.js
  2. 0 47
      packages/fullstack/dist/index.html
  3. 1 1
      packages/fullstack/src/axum_adapter.rs
  4. 1 25
      packages/fullstack/src/render.rs

+ 22 - 18
packages/cli/src/assets/autoreload.js
Ver ficheiro 

@@ -2,29 +2,33 @@
 
 // https://github.com/DioxusLabs/dioxus/tree/master/packages/cli
 
 
 (function () {
 
-  var protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
 
-  var url = protocol + '//' + window.location.host + '/_dioxus/ws';
 
-    var poll_interval = 8080;
 
+  var protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
 
+  var url = protocol + "//" + window.location.host + "/_dioxus/ws";
 
+  var poll_interval = 8080;
 
 
-  var reload_upon_connect = () => {
 
-      window.setTimeout(
 
-          () => {
 
-              var ws = new WebSocket(url);
 
-              ws.onopen = () => window.location.reload();
 
-              ws.onclose = reload_upon_connect;
 
-          },
 
-          poll_interval);
 
+  var reload_upon_connect = (event) => {
 
+    // Firefox will send a 1001 code when the connection is closed because the page is reloaded
 
+    // Only firefox will trigger the onclose event when the page is reloaded manually: https://stackoverflow.com/questions/10965720/should-websocket-onclose-be-triggered-by-user-navigation-or-refresh
 
+    // We should not reload the page in this case
 
+    if (event.code === 1001) {
 
+      return;
 
+    }
 
+    window.setTimeout(() => {
 
+      var ws = new WebSocket(url);
 
+      ws.onopen = () => window.location.reload();
 
+      ws.onclose = reload_upon_connect;
 
+    }, poll_interval);
 
   };
 
 
-    var ws = new WebSocket(url);
 
+  var ws = new WebSocket(url);
 
 
-    ws.onmessage = (ev) => {
 
-        console.log("Received message: ", ev, ev.data);
 
+  ws.onmessage = (ev) => {
 
+    console.log("Received message: ", ev, ev.data);
 
 
-        if (ev.data == "reload") {
 
-            window.location.reload();
 
-        }
 
+    if (ev.data == "reload") {
 
+      window.location.reload();
 
+    }
 
   };
 
 
   ws.onclose = reload_upon_connect;
 
-})()
 
+})();

+ 0 - 47
packages/fullstack/dist/index.html
Ver ficheiro 

@@ -1,47 +0,0 @@
 
-<!DOCTYPE html>
 
-<html>
 
-<head>
 
-  <title>dioxus | ⛺</title>
 
-  <meta content="text/html;charset=utf-8" http-equiv="Content-Type" />
 
-  <meta name="viewport" content="width=device-width, initial-scale=1">
 
-  <meta charset="UTF-8" />
 
-  
-</head>
 
-<body>
 
-  <div id="main"></div>
 
-  <script type="module">
 
-    import init from "/./assets/dioxus/name.js";
 
-    init("/./assets/dioxus/name_bg.wasm").then(wasm => {
 
-      if (wasm.__wbindgen_start == undefined) {
 
-        wasm.main();
 
-      }
 
-    });
 
-  </script>
 
-  
-</body>
 
-</html><script>// Dioxus-CLI
 
-// https://github.com/DioxusLabs/dioxus/tree/master/packages/cli
 
-
 
-(function () {
 
-  var protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
 
-  var url = protocol + '//' + window.location.host + '/_dioxus/ws';
 
-  var poll_interval = 8080;
 
-  var reload_upon_connect = () => {
 
-      window.setTimeout(
 
-          () => {
 
-              var ws = new WebSocket(url);
 
-              ws.onopen = () => window.location.reload();
 
-              ws.onclose = reload_upon_connect;
 
-          },
 
-          poll_interval);
 
-  };
 
-
 
-  var ws = new WebSocket(url);
 
-  ws.onmessage = (ev) => {
 
-      if (ev.data == "reload") {
 
-          window.location.reload();
 
-      }
 
-  };
 
-  ws.onclose = reload_upon_connect;
 
-})()
 
-</script>

+ 1 - 1
packages/fullstack/src/axum_adapter.rs
Ver ficheiro 

@@ -285,7 +285,7 @@ where
 
                 "/_dioxus",
 
                 Router::new()
 
                     .route(
 
-                        "/disconnect",
 
+                        "/ws",
 
                         get(|ws: axum::extract::WebSocketUpgrade| async {
 
                             ws.on_upgrade(|mut ws| async move {
 
                                 use axum::extract::ws::Message;

+ 1 - 25
packages/fullstack/src/render.rs
Ver ficheiro 

@@ -263,31 +263,7 @@ impl dioxus_ssr::incremental::WrapBody for FullstackRenderer {
 
         #[cfg(all(debug_assertions, feature = "hot-reload"))]
 
         {
 
             // In debug mode, we need to add a script to the page that will reload the page if the websocket disconnects to make full recompile hot reloads work
 
-            let disconnect_js = r#"(function () {
 
-    const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
 
-    const url = protocol + '//' + window.location.host + '/_dioxus/disconnect';
 
-    const poll_interval = 1000;
 
-    const reload_upon_connect = () => {
 
-        console.log('Disconnected from server. Attempting to reconnect...');
 
-        window.setTimeout(
 
-            () => {
 
-                // Try to reconnect to the websocket
 
-                const ws = new WebSocket(url);
 
-                ws.onopen = () => {
 
-                    // If we reconnect, reload the page
 
-                    window.location.reload();
 
-                }
 
-                // Otherwise, try again in a second
 
-                reload_upon_connect();
 
-            },
 
-            poll_interval);
 
-    };
 
-
 
-    // on initial page load connect to the disconnect ws
 
-    const ws = new WebSocket(url);
 
-    // if we disconnect, start polling
 
-    ws.onclose = reload_upon_connect;
 
-})()"#;
 
+            let disconnect_js = include_str!("../../cli/src/assets/autoreload.js");
 
 
             to.write_all(r#"<script>"#.as_bytes())?;
 
             to.write_all(disconnect_js.as_bytes())?;