new type Error

Author: ivahaev

msg.go

@@ -8,6 +8,10 @@ type wampMsg struct {
 	Args []interface{}
 }
 
+type Error struct {
+	Desc string `json:"desc"`
+}
+
 func createMessage(args ...interface{}) ([]byte, error) {
 	return json.Marshal(args)
 }
@@ -24,13 +28,13 @@ func createWelcomeMessage(id string) ([]byte, error) {
 	return createMessage(msgWelcome, id, 1, identity)
 }
 
-func createError(err interface{}) string {
+func createError(err interface{}) Error {
 	var text string
 	switch err.(type) {
 	case error:
 		text = err.(error).Error()
 	case string:
 		text = err.(string)
 	}
-	return "error#" + text
+	return Error{"error#" + text}
 }

parser.go

@@ -69,3 +69,18 @@ func parseWampMessage(typ int, msg []interface{}) (*wampMsg, error) {
 	}
 	return message, nil
 }
+
+func parseErrMsg(in interface{}) (Error, error) {
+	switch in.(type) {
+	case string:
+		return Error{in.(string)}, nil
+	case map[string]interface{}:
+		_desc, ok := in.(map[string]interface{})["desc"]
+		if !ok {
+			return Error{}, errors.New("Invalid input error interface{}")
+		}
+		desc, ok := _desc.(string)
+		return Error{desc}, nil
+	}
+	return Error{}, errors.New("Invalid input error interface{}")
+}

wamp.go

@@ -470,10 +470,13 @@ func (w *Wango) handleCallError(c *Conn, msg []interface{}) {
 	res := new(callResult)
 	res.err = errors.New("RPC error#")
 	if len(callResultMessage.Args) > 0 {
-		if _err := callResultMessage.Args[0].(string); ok {
-			err = errors.New("RPC error#" + _err)
+		var _err Error
+		_err, err = parseErrMsg(callResultMessage.Args[0])
+		if err == nil {
+			err = errors.New("RPC error#" + _err.Desc)
 		}
 	}
+
 	resChan <- &callResult{nil, err}
 }
 

wango_test.go

@@ -179,7 +179,7 @@ func TestClientConnectingAndRPC(t *testing.T) {
 
 	_, err = client.Call("wango.test-error")
 	if err == nil {
-		t.Fatal("Can't call")
+		t.Fatal("Call must fail", err)
 	}
 }
 
@@ -427,7 +427,8 @@ func connectAndRPC(path, uri string, args ...interface{}) (interface{}, error) {
 			return message[2], nil
 		}
 		if message[0].(float64) == msgCallError && message[1].(string) == msgId {
-			return nil, errors.New(message[2].(string))
+			errDesc, _ := parseErrMsg(message[2])
+			return nil, errors.New(errDesc.Desc)
 		}
 	}
 }