added basic websockethandler control interface

3 files changed, 70 insertions, 1 deletions

diff --git a/src/helsinki.at/rhimportd/ctrlWeb.go b/src/helsinki.at/rhimportd/ctrlWeb.go
index a786a23..894780c 100644
--- a/src/helsinki.at/rhimportd/ctrlWeb.go
+++ b/src/helsinki.at/rhimportd/ctrlWeb.go
@@ -46,6 +46,9 @@ func StartControlWeb(addr_s string, conf *rhimport.Config, rddb *rhimport.RdDbCh
 	http.Handle("/public/simple", webHandler{conf, rddb, false, webSimpleHandler})
 	http.Handle("/trusted/simple", webHandler{conf, rddb, true, webSimpleHandler})
 
+	http.Handle("/public/socket", webHandler{conf, rddb, false, webSocketHandler})
+	http.Handle("/trusted/socket", webHandler{conf, rddb, true, webSocketHandler})
+
 	rhl.Println("web-ctrl: listening on", addr_s)
 	server := &http.Server{Addr: addr_s, ReadTimeout: 60 * time.Second, WriteTimeout: 60 * time.Second}
 	server.ListenAndServe()
diff --git a/src/helsinki.at/rhimportd/ctrlWebSimple.go b/src/helsinki.at/rhimportd/ctrlWebSimple.go
index f0e9f29..7217584 100644
--- a/src/helsinki.at/rhimportd/ctrlWebSimple.go
+++ b/src/helsinki.at/rhimportd/ctrlWebSimple.go
@@ -122,7 +122,7 @@ func webSimpleParseRequest(conf *rhimport.Config, rddb *rhimport.RdDbChan, trust
 }
 
 func webSimpleHandler(conf *rhimport.Config, rddb *rhimport.RdDbChan, trusted bool, w http.ResponseWriter, r *http.Request) {
-	rhdl.Printf("SimpleHandler: request for '%s'", html.EscapeString(r.URL.Path))
+	rhdl.Printf("WebSimpleHandler: request for '%s'", html.EscapeString(r.URL.Path))
 
 	var ctx *rhimport.ImportContext
 	var err error
diff --git a/src/helsinki.at/rhimportd/ctrlWebSocket.go b/src/helsinki.at/rhimportd/ctrlWebSocket.go
new file mode 100644
index 0000000..2ba2192
--- /dev/null
+++ b/src/helsinki.at/rhimportd/ctrlWebSocket.go
@@ -0,0 +1,66 @@
+//
+//  rhimportd
+//
+//  The Radio Helsinki Rivendell Import Daemon
+//
+//
+//  Copyright (C) 2015 Christian Pointner <equinox@helsinki.at>
+//
+//  This file is part of rhimportd.
+//
+//  rhimportd is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  any later version.
+//
+//  rhimportd is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with rhimportd. If not, see <http://www.gnu.org/licenses/>.
+//
+
+package main
+
+import (
+	//	"encoding/json"
+	"github.com/gorilla/websocket"
+	"helsinki.at/rhimport"
+	"html"
+	"net/http"
+)
+
+func webSocketHandler(conf *rhimport.Config, rddb *rhimport.RdDbChan, trusted bool, w http.ResponseWriter, r *http.Request) {
+	rhdl.Printf("WebSocketHandler: request for '%s'", html.EscapeString(r.URL.Path))
+
+	ws, err := websocket.Upgrade(w, r, nil, 1024, 1024)
+	if _, ok := err.(websocket.HandshakeError); ok {
+		http.Error(w, "Not a websocket handshake", 400)
+		return
+	} else if err != nil {
+		rhdl.Println("WebSocket Client", ws.RemoteAddr(), "error:", err)
+		return
+	}
+	rhdl.Println("WebSocket Client", ws.RemoteAddr(), "connected")
+
+	for {
+		msgtype, msg, err := ws.ReadMessage()
+		if err != nil {
+			rhdl.Println("WebSocket Client", ws.RemoteAddr(), "disconnected:", err)
+			return
+		}
+		if msgtype == websocket.TextMessage {
+			// TODO: implement the actual proto
+			rhdl.Println("Websocket Client", ws.RemoteAddr(), "got:", string(msg))
+
+			if err := ws.WriteMessage(websocket.TextMessage, msg); err != nil {
+				rhdl.Println("WebScoket Client", ws.RemoteAddr(), "write error:", err)
+				return
+			}
+		}
+	}
+
+	return
+}