fix: 🐛 sync reciverChannel

onionj · Feb 16, 2024 · 4b7872f · 4b7872f
1 parent 3d3c79b
commit 4b7872f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/muxr/client.go b/muxr/client.go
@@ -52,7 +52,7 @@ func (c *Client) Start() error {
 			switch typ {
 			case TYPE_DATA:
 				if stream, ok := c.streamsManager.Get(id); ok {
-					go func(stream *Stream) {
+					func(stream *Stream) {
 						stream.Lock()
 						defer stream.Unlock()
 						if !stream.isClosed {

diff --git a/muxr/server.go b/muxr/server.go
@@ -85,6 +85,8 @@ func wsServerHandler(writer http.ResponseWriter, request *http.Request) {
 
 		typ, lenght, id := ParseHeader(data[:NUM_BYTES_HEADER])
 
+		fmt.Println(string(data[NUM_BYTES_HEADER:]))
+
 		switch typ {
 		case TYPE_INITIAL:
 			stream := newStream(id, connAdaptor)
@@ -100,7 +102,7 @@ func wsServerHandler(writer http.ResponseWriter, request *http.Request) {
 		case TYPE_DATA:
 			stream, ok := streamsManager.Get(id)
 			if ok {
-				go func() {
+				func() {
 					stream.Lock()
 					defer stream.Unlock()
 					if !stream.isClosed {

diff --git a/muxr/stream.go b/muxr/stream.go
@@ -23,7 +23,7 @@ func newStream(
 ) *Stream {
 	return &Stream{
 		id:             id,
-		reciverChannel: make(chan []byte),
+		reciverChannel: make(chan []byte, 100), // TODO, replace this channel with a queue
 		isClosed:       false,
 		connAdaptor:    connAdaptor,
 	}
@@ -57,12 +57,6 @@ func (st *Stream) Close() {
 
 func (st *Stream) Kill() {
 
-	// Clear the channel
-	select {
-	case <-st.reciverChannel:
-	default:
-	}
-
 	st.Lock()
 	defer st.Unlock()