fix

handler/create_connection.go

@@ -8,7 +8,7 @@ import (
 	"github.com/tockn/singo/model"
 )
 
-type ResponseCreateConnection struct {
+type SendClientID struct {
 	ClientID string `json:"client_id"`
 }
 
@@ -23,11 +23,11 @@ func (h *Handler) CreateConnection(w http.ResponseWriter, r *http.Request) {
 	ctx := context.Background()
 	go h.HandleSendMessage(ctx, c, conn)
 	go h.HandleReceiveMessage(c, conn)
-	resp := &ResponseCreateConnection{ClientID: c.ID}
-	body, err := json.Marshal(resp)
-	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-	w.Write(body)
+	resp := &SendClientID{ClientID: c.ID}
+	payload, _ := json.Marshal(resp)
+	body, _ := json.Marshal(SendMessage{
+		Type:    SendMessageTypeNotifyClientID,
+		Payload: payload,
+	})
+	sendMessage(conn, body)
 }

handler/handler.go

@@ -2,6 +2,8 @@ package handler
 
 import (
 	"encoding/json"
+	"log"
+	"net/http"
 
 	"github.com/tockn/singo/manager"
 
@@ -19,12 +21,15 @@ func NewHandler(man *manager.Manager) *Handler {
 var upgrader = websocket.Upgrader{
 	ReadBufferSize:  1024,
 	WriteBufferSize: 1024,
+	CheckOrigin: func(r *http.Request) bool {
+		return true
+	},
 }
 
 type ReceiveMessageType string
 
 var (
-	ReceiveMessageTypeJoinRoom ReceiveMessageType = "join room"
+	ReceiveMessageTypeJoinRoom ReceiveMessageType = "join"
 	ReceiveMessageTypeOffer    ReceiveMessageType = "offer"
 	ReceiveMessageTypeAnswer   ReceiveMessageType = "answer"
 )
@@ -37,9 +42,10 @@ type ReceiveMessage struct {
 type SendMessageType string
 
 var (
-	SendMessageTypeError  SendMessageType = "error"
-	SendMessageTypeOffer  SendMessageType = "offer"
-	SendMessageTypeAnswer SendMessageType = "answer"
+	SendMessageTypeNotifyClientID SendMessageType = "notify-client-id"
+	SendMessageTypeError          SendMessageType = "error"
+	SendMessageTypeOffer          SendMessageType = "offer"
+	SendMessageTypeAnswer         SendMessageType = "answer"
 )
 
 type ErrorMessage string
@@ -60,6 +66,7 @@ type SendMessage struct {
 }
 
 func newErrorMessage(msg error) *SendMessage {
+	log.Println("error:", msg)
 	return &SendMessage{
 		Type:    SendMessageTypeError,
 		Payload: []byte(msg.Error()),

main.go

@@ -4,7 +4,6 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/go-chi/chi"
 	"github.com/tockn/singo/handler"
 	"github.com/tockn/singo/manager"
 	"github.com/tockn/singo/repository/mem"
@@ -21,9 +20,8 @@ func run() error {
 	man := manager.NewManager(roomRepo)
 	han := handler.NewHandler(man)
 
-	r := chi.NewRouter()
-	r.Get("/connect", han.CreateConnection)
+	http.HandleFunc("/connect", han.CreateConnection)
 
 	log.Println("running...")
-	return http.ListenAndServe(":5000", r)
+	return http.ListenAndServe("0.0.0.0:5000", nil)
 }

manager/manager.go

@@ -20,7 +20,12 @@ func (m *Manager) CreateRoom(name string) (*model.Room, error) {
 
 func (m *Manager) JoinRoom(c *model.Client, roomID string) error {
 	r, err := m.roomRepo.Get(roomID)
-	if err != nil {
+	if err == repository.ErrNotFound {
+		r = model.NewRoom(roomID)
+		if _, err := m.roomRepo.Create(r); err != nil {
+			return err
+		}
+	} else if err != nil {
 		return err
 	}
 	r.Clients[c.ID] = c
@@ -41,7 +46,7 @@ func (m *Manager) TransferSDPOffer(senderClient *model.Client, sdp *model.SDP) e
 	}
 	msg := &model.Message{
 		Type:    model.MessageTypeSDPOffer,
-		Payload: &SDPOfferPayload{SDP: sdp},
+		Payload: SDPOfferPayload{SDP: sdp},
 	}
 	for _, c := range r.Clients {
 		if c.ID == senderClient.ID {
@@ -63,7 +68,7 @@ func (m *Manager) TransferSDPAnswer(senderClient *model.Client, sdp *model.SDP)
 	}
 	msg := &model.Message{
 		Type:    model.MessageTypeSDPAnswer,
-		Payload: &SDPAnswerPayload{SDP: sdp},
+		Payload: SDPAnswerPayload{SDP: sdp},
 	}
 	for _, c := range r.Clients {
 		if c.ID == senderClient.ID {

repository/mem/room.go

@@ -1,6 +1,8 @@
 package mem
 
 import (
+	"sync"
+
 	"github.com/tockn/singo/model"
 	"github.com/tockn/singo/repository"
 )
@@ -12,10 +14,13 @@ func NewRoomRepository() repository.Room {
 }
 
 type roomRepository struct {
+	mutex sync.Mutex
 	rooms map[string]*model.Room
 }
 
 func (re *roomRepository) Get(roomID string) (*model.Room, error) {
+	re.mutex.Lock()
+	defer re.mutex.Unlock()
 	r, ok := re.rooms[roomID]
 	if !ok {
 		return nil, repository.ErrNotFound
@@ -24,6 +29,8 @@ func (re *roomRepository) Get(roomID string) (*model.Room, error) {
 }
 
 func (re *roomRepository) Update(r *model.Room) (*model.Room, error) {
+	re.mutex.Lock()
+	defer re.mutex.Unlock()
 	if _, ok := re.rooms[r.ID]; !ok {
 		return nil, repository.ErrNotFound
 	}
@@ -32,11 +39,15 @@ func (re *roomRepository) Update(r *model.Room) (*model.Room, error) {
 }
 
 func (re *roomRepository) Create(r *model.Room) (*model.Room, error) {
+	re.mutex.Lock()
+	defer re.mutex.Unlock()
 	re.rooms[r.ID] = r
 	return r, nil
 }
 
 func (re *roomRepository) GetByClientID(clientID string) (*model.Room, error) {
+	re.mutex.Lock()
+	defer re.mutex.Unlock()
 	for _, r := range re.rooms {
 		for _, c := range r.Clients {
 			if c.ID != clientID {