filling code for client-side control channel

client-ctl.go

@@ -1,7 +1,6 @@
 package hodu
 
 import "encoding/json"
-import "fmt"
 import "net/http"
 
 
@@ -10,9 +9,12 @@ import "net/http"
  * /servers -     create new server     list all servers    bulk update     delete all servers
  * /servers/1 -        X             get server 1 details  update server 1  delete server 1
  * /servers/1/xxx -
+ * /servers/1112123/peers
  */
 
-
+type http_errmsg struct {
+	Text string `json:"error-text"`
+}
 
 type client_ctl_servers struct {
 	c *Client
@@ -30,59 +32,114 @@ type client_ctl_clients_id struct {
 	c *Client
 }
 
+// ------------------------------------
 
 func (ctl *client_ctl_servers) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	var c *Client
+	var status_code int
 	var err error
-	var ptn string
 
 	c = ctl.c
 
-	_, ptn = c.mux.Handler(req);
-	fmt.Printf("%s %s %s [%s]\n", ptn, req.Method, req.URL.String(), req.PathValue("id"))
-
 	switch req.Method {
 		case http.MethodGet:
-			goto bad_request // TODO:
+			var je *json.Encoder
+			//var rc *http.ResponseController
+			var cts *ClientConn
+			var first bool = true
+
+			//rc = http.NewResponseController(w)
+			status_code = http.StatusOK; w.WriteHeader(status_code)
+			je = json.NewEncoder(w)
+			if _, err = w.Write([]byte("[")); err != nil { goto oops }
+			c.cts_mtx.Lock()
+			for _, cts = range c.cts_map_by_id {
+				if !first { w.Write([]byte(",")) }
+				if err = je.Encode(cts.cfg); err != nil { goto oops }
+				first = false
+			}
+			c.cts_mtx.Unlock()
+			if _, err = w.Write([]byte("]")); err != nil { goto oops }
+			//rc.Flush()
 
 		case http.MethodPost:
+			// add a new server connection
 			var s ClientCtlParamServer
 			var cc ClientConfig
+			var cts *ClientConn
+
 			err = json.NewDecoder(req.Body).Decode(&s)
 			if err != nil {
-		fmt.Printf ("failed to decode body - %s\n", err.Error())
-				goto bad_request
+				status_code = http.StatusBadRequest
+				w.WriteHeader(status_code)
+				goto done
 			}
 			cc.ServerAddr = s.ServerAddr
 			cc.PeerAddrs = s.PeerAddrs
-			c.StartService(&cc) // TODO: this can be blocking. do we have to resolve addresses before calling this? also not good because resolution succeed or fail at each attempt.  however ok as ServeHTTP itself is in a goroutine?
-			w.WriteHeader(http.StatusCreated)
-
-		case http.MethodPut:
-			goto bad_request // TODO:
+			cts, err = c.start_service(&cc) // TODO: this can be blocking. do we have to resolve addresses before calling this? also not good because resolution succeed or fail at each attempt.  however ok as ServeHTTP itself is in a goroutine?
+			if err != nil {
+				var je *json.Encoder
+				status_code = http.StatusInternalServerError; w.WriteHeader(status_code)
+				je = json.NewEncoder(w)
+				if err = je.Encode(http_errmsg{Text: err.Error()}); err != nil { goto oops }
+			} else {
+				var je *json.Encoder
+				status_code = http.StatusCreated; w.WriteHeader(status_code)
+				je = json.NewEncoder(w)
+				if err = je.Encode(cts.cfg); err != nil { goto oops }
+			}
 
 		case http.MethodDelete:
+			// delete all server conneections
 			var cts *ClientConn
 			c.cts_mtx.Lock()
 			for _, cts = range c.cts_map { cts.ReqStop() }
 			c.cts_mtx.Unlock()
+			w.WriteHeader(http.StatusNoContent)
+
+		default:
+			status_code = http.StatusBadRequest; w.WriteHeader(status_code)
 	}
 
+done:
+	// TODO: need to handle x-forwarded-for and other stuff? this is not a real web service, though
+	c.log.Write("", LOG_DEBUG, "[%s] %s %s %d", req.RemoteAddr, req.Method, req.URL.String(), status_code) // TODO: time taken
+	return
+
+oops:
+	c.log.Write("", LOG_ERROR, "[%s] %s %s - %s", req.RemoteAddr, req.Method, req.URL.String(), err.Error())
+	return
+}
+
+// ------------------------------------
+
+// servers/{id}
+func (ctl *client_ctl_servers_id) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+
+	//req.PathValue("id")
+	switch req.Method {
+		case http.MethodGet:
+
+		case http.MethodPost:
+
+		case http.MethodPut: // update
+			goto bad_request
+
+		case http.MethodDelete:
+	}
 	return
 
 bad_request:
 	w.WriteHeader(http.StatusBadRequest)
 	return
-
-}
-
-
-func (ctl *client_ctl_servers_id) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 }
 
+// ------------------------------------
 
 func (ctl *client_ctl_clients) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 }
 
+// ------------------------------------
+
 func (ctl *client_ctl_clients_id) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 }