Jelajahi Sumber

Refactor: refactor golang flavor

kr328 4 tahun lalu
induk
melakukan
e364af393a
54 mengubah file dengan 16 tambahan dan 12 penghapusan
  1. 2 4
      .gitignore
  2. 4 1
      .gitmodules
  3. 4 2
      core/build.gradle.kts
  4. 0 0
      core/src/main/golang/.idea/codeStyles/Project.xml
  5. 0 0
      core/src/main/golang/.idea/codeStyles/codeStyleConfig.xml
  6. 0 0
      core/src/main/golang/app.go
  7. 0 0
      core/src/main/golang/app/app.go
  8. 0 0
      core/src/main/golang/app/content.go
  9. 0 0
      core/src/main/golang/app/dns.go
  10. 0 0
      core/src/main/golang/app/tun.go
  11. 0 0
      core/src/main/golang/app/ui.go
  12. 0 0
      core/src/main/golang/bridge.c
  13. 0 0
      core/src/main/golang/bridge.h
  14. 0 0
      core/src/main/golang/common/path.go
  15. 0 0
      core/src/main/golang/config.go
  16. 0 0
      core/src/main/golang/config/defaults.go
  17. 0 0
      core/src/main/golang/config/fetch.go
  18. 0 0
      core/src/main/golang/config/load.go
  19. 0 0
      core/src/main/golang/config/override.go
  20. 0 0
      core/src/main/golang/config/process.go
  21. 0 0
      core/src/main/golang/config/provider_open.go
  22. 0 0
      core/src/main/golang/config/provider_premium.go
  23. 0 0
      core/src/main/golang/core/foss
  24. 1 0
      core/src/main/golang/core/premium
  25. 0 0
      core/src/main/golang/debug.go
  26. 1 1
      core/src/main/golang/delegate/init.go
  27. 1 1
      core/src/main/golang/go.mod
  28. 0 0
      core/src/main/golang/go.sum
  29. 0 0
      core/src/main/golang/log.go
  30. 2 2
      core/src/main/golang/main.go
  31. 0 0
      core/src/main/golang/platform/limit.go
  32. 0 0
      core/src/main/golang/platform/procfs.go
  33. 0 0
      core/src/main/golang/proxy.go
  34. 0 0
      core/src/main/golang/proxy/http.go
  35. 0 0
      core/src/main/golang/trace.c
  36. 0 0
      core/src/main/golang/trace.h
  37. 0 0
      core/src/main/golang/tun.go
  38. 0 0
      core/src/main/golang/tun/dns.go
  39. 0 0
      core/src/main/golang/tun/link.go
  40. 0 0
      core/src/main/golang/tun/tcp.go
  41. 0 0
      core/src/main/golang/tun/tun.go
  42. 0 0
      core/src/main/golang/tun/udp.go
  43. 0 0
      core/src/main/golang/tunnel.go
  44. 0 0
      core/src/main/golang/tunnel/conn.go
  45. 0 0
      core/src/main/golang/tunnel/connectivity.go
  46. 0 0
      core/src/main/golang/tunnel/geoip.go
  47. 0 0
      core/src/main/golang/tunnel/providers.go
  48. 0 0
      core/src/main/golang/tunnel/providers_premium.go
  49. 0 0
      core/src/main/golang/tunnel/proxies.go
  50. 0 0
      core/src/main/golang/tunnel/state.go
  51. 0 0
      core/src/main/golang/tunnel/statistic.go
  52. 0 0
      core/src/main/golang/tunnel/suspend.go
  53. 0 0
      core/src/main/golang/utils.go
  54. 1 1
      settings.gradle.kts

+ 2 - 4
.gitignore

@@ -20,10 +20,8 @@ gradle-app.setting
 *.iml
 /.idea/*
 !/.idea/codeStyles
-/core/src/foss/go/.idea/*
-!/core/src/foss/go/.idea/codeStyles
-/core/src/premium/go/.idea/*
-!/core/src/premium/go/.idea/codeStyles
+/core/src/main/golang/.idea/*
+!/core/src/main/golang/.idea/codeStyles
 
 # KeyStore
 *.keystore

+ 4 - 1
.gitmodules

@@ -1,3 +1,6 @@
 [submodule "clash-foss"]
-	path = core/src/foss/go/clash
+	path = core/src/main/golang/core/foss
+	url = https://github.com/Kr328/clash.git
+[submodule "clash-premium"]
+	path = core/src/main/golang/core/premium
 	url = https://github.com/Kr328/clash.git

+ 4 - 2
core/build.gradle.kts

@@ -18,13 +18,15 @@ val geoipOutput = buildDir.resolve("intermediates/golang_blob")
 golang {
     sourceSets {
         create("foss") {
-            srcDir.set(file("src/foss/go"))
+            tags.set(listOf("foss"))
         }
         create("premium") {
-            srcDir.set(file("src/premium/go"))
+            tags.set(listOf("premium"))
+            moduleFile.set("go.premium.mod")
         }
         all {
             fileName.set("libclash.so")
+            srcDir.set(file("src/main/golang"))
         }
     }
 }

+ 0 - 0
core/src/foss/go/.idea/codeStyles/Project.xml → core/src/main/golang/.idea/codeStyles/Project.xml


+ 0 - 0
core/src/foss/go/.idea/codeStyles/codeStyleConfig.xml → core/src/main/golang/.idea/codeStyles/codeStyleConfig.xml


+ 0 - 0
core/src/foss/go/app.go → core/src/main/golang/app.go


+ 0 - 0
core/src/foss/go/app/app.go → core/src/main/golang/app/app.go


+ 0 - 0
core/src/foss/go/app/content.go → core/src/main/golang/app/content.go


+ 0 - 0
core/src/foss/go/app/dns.go → core/src/main/golang/app/dns.go


+ 0 - 0
core/src/foss/go/app/tun.go → core/src/main/golang/app/tun.go


+ 0 - 0
core/src/foss/go/app/ui.go → core/src/main/golang/app/ui.go


+ 0 - 0
core/src/foss/go/bridge.c → core/src/main/golang/bridge.c


+ 0 - 0
core/src/foss/go/bridge.h → core/src/main/golang/bridge.h


+ 0 - 0
core/src/foss/go/common/path.go → core/src/main/golang/common/path.go


+ 0 - 0
core/src/foss/go/config.go → core/src/main/golang/config.go


+ 0 - 0
core/src/foss/go/config/defaults.go → core/src/main/golang/config/defaults.go


+ 0 - 0
core/src/foss/go/config/fetch.go → core/src/main/golang/config/fetch.go


+ 0 - 0
core/src/foss/go/config/load.go → core/src/main/golang/config/load.go


+ 0 - 0
core/src/foss/go/config/override.go → core/src/main/golang/config/override.go


+ 0 - 0
core/src/foss/go/config/process.go → core/src/main/golang/config/process.go


+ 0 - 0
core/src/foss/go/config/provider_open.go → core/src/main/golang/config/provider_open.go


+ 0 - 0
core/src/foss/go/config/provider_premium.go → core/src/main/golang/config/provider_premium.go


+ 0 - 0
core/src/foss/go/clash → core/src/main/golang/core/foss


+ 1 - 0
core/src/main/golang/core/premium

@@ -0,0 +1 @@
+Subproject commit fab0b09292f0d3caf46db5150c969243e35f2ee9

+ 0 - 0
core/src/foss/go/debug.go → core/src/main/golang/debug.go


+ 1 - 1
core/src/foss/go/core/init.go → core/src/main/golang/delegate/init.go

@@ -1,4 +1,4 @@
-package core
+package delegate
 
 import (
 	"errors"

+ 1 - 1
core/src/foss/go/go.mod → core/src/main/golang/go.mod

@@ -13,6 +13,6 @@ require (
 	gopkg.in/yaml.v2 v2.4.0
 )
 
-replace github.com/Dreamacro/clash => ./clash
+replace github.com/Dreamacro/clash => ./core/foss
 
 replace cfa/blob => ../../../build/intermediates/golang_blob

+ 0 - 0
core/src/foss/go/go.sum → core/src/main/golang/go.sum


+ 0 - 0
core/src/foss/go/log.go → core/src/main/golang/log.go


+ 2 - 2
core/src/foss/go/main.go → core/src/main/golang/main.go

@@ -11,7 +11,7 @@ import (
 	"runtime"
 
 	"cfa/config"
-	"cfa/core"
+	"cfa/delegate"
 	"cfa/tunnel"
 
 	"github.com/Dreamacro/clash/log"
@@ -27,7 +27,7 @@ func coreInit(home, versionName C.c_string, sdkVersion C.int) {
 	v := C.GoString(versionName)
 	s := int(sdkVersion)
 
-	core.Init(h, v, s)
+	delegate.Init(h, v, s)
 
 	reset()
 }

+ 0 - 0
core/src/foss/go/platform/limit.go → core/src/main/golang/platform/limit.go


+ 0 - 0
core/src/foss/go/platform/procfs.go → core/src/main/golang/platform/procfs.go


+ 0 - 0
core/src/foss/go/proxy.go → core/src/main/golang/proxy.go


+ 0 - 0
core/src/foss/go/proxy/http.go → core/src/main/golang/proxy/http.go


+ 0 - 0
core/src/foss/go/trace.c → core/src/main/golang/trace.c


+ 0 - 0
core/src/foss/go/trace.h → core/src/main/golang/trace.h


+ 0 - 0
core/src/foss/go/tun.go → core/src/main/golang/tun.go


+ 0 - 0
core/src/foss/go/tun/dns.go → core/src/main/golang/tun/dns.go


+ 0 - 0
core/src/foss/go/tun/link.go → core/src/main/golang/tun/link.go


+ 0 - 0
core/src/foss/go/tun/tcp.go → core/src/main/golang/tun/tcp.go


+ 0 - 0
core/src/foss/go/tun/tun.go → core/src/main/golang/tun/tun.go


+ 0 - 0
core/src/foss/go/tun/udp.go → core/src/main/golang/tun/udp.go


+ 0 - 0
core/src/foss/go/tunnel.go → core/src/main/golang/tunnel.go


+ 0 - 0
core/src/foss/go/tunnel/conn.go → core/src/main/golang/tunnel/conn.go


+ 0 - 0
core/src/foss/go/tunnel/connectivity.go → core/src/main/golang/tunnel/connectivity.go


+ 0 - 0
core/src/foss/go/tunnel/geoip.go → core/src/main/golang/tunnel/geoip.go


+ 0 - 0
core/src/foss/go/tunnel/providers.go → core/src/main/golang/tunnel/providers.go


+ 0 - 0
core/src/foss/go/tunnel/providers_premium.go → core/src/main/golang/tunnel/providers_premium.go


+ 0 - 0
core/src/foss/go/tunnel/proxies.go → core/src/main/golang/tunnel/proxies.go


+ 0 - 0
core/src/foss/go/tunnel/state.go → core/src/main/golang/tunnel/state.go


+ 0 - 0
core/src/foss/go/tunnel/statistic.go → core/src/main/golang/tunnel/statistic.go


+ 0 - 0
core/src/foss/go/tunnel/suspend.go → core/src/main/golang/tunnel/suspend.go


+ 0 - 0
core/src/foss/go/utils.go → core/src/main/golang/utils.go


+ 1 - 1
settings.gradle.kts

@@ -17,7 +17,7 @@ dependencyResolutionManagement {
             val agp = "7.0.2"
             val ksp = "1.5.30-1.0.0-beta09"
             val kotlin = "1.5.30"
-            val golang = "1.0.1"
+            val golang = "1.0.2"
             val coroutine = "1.5.0"
             val coreKtx = "1.5.0"
             val activity = "1.2.3"