Skip to content

Commit 7453ad8

Browse files
myleshortonmyleshorton
authored
Merge pull request #1349 from getlantern/myles/flashlight-file-descs
Update to latest fronted that uses fewer file descs
2 parents 012b8c2 + 488cdd5 commit 7453ad8

2 files changed

Lines changed: 126 additions & 99 deletions

File tree

‎go.mod‎

Lines changed: 42 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/getlantern/lantern-client
22

3-
go 1.24.1
3+
go 1.24.2
4+
5+
toolchain go1.24.4
46

57
//replace github.com/getlantern/flashlight/v7 => ../flashlight
68

@@ -38,8 +40,8 @@ require (
3840
github.com/getlantern/eventual v1.0.0
3941
github.com/getlantern/eventual/v2 v2.0.2
4042
github.com/getlantern/filepersist v0.0.0-20210901195658-ed29a1cb0b7c
41-
github.com/getlantern/flashlight/v7 v7.6.213-0.20250501120106-0e5a6b731f1f
42-
github.com/getlantern/fronted v0.0.0-20250424205729-cbb127ee49ff
43+
github.com/getlantern/flashlight/v7 v7.6.221
44+
github.com/getlantern/fronted v0.0.0-20250613043431-4eb545c2da45
4345
github.com/getlantern/geolookup v0.0.0-20230327091034-aebe73c6eef4
4446
github.com/getlantern/golog v0.0.0-20230503153817-8e72de7e0a65
4547
github.com/getlantern/hidden v0.0.0-20220104173330-f221c5a24770
@@ -74,11 +76,11 @@ require (
7476
github.com/pterm/pterm v0.12.80
7577
github.com/shopspring/decimal v1.4.0
7678
github.com/stretchr/testify v1.10.0
77-
golang.org/x/crypto v0.32.0
79+
golang.org/x/crypto v0.37.0
7880
golang.org/x/mobile v0.0.0-20250106192035-c31d5b91ecc3
79-
golang.org/x/net v0.34.0
80-
golang.org/x/sys v0.29.0
81-
google.golang.org/protobuf v1.36.2
81+
golang.org/x/net v0.39.0
82+
golang.org/x/sys v0.32.0
83+
google.golang.org/protobuf v1.36.5
8284
nhooyr.io/websocket v1.8.17
8385
)
8486

@@ -91,14 +93,18 @@ require (
9193
github.com/cloudflare/circl v1.5.0 // indirect
9294
github.com/coder/websocket v1.8.12 // indirect
9395
github.com/containerd/console v1.0.3 // indirect
94-
github.com/getlantern/kindling v0.0.0-20250424205749-ea5826ac8971 // indirect
96+
github.com/flynn/noise v1.0.0 // indirect
97+
github.com/getlantern/dnstt v0.0.0-20250530230749-4d64f4edcf0f // indirect
98+
github.com/getlantern/kindling v0.0.0-20250613043843-39e9c56a78c4 // indirect
9599
github.com/getlantern/lantern-water v0.0.0-20241218135103-60224336cf1d // indirect
96100
github.com/getlantern/sing-vmess v0.0.0-20241209111030-0f2c02b4eb9a // indirect
97101
github.com/goccy/go-yaml v1.15.13 // indirect
98102
github.com/gofrs/uuid/v5 v5.3.0 // indirect
99103
github.com/gookit/color v1.5.4 // indirect
104+
github.com/josharian/native v1.1.0 // indirect
100105
github.com/lithammer/fuzzysearch v1.1.8 // indirect
101106
github.com/mattn/go-runewidth v0.0.16 // indirect
107+
github.com/mdlayher/socket v0.4.1 // indirect
102108
github.com/pion/dtls/v3 v3.0.3 // indirect
103109
github.com/pion/ice/v4 v4.0.2 // indirect
104110
github.com/pion/mdns/v2 v2.0.7 // indirect
@@ -108,11 +114,15 @@ require (
108114
github.com/pion/turn/v4 v4.0.0 // indirect
109115
github.com/pion/webrtc/v4 v4.0.0 // indirect
110116
github.com/protolambda/ctxlock v0.1.0 // indirect
117+
github.com/quic-go/qpack v0.5.1 // indirect
118+
github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66 // indirect
111119
github.com/rivo/uniseg v0.4.4 // indirect
112120
github.com/sagernet/sing v0.6.0-beta.11 // indirect
113121
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
122+
github.com/xtaci/kcp-go/v5 v5.6.20 // indirect
114123
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
115-
golang.org/x/term v0.28.0 // indirect
124+
golang.org/x/term v0.31.0 // indirect
125+
www.bamsoftware.com/git/dnstt.git v1.20241021.0 // indirect
116126
)
117127

118128
require (
@@ -178,7 +188,7 @@ require (
178188
github.com/frankban/quicktest v1.14.6 // indirect
179189
github.com/gaukas/wazerofs v0.1.0 // indirect
180190
github.com/getlantern/algeneva v0.0.0-20240605225338-caba0b3edf03 // indirect
181-
github.com/getlantern/broflake v0.0.0-20241220181831-2fc0e2904c90 // indirect
191+
github.com/getlantern/broflake v0.0.0-20250515135912-b53a6690f363 // indirect
182192
github.com/getlantern/bufconn v0.0.0-20210901195825-fd7c0267b493 // indirect
183193
github.com/getlantern/byteexec v0.0.0-20220903142956-e6ed20032cfd // indirect
184194
github.com/getlantern/cmux v0.0.0-20230301223233-dac79088a4c0 // indirect
@@ -202,7 +212,7 @@ require (
202212
github.com/getlantern/grtrack v0.0.0-20231025115619-bfbfadb228f3 // indirect
203213
github.com/getlantern/hellosplitter v0.1.1 // indirect
204214
github.com/getlantern/hex v0.0.0-20220104173244-ad7e4b9194dc // indirect
205-
github.com/getlantern/http-proxy-lantern/v2 v2.10.1 // indirect
215+
github.com/getlantern/http-proxy-lantern/v2 v2.10.2-0.20250610193808-3d299b602b1c // indirect
206216
github.com/getlantern/httpseverywhere v0.0.0-20201210200013-19ae11fc4eca // indirect
207217
github.com/getlantern/iptool v0.0.0-20230112135223-c00e863b2696 // indirect
208218
github.com/getlantern/kcp-go/v5 v5.0.0-20220503142114-f0c1cd6e1b54 // indirect
@@ -218,12 +228,12 @@ require (
218228
github.com/getlantern/preconn v1.0.0 // indirect
219229
github.com/getlantern/proxy/v3 v3.0.0-20240328103708-9185589b6a99 // indirect
220230
github.com/getlantern/psmux v1.5.15 // indirect
221-
github.com/getlantern/quicwrapper v0.0.0-20240229232335-e6b4c3c30b2f // indirect
231+
github.com/getlantern/quicwrapper v0.0.0-20250417060014-acb01527c4c2 // indirect
222232
github.com/getlantern/ratelimit v0.0.0-20220926192648-933ab81a6fc7 // indirect
223233
github.com/getlantern/rot13 v0.0.0-20220822172233-370767b2f782 // indirect
224234
github.com/getlantern/rotator v0.0.0-20160829164113-013d4f8e36a2 // indirect
225235
github.com/getlantern/shortcut v0.0.0-20211026183428-bf59a137fdec // indirect
226-
github.com/getlantern/telemetry v0.0.0-20230523155019-be7c1d8cd8cb // indirect
236+
github.com/getlantern/telemetry v0.0.0-20250606052628-8960164ec1f5 // indirect
227237
github.com/getlantern/tinywss v0.0.0-20211216020538-c10008a7d461 // indirect
228238
github.com/getlantern/tlsdefaults v0.0.0-20171004213447-cf35cfd0b1b4 // indirect
229239
github.com/getlantern/tlsdialer/v3 v3.0.5 // indirect
@@ -246,10 +256,10 @@ require (
246256
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
247257
github.com/golang/snappy v0.0.4 // indirect
248258
github.com/google/btree v1.1.3 // indirect
249-
github.com/google/go-cmp v0.6.0 // indirect
259+
github.com/google/go-cmp v0.7.0 // indirect
250260
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
251261
github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 // indirect
252-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
262+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
253263
github.com/hashicorp/golang-lru v1.0.2 // indirect
254264
github.com/huandu/xstrings v1.5.0 // indirect
255265
github.com/jaffee/commandeer v0.6.0 // indirect
@@ -266,7 +276,7 @@ require (
266276
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
267277
github.com/mattn/go-isatty v0.0.20 // indirect
268278
github.com/mattn/go-sqlite3 v2.0.2+incompatible // indirect
269-
github.com/mdlayher/netlink v1.1.0 // indirect
279+
github.com/mdlayher/netlink v1.7.2 // indirect
270280
github.com/mholt/archiver/v3 v3.5.1 // indirect
271281
github.com/miekg/dns v1.1.59 // indirect
272282
github.com/minio/sha256-simd v1.0.1 // indirect
@@ -312,8 +322,8 @@ require (
312322
github.com/prometheus/client_model v0.6.1 // indirect
313323
github.com/prometheus/common v0.61.0 // indirect
314324
github.com/prometheus/procfs v0.15.1 // indirect
315-
github.com/quic-go/quic-go v0.48.2 // indirect
316-
github.com/refraction-networking/utls v1.6.7 // indirect
325+
github.com/quic-go/quic-go v0.50.1 // indirect
326+
github.com/refraction-networking/utls v1.7.1 // indirect
317327
github.com/refraction-networking/water v0.7.0-alpha // indirect
318328
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
319329
github.com/rogpeppe/go-internal v1.13.1 // indirect
@@ -339,34 +349,33 @@ require (
339349
github.com/ulikunitz/xz v0.5.11 // indirect
340350
github.com/wlynxg/anet v0.0.5 // indirect
341351
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
342-
github.com/xtaci/smux v1.5.33 // indirect
352+
github.com/xtaci/smux v1.5.35-0.20250217141229-e6b0586a4539 // indirect
343353
gitlab.com/yawning/edwards25519-extra.git v0.0.0-20211229043746-2f91fcc9fbdb // indirect
344354
gitlab.com/yawning/obfs4.git v0.0.0-20220204003609-77af0cba934d // indirect
345355
go.etcd.io/bbolt v1.3.11 // indirect
346356
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
347-
go.opentelemetry.io/otel v1.33.0 // indirect
348-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0 // indirect
349-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0 // indirect
350-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
351-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 // indirect
352-
go.opentelemetry.io/otel/metric v1.33.0 // indirect
353-
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
354-
go.opentelemetry.io/otel/sdk/metric v1.31.0 // indirect
355-
go.opentelemetry.io/otel/trace v1.33.0 // indirect
357+
go.opentelemetry.io/otel v1.36.0 // indirect
358+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.35.0 // indirect
359+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
360+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0 // indirect
361+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
362+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
363+
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
364+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
356365
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
357366
go.uber.org/atomic v1.11.0 // indirect
358367
go.uber.org/mock v0.5.0 // indirect
359368
go.uber.org/multierr v1.11.0 // indirect
360369
go.uber.org/zap v1.27.0 // indirect
361370
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
362371
golang.org/x/mod v0.22.0 // indirect
363-
golang.org/x/sync v0.10.0 // indirect
364-
golang.org/x/text v0.21.0 // indirect
372+
golang.org/x/sync v0.13.0 // indirect
373+
golang.org/x/text v0.24.0 // indirect
365374
golang.org/x/time v0.9.0 // indirect
366375
golang.org/x/tools v0.29.0 // indirect
367-
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
368-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 // indirect
369-
google.golang.org/grpc v1.69.2 // indirect
376+
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
377+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
378+
google.golang.org/grpc v1.71.0 // indirect
370379
gopkg.in/yaml.v2 v2.4.0 // indirect
371380
gopkg.in/yaml.v3 v3.0.1 // indirect
372381
gvisor.dev/gvisor v0.0.0-20240912010154-1243db29d375 // indirect

0 commit comments

Comments
 (0)