[WIP] Re design core protocol (#574)

* Add rtc.proto/room.proto. * Add new protocol for sfu. * update. * fix simulcast params parase in stream event. * add example for sfu-v2. * update rtc.proto. * Add room.proto. * update. * (fix) update room proto; update biz * update. * rename parameters to config in JoinRequest; * update. * fix typo. * add files. * cleanup. * update. * update. * update room proto. * update room.proto. * Separate RoomService and Signal. * update. * add main.go for room. * (fix) add uid for AddParticipantRequest * (feat) adjust new room protocol * (feat) update redis package; (fix): room logic * add redis_test.go * update. * update. * fix typo * update. * update rtc.proto. * update rtc.proto. * update. * update * (feat): add conference; add all-in-one runner * update * update * update * update * update * update * (fix): update * fix: fix bug in sfu node. * (fix): sub layer * (fix): rm tracks when grpc close * (fix): rm downtrack; simulcast * (fix): room * (fix):update * (fix):update jwt pkg * (fix):update * (fix):update * Fix issue for nats-grpc proxy. * (fix):update * (fix):add conference readme * (fix):rm unuse * (fix):golangci-lint * (fix):join before create room * (fix):update go mod * (fix): ion-sfu pkg * (fix): update jwt * (fix): ci lint * (fix): rm avp * (fix): readme ci Co-authored-by: adwpc <adwpc@hotmail.com>
ionorg · Nov 3, 2021 · 5043298 · 5043298
1 parent fa6ef8c
commit 5043298
Show file tree

Hide file tree

Showing 93 changed files with 8,572 additions and 5,699 deletions.
diff --git a/.github/workflows/docker-app-biz.yaml → .github/workflows/docker-app-room.yaml b/.github/workflows/docker-app-biz.yaml → .github/workflows/docker-app-room.yaml
@@ -1,4 +1,4 @@
-name: app-biz docker
+name: app-room docker
 on:
   push:
     branches:
@@ -17,15 +17,15 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: build
-        run: docker build --tag pionwebrtc/ion:latest-app-biz -f docker/app-biz.Dockerfile .
+        run: docker build --tag pionwebrtc/ion:latest-app-room -f docker/app-room.Dockerfile .
 
       - name: login
         if: github.event_name == 'release'
         run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
 
       - name: tag
         if: github.event_name == 'release'
-        run: docker tag pionwebrtc/ion:latest-app-biz pionwebrtc/ion:"$TAG"-app-biz
+        run: docker tag pionwebrtc/ion:latest-app-room pionwebrtc/ion:"$TAG"-app-room
         env:
           TAG: ${{ github.event.release.tag_name }}
 

diff --git a/.github/workflows/docker-avp.yaml b/.github/workflows/docker-avp.yaml
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -12,8 +12,8 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Generate
-        run: go generate ./...
+      # - name: Generate
+        # run: go generate ./...
 
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2

diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ configs/node.pid
 configs/biz.pid
 configs/sfu.pid
 configs/avp.pid
+configs/signal.pid
 cmd/biz/biz
 cmd/sfu/sfu
 cmd/islb/islb

diff --git a/Makefile b/Makefile
@@ -5,19 +5,19 @@ GO_COVERPKGS:=$(shell echo $(GO_TESTPKGS) | paste -s -d ',')
 TEST_UID:=$(shell id -u)
 TEST_GID:=$(shell id -g)
 
-all: core app
+all: go_deps core app
 
 go_deps:
 	go mod download
 
-core: go_deps
+core:
 	go build -o bin/islb $(GO_LDFLAGS) cmd/islb/main.go
 	go build -o bin/sfu $(GO_LDFLAGS) cmd/sfu/main.go
-	go build -o bin/avp $(GO_LDFLAGS) cmd/avp/main.go
+	# go build -o bin/avp $(GO_LDFLAGS) cmd/avp/main.go
 	go build -o bin/signal $(GO_LDFLAGS) cmd/signal/main.go
 
 app:
-	go build -o bin/app-biz $(GO_LDFLAGS) apps/biz/main.go
+	go build -o bin/app-room $(GO_LDFLAGS) apps/room/main.go
 
 clean:
 	rm -rf bin
@@ -47,11 +47,10 @@ proto-gen-from-docker:
 proto: proto_core proto_app
 
 proto_core: 
-	protoc proto/ion/ion.proto --go_opt=module=github.com/pion/ion --go_out=. --go-grpc_opt=module=github.com/pion/ion --go-grpc_out=.
 	protoc proto/debug/debug.proto --experimental_allow_proto3_optional --go_opt=module=github.com/pion/ion --go_out=. --go-grpc_opt=module=github.com/pion/ion --go-grpc_out=.
-	protoc proto/sfu/sfu.proto --go_opt=module=github.com/pion/ion --go_out=. --go-grpc_opt=module=github.com/pion/ion --go-grpc_out=.
+	protoc proto/ion/ion.proto --go_opt=module=github.com/pion/ion --go_out=. --go-grpc_opt=module=github.com/pion/ion --go-grpc_out=.
 	protoc proto/islb/islb.proto --go_opt=module=github.com/pion/ion --go_out=. --go-grpc_opt=module=github.com/pion/ion --go-grpc_out=.
 	protoc proto/rtc/rtc.proto --go_opt=module=github.com/pion/ion --go_out=. --go-grpc_opt=module=github.com/pion/ion --go-grpc_out=.
 
 proto_app:
-	protoc apps/biz/proto/biz.proto --go_opt=module=github.com/pion/ion --go_out=. --go-grpc_opt=module=github.com/pion/ion --go-grpc_out=.
+	protoc apps/room/proto/room.proto --go_opt=module=github.com/pion/ion --go_out=. --go-grpc_opt=module=github.com/pion/ion --go-grpc_out=.
diff --git a/apps/auth/main.go b/apps/auth/main.go
@@ -0,0 +1,4 @@
+package main
+
+func main() {
+}
diff --git a/apps/auth/proto/auth.proto b/apps/auth/proto/auth.proto
@@ -0,0 +1,14 @@
+syntax = "proto3";
+
+option go_package = "github.com/pion/ion/apps/auth/proto";
+
+package auth;
+
+message Permission {
+  bool publish = 1;
+  bool subscribe = 2;
+  bool addPeers = 3;
+  bool removePeers = 4;
+  bool endSession = 5;
+  bool lockRoom = 6;
+}
diff --git a/apps/auth/server/service.go b/apps/auth/server/service.go
@@ -0,0 +1 @@
+package server
diff --git a/apps/biz/generate.go b/apps/biz/generate.go
diff --git a/apps/biz/main.go b/apps/biz/main.go