chore: add outline-go-tun2socks, except android #1744

daniellacosse · 2023-10-05T15:39:48Z

For now we're not copying the Android build over until we figure out what's going on there.

Issues

Getting this and I'm not sure why? Do we care?

# tools/find_tap_name.go

could not import golang.org/x/sys/windows/registry (no required module provides package "golang.org/x/sys/windows/registry")compiler[BrokenImport](https://pkg.go.dev/golang.org/x/tools/internal/typesinternal#BrokenImport)
error while importing golang.org/x/sys/windows/registry: build constraints exclude all Go files in /Users/daniellacosse/go/pkg/mod/golang.org/x/[email protected]/windows/registrycompiler

is it because it's also package main?

outline/tun2socks/intra/doh/doh.go

codecov · 2023-10-05T15:43:40Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (9133950) 32% compared to head (37f9e14) 32%.

Additional details and impacted files

@@          Coverage Diff           @@
##           master   #1744   +/-   ##
======================================
  Coverage      32%     32%           
======================================
  Files          45      45           
  Lines        2609    2609           
  Branches      337     337           
======================================
  Hits          859     859           
  Misses       1750    1750

Flag	Coverage Δ
apple	`15% <ø> (ø)`
ios	`15% <ø> (ø)`
maccatalyst	`15% <ø> (ø)`
macos	`15% <ø> (ø)`
unittests	`32% <ø> (ø)`
www	`40% <ø> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

fortuna

Let's remove the Intra code from this PR.
Only the Outline code should be here.

outline/tun2socks/Makefile

jyyi1

Thanks @daniellacosse for the contribution, I have a question, after removing intra, shall we just embed the building process within client's npm build action?

.github/workflows/build_and_test_tun2socks.yml

.gitignore

go.mod

outline/tun2socks/Makefile

outline/tun2socks/README.md

outline/tun2socks/intra/android/init.go

outline/tun2socks/intra/android/tun.go

outline/tun2socks/tools.go

daniellacosse · 2023-10-09T14:57:07Z

Thanks @daniellacosse for the contribution, I have a question, after removing intra, shall we just embed the building process within client's npm build action?

I was planning on adding it to the build process in the next PR.

I guess with that in consideration, I can simply not add it to CI yet.

third_party/outline-go-tun2socks/LICENSE

src/tun2socks/https/fetch.go

third_party/outline-go-tun2socks/android/tun2socks.aar

jyyi1

Thanks Daniel! This will be very helpful. The code LGTM, please remember to add a TODO comment of running go tests in the GitHub workflow.

jyyi1 · 2023-12-15T04:00:56Z

src/tun2socks/build.action.mjs

+        '.'
+      );
+
+      return spawnStream('cp', `${buildDir}/tun2socks-windows-386.exe`, `${buildDir}/tun2socks.exe`);


I see, maybe add a TODO in case anyone in the future would like to investigate into that?

src/tun2socks/build.action.mjs

fortuna

Awesome. Thanks for the change! Once we have tun2socks fully in the client it will enable a lot more progress!!! No more need to release outline-go-tun2socks!

fortuna · 2024-01-09T16:10:19Z

Makefile

+IMPORT_HOST=github.com
+IMPORT_PATH=$(IMPORT_HOST)/Jigsaw-Code/outline-client


Ugh, IMPORT_HOST just hurts readability. I see it was already there, no need to change in this PR.

Suggested change

IMPORT_HOST=github.com

IMPORT_PATH=$(IMPORT_HOST)/Jigsaw-Code/outline-client

IMPORT_PATH=github.com/Jigsaw-Code/outline-client

daniellacosse · 2024-01-09T16:31:25Z

Awesome. Thanks for the change! Once we have tun2socks fully in the client it will enable a lot more progress!!! No more need to release outline-go-tun2socks!

@fortuna Do you mind if I modify the Makefile such that it uses go build on the proper platform? Xgo is breaking the Windows CI: https://github.com/Jigsaw-Code/outline-client/actions/runs/7454194624/job/20305511594?pr=1744#step:7:53

Also trying to figure out what happened to the Android NDK.

fortuna · 2024-01-09T16:35:17Z

That's fine for now. Perhaps add a TODO to build windows directly without xgo when on windows.

daniellacosse · 2024-01-10T15:22:48Z

Awesome. Thanks for the change! Once we have tun2socks fully in the client it will enable a lot more progress!!! No more need to release outline-go-tun2socks!

@fortuna Do you mind if I modify the Makefile such that it uses go build on the proper platform? Xgo is breaking the Windows CI: https://github.com/Jigsaw-Code/outline-client/actions/runs/7454194624/job/20305511594?pr=1744#step:7:53

Also trying to figure out what happened to the Android NDK.

Ah, my old friend, -androidapi 19: golang/go#52470 (comment)

Thanks @bemasc !

This reverts commit e8dcd79.

init tun2socks

623f690

github-actions bot added the size/XXL label Oct 5, 2023

daniellacosse changed the title ~~init tun2socks~~ chore: add go-tun2socks to the client Oct 5, 2023

github-advanced-security bot found potential problems Oct 5, 2023

View reviewed changes

outline/tun2socks/intra/doh/doh.go Fixed Show fixed Hide fixed

daniellacosse requested a review from fortuna October 5, 2023 15:41

daniellacosse changed the title ~~chore: add go-tun2socks to the client~~ chore: [WIP] add go-tun2socks to the client Oct 5, 2023

fortuna requested changes Oct 5, 2023

View reviewed changes

fortuna requested a review from jyyi1 October 5, 2023 23:19

fortuna reviewed Oct 5, 2023

View reviewed changes

outline/tun2socks/Makefile Outdated Show resolved Hide resolved

daniellacosse requested a review from fortuna October 6, 2023 15:42

jyyi1 reviewed Oct 6, 2023

View reviewed changes

daniellacosse added 3 commits October 9, 2023 10:57

Merge branch 'master' into daniellacosse/go_tun2socks

6958582

move to src/tun2socks

38fd959

addt'l feedback

9079f6e

daniellacosse requested a review from jyyi1 October 9, 2023 17:02

fortuna requested changes Oct 9, 2023

View reviewed changes

third_party/outline-go-tun2socks/LICENSE Outdated Show resolved Hide resolved

src/tun2socks/https/fetch.go Outdated Show resolved Hide resolved

daniellacosse added 2 commits October 9, 2023 14:43

wip: working on build script

33c05c3

Merge branch 'master' into daniellacosse/go_tun2socks

766516c

jyyi1 reviewed Oct 9, 2023

View reviewed changes

third_party/outline-go-tun2socks/android/tun2socks.aar Outdated Show resolved Hide resolved

daniellacosse added 3 commits November 13, 2023 13:55

Merge branch 'master' into daniellacosse/go_tun2socks

e037b03

update go.mod and references

1a4d61e

attempt #1 adding to build process

6ef1700

daniellacosse changed the title ~~chore: [WIP] add go-tun2socks to the client~~ chore: [WIP] add outline-go-tun2socks to the client Nov 13, 2023

daniellacosse changed the title ~~chore: [WIP] add outline-go-tun2socks to the client~~ chore: [WIP] add outline-go-tun2socks Nov 13, 2023

daniellacosse added the needs test Pull requests that require tests label Nov 13, 2023

daniellacosse added 3 commits November 13, 2023 16:03

cleanup

d8440d2

update CI

50bf620

okay it all works

ee66c4d

daniellacosse added 3 commits December 13, 2023 15:59

now i'm all confused...

b3bb834

this?

0162c76

upgrade gomobile and add macos to the thing

a4cc2e8

daniellacosse requested a review from fortuna December 14, 2023 03:29

Merge branch 'master' into daniellacosse/go_tun2socks

c71236c

jyyi1 approved these changes Dec 15, 2023

View reviewed changes

add TODOs

ddcd75d

daniellacosse requested a review from jyyi1 December 15, 2023 17:50

jyyi1 approved these changes Dec 18, 2023

View reviewed changes

fortuna requested changes Dec 21, 2023

View reviewed changes

src/tun2socks/build.action.mjs Outdated Show resolved Hide resolved

daniellacosse added 7 commits January 4, 2024 16:14

use makefile

c17a7b0

Merge branch 'master' into daniellacosse/go_tun2socks

e8d3aa9

update IMPORT_PATH

9b6b1ce

split up pkg names

2195bd2

?

cfd2130

??

2beffe7

Merge branch 'master' into daniellacosse/go_tun2socks

a6f0348

daniellacosse requested a review from fortuna January 9, 2024 14:59

fortuna approved these changes Jan 9, 2024

View reviewed changes

daniellacosse added 2 commits January 10, 2024 10:21

set androida api

35b3b44

add todos

37f9e14

daniellacosse requested a review from fortuna January 10, 2024 15:41

fortuna approved these changes Jan 10, 2024

View reviewed changes

daniellacosse merged commit e8dcd79 into master Jan 10, 2024
16 of 17 checks passed

daniellacosse added a commit that referenced this pull request Jan 11, 2024

Revert "chore: add outline-go-tun2socks, except android (#1744)"

b2eef5d

This reverts commit e8dcd79.

daniellacosse mentioned this pull request Jan 11, 2024

chore: revert add outline-go-tun2socks, except android #1817

Closed

fortuna mentioned this pull request Nov 14, 2024

Add support for Websocket endpoints #2272

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: add outline-go-tun2socks, except android #1744

chore: add outline-go-tun2socks, except android #1744

daniellacosse commented Oct 5, 2023 •

edited

Loading

codecov bot commented Oct 5, 2023 •

edited

Loading

fortuna left a comment

jyyi1 left a comment

daniellacosse commented Oct 9, 2023

jyyi1 left a comment

jyyi1 Dec 15, 2023

fortuna left a comment

fortuna Jan 9, 2024

daniellacosse commented Jan 9, 2024 •

edited

Loading

fortuna commented Jan 9, 2024

daniellacosse commented Jan 10, 2024 •

edited

Loading

		IMPORT_HOST=github.com
		IMPORT_PATH=$(IMPORT_HOST)/Jigsaw-Code/outline-client

	IMPORT_HOST=github.com
	IMPORT_PATH=$(IMPORT_HOST)/Jigsaw-Code/outline-client
	IMPORT_PATH=github.com/Jigsaw-Code/outline-client

chore: add outline-go-tun2socks, except android #1744

chore: add outline-go-tun2socks, except android #1744

Conversation

daniellacosse commented Oct 5, 2023 • edited Loading

Issues

codecov bot commented Oct 5, 2023 • edited Loading

Codecov Report

fortuna left a comment

Choose a reason for hiding this comment

jyyi1 left a comment

Choose a reason for hiding this comment

daniellacosse commented Oct 9, 2023

jyyi1 left a comment

Choose a reason for hiding this comment

jyyi1 Dec 15, 2023

Choose a reason for hiding this comment

fortuna left a comment

Choose a reason for hiding this comment

fortuna Jan 9, 2024

Choose a reason for hiding this comment

daniellacosse commented Jan 9, 2024 • edited Loading

fortuna commented Jan 9, 2024

daniellacosse commented Jan 10, 2024 • edited Loading

daniellacosse commented Oct 5, 2023 •

edited

Loading

codecov bot commented Oct 5, 2023 •

edited

Loading

daniellacosse commented Jan 9, 2024 •

edited

Loading

daniellacosse commented Jan 10, 2024 •

edited

Loading