broker: refactor (#396)

* remove subscribe from server
* remove publish from client
* broker package refactoring

Co-authored-by: vtolstov <vtolstov@users.noreply.github.com>
Reviewed-on: #396
Co-authored-by: Vasiliy Tolstov <v.tolstov@unistack.org>
Co-committed-by: Vasiliy Tolstov <v.tolstov@unistack.org>

util/socket/pool.go

@@ -1,65 +0,0 @@
-package socket
-
-import (
-	"sync"
-)
-
-// Pool holds the socket pool
-type Pool struct {
-	pool map[string]*Socket
-	sync.RWMutex
-}
-
-// Get socket from pool
-func (p *Pool) Get(id string) (*Socket, bool) {
-	// attempt to get existing socket
-	p.RLock()
-	socket, ok := p.pool[id]
-	if ok {
-		p.RUnlock()
-		return socket, ok
-	}
-	p.RUnlock()
-
-	// save socket
-	p.Lock()
-	defer p.Unlock()
-	// double checked locking
-	socket, ok = p.pool[id]
-	if ok {
-		return socket, ok
-	}
-	// create new socket
-	socket = New(id)
-	p.pool[id] = socket
-
-	// return socket
-	return socket, false
-}
-
-// Release close the socket and delete from pool
-func (p *Pool) Release(s *Socket) {
-	p.Lock()
-	defer p.Unlock()
-
-	// close the socket
-	s.Close()
-	delete(p.pool, s.id)
-}
-
-// Close the pool and delete all the sockets
-func (p *Pool) Close() {
-	p.Lock()
-	defer p.Unlock()
-	for id, sock := range p.pool {
-		sock.Close()
-		delete(p.pool, id)
-	}
-}
-
-// NewPool returns a new socket pool
-func NewPool() *Pool {
-	return &Pool{
-		pool: make(map[string]*Socket),
-	}
-}

util/socket/socket.go

@@ -1,118 +0,0 @@
-// Package socket provides a pseudo socket
-package socket
-
-import (
-	"io"
-
-	"go.unistack.org/micro/v4/network/transport"
-)
-
-// Socket is our pseudo socket for transport.Socket
-type Socket struct {
-	closed chan bool
-	send   chan *transport.Message
-	recv   chan *transport.Message
-	id     string
-	remote string
-	local  string
-}
-
-// SetLocal sets the local addr
-func (s *Socket) SetLocal(l string) {
-	s.local = l
-}
-
-// SetRemote sets the remote addr
-func (s *Socket) SetRemote(r string) {
-	s.remote = r
-}
-
-// Accept passes a message to the socket which will be processed by the call to Recv
-func (s *Socket) Accept(m *transport.Message) error {
-	select {
-	case s.recv <- m:
-		return nil
-	case <-s.closed:
-		return io.EOF
-	}
-}
-
-// Process takes the next message off the send queue created by a call to Send
-func (s *Socket) Process(m *transport.Message) error {
-	select {
-	case msg := <-s.send:
-		*m = *msg
-	case <-s.closed:
-		// see if we need to drain
-		select {
-		case msg := <-s.send:
-			*m = *msg
-			return nil
-		default:
-			return io.EOF
-		}
-	}
-	return nil
-}
-
-// Remote returns remote addr
-func (s *Socket) Remote() string {
-	return s.remote
-}
-
-// Local returns local addr
-func (s *Socket) Local() string {
-	return s.local
-}
-
-// Send message by via transport
-func (s *Socket) Send(m *transport.Message) error {
-	// send a message
-	select {
-	case s.send <- m:
-	case <-s.closed:
-		return io.EOF
-	}
-
-	return nil
-}
-
-// Recv message from transport
-func (s *Socket) Recv(m *transport.Message) error {
-	// receive a message
-	select {
-	case msg := <-s.recv:
-		// set message
-		*m = *msg
-	case <-s.closed:
-		return io.EOF
-	}
-
-	// return nil
-	return nil
-}
-
-// Close closes the socket
-func (s *Socket) Close() error {
-	select {
-	case <-s.closed:
-		// no op
-	default:
-		close(s.closed)
-	}
-	return nil
-}
-
-// New returns a new pseudo socket which can be used in the place of a transport socket.
-// Messages are sent to the socket via Accept and receives from the socket via Process.
-// SetLocal/SetRemote should be called before using the socket.
-func New(id string) *Socket {
-	return &Socket{
-		id:     id,
-		closed: make(chan bool),
-		local:  "local",
-		remote: "remote",
-		send:   make(chan *transport.Message, 128),
-		recv:   make(chan *transport.Message, 128),
-	}
-}