Skip to content

Commit

Permalink
Go version and components update
Browse files Browse the repository at this point in the history
  • Loading branch information
kirill-scherba committed Dec 18, 2024
1 parent 17d1594 commit fccdead
Show file tree
Hide file tree
Showing 5 changed files with 118 additions and 232 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.18
go-version: 1.23.4

# - name: Set private packages
# run: go env -w GOPRIVATE=github.com/teonet-go/teonews-dbcli
Expand Down
5 changes: 2 additions & 3 deletions cmd/teogw/main.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2022 Kirill Scherba <kirill@scherba.ru>. All rights reserved.
// Copyright 2022-2024 Kirill Scherba <kirill@scherba.ru>. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

Expand All @@ -24,7 +24,7 @@ const (
appShort = "teogw"
appName = "Teonet gateway application"
appLong = ""
appVersion = "0.6.7"
appVersion = "0.6.8"
)

var appStartTime = time.Now()
Expand Down Expand Up @@ -65,7 +65,6 @@ func main() {
flag.IntVar(&params.tru_port, "tp", 7701, "tru local port")

flag.StringVar(&params.signalAddr, "signal-addr", ":8081", "webrtc http signal service address")
flag.StringVar(&params.signalAddrTls, "signal-addr-ssl", ":8082", "webrtc https signal service address")

flag.Parse()

Expand Down
8 changes: 4 additions & 4 deletions cmd/teogw/webrtc.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2022-2023 Kirill Scherba <kirill@scherba.ru>. All rights reserved.
// Copyright 2022-2024 Kirill Scherba <kirill@scherba.ru>. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

Expand Down Expand Up @@ -26,7 +26,7 @@ func newWebRTC(teo *Teonet) (w *WebRTC, err error) {
w = new(WebRTC)
w.WebRTC, err = teowebrtc_server.New(
params.signalAddr,
params.signalAddrTls,
true,
name,
new(teogw.TeogwData).MarshalJson,
new(teogw.TeogwData).UnmarshalJson,
Expand All @@ -37,12 +37,12 @@ func newWebRTC(teo *Teonet) (w *WebRTC, err error) {
// Add WebRTC commands
w.Commands.
Add("hello",
func(gw teowebrtc_server.WebRTCData) (data []byte, err error) {
func(dc teowebrtc_server.DataChannel, gw teowebrtc_server.WebRTCData) (data []byte, err error) {
data = []byte("hello")
return
}).
Add("hello-2",
func(gw teowebrtc_server.WebRTCData) (data []byte, err error) {
func(dc teowebrtc_server.DataChannel, gw teowebrtc_server.WebRTCData) (data []byte, err error) {
data = []byte("hello-2")
return
})
Expand Down
62 changes: 30 additions & 32 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,52 +1,50 @@
module github.com/teonet-go/teogw

go 1.19
go 1.23.4

// replace github.com/teonet-go/teowebrtc_server => ../teowebrtc_server
// replace github.com/teonet-go/teowebrtc_client => ../teowebrtc_client

require (
github.com/kirill-scherba/bslice v0.0.2
github.com/teonet-go/teomon v0.5.14
github.com/teonet-go/teonet v0.6.0
github.com/teonet-go/teowebrtc_server v0.0.21
github.com/teonet-go/tru v0.0.16
github.com/teonet-go/teonet v0.6.6
github.com/teonet-go/teowebrtc_server v0.2.0
github.com/teonet-go/tru v0.0.18
)

require (
github.com/coder/websocket v1.8.12 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/denisbrodbeck/machineid v1.0.1 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/kirill-scherba/stable v0.0.8 // indirect
github.com/klauspost/compress v1.16.5 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/pion/datachannel v1.5.5 // indirect
github.com/pion/dtls/v2 v2.2.7 // indirect
github.com/pion/ice/v2 v2.3.6 // indirect
github.com/pion/interceptor v0.1.17 // indirect
github.com/pion/datachannel v1.5.8 // indirect
github.com/pion/dtls/v2 v2.2.12 // indirect
github.com/pion/ice/v2 v2.3.36 // indirect
github.com/pion/interceptor v0.1.29 // indirect
github.com/pion/logging v0.2.2 // indirect
github.com/pion/mdns v0.0.7 // indirect
github.com/pion/mdns v0.0.12 // indirect
github.com/pion/randutil v0.1.0 // indirect
github.com/pion/rtcp v1.2.10 // indirect
github.com/pion/rtp v1.7.13 // indirect
github.com/pion/sctp v1.8.7 // indirect
github.com/pion/sdp/v3 v3.0.6 // indirect
github.com/pion/srtp/v2 v2.0.15 // indirect
github.com/pion/stun v0.6.0 // indirect
github.com/pion/transport/v2 v2.2.1 // indirect
github.com/pion/turn/v2 v2.1.0 // indirect
github.com/pion/webrtc/v3 v3.2.9 // indirect
github.com/pion/rtcp v1.2.14 // indirect
github.com/pion/rtp v1.8.7 // indirect
github.com/pion/sctp v1.8.19 // indirect
github.com/pion/sdp/v3 v3.0.9 // indirect
github.com/pion/srtp/v2 v2.0.20 // indirect
github.com/pion/stun v0.6.1 // indirect
github.com/pion/transport/v2 v2.2.10 // indirect
github.com/pion/turn/v2 v2.1.6 // indirect
github.com/pion/webrtc/v3 v3.3.5 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/testify v1.8.4 // indirect
github.com/teonet-go/teowebrtc_client v0.0.15 // indirect
github.com/teonet-go/teowebrtc_log v0.0.1 // indirect
github.com/teonet-go/teowebrtc_signal v0.0.8 // indirect
github.com/teonet-go/teowebrtc_signal_client v0.0.9 // indirect
golang.org/x/crypto v0.9.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/sys v0.8.0 // indirect
github.com/stretchr/testify v1.9.0 // indirect
github.com/teonet-go/teowebrtc_client v0.2.0 // indirect
github.com/teonet-go/teowebrtc_log v0.2.0 // indirect
github.com/teonet-go/teowebrtc_signal v0.2.0 // indirect
github.com/teonet-go/teowebrtc_signal_client v0.2.0 // indirect
github.com/wlynxg/anet v0.0.3 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/sys v0.18.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
nhooyr.io/websocket v1.8.7 // indirect
)
Loading

0 comments on commit fccdead

Please sign in to comment.