Compare commits

...

31 Commits

Author SHA1 Message Date
chen08209
08d07498b9 update Version 2024-05-07 18:32:21 +08:00
chen08209
d5aa09949a Reconstruction application proxy logic 2024-05-07 18:31:14 +08:00
chen08209
fd1dfe5c60 Fix Tab destroy error 2024-05-06 19:05:27 +08:00
chen08209
9f89fe8b29 Optimize repeat healthcheck 2024-05-06 17:17:26 +08:00
chen08209
78081a12e8 Optimize Direct mode ui 2024-05-06 15:27:37 +08:00
chen08209
6896837f28 Optimize Healthcheck 2024-05-06 14:32:23 +08:00
chen08209
85eb903402 Remove proxies position animation, improve performance
Add Telegram Link
2024-05-06 14:32:22 +08:00
chen08209
9aa9180f1f Update healthcheck policy 2024-05-06 14:32:21 +08:00
chen08209
feb9688a29 New Check URLTest 2024-05-06 14:32:21 +08:00
chen08209
5c71992174 Fix the problem of invalid auto-selection 2024-05-05 16:14:34 +08:00
chen08209
74c3d0ae25 New Async UpdateConfig 2024-05-05 03:13:52 +08:00
chen08209
ecd1bcafd5 add changeProfileDebounce 2024-05-05 03:13:51 +08:00
chen08209
184d2d117a Update Workflow 2024-05-05 03:13:50 +08:00
chen08209
89e6f17794 Fix ChangeProfile block 2024-05-05 03:13:49 +08:00
chen08209
aef50fe0e3 Fix Release Message Error 2024-05-04 16:14:03 +08:00
chen08209
fc0767ed25 Update Selector 2 2024-05-04 01:14:56 +08:00
chen08209
dbf1724cca Update Version 2024-05-04 00:14:34 +08:00
chen08209
909aa4038e Fix Proxies Select Error 2024-05-04 00:14:07 +08:00
chen08209
2d0a7d8d46 Fix the problem that the proxy group is empty in global mode. 2024-05-03 23:08:06 +08:00
chen08209
ca96cd1d82 Fix the problem that the proxy group is empty in global mode. 2024-05-03 23:07:38 +08:00
chen08209
91ab1e5dac Add ProxyProvider2 2024-05-03 21:48:22 +08:00
chen08209
b3a5f74df8 Add ProxyProvider 2024-05-03 21:28:22 +08:00
chen08209
1f98be8ad8 Update Version 2024-05-03 15:33:46 +08:00
chen08209
453c7c98d0 Update ProxyGroup Sort 2024-05-03 15:33:45 +08:00
chen08209
91faed35c0 Fix Android quickStart VpnService some problems 2024-05-02 00:32:11 +08:00
chen08209
07bbaf6b6f Update version 2024-05-01 23:40:04 +08:00
chen08209
e8feb7c431 Set Android notification low importance 2024-05-01 23:40:03 +08:00
chen08209
4d16820526 Fix the issue that VpnService can't be closed correctly in special cases 2024-05-01 23:40:00 +08:00
chen08209
92294b49c6 Fix the problem that TileService is not destroyed correctly in some cases
Adjust tab animation defaults
2024-05-01 23:39:59 +08:00
chen08209
8a188a37c9 Add Telegram in README_zh_CN.md 2024-05-01 21:52:07 +08:00
chen08209
48af16c265 Add Telegram 2024-05-01 21:50:26 +08:00
42 changed files with 1446 additions and 704 deletions

View File

@@ -89,7 +89,7 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
submodules: recursive fetch-depth: 0
- name: Download - name: Download
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
@@ -101,13 +101,13 @@ jobs:
- name: Pre Release - name: Pre Release
run: | run: |
pip install gitchangelog pystache mustache markdown pip install gitchangelog pystache mustache markdown
prelease=$(curl --silent "https://api.github.com/repos/chen08209/FlClash/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' || echo "") pre=$(curl --silent "https://api.github.com/repos/chen08209/FlClash/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' || echo "")
if [ -z "$prelease" ]; then if [ -z "pre" ]; then
echo "init" > release.md echo "init" > release.md
else else
current="${{ github.ref_name }}" current="${{ github.ref_name }}"
echo -e "\n\n<details markdown=1><summary>All changes from $current to the latest commit:</summary>\n\n" >> release.md echo -e "\n\n<details markdown=1><summary>All changes from $current to the latest commit:</summary>\n\n" >> release.md
gitchangelog "${prelease}.." >> release.md 2>&1 || echo "Error in gitchangelog" gitchangelog "${pre}.." >> release.md 2>&1 || echo "Error in gitchangelog"
echo -e "\n\n</details>" >> release.md echo -e "\n\n</details>" >> release.md
fi fi
- name: Release - name: Release

View File

@@ -10,12 +10,12 @@ A multi-platform proxy client based on ClashMeta, simple and easy to use, open-s
on Desktop: on Desktop:
<p style="text-align: center;"> <p style="text-align: center;">
<img src="snapshots/desktop.gif"> <img alt="desktop" src="snapshots/desktop.gif">
</p> </p>
on Mobile: on Mobile:
<p style="text-align: center;"> <p style="text-align: center;">
<img src="snapshots/mobile.gif"> <img alt="mobile" src="snapshots/mobile.gif">
</p> </p>
## Features ## Features
@@ -28,6 +28,10 @@ on Mobile:
✨ Support subscription link, Dark mode ✨ Support subscription link, Dark mode
## Contact
[Telegram](https://t.me/+G-veVtwBOl4wODc1)
## Build ## Build
1. Update submodules 1. Update submodules
@@ -81,4 +85,7 @@ on Mobile:
```bash ```bash
dart .\setup.dart dart .\setup.dart
``` ```

View File

@@ -10,12 +10,12 @@
on Desktop: on Desktop:
<p style="text-align: center;"> <p style="text-align: center;">
<img src="snapshots/desktop.gif"> <img alt="desktop" src="snapshots/desktop.gif">
</p> </p>
on Mobile: on Mobile:
<p style="text-align: center;"> <p style="text-align: center;">
<img src="snapshots/mobile.gif"> <img alt="mobile" src="snapshots/mobile.gif">
</p> </p>
## Features ## Features
@@ -28,6 +28,10 @@ on Mobile:
✨ 支持一键导入订阅, 深色模式 ✨ 支持一键导入订阅, 深色模式
## Contact
[Telegram](https://t.me/+G-veVtwBOl4wODc1)
## Build ## Build
1. 更新 submodules 1. 更新 submodules

View File

@@ -10,6 +10,7 @@ import io.flutter.embedding.engine.FlutterEngine
class MainActivity : FlutterActivity() { class MainActivity : FlutterActivity() {
override fun configureFlutterEngine(flutterEngine: FlutterEngine) { override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
GlobalState.flutterEngine?.destroy()
super.configureFlutterEngine(flutterEngine) super.configureFlutterEngine(flutterEngine)
flutterEngine.plugins.add(AppPlugin()) flutterEngine.plugins.add(AppPlugin())
flutterEngine.plugins.add(ProxyPlugin()) flutterEngine.plugins.add(ProxyPlugin())

View File

@@ -37,14 +37,12 @@ class FlClashTileService : TileService() {
} }
} }
override fun onStartListening() { override fun onStartListening() {
super.onStartListening() super.onStartListening()
GlobalState.runState.value?.let { updateTile(it) } GlobalState.runState.value?.let { updateTile(it) }
GlobalState.runState.observeForever(observer) GlobalState.runState.observeForever(observer)
} }
@SuppressLint("StartActivityAndCollapseDeprecated") @SuppressLint("StartActivityAndCollapseDeprecated")
private fun activityTransfer() { private fun activityTransfer() {
val intent = Intent(this, TempActivity::class.java) val intent = Intent(this, TempActivity::class.java)
@@ -88,7 +86,7 @@ class FlClashTileService : TileService() {
if(currentTilePlugin == null){ if(currentTilePlugin == null){
initFlutterEngine() initFlutterEngine()
}else{ }else{
currentTilePlugin?.handleStart() currentTilePlugin.handleStart()
} }
} else if(GlobalState.runState.value == RunState.START){ } else if(GlobalState.runState.value == RunState.START){
GlobalState.runState.value = RunState.PENDING GlobalState.runState.value = RunState.PENDING
@@ -97,7 +95,6 @@ class FlClashTileService : TileService() {
} }
override fun onDestroy() { override fun onDestroy() {
GlobalState.runState.removeObserver(observer) GlobalState.runState.removeObserver(observer)
super.onDestroy() super.onDestroy()

View File

@@ -25,7 +25,8 @@ class FlClashVpnService : VpnService() {
private val CHANNEL = "FlClash" private val CHANNEL = "FlClash"
var fd: Int? = null; var fd: Int? = null
private val notificationId: Int = 1
private val passList = listOf( private val passList = listOf(
"*zhihu.com", "*zhihu.com",
@@ -100,11 +101,12 @@ class FlClashVpnService : VpnService() {
fun startForeground(title: String, content: String) { fun startForeground(title: String, content: String) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
val channel = val channel =
NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_DEFAULT) NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
val manager = getSystemService(NotificationManager::class.java) val manager = getSystemService(NotificationManager::class.java)
manager.createNotificationChannel(channel) manager.createNotificationChannel(channel)
val intent = Intent(this, MainActivity::class.java) val intent = Intent(this, MainActivity::class.java)
val pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { val pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
PendingIntent.getActivity( PendingIntent.getActivity(
this, this,
@@ -120,7 +122,9 @@ class FlClashVpnService : VpnService() {
PendingIntent.FLAG_UPDATE_CURRENT PendingIntent.FLAG_UPDATE_CURRENT
) )
} }
val icon = IconCompat.createWithResource(this, this.applicationInfo.icon) val icon = IconCompat.createWithResource(this, this.applicationInfo.icon)
val notification = with(NotificationCompat.Builder(this, CHANNEL)) { val notification = with(NotificationCompat.Builder(this, CHANNEL)) {
setSmallIcon(icon) setSmallIcon(icon)
setContentTitle(title) setContentTitle(title)
@@ -132,12 +136,13 @@ class FlClashVpnService : VpnService() {
build() build()
} }
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
startForeground(1, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE) startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
} else { } else {
startForeground(1, notification) startForeground(notificationId, notification)
} }
} }
} }
private fun stopForeground() { private fun stopForeground() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
stopForeground(Service.STOP_FOREGROUND_REMOVE) stopForeground(Service.STOP_FOREGROUND_REMOVE)

View File

@@ -7,14 +7,18 @@ import (
"github.com/metacubex/mihomo/component/process" "github.com/metacubex/mihomo/component/process"
"github.com/metacubex/mihomo/component/resolver" "github.com/metacubex/mihomo/component/resolver"
"github.com/metacubex/mihomo/config" "github.com/metacubex/mihomo/config"
"github.com/metacubex/mihomo/constant/provider"
"github.com/metacubex/mihomo/dns" "github.com/metacubex/mihomo/dns"
"github.com/metacubex/mihomo/hub/executor" "github.com/metacubex/mihomo/hub/executor"
"github.com/metacubex/mihomo/listener" "github.com/metacubex/mihomo/listener"
"github.com/metacubex/mihomo/log" "github.com/metacubex/mihomo/log"
"github.com/metacubex/mihomo/tunnel" "github.com/metacubex/mihomo/tunnel"
"math"
"os" "os"
"os/exec" "os/exec"
"runtime" "runtime"
"strings"
"sync"
"syscall" "syscall"
) )
@@ -46,6 +50,11 @@ type Process struct {
Target string `json:"target"` Target string `json:"target"`
} }
type Now struct {
Name string `json:"name"`
Value string `json:"value"`
}
func restartExecutable(execPath string) { func restartExecutable(execPath string) {
var err error var err error
executor.Shutdown() executor.Shutdown()
@@ -106,6 +115,152 @@ func decorationConfig(profilePath *string, cfg config.RawConfig) *config.RawConf
return prof return prof
} }
func Reduce[T any, U any](s []T, initVal U, f func(U, T) U) U {
for _, v := range s {
initVal = f(initVal, v)
}
return initVal
}
func Map[T, U any](slice []T, fn func(T) U) []U {
result := make([]U, len(slice))
for i, v := range slice {
result[i] = fn(v)
}
return result
}
func replaceFromMap(s string, m map[string]string) string {
for k, v := range m {
s = strings.ReplaceAll(s, k, v)
}
return s
}
func removeDuplicateFromSlice[T any](slice []T) []T {
result := make([]T, 0)
seen := make(map[any]struct{})
for _, value := range slice {
if _, ok := seen[value]; !ok {
result = append(result, value)
seen[value] = struct{}{}
}
}
return result
}
func generateProxyGroupAndRule(proxyGroup *[]map[string]any, rule *[]string) {
var replacements = map[string]string{}
var selectArr []map[string]any
var urlTestArr []map[string]any
var fallbackArr []map[string]any
for _, group := range *proxyGroup {
switch group["type"] {
case "select":
selectArr = append(selectArr, group)
replacements[group["name"].(string)] = "Proxy"
break
case "url-test":
urlTestArr = append(urlTestArr, group)
replacements[group["name"].(string)] = "Auto"
break
case "fallback":
fallbackArr = append(fallbackArr, group)
replacements[group["name"].(string)] = "Fallback"
break
default:
break
}
}
ProxyProxies := Reduce(selectArr, []string{}, func(res []string, cur map[string]any) []string {
if cur["proxies"] == nil {
return res
}
for _, proxyName := range cur["proxies"].([]interface{}) {
if str, ok := proxyName.(string); ok {
str = replaceFromMap(str, replacements)
if str != "Proxy" {
res = append(res, str)
}
}
}
return res
})
ProxyProxies = removeDuplicateFromSlice(ProxyProxies)
AutoProxies := Reduce(urlTestArr, []string{}, func(res []string, cur map[string]any) []string {
if cur["proxies"] == nil {
return res
}
for _, proxyName := range cur["proxies"].([]interface{}) {
if str, ok := proxyName.(string); ok {
str = replaceFromMap(str, replacements)
if str != "Auto" {
res = append(res, str)
}
}
}
return res
})
AutoProxies = removeDuplicateFromSlice(AutoProxies)
FallbackProxies := Reduce(fallbackArr, []string{}, func(res []string, cur map[string]any) []string {
if cur["proxies"] == nil {
return res
}
for _, proxyName := range cur["proxies"].([]interface{}) {
if str, ok := proxyName.(string); ok {
str = replaceFromMap(str, replacements)
if str != "Fallback" {
res = append(res, str)
}
}
}
return res
})
FallbackProxies = removeDuplicateFromSlice(FallbackProxies)
var computedProxyGroup []map[string]any
if len(ProxyProxies) > 0 {
computedProxyGroup = append(computedProxyGroup,
map[string]any{
"name": "Proxy",
"type": "select",
"proxies": ProxyProxies,
})
}
if len(AutoProxies) > 0 {
computedProxyGroup = append(computedProxyGroup,
map[string]any{
"name": "Auto",
"type": "url-test",
"proxies": AutoProxies,
})
}
if len(FallbackProxies) > 0 {
computedProxyGroup = append(computedProxyGroup,
map[string]any{
"name": "Fallback",
"type": "fallback",
"proxies": FallbackProxies,
})
}
computedRule := Map(*rule, func(value string) string {
return replaceFromMap(value, replacements)
})
*proxyGroup = computedProxyGroup
*rule = computedRule
}
func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig) { func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig) {
targetConfig.ExternalController = "" targetConfig.ExternalController = ""
targetConfig.ExternalUI = "" targetConfig.ExternalUI = ""
@@ -121,22 +276,19 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
targetConfig.Tun.Device = patchConfig.Tun.Device targetConfig.Tun.Device = patchConfig.Tun.Device
targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
targetConfig.Tun.Stack = patchConfig.Tun.Stack targetConfig.Tun.Stack = patchConfig.Tun.Stack
targetConfig.GeodataLoader = "standard"
targetConfig.Profile.StoreSelected = false
if targetConfig.DNS.Enable == false { if targetConfig.DNS.Enable == false {
targetConfig.DNS = patchConfig.DNS targetConfig.DNS = patchConfig.DNS
} else {
targetConfig.DNS.UseHosts = patchConfig.DNS.UseHosts
targetConfig.DNS.EnhancedMode = patchConfig.DNS.EnhancedMode
targetConfig.DNS.IPv6 = patchConfig.DNS.IPv6
targetConfig.DNS.DefaultNameserver = append(patchConfig.DNS.DefaultNameserver, targetConfig.DNS.DefaultNameserver...)
targetConfig.DNS.NameServer = append(patchConfig.DNS.NameServer, targetConfig.DNS.NameServer...)
targetConfig.DNS.FakeIPFilter = append(patchConfig.DNS.FakeIPFilter, targetConfig.DNS.FakeIPFilter...)
targetConfig.DNS.Fallback = append(patchConfig.DNS.Fallback, targetConfig.DNS.Fallback...)
if runtime.GOOS == "android" {
targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, "dhcp://"+dns.SystemDNSPlaceholder)
} else if runtime.GOOS == "windows" {
targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, dns.SystemDNSPlaceholder)
}
} }
if runtime.GOOS == "android" {
targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, "dhcp://"+dns.SystemDNSPlaceholder)
} else if runtime.GOOS == "windows" {
targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, dns.SystemDNSPlaceholder)
}
targetConfig.ProxyProvider = make(map[string]map[string]any)
targetConfig.RuleProvider = make(map[string]map[string]any)
generateProxyGroupAndRule(&targetConfig.ProxyGroup, &targetConfig.Rule)
} }
func patchConfig(general *config.General) { func patchConfig(general *config.General) {
@@ -164,10 +316,29 @@ func patchConfig(general *config.General) {
resolver.DisableIPv6 = !general.IPv6 resolver.DisableIPv6 = !general.IPv6
} }
func applyConfig(isPatch bool) bool { const concurrentCount = math.MaxInt
if currentConfig == nil {
return false func hcCompatibleProvider(proxyProviders map[string]provider.ProxyProvider) {
wg := sync.WaitGroup{}
ch := make(chan struct{}, concurrentCount)
for _, proxyProvider := range proxyProviders {
proxyProvider := proxyProvider
if proxyProvider.VehicleType() == provider.Compatible {
log.Infoln("Start initial Compatible provider %s", proxyProvider.Name())
wg.Add(1)
ch <- struct{}{}
go func() {
defer func() { <-ch; wg.Done() }()
if err := proxyProvider.Initial(); err != nil {
log.Errorln("initial Compatible provider %s error: %v", proxyProvider.Name(), err)
}
}()
}
} }
}
func applyConfig(isPatch bool) {
cfg, err := config.ParseRawConfig(currentConfig) cfg, err := config.ParseRawConfig(currentConfig)
if err != nil { if err != nil {
cfg, _ = config.ParseRawConfig(config.DefaultRawConfig()) cfg, _ = config.ParseRawConfig(config.DefaultRawConfig())
@@ -176,7 +347,6 @@ func applyConfig(isPatch bool) bool {
patchConfig(cfg.General) patchConfig(cfg.General)
} else { } else {
executor.ApplyConfig(cfg, true) executor.ApplyConfig(cfg, true)
healthcheck()
} }
return true
} }

View File

@@ -24,7 +24,7 @@ func InitDartApi(api unsafe.Pointer) {
} }
} }
func sendToPort(port int64, msg string) { func SendToPort(port int64, msg string) {
var obj C.Dart_CObject var obj C.Dart_CObject
obj._type = C.Dart_CObject_kString obj._type = C.Dart_CObject_kString
msgString := C.CString(msg) msgString := C.CString(msg)

View File

@@ -10,6 +10,7 @@ const (
Log MessageType = "log" Log MessageType = "log"
Tun MessageType = "tun" Tun MessageType = "tun"
Delay MessageType = "delay" Delay MessageType = "delay"
Now MessageType = "now"
Process MessageType = "process" Process MessageType = "process"
) )
@@ -18,11 +19,11 @@ type Message struct {
Data interface{} `json:"data"` Data interface{} `json:"data"`
} }
func (message *Message) toJson() string { func (message *Message) Json() string {
data, _ := json.Marshal(message) data, _ := json.Marshal(message)
return string(data) return string(data)
} }
func SendMessage(message Message) { func SendMessage(message Message) {
sendToPort(*Port, message.toJson()) SendToPort(*Port, message.Json())
} }

View File

@@ -7,6 +7,7 @@ import (
"fmt" "fmt"
"github.com/metacubex/mihomo/adapter" "github.com/metacubex/mihomo/adapter"
"github.com/metacubex/mihomo/adapter/outboundgroup" "github.com/metacubex/mihomo/adapter/outboundgroup"
"github.com/metacubex/mihomo/adapter/provider"
"github.com/metacubex/mihomo/common/utils" "github.com/metacubex/mihomo/common/utils"
"github.com/metacubex/mihomo/config" "github.com/metacubex/mihomo/config"
"github.com/metacubex/mihomo/constant" "github.com/metacubex/mihomo/constant"
@@ -21,7 +22,7 @@ import (
"unsafe" "unsafe"
) )
var currentConfig *config.RawConfig var currentConfig = config.DefaultRawConfig()
var isInit = false var isInit = false
@@ -63,26 +64,30 @@ func validateConfig(s *C.char) bool {
} }
//export updateConfig //export updateConfig
func updateConfig(s *C.char) bool { func updateConfig(s *C.char, port C.longlong) {
paramsString := C.GoString(s) i := int64(port)
var params = &GenerateConfigParams{} go func() {
err := json.Unmarshal([]byte(paramsString), params) paramsString := C.GoString(s)
if err != nil { var params = &GenerateConfigParams{}
log.Errorln("generateConfig Unmarshal error %v", err) err := json.Unmarshal([]byte(paramsString), params)
return false if err != nil {
} bridge.SendToPort(i, err.Error())
prof := decorationConfig(params.ProfilePath, *params.Config) return
currentConfig = prof }
if *params.IsPatch { prof := decorationConfig(params.ProfilePath, *params.Config)
return applyConfig(true) currentConfig = prof
} else { if *params.IsPatch {
return applyConfig(false) applyConfig(true)
} } else {
applyConfig(false)
}
bridge.SendToPort(i, "")
}()
} }
//export getProxies //export getProxies
func getProxies() *C.char { func getProxies() *C.char {
data, err := json.Marshal(tunnel.Proxies()) data, err := json.Marshal(tunnel.ProxiesWithProviders())
if err != nil { if err != nil {
return C.CString("") return C.CString("")
} }
@@ -91,27 +96,28 @@ func getProxies() *C.char {
//export changeProxy //export changeProxy
func changeProxy(s *C.char) bool { func changeProxy(s *C.char) bool {
paramsString := C.GoString(s) go func() {
var params = &ChangeProxyParams{} paramsString := C.GoString(s)
err := json.Unmarshal([]byte(paramsString), params) var params = &ChangeProxyParams{}
if err != nil { err := json.Unmarshal([]byte(paramsString), params)
log.Infoln("Unmarshal ChangeProxyParams %v", err) if err != nil {
return false log.Infoln("Unmarshal ChangeProxyParams %v", err)
} }
proxies := tunnel.Proxies() proxies := tunnel.ProxiesWithProviders()
proxy := proxies[*params.GroupName] proxy := proxies[*params.GroupName]
if proxy == nil { if proxy == nil {
return false return
} }
log.Infoln("change proxy %s", proxy.Name()) log.Infoln("change proxy %s", proxy.Name())
adapterProxy := proxy.(*adapter.Proxy) adapterProxy := proxy.(*adapter.Proxy)
selector, ok := adapterProxy.ProxyAdapter.(*outboundgroup.Selector) selector, ok := adapterProxy.ProxyAdapter.(*outboundgroup.Selector)
if !ok { if !ok {
return false return
} }
if err := selector.Set(*params.ProxyName); err != nil { if err := selector.Set(*params.ProxyName); err != nil {
return false return
} }
}()
return true return true
} }
@@ -131,7 +137,8 @@ func getTraffic() *C.char {
} }
//export asyncTestDelay //export asyncTestDelay
func asyncTestDelay(s *C.char) { func asyncTestDelay(s *C.char, port C.longlong) {
i := int64(port)
go func() { go func() {
paramsString := C.GoString(s) paramsString := C.GoString(s)
var params = &TestDelayParams{} var params = &TestDelayParams{}
@@ -139,42 +146,34 @@ func asyncTestDelay(s *C.char) {
if err != nil { if err != nil {
return return
} }
expectedStatus, err := utils.NewUnsignedRanges[uint16]("") expectedStatus, err := utils.NewUnsignedRanges[uint16]("")
if err != nil { if err != nil {
return return
} }
ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*time.Duration(params.Timeout)) ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*time.Duration(params.Timeout))
defer cancel() defer cancel()
proxies := tunnel.ProxiesWithProviders()
proxies := tunnel.Proxies()
proxy := proxies[params.ProxyName] proxy := proxies[params.ProxyName]
delayData := &Delay{ delayData := &Delay{
Name: params.ProxyName, Name: params.ProxyName,
} }
message := bridge.Message{ message := bridge.Message{
Type: bridge.Delay, Type: bridge.Delay,
Data: delayData, Data: delayData,
} }
if proxy == nil { if proxy == nil {
delayData.Value = -1 delayData.Value = -1
bridge.SendMessage(message) bridge.SendToPort(i, message.Json())
return return
} }
delay, err := proxy.URLTest(ctx, constant.DefaultTestURL, expectedStatus) delay, err := proxy.URLTest(ctx, constant.DefaultTestURL, expectedStatus)
if err != nil || delay == 0 { if err != nil || delay == 0 {
delayData.Value = -1 delayData.Value = -1
bridge.SendMessage(message) bridge.SendToPort(i, message.Json())
return return
} }
delayData.Value = int32(delay) delayData.Value = int32(delay)
bridge.SendMessage(message) bridge.SendToPort(i, message.Json())
}() }()
} }
@@ -239,17 +238,38 @@ func getProviders() *C.char {
func getProvider(name *C.char) *C.char { func getProvider(name *C.char) *C.char {
providerName := C.GoString(name) providerName := C.GoString(name)
providers := tunnel.Providers() providers := tunnel.Providers()
var provider = providers[providerName] data, err := json.Marshal(providers[providerName])
data, err := json.Marshal(provider)
if err != nil { if err != nil {
return C.CString("") return C.CString("")
} }
return C.CString(string(data)) return C.CString(string(data))
} }
//export healthcheck
func healthcheck() {
hcCompatibleProvider(tunnel.Providers())
}
//export initNativeApiBridge //export initNativeApiBridge
func initNativeApiBridge(api unsafe.Pointer, port C.longlong) { func initNativeApiBridge(api unsafe.Pointer, port C.longlong) {
bridge.InitDartApi(api) bridge.InitDartApi(api)
i := int64(port) i := int64(port)
bridge.Port = &i bridge.Port = &i
} }
func init() {
provider.HealthcheckHook = func(name string, delay uint16) {
delayData := &Delay{
Name: name,
}
if delay == 0 {
delayData.Value = -1
} else {
delayData.Value = int32(delay)
}
bridge.SendMessage(bridge.Message{
Type: bridge.Delay,
Data: delayData,
})
}
}

View File

@@ -1,3 +1,5 @@
import 'dart:async';
import 'package:dynamic_color/dynamic_color.dart'; import 'package:dynamic_color/dynamic_color.dart';
import 'package:fl_clash/l10n/l10n.dart'; import 'package:fl_clash/l10n/l10n.dart';
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
@@ -25,8 +27,13 @@ runAppWithPreferences(
ChangeNotifierProvider<Config>( ChangeNotifierProvider<Config>(
create: (_) => config, create: (_) => config,
), ),
ChangeNotifierProvider<AppState>( ChangeNotifierProxyProvider2<Config, ClashConfig, AppState>(
create: (_) => appState, create: (_) => appState,
update: (_, config, clashConfig, appState) {
appState?.mode = clashConfig.mode;
appState?.currentProxyName = config.currentProxyName;
return appState!;
},
) )
], ],
child: child, child: child,
@@ -112,7 +119,6 @@ class ApplicationState extends State<Application> {
primaryColor: config.primaryColor, primaryColor: config.primaryColor,
), ),
builder: (_, state, child) { builder: (_, state, child) {
debugPrint("[Application] update===>");
return DynamicColorBuilder( return DynamicColorBuilder(
builder: (lightDynamic, darkDynamic) { builder: (lightDynamic, darkDynamic) {
_updateSystemColorSchemes(lightDynamic, darkDynamic); _updateSystemColorSchemes(lightDynamic, darkDynamic);

View File

@@ -1,3 +1,4 @@
import 'dart:async';
import 'dart:convert'; import 'dart:convert';
import 'dart:ffi'; import 'dart:ffi';
import 'dart:io'; import 'dart:io';
@@ -16,19 +17,22 @@ class ClashCore {
late final ClashFFI clashFFI; late final ClashFFI clashFFI;
late final DynamicLibrary lib; late final DynamicLibrary lib;
ClashCore._internal() { DynamicLibrary _getClashLib() {
if (Platform.isWindows) { if (Platform.isWindows) {
lib = DynamicLibrary.open("libclash.dll"); return DynamicLibrary.open("libclash.dll");
clashFFI = ClashFFI(lib);
} }
if (Platform.isMacOS) { if (Platform.isMacOS) {
lib = DynamicLibrary.open("libclash.dylib"); return DynamicLibrary.open("libclash.dylib");
clashFFI = ClashFFI(lib);
} }
if (Platform.isAndroid || Platform.isLinux) { if (Platform.isAndroid || Platform.isLinux) {
lib = DynamicLibrary.open("libclash.so"); return DynamicLibrary.open("libclash.so");
clashFFI = ClashFFI(lib);
} }
throw "Platform is not supported";
}
ClashCore._internal() {
lib = _getClashLib();
clashFFI = ClashFFI(lib);
clashFFI.initNativeApiBridge( clashFFI.initNativeApiBridge(
NativeApi.initializeApiDLData, NativeApi.initializeApiDLData,
receiver.sendPort.nativePort, receiver.sendPort.nativePort,
@@ -61,51 +65,46 @@ class ClashCore {
1; 1;
} }
bool updateConfig(UpdateConfigParams updateConfigParams) { Future<String> updateConfig(UpdateConfigParams updateConfigParams) {
final completer = Completer<String>();
final receiver = ReceivePort();
receiver.listen((message) {
if (!completer.isCompleted) {
completer.complete(message);
receiver.close();
}
});
final params = json.encode(updateConfigParams); final params = json.encode(updateConfigParams);
return clashFFI.updateConfig( clashFFI.updateConfig(
params.toNativeUtf8().cast(), params.toNativeUtf8().cast(),
) == receiver.sendPort.nativePort,
1; );
return completer.future;
} }
List<Group> getProxiesGroups() { Future<List<Group>> getProxiesGroups() {
final proxiesRaw = clashFFI.getProxies(); final proxiesRaw = clashFFI.getProxies();
final proxies = json.decode(proxiesRaw.cast<Utf8>().toDartString()); final proxiesRawString = proxiesRaw.cast<Utf8>().toDartString();
final groupsRaw = List.from(proxies.values).where((e) { return Isolate.run<List<Group>>(() {
final excludeName = !UsedProxyExtension.valueList final proxies = json.decode(proxiesRawString);
.where((element) => element != UsedProxy.GLOBAL.name) final groupNames = [
.contains(e['name']); UsedProxy.GLOBAL.name,
final validType = GroupTypeExtension.valueList.contains(e['type']); ...(proxies[UsedProxy.GLOBAL.name]["all"] as List).where((e) {
return excludeName && validType; final proxy = proxies[e];
}).map( return GroupTypeExtension.valueList.contains(proxy['type']);
(e) { })
e["all"] = ((e["all"] ?? []) as List) ];
final groupsRaw = groupNames.map((groupName) {
final group = proxies[groupName];
group["all"] = ((group["all"] ?? []) as List)
.map( .map(
(name) => proxies[name], (name) => proxies[name],
) )
.toList(); .toList();
return e; return group;
}, }).toList();
).toList() return groupsRaw.map((e) => Group.fromJson(e)).toList();
..sort( });
(a, b) {
final aIndex = GroupTypeExtension.getGroupType(a['type'])?.index;
final bIndex = GroupTypeExtension.getGroupType(b['type'])?.index;
if (a == null && b == null) {
return 0;
}
if (a == null) {
return 1;
}
if (b == null) {
return -1;
}
return aIndex! - bIndex!;
},
);
final groups = groupsRaw.map((e) => Group.fromJson(e)).toList();
return groups;
} }
bool changeProxy(ChangeProxyParams changeProxyParams) { bool changeProxy(ChangeProxyParams changeProxyParams) {
@@ -113,13 +112,42 @@ class ClashCore {
return clashFFI.changeProxy(params.toNativeUtf8().cast()) == 1; return clashFFI.changeProxy(params.toNativeUtf8().cast()) == 1;
} }
bool delay(String proxyName) { Future<Delay> delay(String proxyName) {
final completer = Completer<Delay>();
final receiver = ReceivePort();
receiver.listen((message) {
if (!completer.isCompleted) {
final m = Message.fromJson(json.decode(message));
final delay = Delay.fromJson(m.data);
completer.complete(delay);
receiver.close();
}
});
final delayParams = { final delayParams = {
"proxy-name": proxyName, "proxy-name": proxyName,
"timeout": appConstant.httpTimeoutDuration.inMilliseconds, "timeout": appConstant.httpTimeoutDuration.inMilliseconds,
}; };
clashFFI.asyncTestDelay(json.encode(delayParams).toNativeUtf8().cast()); clashFFI.asyncTestDelay(
return true; json.encode(delayParams).toNativeUtf8().cast(),
receiver.sendPort.nativePort,
);
Future.delayed(appConstant.httpTimeoutDuration + appConstant.moreDuration,
() {
if (!completer.isCompleted) {
receiver.close();
completer.complete(
Delay(
name: proxyName,
value: -1,
),
);
}
});
return completer.future;
}
healthcheck() {
clashFFI.healthcheck();
} }
VersionInfo getVersionInfo() { VersionInfo getVersionInfo() {

View File

@@ -907,19 +907,22 @@ class ClashFFI {
late final _validateConfig = late final _validateConfig =
_validateConfigPtr.asFunction<int Function(ffi.Pointer<ffi.Char>)>(); _validateConfigPtr.asFunction<int Function(ffi.Pointer<ffi.Char>)>();
int updateConfig( void updateConfig(
ffi.Pointer<ffi.Char> s, ffi.Pointer<ffi.Char> s,
int port,
) { ) {
return _updateConfig( return _updateConfig(
s, s,
port,
); );
} }
late final _updateConfigPtr = late final _updateConfigPtr = _lookup<
_lookup<ffi.NativeFunction<GoUint8 Function(ffi.Pointer<ffi.Char>)>>( ffi.NativeFunction<
'updateConfig'); ffi.Void Function(
ffi.Pointer<ffi.Char>, ffi.LongLong)>>('updateConfig');
late final _updateConfig = late final _updateConfig =
_updateConfigPtr.asFunction<int Function(ffi.Pointer<ffi.Char>)>(); _updateConfigPtr.asFunction<void Function(ffi.Pointer<ffi.Char>, int)>();
ffi.Pointer<ffi.Char> getProxies() { ffi.Pointer<ffi.Char> getProxies() {
return _getProxies(); return _getProxies();
@@ -957,17 +960,20 @@ class ClashFFI {
void asyncTestDelay( void asyncTestDelay(
ffi.Pointer<ffi.Char> s, ffi.Pointer<ffi.Char> s,
int port,
) { ) {
return _asyncTestDelay( return _asyncTestDelay(
s, s,
port,
); );
} }
late final _asyncTestDelayPtr = late final _asyncTestDelayPtr = _lookup<
_lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Char>)>>( ffi.NativeFunction<
'asyncTestDelay'); ffi.Void Function(
late final _asyncTestDelay = ffi.Pointer<ffi.Char>, ffi.LongLong)>>('asyncTestDelay');
_asyncTestDelayPtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>(); late final _asyncTestDelay = _asyncTestDelayPtr
.asFunction<void Function(ffi.Pointer<ffi.Char>, int)>();
ffi.Pointer<ffi.Char> getVersionInfo() { ffi.Pointer<ffi.Char> getVersionInfo() {
return _getVersionInfo(); return _getVersionInfo();
@@ -1037,6 +1043,14 @@ class ClashFFI {
late final _getProvider = _getProviderPtr late final _getProvider = _getProviderPtr
.asFunction<ffi.Pointer<ffi.Char> Function(ffi.Pointer<ffi.Char>)>(); .asFunction<ffi.Pointer<ffi.Char> Function(ffi.Pointer<ffi.Char>)>();
void healthcheck() {
return _healthcheck();
}
late final _healthcheckPtr =
_lookup<ffi.NativeFunction<ffi.Void Function()>>('healthcheck');
late final _healthcheck = _healthcheckPtr.asFunction<void Function()>();
void initNativeApiBridge( void initNativeApiBridge(
ffi.Pointer<ffi.Void> api, ffi.Pointer<ffi.Void> api,
int port, int port,

View File

@@ -15,6 +15,8 @@ abstract mixin class ClashMessageListener {
void onDelay(Delay delay) {} void onDelay(Delay delay) {}
void onProcess(Metadata metadata) {} void onProcess(Metadata metadata) {}
void onNow(Now now) {}
} }
class ClashMessage { class ClashMessage {
@@ -41,6 +43,9 @@ class ClashMessage {
case MessageType.process: case MessageType.process:
listener.onProcess(Metadata.fromJson(m.data)); listener.onProcess(Metadata.fromJson(m.data));
break; break;
case MessageType.now:
listener.onNow(Now.fromJson(m.data));
break;
} }
} }
}); });

View File

@@ -19,8 +19,8 @@ Function debounce<F extends Function>(F func,{int milliseconds = 600}) {
if (timer != null) { if (timer != null) {
timer!.cancel(); timer!.cancel();
} }
timer = Timer(Duration(milliseconds: milliseconds), () { timer = Timer(Duration(milliseconds: milliseconds), () async {
Function.apply(func, args ?? [], namedArgs); await Function.apply(func, args ?? [], namedArgs);
}); });
}; };
} }

View File

@@ -35,7 +35,6 @@ class AppController {
config: config, config: config,
clashConfig: clashConfig, clashConfig: clashConfig,
); );
updateRunTime(); updateRunTime();
updateTraffic(); updateTraffic();
globalState.updateFunctionLists = [ globalState.updateFunctionLists = [
@@ -71,28 +70,10 @@ class AppController {
} }
changeProxy() { changeProxy() {
final currentGroupName = globalState.changeProxy(
appState.getCurrentGroupName(config.currentGroupName, clashConfig.mode); appState: appState,
final currentProxyName = config: config,
appState.getCurrentProxyName(config.currentProxyName, clashConfig.mode); clashConfig: clashConfig,
if (config.profiles.isEmpty || currentProxyName == null) {
updateSystemProxy(false);
return;
}
if (currentGroupName == null) return;
final groupIndex = appState.groups.indexWhere(
(element) => element.name == currentGroupName,
);
if (groupIndex == -1) return;
final proxyIndex = appState.groups[groupIndex].all.indexWhere(
(element) => element.name == currentProxyName,
);
if (proxyIndex == -1) return;
clashCore.changeProxy(
ChangeProxyParams(
groupName: currentGroupName,
proxyName: currentProxyName,
),
); );
} }
@@ -133,7 +114,7 @@ class AppController {
} }
} }
Future<bool> updateClashConfig({bool isPatch = true}) async { Future<String> updateClashConfig({bool isPatch = true}) async {
return await globalState.updateClashConfig( return await globalState.updateClashConfig(
clashConfig: clashConfig, clashConfig: clashConfig,
config: config, config: config,
@@ -141,12 +122,31 @@ class AppController {
); );
} }
applyProfile() async {
await globalState.applyProfile(
appState: appState,
config: config,
clashConfig: clashConfig,
);
}
Function? _changeProfileDebounce;
changeProfileDebounce(String? profileId) {
if (profileId == config.currentProfileId) return;
config.currentProfileId = profileId;
_changeProfileDebounce ??= debounce<Function(String?)>((profileId) async {
await applyProfile();
appState.delayMap = {};
saveConfigPreferences();
});
_changeProfileDebounce!([profileId]);
}
changeProfile(String? value) async { changeProfile(String? value) async {
if (value == config.currentProfileId) return; if (value == config.currentProfileId) return;
config.currentProfileId = value; config.currentProfileId = value;
await updateClashConfig(isPatch: false); await applyProfile();
updateGroups();
changeProxy();
appState.delayMap = {}; appState.delayMap = {};
saveConfigPreferences(); saveConfigPreferences();
} }
@@ -160,28 +160,18 @@ class AppController {
) )
.isBeforeNow(); .isBeforeNow();
if (isNotNeedUpdate == false) continue; if (isNotNeedUpdate == false) continue;
final result = await profile.update(); await profile.update();
if (result.type == ResultType.error) continue;
updateGroups();
changeProxy();
} }
} }
updateGroups() { Future<void> updateGroups() async {
globalState.updateGroups(appState); await globalState.updateGroups(appState);
} }
updateSystemColorSchemes(SystemColorSchemes systemColorSchemes) { updateSystemColorSchemes(SystemColorSchemes systemColorSchemes) {
appState.systemColorSchemes = systemColorSchemes; appState.systemColorSchemes = systemColorSchemes;
} }
clearCurrentDelay() {
final currentProxyName =
appState.getCurrentProxyName(config.currentProxyName, clashConfig.mode);
if (currentProxyName == null) return;
appState.setDelay(Delay(name: currentProxyName, value: null));
}
savePreferences() async { savePreferences() async {
await saveConfigPreferences(); await saveConfigPreferences();
await saveClashConfigPreferences(); await saveClashConfigPreferences();
@@ -225,20 +215,30 @@ class AppController {
} }
afterInit() async { afterInit() async {
if (appState.isInit) { if (config.autoRun) {
changeProxy(); await updateSystemProxy(true);
if (config.autoRun) { } else {
await updateSystemProxy(true); await proxyManager.updateStartTime();
} else { await updateSystemProxy(proxyManager.isStart);
await proxyManager.updateStartTime();
await updateSystemProxy(proxyManager.isStart);
}
autoUpdateProfiles();
updateLogStatus();
if (!config.silentLaunch) {
window?.show();
}
} }
autoUpdateProfiles();
updateLogStatus();
if (!config.silentLaunch) {
window?.show();
}
}
healthcheck() {
if (globalState.healthcheckLock) return;
for (final delay in appState.delayMap.entries) {
setDelay(
Delay(
name: delay.key,
value: 0,
),
);
}
clashCore.healthcheck();
} }
setDelay(Delay delay) { setDelay(Delay delay) {

View File

@@ -2,6 +2,8 @@
enum GroupType { Selector, URLTest, Fallback } enum GroupType { Selector, URLTest, Fallback }
enum GroupName { GLOBAL, Proxy, Auto, Fallback }
extension GroupTypeExtension on GroupType { extension GroupTypeExtension on GroupType {
static List<String> get valueList => GroupType.values static List<String> get valueList => GroupType.values
.map( .map(
@@ -9,8 +11,7 @@ extension GroupTypeExtension on GroupType {
) )
.toList(); .toList();
static GroupType? getGroupType(String? value) { static GroupType? getGroupType(String value) {
if (value == null) return null;
final index = GroupTypeExtension.valueList.indexOf(value); final index = GroupTypeExtension.valueList.indexOf(value);
if (index == -1) return null; if (index == -1) return null;
return GroupType.values[index]; return GroupType.values[index];
@@ -53,4 +54,4 @@ enum ProfileType { file, url }
enum ResultType { success, error } enum ResultType { success, error }
enum MessageType { log, tun, delay, process } enum MessageType { log, tun, delay, process, now }

View File

@@ -80,6 +80,15 @@ class AboutFragment extends StatelessWidget {
}); });
}, },
), ),
ListTile(
title: const Text("Telegram"),
onTap: () {
launchUrl(
Uri.parse("https://t.me/+G-veVtwBOl4wODc1"),
);
},
trailing: const Icon(Icons.launch),
),
ListTile( ListTile(
title: Text(appLocalizations.project), title: Text(appLocalizations.project),
onTap: () { onTap: () {

View File

@@ -12,7 +12,6 @@ class CoreInfo extends StatelessWidget {
return Selector<AppState, VersionInfo?>( return Selector<AppState, VersionInfo?>(
selector: (_, appState) => appState.versionInfo, selector: (_, appState) => appState.versionInfo,
builder: (_, versionInfo, __) { builder: (_, versionInfo, __) {
debugPrint("[CoreInfo] update===>");
return CommonCard( return CommonCard(
info: Info( info: Info(
label: appLocalizations.coreInfo, label: appLocalizations.coreInfo,

View File

@@ -1,6 +1,6 @@
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/enum/enum.dart';
import 'package:fl_clash/models/models.dart'; import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/state.dart';
import 'package:fl_clash/widgets/widgets.dart'; import 'package:fl_clash/widgets/widgets.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@@ -25,6 +25,11 @@ class _NetworkDetectionState extends State<NetworkDetection> {
), ),
); );
} }
if (currentProxyName == UsedProxy.DIRECT.name) {
return const Icon(
Icons.offline_bolt_outlined,
);
}
if (delay == 0 || delay == null) { if (delay == 0 || delay == null) {
return const AspectRatio( return const AspectRatio(
aspectRatio: 1, aspectRatio: 1,
@@ -73,57 +78,6 @@ class _NetworkDetectionState extends State<NetworkDetection> {
); );
} }
_updateCurrentDelay(
String? currentProxyName,
int? delay,
bool isCurrent,
bool isInit,
) {
if (!isCurrent || currentProxyName == null || !isInit) return;
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
if (delay == null) {
context.appController.setDelay(
Delay(
name: currentProxyName,
value: 0,
),
);
globalState.updateCurrentDelay(
currentProxyName,
);
}
});
}
_updateCurrentDelayContainer(Widget child) {
return Selector3<AppState, Config, ClashConfig,
UpdateCurrentDelaySelectorState>(
selector: (_, appState, config, clashConfig) {
final proxyName = appState.getCurrentProxyName(
config.currentProxyName,
clashConfig.mode,
);
return UpdateCurrentDelaySelectorState(
isInit: appState.isInit,
currentProxyName: proxyName,
delay: appState.delayMap[proxyName],
isCurrent: appState.currentLabel == 'dashboard',
);
},
builder: (_, state, __) {
debugPrint("[UpdateCurrentDelay] update===>");
_updateCurrentDelay(
state.currentProxyName,
state.delay,
state.isCurrent,
state.isInit,
);
return child;
},
child: child,
);
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return CommonCard( return CommonCard(
@@ -131,59 +85,55 @@ class _NetworkDetectionState extends State<NetworkDetection> {
iconData: Icons.network_check, iconData: Icons.network_check,
label: appLocalizations.networkDetection, label: appLocalizations.networkDetection,
), ),
child: _updateCurrentDelayContainer( child: Selector3<AppState, Config, ClashConfig,
Selector3<AppState, Config, ClashConfig, NetworkDetectionSelectorState>( NetworkDetectionSelectorState>(
selector: (_, appState, config, clashConfig) { selector: (_, appState, config, clashConfig) {
final proxyName = appState.getCurrentProxyName( final proxyName = appState.currentProxyName;
config.currentProxyName, return NetworkDetectionSelectorState(
clashConfig.mode, currentProxyName: proxyName,
); delay: appState.getDelay(
return NetworkDetectionSelectorState( proxyName,
isInit: appState.isInit, ),
currentProxyName: proxyName, );
delay: appState.delayMap[proxyName], },
); builder: (_, state, __) {
}, return Container(
builder: (_, state, __) { padding: const EdgeInsets.all(16).copyWith(top: 0),
debugPrint("[NetworkDetection] update===>"); child: Column(
return Container( mainAxisSize: MainAxisSize.min,
padding: const EdgeInsets.all(16).copyWith(top: 0), crossAxisAlignment: CrossAxisAlignment.start,
child: Column( children: [
mainAxisSize: MainAxisSize.min, Flexible(
crossAxisAlignment: CrossAxisAlignment.start, flex: 0,
children: [ child: TooltipText(
Flexible( text: Text(
flex: 0, state.currentProxyName ?? appLocalizations.noProxy,
child: TooltipText( overflow: TextOverflow.ellipsis,
text: Text( maxLines: 1,
state.currentProxyName ?? appLocalizations.noProxy, style:
overflow: TextOverflow.ellipsis, Theme.of(context).textTheme.titleMedium?.toSoftBold(),
maxLines: 1, ),
style: ),
Theme.of(context).textTheme.titleMedium?.toSoftBold(), ),
const SizedBox(
height: 8,
),
Flexible(
child: Container(
height: context.appController.measure.titleLargeHeight,
alignment: Alignment.centerLeft,
child: FadeBox(
child: _buildDescription(
state.currentProxyName,
state.delay,
), ),
), ),
), ),
const SizedBox( ),
height: 8, ],
), ),
Flexible( );
child: Container( },
height: context.appController.measure.titleLargeHeight,
alignment: Alignment.centerLeft,
child: FadeBox(
child: _buildDescription(
state.currentProxyName,
state.delay,
),
),
),
),
],
),
);
},
),
), ),
); );
} }

View File

@@ -1,5 +1,7 @@
import 'package:fl_clash/clash/clash.dart';
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/models/models.dart'; import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@@ -50,9 +52,6 @@ class _StartButtonState extends State<StartButton>
updateSystemProxy() async { updateSystemProxy() async {
final appController = context.appController; final appController = context.appController;
await appController.updateSystemProxy(isStart); await appController.updateSystemProxy(isStart);
if (isStart && mounted) {
appController.clearCurrentDelay();
}
} }
@override @override
@@ -63,18 +62,20 @@ class _StartButtonState extends State<StartButton>
hasProfile: config.profiles.isNotEmpty, hasProfile: config.profiles.isNotEmpty,
), ),
builder: (_, state, child) { builder: (_, state, child) {
debugPrint("[StartButton] update===>");
if (!state.isInit || !state.hasProfile) { if (!state.isInit || !state.hasProfile) {
return Container(); return Container();
} }
final textWidth = context.appController.measure.computeTextSize( final textWidth = context.appController.measure
Text( .computeTextSize(
Other.getTimeDifference( Text(
DateTime.now(), Other.getTimeDifference(
), DateTime.now(),
style: Theme.of(context).textTheme.titleMedium?.toSoftBold(), ),
), style:
).width + Theme.of(context).textTheme.titleMedium?.toSoftBold(),
),
)
.width +
16; 16;
return AnimatedBuilder( return AnimatedBuilder(
animation: _controller.view, animation: _controller.view,

View File

@@ -24,6 +24,7 @@ class ProfilesFragment extends StatefulWidget {
} }
class _ProfilesFragmentState extends State<ProfilesFragment> { class _ProfilesFragmentState extends State<ProfilesFragment> {
String _getLastUpdateTimeDifference(DateTime lastDateTime) { String _getLastUpdateTimeDifference(DateTime lastDateTime) {
final currentDateTime = DateTime.now(); final currentDateTime = DateTime.now();
final difference = currentDateTime.difference(lastDateTime); final difference = currentDateTime.difference(lastDateTime);
@@ -209,7 +210,7 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
child: _profileItem( child: _profileItem(
profile: profile, profile: profile,
groupValue: state.currentProfileId, groupValue: state.currentProfileId,
onChanged: context.appController.changeProfile, onChanged: context.appController.changeProfileDebounce,
), ),
), ),
], ],
@@ -234,7 +235,6 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
currentProfileId: config.currentProfileId, currentProfileId: config.currentProfileId,
), ),
builder: (context, state, child) { builder: (context, state, child) {
debugPrint("[Profiles] update===>");
if (state.profiles.isEmpty) { if (state.profiles.isEmpty) {
return NullStatus( return NullStatus(
label: appLocalizations.nullProfileDesc, label: appLocalizations.nullProfileDesc,

View File

@@ -1,5 +1,3 @@
import 'package:collection/collection.dart';
import 'package:fl_clash/clash/clash.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_adaptive_scaffold/flutter_adaptive_scaffold.dart'; import 'package:flutter_adaptive_scaffold/flutter_adaptive_scaffold.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@@ -18,8 +16,6 @@ class ProxiesFragment extends StatefulWidget {
class _ProxiesFragmentState extends State<ProxiesFragment> class _ProxiesFragmentState extends State<ProxiesFragment>
with TickerProviderStateMixin { with TickerProviderStateMixin {
TabController? _tabController;
_initActions() { _initActions() {
WidgetsBinding.instance.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
final commonScaffoldState = final commonScaffoldState =
@@ -57,150 +53,6 @@ class _ProxiesFragmentState extends State<ProxiesFragment>
}); });
} }
_updateTabController(length) {
if (_tabController != null) {
_tabController!.dispose();
_tabController = null;
}
_tabController = TabController(
length: length,
vsync: this,
);
}
@override
void dispose() {
if (_tabController != null) {
_tabController!.dispose();
_tabController = null;
}
super.dispose();
}
@override
Widget build(BuildContext context) {
return Selector<AppState, bool>(
selector: (_, appState) => appState.currentLabel == 'proxies',
builder: (_, isCurrent, child) {
if (isCurrent) {
_initActions();
}
return child!;
},
child: Selector2<AppState, ClashConfig, List<Group>>(
selector: (_, appState, clashConfig) =>
appState.getCurrentGroups(clashConfig.mode),
shouldRebuild: (prev, next) =>
!const ListEquality<Group>().equals(prev, next),
builder: (_, groups, __) {
debugPrint("[Proxies] update===>");
_updateTabController(groups.length);
return Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
TabBar(
controller: _tabController,
padding: const EdgeInsets.symmetric(horizontal: 16),
dividerColor: Colors.transparent,
isScrollable: true,
tabAlignment: TabAlignment.start,
overlayColor:
const MaterialStatePropertyAll(Colors.transparent),
tabs: [
for (final group in groups)
Tab(
text: group.name,
),
],
),
Expanded(
child: TabBarView(
controller: _tabController,
children: [
for (final group in groups)
KeepContainer(
child: ProxiesTabView(
group: group,
),
),
],
),
)
],
);
},
),
);
}
}
class ProxiesTabView extends StatefulWidget {
final Group group;
const ProxiesTabView({
super.key,
required this.group,
});
@override
State<ProxiesTabView> createState() => _ProxiesTabViewState();
}
class _ProxiesTabViewState extends State<ProxiesTabView>
with SingleTickerProviderStateMixin {
var lock = false;
late AnimationController _controller;
late Animation<double> _scale;
late Animation<double> _opacity;
@override
void initState() {
super.initState();
_controller = AnimationController(
vsync: this,
duration: const Duration(
milliseconds: 200,
),
);
_scale = Tween<double>(
begin: 1.0,
end: 0.8,
).animate(
CurvedAnimation(
parent: _controller,
curve: const Interval(
0.0,
0.3,
curve: Curves.easeIn,
),
),
);
_opacity = Tween<double>(
begin: 1.0,
end: 0.0,
).animate(
CurvedAnimation(
parent: _controller,
curve: const Interval(
0,
1,
curve: Curves.easeIn,
),
),
);
}
@override
void dispose() {
super.dispose();
_controller.dispose();
}
get group => widget.group;
get measure => context.appController.measure;
List<Proxy> _sortOfName(List<Proxy> proxies) { List<Proxy> _sortOfName(List<Proxy> proxies) {
return List.of(proxies) return List.of(proxies)
..sort( ..sort(
@@ -208,7 +60,7 @@ class _ProxiesTabViewState extends State<ProxiesTabView>
); );
} }
List<Proxy> _sortOfDelay(List<Proxy> proxies) { List<Proxy> _sortOfDelay(BuildContext context, List<Proxy> proxies) {
final appState = context.read<AppState>(); final appState = context.read<AppState>();
final delayMap = appState.delayMap; final delayMap = appState.delayMap;
return proxies = List.of(proxies) return proxies = List.of(proxies)
@@ -234,35 +86,15 @@ class _ProxiesTabViewState extends State<ProxiesTabView>
List<Proxy> proxies, List<Proxy> proxies,
ProxiesSortType proxiesSortType, ProxiesSortType proxiesSortType,
) { ) {
if (proxiesSortType == ProxiesSortType.delay) return _sortOfDelay(proxies); if (proxiesSortType == ProxiesSortType.delay) {
return _sortOfDelay(context, proxies);
}
if (proxiesSortType == ProxiesSortType.name) return _sortOfName(proxies); if (proxiesSortType == ProxiesSortType.name) return _sortOfName(proxies);
return proxies; return proxies;
} }
_getDelayMap() async { double _getItemHeight(BuildContext context) {
if (lock == true) return; final measure = context.appController.measure;
lock = true;
_controller.forward();
for (final proxy in group.all) {
context.appController.setDelay(
Delay(
name: proxy.name,
value: 0,
),
);
clashCore.delay(
proxy.name,
);
}
await Future.delayed(
appConstant.httpTimeoutDuration + appConstant.moreDuration,
);
lock = false;
_controller.reverse();
setState(() {});
}
double _getItemHeight() {
return 12 * 2 + return 12 * 2 +
measure.bodyMediumHeight * 2 + measure.bodyMediumHeight * 2 +
measure.bodySmallHeight + measure.bodySmallHeight +
@@ -275,6 +107,7 @@ class _ProxiesTabViewState extends State<ProxiesTabView>
required bool isSelected, required bool isSelected,
required Proxy proxy, required Proxy proxy,
}) { }) {
final measure = context.appController.measure;
return CommonCard( return CommonCard(
isSelected: isSelected, isSelected: isSelected,
onPressed: onPressed, onPressed: onPressed,
@@ -311,12 +144,22 @@ class _ProxiesTabViewState extends State<ProxiesTabView>
), ),
SizedBox( SizedBox(
height: measure.bodySmallHeight, height: measure.bodySmallHeight,
child: Text( child: Selector<AppState, String>(
proxy.type, selector: (context, appState) => appState.getDesc(
style: context.textTheme.bodySmall?.copyWith( proxy.type,
overflow: TextOverflow.ellipsis, proxy.name,
color: context.textTheme.bodySmall?.color?.toLight(),
), ),
builder: (_, desc, __) {
return TooltipText(
text: Text(
desc,
style: context.textTheme.bodySmall?.copyWith(
overflow: TextOverflow.ellipsis,
color: context.textTheme.bodySmall?.color?.toLight(),
),
),
);
},
), ),
), ),
const SizedBox( const SizedBox(
@@ -325,7 +168,7 @@ class _ProxiesTabViewState extends State<ProxiesTabView>
SizedBox( SizedBox(
height: measure.labelSmallHeight, height: measure.labelSmallHeight,
child: Selector<AppState, int?>( child: Selector<AppState, int?>(
selector: (context, appState) => appState.delayMap[proxy.name], selector: (context, appState) => appState.getDelay(proxy.name),
builder: (_, delay, __) { builder: (_, delay, __) {
return FadeBox( return FadeBox(
child: Builder( child: Builder(
@@ -363,107 +206,200 @@ class _ProxiesTabViewState extends State<ProxiesTabView>
); );
} }
_buildGrid({ Widget _buildGrid(
required ProxiesSortType proxiesSortType, BuildContext context, {
required List<Proxy> proxies,
required int columns, required int columns,
}) { }) {
return SingleChildScrollView( return GridView.builder(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
child: AnimateGrid<Proxy>( gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
items: _getProxies(group.all, proxiesSortType), crossAxisCount: columns,
columns: columns, mainAxisSpacing: 8,
itemHeight: _getItemHeight(), crossAxisSpacing: 8,
keyBuilder: (item) { mainAxisExtent: _getItemHeight(context),
return ObjectKey(item);
},
builder: (_, proxy) {
return Selector3<AppState, Config, ClashConfig, String?>(
selector: (_, appState, config, clashConfig) =>
appState.getCurrentProxyName(
config.currentProxyName,
clashConfig.mode,
),
builder: (_, value, __) {
final currentProxyName =
group.type == GroupType.Selector ? value : group.now;
return _card(
isSelected: proxy.name == currentProxyName,
onPressed: () {
if (group.type == GroupType.Selector) {
final config = context.read<Config>();
config.currentProfile?.groupName = group.name;
config.currentProfile?.proxyName = proxy.name;
config.update();
context.appController.changeProxy();
}
},
proxy: proxy,
);
},
);
},
), ),
itemCount: proxies.length,
itemBuilder: (_, index) {
final proxy = proxies[index];
return Selector<AppState, bool>(
selector: (_, appState) => proxy.name == appState.currentProxyName,
builder: (_, isSelected, __) {
return _card(
isSelected: isSelected,
onPressed: () {
context.appController.config.currentProxyName = proxy.name;
context.appController.changeProxy();
},
proxy: proxy,
);
},
);
},
); );
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Selector<Config, ProxiesSortType>( return DelayTestButtonContainer(
selector: (_, config) => config.proxiesSortType, child: Selector<AppState, bool>(
builder: (_, proxiesSortType, __) { selector: (_, appState) => appState.currentLabel == 'proxies',
return FloatLayout( builder: (_, isCurrent, child) {
floatingWidget: FloatWrapper( if (isCurrent) {
child: AnimatedBuilder( _initActions();
animation: _controller, }
builder: (_, __) { return child!;
return Transform.scale( },
scale: _scale.value, child: Selector2<AppState, Config, ProxiesSelectorState>(
child: SizedBox( selector: (_, appState, config) {
width: 56, return ProxiesSelectorState(
height: 56, proxiesSortType: config.proxiesSortType,
child: Opacity( sortNum: appState.sortNum,
opacity: _opacity.value, group: appState.currentGroup,
child: FloatingActionButton( );
heroTag: null, },
onPressed: _getDelayMap, builder: (_, state, __) {
child: const Icon(Icons.network_ping), if (state.group == null) return Container();
), final proxies = _getProxies(
state.group!.all,
state.proxiesSortType,
);
return Align(
alignment: Alignment.topCenter,
child: SlotLayout(
config: {
Breakpoints.small: SlotLayout.from(
key: const Key('proxies_grid_small'),
builder: (_) => _buildGrid(
context,
proxies: proxies,
columns: 2,
), ),
), ),
); Breakpoints.medium: SlotLayout.from(
}, key: const Key('proxies_grid_medium'),
), builder: (_) => _buildGrid(
), context,
child: Align( proxies: proxies,
alignment: Alignment.topCenter, columns: 3,
child: SlotLayout( ),
config: {
Breakpoints.small: SlotLayout.from(
key: const Key('proxies_grid_small'),
builder: (_) => _buildGrid(
proxiesSortType: proxiesSortType,
columns: 2,
), ),
), Breakpoints.large: SlotLayout.from(
Breakpoints.medium: SlotLayout.from( key: const Key('proxies_grid_large'),
key: const Key('proxies_grid_medium'), builder: (_) => _buildGrid(
builder: (_) => _buildGrid( context,
proxiesSortType: proxiesSortType, proxies: proxies,
columns: 3, columns: 4,
),
), ),
), },
Breakpoints.large: SlotLayout.from( ),
key: const Key('proxies_grid_large'), );
builder: (_) => _buildGrid( },
proxiesSortType: proxiesSortType, ),
columns: 4, ),
), );
), }
}, }
),
), class DelayTestButtonContainer extends StatefulWidget {
); final Widget child;
},
const DelayTestButtonContainer({
super.key,
required this.child,
});
@override
State<DelayTestButtonContainer> createState() =>
_DelayTestButtonContainerState();
}
class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
with SingleTickerProviderStateMixin {
late AnimationController _controller;
late Animation<double> _scale;
late Animation<double> _opacity;
_healthcheck() async {
_controller.forward();
context.appController.healthcheck();
await Future.delayed(
appConstant.httpTimeoutDuration + appConstant.moreDuration,
);
_controller.reverse();
}
@override
void initState() {
super.initState();
_controller = AnimationController(
vsync: this,
duration: const Duration(
milliseconds: 300,
),
);
_scale = Tween<double>(
begin: 1.0,
end: 0.0,
).animate(
CurvedAnimation(
parent: _controller,
curve: const Interval(
0,
1,
curve: Curves.easeIn,
),
),
);
_opacity = Tween<double>(
begin: 1.0,
end: 0.0,
).animate(
CurvedAnimation(
parent: _controller,
curve: const Interval(
0,
1,
curve: Curves.easeIn,
),
),
);
}
@override
void dispose() {
_controller.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
return FloatLayout(
floatingWidget: FloatWrapper(
child: AnimatedBuilder(
animation: _controller,
builder: (_, child) {
return SizedBox(
width: 56,
height: 56,
child: Transform.scale(
scale: _scale.value,
child: Opacity(
opacity: _opacity.value,
child: child!,
),
),
);
},
child: FloatingActionButton(
heroTag: null,
onPressed: _healthcheck,
child: const Icon(Icons.network_ping),
),
),
),
child: widget.child,
); );
} }
} }

View File

@@ -17,7 +17,10 @@ Future<void> main() async {
await window?.init(); await window?.init();
final config = await preferences.getConfig() ?? Config(); final config = await preferences.getConfig() ?? Config();
final clashConfig = await preferences.getClashConfig() ?? ClashConfig(); final clashConfig = await preferences.getClashConfig() ?? ClashConfig();
final appState = AppState(); final appState = AppState(
mode: clashConfig.mode,
currentProxyName: config.currentProxyName,
);
await globalState.init( await globalState.init(
appState: appState, appState: appState,
config: config, config: config,
@@ -41,7 +44,10 @@ Future<void> vpnService() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
final config = await preferences.getConfig() ?? Config(); final config = await preferences.getConfig() ?? Config();
final clashConfig = await preferences.getClashConfig() ?? ClashConfig(); final clashConfig = await preferences.getClashConfig() ?? ClashConfig();
final appState = AppState(); final appState = AppState(
mode: clashConfig.mode,
currentProxyName: config.currentProxyName,
);
clashMessage.addListener(ClashMessageListenerWithVpn(onTun: (String fd) { clashMessage.addListener(ClashMessageListenerWithVpn(onTun: (String fd) {
proxyManager.setProtect( proxyManager.setProtect(
int.parse(fd), int.parse(fd),
@@ -78,6 +84,7 @@ Future<void> vpnService() async {
TileListenerWithVpn( TileListenerWithVpn(
onStop: () async { onStop: () async {
await app?.tip(appLocalizations.stopVpn); await app?.tip(appLocalizations.stopVpn);
await globalState.stopSystemProxy();
clashCore.shutdown(); clashCore.shutdown();
exit(0); exit(0);
}, },

View File

@@ -22,8 +22,11 @@ class AppState with ChangeNotifier {
String _currentLabel; String _currentLabel;
SystemColorSchemes _systemColorSchemes; SystemColorSchemes _systemColorSchemes;
List<Group> _groups; List<Group> _groups;
num _sortNum;
Mode _mode;
String? _currentProxyName;
AppState() AppState({required Mode mode, required currentProxyName})
: _navigationItems = [], : _navigationItems = [],
_delayMap = {}, _delayMap = {},
_isInit = false, _isInit = false,
@@ -32,6 +35,9 @@ class AppState with ChangeNotifier {
_logs = [], _logs = [],
_groups = [], _groups = [],
_packages = [], _packages = [],
_sortNum = 0,
_mode = mode,
_currentProxyName = currentProxyName,
_systemColorSchemes = SystemColorSchemes(); _systemColorSchemes = SystemColorSchemes();
String get currentLabel => _currentLabel; String get currentLabel => _currentLabel;
@@ -79,6 +85,35 @@ class AppState with ChangeNotifier {
} }
} }
String getDesc(String type, String? proxyName) {
final groupTypeNamesList = GroupType.values.map((e) => e.name).toList();
if (!groupTypeNamesList.contains(type)) {
return type;
}else{
final index = groups.indexWhere((element) => element.name == proxyName);
if(index == -1) return type;
return "$type(${groups[index].now})";
}
}
int? getDelay(String? proxyName) {
if (proxyName == null) return null;
final index = groups.indexWhere((element) => element.name == proxyName);
if (index == -1) return _delayMap[proxyName];
final group = groups[index];
if (group.now == null) return null;
return _delayMap[group.now];
}
String? get realCurrentProxyName {
if (currentProxyName == null) return null;
final index = groups.indexWhere((element) => element.name == currentProxyName);
if (index == -1) return currentProxyName;
final group = groups[index];
if (group.now == null) return null;
return group.now;
}
setDelay(Delay delay) { setDelay(Delay delay) {
if (_delayMap[delay.name] != delay.value) { if (_delayMap[delay.name] != delay.value) {
_delayMap = Map.from(_delayMap)..[delay.name] = delay.value; _delayMap = Map.from(_delayMap)..[delay.name] = delay.value;
@@ -144,48 +179,63 @@ class AppState with ChangeNotifier {
List<Group> get groups => _groups; List<Group> get groups => _groups;
set groups(List<Group> value) { set groups(List<Group> value) {
if (_groups != value) { if (!const ListEquality<Group>().equals(_groups, value)) {
_groups = value; _groups = value;
notifyListeners(); notifyListeners();
} }
} }
List<Group> getCurrentGroups(Mode mode) { num get sortNum => _sortNum;
switch (mode) {
case Mode.direct: set sortNum(num value) {
return []; if (_sortNum != value) {
case Mode.global: _sortNum = value;
return groups notifyListeners();
.where((element) => element.name == UsedProxy.GLOBAL.name)
.toList();
case Mode.rule:
return groups
.where((element) => element.name != UsedProxy.GLOBAL.name)
.toList();
} }
} }
String? getCurrentGroupName(String? groupName, Mode mode) { Mode get mode => _mode;
final currentGroups = getCurrentGroups(mode);
set mode(Mode value) {
if (_mode != value) {
_mode = value;
notifyListeners();
}
}
String? get currentProxyName {
if (mode == Mode.direct) return UsedProxy.DIRECT.name;
if (_currentProxyName != null) return _currentProxyName!;
return currentGroup?.now;
}
set currentProxyName(String? value) {
if (_currentProxyName != value) {
_currentProxyName = value;
notifyListeners();
}
}
Group? get currentGroup {
switch (mode) { switch (mode) {
case Mode.direct: case Mode.direct:
return null; return null;
case Mode.global: case Mode.global:
return UsedProxy.GLOBAL.name; return globalGroup;
case Mode.rule: case Mode.rule:
return groupName ?? return ruleGroup;
(currentGroups.isNotEmpty ? currentGroups.first.name : null);
} }
} }
String? getCurrentProxyName(String? proxyName, Mode mode) { Group? get globalGroup {
final currentGroups = getCurrentGroups(mode); final index =
switch (mode) { groups.indexWhere((element) => element.name == GroupName.GLOBAL.name);
case Mode.direct: return index != -1 ? groups[index] : null;
return UsedProxy.DIRECT.name; }
case Mode.global || Mode.rule:
return proxyName ?? Group? get ruleGroup {
(currentGroups.isNotEmpty ? currentGroups.first.now : null); final index =
} groups.indexWhere((element) => element.name == GroupName.Proxy.name);
return index != -1 ? groups[index] : null;
} }
} }

View File

@@ -87,7 +87,7 @@ class Config extends ChangeNotifier {
_isMinimizeOnExit = true, _isMinimizeOnExit = true,
_isAccessControl = false, _isAccessControl = false,
_accessControl = AccessControl(), _accessControl = AccessControl(),
_isAnimateToPage = false; _isAnimateToPage = true;
deleteProfileById(String id) { deleteProfileById(String id) {
_profiles = profiles.where((element) => element.id != id).toList(); _profiles = profiles.where((element) => element.id != id).toList();
@@ -161,7 +161,12 @@ class Config extends ChangeNotifier {
String? get currentProxyName => currentProfile?.proxyName; String? get currentProxyName => currentProfile?.proxyName;
String? get currentGroupName => currentProfile?.groupName; set currentProxyName(String? value){
if (currentProfile?.proxyName != value) {
currentProfile?.proxyName = value;
notifyListeners();
}
}
@JsonKey(defaultValue: false) @JsonKey(defaultValue: false)
bool get autoLaunch { bool get autoLaunch {

View File

@@ -52,6 +52,16 @@ class Delay with _$Delay {
factory Delay.fromJson(Map<String, Object?> json) => _$DelayFromJson(json); factory Delay.fromJson(Map<String, Object?> json) => _$DelayFromJson(json);
} }
@freezed
class Now with _$Now {
const factory Now({
required String name,
required String value,
}) = _Now;
factory Now.fromJson(Map<String, Object?> json) => _$NowFromJson(json);
}
@freezed @freezed
class Process with _$Process { class Process with _$Process {
const factory Process({ const factory Process({

View File

@@ -672,6 +672,151 @@ abstract class _Delay implements Delay {
throw _privateConstructorUsedError; throw _privateConstructorUsedError;
} }
Now _$NowFromJson(Map<String, dynamic> json) {
return _Now.fromJson(json);
}
/// @nodoc
mixin _$Now {
String get name => throw _privateConstructorUsedError;
String get value => throw _privateConstructorUsedError;
Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@JsonKey(ignore: true)
$NowCopyWith<Now> get copyWith => throw _privateConstructorUsedError;
}
/// @nodoc
abstract class $NowCopyWith<$Res> {
factory $NowCopyWith(Now value, $Res Function(Now) then) =
_$NowCopyWithImpl<$Res, Now>;
@useResult
$Res call({String name, String value});
}
/// @nodoc
class _$NowCopyWithImpl<$Res, $Val extends Now> implements $NowCopyWith<$Res> {
_$NowCopyWithImpl(this._value, this._then);
// ignore: unused_field
final $Val _value;
// ignore: unused_field
final $Res Function($Val) _then;
@pragma('vm:prefer-inline')
@override
$Res call({
Object? name = null,
Object? value = null,
}) {
return _then(_value.copyWith(
name: null == name
? _value.name
: name // ignore: cast_nullable_to_non_nullable
as String,
value: null == value
? _value.value
: value // ignore: cast_nullable_to_non_nullable
as String,
) as $Val);
}
}
/// @nodoc
abstract class _$$NowImplCopyWith<$Res> implements $NowCopyWith<$Res> {
factory _$$NowImplCopyWith(_$NowImpl value, $Res Function(_$NowImpl) then) =
__$$NowImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({String name, String value});
}
/// @nodoc
class __$$NowImplCopyWithImpl<$Res> extends _$NowCopyWithImpl<$Res, _$NowImpl>
implements _$$NowImplCopyWith<$Res> {
__$$NowImplCopyWithImpl(_$NowImpl _value, $Res Function(_$NowImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@override
$Res call({
Object? name = null,
Object? value = null,
}) {
return _then(_$NowImpl(
name: null == name
? _value.name
: name // ignore: cast_nullable_to_non_nullable
as String,
value: null == value
? _value.value
: value // ignore: cast_nullable_to_non_nullable
as String,
));
}
}
/// @nodoc
@JsonSerializable()
class _$NowImpl implements _Now {
const _$NowImpl({required this.name, required this.value});
factory _$NowImpl.fromJson(Map<String, dynamic> json) =>
_$$NowImplFromJson(json);
@override
final String name;
@override
final String value;
@override
String toString() {
return 'Now(name: $name, value: $value)';
}
@override
bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$NowImpl &&
(identical(other.name, name) || other.name == name) &&
(identical(other.value, value) || other.value == value));
}
@JsonKey(ignore: true)
@override
int get hashCode => Object.hash(runtimeType, name, value);
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
_$$NowImplCopyWith<_$NowImpl> get copyWith =>
__$$NowImplCopyWithImpl<_$NowImpl>(this, _$identity);
@override
Map<String, dynamic> toJson() {
return _$$NowImplToJson(
this,
);
}
}
abstract class _Now implements Now {
const factory _Now(
{required final String name, required final String value}) = _$NowImpl;
factory _Now.fromJson(Map<String, dynamic> json) = _$NowImpl.fromJson;
@override
String get name;
@override
String get value;
@override
@JsonKey(ignore: true)
_$$NowImplCopyWith<_$NowImpl> get copyWith =>
throw _privateConstructorUsedError;
}
Process _$ProcessFromJson(Map<String, dynamic> json) { Process _$ProcessFromJson(Map<String, dynamic> json) {
return _Process.fromJson(json); return _Process.fromJson(json);
} }

View File

@@ -53,6 +53,7 @@ const _$MessageTypeEnumMap = {
MessageType.tun: 'tun', MessageType.tun: 'tun',
MessageType.delay: 'delay', MessageType.delay: 'delay',
MessageType.process: 'process', MessageType.process: 'process',
MessageType.now: 'now',
}; };
_$DelayImpl _$$DelayImplFromJson(Map<String, dynamic> json) => _$DelayImpl( _$DelayImpl _$$DelayImplFromJson(Map<String, dynamic> json) => _$DelayImpl(
@@ -66,6 +67,16 @@ Map<String, dynamic> _$$DelayImplToJson(_$DelayImpl instance) =>
'value': instance.value, 'value': instance.value,
}; };
_$NowImpl _$$NowImplFromJson(Map<String, dynamic> json) => _$NowImpl(
name: json['name'] as String,
value: json['value'] as String,
);
Map<String, dynamic> _$$NowImplToJson(_$NowImpl instance) => <String, dynamic>{
'name': instance.name,
'value': instance.value,
};
_$ProcessImpl _$$ProcessImplFromJson(Map<String, dynamic> json) => _$ProcessImpl _$$ProcessImplFromJson(Map<String, dynamic> json) =>
_$ProcessImpl( _$ProcessImpl(
uid: (json['uid'] as num).toInt(), uid: (json['uid'] as num).toInt(),

View File

@@ -27,7 +27,6 @@ Profile _$ProfileFromJson(Map<String, dynamic> json) => Profile(
userInfo: json['userInfo'] == null userInfo: json['userInfo'] == null
? null ? null
: UserInfo.fromJson(json['userInfo'] as Map<String, dynamic>), : UserInfo.fromJson(json['userInfo'] as Map<String, dynamic>),
groupName: json['groupName'] as String?,
proxyName: json['proxyName'] as String?, proxyName: json['proxyName'] as String?,
lastUpdateDate: json['lastUpdateDate'] == null lastUpdateDate: json['lastUpdateDate'] == null
? null ? null
@@ -41,7 +40,6 @@ Profile _$ProfileFromJson(Map<String, dynamic> json) => Profile(
Map<String, dynamic> _$ProfileToJson(Profile instance) => <String, dynamic>{ Map<String, dynamic> _$ProfileToJson(Profile instance) => <String, dynamic>{
'id': instance.id, 'id': instance.id,
'label': instance.label, 'label': instance.label,
'groupName': instance.groupName,
'proxyName': instance.proxyName, 'proxyName': instance.proxyName,
'url': instance.url, 'url': instance.url,
'lastUpdateDate': instance.lastUpdateDate?.toIso8601String(), 'lastUpdateDate': instance.lastUpdateDate?.toIso8601String(),

View File

@@ -349,7 +349,6 @@ abstract class _UpdateCurrentDelaySelectorState
mixin _$NetworkDetectionSelectorState { mixin _$NetworkDetectionSelectorState {
String? get currentProxyName => throw _privateConstructorUsedError; String? get currentProxyName => throw _privateConstructorUsedError;
int? get delay => throw _privateConstructorUsedError; int? get delay => throw _privateConstructorUsedError;
bool get isInit => throw _privateConstructorUsedError;
@JsonKey(ignore: true) @JsonKey(ignore: true)
$NetworkDetectionSelectorStateCopyWith<NetworkDetectionSelectorState> $NetworkDetectionSelectorStateCopyWith<NetworkDetectionSelectorState>
@@ -364,7 +363,7 @@ abstract class $NetworkDetectionSelectorStateCopyWith<$Res> {
_$NetworkDetectionSelectorStateCopyWithImpl<$Res, _$NetworkDetectionSelectorStateCopyWithImpl<$Res,
NetworkDetectionSelectorState>; NetworkDetectionSelectorState>;
@useResult @useResult
$Res call({String? currentProxyName, int? delay, bool isInit}); $Res call({String? currentProxyName, int? delay});
} }
/// @nodoc /// @nodoc
@@ -383,7 +382,6 @@ class _$NetworkDetectionSelectorStateCopyWithImpl<$Res,
$Res call({ $Res call({
Object? currentProxyName = freezed, Object? currentProxyName = freezed,
Object? delay = freezed, Object? delay = freezed,
Object? isInit = null,
}) { }) {
return _then(_value.copyWith( return _then(_value.copyWith(
currentProxyName: freezed == currentProxyName currentProxyName: freezed == currentProxyName
@@ -394,10 +392,6 @@ class _$NetworkDetectionSelectorStateCopyWithImpl<$Res,
? _value.delay ? _value.delay
: delay // ignore: cast_nullable_to_non_nullable : delay // ignore: cast_nullable_to_non_nullable
as int?, as int?,
isInit: null == isInit
? _value.isInit
: isInit // ignore: cast_nullable_to_non_nullable
as bool,
) as $Val); ) as $Val);
} }
} }
@@ -411,7 +405,7 @@ abstract class _$$NetworkDetectionSelectorStateImplCopyWith<$Res>
__$$NetworkDetectionSelectorStateImplCopyWithImpl<$Res>; __$$NetworkDetectionSelectorStateImplCopyWithImpl<$Res>;
@override @override
@useResult @useResult
$Res call({String? currentProxyName, int? delay, bool isInit}); $Res call({String? currentProxyName, int? delay});
} }
/// @nodoc /// @nodoc
@@ -429,7 +423,6 @@ class __$$NetworkDetectionSelectorStateImplCopyWithImpl<$Res>
$Res call({ $Res call({
Object? currentProxyName = freezed, Object? currentProxyName = freezed,
Object? delay = freezed, Object? delay = freezed,
Object? isInit = null,
}) { }) {
return _then(_$NetworkDetectionSelectorStateImpl( return _then(_$NetworkDetectionSelectorStateImpl(
currentProxyName: freezed == currentProxyName currentProxyName: freezed == currentProxyName
@@ -440,10 +433,6 @@ class __$$NetworkDetectionSelectorStateImplCopyWithImpl<$Res>
? _value.delay ? _value.delay
: delay // ignore: cast_nullable_to_non_nullable : delay // ignore: cast_nullable_to_non_nullable
as int?, as int?,
isInit: null == isInit
? _value.isInit
: isInit // ignore: cast_nullable_to_non_nullable
as bool,
)); ));
} }
} }
@@ -453,20 +442,16 @@ class __$$NetworkDetectionSelectorStateImplCopyWithImpl<$Res>
class _$NetworkDetectionSelectorStateImpl class _$NetworkDetectionSelectorStateImpl
implements _NetworkDetectionSelectorState { implements _NetworkDetectionSelectorState {
const _$NetworkDetectionSelectorStateImpl( const _$NetworkDetectionSelectorStateImpl(
{required this.currentProxyName, {required this.currentProxyName, required this.delay});
required this.delay,
required this.isInit});
@override @override
final String? currentProxyName; final String? currentProxyName;
@override @override
final int? delay; final int? delay;
@override
final bool isInit;
@override @override
String toString() { String toString() {
return 'NetworkDetectionSelectorState(currentProxyName: $currentProxyName, delay: $delay, isInit: $isInit)'; return 'NetworkDetectionSelectorState(currentProxyName: $currentProxyName, delay: $delay)';
} }
@override @override
@@ -476,12 +461,11 @@ class _$NetworkDetectionSelectorStateImpl
other is _$NetworkDetectionSelectorStateImpl && other is _$NetworkDetectionSelectorStateImpl &&
(identical(other.currentProxyName, currentProxyName) || (identical(other.currentProxyName, currentProxyName) ||
other.currentProxyName == currentProxyName) && other.currentProxyName == currentProxyName) &&
(identical(other.delay, delay) || other.delay == delay) && (identical(other.delay, delay) || other.delay == delay));
(identical(other.isInit, isInit) || other.isInit == isInit));
} }
@override @override
int get hashCode => Object.hash(runtimeType, currentProxyName, delay, isInit); int get hashCode => Object.hash(runtimeType, currentProxyName, delay);
@JsonKey(ignore: true) @JsonKey(ignore: true)
@override @override
@@ -496,16 +480,13 @@ abstract class _NetworkDetectionSelectorState
implements NetworkDetectionSelectorState { implements NetworkDetectionSelectorState {
const factory _NetworkDetectionSelectorState( const factory _NetworkDetectionSelectorState(
{required final String? currentProxyName, {required final String? currentProxyName,
required final int? delay, required final int? delay}) = _$NetworkDetectionSelectorStateImpl;
required final bool isInit}) = _$NetworkDetectionSelectorStateImpl;
@override @override
String? get currentProxyName; String? get currentProxyName;
@override @override
int? get delay; int? get delay;
@override @override
bool get isInit;
@override
@JsonKey(ignore: true) @JsonKey(ignore: true)
_$$NetworkDetectionSelectorStateImplCopyWith< _$$NetworkDetectionSelectorStateImplCopyWith<
_$NetworkDetectionSelectorStateImpl> _$NetworkDetectionSelectorStateImpl>
@@ -1740,3 +1721,322 @@ abstract class _HomeNavigationSelectorState
_$$HomeNavigationSelectorStateImplCopyWith<_$HomeNavigationSelectorStateImpl> _$$HomeNavigationSelectorStateImplCopyWith<_$HomeNavigationSelectorStateImpl>
get copyWith => throw _privateConstructorUsedError; get copyWith => throw _privateConstructorUsedError;
} }
/// @nodoc
mixin _$ProxiesCardSelectorState {
String? get currentProxyName => throw _privateConstructorUsedError;
bool get isSelected => throw _privateConstructorUsedError;
@JsonKey(ignore: true)
$ProxiesCardSelectorStateCopyWith<ProxiesCardSelectorState> get copyWith =>
throw _privateConstructorUsedError;
}
/// @nodoc
abstract class $ProxiesCardSelectorStateCopyWith<$Res> {
factory $ProxiesCardSelectorStateCopyWith(ProxiesCardSelectorState value,
$Res Function(ProxiesCardSelectorState) then) =
_$ProxiesCardSelectorStateCopyWithImpl<$Res, ProxiesCardSelectorState>;
@useResult
$Res call({String? currentProxyName, bool isSelected});
}
/// @nodoc
class _$ProxiesCardSelectorStateCopyWithImpl<$Res,
$Val extends ProxiesCardSelectorState>
implements $ProxiesCardSelectorStateCopyWith<$Res> {
_$ProxiesCardSelectorStateCopyWithImpl(this._value, this._then);
// ignore: unused_field
final $Val _value;
// ignore: unused_field
final $Res Function($Val) _then;
@pragma('vm:prefer-inline')
@override
$Res call({
Object? currentProxyName = freezed,
Object? isSelected = null,
}) {
return _then(_value.copyWith(
currentProxyName: freezed == currentProxyName
? _value.currentProxyName
: currentProxyName // ignore: cast_nullable_to_non_nullable
as String?,
isSelected: null == isSelected
? _value.isSelected
: isSelected // ignore: cast_nullable_to_non_nullable
as bool,
) as $Val);
}
}
/// @nodoc
abstract class _$$ProxiesCardSelectorStateImplCopyWith<$Res>
implements $ProxiesCardSelectorStateCopyWith<$Res> {
factory _$$ProxiesCardSelectorStateImplCopyWith(
_$ProxiesCardSelectorStateImpl value,
$Res Function(_$ProxiesCardSelectorStateImpl) then) =
__$$ProxiesCardSelectorStateImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({String? currentProxyName, bool isSelected});
}
/// @nodoc
class __$$ProxiesCardSelectorStateImplCopyWithImpl<$Res>
extends _$ProxiesCardSelectorStateCopyWithImpl<$Res,
_$ProxiesCardSelectorStateImpl>
implements _$$ProxiesCardSelectorStateImplCopyWith<$Res> {
__$$ProxiesCardSelectorStateImplCopyWithImpl(
_$ProxiesCardSelectorStateImpl _value,
$Res Function(_$ProxiesCardSelectorStateImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@override
$Res call({
Object? currentProxyName = freezed,
Object? isSelected = null,
}) {
return _then(_$ProxiesCardSelectorStateImpl(
currentProxyName: freezed == currentProxyName
? _value.currentProxyName
: currentProxyName // ignore: cast_nullable_to_non_nullable
as String?,
isSelected: null == isSelected
? _value.isSelected
: isSelected // ignore: cast_nullable_to_non_nullable
as bool,
));
}
}
/// @nodoc
class _$ProxiesCardSelectorStateImpl implements _ProxiesCardSelectorState {
const _$ProxiesCardSelectorStateImpl(
{required this.currentProxyName, required this.isSelected});
@override
final String? currentProxyName;
@override
final bool isSelected;
@override
String toString() {
return 'ProxiesCardSelectorState(currentProxyName: $currentProxyName, isSelected: $isSelected)';
}
@override
bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$ProxiesCardSelectorStateImpl &&
(identical(other.currentProxyName, currentProxyName) ||
other.currentProxyName == currentProxyName) &&
(identical(other.isSelected, isSelected) ||
other.isSelected == isSelected));
}
@override
int get hashCode => Object.hash(runtimeType, currentProxyName, isSelected);
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
_$$ProxiesCardSelectorStateImplCopyWith<_$ProxiesCardSelectorStateImpl>
get copyWith => __$$ProxiesCardSelectorStateImplCopyWithImpl<
_$ProxiesCardSelectorStateImpl>(this, _$identity);
}
abstract class _ProxiesCardSelectorState implements ProxiesCardSelectorState {
const factory _ProxiesCardSelectorState(
{required final String? currentProxyName,
required final bool isSelected}) = _$ProxiesCardSelectorStateImpl;
@override
String? get currentProxyName;
@override
bool get isSelected;
@override
@JsonKey(ignore: true)
_$$ProxiesCardSelectorStateImplCopyWith<_$ProxiesCardSelectorStateImpl>
get copyWith => throw _privateConstructorUsedError;
}
/// @nodoc
mixin _$ProxiesSelectorState {
ProxiesSortType get proxiesSortType => throw _privateConstructorUsedError;
num get sortNum => throw _privateConstructorUsedError;
Group? get group => throw _privateConstructorUsedError;
@JsonKey(ignore: true)
$ProxiesSelectorStateCopyWith<ProxiesSelectorState> get copyWith =>
throw _privateConstructorUsedError;
}
/// @nodoc
abstract class $ProxiesSelectorStateCopyWith<$Res> {
factory $ProxiesSelectorStateCopyWith(ProxiesSelectorState value,
$Res Function(ProxiesSelectorState) then) =
_$ProxiesSelectorStateCopyWithImpl<$Res, ProxiesSelectorState>;
@useResult
$Res call({ProxiesSortType proxiesSortType, num sortNum, Group? group});
$GroupCopyWith<$Res>? get group;
}
/// @nodoc
class _$ProxiesSelectorStateCopyWithImpl<$Res,
$Val extends ProxiesSelectorState>
implements $ProxiesSelectorStateCopyWith<$Res> {
_$ProxiesSelectorStateCopyWithImpl(this._value, this._then);
// ignore: unused_field
final $Val _value;
// ignore: unused_field
final $Res Function($Val) _then;
@pragma('vm:prefer-inline')
@override
$Res call({
Object? proxiesSortType = null,
Object? sortNum = null,
Object? group = freezed,
}) {
return _then(_value.copyWith(
proxiesSortType: null == proxiesSortType
? _value.proxiesSortType
: proxiesSortType // ignore: cast_nullable_to_non_nullable
as ProxiesSortType,
sortNum: null == sortNum
? _value.sortNum
: sortNum // ignore: cast_nullable_to_non_nullable
as num,
group: freezed == group
? _value.group
: group // ignore: cast_nullable_to_non_nullable
as Group?,
) as $Val);
}
@override
@pragma('vm:prefer-inline')
$GroupCopyWith<$Res>? get group {
if (_value.group == null) {
return null;
}
return $GroupCopyWith<$Res>(_value.group!, (value) {
return _then(_value.copyWith(group: value) as $Val);
});
}
}
/// @nodoc
abstract class _$$ProxiesSelectorStateImplCopyWith<$Res>
implements $ProxiesSelectorStateCopyWith<$Res> {
factory _$$ProxiesSelectorStateImplCopyWith(_$ProxiesSelectorStateImpl value,
$Res Function(_$ProxiesSelectorStateImpl) then) =
__$$ProxiesSelectorStateImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({ProxiesSortType proxiesSortType, num sortNum, Group? group});
@override
$GroupCopyWith<$Res>? get group;
}
/// @nodoc
class __$$ProxiesSelectorStateImplCopyWithImpl<$Res>
extends _$ProxiesSelectorStateCopyWithImpl<$Res, _$ProxiesSelectorStateImpl>
implements _$$ProxiesSelectorStateImplCopyWith<$Res> {
__$$ProxiesSelectorStateImplCopyWithImpl(_$ProxiesSelectorStateImpl _value,
$Res Function(_$ProxiesSelectorStateImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@override
$Res call({
Object? proxiesSortType = null,
Object? sortNum = null,
Object? group = freezed,
}) {
return _then(_$ProxiesSelectorStateImpl(
proxiesSortType: null == proxiesSortType
? _value.proxiesSortType
: proxiesSortType // ignore: cast_nullable_to_non_nullable
as ProxiesSortType,
sortNum: null == sortNum
? _value.sortNum
: sortNum // ignore: cast_nullable_to_non_nullable
as num,
group: freezed == group
? _value.group
: group // ignore: cast_nullable_to_non_nullable
as Group?,
));
}
}
/// @nodoc
class _$ProxiesSelectorStateImpl implements _ProxiesSelectorState {
const _$ProxiesSelectorStateImpl(
{required this.proxiesSortType,
required this.sortNum,
required this.group});
@override
final ProxiesSortType proxiesSortType;
@override
final num sortNum;
@override
final Group? group;
@override
String toString() {
return 'ProxiesSelectorState(proxiesSortType: $proxiesSortType, sortNum: $sortNum, group: $group)';
}
@override
bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$ProxiesSelectorStateImpl &&
(identical(other.proxiesSortType, proxiesSortType) ||
other.proxiesSortType == proxiesSortType) &&
(identical(other.sortNum, sortNum) || other.sortNum == sortNum) &&
(identical(other.group, group) || other.group == group));
}
@override
int get hashCode => Object.hash(runtimeType, proxiesSortType, sortNum, group);
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
_$$ProxiesSelectorStateImplCopyWith<_$ProxiesSelectorStateImpl>
get copyWith =>
__$$ProxiesSelectorStateImplCopyWithImpl<_$ProxiesSelectorStateImpl>(
this, _$identity);
}
abstract class _ProxiesSelectorState implements ProxiesSelectorState {
const factory _ProxiesSelectorState(
{required final ProxiesSortType proxiesSortType,
required final num sortNum,
required final Group? group}) = _$ProxiesSelectorStateImpl;
@override
ProxiesSortType get proxiesSortType;
@override
num get sortNum;
@override
Group? get group;
@override
@JsonKey(ignore: true)
_$$ProxiesSelectorStateImplCopyWith<_$ProxiesSelectorStateImpl>
get copyWith => throw _privateConstructorUsedError;
}

View File

@@ -62,7 +62,6 @@ class UserInfo {
class Profile { class Profile {
String id; String id;
String? label; String? label;
String? groupName;
String? proxyName; String? proxyName;
String? url; String? url;
DateTime? lastUpdateDate; DateTime? lastUpdateDate;
@@ -75,7 +74,6 @@ class Profile {
this.label, this.label,
this.url, this.url,
this.userInfo, this.userInfo,
this.groupName,
this.proxyName, this.proxyName,
this.lastUpdateDate, this.lastUpdateDate,
Duration? autoUpdateDuration, Duration? autoUpdateDuration,
@@ -158,7 +156,6 @@ class Profile {
runtimeType == other.runtimeType && runtimeType == other.runtimeType &&
id == other.id && id == other.id &&
label == other.label && label == other.label &&
groupName == other.groupName &&
proxyName == other.proxyName && proxyName == other.proxyName &&
url == other.url && url == other.url &&
lastUpdateDate == other.lastUpdateDate && lastUpdateDate == other.lastUpdateDate &&
@@ -170,7 +167,6 @@ class Profile {
int get hashCode => int get hashCode =>
id.hashCode ^ id.hashCode ^
label.hashCode ^ label.hashCode ^
groupName.hashCode ^
proxyName.hashCode ^ proxyName.hashCode ^
url.hashCode ^ url.hashCode ^
lastUpdateDate.hashCode ^ lastUpdateDate.hashCode ^
@@ -180,7 +176,7 @@ class Profile {
@override @override
String toString() { String toString() {
return 'Profile{id: $id, label: $label, groupName: $groupName, proxyName: $proxyName, url: $url, lastUpdateDate: $lastUpdateDate, autoUpdateDuration: $autoUpdateDuration, userInfo: $userInfo, autoUpdate: $autoUpdate}'; return 'Profile{id: $id, label: $label, proxyName: $proxyName, url: $url, lastUpdateDate: $lastUpdateDate, autoUpdateDuration: $autoUpdateDuration, userInfo: $userInfo, autoUpdate: $autoUpdate}';
} }
Profile copyWith({ Profile copyWith({
@@ -197,7 +193,6 @@ class Profile {
id: id, id: id,
label: label ?? this.label, label: label ?? this.label,
url: url ?? this.url, url: url ?? this.url,
groupName: groupName ?? this.groupName,
proxyName: proxyName ?? this.proxyName, proxyName: proxyName ?? this.proxyName,
userInfo: userInfo ?? this.userInfo, userInfo: userInfo ?? this.userInfo,
lastUpdateDate: lastUpdateDate ?? this.lastUpdateDate, lastUpdateDate: lastUpdateDate ?? this.lastUpdateDate,

View File

@@ -5,6 +5,7 @@ import 'config.dart';
import 'navigation.dart'; import 'navigation.dart';
import 'package.dart'; import 'package.dart';
import 'profile.dart'; import 'profile.dart';
import 'proxy.dart';
part 'generated/selector.freezed.dart'; part 'generated/selector.freezed.dart';
@@ -31,7 +32,6 @@ class NetworkDetectionSelectorState with _$NetworkDetectionSelectorState {
const factory NetworkDetectionSelectorState({ const factory NetworkDetectionSelectorState({
required String? currentProxyName, required String? currentProxyName,
required int? delay, required int? delay,
required bool isInit,
}) = _NetworkDetectionSelectorState; }) = _NetworkDetectionSelectorState;
} }
@@ -101,3 +101,20 @@ class HomeNavigationSelectorState with _$HomeNavigationSelectorState{
required String? locale, required String? locale,
}) = _HomeNavigationSelectorState; }) = _HomeNavigationSelectorState;
} }
@freezed
class ProxiesCardSelectorState with _$ProxiesCardSelectorState{
const factory ProxiesCardSelectorState({
required String? currentProxyName,
required bool isSelected,
}) = _ProxiesCardSelectorState;
}
@freezed
class ProxiesSelectorState with _$ProxiesSelectorState{
const factory ProxiesSelectorState({
required ProxiesSortType proxiesSortType,
required num sortNum,
required Group? group,
}) = _ProxiesSelectorState;
}

View File

@@ -140,7 +140,6 @@ class HomePage extends StatelessWidget {
child: Selector<AppState, List<NavigationItem>>( child: Selector<AppState, List<NavigationItem>>(
selector: (_, appState) => appState.navigationItems, selector: (_, appState) => appState.navigationItems,
builder: (_, navigationItems, __) { builder: (_, navigationItems, __) {
debugPrint("[Home] update===>");
final desktopNavigationItems = navigationItems final desktopNavigationItems = navigationItems
.where( .where(
(element) => (element) =>

View File

@@ -14,8 +14,7 @@ import 'common/common.dart';
class GlobalState { class GlobalState {
Timer? timer; Timer? timer;
Timer? currentDelayTimer; Function? updateSortNumDebounce;
Function? updateCurrentDelayDebounce;
PageController? pageController; PageController? pageController;
final navigatorKey = GlobalKey<NavigatorState>(); final navigatorKey = GlobalKey<NavigatorState>();
final Map<int, String?> packageNameMap = {}; final Map<int, String?> packageNameMap = {};
@@ -23,6 +22,7 @@ class GlobalState {
List<Function> updateFunctionLists = []; List<Function> updateFunctionLists = [];
List<NavigationItem> currentNavigationItems = []; List<NavigationItem> currentNavigationItems = [];
bool updatePackagesLock = false; bool updatePackagesLock = false;
bool healthcheckLock = false;
startListenUpdate() { startListenUpdate() {
if (timer != null && timer!.isActive == true) return; if (timer != null && timer!.isActive == true) return;
@@ -38,7 +38,7 @@ class GlobalState {
timer?.cancel(); timer?.cancel();
} }
Future<bool> updateClashConfig({ Future<String> updateClashConfig({
required ClashConfig clashConfig, required ClashConfig clashConfig,
required Config config, required Config config,
bool isPatch = true, bool isPatch = true,
@@ -74,17 +74,24 @@ class GlobalState {
stopListenUpdate(); stopListenUpdate();
} }
void updateCurrentDelay(
String? proxyName, applyProfile({
) { required AppState appState,
updateCurrentDelayDebounce ??= debounce<Function(String?)>((proxyName) { required Config config,
if (proxyName != null) { required ClashConfig clashConfig,
clashCore.delay( }) async {
proxyName, final res = await updateClashConfig(
); clashConfig: clashConfig,
} config: config,
}); isPatch: false,
updateCurrentDelayDebounce!([proxyName]); );
if (res.isNotEmpty) return Result.error(message: res);
await updateGroups(appState);
changeProxy(
appState: appState,
config: config,
clashConfig: clashConfig,
);
} }
init({ init({
@@ -100,15 +107,51 @@ class GlobalState {
); );
} }
if (!appState.isInit) return; if (!appState.isInit) return;
await updateClashConfig( await applyProfile(
clashConfig: clashConfig, appState: appState,
config: config, config: config,
isPatch: false, clashConfig: clashConfig,
); );
updateGroups(appState);
updateCoreVersionInfo(appState); updateCoreVersionInfo(appState);
} }
changeProxy({
required AppState appState,
required Config config,
required ClashConfig clashConfig,
}) {
WidgetsBinding.instance.addPostFrameCallback((_) {
if (config.profiles.isEmpty) {
stopSystemProxy();
return;
}
final currentProxyName = appState.currentProxyName;
if (currentProxyName == null) return;
final index1 = appState.globalGroup?.all.indexWhere(
(element) => element.name == currentProxyName,
);
if (index1 != null && index1 != -1) {
clashCore.changeProxy(
ChangeProxyParams(
groupName: GroupName.GLOBAL.name,
proxyName: currentProxyName,
),
);
}
final index2 = appState.ruleGroup?.all.indexWhere(
(element) => element.name == currentProxyName,
);
if (index2 != null && index2 != -1) {
clashCore.changeProxy(
ChangeProxyParams(
groupName: GroupName.Proxy.name,
proxyName: currentProxyName,
),
);
}
});
}
updatePackages(AppState appState) async { updatePackages(AppState appState) async {
if (appState.packages.isEmpty && updatePackagesLock == false) { if (appState.packages.isEmpty && updatePackagesLock == false) {
updatePackagesLock = true; updatePackagesLock = true;
@@ -122,16 +165,16 @@ class GlobalState {
required Config config, required Config config,
required ClashConfig clashConfig, required ClashConfig clashConfig,
}) { }) {
final hasGroups = appState.getCurrentGroups(clashConfig.mode).isNotEmpty; final group = appState.currentGroup;
final hasProfile = config.profiles.isNotEmpty; final hasProfile = config.profiles.isNotEmpty;
appState.navigationItems = navigation.getItems( appState.navigationItems = navigation.getItems(
openLogs: config.openLogs, openLogs: config.openLogs,
hasProxies: hasGroups && hasProfile, hasProxies: group != null && hasProfile,
); );
} }
updateGroups(AppState appState) { Future<void> updateGroups(AppState appState) async {
appState.groups = clashCore.getProxiesGroups(); appState.groups = await clashCore.getProxiesGroups();
} }
showMessage({ showMessage({
@@ -198,7 +241,7 @@ class GlobalState {
required Config config, required Config config,
}) { }) {
final traffic = clashCore.getTraffic(); final traffic = clashCore.getTraffic();
if(appState != null){ if (appState != null) {
appState.addTraffic(traffic); appState.addTraffic(traffic);
} }
if (Platform.isAndroid) { if (Platform.isAndroid) {

View File

@@ -15,7 +15,6 @@ class AppStateContainer extends StatelessWidget {
return Selector<Config, bool>( return Selector<Config, bool>(
selector: (_, config) => config.autoLaunch, selector: (_, config) => config.autoLaunch,
builder: (_, isAutoLaunch, child) { builder: (_, isAutoLaunch, child) {
debugPrint("[autoLaunchContainer] update===>");
autoLaunch?.updateStatus(isAutoLaunch); autoLaunch?.updateStatus(isAutoLaunch);
return child!; return child!;
}, },
@@ -24,18 +23,16 @@ class AppStateContainer extends StatelessWidget {
} }
_updateNavigationsContainer(Widget child) { _updateNavigationsContainer(Widget child) {
return Selector3<AppState, Config, ClashConfig, UpdateNavigationsSelector>( return Selector2<AppState, Config, UpdateNavigationsSelector>(
selector: (_, appState, config, clashConfig) { selector: (_, appState, config) {
final hasGroups = final group = appState.currentGroup;
appState.getCurrentGroups(clashConfig.mode).isNotEmpty;
final hasProfile = config.profiles.isNotEmpty; final hasProfile = config.profiles.isNotEmpty;
return UpdateNavigationsSelector( return UpdateNavigationsSelector(
openLogs: config.openLogs, openLogs: config.openLogs,
hasProxies: hasGroups && hasProfile, hasProxies: group != null && hasProfile,
); );
}, },
builder: (context, state, child) { builder: (context, state, child) {
debugPrint("[NavigationsContainer] update===>");
WidgetsBinding.instance.addPostFrameCallback( WidgetsBinding.instance.addPostFrameCallback(
(_) { (_) {
context.appController.appState.navigationItems = context.appController.appState.navigationItems =

View File

@@ -38,13 +38,26 @@ class _ClashMessageContainerState extends State<ClashMessageContainer>
@override @override
void onDelay(Delay delay) { void onDelay(Delay delay) {
context.appController.setDelay(delay); final appController = context.appController;
appController.setDelay(delay);
globalState.healthcheckLock = true;
WidgetsBinding.instance.addPostFrameCallback((_) {
globalState.updateSortNumDebounce ??= debounce<Function()>(
() async {
await appController.updateGroups();
appController.appState.sortNum++;
globalState.healthcheckLock = false;
},
milliseconds: 5000,
);
globalState.updateSortNumDebounce!();
});
super.onDelay(delay); super.onDelay(delay);
} }
@override @override
void onLog(Log log) { void onLog(Log log) {
debugPrint("$log"); print("$log");
context.appController.appState.addLog(log); context.appController.appState.addLog(log);
super.onLog(log); super.onLog(log);
} }

View File

@@ -446,7 +446,6 @@ class _OpenContainerRoute<T> extends ModalRoute<T> {
return Selector<Config, ThemeMode>( return Selector<Config, ThemeMode>(
selector: (_, config) => config.themeMode, selector: (_, config) => config.themeMode,
builder: (_, __, ___) { builder: (_, __, ___) {
debugPrint("[OpenContainerTheme] update===>");
_colorTween = _getColorTween( _colorTween = _getColorTween(
transitionType: transitionType, transitionType: transitionType,
closedColor: Theme.of(context).colorScheme.background, closedColor: Theme.of(context).colorScheme.background,

View File

@@ -144,7 +144,6 @@ class _TrayContainerState extends State<TrayContainer> with TrayListener {
locale: config.locale, locale: config.locale,
), ),
builder: (_, state, child) { builder: (_, state, child) {
debugPrint("[TrayContainer] update===>");
WidgetsBinding.instance.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
updateMenu(state); updateMenu(state);
}); });

View File

@@ -258,10 +258,10 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: flutter_adaptive_scaffold name: flutter_adaptive_scaffold
sha256: "600bbe237530a249f957f7d0f36273c20bd38d137e28e098c5231c30cadbe927" sha256: "9a1d5e9f728815e27b7b612883db19107ba8a35a46a97c757ea00896cb027451"
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.1.10+1" version: "0.1.10+2"
flutter_lints: flutter_lints:
dependency: "direct dev" dependency: "direct dev"
description: description:
@@ -279,10 +279,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: flutter_plugin_android_lifecycle name: flutter_plugin_android_lifecycle
sha256: "592dc01a18961a51c24ae5d963b724b2b7fa4a95c100fe8eb6ca8a5a4732cadf" sha256: "8cf40eebf5dec866a6d1956ad7b4f7016e6c0cc69847ab946833b7d43743809f"
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.0.18" version: "2.0.19"
flutter_test: flutter_test:
dependency: "direct dev" dependency: "direct dev"
description: flutter description: flutter
@@ -997,10 +997,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: yaml_edit name: yaml_edit
sha256: c566f4f804215d84a7a2c377667f546c6033d5b34b4f9e60dfb09d17c4e97826 sha256: e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.2.0" version: "2.2.1"
sdks: sdks:
dart: ">=3.3.0 <4.0.0" dart: ">=3.3.0 <4.0.0"
flutter: ">=3.19.0" flutter: ">=3.19.0"

View File

@@ -1,7 +1,7 @@
name: fl_clash name: fl_clash
description: A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free. description: A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.
publish_to: 'none' publish_to: 'none'
version: 0.7.0 version: 0.7.14
environment: environment:
sdk: '>=3.1.0 <4.0.0' sdk: '>=3.1.0 <4.0.0'