Skip to content

Commit

Permalink
Merge pull request #1257 from getlantern/myles/early-fronting
Browse files Browse the repository at this point in the history
Use latest flashlight code that initializes domain fronting quicker
  • Loading branch information
myleshorton authored Dec 12, 2024
2 parents c566ea3 + e5d2e49 commit 97658b2
Show file tree
Hide file tree
Showing 9 changed files with 68 additions and 112 deletions.
11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,12 @@ All these dependencies must be in your PATH. Some of this is Android specific, s
### 🚀 Setup Project:

* Install all prerequisites
* Run `git submodule update --init --recursive`
* Run `git lfs install && git pull`.
* Put the [app.env](https://my.1password.com/app#/everything/AllItems/whdjlkyj7ku6pumtyc7nh5vg4yadqasjh2hspgjgvgfllyekhcrq) file (Frontend vault) from 1Password in the repo root.
* Go to the **SDK MANAGER**
* Go to the **SDK MANAGER** (Tools->SDK Manager in Android Studio)
* Select **Android SDK**
* Check the SDK from android 5.0(LOLLIPOP) up to the Latest Version at the moment.
* Go to **SDK Tools** and check the option **Show Package Details**
* Go to the **SDK Tools** tab in the same window and check the option **Show Package Details**
* On the Android SDK Build-Tools, check from: SDK 30 up to the latest at the moment. (is optional if you wish to add more SDK alternatives such as 27.0, 28 or 29).
* On the NDK(Side by side) check the latest version of 22.x (not anything newer)
* Make sure that you have the latest **Android SDK Command-line Tools**
Expand All @@ -75,17 +74,17 @@ All these dependencies must be in your PATH. Some of this is Android specific, s
* Click on Apply and accept the Terms and Conditions.
* Open Xcode first time open Xcode and install necessary components
* Download Certificate and provisioning profile from 1Pass [Search [IOS Certificates and profiles](https://my.1password.com/vaults/all/allitems)]
* Lastly `Flutter Doctor` to confirm that your setup is correct and ready!
* Lastly `flutter doctor` to confirm that your setup is correct and ready!

### 🤖 Running the project on Android

* `make android-lib ANDROID_ARCH` (you need to generated liblantern-all.aar containing the Go backend code in order for the project to compile.)
* `make android` (you need to generated liblantern-all.aar containing the Go backend code in order for the project to compile.)
* `flutter pub get`
* `flutter run --flavor prod`

### 🍏 Running the project on iOS

* `make build-framework` (you need to generated Internalsdk.xcframework. containing the Go backend code in order for the project to compile.)
* `make ios` (you need to generated Internalsdk.xcframework. containing the Go backend code in order for the project to compile.)
* `flutter pub get`
* `flutter run --flavor prod`

Expand Down
29 changes: 16 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/getlantern/lantern-client

go 1.22.4
go 1.22.6

toolchain go1.22.8
toolchain go1.22.10

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

Expand Down Expand Up @@ -39,8 +39,8 @@ require (
github.com/getlantern/eventual v1.0.0
github.com/getlantern/eventual/v2 v2.0.2
github.com/getlantern/filepersist v0.0.0-20210901195658-ed29a1cb0b7c
github.com/getlantern/flashlight/v7 v7.6.150
github.com/getlantern/fronted v0.0.0-20241120203013-eedcd71609d2
github.com/getlantern/flashlight/v7 v7.6.160
github.com/getlantern/fronted v0.0.0-20241212194832-a55b6db2616e
github.com/getlantern/golog v0.0.0-20230503153817-8e72de7e0a65
github.com/getlantern/hidden v0.0.0-20220104173330-f221c5a24770
github.com/getlantern/i18n v0.0.0-20181205222232-2afc4f49bb1c
Expand Down Expand Up @@ -77,11 +77,16 @@ require (
golang.org/x/mobile v0.0.0-20241016134751-7ff83004ec2c
golang.org/x/net v0.30.0
golang.org/x/sys v0.26.0
google.golang.org/protobuf v1.34.2
google.golang.org/protobuf v1.35.2
nhooyr.io/websocket v1.8.17
)

require github.com/coder/websocket v1.8.12 // indirect
require (
github.com/alitto/pond/v2 v2.1.5 // indirect
github.com/cloudflare/circl v1.3.7 // indirect
github.com/coder/websocket v1.8.12 // indirect
github.com/golang/protobuf v1.5.4 // indirect
)

require (
filippo.io/edwards25519 v1.0.0 // indirect
Expand Down Expand Up @@ -144,7 +149,6 @@ require (
github.com/enobufs/go-nats v0.0.1 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/frankban/quicktest v1.14.6 // indirect
github.com/gaukas/godicttls v0.0.4 // indirect
github.com/gaukas/wazerofs v0.1.0 // indirect
github.com/getlantern/algeneva v0.0.0-20240605225338-caba0b3edf03 // indirect
github.com/getlantern/broflake v0.0.0-20241127130800-763b7ebbf090 // indirect
Expand All @@ -164,15 +168,15 @@ require (
github.com/getlantern/event v0.0.0-20210901195647-a7e3145142e6 // indirect
github.com/getlantern/fdcount v0.0.0-20210503151800-5decd65b3731 // indirect
github.com/getlantern/framed v0.0.0-20190601192238-ceb6431eeede // indirect
github.com/getlantern/geo v0.0.0-20240108161311-50692a1b69a9 // indirect
github.com/getlantern/geo v0.0.0-20241129152027-2fc88c10f91e // indirect
github.com/getlantern/go-socks5 v0.0.0-20171114193258-79d4dd3e2db5 // indirect
github.com/getlantern/go-update v0.0.0-20230221120840-8d795213a8bc // indirect
github.com/getlantern/gonat v0.0.0-20201001145726-634575ba87fb // indirect
github.com/getlantern/gowin v0.0.0-20160824205538-88fa116ddffc // indirect
github.com/getlantern/grtrack v0.0.0-20231025115619-bfbfadb228f3 // indirect
github.com/getlantern/hellosplitter v0.1.1 // indirect
github.com/getlantern/hex v0.0.0-20220104173244-ad7e4b9194dc // indirect
github.com/getlantern/http-proxy-lantern/v2 v2.10.1-0.20240614175233-0df4a97b806e // indirect
github.com/getlantern/http-proxy-lantern/v2 v2.10.1 // indirect
github.com/getlantern/httpseverywhere v0.0.0-20201210200013-19ae11fc4eca // indirect
github.com/getlantern/iptool v0.0.0-20230112135223-c00e863b2696 // indirect
github.com/getlantern/kcp-go/v5 v5.0.0-20220503142114-f0c1cd6e1b54 // indirect
Expand All @@ -196,9 +200,9 @@ require (
github.com/getlantern/telemetry v0.0.0-20230523155019-be7c1d8cd8cb // indirect
github.com/getlantern/tinywss v0.0.0-20211216020538-c10008a7d461 // indirect
github.com/getlantern/tlsdefaults v0.0.0-20171004213447-cf35cfd0b1b4 // indirect
github.com/getlantern/tlsdialer/v3 v3.0.3 // indirect
github.com/getlantern/tlsdialer/v3 v3.0.5 // indirect
github.com/getlantern/tlsmasq v0.4.7-0.20230302000139-6e479a593298 // indirect
github.com/getlantern/tlsresumption v0.0.0-20211216020551-6a3f901d86b9 // indirect
github.com/getlantern/tlsresumption v0.0.0-20241210052744-a1c6aacc1d4d // indirect
github.com/getlantern/tlsutil v0.5.3 // indirect
github.com/getlantern/uuid v1.2.0 // indirect
github.com/getlantern/winsvc v0.0.0-20160824205134-8bb3a5dbcc1d // indirect
Expand All @@ -214,7 +218,6 @@ require (
github.com/golang/gddo v0.0.0-20210115222349-20d68f94ee1f // indirect
github.com/golang/geo v0.0.0-20230421003525-6adc56603217 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/go-cmp v0.6.0 // indirect
Expand Down Expand Up @@ -284,7 +287,7 @@ require (
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/quic-go/quic-go v0.48.0 // indirect
github.com/refraction-networking/utls v1.3.3 // indirect
github.com/refraction-networking/utls v1.6.7
github.com/refraction-networking/water v0.7.0-alpha // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
Expand Down
Loading

0 comments on commit 97658b2

Please sign in to comment.