app.go

@@ -3,16 +3,12 @@ package main
 import (
 	"bytes"
 	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"os/signal"
 	"sourcecode.social/greatape/goldgorilla/controllers"
 	"sourcecode.social/greatape/goldgorilla/models"
 	"sourcecode.social/greatape/goldgorilla/repositories"
 	"sourcecode.social/greatape/goldgorilla/routers"
-	"syscall"
+	"io"
+	"net/http"
 	"time"
 )
 
@@ -22,13 +18,11 @@ type App struct {
 	src    string
 }
 
-func (a *App) Init(srcListenAddr string, svcAddr string, logjamBaseUrl string, targetRoom string) {
+func (a *App) Init(srcListenAddr string, logjamBaseUrl string, targetRoom string) {
-	println("initializing ..")
 	a.src = srcListenAddr
 	a.conf = &models.ConfigModel{
-		LogjamBaseUrl:  logjamBaseUrl + "/auxiliary-node",
+		LogjamBaseUrl: logjamBaseUrl + "/auxiliary-node",
-		TargetRoom:     targetRoom,
+		TargetRoom:    targetRoom,
-		ServiceAddress: svcAddr,
 	}
 	roomRepo := repositories.NewRoomRepository(a.conf)
 	a.router = &routers.Router{}
@@ -37,25 +31,14 @@ func (a *App) Init(srcListenAddr string, svcAddr string, logjamBaseUrl string, t
 
 	err := a.router.RegisterRoutes(roomCtrl)
 	panicIfErr(err)
-
-	{
-		sigs := make(chan os.Signal, 1)
-		signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM, syscall.SIGKILL, syscall.SIGILL, syscall.SIGSTOP)
-		go func() {
-			a.onDie(<-sigs)
-		}()
-	}
 }
 
 func (a *App) Run() {
 	go func() {
 	start:
-		buffer, _ := json.Marshal(map[string]any{"roomId": a.conf.TargetRoom, "svcAddr": a.conf.ServiceAddress})
+		buffer, _ := json.Marshal(map[string]any{"roomId": a.conf.TargetRoom})
 		body := bytes.NewReader(buffer)
-		c := &http.Client{
+		res, err := http.Post(a.conf.LogjamBaseUrl+"/join", "application/json", body)
-			Timeout: 8 * time.Second,
-		}
-		res, err := c.Post(a.conf.LogjamBaseUrl+"/join", "application/json", body)
 		if err != nil {
 			println(err.Error())
 			time.Sleep(4 * time.Second)
@@ -72,12 +55,6 @@ func (a *App) Run() {
 	panicIfErr(err)
 }
 
-func (a *App) onDie(sig os.Signal) {
-	fmt.Println("<-", sig)
-
-	os.Exit(0)
-}
-
 func panicIfErr(err error) {
 	if err != nil {
 		panic(err)

controllers/room.go

@@ -4,12 +4,10 @@ import (
 	"bytes"
 	"encoding/json"
 	"github.com/gin-gonic/gin"
-	"io"
-	"net/http"
 	"sourcecode.social/greatape/goldgorilla/models"
 	"sourcecode.social/greatape/goldgorilla/models/dto"
 	"sourcecode.social/greatape/goldgorilla/repositories"
-	"time"
+	"net/http"
 )
 
 type RoomController struct {
@@ -36,11 +34,34 @@ func (c *RoomController) CreatePeer(ctx *gin.Context) {
 		c.helper.ResponseUnprocessableEntity(ctx)
 		return
 	}
-	err := c.repo.CreatePeer(reqModel.RoomId, reqModel.ID, reqModel.CanPublish, reqModel.IsCaller)
+	offer, err := c.repo.CreatePeer(reqModel.RoomId, reqModel.ID, reqModel.CanPublish, reqModel.IsCaller)
 	if c.helper.HandleIfErr(ctx, err, nil) {
 		return
 	}
 	c.helper.Response(ctx, struct{}{}, http.StatusNoContent)
+
+	if offer != nil {
+		buffer, err := json.Marshal(dto.SetSDPReqModel{
+			PeerDTO: dto.PeerDTO{
+				RoomId: reqModel.RoomId,
+				ID:     reqModel.ID,
+			},
+			SDP: *offer,
+		})
+		if err != nil {
+			println(err.Error())
+			return
+		}
+		reader := bytes.NewReader(buffer)
+		resp, err := http.Post(c.conf.LogjamBaseUrl+"/offer", "application/json", reader)
+		if err != nil {
+			println(err.Error())
+			return
+		}
+		if resp.StatusCode > 204 {
+			println(resp.Status)
+		}
+	}
 }
 
 func (c *RoomController) AddICECandidate(ctx *gin.Context) {
@@ -112,7 +133,6 @@ func (c *RoomController) Answer(ctx *gin.Context) {
 	}
 	err := c.repo.SetPeerAnswer(reqModel.RoomId, reqModel.ID, reqModel.SDP)
 	if c.helper.HandleIfErr(ctx, err, nil) {
-		println(err.Error())
 		return
 	}
 	c.helper.Response(ctx, struct{}{}, http.StatusNoContent)
@@ -134,43 +154,3 @@ func (c *RoomController) ClosePeer(ctx *gin.Context) {
 	}
 	c.helper.Response(ctx, struct{}{}, http.StatusNoContent)
 }
-
-func (c *RoomController) ResetRoom(ctx *gin.Context) {
-	var reqModel map[string]any
-	badReqSt := 400
-	if err := ctx.ShouldBindJSON(&reqModel); c.helper.HandleIfErr(ctx, err, &badReqSt) {
-		return
-	}
-	roomId := ""
-	if rid, exists := reqModel["roomId"]; !exists {
-		c.helper.ResponseUnprocessableEntity(ctx)
-		return
-	} else {
-		if castedrid, stringItIs := rid.(string); stringItIs {
-			roomId = castedrid
-		} else {
-			c.helper.ResponseUnprocessableEntity(ctx)
-			return
-		}
-	}
-	err := c.repo.ResetRoom(roomId)
-	if c.helper.HandleIfErr(ctx, err, nil) {
-		return
-	}
-
-	c.helper.Response(ctx, nil, http.StatusNoContent)
-}
-
-func (c *RoomController) Start(ctx *gin.Context) {
-	buffer, _ := json.Marshal(map[string]any{"roomId": c.conf.TargetRoom, "svcAddr": c.conf.ServiceAddress})
-	body := bytes.NewReader(buffer)
-	res, err := http.Post(c.conf.LogjamBaseUrl+"/join", "application/json", body)
-	if err != nil {
-		println(err.Error())
-		time.Sleep(4 * time.Second)
-	}
-	if res.StatusCode > 204 {
-		resbody, _ := io.ReadAll(res.Body)
-		println("get /join "+res.Status, string(resbody))
-	}
-}

controllers/status.go

@@ -1,7 +0,0 @@
-package controllers
-
-import "github.com/gin-gonic/gin"
-
-func HealthCheck(ctx *gin.Context) {
-	ctx.Status(204)
-}

main.go

@@ -6,7 +6,6 @@ import (
 )
 
 func main() {
-	svcAddr := flag.String("svc-addr", "", "service baseurl to register in logjam ( shoudln't end with / )")
 	src := flag.String("src", ":8080", "listenhost:listenPort")
 	logjamBaseUrl := flag.String("logjam-base-url", "https://example.com", "logjam base url(shouldn't end with /)")
 	targetRoom := flag.String("targetRoom", "testyroom", "target room")
@@ -16,10 +15,7 @@ func main() {
 	if strings.HasSuffix(*logjamBaseUrl, "/") {
 		panic("logjam-base-url shouldn't end with /")
 	}
-	if strings.HasSuffix(*svcAddr, "/") {
-		panic("service address shouldn't end with /")
-	}
 	app := App{}
-	app.Init(*src, *svcAddr, *logjamBaseUrl, *targetRoom)
+	app.Init(*src, *logjamBaseUrl, *targetRoom)
 	app.Run()
 }

models/config.go

@@ -1,7 +1,6 @@
 package models
 
 type ConfigModel struct {
-	ServiceAddress string `json:"serviceAddress"`
+	LogjamBaseUrl string `json:"logjamBaseUrl"`
-	LogjamBaseUrl  string `json:"logjamBaseUrl"`
+	TargetRoom    string `json:"targetRoom"`
-	TargetRoom     string `json:"targetRoom"`
 }

repositories/room.go

@@ -6,10 +6,10 @@ import (
 	"fmt"
 	"github.com/pion/rtcp"
 	"github.com/pion/webrtc/v3"
-	"log"
-	"net/http"
 	"sourcecode.social/greatape/goldgorilla/models"
 	"sourcecode.social/greatape/goldgorilla/models/dto"
+	"log"
+	"net/http"
 	"sync"
 	"time"
 )
@@ -30,7 +30,6 @@ type Room struct {
 	Peers     map[uint64]*Peer
 	trackLock *sync.Mutex
 	Tracks    map[string]*Track
-	timer     *time.Ticker
 }
 
 type RoomRepository struct {
@@ -65,7 +64,7 @@ func (r *RoomRepository) doesPeerExists(roomId string, id uint64) bool {
 	return false
 }
 
-func (r *RoomRepository) CreatePeer(roomId string, id uint64, canPublish, isCaller bool) error {
+func (r *RoomRepository) CreatePeer(roomId string, id uint64, canPublish, isCaller bool) (*webrtc.SessionDescription, error) {
 	r.Lock()
 
 	if !r.doesRoomExists(roomId) {
@@ -74,11 +73,10 @@ func (r *RoomRepository) CreatePeer(roomId string, id uint64, canPublish, isCall
 			Peers:     make(map[uint64]*Peer),
 			trackLock: &sync.Mutex{},
 			Tracks:    make(map[string]*Track),
-			timer:     time.NewTicker(3 * time.Second),
 		}
 		r.Rooms[roomId] = room
 		go func() {
-			for range room.timer.C {
+			for range time.NewTicker(3 * time.Second).C {
 				room.Lock()
 				for _, peer := range room.Peers {
 					for _, receiver := range peer.Conn.GetReceivers() {
@@ -106,7 +104,14 @@ func (r *RoomRepository) CreatePeer(roomId string, id uint64, canPublish, isCall
 
 	peerConn, err := webrtc.NewPeerConnection(webrtc.Configuration{})
 	if err != nil {
-		return models.NewError("can't create peer connection", 500, models.MessageResponse{Message: err.Error()})
+		return nil, models.NewError("can't create peer connection", 500, models.MessageResponse{Message: err.Error()})
+	}
+	for _, typ := range []webrtc.RTPCodecType{webrtc.RTPCodecTypeVideo, webrtc.RTPCodecTypeAudio} {
+		if _, err := peerConn.AddTransceiverFromKind(typ, webrtc.RTPTransceiverInit{
+			Direction: webrtc.RTPTransceiverDirectionSendrecv,
+		}); err != nil {
+			return nil, models.NewError("unhandled error, contact support #1313", 500, err)
+		}
 	}
 
 	peerConn.OnICECandidate(func(ic *webrtc.ICECandidate) {
@@ -119,12 +124,29 @@ func (r *RoomRepository) CreatePeer(roomId string, id uint64, canPublish, isCall
 		r.onPeerTrack(roomId, id, remote, receiver)
 	})
 
+	var sdp *webrtc.SessionDescription
+	if !isCaller {
+		offer, err := peerConn.CreateOffer(nil)
+		if err != nil {
+			println(err.Error())
+			peerConn.Close()
+			return nil, models.NewError("unhandled error, contact support #1314", 500, err)
+		}
+		err = peerConn.SetLocalDescription(offer)
+		if err != nil {
+			println(err.Error())
+			peerConn.Close()
+			return nil, models.NewError("unhandled error, contact support #1315", 500, err)
+		}
+		sdp = &offer
+	}
+
 	room.Peers[id] = &Peer{
 		ID:   id,
 		Conn: peerConn,
 	}
-	go r.updatePCTracks(roomId)
+
-	return nil
+	return sdp, nil
 }
 
 func (r *RoomRepository) onPeerICECandidate(roomId string, id uint64, ic *webrtc.ICECandidate) {
@@ -249,53 +271,33 @@ func (r *RoomRepository) updatePCTracks(roomId string) {
 			receivingPeerTracks[track.ID()] = rtpReceiver
 		}
 		room.trackLock.Lock()
-		renegotiate := false
 		for id, track := range room.Tracks {
 			_, alreadySend := alreadySentTracks[id]
 			_, alreadyReceiver := receivingPeerTracks[id]
 			if track.OwnerId != peer.ID && (!alreadySend && !alreadyReceiver) {
-				renegotiate = true
+				go func(peer *Peer, track *Track) {
-				println("add track")
+					println("add track")
-				_, err := peer.Conn.AddTrack(track.TrackLocal)
+					_, err := peer.Conn.AddTrack(track.TrackLocal)
-				if err != nil {
+					if err != nil {
-					println(err.Error())
+						println(err.Error())
-					return
+					}
-				}
+				}(peer, track)
 			}
 		}
 		room.trackLock.Unlock()
-		if renegotiate {
+
-			offer, err := peer.Conn.CreateOffer(nil)
+		/*room.trackLock.Lock()
-			if err != nil {
+		for trackId, _ := range alreadySentTracks {
-				println(err.Error())
+			if _, exists := room.Tracks[trackId]; !exists {
-				return
+				go func(peer *Peer, rtpSender *webrtc.RTPSender) {
-			}
+					err := peer.Conn.RemoveTrack(rtpSender)
-			err = peer.Conn.SetLocalDescription(offer)
+					if err != nil {
-			if err != nil {
+						println(err.Error())
-				println(err.Error())
+					}
-				return
+				}(peer, alreadySentTracks[trackId])
-			}
-			reqModel := dto.SetSDPReqModel{
-				PeerDTO: dto.PeerDTO{
-					RoomId: roomId,
-					ID:     peer.ID,
-				},
-				SDP: offer,
-			}
-			bodyJson, err := json.Marshal(reqModel)
-			if err != nil {
-				println(err.Error())
-				return
-			}
-			res, err := http.Post(r.conf.LogjamBaseUrl+"/offer", "application/json", bytes.NewReader(bodyJson))
-			if err != nil {
-				println(err.Error())
-				return
-			}
-			if res.StatusCode > 204 {
-				println("/offer ", res.Status)
 			}
 		}
+		room.trackLock.Unlock()*/
 	}
 }
 
@@ -408,26 +410,3 @@ func (r *RoomRepository) ClosePeer(roomId string, id uint64) error {
 	}
 	return room.Peers[id].Conn.Close()
 }
-
-func (r *RoomRepository) ResetRoom(roomId string) error {
-	r.Lock()
-	if !r.doesRoomExists(roomId) {
-		r.Unlock()
-		return nil
-	}
-	room := r.Rooms[roomId]
-	r.Unlock()
-
-	room.Lock()
-
-	room.timer.Stop()
-	for _, peer := range room.Peers {
-		peer.Conn.Close()
-	}
-	room.Unlock()
-
-	r.Lock()
-	delete(r.Rooms, roomId)
-	r.Unlock()
-	return nil
-}

routers/room.go

@@ -9,12 +9,8 @@ func registerRoomRoutes(rg *gin.RouterGroup, ctrl *controllers.RoomController) {
 
 	rg.POST("/peer", ctrl.CreatePeer)
 	rg.DELETE("/peer", ctrl.ClosePeer)
-
 	rg.POST("/ice", ctrl.AddICECandidate)
 	rg.POST("/answer", ctrl.Answer)
 	rg.POST("/offer", ctrl.Offer)
 
-	rg.POST("/", ctrl.Start)
-	rg.DELETE("/", ctrl.ResetRoom)
-
 }

routers/router.go

@@ -13,7 +13,6 @@ func (r *Router) RegisterRoutes(rCtrl *controllers.RoomController) error {
 	gin.SetMode(gin.ReleaseMode)
 	r.router = gin.Default()
 	registerRoomRoutes(r.router.Group("/room"), rCtrl)
-	r.router.GET("/healthcheck", controllers.HealthCheck)
 
 	return nil
 }