First beta version of outbound server is here :)

Author: 0x19

connection.go

@@ -26,7 +26,7 @@ type SocketConnection struct {
 func (c *SocketConnection) Send(cmd string) error {
 
 	if strings.Contains(cmd, "\r\n") {
-		fmt.Errorf("Invalid command provided. Command cannot contain \\r and/or \\n within. Command you provided is: %s", cmd)
+		fmt.Errorf(EInvalidCommandProvided, cmd)
 	}
 
 	fmt.Fprintf(c, "%s\r\n\r\n", cmd)
@@ -73,7 +73,7 @@ func (c *SocketConnection) SendMsg(msg map[string]string, uuid, data string) (m
 
 	if uuid != "" {
 		if strings.Contains(uuid, "\r\n") {
-			return nil, fmt.Errorf("Invalid command provided. Command cannot contain \\r and/or \\n within. Command you provided is: %s", msg)
+			return nil, fmt.Errorf(EInvalidCommandProvided, msg)
 		}
 
 		b.WriteString(" " + uuid)
@@ -83,12 +83,12 @@ func (c *SocketConnection) SendMsg(msg map[string]string, uuid, data string) (m
 
 	for k, v := range msg {
 		if strings.Contains(k, "\r\n") {
-			return nil, fmt.Errorf("Invalid command provided. Command cannot contain \\r and/or \\n within. Command you provided is: %s", msg)
+			return nil, fmt.Errorf(EInvalidCommandProvided, msg)
 		}
 
 		if v != "" {
 			if strings.Contains(v, "\r\n") {
-				return nil, fmt.Errorf("Invalid command provided. Command cannot contain \\r and/or \\n within. Command you provided is: %s", msg)
+				return nil, fmt.Errorf(EInvalidCommandProvided, msg)
 			}
 
 			b.WriteString(fmt.Sprintf("%s: %s\n", k, v))
@@ -139,7 +139,7 @@ func (c *SocketConnection) Handle() {
 
 	go func() {
 		for {
-			msg, err := newMessage(bufio.NewReaderSize(c, READER_BUFFER_SIZE))
+			msg, err := newMessage(bufio.NewReaderSize(c, ReadBufferSize))
 
 			if err != nil {
 				c.err <- err

constants.go

@@ -6,13 +6,4 @@
 
 package goesl
 
-const (
-	//
-	INBOUND_SERVER_CONN_PROTO = "tcp"
-
-	//
-	READER_BUFFER_SIZE = 1024 << 6
-
-	//
-	EVENTS_BUFFER = 32
-)
+const ()

errors.go

@@ -2,4 +2,19 @@
 // Please check out LICENSE file for more information about what you CAN and what you CANNOT do!
 // Basically in short this is a free software for you to do whatever you want to do BUT copyright must be included!
 // I didn't write all of this code so you could say it's yours.
-// MIT License
+// MIT License
+
+package goesl
+
+var (
+	EInvalidCommandProvided  = "Invalid command provided. Command cannot contain \\r and/or \\n. Provided command is: %s"
+	ECouldNotReadMIMEHeaders = "Error while reading MIME headers: %s"
+	EInvalidContentLength    = "Unable to get size of content-length: %s"
+	EUnsuccessfulReply       = "Got error while reading from reply command: %s"
+	ECouldNotReadyBody       = "Got error while reading reader body: %s"
+	EUnsupportedMessageType  = "Unsupported message type! We got '%s'. Supported types are: %v "
+	ECouldNotDecode          = "Could not decode/unescape message: %s"
+	ECouldNotStartListener   = "Got error while attempting to start listener: %s"
+	EListenerConnection      = "Listener connection error: %s"
+	EInvalidServerAddr       = "Please make sure to pass along valid address. You've passed: \"%s\""
+)

message.go

@@ -50,7 +50,7 @@ func (m *Message) Parse() error {
 	cmr, err := m.tr.ReadMIMEHeader()
 
 	if err != nil && err.Error() != "EOF" {
-		Error("Error while reading MIME headers: %s", err)
+		Error(ECouldNotReadMIMEHeaders, err)
 		return err
 	}
 
@@ -65,14 +65,14 @@ func (m *Message) Parse() error {
 		l, err := strconv.Atoi(lv)
 
 		if err != nil {
-			Error("Unable to get size of content-length: %s", err)
+			Error(EInvalidContentLength, err)
 			return err
 		}
 
 		m.Body = make([]byte, l)
 
 		if _, err := io.ReadFull(m.r, m.Body); err != nil {
-			Error("Got error while reading reader body: %s", err)
+			Error(ECouldNotReadyBody, err)
 			return err
 		}
 	}
@@ -82,7 +82,7 @@ func (m *Message) Parse() error {
 	Debug("Got message content (type: %s). Searching if we can handle it ...", msgType)
 
 	if !StringInSlice(msgType, AvailableMessageTypes) {
-		return fmt.Errorf("Unsupported message type! We got '%s'. Supported types are: %v ", msgType, AvailableMessageTypes)
+		return fmt.Errorf(EUnsupportedMessageType, msgType, AvailableMessageTypes)
 	}
 
 	// Assing message headers IF message is not type of event-json
@@ -96,7 +96,7 @@ func (m *Message) Parse() error {
 				m.Headers[k], err = url.QueryUnescape(v[0])
 
 				if err != nil {
-					Debug("Could not decode/unescape message: %s", err)
+					Error(ECouldNotDecode, err)
 					continue
 				}
 			}
@@ -111,12 +111,12 @@ func (m *Message) Parse() error {
 	case "command/reply":
 		reply := cmr.Get("Reply-Text")
 
-		if reply[:2] == "-E" {
-			return fmt.Errorf("Got error while reading from reply command: %s", reply[5:])
+		if strings.Contains(reply, "-ERR") {
+			return fmt.Errorf(EUnsuccessfulReply, reply[5:])
 		}
 	case "api/response":
-		if string(m.Body[:2]) == "-E" {
-			return fmt.Errorf("Got error while reading from reply command: %s", string(m.Body)[5:])
+		if strings.Contains(string(m.Body), "-ERR") {
+			return fmt.Errorf(EUnsuccessfulReply, string(m.Body)[5:])
 		}
 
 	case "text/event-plain":
@@ -127,21 +127,21 @@ func (m *Message) Parse() error {
 		emh, err := tr.ReadMIMEHeader()
 
 		if err != nil {
-			return fmt.Errorf("Error while reading MIME headers (text/event-plain): %s", err)
+			return fmt.Errorf(ECouldNotReadMIMEHeaders, err)
 		}
 
 		if vl := emh.Get("Content-Length"); vl != "" {
 			length, err := strconv.Atoi(vl)
 
 			if err != nil {
-				Error("Unable to get size of content-length (text/event-plain): %s", err)
+				Error(EInvalidContentLength, err)
 				return err
 			}
 
 			m.Body = make([]byte, length)
 
 			if _, err = io.ReadFull(r, m.Body); err != nil {
-				Error("Got error while reading body (text/event-plain): %s", err)
+				Error(ECouldNotReadyBody, err)
 				return err
 			}
 		}

server.go

@@ -11,7 +11,6 @@ import (
 	"net"
 	"os"
 	"os/signal"
-	"runtime"
 	"syscall"
 )
 
@@ -32,13 +31,10 @@ func (s *OutboundServer) Start() error {
 	s.Listener, err = net.Listen(s.Proto, s.Addr)
 
 	if err != nil {
-		Error("Got error while attempting to create listener: %s", err)
+		Error(ECouldNotStartListener, err)
 		return err
 	}
 
-	// @TODO -> Fix this so that concurrency is actually configurable ...
-	_ = NewSemaphore(uint(runtime.NumCPU()))
-
 	quit := make(chan bool)
 
 	go func() {
@@ -48,11 +44,13 @@ func (s *OutboundServer) Start() error {
 			c, err := s.Accept()
 
 			if err != nil {
-				Error("Got connection error: %s", err)
+				Error(EListenerConnection, err)
 				quit <- true
 				break
 			}
 
+			Debug("Aha")
+
 			conn := SocketConnection{
 				Conn: c,
 				err:  make(chan error),
@@ -64,7 +62,6 @@ func (s *OutboundServer) Start() error {
 			go conn.Handle()
 
 			s.Conns <- conn
-
 		}
 	}()
 
@@ -90,14 +87,14 @@ func NewOutboundServer(addr string) (*OutboundServer, error) {
 		addr = os.Getenv("GOES_OUTBOUND_SERVER_ADDR")
 
 		if addr == "" {
-			return nil, fmt.Errorf("Please make sure to pass along valid address. You've passed: \"%s\"", addr)
+			return nil, fmt.Errorf(EInvalidServerAddr, addr)
 		}
 	}
 
 	server := OutboundServer{
 		Addr:  addr,
-		Proto: INBOUND_SERVER_CONN_PROTO,
-		Conns: make(chan SocketConnection, EVENTS_BUFFER),
+		Proto: "tcp", // Not seeing reason why this could become configurable at this moment
+		Conns: make(chan SocketConnection),
 	}
 
 	sig := make(chan os.Signal, 1)

vars.go

@@ -8,6 +8,9 @@ package goesl
 
 var (
 
+	// Size of buffer when we read from connection
+	ReadBufferSize = 1024 << 6
+
 	// Supported freeswitch events that we can/wish to parse out
 	AvailableMessageTypes = []string{"text/disconnect-notice", "text/event-json", "text/event-plain", "api/response", "command/reply"}
 )