andre/cam2ip
1
0
Fork 0
mirror of https://github.com/gen2brain/cam2ip.git synced 2025-12-16 12:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the string replacement of the bind address/port

Browse Source 
Removes the bind address in favor of using JS to auto detect the location and use instead.  "window.location.host" will point to the proper endpoint.
If the server is at "10.10.10.10", 'new WebSocket("ws://" + window.location.host + "/socket");' would be created at "ws://10.10.10.10". The "window.location.host" property also includes the port number as well.
This should fix the current open issue with websockets on HTML not rendering properly when the "-bind" option is omitted.
This commit is contained in:
iDigitalFlame
2018-11-30 21:42:03 +00:00
committed by GitHub
parent 09932a978c
commit 13385ba650
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
handlers/html.go
View File

@@ -15,18 +15,11 @@ type HTML struct {
// NewHTML returns new HTML handler.
func NewHTML(bind string, width, height float64, nogl bool) *HTML {
h := &HTML{}
b := strings.Split(bind, ":")
if b[0] == "" {
bind = "127.0.0.1" + bind
}
tpl := htmlWebGL
if nogl {
tpl = html
}
tpl = strings.Replace(tpl, "{BIND}", bind, -1)
tpl = strings.Replace(tpl, "{WIDTH}", fmt.Sprintf("%.0f", width), -1)
tpl = strings.Replace(tpl, "{HEIGHT}", fmt.Sprintf("%.0f", height), -1)
@@ -52,7 +45,7 @@ var html = `<html>
<meta charset="utf-8"/>
<title>cam2ip</title>
<script>
ws = new WebSocket("ws://{BIND}/socket");
ws = new WebSocket("ws://" + window.location.host + "/socket");
var image = new Image();
ws.onopen = function() {
@@ -85,7 +78,7 @@ var htmlWebGL = `<html>
<script>
var texture, vloc, tloc, vertexBuff, textureBuff;
ws = new WebSocket("ws://{BIND}/socket");
ws = new WebSocket("ws://" + window.location.host "/socket");
var image = new Image();
ws.onopen = function() {