message

handler/handler.go

@@ -1,8 +1,6 @@
 package handler
 
 import (
-	"encoding/json"
-	"log"
 	"net/http"
 
 	"github.com/tockn/singo/manager"
@@ -25,49 +23,3 @@ var upgrader = websocket.Upgrader{
 		return true
 	},
 }
-
-type ReceiveMessageType string
-
-var (
-	ReceiveMessageTypeJoinRoom ReceiveMessageType = "join"
-	ReceiveMessageTypeOffer    ReceiveMessageType = "offer"
-	ReceiveMessageTypeAnswer   ReceiveMessageType = "answer"
-)
-
-type ReceiveMessage struct {
-	Type    ReceiveMessageType `json:"type"`
-	Payload json.RawMessage    `json:"payload"`
-}
-
-type SendMessageType string
-
-var (
-	SendMessageTypeError  SendMessageType = "error"
-	SendMessageTypeOffer  SendMessageType = "offer"
-	SendMessageTypeAnswer SendMessageType = "answer"
-)
-
-type ErrorMessage string
-
-func (e ErrorMessage) Error() string {
-	return string(e)
-}
-
-var (
-	ErrMsgInvalidType    ErrorMessage = "invalid type"
-	ErrMsgInvalidPayload ErrorMessage = "invalid payload"
-	ErrMsgInternalError  ErrorMessage = "internal error"
-)
-
-type SendMessage struct {
-	Type    SendMessageType `json:"type"`
-	Payload json.RawMessage `json:"payload"`
-}
-
-func newErrorMessage(msg error) *SendMessage {
-	log.Println("error:", msg)
-	return &SendMessage{
-		Type:    SendMessageTypeError,
-		Payload: []byte(msg.Error()),
-	}
-}

handler/message.go

@@ -0,0 +1,41 @@
+package handler
+
+import (
+	"encoding/json"
+	"log"
+
+	"github.com/tockn/singo/model"
+)
+
+type ReceiveMessageType string
+
+var (
+	ReceiveMessageTypeJoinRoom ReceiveMessageType = "join"
+	ReceiveMessageTypeOffer    ReceiveMessageType = "offer"
+	ReceiveMessageTypeAnswer   ReceiveMessageType = "answer"
+)
+
+type ReceiveMessage struct {
+	Type    ReceiveMessageType `json:"type"`
+	Payload json.RawMessage    `json:"payload"`
+}
+
+type ErrorMessage string
+
+func (e ErrorMessage) Error() string {
+	return string(e)
+}
+
+var (
+	ErrMsgInvalidType    ErrorMessage = "invalid type"
+	ErrMsgInvalidPayload ErrorMessage = "invalid payload"
+	ErrMsgInternalError  ErrorMessage = "internal error"
+)
+
+func newErrorMessage(msg error) *model.Message {
+	log.Println("error:", msg)
+	return &model.Message{
+		Type:    model.MessageTypeError,
+		Payload: []byte(msg.Error()),
+	}
+}

handler/receive_message.go

@@ -24,7 +24,7 @@ func (h *Handler) HandleReceiveMessage(c *model.Client, conn *websocket.Conn) {
 			continue
 		}
 
-		var resp *SendMessage
+		var resp *model.Message
 		switch req.Type {
 		case ReceiveMessageTypeJoinRoom:
 			resp = h.handleJoinRoom(c, req.Payload)
@@ -55,7 +55,7 @@ type MessageJoinRoom struct {
 	RoomID string `json:"room_id"`
 }
 
-func (h *Handler) handleJoinRoom(c *model.Client, msg []byte) *SendMessage {
+func (h *Handler) handleJoinRoom(c *model.Client, msg []byte) *model.Message {
 	var req MessageJoinRoom
 	if err := json.Unmarshal(msg, &req); err != nil {
 		return newErrorMessage(ErrMsgInvalidPayload)
@@ -72,7 +72,7 @@ type MessageSDPOffer struct {
 }
 
 // SDP offerが来た時に呼ばれる。Room IDの
-func (h *Handler) handleSDPOffer(c *model.Client, msg []byte) *SendMessage {
+func (h *Handler) handleSDPOffer(c *model.Client, msg []byte) *model.Message {
 	var req MessageSDPOffer
 	if err := json.Unmarshal(msg, &req); err != nil {
 		return newErrorMessage(ErrMsgInvalidPayload)
@@ -88,7 +88,7 @@ type MessageSDPAnswer struct {
 	ClientID string     `json:"client_id"`
 }
 
-func (h *Handler) handleSDPAnswer(c *model.Client, msg []byte) *SendMessage {
+func (h *Handler) handleSDPAnswer(c *model.Client, msg []byte) *model.Message {
 	var req MessageSDPAnswer
 	if err := json.Unmarshal(msg, &req); err != nil {
 		return newErrorMessage(ErrMsgInvalidPayload)

model/message.go

@@ -11,6 +11,7 @@ var (
 	MessageTypeICECandidate   MessageType = "ice-candidate"
 	MessageTypeNewClient      MessageType = "new-client"
 	MessageTypeLeaveClient    MessageType = "leave-client"
+	MessageTypeError          MessageType = "error"
 )
 
 type Message struct {