Merge pull request #3628 from rstudio/joe/feature/autoreload-custom-url

Add ability for autoreload ws to be at a custom URL
rstudio · May 4, 2022 · 2cae041 · 2cae041
2 parents 8eb7b05 + 59bddea
commit 2cae041
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 14 deletions.
diff --git a/inst/www/shared/shiny-autoreload.js b/inst/www/shared/shiny-autoreload.js
diff --git a/inst/www/shared/shiny-autoreload.js.map b/inst/www/shared/shiny-autoreload.js.map
diff --git a/inst/www/shared/shiny-showcase.js b/inst/www/shared/shiny-showcase.js
diff --git a/inst/www/shared/shiny-showcase.js.map b/inst/www/shared/shiny-showcase.js.map
diff --git a/inst/www/shared/shiny-testmode.js b/inst/www/shared/shiny-testmode.js
diff --git a/inst/www/shared/shiny-testmode.js.map b/inst/www/shared/shiny-testmode.js.map
diff --git a/srcts/build/extras.ts b/srcts/build/extras.ts
@@ -10,7 +10,7 @@ import babelPlugin from "esbuild-plugin-babel";
 
 build({
   bundle: true,
-  sourcemap: "inline",
+  sourcemap: true,
   minify: true,
   plugins: [babelPlugin()],
   banner: banner,

diff --git a/srcts/extras/shiny-autoreload.ts b/srcts/extras/shiny-autoreload.ts
@@ -1,14 +1,13 @@
 /* eslint-disable unicorn/filename-case */
-let protocol = "ws:";
+const protocol = (window.location.protocol === "https:") ? "wss:" : "ws:";
+// Add trailing slash to path, if necessary, before appending "autoreload"
+const defaultPath = window.location.pathname.replace(/\/?$/, "/") + "autoreload/";
+const defaultUrl = `${protocol}//${window.location.host}${defaultPath}`;
 
-if (window.location.protocol === "https:") protocol = "wss:";
-
-let defaultPath = window.location.pathname;
-
-if (!/\/$/.test(defaultPath)) defaultPath += "/";
-defaultPath += "autoreload/";
-
-const ws = new WebSocket(protocol + "//" + window.location.host + defaultPath);
+// By default, use the defaultUrl. But if there's a data-ws-url attribute on our
+// <script> tag, use that instead.
+const wsUrl = document.currentScript.dataset.wsUrl || defaultUrl;
+const ws = new WebSocket(wsUrl);
 
 ws.onmessage = function (event) {
   if (event.data === "autoreload") {