diff --git a/application/controller/controller.go b/application/controller/controller.go index 015b2ecd..4bf30f9c 100644 --- a/application/controller/controller.go +++ b/application/controller/controller.go @@ -35,7 +35,7 @@ var ( ) const ( - assetsURLPrefix = "/sshwifty/assets/" + assetsURLPrefix = "/assets/" assetsURLPrefixLen = len(assetsURLPrefix) ) @@ -79,9 +79,9 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { case "/": err = serveController(h.homeCtl, w, r, clientLogger) - case "/sshwifty/socket": + case "/socket": err = serveController(h.socketCtl, w, r, clientLogger) - case "/sshwifty/socket/verify": + case "/socket/verify": err = serveController(h.socketVerifyCtl, w, r, clientLogger) case "/robots.txt": diff --git a/ui/app.js b/ui/app.js index 431d41fd..42892d03 100644 --- a/ui/app.js +++ b/ui/app.js @@ -65,7 +65,7 @@ const mainTemplate = ` `.trim(); -const socksInterface = "/sshwifty/socket"; +const socksInterface = "socket"; const socksVerificationInterface = socksInterface + "/verify"; const socksKeyTimeTruncater = 100 * 1000; @@ -218,8 +218,8 @@ function startApp(rootEl) { r.webSocket = "ws://"; } - r.webSocket += location.host + socksInterface; - r.keepAlive = location.protocol + "//" + location.host + socksInterface; + r.webSocket += location.host + location.pathname + socksInterface; + r.keepAlive = location.protocol + "//" + location.host + location.pathname + socksInterface; return r; }, diff --git a/ui/index.html b/ui/index.html index 6db4a19f..f1dc0c52 100644 --- a/ui/index.html +++ b/ui/index.html @@ -49,13 +49,13 @@

Loading Sshwifty

Source code - + Third-party - Readme + Readme - License + License

diff --git a/webpack.config.js b/webpack.config.js index 113da915..8805aa48 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -189,7 +189,7 @@ module.exports = { }, devtool: inDevMode ? "inline-source-map" : "source-map", output: { - publicPath: "/sshwifty/assets/", + publicPath: "assets/", path: path.join(__dirname, ".tmp", "dist"), filename: "[name]-[contenthash:8].js", chunkFormat: "array-push",