Skip to content

Commit

Permalink
upgraded to go-micro 3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
dh1tw committed Apr 16, 2021
1 parent c4e1ece commit 1bab77d
Show file tree
Hide file tree
Showing 10 changed files with 752 additions and 1,780 deletions.
12 changes: 11 additions & 1 deletion ci/install-deps-windows.bat
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,14 @@ ECHO "install-deps starting..."
%MSYS_PATH%\usr\bin\bash -lc "pacman --noconfirm --needed -Sy curl"

ECHO "deps cleanup..."
%MSYS_PATH%\usr\bin\bash -lc "yes|pacman --noconfirm -Sc"
%MSYS_PATH%\usr\bin\bash -lc "yes|pacman --noconfirm -Sc"

pacman-cross -Sy make
pacman-cross -Sy --noconfirm --needed make
pacman-cross -Sy --noconfirm --needed mingw-w64-x86_64-gcc
pacman-cross -Sy --noconfirm --needed mingw-w64-x86_64-pkg-config
pacman-cross -Sy --noconfirm --needed mingw-w64-x86_64-libsamplerate
pacman-cross -Sy --noconfirm --needed mingw-w64-x86_64-portaudio
pacman-cross -Sy --noconfirm --needed mingw-w64-x86_64-opusfile
pacman-cross -Sy --noconfirm --needed mingw-w64-x86_64-opus
pacman-cross -Sy --noconfirm --needed mingw-w64-x86_64-protobuf
17 changes: 9 additions & 8 deletions cmd/client_nats.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ import (
"strings"
"time"

natsBroker "github.com/asim/go-micro/plugins/broker/nats/v3"
natsReg "github.com/asim/go-micro/plugins/registry/nats/v3"
natsTr "github.com/asim/go-micro/plugins/transport/nats/v3"

// _ "net/http/pprof"
"github.com/asim/go-micro/v3/client"
"github.com/asim/go-micro/v3/registry"
"github.com/asim/go-micro/v3/transport"
"github.com/dh1tw/remoteAudio/audio/chain"
"github.com/dh1tw/remoteAudio/audio/nodes/vox"
"github.com/dh1tw/remoteAudio/audio/sinks/pbWriter"
Expand All @@ -19,13 +27,6 @@ import (
"github.com/dh1tw/remoteAudio/trx"
"github.com/dh1tw/remoteAudio/webserver"
"github.com/gordonklaus/portaudio"
"github.com/micro/go-micro/client"
"github.com/micro/go-micro/client/selector/static"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/transport"
natsBroker "github.com/micro/go-plugins/broker/nats"
natsReg "github.com/micro/go-plugins/registry/nats"
natsTr "github.com/micro/go-plugins/transport/nats" // _ "net/http/pprof"
"github.com/nats-io/nats.go"
"github.com/spf13/cobra"
"github.com/spf13/viper"
Expand Down Expand Up @@ -203,7 +204,7 @@ func natsAudioClient(cmd *cobra.Command, args []string) {
client.Registry(reg),
client.PoolSize(1),
client.PoolTTL(time.Hour*8760), // one year - don't TTL our connection
client.Selector(static.NewSelector()),
client.ContentType("application/proto-rpc"),
)

speaker, err := scWriter.NewScWriter(
Expand Down
14 changes: 7 additions & 7 deletions cmd/server_nats.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ import (

// _ "net/http/pprof"

natsBroker "github.com/asim/go-micro/plugins/broker/nats/v3"
natsReg "github.com/asim/go-micro/plugins/registry/nats/v3"
natsTr "github.com/asim/go-micro/plugins/transport/nats/v3"
micro "github.com/asim/go-micro/v3"
"github.com/asim/go-micro/v3/broker"
"github.com/asim/go-micro/v3/registry"
"github.com/asim/go-micro/v3/server"
"github.com/dh1tw/remoteAudio/audio/chain"
"github.com/dh1tw/remoteAudio/audio/nodes/doorman"
"github.com/dh1tw/remoteAudio/audio/sinks/pbWriter"
Expand All @@ -21,13 +28,6 @@ import (
sbAudio "github.com/dh1tw/remoteAudio/sb_audio"
"github.com/gogo/protobuf/proto"
"github.com/gordonklaus/portaudio"
micro "github.com/micro/go-micro"
"github.com/micro/go-micro/broker"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/server"
natsBroker "github.com/micro/go-plugins/broker/nats"
natsReg "github.com/micro/go-plugins/registry/nats"
natsTr "github.com/micro/go-plugins/transport/nats"
"github.com/nats-io/nats.go"
"github.com/spf13/cobra"
"github.com/spf13/viper"
Expand Down
10 changes: 8 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,27 @@ go 1.14

require (
github.com/GeertJohan/go.rice v1.0.0
github.com/asim/go-micro/plugins/broker/nats/v3 v3.0.0-20210408173139-0d57213d3f5c
github.com/asim/go-micro/plugins/registry/nats/v3 v3.0.0-20210408173139-0d57213d3f5c
github.com/asim/go-micro/plugins/transport/nats/v3 v3.0.0-20210408173139-0d57213d3f5c
github.com/asim/go-micro/v3 v3.5.0
github.com/chewxy/math32 v1.0.6
github.com/dh1tw/golang-ring v0.0.0-20180327112950-d11a99b5aede
github.com/dh1tw/gosamplerate v0.1.2
github.com/go-audio/audio v1.0.0
github.com/go-audio/wav v1.0.0
github.com/gogo/protobuf v1.3.1
github.com/golang/protobuf v1.4.2
github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect
github.com/gordonklaus/portaudio v0.0.0-20180817120803-00e7307ccd93
github.com/gorilla/mux v1.7.4
github.com/gorilla/websocket v1.4.2
github.com/micro/go-micro v1.16.0
github.com/micro/go-plugins v1.5.1
github.com/nats-io/nats.go v1.10.0
github.com/spf13/afero v1.2.2 // indirect
github.com/spf13/cobra v1.0.0
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.7.0
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect
google.golang.org/protobuf v1.23.0
gopkg.in/hraban/opus.v2 v2.0.0-20200710132758-e28f8214483b
)
Loading

0 comments on commit 1bab77d

Please sign in to comment.