Merge branch 'dev' of github.com:TUM-Dev/gocast into feat/transcript

api/courses.go

@@ -362,6 +362,7 @@ func (r coursesRoutes) getCourseBySlug(c *gin.Context) {
 
 	if (course.IsLoggedIn() && tumLiveContext.User == nil) || (course.IsEnrolled() && !tumLiveContext.User.IsEligibleToWatchCourse(course)) {
 		c.AbortWithStatus(http.StatusUnauthorized)
+		return
 	}
 
 	user := tumLiveContext.User

docker-compose.yml

@@ -1,3 +1,6 @@
+####################################################
+# Not production ready, only for local development #
+####################################################
 version: "3.8"
 
 services:
@@ -20,7 +23,7 @@ services:
     container_name: tum-live-worker
     depends_on:
       - tum-live
-      - vod-service
+      #- vod-service    # Omitted for local development due to size. Comment out to use voice-service
     build: worker
     platform: linux/amd64
     environment:
@@ -68,16 +71,17 @@ services:
       - ./init.sql:/data/application/init.sql
       - mariadb-data:/var/lib/mysql
     restart: always
-  voice-service:
-    container_name: tum-live-voice-service
-    image: ghcr.io/tum-dev/tum-live-voice-service:latest
-    environment:
-      - TRANSCRIBER=whisper
-      - WHISPER_MODEL=tiny
-      - MAX_WORKERS=10
-      - DEBUG=1
-    volumes:
-      - mass:/mass
+# Omitted for local development due to size. Comment out to use voice-service
+#  voice-service:
+#    container_name: tum-live-voice-service
+#    image: ghcr.io/tum-dev/tum-live-voice-service:latest
+#    environment:
+#      - TRANSCRIBER=whisper
+#      - WHISPER_MODEL=tiny
+#      - MAX_WORKERS=10
+#      - DEBUG=1
+#    volumes:
+#      - mass:/mass
 
 volumes:
   recordings:

worker/api/api_server.go

@@ -4,13 +4,12 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/joschahenningsen/thumbgen"
 	"net"
 	"os"
 	"os/exec"
 	"time"
 
-	"github.com/joschahenningsen/thumbgen"
-
 	"github.com/u2takey/go-utils/uuid"
 
 	"github.com/TUM-Dev/gocast/worker/cfg"

worker/api/api_server_test.go

@@ -2,10 +2,9 @@ package api
 
 import (
 	"context"
-	"testing"
-
 	"github.com/TUM-Dev/gocast/worker/cfg"
 	"github.com/TUM-Dev/gocast/worker/pb"
+	"testing"
 )
 
 var mockServer = server{}
@@ -17,8 +16,7 @@ func setup() {
 func TestServer_RequestStream(t *testing.T) {
 	setup()
 	_, err := mockServer.RequestStream(context.Background(), &pb.StreamRequest{
-		WorkerId: "234",
-	})
+		WorkerId: "234"})
 	if err == nil {
 		t.Errorf("Request with wrong WorkerID should be rejected")
 		return

worker/cfg/cfg.go

@@ -77,11 +77,11 @@ func SetConfig() {
 	if PersistDir == "" {
 		PersistDir = "."
 	}
-	err := os.MkdirAll(PersistDir, 0o755)
+	err := os.MkdirAll(PersistDir, 0755)
 	if err != nil {
 		log.Error(err)
 	}
-	err = os.MkdirAll(LogDir, 0o755)
+	err = os.MkdirAll(LogDir, 0755)
 	if err != nil {
 		log.Warn("Could not create log directory: ", err)
 	}
@@ -112,4 +112,5 @@ func SetConfig() {
 		defer sentry.Recover()
 		log.AddHook(sentryhook.New([]log.Level{log.PanicLevel, log.FatalLevel, log.ErrorLevel, log.WarnLevel}))
 	}
+
 }

worker/client/main.go

@@ -4,13 +4,12 @@ import (
 	"context"
 	"encoding/base64"
 	"fmt"
-	"time"
-
 	"github.com/TUM-Dev/gocast/worker/pb"
 	log "github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/backoff"
 	"google.golang.org/grpc/credentials/insecure"
+	"time"
 )
 
 // interactively test your implementation here

worker/cmd/worker/worker.go

@@ -3,14 +3,6 @@ package main
 import (
 	"context"
 	"fmt"
-	"net/http"
-	_ "net/http/pprof"
-	"os"
-	"os/exec"
-	"os/signal"
-	"syscall"
-	"time"
-
 	"github.com/TUM-Dev/gocast/worker/api"
 	"github.com/TUM-Dev/gocast/worker/cfg"
 	"github.com/TUM-Dev/gocast/worker/pb"
@@ -21,18 +13,23 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/backoff"
 	"google.golang.org/grpc/credentials/insecure"
+	"net/http"
+	_ "net/http/pprof"
+	"os"
+	"os/exec"
+	"os/signal"
+	"syscall"
+	"time"
 )
 
 // OsSignal contains the current os signal received.
 // Application exits when it's terminating (kill, int, sigusr, term)
-var (
-	OsSignal   chan os.Signal
-	VersionTag = "dev"
-)
+var OsSignal chan os.Signal
+var VersionTag = "dev"
 
 // prepare checks if the required dependencies are installed
 func prepare() {
-	// check if ffmpeg is installed
+	//check if ffmpeg is installed
 	_, err := exec.LookPath("ffmpeg")
 	if err != nil {
 		log.Fatal("ffmpeg is not installed")
@@ -49,8 +46,7 @@ func main() {
 			BaseDelay:  1 * time.Second,
 			Multiplier: 1.6,
 			MaxDelay:   30 * time.Second,
-		},
-	}), grpc.WithBlock())
+		}}), grpc.WithBlock())
 	if err != nil {
 		log.Fatalf("Could not connect to main base: %v", err)
 	}

worker/edge/edge.go

@@ -5,6 +5,8 @@ import (
 	"crypto/rsa"
 	"encoding/json"
 	"fmt"
+	"github.com/golang-jwt/jwt/v4"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"io"
 	"log"
 	"mime"
@@ -22,9 +24,6 @@ import (
 	"sync"
 	"syscall"
 	"time"
-
-	"github.com/golang-jwt/jwt/v4"
-	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
 
 var (
@@ -35,15 +34,13 @@ var (
 	inflight     = make(map[string]*sync.Mutex)
 
 	allowedRe = regexp.MustCompile(`^/[a-zA-Z0-9]+/([a-zA-Z0-9_]+/)*[a-zA-Z0-9_]+\.(ts|m3u8)$`) // e.g. /vm123/live/stream/1234.ts
-	// allowedRe = regexp.MustCompile("^.*$") // e.g. /vm123/live/strean/1234.ts
+	//allowedRe = regexp.MustCompile("^.*$") // e.g. /vm123/live/strean/1234.ts
 )
 
 var port = ":8089"
 
-var (
-	originPort  = "8085"
-	originProto = "http://"
-)
+var originPort = "8085"
+var originProto = "http://"
 
 var VersionTag = "dev"
 
@@ -230,6 +227,7 @@ func vodHandler(w http.ResponseWriter, r *http.Request) {
 			}
 			r.URL.Path = strings.TrimPrefix(r.URL.Path, "/vod")
 			f, err := os.Open(path.Join(vodPath, path.Clean(r.URL.Path)))
+
 			if err != nil {
 				err404Playlists.WithLabelValues(claims.StreamID, claims.Playlist).Inc()
 				w.WriteHeader(http.StatusNotFound)
@@ -374,7 +372,7 @@ func fetchFile(host, file string) error {
 		return fmt.Errorf("parse file path: %s", file)
 	}
 	d := filepath.Dir(diskDir)
-	err = os.MkdirAll(d, 0o755)
+	err = os.MkdirAll(d, 0755)
 	if err != nil {
 		return err
 	}

worker/edge/go.mod

@@ -16,5 +16,5 @@ require (
 	github.com/prometheus/common v0.44.0 // indirect
 	github.com/prometheus/procfs v0.11.1 // indirect
 	golang.org/x/sys v0.11.0 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 )

worker/edge/go.sum

@@ -3,7 +3,6 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
 github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -12,7 +11,6 @@ github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8=
@@ -29,5 +27,5 @@ golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=

worker/edge/metrics.go

@@ -1,11 +1,10 @@
 package main
 
 import (
-	"sync"
-	"time"
-
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
+	"sync"
+	"time"
 )
 
 var (

worker/go.mod

@@ -4,18 +4,18 @@ go 1.21
 
 // Direct dependencies
 require (
-	github.com/getsentry/sentry-go v0.25.0
+	github.com/getsentry/sentry-go v0.23.0
 	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/icza/gox v0.0.0-20230924165045-adcb03233bb5
+	github.com/icza/gox v0.0.0-20230330130131-23e1aaac139e
 	github.com/iris-contrib/go.uuid v2.0.0+incompatible
 	github.com/joschahenningsen/thumbgen v0.1.2
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/shirou/gopsutil/v3 v3.23.12
+	github.com/shirou/gopsutil/v3 v3.23.7
 	github.com/sirupsen/logrus v1.9.3
-	github.com/tidwall/gjson v1.17.0
-	golang.org/x/sync v0.7.0
-	google.golang.org/grpc v1.60.1
-	google.golang.org/protobuf v1.33.0
+	github.com/tidwall/gjson v1.16.0
+	golang.org/x/sync v0.3.0
+	google.golang.org/grpc v1.57.0
+	google.golang.org/protobuf v1.31.0
 )
 
 require (
@@ -26,25 +26,25 @@ require (
 // Indirect dependencies
 require (
 	github.com/go-ole/go-ole v1.3.0 // indirect
-	github.com/lufia/plan9stats v0.0.0-20231016141302-07b5767bb0ed // indirect
+	github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a // indirect
 	github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
 	github.com/rogpeppe/go-internal v1.8.1 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
-	github.com/tklauser/go-sysconf v0.3.13 // indirect
-	github.com/tklauser/numcpus v0.7.0 // indirect
+	github.com/tklauser/go-sysconf v0.3.12 // indirect
+	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/u2takey/go-utils v0.3.1
 	github.com/yusufpapurcu/wmi v1.2.3 // indirect
-	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/net v0.14.0 // indirect
+	golang.org/x/sys v0.11.0 // indirect
+	golang.org/x/text v0.12.0 // indirect
 )
 
 require (
 	github.com/felixge/fgprof v0.9.3 // indirect
-	github.com/google/pprof v0.0.0-20231229205709-960ae82b1e42 // indirect
-	github.com/google/uuid v1.5.0 // indirect
+	github.com/google/pprof v0.0.0-20230811205829-9131a7e9cc17 // indirect
+	github.com/google/uuid v1.3.0 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
-	golang.org/x/image v0.18.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect
+	golang.org/x/image v0.11.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230814215434-ca7cfce7776a // indirect
 )