Release as version v0.1.2

.gitea/workflows/go-test.yml

@@ -1,7 +1,11 @@
 name: Run go tests
 on:
-  - test
+  push:
-  - pull_request
+    paths:
+      - '**.go'
+  pull_request:
+    paths:
+      - '**.go'
 
 env:
   GOPATH: /go_path
@@ -31,6 +35,12 @@ jobs:
     
     - name: Cache go 
       uses: actions/cache@v3
+      id: cache-go
+      with:
+        path: |
+          /go_path
+          /go_cache
+        key: cache-go-${{ steps.hash-go.outputs.hash }}
 
     - name: Go mod download
       run: go mod download

.gitea/workflows/release-nightly.yml

@@ -0,0 +1,56 @@
+name: release-nightly
+
+on:
+  push:
+    branches: [ master ]
+
+env:
+  REGISTRY: git.t-juice.club
+  IMAGE_NAME: ${{ gitea.repository }}
+  DOCKER_TAG: nightly
+
+jobs:
+  release-image:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/catthehacker/ubuntu:act-latest
+    env:
+      DOCKER_ORG: torjus
+      DOCKER_TAG: nightly
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # all history for all branches and tags
+          submodules: true
+          github-server-url: 'https://git.t-juice.club'
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker BuildX
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to git.t-juice.club registry
+        uses: docker/login-action@v3
+        with:
+          registry: git.t-juice.club
+          username: ${{ gitea.actor }}
+          password: ${{ secrets.DOCKER_PUSH }}
+
+      - name: Get Meta
+        id: meta
+        run: |
+          echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT
+          echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT          
+
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: |
+            linux/amd64
+          push: true
+          tags: |
+            ${{ env.REGISTRY }}/${{ gitea.repository }}:${{ env.DOCKER_TAG }}

.gitea/workflows/release-tag.yml

@@ -0,0 +1,58 @@
+name: release-tag
+
+on:
+  push:
+    tags:
+      - '*'
+
+env:
+  REGISTRY: git.t-juice.club
+  IMAGE_NAME: ${{ gitea.repository }}
+  DOCKER_TAG: latest
+
+jobs:
+  release-image:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/catthehacker/ubuntu:act-latest
+    env:
+      DOCKER_ORG: torjus
+      DOCKER_TAG: nightly
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # all history for all branches and tags
+          submodules: true
+          github-server-url: 'https://git.t-juice.club'
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker BuildX
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to git.t-juice.club registry
+        uses: docker/login-action@v3
+        with:
+          registry: git.t-juice.club
+          username: ${{ gitea.actor }}
+          password: ${{ secrets.DOCKER_PUSH }}
+
+      - name: Get Meta
+        id: meta
+        run: |
+          echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT
+          echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT          
+
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: |
+            linux/amd64
+          push: true
+          tags: |
+            ${{ env.REGISTRY }}/${{ gitea.repository }}:${{ steps.meta.outputs.REPO_VERSION }}
+            ${{ env.REGISTRY }}/${{ gitea.repository }}:${{ env.DOCKER_TAG }}

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "ministream-frontend"]
 	path = ministream-frontend
-	url = ssh://git@git.t-juice.club:222/torjus/ministream-frontend.git
+	url = https://git.t-juice.club/torjus/ministream-frontend.git

go.mod

@@ -4,6 +4,7 @@ go 1.21.3
 
 require (
 	github.com/go-chi/chi/v5 v5.0.10
+	github.com/google/uuid v1.4.0
 	github.com/pelletier/go-toml/v2 v2.1.0
 	github.com/pion/interceptor v0.1.25
 	github.com/pion/sdp/v3 v3.0.6
@@ -15,7 +16,6 @@ require (
 require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/google/uuid v1.4.0 // indirect
 	github.com/pion/datachannel v1.5.5 // indirect
 	github.com/pion/dtls/v2 v2.2.8 // indirect
 	github.com/pion/ice/v3 v3.0.2 // indirect

main.go

@@ -12,7 +12,7 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
-const Version = "v0.1.1"
+const Version = "v0.1.2"
 
 type ctxKey string
 

server/server.go

@@ -136,9 +136,18 @@ func (s *Server) DeleteHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func (s *Server) ListHandler(w http.ResponseWriter, r *http.Request) {
-	streams := s.streams.List()
+	type StreamInfo struct {
+		StreamKey string `json:"streamKey"`
+		ViewCount int    `json:"viewCount"`
+	}
+
+	infos := []StreamInfo{}
+	for key, stream := range s.streams.Streams {
+		infos = append(infos, StreamInfo{StreamKey: key, ViewCount: len(stream.viewers)})
+	}
+
 	enc := json.NewEncoder(w)
-	enc.Encode(&streams)
+	enc.Encode(&infos)
 }
 
 func (s *Server) WhipHandler(w http.ResponseWriter, r *http.Request) {

server/stream.go

@@ -10,6 +10,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/pion/interceptor"
 	"github.com/pion/interceptor/pkg/nack"
 	"github.com/pion/interceptor/pkg/stats"
@@ -42,7 +43,7 @@ type Stream struct {
 	peerConnectionStatsMu sync.Mutex
 	lastUpdate            time.Time
 	localTracks           []*webrtc.TrackLocalStaticRTP
-	peers                 []*webrtc.PeerConnection
+	viewers               map[string]*webrtc.PeerConnection
 	mu                    sync.Mutex
 }
 
@@ -72,6 +73,7 @@ func (s *StreamStore) StatsHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func (s *Stream) AddListener(sd *webrtc.SessionDescription) (*webrtc.SessionDescription, error) {
+	viewerID := uuid.New().String()
 	m := &webrtc.MediaEngine{}
 	if err := m.RegisterDefaultCodecs(); err != nil {
 		panic(err)
@@ -124,6 +126,10 @@ func (s *Stream) AddListener(sd *webrtc.SessionDescription) (*webrtc.SessionDesc
 		rtpSender, err := peerConnection.AddTrack(ltrack)
 		if err != nil {
 			// TODO, stop peerconn
+			peerConnection.Close()
+			s.mu.Lock()
+			delete(s.viewers, viewerID)
+			s.mu.Unlock()
 			return nil, err
 		}
 		go func() {
@@ -131,6 +137,9 @@ func (s *Stream) AddListener(sd *webrtc.SessionDescription) (*webrtc.SessionDesc
 			for {
 				if _, _, err := rtpSender.Read(rtcpBuf); err != nil {
 					peerConnection.Close()
+					s.mu.Lock()
+					delete(s.viewers, viewerID)
+					s.mu.Unlock()
 					return
 				}
 			}
@@ -173,7 +182,7 @@ func (s *Stream) AddListener(sd *webrtc.SessionDescription) (*webrtc.SessionDesc
 	// in a production application you should exchange ICE Candidates via OnICECandidate
 	<-gatherComplete
 	s.mu.Lock()
-	s.peers = append(s.peers, peerConnection)
+	s.viewers[viewerID] = peerConnection
 
 	defer s.mu.Unlock()
 
@@ -189,6 +198,7 @@ func (s *StreamStore) Add(streamKey string, sd *webrtc.SessionDescription) (*web
 			store:               s,
 			lastUpdate:          time.Now(),
 			peerConnectionStats: make(map[string]*stats.Stats),
+			viewers:             make(map[string]*webrtc.PeerConnection),
 		}
 		m := &webrtc.MediaEngine{}
 		if err := m.RegisterDefaultCodecs(); err != nil {
@@ -391,7 +401,7 @@ func (s *StreamStore) Delete(streamKey string) error {
 	defer s.mu.Unlock()
 	delete(s.Streams, streamKey)
 
-	for _, peer := range stream.peers {
+	for _, peer := range stream.viewers {
 		if err := peer.Close(); err != nil {
 			slog.Warn("Error closing peer.", "error", err)
 		}