Merge branch 'master' into update-udp

.dockerignore

@@ -7,7 +7,6 @@ islb.Dockerfile
 web.Dockerfile
 docker-compose.yml
 docker
-configs
 docs
 screenshots
 */*/node_modules

cmd/avp/main.go

@@ -2,32 +2,57 @@ package main
 
 import (
 	"errors"
+	"fmt"
 	"net/http"
 	_ "net/http/pprof"
+	"path"
 
+	elements "github.com/pion/ion-elements"
 	conf "github.com/pion/ion/pkg/conf/avp"
 	"github.com/pion/ion/pkg/discovery"
 	"github.com/pion/ion/pkg/log"
 	"github.com/pion/ion/pkg/node/avp"
 	"github.com/pion/ion/pkg/process"
-	"github.com/pion/ion/pkg/process/elements"
 	"github.com/pion/ion/pkg/process/samples"
 	"github.com/pion/ion/pkg/proto"
 )
 
-func getDefaultElements(id string) map[string]elements.Element {
-	de := make(map[string]elements.Element)
+func getDefaultElements(id string) map[string]process.Element {
+	de := make(map[string]process.Element)
 	if conf.Pipeline.WebmSaver.Enabled && conf.Pipeline.WebmSaver.DefaultOn {
-		webm := elements.NewWebmSaver(id)
-		de[elements.TypeWebmSaver] = webm
+		filewriter := elements.NewFileWriter(elements.FileWriterConfig{
+			ID:   id,
+			Path: path.Join(conf.Pipeline.WebmSaver.Path, fmt.Sprintf("%s.webm", id)),
+		})
+		webm := elements.NewWebmSaver(elements.WebmSaverConfig{
+			ID: id,
+		})
+		err := webm.Attach(filewriter)
+		if err != nil {
+			log.Errorf("error attaching filewriter to webm %s", err)
+		} else {
+			de[elements.TypeWebmSaver] = webm
+		}
 	}
 	return de
 }
 
-func getTogglableElement(msg proto.ElementInfo) (elements.Element, error) {
+func getTogglableElement(msg proto.ElementInfo) (process.Element, error) {
 	switch msg.Type {
 	case elements.TypeWebmSaver:
-		return elements.NewWebmSaver(msg.MID), nil
+		filewriter := elements.NewFileWriter(elements.FileWriterConfig{
+			ID:   msg.MID,
+			Path: path.Join(conf.Pipeline.WebmSaver.Path, fmt.Sprintf("%s.webm", msg.MID)),
+		})
+		webm := elements.NewWebmSaver(elements.WebmSaverConfig{
+			ID: msg.MID,
+		})
+		err := webm.Attach(filewriter)
+		if err != nil {
+			log.Errorf("error attaching filewriter to webm %s", err)
+			return nil, err
+		}
+		return webm, nil
 	}
 
 	return nil, errors.New("element not found")

codecov.yml

@@ -10,10 +10,7 @@ coverage:
       default:
         # Allow decreasing 2% of total coverage to avoid noise.
         threshold: 2%
-    # patch:
-    #   default:
-    #     target: 30%
-    #     only_pulls: true
+    patch: off
 
 ignore:
   - "cmd/*"

docker-compose.stable.yml

@@ -2,10 +2,7 @@ version: "3.7"
 
 services:
   sfu:
-    image: pionwebrtc/ion-sfu:v0.4.1
-    command: "-c /configs/sfu.toml"
-    volumes:
-      - "./configs/docker/sfu.toml:/configs/sfu.toml"
+    image: pionwebrtc/ion-sfu:v0.4.4
     ports:
       - "5000-5200:5000-5200/udp"
     depends_on:
@@ -15,10 +12,7 @@ services:
       - ionnet
 
   biz:
-    image: pionwebrtc/ion-biz:v0.4.1
-    command: "-c /configs/biz.toml"
-    volumes:
-      - "./configs/docker/biz.toml:/configs/biz.toml"
+    image: pionwebrtc/ion-biz:v0.4.4
     ports:
       - 8443:8443
     networks:
@@ -28,10 +22,7 @@ services:
       - etcd
 
   islb:
-    image: pionwebrtc/ion-islb:v0.4.1
-    command: "-c /configs/islb.toml"
-    volumes:
-      - "./configs/docker/islb.toml:/configs/islb.toml"
+    image: pionwebrtc/ion-islb:v0.4.4
     depends_on:
       - nats
       - etcd

docker/avp.Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.14.2-stretch
+FROM golang:1.14.4-stretch
 
 ENV GO111MODULE=on
 
@@ -18,5 +18,7 @@ FROM alpine:3.12.0
 RUN apk --no-cache add ca-certificates
 COPY --from=0 /avp /usr/local/bin/avp
 
+COPY configs/docker/avp.toml /configs/avp.toml
+
 ENTRYPOINT ["/usr/local/bin/avp"]
 CMD ["-c", "/configs/avp.toml"]

docker/biz.Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.14.3-stretch
+FROM golang:1.14.4-stretch
 
 ENV GO111MODULE=on
 
@@ -18,5 +18,7 @@ FROM alpine:3.12.0
 RUN apk --no-cache add ca-certificates
 COPY --from=0 /biz /usr/local/bin/biz
 
+COPY configs/docker/biz.toml /configs/biz.toml
+
 ENTRYPOINT ["/usr/local/bin/biz"]
 CMD ["-c", "/configs/biz.toml"]

docker/islb.Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.14.3-stretch
+FROM golang:1.14.4-stretch
 
 ENV GO111MODULE=on
 
@@ -17,5 +17,7 @@ FROM alpine:3.12.0
 RUN apk --no-cache add ca-certificates
 COPY --from=0 /islb /usr/local/bin/islb
 
+COPY configs/docker/islb.toml /configs/islb.toml
+
 ENTRYPOINT ["/usr/local/bin/islb"]
 CMD ["-c", "/configs/islb.toml"]

docker/sfu.Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.14.3-stretch
+FROM golang:1.14.4-stretch
 
 ENV GO111MODULE=on
 
@@ -18,5 +18,7 @@ FROM alpine:3.12.0
 RUN apk --no-cache add ca-certificates
 COPY --from=0 /sfu /usr/local/bin/sfu
 
+COPY configs/docker/sfu.toml /configs/sfu.toml
+
 ENTRYPOINT ["/usr/local/bin/sfu"]
 CMD ["-c", "/configs/sfu.toml"]

go.mod

@@ -5,18 +5,16 @@ go 1.13
 require (
 	github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
 	github.com/at-wat/ebml-go v0.11.0
-	github.com/cloudwebrtc/go-protoo v0.0.0-20200510140124-cf4744e87257
-	github.com/cloudwebrtc/nats-protoo v0.0.0-20200328144814-d3c1c848d442
-	github.com/coreos/etcd v3.3.22+incompatible // indirect
-	github.com/dustin/go-humanize v1.0.0 // indirect
+	github.com/cloudwebrtc/go-protoo v0.0.0-20200602160428-0a199e23f7e0
+	github.com/cloudwebrtc/nats-protoo v0.0.0-20200602160410-25aa7ab703af
 	github.com/go-ole/go-ole v1.2.4 // indirect
 	github.com/go-redis/redis/v7 v7.3.0
 	github.com/google/uuid v1.1.1
 	github.com/json-iterator/go v1.1.9 // indirect
 	github.com/klauspost/cpuid v1.2.3 // indirect
 	github.com/klauspost/reedsolomon v1.9.3 // indirect
-	github.com/nats-io/nats-server/v2 v2.1.4 // indirect
 	github.com/notedit/sdp v0.0.4
+	github.com/pion/ion-elements v0.1.1 // indirect
 	github.com/pion/rtcp v1.2.3
 	github.com/pion/rtp v1.5.4
 	github.com/pion/stun v0.3.5
@@ -30,7 +28,7 @@ require (
 	github.com/tjfoc/gmsm v1.3.1 // indirect
 	github.com/xtaci/kcp-go v5.4.20+incompatible
 	github.com/xtaci/lossyconn v0.0.0-20200209145036-adba10fffc37 // indirect
-	go.etcd.io/etcd v3.3.22+incompatible
+	go.etcd.io/etcd v3.3.4+incompatible
 	golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37
-	sigs.k8s.io/yaml v1.2.0 // indirect
+	gopkg.in/yaml.v2 v2.2.8 // indirect
 )

go.sum

@@ -39,10 +39,10 @@ github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wX
 github.com/chuckpreslar/emission v0.0.0-20170206194824-a7ddd980baf9 h1:xz6Nv3zcwO2Lila35hcb0QloCQsc38Al13RNEzWRpX4=
 github.com/chuckpreslar/emission v0.0.0-20170206194824-a7ddd980baf9/go.mod h1:2wSM9zJkl1UQEFZgSd68NfCgRz1VL1jzy/RjCg+ULrs=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cloudwebrtc/go-protoo v0.0.0-20200510140124-cf4744e87257 h1:wFUOcfpZkIkTj3VLzzDGFkpXIkP7N/JOnliKLpCqjyY=
-github.com/cloudwebrtc/go-protoo v0.0.0-20200510140124-cf4744e87257/go.mod h1:Q0DiItmsD5iCBdeID9Xu03ok8bemc78XJ+0rYATQbuQ=
-github.com/cloudwebrtc/nats-protoo v0.0.0-20200328144814-d3c1c848d442 h1:jQwLu2qva1swuN+HcWSpr+SrJ/zPScQegf6gVG0fiok=
-github.com/cloudwebrtc/nats-protoo v0.0.0-20200328144814-d3c1c848d442/go.mod h1:GChOgYiUBBZTCzjSPbPCDIQCAtScaaJmvb41Vw83TLQ=
+github.com/cloudwebrtc/go-protoo v0.0.0-20200602160428-0a199e23f7e0 h1:7lmqBSdb1ILwUJalqJdIoWPH0cnnQt4NshxXnVvrmx0=
+github.com/cloudwebrtc/go-protoo v0.0.0-20200602160428-0a199e23f7e0/go.mod h1:Q0DiItmsD5iCBdeID9Xu03ok8bemc78XJ+0rYATQbuQ=
+github.com/cloudwebrtc/nats-protoo v0.0.0-20200602160410-25aa7ab703af h1:M6ONhwD/EXjYLVdw23/xFkcQUEEj3tn500N3S6d4bLA=
+github.com/cloudwebrtc/nats-protoo v0.0.0-20200602160410-25aa7ab703af/go.mod h1:zwKwTqbrcBl9o2AHopHYlMh4KM3wMQHYeR6TrtoRCQ0=
 github.com/coreos/bbolt v1.3.2 h1:wZwiHHUieZCquLkDL0B8UhzreNWsPHooDAG3q34zk0s=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
@@ -60,11 +60,11 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
-github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
@@ -91,11 +91,22 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0 h1:oOuy+ugB+P/kBdUnG5QaMXSIyJ1q38wWSojYCb3z5VQ=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -142,6 +153,7 @@ github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -190,18 +202,16 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
 github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/nats-io/jwt v0.3.0 h1:xdnzwFETV++jNc4W1mw//qFyJGb2ABOombmZJQS4+Qo=
-github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
 github.com/nats-io/jwt v0.3.2 h1:+RB5hMpXUUA2dfxuhBTEkMOrYmM+gKIZYS1KjSostMI=
 github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU=
-github.com/nats-io/nats-server/v2 v2.1.4 h1:BILRnsJ2Yb/fefiFbBWADpViGF69uh4sxe8poVDQ06g=
-github.com/nats-io/nats-server/v2 v2.1.4/go.mod h1:Jw1Z28soD/QasIA2uWjXyM9El1jly3YwyFOuR8tH1rg=
-github.com/nats-io/nats.go v1.9.1 h1:ik3HbLhZ0YABLto7iX80pZLPw/6dx3T+++MZJwLnMrQ=
-github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w=
-github.com/nats-io/nkeys v0.1.0 h1:qMd4+pRHgdr1nAClu+2h/2a5F2TmKcCzjCDazVgRoX4=
-github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
+github.com/nats-io/nats-server/v2 v2.1.7 h1:jCoQwDvRYJy3OpOTHeYfvIPLP46BMeDmH7XEJg/r42I=
+github.com/nats-io/nats-server/v2 v2.1.7/go.mod h1:rbRrRE/Iv93O/rUvZ9dh4NfT0Cm9HWjW/BqOWLGgYiE=
+github.com/nats-io/nats.go v1.10.0 h1:L8qnKaofSfNFbXg0C5F71LdjPRnmQwSsA4ukmkt1TvY=
+github.com/nats-io/nats.go v1.10.0/go.mod h1:AjGArbfyR50+afOUotNX2Xs5SYHf+CoOa5HH1eEl2HE=
 github.com/nats-io/nkeys v0.1.3 h1:6JrEfig+HzTH85yxzhSVbjHRJv9cn0p6n3IngIcM5/k=
 github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
+github.com/nats-io/nkeys v0.1.4 h1:aEsHIssIk6ETN5m2/MD8Y4B2X7FfXrBAUdkyRvbVYzA=
+github.com/nats-io/nkeys v0.1.4/go.mod h1:XdZpAbhgyyODYqjTawOnIOI7VlbKSarI9Gfy1tqEu/s=
 github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/notedit/sdp v0.0.4 h1:P4L8HbZ8SfzrRDE2m3zPnkHhcSdr/0sZkapKo0lyDJs=
@@ -223,6 +233,17 @@ github.com/pion/dtls/v2 v2.0.0 h1:Fk+MBhLZ/U1bImzAhmzwbO/pP2rKhtTw8iA934H3ybE=
 github.com/pion/dtls/v2 v2.0.0/go.mod h1:VkY5VL2wtsQQOG60xQ4lkV5pdn0wwBBTzCfRJqXhp3A=
 github.com/pion/ice v0.7.15 h1:s1In+gnuyVq7WKWGVQL+1p+OcrMsbfL+VfSe2isH8Ag=
 github.com/pion/ice v0.7.15/go.mod h1:Z6zybEQgky5mZkKcLfmvc266JukK2srz3VZBBD1iXBw=
+github.com/pion/ion v0.4.2-0.20200602171638-d7dc6b713737/go.mod h1:pzWW8GmeHqhuFfoyuhgUsNFcHsAihgIxvdRLFmyv4lM=
+github.com/pion/ion-elements v0.0.0-20200602184012-6219471db5b9 h1:QvYlkLQWQea44i2GThoV7TmAgxRZAZ7QJbYjTXzbgaQ=
+github.com/pion/ion-elements v0.0.0-20200602184012-6219471db5b9/go.mod h1:8ptjqR31WjjKkRZQlWP1el4t1VHUfkdyDGJaBhd2OGM=
+github.com/pion/ion-elements v0.1.0 h1:8ARiVz+zX1p8Ji9tWiYSr3UDC1877k5WGOPO2CAdbhg=
+github.com/pion/ion-elements v0.1.0/go.mod h1:8ptjqR31WjjKkRZQlWP1el4t1VHUfkdyDGJaBhd2OGM=
+github.com/pion/ion-elements v0.1.1-0.20200603152220-97e954fa8147 h1:vMimzA4eshiRuTtC+sTQtJCCWLuVP1MMtP96eq6aaos=
+github.com/pion/ion-elements v0.1.1-0.20200603152220-97e954fa8147/go.mod h1:8ptjqR31WjjKkRZQlWP1el4t1VHUfkdyDGJaBhd2OGM=
+github.com/pion/ion-elements v0.1.1-0.20200603153622-8d2b6b850c9b h1:ko42eDxfJcqNjkSgi3iM0jSF/pt0K3E2i/eApgrl4tE=
+github.com/pion/ion-elements v0.1.1-0.20200603153622-8d2b6b850c9b/go.mod h1:8ptjqR31WjjKkRZQlWP1el4t1VHUfkdyDGJaBhd2OGM=
+github.com/pion/ion-elements v0.1.1 h1:loeBUKq1YAOOw5swvsdHfb9B/6KiipiTvS0BDmxc18g=
+github.com/pion/ion-elements v0.1.1/go.mod h1:8ptjqR31WjjKkRZQlWP1el4t1VHUfkdyDGJaBhd2OGM=
 github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY=
 github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms=
 github.com/pion/mdns v0.0.4 h1:O4vvVqr4DGX63vzmO6Fw9vpy3lfztVWHGCQfyw0ZLSY=
@@ -233,9 +254,7 @@ github.com/pion/rtcp v1.2.1 h1:S3yG4KpYAiSmBVqKAfgRa5JdwBNj4zK3RLUa8JYdhak=
 github.com/pion/rtcp v1.2.1/go.mod h1:a5dj2d6BKIKHl43EnAOIrCczcjESrtPuMgfmL6/K6QM=
 github.com/pion/rtcp v1.2.3 h1:2wrhKnqgSz91Q5nzYTO07mQXztYPtxL8a0XOss4rJqA=
 github.com/pion/rtcp v1.2.3/go.mod h1:zGhIv0RPRF0Z1Wiij22pUt5W/c9fevqSzT4jje/oK7I=
-github.com/pion/rtp v1.4.0 h1:EkeHEXKuJhZoRUxtL2Ie80vVg9gBH+poT9UoL8M14nw=
 github.com/pion/rtp v1.4.0/go.mod h1:/l4cvcKd0D3u9JLs2xSVI95YkfXW87a3br3nqmVtSlE=
-github.com/pion/rtp v1.5.3 h1:5OPyxyTa1zclKP6mOaQFuxbslGEekIdnqGu9iR2Hvg4=
 github.com/pion/rtp v1.5.3/go.mod h1:bg60AL5GotNOlYZsqycbhDtEV3TkfbpXG0KBiUq29Mg=
 github.com/pion/rtp v1.5.4 h1:PuNg6xqV3brIUihatcKZj1YDUs+M45L0ZbrZWYtkDxY=
 github.com/pion/rtp v1.5.4/go.mod h1:bg60AL5GotNOlYZsqycbhDtEV3TkfbpXG0KBiUq29Mg=
@@ -480,6 +499,15 @@ google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZi
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1 h1:j6XxA85m/6txkUCHvzlV5f+HBNl/1r5cZ2A/3IEFOO8=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0 h1:cJv5/xdbk1NnMPR1VP9+HU6gupuG9MLBoH1r6RHZ2MY=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -506,5 +534,4 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
-sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=

pkg/conf/avp/conf.go

@@ -98,7 +98,7 @@ func (c *Config) load() bool {
 		fmt.Printf("config file %s read failed. %v\n", c.CfgFile, err)
 		return false
 	}
-	err = viper.GetViper().UnmarshalExact(c)
+	err = viper.GetViper().Unmarshal(c)
 	if err != nil {
 		fmt.Printf("config file %s loaded failed. %v\n", c.CfgFile, err)
 		return false

pkg/db/redis_test.go

@@ -12,9 +12,9 @@ var (
 	db     *Redis
 	dc     = "dc1"
 	node   = "sfu1"
-	room   = "room1"
-	uid    = "uuid-xxxxx-xxxxx-xxxxx-xxxxx"
-	mid    = "mid-xxxxx-xxxxx-xxxxx-xxxxx"
+	room   = proto.RID("room1")
+	uid    = proto.UID("uuid-xxxxx-xxxxx-xxxxx-xxxxx")
+	mid    = proto.MID("mid-xxxxx-xxxxx-xxxxx-xxxxx")
 	msid0  = "pion audio"
 	msid1  = "pion video"
 	track0 = proto.TrackInfo{Ssrc: 3694449886, Payload: 111, Type: "audio", ID: "aid0"}
@@ -36,7 +36,7 @@ var (
 	ukey = proto.UserInfo{
 		DC:  dc,
 		RID: room,
-		UID: room,
+		UID: uid,
 	}.BuildKey()
 )