Support SockJS

Author: thani-sh

server/conn.go

@@ -0,0 +1,37 @@
+package server
+
+import "encoding/json"
+
+type SockJSConn struct {
+	session SockJSSession
+}
+
+func (c *SockJSConn) ReadMessage() (Message, error) {
+	msg := Message{}
+
+	str, err := c.session.Recv()
+	if err != nil {
+		return msg, err
+	}
+
+	chars := []byte(str)
+	if err = json.Unmarshal(chars, &msg); err != nil {
+		return msg, err
+	}
+
+	return msg, nil
+}
+
+func (c *SockJSConn) WriteMessage(msg interface{}) error {
+	chars, err := json.Marshal(msg)
+	if err != nil {
+		return err
+	}
+
+	str := string(chars)
+	if err = c.session.Send(str); err != nil {
+		return err
+	}
+
+	return nil
+}

server/conn_sockjs.go

@@ -0,0 +1,75 @@
+package server
+
+import (
+	"errors"
+	"testing"
+)
+
+func Test_SockJSConn_ReadMessage(t *testing.T) {
+	sock := &TestSockJSSession{in: "{\"id\": \"test-id\"}"}
+	conn := &SockJSConn{sock}
+	msg, err := conn.ReadMessage()
+
+	if err != nil {
+		t.Error("should not return an error")
+	}
+
+	if msg.ID != "test-id" {
+		t.Error("should return correct message")
+	}
+}
+
+func Test_SockJSConn_ReadMessage_ReadError(t *testing.T) {
+	sock := &TestSockJSSession{err: errors.New("test-err")}
+	conn := &SockJSConn{sock}
+
+	if _, err := conn.ReadMessage(); err.Error() != "test-err" {
+		t.Error("should return error it read fails")
+	}
+}
+
+func Test_SockJSConn_ReadMessage_UnmarshalError(t *testing.T) {
+	sock := &TestSockJSSession{in: "not-json"}
+	conn := &SockJSConn{sock}
+
+	if _, err := conn.ReadMessage(); err == nil {
+		t.Error("should return error if unmarshal fails")
+	}
+}
+
+func Test_SockJSConn_WriteMessage(t *testing.T) {
+	sock := &TestSockJSSession{}
+	conn := &SockJSConn{sock}
+
+	data := struct {
+		Foo string `json:"foo"`
+	}{
+		Foo: "bar",
+	}
+
+	if err := conn.WriteMessage(data); err != nil {
+		t.Error("should not return an error")
+	}
+
+	s, ok := conn.session.(*TestSockJSSession)
+	if !ok {
+		t.Error("what?")
+	}
+
+	if s.out != `{"foo":"bar"}` {
+		t.Error("should send correct message")
+	}
+}
+
+func Test_SockJSConn_WriteMessage_WriteError(t *testing.T) {
+	sock := &TestSockJSSession{err: errors.New("test-error")}
+	conn := &SockJSConn{sock}
+
+	if err := conn.WriteMessage(""); err.Error() != "test-error" {
+		t.Error("should return error if write fails")
+	}
+}
+
+func Test_SockJSConn_WriteMessage_MarshalError(t *testing.T) {
+	// TODO => create a Marshal error
+}

server/conn_sockjs_test.go

@@ -0,0 +1,17 @@
+package server
+
+import "golang.org/x/net/websocket"
+
+type WSConn struct {
+	ws *websocket.Conn
+}
+
+func (c *WSConn) ReadMessage() (Message, error) {
+	msg := Message{}
+	err := websocket.JSON.Receive(c.ws, &msg)
+	return msg, err
+}
+
+func (c *WSConn) WriteMessage(msg interface{}) error {
+	return websocket.JSON.Send(c.ws, msg)
+}

server/conn_ws.go

@@ -0,0 +1,27 @@
+package server
+
+import "testing"
+
+func Test_WSConn_ReadMessage(t *testing.T) {
+	// TODO => write test
+}
+
+func Test_WSConn_ReadMessage_ReadError(t *testing.T) {
+	// TODO => write test
+}
+
+func Test_WSConn_ReadMessage_UnmarshalError(t *testing.T) {
+	// TODO => write test
+}
+
+func Test_WSConn_WriteMessage(t *testing.T) {
+	// TODO => write test
+}
+
+func Test_WSConn_WriteMessage_WriteError(t *testing.T) {
+	// TODO => write test
+}
+
+func Test_WSConn_WriteMessage_MarshalError(t *testing.T) {
+	// TODO => write test
+}

server/conn_ws_test.go

@@ -0,0 +1,46 @@
+package integration
+
+import (
+	"testing"
+	"time"
+
+	"github.com/meteorhacks/goddp/server"
+)
+
+var (
+	WSURL  = "http://localhost:1337/websocket"
+	ORIGIN = "http://localhost:1337"
+	ADDR   = "localhost:1337"
+	s      server.Server
+)
+
+type MethodError struct {
+	Error string `json:"error"`
+}
+
+type Message struct {
+	Msg     string      `json:"msg"`
+	Session string      `json:"session"`
+	ID      string      `json:"id"`
+	Result  float64     `json:"result"`
+	Error   MethodError `json:"error"`
+}
+
+func Test_StartServer(t *testing.T) {
+	s = server.New()
+
+	s.Method("double", func(ctx server.MethodContext) {
+		n, ok := ctx.Params[0].(float64)
+
+		if !ok {
+			ctx.SendError("invalid parameters")
+		} else {
+			ctx.SendResult(n * 2)
+		}
+
+		ctx.SendUpdated()
+	})
+
+	go s.Listen(":1337")
+	time.Sleep(100 * time.Millisecond)
+}

server/integration_test/0_config_test.go

@@ -8,51 +8,11 @@ import (
 	"net/http"
 	"net/url"
 	"testing"
-	"time"
 
 	"github.com/gorilla/websocket"
-	"github.com/meteorhacks/goddp/server"
 )
 
-var (
-	URL    = "http://localhost:1337/websocket"
-	ORIGIN = "http://localhost:1337"
-	ADDR   = "localhost:1337"
-	s      server.Server
-)
-
-type MethodError struct {
-	Error string `json:"error"`
-}
-
-type Message struct {
-	Msg     string      `json:"msg"`
-	Session string      `json:"session"`
-	ID      string      `json:"id"`
-	Result  float64     `json:"result"`
-	Error   MethodError `json:"error"`
-}
-
-func TestStartServer(t *testing.T) {
-	s = server.New()
-
-	s.Method("double", func(ctx server.MethodContext) {
-		n, ok := ctx.Params[0].(float64)
-
-		if !ok {
-			ctx.SendError("invalid parameters")
-		} else {
-			ctx.SendResult(n * 2)
-		}
-
-		ctx.SendUpdated()
-	})
-
-	go s.Listen(":1337")
-	time.Sleep(100 * time.Millisecond)
-}
-
-func TestConnect(t *testing.T) {
+func Test_WS_Connect(t *testing.T) {
 	ws, err := newClient()
 	if err != nil {
 		t.Error("websocket connection failed")
@@ -72,7 +32,7 @@ func TestConnect(t *testing.T) {
 	}
 }
 
-func TestPingWithoutId(t *testing.T) {
+func Test_WS_PingWithoutId(t *testing.T) {
 	ws, err := newClient()
 	if err != nil {
 		t.Error("websocket connection failed")
@@ -91,7 +51,7 @@ func TestPingWithoutId(t *testing.T) {
 	}
 }
 
-func TestPingWithId(t *testing.T) {
+func Test_WS_PingWithId(t *testing.T) {
 	ws, err := newClient()
 	if err != nil {
 		t.Error("websocket connection failed")
@@ -114,7 +74,7 @@ func TestPingWithId(t *testing.T) {
 	}
 }
 
-func TestMethodResult(t *testing.T) {
+func Test_WS_MethodResult(t *testing.T) {
 	ws, err := newClient()
 	if err != nil {
 		t.Error("websocket connection failed")
@@ -141,7 +101,7 @@ func TestMethodResult(t *testing.T) {
 	}
 }
 
-func TestMethodError(t *testing.T) {
+func Test_WS_MethodError(t *testing.T) {
 	ws, err := newClient()
 	if err != nil {
 		t.Error("websocket connection failed")
@@ -169,7 +129,7 @@ func TestMethodError(t *testing.T) {
 }
 
 func newClient() (*websocket.Conn, error) {
-	u, _ := url.Parse(URL)
+	u, _ := url.Parse(WSURL)
 	conn, err := net.Dial("tcp", ADDR)
 
 	if err != nil {

server/integration_test/integration_test.go renamed to server/integration_test/websocket_test.go

@@ -10,7 +10,7 @@ type MethodContext struct {
 	Updated bool
 }
 
-func NewMethodContext(m Message, conn Connection) MethodContext {
+func NewMethodContext(m *Message, conn Connection) MethodContext {
 	ctx := MethodContext{}
 	ctx.ID = m.ID
 	ctx.Params = m.Params
@@ -31,7 +31,7 @@ func (ctx *MethodContext) SendResult(result interface{}) error {
 		"result": result,
 	}
 
-	return ctx.Conn.WriteJSON(msg)
+	return ctx.Conn.WriteMessage(msg)
 }
 
 func (ctx *MethodContext) SendError(e string) error {
@@ -49,7 +49,7 @@ func (ctx *MethodContext) SendError(e string) error {
 		},
 	}
 
-	return ctx.Conn.WriteJSON(msg)
+	return ctx.Conn.WriteMessage(msg)
 }
 
 func (ctx *MethodContext) SendUpdated() error {
@@ -64,5 +64,5 @@ func (ctx *MethodContext) SendUpdated() error {
 		"methods": []string{ctx.ID},
 	}
 
-	return ctx.Conn.WriteJSON(msg)
+	return ctx.Conn.WriteMessage(msg)
 }