factor out the JS code to create new WS and make sure hashes and quer…

…ies are removed for the WS URL

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: servr
 Type: Package
 Title: A Simple HTTP Server to Serve Static Files or Dynamic Documents
-Version: 0.29.1
+Version: 0.29.2
 Authors@R: c(
   person("Yihui", "Xie", role = c("aut", "cre"), email = "[email protected]", comment = c(ORCID = "0000-0003-0645-5666")),
   person("Carson", "Sievert", role = "ctb"),

NEWS.md

@@ -1,5 +1,6 @@
 # CHANGES IN servr VERSION 0.30
 
+- Fixed a bug that caused WebSockets to fail when the URL contains a hash.
 
 # CHANGES IN servr VERSION 0.29
 

R/dynamic.R

@@ -191,9 +191,10 @@ dynamic_site = function(
   invisible(res)
 }
 
+ws = "new WebSocket(location.href.replace(/^http/, 'ws').replace(/[?#].*/g, '').replace(/\\/?$/, '/websocket/'))"
 ws_js = function(js, interval, path) {
   path = gsub('"', '\\"', path, fixed = TRUE)
-  paste0('<script>', js, '(', interval * 1000, ', "', path, '");</script>')
+  paste0('<script>', js, '(', interval * 1000, ', "', path, '", ', ws, ');</script>')
 }
 
 add_js = function(res, js, ...) {

inst/resources/ws-reload.js

@@ -1,6 +1,5 @@
 // automatically refresh the page when necessary (R will send a message to ws)
-((interval, path) => {
-const ws = new WebSocket(location.href.replace(/^http/, 'ws').replace(/\/?$/, '/websocket/'));
+((interval, path, ws) => {
 let flag;
 ws.onmessage = e => {
   flag = true;

inst/resources/ws-update.js

@@ -1,5 +1,4 @@
-((interval, path) => {
-const ws = new WebSocket(location.href.replace(/^http/, 'ws').replace(/\/?$/, '/websocket/'));
+((interval, path, ws) => {
 let flag;
 ws.onmessage = e => {
   flag = true;