From 0b6582dd152cbb87df54491338be967f70d64f6b Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 6 Sep 2019 22:38:40 +0200 Subject: [PATCH] Improve documentation and formatting --- api/client/client.go | 1 + api/client/message.go | 29 ++++------------------------- config/layers.go | 2 +- config/persistence.go | 2 +- 4 files changed, 7 insertions(+), 27 deletions(-) diff --git a/api/client/client.go b/api/client/client.go index 1c8d4d4..5453a9d 100644 --- a/api/client/client.go +++ b/api/client/client.go @@ -6,6 +6,7 @@ import ( "time" "github.com/safing/portbase/log" + "github.com/gorilla/websocket" "github.com/tevino/abool" ) diff --git a/api/client/message.go b/api/client/message.go index 8ade82e..7280659 100644 --- a/api/client/message.go +++ b/api/client/message.go @@ -9,10 +9,12 @@ import ( "github.com/tevino/abool" ) +// Client errors var ( ErrMalformedMessage = errors.New("malformed message") ) +// Message is an API message. type Message struct { OpID string Type string @@ -22,6 +24,7 @@ type Message struct { sent *abool.AtomicBool } +// ParseMessage parses the given raw data and returns a Message. func ParseMessage(data []byte) (*Message, error) { parts := bytes.SplitN(data, apiSeperatorBytes, 4) if len(parts) < 2 { @@ -68,6 +71,7 @@ func ParseMessage(data []byte) (*Message, error) { return m, nil } +// Pack serializes a message into a []byte slice. func (m *Message) Pack() ([]byte, error) { c := container.New([]byte(m.OpID), apiSeperatorBytes, []byte(m.Type)) @@ -90,28 +94,3 @@ func (m *Message) Pack() ([]byte, error) { return c.CompileData(), nil } - -func (m *Message) IsOk() bool { - return m.Type == MsgOk -} -func (m *Message) IsDone() bool { - return m.Type == MsgDone -} -func (m *Message) IsError() bool { - return m.Type == MsgError -} -func (m *Message) IsUpdate() bool { - return m.Type == MsgUpdate -} -func (m *Message) IsNew() bool { - return m.Type == MsgNew -} -func (m *Message) IsDelete() bool { - return m.Type == MsgDelete -} -func (m *Message) IsWarning() bool { - return m.Type == MsgWarning -} -func (m *Message) GetMessage() string { - return m.Key -} diff --git a/config/layers.go b/config/layers.go index 4a54edc..4848e31 100644 --- a/config/layers.go +++ b/config/layers.go @@ -2,8 +2,8 @@ package config import ( "errors" - "sync" "fmt" + "sync" "github.com/safing/portbase/log" ) diff --git a/config/persistence.go b/config/persistence.go index d1f4bb7..3edf647 100644 --- a/config/persistence.go +++ b/config/persistence.go @@ -82,7 +82,7 @@ func MapToJSON(mapData map[string]interface{}) ([]byte, error) { for key, value := range mapData { new[key] = value } - + expand(new) return json.MarshalIndent(new, "", " ") }