fix: reverse proxy support websocket

tympanix · Jul 10, 2018 · 214c5fd · 214c5fd
1 parent cb106d3
commit 214c5fd
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 3 deletions.
diff --git a/api/api_config.go b/api/api_config.go
@@ -9,7 +9,8 @@ import (
 )
 
 type jsonConfig struct {
-	Lang []jsonLang `json:"languages"`
+	Lang      []jsonLang `json:"languages"`
+	Proxypath string     `json:"proxypath"`
 }
 
 type jsonLang struct {
@@ -30,6 +31,7 @@ func (a *API) config(w http.ResponseWriter, r *http.Request) interface{} {
 		}
 		return jsonConfig{
 			langs,
+			a.Config().ProxyPath(),
 		}
 	}
 	err := errors.New("Method not allowed")

diff --git a/app/app_rename_test.go b/app/app_rename_test.go
@@ -120,6 +120,7 @@ func (c fakeConfig) Providers() []types.Provider    { return c.providers }
 func (c fakeConfig) Scrapers() []types.Scraper      { return c.scrapers }
 func (c fakeConfig) RenameAction() string           { return c.action }
 func (c fakeConfig) Evaluator() types.Evaluator     { return c.evaluator }
+func (c fakeConfig) ProxyPath() string              { return "/" }
 
 type fakeTemplates struct {
 	output         string

diff --git a/cfg/config.go b/cfg/config.go
@@ -297,3 +297,7 @@ func (v viperConfig) RenameAction() string {
 func (v viperConfig) Evaluator() types.Evaluator {
 	return new(score.DefaultEvaluator)
 }
+
+func (v viperConfig) ProxyPath() string {
+	return viper.GetString("proxypath")
+}
diff --git a/cmd/web.go b/cmd/web.go
@@ -13,9 +13,11 @@ import (
 func init() {
 	webCmd.Flags().IntP("port", "p", 5670, "port used to serve the web application")
 	webCmd.Flags().String("static", "", "path to the web files to serve")
+	webCmd.Flags().String("proxypath", "/", "base path for reverse proxy")
 
 	viper.BindPFlag("port", webCmd.Flags().Lookup("port"))
 	viper.BindPFlag("static", webCmd.Flags().Lookup("static"))
+	viper.BindPFlag("proxypath", webCmd.Flags().Lookup("proxypath"))
 
 	rootCmd.AddCommand(webCmd)
 }

diff --git a/etc/supper.yaml b/etc/supper.yaml
@@ -15,6 +15,9 @@ impared: false
 # Bind web server to port
 port: 5670
 
+# Base path for reverse proxy
+proxypath: "/"
+
 # Location of web root for static resources
 static: /var/lib/supper
 

diff --git a/types/app_types.go b/types/app_types.go
@@ -47,6 +47,7 @@ type Config interface {
 	MediaFilter() MediaFilter
 	RenameAction() string
 	Evaluator() Evaluator
+	ProxyPath() string
 }
 
 // APIKeys is the interface for configuration of 3rd party APIs

diff --git a/web/js/websocket.js b/web/js/websocket.js
@@ -1,6 +1,8 @@
 import { EventEmitter } from 'events'
 
 import Snackbar from './comp/Snackbar'
+import { configStore } from './stores'
+import { join } from 'path'
 
 const loggers = {
   "debug": Snackbar.notify,
@@ -14,12 +16,33 @@ class Websocket extends EventEmitter {
 
   constructor() {
     super()
-    this.ws = new WebSocket("ws://" + document.location.host + "/api/ws")
-    this.ws.onmessage = this.__handle.bind(this)
+    this.__listen()
+    this.__connect()
     this.__id = 0
     this.__handlers = []
   }
 
+  __create() {
+    this.__proto = document.location.protocol === "http:" ? "ws://" : "wss://"
+    this.__path = join(document.location.host, this.__proxypath || "", "/api/ws")
+    this.ws = new WebSocket(this.__proto + this.__path)
+    this.ws.onmessage = this.__handle.bind(this)
+  }
+
+  __connect() {
+    this.__proxypath = configStore.getAll().proxypath
+    if (this.__proxypath) {
+      this.__create()
+    }
+  }
+
+  __listen() {
+    let self = this
+    configStore.on("change", () => {
+      self.__connect()
+    })
+  }
+
   __handle(event) {
     console.log(event.data)
     var data = this.__json(event.data)