update to ari 5 release

mtryfoss · Mar 7, 2020 · ab115eb · ab115eb
1 parent 9ba2278
commit ab115eb
Show file tree

Hide file tree

Showing 49 changed files with 183 additions and 223 deletions.
diff --git a/_examples/bridge/main.go b/_examples/bridge/main.go
@@ -1,16 +1,15 @@
 package main
 
 import (
+	"context"
 	"sync"
 
-	"golang.org/x/net/context"
-
 	"github.com/inconshreveable/log15"
 
-	"github.com/CyCoreSystems/ari"
 	"github.com/CyCoreSystems/ari-proxy/client"
-	"github.com/CyCoreSystems/ari/ext/play"
-	"github.com/CyCoreSystems/ari/rid"
+	rid "github.com/CyCoreSystems/ari-rid"
+	"github.com/CyCoreSystems/ari/v5"
+	"github.com/CyCoreSystems/ari/v5/ext/play"
 	"github.com/pkg/errors"
 )
 
@@ -51,7 +50,7 @@ func appStart(ctx context.Context, cl ari.Client) func(*ari.ChannelHandle, *ari.
 
 		if err := h.Answer(); err != nil {
 			log.Error("failed to answer call", "error", err)
-			//return
+			// return
 		}
 
 		if err := ensureBridge(ctx, cl, h.Key()); err != nil {

diff --git a/_examples/play/main.go b/_examples/play/main.go
@@ -1,13 +1,13 @@
 package main
 
 import (
-	"golang.org/x/net/context"
+	"context"
 
 	"github.com/inconshreveable/log15"
 
-	"github.com/CyCoreSystems/ari"
 	"github.com/CyCoreSystems/ari-proxy/client"
-	"github.com/CyCoreSystems/ari/ext/play"
+	"github.com/CyCoreSystems/ari/v5"
+	"github.com/CyCoreSystems/ari/v5/ext/play"
 )
 
 var ariApp = "test"
@@ -47,7 +47,7 @@ func appStart(ctx context.Context) func(*ari.ChannelHandle, *ari.StasisStart) {
 
 		if err := h.Answer(); err != nil {
 			log.Error("failed to answer call", "error", err)
-			//return
+			// return
 		}
 
 		if err := play.Play(ctx, h, play.URI("sound:tt-monkeys")).Err(); err != nil {

diff --git a/_examples/record/main.go b/_examples/record/main.go
@@ -1,13 +1,13 @@
 package main
 
 import (
-	"golang.org/x/net/context"
+	"context"
 
 	"github.com/inconshreveable/log15"
 
-	"github.com/CyCoreSystems/ari"
 	"github.com/CyCoreSystems/ari-proxy/client"
-	"github.com/CyCoreSystems/ari/ext/record"
+	"github.com/CyCoreSystems/ari/v5"
+	"github.com/CyCoreSystems/ari/v5/ext/record"
 )
 
 var ariApp = "test"
@@ -49,7 +49,7 @@ func appStart(ctx context.Context) func(*ari.ChannelHandle, *ari.StasisStart) {
 
 		if err := h.Answer(); err != nil {
 			log.Error("failed to answer call", "error", err)
-			//return
+			// return
 		}
 
 		res, err := record.Record(ctx, h,

diff --git a/_examples/stasisStart/main.go b/_examples/stasisStart/main.go
@@ -1,14 +1,13 @@
 package main
 
 import (
+	"context"
 	"net/http"
 	"sync"
 
-	"golang.org/x/net/context"
-
-	"github.com/CyCoreSystems/ari"
 	"github.com/CyCoreSystems/ari-proxy/client"
-	"github.com/CyCoreSystems/ari/client/native"
+	"github.com/CyCoreSystems/ari/v5"
+	"github.com/CyCoreSystems/ari/v5/client/native"
 
 	"github.com/inconshreveable/log15"
 )
@@ -124,7 +123,6 @@ func channelHandler(h *ari.ChannelHandle, startEvent *ari.StasisStart) {
 				log.Info("New Channel State", "state", v.Channel.State)
 			}
 		}
-
 	}()
 
 	h.Answer()

diff --git a/client/application.go b/client/application.go
@@ -1,8 +1,8 @@
 package client
 
 import (
-	"github.com/CyCoreSystems/ari"
 	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari/v5"
 )
 
 type application struct {

diff --git a/client/asterisk.go b/client/asterisk.go
@@ -1,8 +1,8 @@
 package client
 
 import (
-	"github.com/CyCoreSystems/ari"
 	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari/v5"
 )
 
 type asterisk struct {

diff --git a/client/bridge.go b/client/bridge.go
@@ -1,9 +1,9 @@
 package client
 
 import (
-	"github.com/CyCoreSystems/ari"
 	"github.com/CyCoreSystems/ari-proxy/proxy"
-	"github.com/CyCoreSystems/ari/rid"
+	rid "github.com/CyCoreSystems/ari-rid"
+	"github.com/CyCoreSystems/ari/v5"
 )
 
 type bridge struct {
@@ -231,3 +231,20 @@ func (b *bridge) Subscribe(key *ari.Key, n ...string) ari.Subscription {
 
 	return b.c.Bus().Subscribe(key, n...)
 }
+
+func (b *bridge) VideoSource(key *ari.Key, channelID string) error {
+	return b.c.commandRequest(&proxy.Request{
+		Kind: "BridgeVideoSource",
+		Key:  key,
+		BridgeVideoSource: &proxy.BridgeVideoSource{
+			Channel: channelID,
+		},
+	})
+}
+
+func (b *bridge) VideoSourceDelete(key *ari.Key) error {
+	return b.c.commandRequest(&proxy.Request{
+		Kind: "BridgeVideoSourceDelete",
+		Key:  key,
+	})
+}
diff --git a/client/bus/bus.go b/client/bus/bus.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/CyCoreSystems/ari"
+	"github.com/CyCoreSystems/ari/v5"
 	"github.com/inconshreveable/log15"
 
 	"github.com/nats-io/nats.go"

diff --git a/client/bus/bus_test.go b/client/bus/bus_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/inconshreveable/log15"
 
-	"github.com/CyCoreSystems/ari"
+	"github.com/CyCoreSystems/ari/v5"
 )
 
 func TestMatchEvent(t *testing.T) {

diff --git a/client/channel.go b/client/channel.go
@@ -3,9 +3,9 @@ package client
 import (
 	"time"
 
-	"github.com/CyCoreSystems/ari"
 	"github.com/CyCoreSystems/ari-proxy/proxy"
-	"github.com/CyCoreSystems/ari/rid"
+	rid "github.com/CyCoreSystems/ari-rid"
+	"github.com/CyCoreSystems/ari/v5"
 )
 
 type channel struct {

diff --git a/client/client.go b/client/client.go
@@ -5,11 +5,11 @@ import (
 	"os"
 	"time"
 
-	"github.com/CyCoreSystems/ari"
 	"github.com/CyCoreSystems/ari-proxy/client/bus"
 	"github.com/CyCoreSystems/ari-proxy/client/cluster"
 	"github.com/CyCoreSystems/ari-proxy/proxy"
-	"github.com/CyCoreSystems/ari/rid"
+	rid "github.com/CyCoreSystems/ari-rid"
+	"github.com/CyCoreSystems/ari/v5"
 
 	"github.com/inconshreveable/log15"
 	"github.com/nats-io/nats.go"
@@ -476,7 +476,6 @@ func (c *Client) getRequest(req *proxy.Request) (*ari.Key, error) {
 
 func (c *Client) dataRequest(req *proxy.Request) (*proxy.EntityData, error) {
 	resp, err := c.makeRequest("data", req)
-
 	if err != nil {
 		return nil, err
 	}

diff --git a/client/clientserver_test.go b/client/clientserver_test.go
@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/CyCoreSystems/ari"
 	"github.com/CyCoreSystems/ari-proxy/server"
-	"github.com/CyCoreSystems/ari/rid"
+	rid "github.com/CyCoreSystems/ari-rid"
+	"github.com/CyCoreSystems/ari/v5"
 	"github.com/nats-io/nats.go"
 )
 

diff --git a/client/cluster/cluster_test.go b/client/cluster/cluster_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/CyCoreSystems/ari/rid"
+	rid "github.com/CyCoreSystems/ari-rid"
 )
 
 func TestHash(t *testing.T) {
@@ -106,5 +106,4 @@ func TestPurge(t *testing.T) {
 	if len(list) != 2 {
 		t.Errorf("Incorrect number of cluster members: %d != 2", len(list))
 	}
-
 }
diff --git a/client/config.go b/client/config.go
@@ -1,8 +1,8 @@
 package client
 
 import (
-	"github.com/CyCoreSystems/ari"
 	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari/v5"
 )
 
 type config struct {

diff --git a/client/device.go b/client/device.go
@@ -1,8 +1,8 @@
 package client
 
 import (
-	"github.com/CyCoreSystems/ari"
 	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari/v5"
 )
 
 type deviceState struct {

diff --git a/client/endpoint.go b/client/endpoint.go
@@ -1,8 +1,8 @@
 package client
 
 import (
-	"github.com/CyCoreSystems/ari"
 	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari/v5"
 )
 
 type endpoint struct {

diff --git a/client/listen.go b/client/listen.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/CyCoreSystems/ari"
+	"github.com/CyCoreSystems/ari/v5"
 	"github.com/nats-io/nats.go"
 	"github.com/pkg/errors"
 )

diff --git a/client/liveRecording.go b/client/liveRecording.go
@@ -1,8 +1,8 @@
 package client
 
 import (
-	"github.com/CyCoreSystems/ari"
 	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari/v5"
 )
 
 type liveRecording struct {
@@ -19,7 +19,6 @@ func (l *liveRecording) Get(key *ari.Key) *ari.LiveRecordingHandle {
 		return ari.NewLiveRecordingHandle(key, l, nil)
 	}
 	return ari.NewLiveRecordingHandle(k, l, nil)
-
 }
 
 func (l *liveRecording) Data(key *ari.Key) (*ari.LiveRecordingData, error) {

diff --git a/client/logging.go b/client/logging.go
@@ -1,8 +1,8 @@
 package client
 
 import (
-	"github.com/CyCoreSystems/ari"
 	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari/v5"
 )
 
 type logging struct {

diff --git a/client/mailbox.go b/client/mailbox.go
@@ -1,8 +1,8 @@
 package client
 
 import (
-	"github.com/CyCoreSystems/ari"
 	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari/v5"
 )
 
 type mailbox struct {

diff --git a/client/modules.go b/client/modules.go
@@ -1,8 +1,8 @@
 package client
 
 import (
-	"github.com/CyCoreSystems/ari"
 	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari/v5"
 )
 
 type modules struct {

diff --git a/client/playback.go b/client/playback.go
@@ -1,8 +1,8 @@
 package client
 
 import (
-	"github.com/CyCoreSystems/ari"
 	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari/v5"
 )
 
 type playback struct {

diff --git a/client/sound.go b/client/sound.go
@@ -1,8 +1,8 @@
 package client
 
 import (
-	"github.com/CyCoreSystems/ari"
 	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari/v5"
 )
 
 type sound struct {

diff --git a/client/storedRecording.go b/client/storedRecording.go
@@ -1,8 +1,8 @@
 package client
 
 import (
-	"github.com/CyCoreSystems/ari"
 	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari/v5"
 )
 
 type storedRecording struct {

diff --git a/cmd.go b/cmd.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/CyCoreSystems/ari-proxy/server"
-	"github.com/CyCoreSystems/ari/client/native"
+	"github.com/CyCoreSystems/ari/v5/client/native"
 
 	"github.com/inconshreveable/log15"
 	"github.com/nats-io/nats.go"
@@ -33,7 +33,7 @@ var RootCmd = &cobra.Command{
 			os.Exit(0)
 		}
 
-		var handler = log15.StdoutHandler
+		handler := log15.StdoutHandler
 		if viper.GetBool("verbose") {
 			Log.Info("verbose logging enabled")
 			handler = log15.LvlFilterHandler(log15.LvlDebug, handler)
@@ -98,7 +98,6 @@ func readConfig() {
 }
 
 func runServer(ctx context.Context, log log15.Logger) error {
-
 	natsURL := viper.GetString("nats.url")
 	if os.Getenv("NATS_SERVICE_HOST") != "" {
 		natsURL = "nats://" + os.Getenv("NATS_SERVICE_HOST") + ":" + os.Getenv("NATS_SERVICE_PORT_CLIENT")
@@ -115,5 +114,4 @@ func runServer(ctx context.Context, log log15.Logger) error {
 		URL:          viper.GetString("ari.http_url"),
 		WebsocketURL: viper.GetString("ari.websocket_url"),
 	}, natsURL)
-
 }