Release: v1.0.11-alpha

amir-the-h · Sep 29, 2021 · 6ab32ef · 6ab32ef
1 parent a6c60aa
commit 6ab32ef
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@ Changelog
 =========
 All notable changes to this project will be documented in this file.
 
+v1.0.11-alpha
+------------
+
+### Changed
+
+- Better error handling on `Ws`
+
 v1.0.10-alpha
 ------------
 

diff --git a/api/ws/client.go b/api/ws/client.go
@@ -366,7 +366,18 @@ func (c *ClientWs) process(data []byte, e *events.Basic) bool {
 		}()
 		return true
 	}
+	if c.Private.Process(data, e) {
+		return true
+	}
+	if c.Public.Process(data, e) {
+		return true
+	}
 	if e.ID != "" {
+		if e.Code != 0 {
+			ee := *e
+			ee.Event = "error"
+			return c.process(data, &ee)
+		}
 		e := events.Success{}
 		_ = json.Unmarshal(data, &e)
 		go func() {
@@ -377,12 +388,6 @@ func (c *ClientWs) process(data []byte, e *events.Basic) bool {
 		}()
 		return true
 	}
-	if c.Private.Process(data, e) {
-		return true
-	}
-	if c.Public.Process(data, e) {
-		return true
-	}
 	go func() { c.RawEventChan <- e }()
 
 	return false

diff --git a/events/events.go b/events/events.go
@@ -32,6 +32,9 @@ type (
 		Msg   string         `json:"msg,omitempty"`
 		Op    string         `json:"op,omitempty"`
 		Code  okex.JSONInt64 `json:"code"`
+		Args  []*Argument    `json:"args,omitempty"`
+		Arg   *Argument      `json:"arg,omitempty"`
+		Data  []*Argument    `json:"data,omitempty"`
 		ID    string         `json:"id,omitempty"`
 	}
 	Login struct {