Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d2d9bdab02 | ||
|
|
d0f8444b6d | ||
|
|
fccabfbe27 | ||
|
|
e9bb97c6ce | ||
|
|
068fe14d89 | ||
|
|
43c397007c | ||
|
|
5e801d5f5e | ||
|
|
52d61b15fd | ||
|
|
fea3c14608 | ||
|
|
84be01a38a | ||
|
|
93da242148 | ||
|
|
bb7e44da30 | ||
|
|
01f1b2d72f | ||
|
|
3074b1299e |
4
.github/workflows/build.yml
vendored
4
.github/workflows/build.yml
vendored
@@ -17,8 +17,8 @@ jobs:
|
||||
os: windows-latest
|
||||
- platform: linux
|
||||
os: ubuntu-latest
|
||||
- platform: macos
|
||||
os: macos-13
|
||||
# - platform: macos
|
||||
# os: macos-13
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@@ -31,6 +31,7 @@ migrate_working_dir/
|
||||
.pub-cache/
|
||||
.pub/
|
||||
/build/
|
||||
/dist/
|
||||
|
||||
# Symbolication related
|
||||
app.*.symbols
|
||||
@@ -44,6 +45,7 @@ app.*.map.json
|
||||
/android/app/release
|
||||
|
||||
|
||||
|
||||
#libclash
|
||||
/libclash/
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@ import android.os.Binder
|
||||
import android.os.Build
|
||||
import android.os.IBinder
|
||||
import androidx.core.app.NotificationCompat
|
||||
import androidx.core.app.NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE
|
||||
import androidx.core.graphics.drawable.IconCompat
|
||||
import com.follow.clash.GlobalState
|
||||
import com.follow.clash.MainActivity
|
||||
@@ -20,6 +21,7 @@ import com.follow.clash.models.AccessControl
|
||||
import com.follow.clash.models.AccessControlMode
|
||||
|
||||
|
||||
@SuppressLint("WrongConstant")
|
||||
class FlClashVpnService : VpnService() {
|
||||
|
||||
|
||||
@@ -97,6 +99,43 @@ class FlClashVpnService : VpnService() {
|
||||
stopForeground()
|
||||
}
|
||||
|
||||
|
||||
private val notificationBuilder by lazy {
|
||||
val intent = Intent(this, MainActivity::class.java)
|
||||
|
||||
val pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
||||
PendingIntent.getActivity(
|
||||
this,
|
||||
0,
|
||||
intent,
|
||||
PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
|
||||
)
|
||||
} else {
|
||||
PendingIntent.getActivity(
|
||||
this,
|
||||
0,
|
||||
intent,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT
|
||||
)
|
||||
}
|
||||
|
||||
val icon = IconCompat.createWithResource(this, this.applicationInfo.icon)
|
||||
|
||||
with(NotificationCompat.Builder(this, CHANNEL)) {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
||||
setSmallIcon(icon)
|
||||
}
|
||||
setContentTitle("FlClash")
|
||||
foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
|
||||
setContentIntent(pendingIntent)
|
||||
setCategory(NotificationCompat.CATEGORY_SERVICE)
|
||||
priority = NotificationCompat.PRIORITY_LOW
|
||||
setOngoing(true)
|
||||
setShowWhen(false)
|
||||
setOnlyAlertOnce(true)
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressLint("ForegroundServiceType", "WrongConstant")
|
||||
fun startForeground(title: String, content: String) {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||
@@ -104,42 +143,13 @@ class FlClashVpnService : VpnService() {
|
||||
NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
|
||||
val manager = getSystemService(NotificationManager::class.java)
|
||||
manager.createNotificationChannel(channel)
|
||||
|
||||
val intent = Intent(this, MainActivity::class.java)
|
||||
|
||||
val pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
||||
PendingIntent.getActivity(
|
||||
this,
|
||||
0,
|
||||
intent,
|
||||
PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
|
||||
)
|
||||
} else {
|
||||
PendingIntent.getActivity(
|
||||
this,
|
||||
0,
|
||||
intent,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT
|
||||
)
|
||||
}
|
||||
|
||||
val icon = IconCompat.createWithResource(this, this.applicationInfo.icon)
|
||||
|
||||
val notification = with(NotificationCompat.Builder(this, CHANNEL)) {
|
||||
setSmallIcon(icon)
|
||||
setContentTitle(title)
|
||||
setContentText(content)
|
||||
foregroundServiceBehavior = NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE
|
||||
setContentIntent(pendingIntent)
|
||||
setOngoing(true)
|
||||
setShowWhen(false)
|
||||
build()
|
||||
}
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
|
||||
startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
|
||||
} else {
|
||||
startForeground(notificationId, notification)
|
||||
}
|
||||
}
|
||||
val notification =
|
||||
notificationBuilder.setContentTitle(title).setContentText(content).build()
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
|
||||
startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
|
||||
} else {
|
||||
startForeground(notificationId, notification)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
BIN
assets/data/ASN.mmdb
Normal file
BIN
assets/data/ASN.mmdb
Normal file
Binary file not shown.
31589
assets/data/GeoSite.dat
Normal file
31589
assets/data/GeoSite.dat
Normal file
File diff suppressed because one or more lines are too long
Binary file not shown.
Submodule core/Clash.Meta updated: 9b94b9c339...2cf9c4b120
@@ -22,6 +22,7 @@ import (
|
||||
"strings"
|
||||
"sync"
|
||||
"syscall"
|
||||
"time"
|
||||
)
|
||||
|
||||
type healthCheckSchema struct {
|
||||
@@ -93,6 +94,13 @@ type Now struct {
|
||||
Value string `json:"value"`
|
||||
}
|
||||
|
||||
type ExternalProvider struct {
|
||||
Name string `json:"name"`
|
||||
Type string `json:"type"`
|
||||
VehicleType string `json:"vehicle-type"`
|
||||
UpdateAt time.Time `json:"update-at"`
|
||||
}
|
||||
|
||||
func restartExecutable(execPath string) {
|
||||
var err error
|
||||
executor.Shutdown()
|
||||
@@ -317,11 +325,14 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
|
||||
targetConfig.ExternalUI = ""
|
||||
targetConfig.Interface = ""
|
||||
targetConfig.ExternalUIURL = ""
|
||||
targetConfig.GeodataMode = false
|
||||
//targetConfig.IPv6 = patchConfig.IPv6
|
||||
targetConfig.LogLevel = patchConfig.LogLevel
|
||||
targetConfig.Port = 0
|
||||
targetConfig.SocksPort = 0
|
||||
targetConfig.MixedPort = patchConfig.MixedPort
|
||||
targetConfig.FindProcessMode = process.FindProcessAlways
|
||||
targetConfig.AllowLan = patchConfig.AllowLan
|
||||
targetConfig.MixedPort = patchConfig.MixedPort
|
||||
targetConfig.Mode = patchConfig.Mode
|
||||
targetConfig.Tun.Enable = patchConfig.Tun.Enable
|
||||
targetConfig.Tun.Device = patchConfig.Tun.Device
|
||||
@@ -342,7 +353,6 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
|
||||
targetConfig.RuleProvider = make(map[string]map[string]any)
|
||||
generateProxyGroupAndRule(&targetConfig.ProxyGroup, &targetConfig.Rule)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func patchConfig(general *config.General) {
|
||||
@@ -401,6 +411,6 @@ func applyConfig(isPatch bool) {
|
||||
patchConfig(cfg.General)
|
||||
} else {
|
||||
executor.ApplyConfig(cfg, true)
|
||||
healthcheck()
|
||||
hcCompatibleProvider(tunnel.Providers())
|
||||
}
|
||||
}
|
||||
|
||||
34
core/go.mod
34
core/go.mod
@@ -1,6 +1,6 @@
|
||||
module core
|
||||
|
||||
go 1.21.0
|
||||
go 1.20
|
||||
|
||||
replace github.com/metacubex/mihomo => ./Clash.Meta
|
||||
|
||||
@@ -8,7 +8,7 @@ require (
|
||||
github.com/Kr328/tun2socket v0.0.0-20220414050025-d07c78d06d34
|
||||
github.com/metacubex/mihomo v1.17.1
|
||||
github.com/miekg/dns v1.1.59
|
||||
golang.org/x/net v0.24.0
|
||||
golang.org/x/net v0.25.0
|
||||
golang.org/x/sync v0.7.0
|
||||
)
|
||||
|
||||
@@ -21,7 +21,7 @@ require (
|
||||
github.com/bahlo/generic-list-go v0.2.0 // indirect
|
||||
github.com/buger/jsonparser v1.1.1 // indirect
|
||||
github.com/cilium/ebpf v0.12.3 // indirect
|
||||
github.com/cloudflare/circl v1.3.6 // indirect
|
||||
github.com/cloudflare/circl v1.3.7 // indirect
|
||||
github.com/coreos/go-iptables v0.7.0 // indirect
|
||||
github.com/dlclark/regexp2 v1.11.0 // indirect
|
||||
github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 // indirect
|
||||
@@ -34,8 +34,8 @@ require (
|
||||
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
|
||||
github.com/gobwas/httphead v0.1.0 // indirect
|
||||
github.com/gobwas/pool v0.2.1 // indirect
|
||||
github.com/gobwas/ws v1.3.2 // indirect
|
||||
github.com/gofrs/uuid/v5 v5.1.0 // indirect
|
||||
github.com/gobwas/ws v1.4.0 // indirect
|
||||
github.com/gofrs/uuid/v5 v5.2.0 // indirect
|
||||
github.com/google/btree v1.1.2 // indirect
|
||||
github.com/google/go-cmp v0.6.0 // indirect
|
||||
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
|
||||
@@ -51,14 +51,15 @@ require (
|
||||
github.com/mdlayher/socket v0.4.1 // indirect
|
||||
github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 // indirect
|
||||
github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec // indirect
|
||||
github.com/metacubex/quic-go v0.42.1-0.20240418003344-f006b5735d98 // indirect
|
||||
github.com/metacubex/sing-quic v0.0.0-20240418004036-814c531c378d // indirect
|
||||
github.com/metacubex/quic-go v0.43.2-0.20240518033621-2c3d14c6b38e // indirect
|
||||
github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 // indirect
|
||||
github.com/metacubex/sing-shadowsocks v0.2.6 // indirect
|
||||
github.com/metacubex/sing-shadowsocks2 v0.2.0 // indirect
|
||||
github.com/metacubex/sing-tun v0.2.6 // indirect
|
||||
github.com/metacubex/sing-tun v0.2.7-0.20240512075008-89e7c6208eec // indirect
|
||||
github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f // indirect
|
||||
github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63 // indirect
|
||||
github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66 // indirect
|
||||
github.com/metacubex/utls v1.6.6 // indirect
|
||||
github.com/mroth/weightedrand/v2 v2.1.0 // indirect
|
||||
github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 // indirect
|
||||
github.com/onsi/ginkgo/v2 v2.9.5 // indirect
|
||||
@@ -75,10 +76,9 @@ require (
|
||||
github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6 // indirect
|
||||
github.com/sagernet/sing-shadowtls v0.1.4 // indirect
|
||||
github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 // indirect
|
||||
github.com/sagernet/utls v1.5.4 // indirect
|
||||
github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e // indirect
|
||||
github.com/samber/lo v1.39.0 // indirect
|
||||
github.com/shirou/gopsutil/v3 v3.24.3 // indirect
|
||||
github.com/shirou/gopsutil/v3 v3.24.4 // indirect
|
||||
github.com/shoenig/go-m1cpu v0.1.6 // indirect
|
||||
github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b // indirect
|
||||
github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c // indirect
|
||||
@@ -94,14 +94,14 @@ require (
|
||||
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
|
||||
go.uber.org/mock v0.4.0 // indirect
|
||||
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
|
||||
golang.org/x/crypto v0.22.0 // indirect
|
||||
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
|
||||
golang.org/x/crypto v0.23.0 // indirect
|
||||
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
|
||||
golang.org/x/mod v0.17.0 // indirect
|
||||
golang.org/x/sys v0.19.0 // indirect
|
||||
golang.org/x/text v0.14.0 // indirect
|
||||
golang.org/x/sys v0.20.0 // indirect
|
||||
golang.org/x/text v0.15.0 // indirect
|
||||
golang.org/x/time v0.5.0 // indirect
|
||||
golang.org/x/tools v0.20.0 // indirect
|
||||
google.golang.org/protobuf v1.33.0 // indirect
|
||||
golang.org/x/tools v0.21.0 // indirect
|
||||
google.golang.org/protobuf v1.34.1 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
lukechampine.com/blake3 v1.2.2 // indirect
|
||||
lukechampine.com/blake3 v1.3.0 // indirect
|
||||
)
|
||||
|
||||
77
core/go.sum
77
core/go.sum
@@ -21,8 +21,8 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P
|
||||
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
|
||||
github.com/cilium/ebpf v0.12.3 h1:8ht6F9MquybnY97at+VDZb3eQQr8ev79RueWeVaEcG4=
|
||||
github.com/cilium/ebpf v0.12.3/go.mod h1:TctK1ivibvI3znr66ljgi4hqOT8EYQjz1KWBfb1UVgM=
|
||||
github.com/cloudflare/circl v1.3.6 h1:/xbKIqSHbZXHwkhbrhrt2YOHIwYJlXH94E3tI/gDlUg=
|
||||
github.com/cloudflare/circl v1.3.6/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
|
||||
github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
|
||||
github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
|
||||
github.com/coreos/go-iptables v0.7.0 h1:XWM3V+MPRr5/q51NuWSgU0fqMad64Zyxs8ZUoMsamr8=
|
||||
github.com/coreos/go-iptables v0.7.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
@@ -35,19 +35,16 @@ github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9/go.mod h1:hkIF
|
||||
github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 h1:8j2RH289RJplhA6WfdaPqzg1MjH2K8wX5e0uhAxrw2g=
|
||||
github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391/go.mod h1:K2R7GhgxrlJzHw2qiPWsCZXf/kXEJN9PLnQK73Ll0po=
|
||||
github.com/ericlagergren/saferand v0.0.0-20220206064634-960a4dd2bc5c h1:RUzBDdZ+e/HEe2Nh8lYsduiPAZygUfVXJn0Ncj5sHMg=
|
||||
github.com/ericlagergren/saferand v0.0.0-20220206064634-960a4dd2bc5c/go.mod h1:ETASDWf/FmEb6Ysrtd1QhjNedUU/ZQxBCRLh60bQ/UI=
|
||||
github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 h1:tlDMEdcPRQKBEz5nGDMvswiajqh7k8ogWRlhRwKy5mY=
|
||||
github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1/go.mod h1:4RfsapbGx2j/vU5xC/5/9qB3kn9Awp1YDiEnN43QrJ4=
|
||||
github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 h1:fuGucgPk5dN6wzfnxl3D0D3rVLw4v2SbBT9jb4VnxzA=
|
||||
github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010/go.mod h1:JtBcj7sBuTTRupn7c2bFspMDIObMJsVK8TeUvpShPok=
|
||||
github.com/frankban/quicktest v1.14.5 h1:dfYrrRyLtiqT9GyKXgdh+k4inNeTvmGbuSgZ3lx3GhA=
|
||||
github.com/frankban/quicktest v1.14.5/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
|
||||
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
|
||||
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
|
||||
github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk=
|
||||
github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI=
|
||||
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
|
||||
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
|
||||
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
|
||||
github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
|
||||
github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
|
||||
@@ -57,13 +54,12 @@ github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU
|
||||
github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
|
||||
github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
|
||||
github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
|
||||
github.com/gobwas/ws v1.3.2 h1:zlnbNHxumkRvfPWgfXu8RBwyNR1x8wh9cf5PTOCqs9Q=
|
||||
github.com/gobwas/ws v1.3.2/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
|
||||
github.com/gofrs/uuid/v5 v5.1.0 h1:S5rqVKIigghZTCBKPCw0Y+bXkn26K3TB5mvQq2Ix8dk=
|
||||
github.com/gofrs/uuid/v5 v5.1.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
|
||||
github.com/gobwas/ws v1.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs=
|
||||
github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc=
|
||||
github.com/gofrs/uuid/v5 v5.2.0 h1:qw1GMx6/y8vhVsx626ImfKMuS5CvJmhIKKtuyvfajMM=
|
||||
github.com/gofrs/uuid/v5 v5.2.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
|
||||
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
|
||||
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
|
||||
github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
|
||||
github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
|
||||
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
@@ -73,7 +69,6 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
|
||||
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
|
||||
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
|
||||
github.com/google/tink/go v1.6.1 h1:t7JHqO8Ath2w2ig5vjwQYJzhGEZymedQc90lQXUBa4I=
|
||||
github.com/google/tink/go v1.6.1/go.mod h1:IGW53kTgag+st5yPhKKwJ6u2l+SSp5/v9XF7spovjlY=
|
||||
github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
|
||||
github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
|
||||
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
|
||||
@@ -88,9 +83,7 @@ github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6K
|
||||
github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
|
||||
github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
|
||||
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
||||
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
||||
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
||||
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
||||
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
|
||||
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
|
||||
github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc=
|
||||
@@ -105,22 +98,24 @@ github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 h1:cjd4biTvO
|
||||
github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759/go.mod h1:UHOv2xu+RIgLwpXca7TLrXleEd4oR3sPatW6IF8wU88=
|
||||
github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec h1:HxreOiFTUrJXJautEo8rnE1uKTVGY8wtZepY1Tii/Nc=
|
||||
github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec/go.mod h1:8BVmQ+3cxjqzWElafm24rb2Ae4jRI6vAXNXWqWjfrXw=
|
||||
github.com/metacubex/quic-go v0.42.1-0.20240418003344-f006b5735d98 h1:oMLlJV4a9AylNo8ZLBNUiqZ02Vme6GLLHjuWJz8amSk=
|
||||
github.com/metacubex/quic-go v0.42.1-0.20240418003344-f006b5735d98/go.mod h1:iGx3Y1zynls/FjFgykLSqDcM81U0IKePRTXEz5g3iiQ=
|
||||
github.com/metacubex/sing-quic v0.0.0-20240418004036-814c531c378d h1:RAe0ND8J5SOPGI623oEXfaHKaaUrrzHx+U1DN9Awcco=
|
||||
github.com/metacubex/sing-quic v0.0.0-20240418004036-814c531c378d/go.mod h1:WyY0zYxv+o+18R/Ece+QFontlgXoobKbNqbtYn2zjz8=
|
||||
github.com/metacubex/quic-go v0.43.2-0.20240518033621-2c3d14c6b38e h1:Nzwe08FNIJpExWpy9iXkG336dN/8nJqn69yijB7vJ8g=
|
||||
github.com/metacubex/quic-go v0.43.2-0.20240518033621-2c3d14c6b38e/go.mod h1:uXHODgJFUfUnkkCMWLd5Er6L5QY/LFRZb9LD5jyyhsk=
|
||||
github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 h1:Wr4g1HCb5Z/QIFwFiVNjO2qL+dRu25+Mdn9xtAZZ+ew=
|
||||
github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72/go.mod h1:g7Mxj7b7zm7YVqD975mk/hSmrb0A0G4bVvIMr2MMzn8=
|
||||
github.com/metacubex/sing-shadowsocks v0.2.6 h1:6oEB3QcsFYnNiFeoevcXrCwJ3sAablwVSgtE9R3QeFQ=
|
||||
github.com/metacubex/sing-shadowsocks v0.2.6/go.mod h1:zIkMeSnb8Mbf4hdqhw0pjzkn1d99YJ3JQm/VBg5WMTg=
|
||||
github.com/metacubex/sing-shadowsocks2 v0.2.0 h1:hqwT/AfI5d5UdPefIzR6onGHJfDXs5zgOM5QSgaM/9A=
|
||||
github.com/metacubex/sing-shadowsocks2 v0.2.0/go.mod h1:LCKF6j1P94zN8ZS+LXRK1gmYTVGB3squivBSXAFnOg8=
|
||||
github.com/metacubex/sing-tun v0.2.6 h1:frc58BqnIClqcC9KcYBfVAn5bgO6WW1ANKvZW3/HYAQ=
|
||||
github.com/metacubex/sing-tun v0.2.6/go.mod h1:4VsMwZH1IlgPGFK1ZbBomZ/B2MYkTgs2+gnBAr5GOIo=
|
||||
github.com/metacubex/sing-tun v0.2.7-0.20240512075008-89e7c6208eec h1:K4Wq3GOdLZ/xcqwyzAt4kmYQrjokyKQ3u/Xh5Yft14U=
|
||||
github.com/metacubex/sing-tun v0.2.7-0.20240512075008-89e7c6208eec/go.mod h1:4VsMwZH1IlgPGFK1ZbBomZ/B2MYkTgs2+gnBAr5GOIo=
|
||||
github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f h1:QjXrHKbTMBip/C+R79bvbfr42xH1gZl3uFb0RELdZiQ=
|
||||
github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f/go.mod h1:olVkD4FChQ5gKMHG4ZzuD7+fMkJY1G8vwOKpRehjrmY=
|
||||
github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63 h1:AGyIB55UfQm/0ZH0HtQO9u3l//yjtHUpjeRjjPGfGRI=
|
||||
github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63/go.mod h1:uY+BYb0UEknLrqvbGcwi9i++KgrKxsurysgI6G1Pveo=
|
||||
github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66 h1:as/aO/fM8nv4W4pOr9EETP6kV/Oaujk3fUNyQSJK61c=
|
||||
github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66/go.mod h1:c7bVFM9f5+VzeZ/6Kg77T/jrg1Xp8QpqlSHvG/aXVts=
|
||||
github.com/metacubex/utls v1.6.6 h1:3D12YKHTf2Z41UPhQU2dWerNWJ5TVQD9gKoQ+H+iLC8=
|
||||
github.com/metacubex/utls v1.6.6/go.mod h1:+WLFUnXjcpdxXCnyX25nggw8C6YonZ8zOK2Zm/oRvdo=
|
||||
github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs=
|
||||
github.com/miekg/dns v1.1.59/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk=
|
||||
github.com/mroth/weightedrand/v2 v2.1.0 h1:o1ascnB1CIVzsqlfArQQjeMy1U0NcIbBO5rfd5E/OeU=
|
||||
@@ -130,7 +125,6 @@ github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7/go.mod h1:U
|
||||
github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=
|
||||
github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k=
|
||||
github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
|
||||
github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg=
|
||||
github.com/openacid/errors v0.8.1/go.mod h1:GUQEJJOJE3W9skHm8E8Y4phdl2LLEN8iD7c5gcGgdx0=
|
||||
github.com/openacid/low v0.1.21 h1:Tr2GNu4N/+rGRYdOsEHOE89cxUIaDViZbVmKz29uKGo=
|
||||
github.com/openacid/low v0.1.21/go.mod h1:q+MsKI6Pz2xsCkzV4BLj7NR5M4EX0sGz5AqotpZDVh0=
|
||||
@@ -152,7 +146,6 @@ github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1
|
||||
github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs=
|
||||
github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
|
||||
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
|
||||
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
|
||||
github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a h1:+NkI2670SQpQWvkkD2QgdTuzQG263YZ+2emfpeyGqW0=
|
||||
github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a/go.mod h1:63s7jpZqcDAIpj8oI/1v4Izok+npJOHACFCU6+huCkM=
|
||||
github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97 h1:iL5gZI3uFp0X6EslacyapiRz7LLSJyr4RajF/BhMVyE=
|
||||
@@ -166,14 +159,12 @@ github.com/sagernet/sing-shadowtls v0.1.4 h1:aTgBSJEgnumzFenPvc+kbD9/W0PywzWevnV
|
||||
github.com/sagernet/sing-shadowtls v0.1.4/go.mod h1:F8NBgsY5YN2beQavdgdm1DPlhaKQlaL6lpDdcBglGK4=
|
||||
github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 h1:DImB4lELfQhplLTxeq2z31Fpv8CQqqrUwTbrIRumZqQ=
|
||||
github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7/go.mod h1:FP9X2xjT/Az1EsG/orYYoC+5MojWnuI7hrffz8fGwwo=
|
||||
github.com/sagernet/utls v1.5.4 h1:KmsEGbB2dKUtCNC+44NwAdNAqnqQ6GA4pTO0Yik56co=
|
||||
github.com/sagernet/utls v1.5.4/go.mod h1:CTGxPWExIloRipK3XFpYv0OVyhO8kk3XCGW/ieyTh1s=
|
||||
github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e h1:iGH0RMv2FzELOFNFQtvsxH7NPmlo7X5JizEK51UCojo=
|
||||
github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e/go.mod h1:YbL4TKHRR6APYQv3U2RGfwLDpPYSyWz6oUlpISBEzBE=
|
||||
github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA=
|
||||
github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
|
||||
github.com/shirou/gopsutil/v3 v3.24.3 h1:eoUGJSmdfLzJ3mxIhmOAhgKEKgQkeOwKpz1NbhVnuPE=
|
||||
github.com/shirou/gopsutil/v3 v3.24.3/go.mod h1:JpND7O217xa72ewWz9zN2eIIkPWsDN/3pl0H8Qt0uwg=
|
||||
github.com/shirou/gopsutil/v3 v3.24.4 h1:dEHgzZXt4LMNm+oYELpzl9YCqV65Yr/6SfrvgRBtXeU=
|
||||
github.com/shirou/gopsutil/v3 v3.24.4/go.mod h1:lTd2mdiOspcqLgAnr9/nGi71NkeMpWKdmhuxm9GusH8=
|
||||
github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
|
||||
github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
|
||||
github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
|
||||
@@ -223,18 +214,18 @@ go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBs
|
||||
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
|
||||
golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
|
||||
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f h1:99ci1mjWVBWwJiEKYY6jWa4d2nTQVIEhZIptnrVb1XY=
|
||||
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI=
|
||||
golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
|
||||
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
|
||||
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
|
||||
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
|
||||
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
|
||||
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
|
||||
golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
|
||||
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
|
||||
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
|
||||
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
|
||||
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
|
||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
|
||||
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||
@@ -254,28 +245,26 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
|
||||
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
|
||||
golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
|
||||
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
|
||||
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
|
||||
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
||||
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
|
||||
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
||||
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
|
||||
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
|
||||
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
||||
golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY=
|
||||
golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg=
|
||||
golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw=
|
||||
golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
|
||||
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
|
||||
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
|
||||
google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
|
||||
google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
|
||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
lukechampine.com/blake3 v1.2.2 h1:wEAbSg0IVU4ih44CVlpMqMZMpzr5hf/6aqodLlevd/w=
|
||||
lukechampine.com/blake3 v1.2.2/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=
|
||||
lukechampine.com/blake3 v1.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE=
|
||||
lukechampine.com/blake3 v1.3.0/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=
|
||||
|
||||
117
core/hub.go
117
core/hub.go
@@ -10,10 +10,13 @@ import (
|
||||
"github.com/metacubex/mihomo/adapter/provider"
|
||||
"github.com/metacubex/mihomo/common/structure"
|
||||
"github.com/metacubex/mihomo/common/utils"
|
||||
"github.com/metacubex/mihomo/component/mmdb"
|
||||
"github.com/metacubex/mihomo/config"
|
||||
"github.com/metacubex/mihomo/constant"
|
||||
cp "github.com/metacubex/mihomo/constant/provider"
|
||||
"github.com/metacubex/mihomo/hub/executor"
|
||||
"github.com/metacubex/mihomo/log"
|
||||
rp "github.com/metacubex/mihomo/rules/provider"
|
||||
"github.com/metacubex/mihomo/tunnel"
|
||||
"github.com/metacubex/mihomo/tunnel/statistic"
|
||||
"golang.org/x/net/context"
|
||||
@@ -58,10 +61,17 @@ func shutdownClash() bool {
|
||||
}
|
||||
|
||||
//export validateConfig
|
||||
func validateConfig(s *C.char) bool {
|
||||
bytes := []byte(C.GoString(s))
|
||||
_, err := config.UnmarshalRawConfig(bytes)
|
||||
return err == nil
|
||||
func validateConfig(s *C.char, port C.longlong) {
|
||||
i := int64(port)
|
||||
go func() {
|
||||
bytes := []byte(C.GoString(s))
|
||||
_, err := config.UnmarshalRawConfig(bytes)
|
||||
if err != nil {
|
||||
bridge.SendToPort(i, err.Error())
|
||||
return
|
||||
}
|
||||
bridge.SendToPort(i, "")
|
||||
}()
|
||||
}
|
||||
|
||||
//export updateConfig
|
||||
@@ -171,7 +181,8 @@ func getTraffic() *C.char {
|
||||
}
|
||||
|
||||
//export asyncTestDelay
|
||||
func asyncTestDelay(s *C.char) {
|
||||
func asyncTestDelay(s *C.char, port C.longlong) {
|
||||
i := int64(port)
|
||||
go func() {
|
||||
paramsString := C.GoString(s)
|
||||
var params = &TestDelayParams{}
|
||||
@@ -195,26 +206,25 @@ func asyncTestDelay(s *C.char) {
|
||||
Name: params.ProxyName,
|
||||
}
|
||||
|
||||
message := bridge.Message{
|
||||
Type: bridge.Delay,
|
||||
Data: delayData,
|
||||
}
|
||||
|
||||
if proxy == nil {
|
||||
delayData.Value = -1
|
||||
bridge.SendMessage(message)
|
||||
data, _ := json.Marshal(delayData)
|
||||
bridge.SendToPort(i, string(data))
|
||||
return
|
||||
}
|
||||
|
||||
delay, err := proxy.URLTest(ctx, constant.DefaultTestURL, expectedStatus)
|
||||
if err != nil || delay == 0 {
|
||||
delayData.Value = -1
|
||||
bridge.SendMessage(message)
|
||||
data, _ := json.Marshal(delayData)
|
||||
bridge.SendToPort(i, string(data))
|
||||
return
|
||||
}
|
||||
|
||||
delayData.Value = int32(delay)
|
||||
bridge.SendMessage(message)
|
||||
data, _ := json.Marshal(delayData)
|
||||
bridge.SendToPort(i, string(data))
|
||||
return
|
||||
}()
|
||||
}
|
||||
|
||||
@@ -222,7 +232,7 @@ func asyncTestDelay(s *C.char) {
|
||||
func getVersionInfo() *C.char {
|
||||
versionInfo := map[string]string{
|
||||
"clashName": constant.Name,
|
||||
"version": constant.Version,
|
||||
"version": "1.18.5",
|
||||
}
|
||||
data, err := json.Marshal(versionInfo)
|
||||
if err != nil {
|
||||
@@ -286,9 +296,82 @@ func getProvider(name *C.char) *C.char {
|
||||
return C.CString(string(data))
|
||||
}
|
||||
|
||||
//export healthcheck
|
||||
func healthcheck() {
|
||||
hcCompatibleProvider(tunnel.Providers())
|
||||
//export getExternalProviders
|
||||
func getExternalProviders() *C.char {
|
||||
externalProviders := make([]ExternalProvider, 0)
|
||||
providers := tunnel.Providers()
|
||||
for n, p := range providers {
|
||||
if p.VehicleType() != cp.Compatible {
|
||||
p := p.(*provider.ProxySetProvider)
|
||||
externalProviders = append(externalProviders, ExternalProvider{
|
||||
Name: n,
|
||||
Type: p.Type().String(),
|
||||
VehicleType: p.VehicleType().String(),
|
||||
UpdateAt: p.UpdatedAt,
|
||||
})
|
||||
}
|
||||
}
|
||||
for n, p := range tunnel.RuleProviders() {
|
||||
if p.VehicleType() != cp.Compatible {
|
||||
p := p.(*rp.RuleSetProvider)
|
||||
externalProviders = append(externalProviders, ExternalProvider{
|
||||
Name: n,
|
||||
Type: p.Type().String(),
|
||||
VehicleType: p.VehicleType().String(),
|
||||
UpdateAt: p.UpdatedAt,
|
||||
})
|
||||
}
|
||||
}
|
||||
data, err := json.Marshal(externalProviders)
|
||||
if err != nil {
|
||||
return C.CString("")
|
||||
}
|
||||
return C.CString(string(data))
|
||||
}
|
||||
|
||||
//export updateExternalProvider
|
||||
func updateExternalProvider(providerName *C.char, providerType *C.char, port C.longlong) {
|
||||
i := int64(port)
|
||||
go func() {
|
||||
providerNameString := C.GoString(providerName)
|
||||
providerTypeString := C.GoString(providerType)
|
||||
|
||||
switch providerTypeString {
|
||||
case "Proxy":
|
||||
providers := tunnel.Providers()
|
||||
err := providers[providerNameString].Update()
|
||||
if err != nil {
|
||||
bridge.SendToPort(i, err.Error())
|
||||
return
|
||||
}
|
||||
case "Rule":
|
||||
providers := tunnel.RuleProviders()
|
||||
err := providers[providerNameString].Update()
|
||||
if err != nil {
|
||||
bridge.SendToPort(i, err.Error())
|
||||
return
|
||||
}
|
||||
case "GeoIp":
|
||||
err := mmdb.DownloadMMDB(constant.Path.Resolve(providerNameString))
|
||||
if err != nil {
|
||||
bridge.SendToPort(i, err.Error())
|
||||
return
|
||||
}
|
||||
case "GeoSite":
|
||||
err := mmdb.DownloadGeoSite(constant.Path.Resolve(providerNameString))
|
||||
if err != nil {
|
||||
bridge.SendToPort(i, err.Error())
|
||||
return
|
||||
}
|
||||
case "ASN":
|
||||
err := mmdb.DownloadASN(constant.Path.Resolve(providerNameString))
|
||||
if err != nil {
|
||||
bridge.SendToPort(i, err.Error())
|
||||
return
|
||||
}
|
||||
}
|
||||
bridge.SendToPort(i, "")
|
||||
}()
|
||||
}
|
||||
|
||||
//export initNativeApiBridge
|
||||
|
||||
61
core/tun.go
61
core/tun.go
@@ -17,36 +17,35 @@ var tunLock sync.Mutex
|
||||
var tun *t.Tun
|
||||
|
||||
//export startTUN
|
||||
func startTUN(fd C.int) bool {
|
||||
tunLock.Lock()
|
||||
defer tunLock.Unlock()
|
||||
func startTUN(fd C.int) {
|
||||
go func() {
|
||||
tunLock.Lock()
|
||||
defer tunLock.Unlock()
|
||||
|
||||
if tun != nil {
|
||||
tun.Close()
|
||||
tun = nil
|
||||
}
|
||||
f := int(fd)
|
||||
gateway := "172.16.0.1/30"
|
||||
portal := "172.16.0.2"
|
||||
dns := "0.0.0.0"
|
||||
if tun != nil {
|
||||
tun.Close()
|
||||
tun = nil
|
||||
}
|
||||
f := int(fd)
|
||||
gateway := "172.16.0.1/30"
|
||||
portal := "172.16.0.2"
|
||||
dns := "0.0.0.0"
|
||||
|
||||
tempTun := &t.Tun{Closed: false, Limit: semaphore.NewWeighted(4)}
|
||||
tempTun := &t.Tun{Closed: false, Limit: semaphore.NewWeighted(4)}
|
||||
|
||||
closer, err := t.Start(f, gateway, portal, dns)
|
||||
closer, err := t.Start(f, gateway, portal, dns)
|
||||
|
||||
applyConfig(true)
|
||||
applyConfig(true)
|
||||
|
||||
if err != nil {
|
||||
log.Errorln("startTUN error: %v", err)
|
||||
tempTun.Close()
|
||||
return false
|
||||
}
|
||||
if err != nil {
|
||||
log.Errorln("startTUN error: %v", err)
|
||||
tempTun.Close()
|
||||
}
|
||||
|
||||
tempTun.Closer = closer
|
||||
tempTun.Closer = closer
|
||||
|
||||
tun = tempTun
|
||||
|
||||
return true
|
||||
tun = tempTun
|
||||
}()
|
||||
}
|
||||
|
||||
//export updateMarkSocketPort
|
||||
@@ -61,14 +60,16 @@ func updateMarkSocketPort(markSocketPort C.longlong) bool {
|
||||
|
||||
//export stopTun
|
||||
func stopTun() {
|
||||
tunLock.Lock()
|
||||
defer tunLock.Unlock()
|
||||
go func() {
|
||||
tunLock.Lock()
|
||||
defer tunLock.Unlock()
|
||||
|
||||
if tun != nil {
|
||||
tun.Close()
|
||||
applyConfig(true)
|
||||
tun = nil
|
||||
}
|
||||
if tun != nil {
|
||||
tun.Close()
|
||||
applyConfig(true)
|
||||
tun = nil
|
||||
}
|
||||
}()
|
||||
}
|
||||
|
||||
func init() {
|
||||
|
||||
@@ -82,7 +82,6 @@ class ApplicationState extends State<Application> {
|
||||
super.initState();
|
||||
globalState.appController = AppController(context);
|
||||
WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
|
||||
globalState.appController.updateViewWidth();
|
||||
globalState.appController.afterInit();
|
||||
globalState.appController.initLink();
|
||||
_updateGroups();
|
||||
|
||||
@@ -5,9 +5,9 @@ import 'dart:io';
|
||||
import 'dart:isolate';
|
||||
|
||||
import 'package:ffi/ffi.dart';
|
||||
import '../enum/enum.dart';
|
||||
import '../models/models.dart';
|
||||
import '../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 'generated/clash_ffi.dart';
|
||||
|
||||
class ClashCore {
|
||||
@@ -58,11 +58,20 @@ class ClashCore {
|
||||
|
||||
bool get isInit => clashFFI.getIsInit() == 1;
|
||||
|
||||
bool validateConfig(String data) {
|
||||
return clashFFI.validateConfig(
|
||||
data.toNativeUtf8().cast(),
|
||||
) ==
|
||||
1;
|
||||
Future<String> validateConfig(String data) {
|
||||
final completer = Completer<String>();
|
||||
final receiver = ReceivePort();
|
||||
receiver.listen((message) {
|
||||
if (!completer.isCompleted) {
|
||||
completer.complete(message);
|
||||
receiver.close();
|
||||
}
|
||||
});
|
||||
clashFFI.validateConfig(
|
||||
data.toNativeUtf8().cast(),
|
||||
receiver.sendPort.nativePort,
|
||||
);
|
||||
return completer.future;
|
||||
}
|
||||
|
||||
Future<String> updateConfig(UpdateConfigParams updateConfigParams) {
|
||||
@@ -107,53 +116,76 @@ class ClashCore {
|
||||
});
|
||||
}
|
||||
|
||||
Future<DelayMap> getDelayMap() {
|
||||
final proxiesRaw = clashFFI.getProxies();
|
||||
final proxiesRawString = proxiesRaw.cast<Utf8>().toDartString();
|
||||
return Isolate.run<DelayMap>(() {
|
||||
final proxies = json.decode(proxiesRawString) as Map<String, dynamic>;
|
||||
return proxies.map<String, int?>(
|
||||
(k, v) {
|
||||
final history = v["history"] as List<dynamic>;
|
||||
if (history.isEmpty) {
|
||||
return MapEntry(
|
||||
k,
|
||||
null,
|
||||
);
|
||||
} else {
|
||||
final delay = history.last["delay"];
|
||||
return MapEntry(
|
||||
k,
|
||||
delay != 0 ? delay : -1,
|
||||
);
|
||||
}
|
||||
},
|
||||
);
|
||||
Future<List<ExternalProvider>> getExternalProviders() {
|
||||
final externalProvidersRaw = clashFFI.getExternalProviders();
|
||||
final externalProvidersRawString =
|
||||
externalProvidersRaw.cast<Utf8>().toDartString();
|
||||
return Isolate.run<List<ExternalProvider>>(() {
|
||||
final externalProviders =
|
||||
(json.decode(externalProvidersRawString) as List<dynamic>)
|
||||
.map(
|
||||
(item) => ExternalProvider.fromJson(item),
|
||||
)
|
||||
.toList();
|
||||
return externalProviders;
|
||||
});
|
||||
}
|
||||
|
||||
Future<String> updateExternalProvider({
|
||||
required String providerName,
|
||||
required String providerType,
|
||||
}) {
|
||||
final completer = Completer<String>();
|
||||
final receiver = ReceivePort();
|
||||
receiver.listen((message) {
|
||||
if (!completer.isCompleted) {
|
||||
completer.complete(message);
|
||||
receiver.close();
|
||||
}
|
||||
});
|
||||
clashFFI.updateExternalProvider(
|
||||
providerName.toNativeUtf8().cast(),
|
||||
providerType.toNativeUtf8().cast(),
|
||||
receiver.sendPort.nativePort,
|
||||
);
|
||||
return completer.future;
|
||||
}
|
||||
|
||||
bool changeProxy(ChangeProxyParams changeProxyParams) {
|
||||
final params = json.encode(changeProxyParams);
|
||||
return clashFFI.changeProxy(params.toNativeUtf8().cast()) == 1;
|
||||
}
|
||||
|
||||
bool delay(String proxyName) {
|
||||
Future<Delay> getDelay(String proxyName) {
|
||||
final delayParams = {
|
||||
"proxy-name": proxyName,
|
||||
"timeout": httpTimeoutDuration.inMilliseconds,
|
||||
};
|
||||
clashFFI.asyncTestDelay(json.encode(delayParams).toNativeUtf8().cast());
|
||||
return true;
|
||||
final completer = Completer<Delay>();
|
||||
final receiver = ReceivePort();
|
||||
receiver.listen((message) {
|
||||
if (!completer.isCompleted) {
|
||||
completer.complete(Delay.fromJson(json.decode(message)));
|
||||
receiver.close();
|
||||
}
|
||||
});
|
||||
clashFFI.asyncTestDelay(
|
||||
json.encode(delayParams).toNativeUtf8().cast(),
|
||||
receiver.sendPort.nativePort,
|
||||
);
|
||||
Future.delayed(httpTimeoutDuration + moreDuration, () {
|
||||
receiver.close();
|
||||
completer.complete(
|
||||
Delay(name: proxyName, value: -1),
|
||||
);
|
||||
});
|
||||
return completer.future;
|
||||
}
|
||||
|
||||
clearEffect(String path) {
|
||||
clashFFI.clearEffect(path.toNativeUtf8().cast());
|
||||
}
|
||||
|
||||
healthcheck() {
|
||||
clashFFI.healthcheck();
|
||||
}
|
||||
|
||||
VersionInfo getVersionInfo() {
|
||||
final versionInfoRaw = clashFFI.getVersionInfo();
|
||||
final versionInfo = json.decode(versionInfoRaw.cast<Utf8>().toDartString());
|
||||
|
||||
@@ -893,19 +893,22 @@ class ClashFFI {
|
||||
_lookup<ffi.NativeFunction<GoUint8 Function()>>('shutdownClash');
|
||||
late final _shutdownClash = _shutdownClashPtr.asFunction<int Function()>();
|
||||
|
||||
int validateConfig(
|
||||
void validateConfig(
|
||||
ffi.Pointer<ffi.Char> s,
|
||||
int port,
|
||||
) {
|
||||
return _validateConfig(
|
||||
s,
|
||||
port,
|
||||
);
|
||||
}
|
||||
|
||||
late final _validateConfigPtr =
|
||||
_lookup<ffi.NativeFunction<GoUint8 Function(ffi.Pointer<ffi.Char>)>>(
|
||||
'validateConfig');
|
||||
late final _validateConfig =
|
||||
_validateConfigPtr.asFunction<int Function(ffi.Pointer<ffi.Char>)>();
|
||||
late final _validateConfigPtr = _lookup<
|
||||
ffi.NativeFunction<
|
||||
ffi.Void Function(
|
||||
ffi.Pointer<ffi.Char>, ffi.LongLong)>>('validateConfig');
|
||||
late final _validateConfig = _validateConfigPtr
|
||||
.asFunction<void Function(ffi.Pointer<ffi.Char>, int)>();
|
||||
|
||||
void updateConfig(
|
||||
ffi.Pointer<ffi.Char> s,
|
||||
@@ -974,17 +977,20 @@ class ClashFFI {
|
||||
|
||||
void asyncTestDelay(
|
||||
ffi.Pointer<ffi.Char> s,
|
||||
int port,
|
||||
) {
|
||||
return _asyncTestDelay(
|
||||
s,
|
||||
port,
|
||||
);
|
||||
}
|
||||
|
||||
late final _asyncTestDelayPtr =
|
||||
_lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Char>)>>(
|
||||
'asyncTestDelay');
|
||||
late final _asyncTestDelay =
|
||||
_asyncTestDelayPtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();
|
||||
late final _asyncTestDelayPtr = _lookup<
|
||||
ffi.NativeFunction<
|
||||
ffi.Void Function(
|
||||
ffi.Pointer<ffi.Char>, ffi.LongLong)>>('asyncTestDelay');
|
||||
late final _asyncTestDelay = _asyncTestDelayPtr
|
||||
.asFunction<void Function(ffi.Pointer<ffi.Char>, int)>();
|
||||
|
||||
ffi.Pointer<ffi.Char> getVersionInfo() {
|
||||
return _getVersionInfo();
|
||||
@@ -1054,13 +1060,34 @@ class ClashFFI {
|
||||
late final _getProvider = _getProviderPtr
|
||||
.asFunction<ffi.Pointer<ffi.Char> Function(ffi.Pointer<ffi.Char>)>();
|
||||
|
||||
void healthcheck() {
|
||||
return _healthcheck();
|
||||
ffi.Pointer<ffi.Char> getExternalProviders() {
|
||||
return _getExternalProviders();
|
||||
}
|
||||
|
||||
late final _healthcheckPtr =
|
||||
_lookup<ffi.NativeFunction<ffi.Void Function()>>('healthcheck');
|
||||
late final _healthcheck = _healthcheckPtr.asFunction<void Function()>();
|
||||
late final _getExternalProvidersPtr =
|
||||
_lookup<ffi.NativeFunction<ffi.Pointer<ffi.Char> Function()>>(
|
||||
'getExternalProviders');
|
||||
late final _getExternalProviders =
|
||||
_getExternalProvidersPtr.asFunction<ffi.Pointer<ffi.Char> Function()>();
|
||||
|
||||
void updateExternalProvider(
|
||||
ffi.Pointer<ffi.Char> providerName,
|
||||
ffi.Pointer<ffi.Char> providerType,
|
||||
int port,
|
||||
) {
|
||||
return _updateExternalProvider(
|
||||
providerName,
|
||||
providerType,
|
||||
port,
|
||||
);
|
||||
}
|
||||
|
||||
late final _updateExternalProviderPtr = _lookup<
|
||||
ffi.NativeFunction<
|
||||
ffi.Void Function(ffi.Pointer<ffi.Char>, ffi.Pointer<ffi.Char>,
|
||||
ffi.LongLong)>>('updateExternalProvider');
|
||||
late final _updateExternalProvider = _updateExternalProviderPtr.asFunction<
|
||||
void Function(ffi.Pointer<ffi.Char>, ffi.Pointer<ffi.Char>, int)>();
|
||||
|
||||
void initNativeApiBridge(
|
||||
ffi.Pointer<ffi.Void> api,
|
||||
|
||||
@@ -1,24 +1,41 @@
|
||||
import 'dart:io';
|
||||
import 'package:fl_clash/common/common.dart';
|
||||
import 'package:fl_clash/models/models.dart';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:path/path.dart';
|
||||
|
||||
import 'core.dart';
|
||||
|
||||
class ClashService {
|
||||
Future<bool> initMmdb() async {
|
||||
final mmdbPath = await appPath.getMMDBPath();
|
||||
var mmdbFile = File(mmdbPath);
|
||||
final isExists = await mmdbFile.exists();
|
||||
if (isExists) return true;
|
||||
Future<void> initGeo() async {
|
||||
final homePath = await appPath.getHomeDirPath();
|
||||
final homeDir = Directory(homePath);
|
||||
final isExists = await homeDir.exists();
|
||||
if (!isExists) {
|
||||
await homeDir.create(recursive: true);
|
||||
}
|
||||
const geoFileNameList = [
|
||||
mmdbFileName,
|
||||
geoSiteFileName,
|
||||
asnFileName,
|
||||
];
|
||||
try {
|
||||
mmdbFile = await mmdbFile.create(recursive: true);
|
||||
ByteData data = await rootBundle.load('assets/data/geoip.metadb');
|
||||
List<int> bytes = data.buffer.asUint8List();
|
||||
await mmdbFile.writeAsBytes(bytes, flush: true);
|
||||
return true;
|
||||
} catch (_) {
|
||||
return false;
|
||||
for (final geoFileName in geoFileNameList) {
|
||||
final geoFile = File(
|
||||
join(homePath, geoFileName),
|
||||
);
|
||||
final isExists = await geoFile.exists();
|
||||
if (isExists) {
|
||||
continue;
|
||||
}
|
||||
final data = await rootBundle.load('assets/data/$geoFileName');
|
||||
List<int> bytes = data.buffer.asUint8List();
|
||||
await geoFile.writeAsBytes(bytes, flush: true);
|
||||
}
|
||||
} catch (e) {
|
||||
debugPrint("$e");
|
||||
exit(0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,8 +43,7 @@ class ClashService {
|
||||
required ClashConfig clashConfig,
|
||||
required Config config,
|
||||
}) async {
|
||||
final isInitMmdb = await initMmdb();
|
||||
if (!isInitMmdb) return false;
|
||||
await initGeo();
|
||||
final homeDirPath = await appPath.getHomeDirPath();
|
||||
final isInit = clashCore.init(homeDirPath);
|
||||
return isInit;
|
||||
|
||||
@@ -9,6 +9,8 @@ const httpTimeoutDuration = Duration(milliseconds: 5000);
|
||||
const moreDuration = Duration(milliseconds: 100);
|
||||
const defaultUpdateDuration = Duration(days: 1);
|
||||
const mmdbFileName = "geoip.metadb";
|
||||
const geoSiteFileName = "GeoSite.dat";
|
||||
const asnFileName = "ASN.mmdb";
|
||||
const profilesDirectoryName = "profiles";
|
||||
const localhost = "127.0.0.1";
|
||||
const clashConfigKey = "clash_config";
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
import 'package:fl_clash/common/app_localizations.dart';
|
||||
|
||||
extension DateTimeExtension on DateTime {
|
||||
bool isBeforeNow() {
|
||||
bool get isBeforeNow {
|
||||
return isBefore(DateTime.now());
|
||||
}
|
||||
|
||||
@@ -9,4 +11,28 @@ extension DateTimeExtension on DateTime {
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
String get lastUpdateTimeDesc {
|
||||
final currentDateTime = DateTime.now();
|
||||
final difference = currentDateTime.difference(this);
|
||||
final days = difference.inDays;
|
||||
if (days >= 365) {
|
||||
return "${(days / 365).floor()} ${appLocalizations.years}${appLocalizations.ago}";
|
||||
}
|
||||
if (days >= 30) {
|
||||
return "${(days / 30).floor()} ${appLocalizations.months}${appLocalizations.ago}";
|
||||
}
|
||||
if (days >= 1) {
|
||||
return "$days ${appLocalizations.days}${appLocalizations.ago}";
|
||||
}
|
||||
final hours = difference.inHours;
|
||||
if (hours >= 1) {
|
||||
return "$hours ${appLocalizations.hours}${appLocalizations.ago}";
|
||||
}
|
||||
final minutes = difference.inMinutes;
|
||||
if (minutes >= 1) {
|
||||
return "$minutes ${appLocalizations.minutes}${appLocalizations.ago}";
|
||||
}
|
||||
return appLocalizations.just;
|
||||
}
|
||||
}
|
||||
@@ -24,9 +24,9 @@ class Measure {
|
||||
double? _bodySmallHeight;
|
||||
double? _labelSmallHeight;
|
||||
double? _titleLargeHeight;
|
||||
double? _titleMediumHeight;
|
||||
|
||||
|
||||
double get bodyMediumHeight{
|
||||
double get bodyMediumHeight {
|
||||
_bodyMediumHeight ??= computeTextSize(
|
||||
Text(
|
||||
"",
|
||||
@@ -36,7 +36,7 @@ class Measure {
|
||||
return _bodyMediumHeight!;
|
||||
}
|
||||
|
||||
double get bodySmallHeight{
|
||||
double get bodySmallHeight {
|
||||
_bodySmallHeight ??= computeTextSize(
|
||||
Text(
|
||||
"",
|
||||
@@ -46,7 +46,7 @@ class Measure {
|
||||
return _bodySmallHeight!;
|
||||
}
|
||||
|
||||
double get labelSmallHeight{
|
||||
double get labelSmallHeight {
|
||||
_labelSmallHeight ??= computeTextSize(
|
||||
Text(
|
||||
"",
|
||||
@@ -56,7 +56,7 @@ class Measure {
|
||||
return _labelSmallHeight!;
|
||||
}
|
||||
|
||||
double get titleLargeHeight{
|
||||
double get titleLargeHeight {
|
||||
_titleLargeHeight ??= computeTextSize(
|
||||
Text(
|
||||
"",
|
||||
@@ -65,4 +65,14 @@ class Measure {
|
||||
).height;
|
||||
return _titleLargeHeight!;
|
||||
}
|
||||
|
||||
double get titleMediumHeight {
|
||||
_titleMediumHeight ??= computeTextSize(
|
||||
Text(
|
||||
"",
|
||||
style: context.textTheme.titleMedium,
|
||||
),
|
||||
).height;
|
||||
return _titleMediumHeight!;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,6 +29,14 @@ class Navigation {
|
||||
label: "profiles",
|
||||
fragment: ProfilesFragment(),
|
||||
),
|
||||
const NavigationItem(
|
||||
icon: Icon(Icons.swap_vert_circle),
|
||||
label: "resources",
|
||||
description: "resourcesDesc",
|
||||
keep: false,
|
||||
fragment: Resources(),
|
||||
modes: [NavigationItemMode.desktop, NavigationItemMode.more],
|
||||
),
|
||||
NavigationItem(
|
||||
icon: const Icon(Icons.adb),
|
||||
label: "logs",
|
||||
|
||||
@@ -2,6 +2,8 @@ import 'dart:io';
|
||||
import 'dart:isolate';
|
||||
import 'dart:typed_data';
|
||||
|
||||
import 'package:fl_clash/common/constant.dart';
|
||||
import 'package:fl_clash/enum/enum.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:zxing2/qrcode.dart';
|
||||
import 'package:image/image.dart' as img;
|
||||
@@ -178,6 +180,12 @@ class Other {
|
||||
.where((item) => item.isNotEmpty)
|
||||
.toList();
|
||||
}
|
||||
|
||||
ViewMode getViewMode(double viewWidth){
|
||||
if (viewWidth <= maxMobileWidth) return ViewMode.mobile;
|
||||
if (viewWidth <= maxLaptopWidth) return ViewMode.laptop;
|
||||
return ViewMode.desktop;
|
||||
}
|
||||
}
|
||||
|
||||
final other = Other();
|
||||
|
||||
@@ -36,11 +36,6 @@ class AppPath {
|
||||
final directory = await getProfilesPath();
|
||||
return join(directory, "$id.yaml");
|
||||
}
|
||||
|
||||
Future<String> getMMDBPath() async {
|
||||
var directory = await applicationSupportDirectoryCompleter.future;
|
||||
return join(directory.path, mmdbFileName);
|
||||
}
|
||||
}
|
||||
|
||||
final appPath = AppPath();
|
||||
|
||||
@@ -3,10 +3,9 @@ import 'dart:io';
|
||||
import 'package:file_picker/file_picker.dart';
|
||||
import 'package:fl_clash/common/common.dart';
|
||||
import 'package:image_picker/image_picker.dart';
|
||||
import 'package:fl_clash/models/models.dart';
|
||||
|
||||
class Picker {
|
||||
Future<Result<PlatformFile>> pickerConfigFile() async {
|
||||
Future<PlatformFile?> pickerConfigFile() async {
|
||||
FilePickerResult? filePickerResult;
|
||||
if (Platform.isAndroid) {
|
||||
filePickerResult = await FilePicker.platform.pickFiles(
|
||||
@@ -23,20 +22,20 @@ class Picker {
|
||||
}
|
||||
final file = filePickerResult?.files.first;
|
||||
if (file == null) {
|
||||
return Result.error(appLocalizations.pleaseUploadFile);
|
||||
return null;
|
||||
}
|
||||
return Result.success(file);
|
||||
return file;
|
||||
}
|
||||
|
||||
Future<Result<String>> pickerConfigQRCode() async {
|
||||
Future<String?> pickerConfigQRCode() async {
|
||||
final xFile = await ImagePicker().pickImage(source: ImageSource.gallery);
|
||||
final bytes = await xFile?.readAsBytes();
|
||||
if (bytes == null) return Result.error();
|
||||
if (bytes == null) return null;
|
||||
final result = await other.parseQRCode(bytes);
|
||||
if (result == null || !result.isUrl) {
|
||||
return Result.error(appLocalizations.pleaseUploadValidQrcode);
|
||||
throw appLocalizations.pleaseUploadValidQrcode;
|
||||
}
|
||||
return Result.success(result);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ class ProxyManager {
|
||||
_proxy = proxy ?? proxy_plugin.Proxy();
|
||||
}
|
||||
|
||||
bool get isStart => startTime != null && startTime!.isBeforeNow();
|
||||
bool get isStart => startTime != null && startTime!.isBeforeNow;
|
||||
|
||||
DateTime? get startTime => _proxy.startTime;
|
||||
|
||||
|
||||
@@ -1,36 +1,106 @@
|
||||
import 'dart:convert';
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:dio/dio.dart';
|
||||
import 'package:dio/io.dart';
|
||||
import 'package:fl_clash/common/common.dart';
|
||||
import 'package:http/http.dart';
|
||||
import '../models/models.dart';
|
||||
import 'package:fl_clash/models/ip.dart';
|
||||
import 'package:fl_clash/state.dart';
|
||||
|
||||
class Request {
|
||||
static Future<Result<Response>> getFileResponseForUrl(String url) async {
|
||||
final headers = {'User-Agent': coreName};
|
||||
try {
|
||||
final response = await get(Uri.parse(url), headers: headers).timeout(
|
||||
httpTimeoutDuration,
|
||||
late final Dio _dio;
|
||||
int? _port;
|
||||
bool _isStart = false;
|
||||
|
||||
Request() {
|
||||
_dio = Dio(
|
||||
BaseOptions(
|
||||
connectTimeout: httpTimeoutDuration,
|
||||
sendTimeout: httpTimeoutDuration,
|
||||
receiveTimeout: httpTimeoutDuration,
|
||||
headers: {"User-Agent": coreName},
|
||||
),
|
||||
);
|
||||
_dio.interceptors.add(InterceptorsWrapper(
|
||||
onRequest: (options, handler) {
|
||||
_syncProxy();
|
||||
return handler.next(options); // 继续请求
|
||||
},
|
||||
));
|
||||
}
|
||||
|
||||
_syncProxy() {
|
||||
final port = globalState.appController.clashConfig.mixedPort;
|
||||
final isStart = globalState.appController.appState.isStart;
|
||||
if (_port != port || isStart != _isStart) {
|
||||
_port = port;
|
||||
_isStart = isStart;
|
||||
_dio.httpClientAdapter = IOHttpClientAdapter(
|
||||
createHttpClient: () {
|
||||
final client = HttpClient();
|
||||
if(!_isStart) return client;
|
||||
client.findProxy = (url) {
|
||||
return "PROXY localhost:$_port;DIRECT";
|
||||
};
|
||||
return client;
|
||||
},
|
||||
);
|
||||
return Result.success(response);
|
||||
} catch (err) {
|
||||
return Result.error(err.toString());
|
||||
}
|
||||
}
|
||||
|
||||
static Future<Result<Map<String,dynamic>>> checkForUpdate() async {
|
||||
final response = await get(
|
||||
Uri.parse(
|
||||
"https://api.github.com/repos/$repository/releases/latest",
|
||||
Future<Response> getFileResponseForUrl(String url) async {
|
||||
final response = await _dio
|
||||
.get(
|
||||
url,
|
||||
options: Options(
|
||||
responseType: ResponseType.bytes,
|
||||
),
|
||||
)
|
||||
.timeout(
|
||||
httpTimeoutDuration,
|
||||
);
|
||||
return response;
|
||||
}
|
||||
|
||||
Future<Map<String, dynamic>?> checkForUpdate() async {
|
||||
final response = await _dio.get(
|
||||
"https://api.github.com/repos/$repository/releases/latest",
|
||||
options: Options(
|
||||
responseType: ResponseType.json,
|
||||
),
|
||||
);
|
||||
if (response.statusCode != 200) return Result.error();
|
||||
final body = json.decode(response.body) as Map<String,dynamic>;
|
||||
final remoteVersion = body['tag_name'];
|
||||
if (response.statusCode != 200) return null;
|
||||
final data = response.data as Map<String, dynamic>;
|
||||
final remoteVersion = data['tag_name'];
|
||||
final packageInfo = await appPackage.packageInfoCompleter.future;
|
||||
final version = packageInfo.version;
|
||||
final hasUpdate =
|
||||
other.compareVersions(remoteVersion.replaceAll('v', ''), version) > 0;
|
||||
if (!hasUpdate) return Result.error();
|
||||
return Result.success(body);
|
||||
if (!hasUpdate) return null;
|
||||
return data;
|
||||
}
|
||||
|
||||
final Map<String, IpInfo Function(Map<String, dynamic>)> _ipInfoSources = {
|
||||
"https://ipwho.is/": IpInfo.fromIpwhoIsJson,
|
||||
"https://api.ip.sb/geoip/": IpInfo.fromIpSbJson,
|
||||
"https://ipapi.co/json/": IpInfo.fromIpApiCoJson,
|
||||
"https://ipinfo.io/json/": IpInfo.fromIpInfoIoJson,
|
||||
};
|
||||
|
||||
Future<IpInfo?> checkIp() async {
|
||||
for (final source in _ipInfoSources.entries) {
|
||||
try {
|
||||
final response = await _dio.get<Map<String, dynamic>>(
|
||||
source.key,
|
||||
);
|
||||
if (response.statusCode == 200 && response.data != null) {
|
||||
return source.value(response.data!);
|
||||
}
|
||||
} catch (e) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
final request = Request();
|
||||
@@ -6,7 +6,6 @@ import 'package:provider/provider.dart';
|
||||
import 'package:url_launcher/url_launcher.dart';
|
||||
|
||||
import 'clash/core.dart';
|
||||
import 'enum/enum.dart';
|
||||
import 'models/models.dart';
|
||||
import 'common/common.dart';
|
||||
|
||||
@@ -40,8 +39,6 @@ class AppController {
|
||||
updateRunTime,
|
||||
updateTraffic,
|
||||
];
|
||||
clearShowProxyDelay();
|
||||
testShowProxyDelay();
|
||||
} else {
|
||||
await globalState.stopSystemProxy();
|
||||
appState.traffics = [];
|
||||
@@ -78,10 +75,10 @@ class AppController {
|
||||
);
|
||||
}
|
||||
|
||||
addProfile(Profile profile) {
|
||||
addProfile(Profile profile) async {
|
||||
config.setProfile(profile);
|
||||
if (config.currentProfileId != null) return;
|
||||
changeProfile(profile.id);
|
||||
await changeProfile(profile.id);
|
||||
}
|
||||
|
||||
deleteProfile(String id) async {
|
||||
@@ -102,15 +99,14 @@ class AppController {
|
||||
updateProfile(String id) async {
|
||||
final profile = config.getCurrentProfileForId(id);
|
||||
if (profile != null) {
|
||||
final res = await profile.update();
|
||||
if (res.type == ResultType.success) {
|
||||
config.setProfile(profile);
|
||||
}
|
||||
final tempProfile = profile.copyWith();
|
||||
await tempProfile.update();
|
||||
config.setProfile(tempProfile);
|
||||
}
|
||||
}
|
||||
|
||||
Future<String> updateClashConfig({bool isPatch = true}) async {
|
||||
return await globalState.updateClashConfig(
|
||||
Future<void> updateClashConfig({bool isPatch = true}) async {
|
||||
await globalState.updateClashConfig(
|
||||
clashConfig: clashConfig,
|
||||
config: config,
|
||||
isPatch: isPatch,
|
||||
@@ -118,24 +114,15 @@ class AppController {
|
||||
}
|
||||
|
||||
Future 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();
|
||||
final commonScaffoldState = globalState.homeScaffoldKey.currentState;
|
||||
if (commonScaffoldState?.mounted != true) return;
|
||||
commonScaffoldState?.loadingRun(() async {
|
||||
await globalState.applyProfile(
|
||||
appState: appState,
|
||||
config: config,
|
||||
clashConfig: clashConfig,
|
||||
);
|
||||
});
|
||||
_changeProfileDebounce!([profileId]);
|
||||
}
|
||||
|
||||
changeProfile(String? value) async {
|
||||
@@ -153,8 +140,10 @@ class AppController {
|
||||
?.add(
|
||||
profile.autoUpdateDuration,
|
||||
)
|
||||
.isBeforeNow();
|
||||
if (isNotNeedUpdate == false) continue;
|
||||
.isBeforeNow;
|
||||
if (isNotNeedUpdate == false ||
|
||||
profile.url == null ||
|
||||
profile.url!.isEmpty) continue;
|
||||
await profile.update();
|
||||
}
|
||||
}
|
||||
@@ -211,18 +200,17 @@ class AppController {
|
||||
|
||||
autoCheckUpdate() async {
|
||||
if (!config.autoCheckUpdate) return;
|
||||
final res = await Request.checkForUpdate();
|
||||
checkUpdateResultHandle(result: res);
|
||||
final res = await request.checkForUpdate();
|
||||
checkUpdateResultHandle(data: res);
|
||||
}
|
||||
|
||||
checkUpdateResultHandle({
|
||||
Result<Map<String, dynamic>>? result,
|
||||
bool handleError = false
|
||||
}) async {
|
||||
if (result == null) return;
|
||||
if (result.type == ResultType.success) {
|
||||
final tagName = result.data?['tag_name'];
|
||||
final body = result.data?['body'];
|
||||
Map<String, dynamic>? data,
|
||||
bool handleError = false,
|
||||
}) async {
|
||||
if (data != null) {
|
||||
final tagName = data['tag_name'];
|
||||
final body = data['body'];
|
||||
final submits = other.parseReleaseBody(body);
|
||||
globalState.showMessage(
|
||||
title: appLocalizations.discoverNewVersion,
|
||||
@@ -248,7 +236,7 @@ class AppController {
|
||||
},
|
||||
confirmText: appLocalizations.goDownload,
|
||||
);
|
||||
} else if(handleError){
|
||||
} else if (handleError) {
|
||||
globalState.showMessage(
|
||||
title: appLocalizations.checkUpdate,
|
||||
message: TextSpan(
|
||||
@@ -273,28 +261,14 @@ class AppController {
|
||||
autoCheckUpdate();
|
||||
}
|
||||
|
||||
healthcheck() {
|
||||
if (globalState.healthcheckLock) return;
|
||||
for (final delay in appState.delayMap.entries) {
|
||||
setDelay(
|
||||
Delay(
|
||||
name: delay.key,
|
||||
value: 0,
|
||||
),
|
||||
);
|
||||
}
|
||||
clashCore.healthcheck();
|
||||
}
|
||||
|
||||
setDelay(Delay delay) {
|
||||
appState.setDelay(delay);
|
||||
}
|
||||
|
||||
updateDelayMap() async {
|
||||
appState.delayMap = await clashCore.getDelayMap();
|
||||
}
|
||||
|
||||
toPage(int index, {bool hasAnimate = false}) {
|
||||
if (index > appState.currentNavigationItems.length - 1) {
|
||||
return;
|
||||
}
|
||||
appState.currentLabel = appState.currentNavigationItems[index].label;
|
||||
if ((config.isAnimateToPage || hasAnimate)) {
|
||||
globalState.pageController?.animateToPage(
|
||||
@@ -350,94 +324,55 @@ class AppController {
|
||||
toProfiles();
|
||||
final commonScaffoldState = globalState.homeScaffoldKey.currentState;
|
||||
if (commonScaffoldState?.mounted != true) return;
|
||||
commonScaffoldState?.loadingRun(
|
||||
final profile = await commonScaffoldState?.loadingRun<Profile>(
|
||||
() async {
|
||||
await Future.delayed(const Duration(milliseconds: 300));
|
||||
final profile = Profile(
|
||||
url: url,
|
||||
);
|
||||
final res = await profile.update();
|
||||
if (res.type == ResultType.success) {
|
||||
addProfile(profile);
|
||||
} else {
|
||||
debugPrint(res.message);
|
||||
globalState.showMessage(
|
||||
title: "${appLocalizations.add}${appLocalizations.profile}",
|
||||
message: TextSpan(text: res.message!),
|
||||
);
|
||||
}
|
||||
await profile.update();
|
||||
return profile;
|
||||
},
|
||||
title: "${appLocalizations.add}${appLocalizations.profile}",
|
||||
);
|
||||
if (profile != null) {
|
||||
await addProfile(profile);
|
||||
}
|
||||
}
|
||||
|
||||
addProfileFormFile() async {
|
||||
final result = await picker.pickerConfigFile();
|
||||
if (result.type == ResultType.error) return;
|
||||
final platformFile = await globalState.safeRun(picker.pickerConfigFile);
|
||||
if (!context.mounted) return;
|
||||
globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
|
||||
toProfiles();
|
||||
final commonScaffoldState = globalState.homeScaffoldKey.currentState;
|
||||
if (commonScaffoldState?.mounted != true) return;
|
||||
commonScaffoldState?.loadingRun(
|
||||
final profile = await commonScaffoldState?.loadingRun<Profile?>(
|
||||
() async {
|
||||
await Future.delayed(const Duration(milliseconds: 300));
|
||||
final bytes = result.data?.bytes;
|
||||
final bytes = platformFile?.bytes;
|
||||
if (bytes == null) {
|
||||
return;
|
||||
return null;
|
||||
}
|
||||
final profile = Profile(label: result.data?.name);
|
||||
final sRes = await profile.saveFile(bytes);
|
||||
if (sRes.type == ResultType.error) {
|
||||
debugPrint(sRes.message);
|
||||
globalState.showMessage(
|
||||
title: "${appLocalizations.add}${appLocalizations.profile}",
|
||||
message: TextSpan(text: sRes.message!),
|
||||
);
|
||||
return;
|
||||
}
|
||||
addProfile(profile);
|
||||
final profile = Profile(label: platformFile?.name);
|
||||
await profile.saveFile(bytes);
|
||||
return profile;
|
||||
},
|
||||
title: "${appLocalizations.add}${appLocalizations.profile}",
|
||||
);
|
||||
if (profile != null) {
|
||||
await addProfile(profile);
|
||||
}
|
||||
}
|
||||
|
||||
addProfileFormQrCode() async {
|
||||
final result = await picker.pickerConfigQRCode();
|
||||
if (result.type == ResultType.error) {
|
||||
if (result.message != null) {
|
||||
globalState.showMessage(
|
||||
title: appLocalizations.tip,
|
||||
message: TextSpan(
|
||||
text: result.message,
|
||||
),
|
||||
);
|
||||
}
|
||||
return;
|
||||
}
|
||||
addProfileFormURL(result.data!);
|
||||
final url = await globalState.safeRun(picker.pickerConfigQRCode);
|
||||
if (url == null) return;
|
||||
addProfileFormURL(url);
|
||||
}
|
||||
|
||||
clearShowProxyDelay() {
|
||||
final showProxyDelay = appState.getRealProxyName(appState.showProxyName);
|
||||
if (showProxyDelay != null) {
|
||||
appState.setDelay(
|
||||
Delay(name: showProxyDelay, value: null),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
testShowProxyDelay() {
|
||||
final showProxyDelay = appState.getRealProxyName(appState.showProxyName);
|
||||
if (showProxyDelay != null) {
|
||||
globalState.updateCurrentDelay(showProxyDelay);
|
||||
}
|
||||
}
|
||||
|
||||
updateViewWidth() {
|
||||
appState.viewWidth = context.width;
|
||||
if (appState.viewWidth == 0) {
|
||||
Future.delayed(moreDuration, () {
|
||||
updateViewWidth();
|
||||
});
|
||||
}
|
||||
updateViewWidth(double width) {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
appState.viewWidth = width;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import 'package:fl_clash/common/common.dart';
|
||||
import 'package:fl_clash/models/common.dart';
|
||||
import 'package:fl_clash/state.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:package_info_plus/package_info_plus.dart';
|
||||
@@ -11,13 +10,13 @@ class AboutFragment extends StatelessWidget {
|
||||
_checkUpdate(BuildContext context) async {
|
||||
final commonScaffoldState = context.commonScaffoldState;
|
||||
if (commonScaffoldState?.mounted != true) return;
|
||||
final res =
|
||||
await commonScaffoldState?.loadingRun<Result<Map<String, dynamic>>>(
|
||||
Request.checkForUpdate,
|
||||
final data =
|
||||
await commonScaffoldState?.loadingRun<Map<String, dynamic>?>(
|
||||
request.checkForUpdate,
|
||||
title: appLocalizations.checkUpdate,
|
||||
);
|
||||
globalState.appController.checkUpdateResultHandle(
|
||||
result: res,
|
||||
data: data,
|
||||
handleError: true,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
import 'package:collection/collection.dart';
|
||||
import 'package:fl_clash/enum/enum.dart';
|
||||
import 'package:fl_clash/models/models.dart';
|
||||
import 'package:fl_clash/plugins/app.dart';
|
||||
import 'package:fl_clash/common/common.dart';
|
||||
import 'package:fl_clash/state.dart';
|
||||
import 'package:fl_clash/widgets/widgets.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
@@ -19,8 +21,10 @@ class _AccessFragmentState extends State<AccessFragment> {
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) async {
|
||||
packagesListenable.value = await app?.getPackages() ?? [];
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
Future.delayed(const Duration(milliseconds: 300), () async {
|
||||
packagesListenable.value = await app?.getPackages() ?? [];
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@@ -91,13 +95,28 @@ class _AccessFragmentState extends State<AccessFragment> {
|
||||
return IconButton(
|
||||
tooltip: tooltip,
|
||||
onPressed: () {
|
||||
final config = context.read<Config>();
|
||||
final config = globalState.appController.config;
|
||||
final isAccept =
|
||||
config.accessControl.mode == AccessControlMode.acceptSelected;
|
||||
|
||||
if (isSelectedAll) {
|
||||
config.accessControl.currentList = [];
|
||||
config.accessControl = config.accessControl.copyWith();
|
||||
config.accessControl = switch (isAccept) {
|
||||
true => config.accessControl.copyWith(
|
||||
acceptList: [],
|
||||
),
|
||||
false => config.accessControl.copyWith(
|
||||
rejectList: [],
|
||||
),
|
||||
};
|
||||
} else {
|
||||
config.accessControl.currentList = allValueList;
|
||||
config.accessControl = config.accessControl.copyWith();
|
||||
config.accessControl = switch (isAccept) {
|
||||
true => config.accessControl.copyWith(
|
||||
acceptList: allValueList,
|
||||
),
|
||||
false => config.accessControl.copyWith(
|
||||
rejectList: allValueList,
|
||||
),
|
||||
};
|
||||
}
|
||||
},
|
||||
icon: isSelectedAll
|
||||
@@ -181,7 +200,8 @@ class _AccessFragmentState extends State<AccessFragment> {
|
||||
children: [
|
||||
Flexible(
|
||||
child: _buildSelectedAllButton(
|
||||
isSelectedAll: valueList.length == packageNameList.length,
|
||||
isSelectedAll: const ListEquality<String>()
|
||||
.equals(valueList, packageNameList),
|
||||
allValueList: packageNameList,
|
||||
),
|
||||
),
|
||||
@@ -195,29 +215,59 @@ class _AccessFragmentState extends State<AccessFragment> {
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildPackageList(bool isAccessControl) {
|
||||
Widget _buildPackageList() {
|
||||
return ValueListenableBuilder(
|
||||
valueListenable: packagesListenable,
|
||||
builder: (_, packages, ___) {
|
||||
return Selector<Config, AccessControl>(
|
||||
selector: (_, config) => config.accessControl,
|
||||
builder: (context, accessControl, __) {
|
||||
final accessControl = globalState.appController.config.accessControl;
|
||||
final acceptList = accessControl.acceptList;
|
||||
final rejectList = accessControl.rejectList;
|
||||
final acceptPackages = packages.sorted((a, b) {
|
||||
final isSelectA = acceptList.contains(a.packageName);
|
||||
final isSelectB = acceptList.contains(b.packageName);
|
||||
if (isSelectA && isSelectB) return 0;
|
||||
if (isSelectA) return -1;
|
||||
if (isSelectB) return 1;
|
||||
return 0;
|
||||
});
|
||||
final rejectPackages = packages.sorted((a, b) {
|
||||
final isSelectA = rejectList.contains(a.packageName);
|
||||
final isSelectB = rejectList.contains(b.packageName);
|
||||
if (isSelectA && isSelectB) return 0;
|
||||
if (isSelectA) return -1;
|
||||
if (isSelectB) return 1;
|
||||
return 0;
|
||||
});
|
||||
return Selector<Config, PackageListSelectorState>(
|
||||
selector: (_, config) => PackageListSelectorState(
|
||||
accessControl: config.accessControl,
|
||||
isAccessControl: config.isAccessControl,
|
||||
),
|
||||
builder: (context, state, __) {
|
||||
final accessControl = state.accessControl;
|
||||
final isAccessControl = state.isAccessControl;
|
||||
final isFilterSystemApp = accessControl.isFilterSystemApp;
|
||||
final accessControlMode = accessControl.mode;
|
||||
final packages =
|
||||
accessControlMode == AccessControlMode.acceptSelected
|
||||
? acceptPackages
|
||||
: rejectPackages;
|
||||
final currentList =
|
||||
accessControlMode == AccessControlMode.acceptSelected
|
||||
? accessControl.acceptList
|
||||
: accessControl.rejectList;
|
||||
final currentPackages = isFilterSystemApp
|
||||
? packages
|
||||
.where((element) => element.isSystem == false)
|
||||
.toList()
|
||||
.where((element) => element.isSystem == false)
|
||||
.toList()
|
||||
: packages;
|
||||
final packageNameList =
|
||||
currentPackages.map((e) => e.packageName).toList();
|
||||
final accessControlMode = accessControl.mode;
|
||||
final valueList =
|
||||
accessControl.currentList.intersection(packageNameList);
|
||||
final valueList = currentList.intersection(packageNameList);
|
||||
final describe =
|
||||
accessControlMode == AccessControlMode.acceptSelected
|
||||
? appLocalizations.accessControlAllowDesc
|
||||
: appLocalizations.accessControlNotAllowDesc;
|
||||
|
||||
return DisabledMask(
|
||||
status: !isAccessControl,
|
||||
child: Column(
|
||||
@@ -241,7 +291,7 @@ class _AccessFragmentState extends State<AccessFragment> {
|
||||
itemBuilder: (_, index) {
|
||||
final package = currentPackages[index];
|
||||
return PackageListItem(
|
||||
key: Key(package.label),
|
||||
key: Key(package.packageName),
|
||||
package: package,
|
||||
value:
|
||||
valueList.contains(package.packageName),
|
||||
@@ -252,11 +302,20 @@ class _AccessFragmentState extends State<AccessFragment> {
|
||||
} else {
|
||||
valueList.remove(package.packageName);
|
||||
}
|
||||
final config = context.read<Config>();
|
||||
config.accessControl.currentList =
|
||||
valueList;
|
||||
config.accessControl =
|
||||
config.accessControl.copyWith();
|
||||
final config =
|
||||
globalState.appController.config;
|
||||
if (accessControlMode ==
|
||||
AccessControlMode.acceptSelected) {
|
||||
config.accessControl =
|
||||
config.accessControl.copyWith(
|
||||
acceptList: valueList,
|
||||
);
|
||||
} else {
|
||||
config.accessControl =
|
||||
config.accessControl.copyWith(
|
||||
rejectList: valueList,
|
||||
);
|
||||
}
|
||||
},
|
||||
);
|
||||
},
|
||||
@@ -276,7 +335,7 @@ class _AccessFragmentState extends State<AccessFragment> {
|
||||
Widget build(BuildContext context) {
|
||||
return Selector<Config, bool>(
|
||||
selector: (_, config) => config.isAccessControl,
|
||||
builder: (_, isAccessControl, __) {
|
||||
builder: (_, isAccessControl, child) {
|
||||
return Column(
|
||||
mainAxisSize: MainAxisSize.max,
|
||||
children: [
|
||||
@@ -300,11 +359,12 @@ class _AccessFragmentState extends State<AccessFragment> {
|
||||
),
|
||||
),
|
||||
Flexible(
|
||||
child: _buildPackageList(isAccessControl),
|
||||
child: child!,
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
child: _buildPackageList(),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -86,25 +86,25 @@ class _ConfigFragmentState extends State<ConfigFragment> {
|
||||
);
|
||||
},
|
||||
),
|
||||
if (system.isDesktop)
|
||||
Selector<ClashConfig, bool>(
|
||||
selector: (_, clashConfig) => clashConfig.tun.enable,
|
||||
builder: (_, tunEnable, __) {
|
||||
return ListItem.switchItem(
|
||||
leading: const Icon(Icons.support),
|
||||
title: Text(appLocalizations.tun),
|
||||
subtitle: Text(appLocalizations.tunDesc),
|
||||
delegate: SwitchDelegate(
|
||||
value: tunEnable,
|
||||
onChanged: (bool value) async {
|
||||
final clashConfig = context.read<ClashConfig>();
|
||||
clashConfig.tun = Tun(enable: value);
|
||||
globalState.appController.updateClashConfigDebounce();
|
||||
},
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
// if (system.isDesktop)
|
||||
// Selector<ClashConfig, bool>(
|
||||
// selector: (_, clashConfig) => clashConfig.tun.enable,
|
||||
// builder: (_, tunEnable, __) {
|
||||
// return ListItem.switchItem(
|
||||
// leading: const Icon(Icons.support),
|
||||
// title: Text(appLocalizations.tun),
|
||||
// subtitle: Text(appLocalizations.tunDesc),
|
||||
// delegate: SwitchDelegate(
|
||||
// value: tunEnable,
|
||||
// onChanged: (bool value) async {
|
||||
// final clashConfig = context.read<ClashConfig>();
|
||||
// clashConfig.tun = Tun(enable: value);
|
||||
// globalState.appController.updateClashConfigDebounce();
|
||||
// },
|
||||
// ),
|
||||
// );
|
||||
// },
|
||||
// ),
|
||||
Selector<Config, bool>(
|
||||
selector: (_, config) => config.isCompatible,
|
||||
builder: (_, isCompatible, __) {
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import 'package:country_flags/country_flags.dart';
|
||||
import 'package:fl_clash/common/common.dart';
|
||||
import 'package:fl_clash/models/models.dart';
|
||||
import 'package:fl_clash/state.dart';
|
||||
@@ -13,118 +14,134 @@ class NetworkDetection extends StatefulWidget {
|
||||
}
|
||||
|
||||
class _NetworkDetectionState extends State<NetworkDetection> {
|
||||
Widget _buildDescription(String? currentProxyName, int? delay) {
|
||||
if (currentProxyName == null) {
|
||||
return TooltipText(
|
||||
text: Text(
|
||||
appLocalizations.noProxyDesc,
|
||||
style: Theme.of(context).textTheme.titleMedium?.copyWith(
|
||||
color: Theme.of(context).colorScheme.secondary,
|
||||
),
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
);
|
||||
final ipInfoNotifier = ValueNotifier<IpInfo?>(null);
|
||||
final timeoutNotifier = ValueNotifier<bool>(false);
|
||||
|
||||
_checkIp(
|
||||
bool isInit,
|
||||
) async {
|
||||
if (!isInit) return;
|
||||
ipInfoNotifier.value = null;
|
||||
final ipInfo = await request.checkIp();
|
||||
if (ipInfo == null) {
|
||||
timeoutNotifier.value = true;
|
||||
return;
|
||||
} else {
|
||||
timeoutNotifier.value = false;
|
||||
}
|
||||
if (delay == 0 || delay == null) {
|
||||
return const AspectRatio(
|
||||
aspectRatio: 1,
|
||||
child: CircularProgressIndicator(
|
||||
strokeCap: StrokeCap.round,
|
||||
),
|
||||
);
|
||||
}
|
||||
if (delay > 0) {
|
||||
return Row(
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
TooltipText(
|
||||
text: Text(
|
||||
"$delay",
|
||||
overflow: TextOverflow.ellipsis,
|
||||
maxLines: 1,
|
||||
style: context.textTheme.titleLarge
|
||||
?.copyWith(
|
||||
color: context.colorScheme.primary,
|
||||
)
|
||||
.toSoftBold(),
|
||||
),
|
||||
),
|
||||
const Flexible(
|
||||
child: SizedBox(
|
||||
width: 4,
|
||||
),
|
||||
),
|
||||
Flexible(
|
||||
flex: 0,
|
||||
child: Text(
|
||||
'ms',
|
||||
style: Theme.of(context).textTheme.bodyMedium?.toLight(),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
return Text(
|
||||
"Timeout",
|
||||
style: Theme.of(context).textTheme.titleMedium?.copyWith(
|
||||
color: Colors.red,
|
||||
),
|
||||
ipInfoNotifier.value = await request.checkIp();
|
||||
}
|
||||
|
||||
_checkIpContainer(Widget child) {
|
||||
return Selector2<AppState, Config, CheckIpSelectorState>(
|
||||
selector: (_, appState, config) {
|
||||
return CheckIpSelectorState(
|
||||
isInit: appState.isInit,
|
||||
selectedMap: appState.selectedMap,
|
||||
isStart: appState.isStart,
|
||||
);
|
||||
},
|
||||
builder: (_, state, __) {
|
||||
_checkIp(
|
||||
state.isInit,
|
||||
);
|
||||
return child;
|
||||
},
|
||||
child: child,
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return CommonCard(
|
||||
info: Info(
|
||||
iconData: Icons.network_check,
|
||||
label: appLocalizations.networkDetection,
|
||||
),
|
||||
child: Selector<AppState, NetworkDetectionSelectorState>(
|
||||
selector: (_, appState) {
|
||||
return NetworkDetectionSelectorState(
|
||||
currentProxyName: appState.showProxyName,
|
||||
delay: appState.getDelay(
|
||||
appState.showProxyName,
|
||||
),
|
||||
);
|
||||
},
|
||||
builder: (_, state, __) {
|
||||
return Container(
|
||||
padding: const EdgeInsets.all(16).copyWith(top: 0),
|
||||
return _checkIpContainer(
|
||||
ValueListenableBuilder<IpInfo?>(
|
||||
valueListenable: ipInfoNotifier,
|
||||
builder: (_, ipInfo, __) {
|
||||
return CommonCard(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Flexible(
|
||||
flex: 0,
|
||||
child: TooltipText(
|
||||
text: Text(
|
||||
state.currentProxyName ?? appLocalizations.noProxy,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
maxLines: 1,
|
||||
style: Theme.of(context)
|
||||
.textTheme
|
||||
.titleMedium
|
||||
?.toSoftBold(),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
height: 8,
|
||||
),
|
||||
Flexible(
|
||||
child: Container(
|
||||
height: globalState.appController.measure.titleLargeHeight,
|
||||
alignment: Alignment.centerLeft,
|
||||
child: FadeBox(
|
||||
child: _buildDescription(
|
||||
state.currentProxyName,
|
||||
state.delay,
|
||||
),
|
||||
padding: const EdgeInsets.all(16),
|
||||
child: Row(
|
||||
children: [
|
||||
Icon(
|
||||
Icons.network_check,
|
||||
color: Theme.of(context).colorScheme.primary,
|
||||
),
|
||||
const SizedBox(
|
||||
width: 8,
|
||||
),
|
||||
Flexible(
|
||||
flex: 1,
|
||||
child: FadeBox(
|
||||
child: ipInfo != null
|
||||
? CountryFlag.fromCountryCode(
|
||||
ipInfo.countryCode,
|
||||
width: 24,
|
||||
height: 24,
|
||||
)
|
||||
: TooltipText(
|
||||
text: Text(
|
||||
appLocalizations.checking,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: Theme.of(context)
|
||||
.textTheme
|
||||
.titleMedium,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
Container(
|
||||
height:
|
||||
globalState.appController.measure.titleLargeHeight + 24,
|
||||
alignment: Alignment.centerLeft,
|
||||
padding: const EdgeInsets.all(16).copyWith(top: 0),
|
||||
child: FadeBox(
|
||||
child: ipInfo != null
|
||||
? Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Flexible(
|
||||
flex: 1,
|
||||
child: TooltipText(
|
||||
text: Text(
|
||||
ipInfo.ip,
|
||||
style: context.textTheme.titleLarge
|
||||
?.toSoftBold(),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
)
|
||||
: ValueListenableBuilder(
|
||||
valueListenable: timeoutNotifier,
|
||||
builder: (_, timeout, __) {
|
||||
if(timeout){
|
||||
return Text(
|
||||
appLocalizations.ipCheckError,
|
||||
style: context.textTheme.bodyMedium
|
||||
?.toSoftBold(),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
);
|
||||
}
|
||||
return const SizedBox(
|
||||
child: CircularProgressIndicator(),
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
);
|
||||
|
||||
@@ -19,7 +19,7 @@ class _StartButtonState extends State<StartButton>
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
isStart = context.read<AppState>().runTime != null;
|
||||
isStart = globalState.appController.appState.isStart;
|
||||
_controller = AnimationController(
|
||||
vsync: this,
|
||||
value: isStart ? 1 : 0,
|
||||
@@ -48,9 +48,11 @@ class _StartButtonState extends State<StartButton>
|
||||
}
|
||||
}
|
||||
|
||||
updateSystemProxy() async {
|
||||
final appController = globalState.appController;
|
||||
await appController.updateSystemProxy(isStart);
|
||||
updateSystemProxy() {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) async {
|
||||
final appController = globalState.appController;
|
||||
await appController.updateSystemProxy(isStart);
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
|
||||
@@ -8,4 +8,5 @@ export 'access.dart';
|
||||
export 'config.dart';
|
||||
export 'application_setting.dart';
|
||||
export 'about.dart';
|
||||
export 'backup_and_recovery.dart';
|
||||
export 'backup_and_recovery.dart';
|
||||
export 'resources.dart';
|
||||
@@ -1,4 +1,5 @@
|
||||
import 'package:collection/collection.dart';
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:fl_clash/common/common.dart';
|
||||
import 'package:fl_clash/enum/enum.dart';
|
||||
import 'package:fl_clash/state.dart';
|
||||
@@ -7,10 +8,40 @@ import 'package:provider/provider.dart';
|
||||
import '../models/models.dart';
|
||||
import '../widgets/widgets.dart';
|
||||
|
||||
class LogsFragment extends StatelessWidget {
|
||||
class LogsFragment extends StatefulWidget {
|
||||
const LogsFragment({super.key});
|
||||
|
||||
_initActions(BuildContext context) {
|
||||
@override
|
||||
State<LogsFragment> createState() => _LogsFragmentState();
|
||||
}
|
||||
|
||||
class _LogsFragmentState extends State<LogsFragment> {
|
||||
final logsNotifier = ValueNotifier<List<Log>>([]);
|
||||
Timer? timer;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
|
||||
logsNotifier.value = context.read<AppState>().logs;
|
||||
if (timer != null) {
|
||||
timer?.cancel();
|
||||
timer = null;
|
||||
}
|
||||
timer = Timer.periodic(const Duration(milliseconds: 200), (timer) {
|
||||
logsNotifier.value = globalState.appController.appState.logs;
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
super.dispose();
|
||||
timer?.cancel();
|
||||
timer = null;
|
||||
}
|
||||
|
||||
_initActions() {
|
||||
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
|
||||
final commonScaffoldState =
|
||||
context.findAncestorStateOfType<CommonScaffoldState>();
|
||||
@@ -20,7 +51,7 @@ class LogsFragment extends StatelessWidget {
|
||||
showSearch(
|
||||
context: context,
|
||||
delegate: LogsSearchDelegate(
|
||||
logs: globalState.appController.appState.logs.reversed.toList(),
|
||||
logs: logsNotifier.value.reversed.toList(),
|
||||
),
|
||||
);
|
||||
},
|
||||
@@ -31,10 +62,8 @@ class LogsFragment extends StatelessWidget {
|
||||
}
|
||||
|
||||
_buildList() {
|
||||
return Selector<AppState, List<Log>>(
|
||||
selector: (_, appState) => appState.logs,
|
||||
shouldRebuild: (prev, next) =>
|
||||
!const ListEquality<Log>().equals(prev, next),
|
||||
return ValueListenableBuilder<List<Log>>(
|
||||
valueListenable: logsNotifier,
|
||||
builder: (_, List<Log> logs, __) {
|
||||
if (logs.isEmpty) {
|
||||
return NullStatus(
|
||||
@@ -48,7 +77,6 @@ class LogsFragment extends StatelessWidget {
|
||||
itemBuilder: (BuildContext context, int index) {
|
||||
final log = logs[index];
|
||||
return LogItem(
|
||||
key: ValueKey(log.dateTime),
|
||||
log: log,
|
||||
);
|
||||
},
|
||||
@@ -65,14 +93,13 @@ class LogsFragment extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Selector<AppState, bool?>(
|
||||
selector: (_, appState) {
|
||||
return appState.currentLabel == 'logs' ||
|
||||
appState.viewMode == ViewMode.mobile &&
|
||||
appState.currentLabel == "tools";
|
||||
},
|
||||
selector: (_, appState) =>
|
||||
appState.currentLabel == 'logs' ||
|
||||
appState.viewMode == ViewMode.mobile &&
|
||||
appState.currentLabel == "tools",
|
||||
builder: (_, isCurrent, child) {
|
||||
if (isCurrent == null || isCurrent) {
|
||||
_initActions(context);
|
||||
_initActions();
|
||||
}
|
||||
return child!;
|
||||
},
|
||||
|
||||
@@ -40,7 +40,7 @@ class _EditProfileState extends State<EditProfile> {
|
||||
_handleConfirm() {
|
||||
if (!_formKey.currentState!.validate()) return;
|
||||
final config = widget.context.read<Config>();
|
||||
final hasUpdate = widget.profile.url != urlController.text;
|
||||
final hasUpdate = urlController.text.isNotEmpty && widget.profile.url != urlController.text;
|
||||
widget.profile.url = urlController.text;
|
||||
widget.profile.label = labelController.text;
|
||||
widget.profile.autoUpdate = autoUpdate;
|
||||
@@ -82,7 +82,7 @@ class _EditProfileState extends State<EditProfile> {
|
||||
},
|
||||
),
|
||||
),
|
||||
if (widget.profile.url != null)...[
|
||||
if (widget.profile.url != null && widget.profile.url!.isNotEmpty == true)...[
|
||||
ListItem(
|
||||
title: TextFormField(
|
||||
controller: urlController,
|
||||
|
||||
@@ -25,7 +25,6 @@ class ProfilesFragment extends StatefulWidget {
|
||||
}
|
||||
|
||||
class _ProfilesFragmentState extends State<ProfilesFragment> {
|
||||
|
||||
_handleDeleteProfile(String id) async {
|
||||
globalState.appController.deleteProfile(id);
|
||||
}
|
||||
@@ -140,9 +139,10 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
|
||||
),
|
||||
child: Selector2<AppState, Config, ProfilesSelectorState>(
|
||||
selector: (_, appState, config) => ProfilesSelectorState(
|
||||
profiles: config.profiles,
|
||||
currentProfileId: config.currentProfileId,
|
||||
viewMode: appState.viewMode),
|
||||
profiles: config.profiles,
|
||||
currentProfileId: config.currentProfileId,
|
||||
viewMode: appState.viewMode,
|
||||
),
|
||||
builder: (context, state, child) {
|
||||
if (state.profiles.isEmpty) {
|
||||
return NullStatus(
|
||||
@@ -176,30 +176,6 @@ class ProfileItem extends StatelessWidget {
|
||||
required this.onChanged,
|
||||
});
|
||||
|
||||
String _getLastUpdateTimeDifference(DateTime lastDateTime) {
|
||||
final currentDateTime = DateTime.now();
|
||||
final difference = currentDateTime.difference(lastDateTime);
|
||||
final days = difference.inDays;
|
||||
if (days >= 365) {
|
||||
return "${(days / 365).floor()} ${appLocalizations.years}${appLocalizations.ago}";
|
||||
}
|
||||
if (days >= 30) {
|
||||
return "${(days / 30).floor()} ${appLocalizations.months}${appLocalizations.ago}";
|
||||
}
|
||||
if (days >= 1) {
|
||||
return "$days ${appLocalizations.days}${appLocalizations.ago}";
|
||||
}
|
||||
final hours = difference.inHours;
|
||||
if (hours >= 1) {
|
||||
return "$hours ${appLocalizations.hours}${appLocalizations.ago}";
|
||||
}
|
||||
final minutes = difference.inMinutes;
|
||||
if (minutes >= 1) {
|
||||
return "$minutes ${appLocalizations.minutes}${appLocalizations.ago}";
|
||||
}
|
||||
return appLocalizations.just;
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
String useShow;
|
||||
@@ -246,9 +222,7 @@ class ProfileItem extends StatelessWidget {
|
||||
),
|
||||
Flexible(
|
||||
child: Text(
|
||||
profile.lastUpdateDate != null
|
||||
? _getLastUpdateTimeDifference(profile.lastUpdateDate!)
|
||||
: '',
|
||||
profile.lastUpdateDate?.lastUpdateTimeDesc ?? '',
|
||||
style: Theme.of(context).textTheme.labelMedium?.toLight(),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import 'package:fl_clash/clash/clash.dart';
|
||||
import 'package:fl_clash/state.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
@@ -57,72 +58,69 @@ class _ProxiesFragmentState extends State<ProxiesFragment>
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return DelayTestButtonContainer(
|
||||
child: Selector<AppState, bool>(
|
||||
selector: (_, appState) => appState.currentLabel == 'proxies',
|
||||
builder: (_, isCurrent, child) {
|
||||
if (isCurrent) {
|
||||
_initActions();
|
||||
}
|
||||
return child!;
|
||||
return Selector<AppState, bool>(
|
||||
selector: (_, appState) => appState.currentLabel == 'proxies',
|
||||
builder: (_, isCurrent, child) {
|
||||
if (isCurrent) {
|
||||
_initActions();
|
||||
}
|
||||
return child!;
|
||||
},
|
||||
child: Selector3<AppState, Config, ClashConfig, ProxiesSelectorState>(
|
||||
selector: (_, appState, config, clashConfig) {
|
||||
final currentGroups = appState.currentGroups;
|
||||
final groupNames = currentGroups.map((e) => e.name).toList();
|
||||
return ProxiesSelectorState(
|
||||
groupNames: groupNames,
|
||||
);
|
||||
},
|
||||
child: Selector3<AppState, Config, ClashConfig, ProxiesSelectorState>(
|
||||
selector: (_, appState, config, clashConfig) {
|
||||
final currentGroups = appState.currentGroups;
|
||||
final groupNames = currentGroups.map((e) => e.name).toList();
|
||||
return ProxiesSelectorState(
|
||||
groupNames: groupNames,
|
||||
);
|
||||
},
|
||||
shouldRebuild: (prev, next) {
|
||||
if (prev.groupNames.length != next.groupNames.length) {
|
||||
_tabController?.dispose();
|
||||
_tabController = null;
|
||||
}
|
||||
return prev != next;
|
||||
},
|
||||
builder: (_, state, __) {
|
||||
_tabController ??= TabController(
|
||||
length: state.groupNames.length,
|
||||
vsync: this,
|
||||
);
|
||||
return Column(
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
TabBar(
|
||||
shouldRebuild: (prev, next) {
|
||||
if (prev.groupNames.length != next.groupNames.length) {
|
||||
_tabController?.dispose();
|
||||
_tabController = null;
|
||||
}
|
||||
return prev != next;
|
||||
},
|
||||
builder: (_, state, __) {
|
||||
_tabController ??= TabController(
|
||||
length: state.groupNames.length,
|
||||
vsync: this,
|
||||
);
|
||||
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 WidgetStatePropertyAll(Colors.transparent),
|
||||
tabs: [
|
||||
for (final groupName in state.groupNames)
|
||||
Tab(
|
||||
text: groupName,
|
||||
),
|
||||
],
|
||||
),
|
||||
Expanded(
|
||||
child: TabBarView(
|
||||
controller: _tabController,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16),
|
||||
dividerColor: Colors.transparent,
|
||||
isScrollable: true,
|
||||
tabAlignment: TabAlignment.start,
|
||||
overlayColor:
|
||||
const WidgetStatePropertyAll(Colors.transparent),
|
||||
tabs: [
|
||||
children: [
|
||||
for (final groupName in state.groupNames)
|
||||
Tab(
|
||||
text: groupName,
|
||||
KeepContainer(
|
||||
key: ObjectKey(groupName),
|
||||
child: ProxiesTabView(
|
||||
groupName: groupName,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
Expanded(
|
||||
child: TabBarView(
|
||||
controller: _tabController,
|
||||
children: [
|
||||
for (final groupName in state.groupNames)
|
||||
KeepContainer(
|
||||
key: ObjectKey(groupName),
|
||||
child: ProxiesTabView(
|
||||
groupName: groupName,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
)
|
||||
],
|
||||
);
|
||||
},
|
||||
),
|
||||
)
|
||||
],
|
||||
);
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -196,6 +194,18 @@ class ProxiesTabView extends StatelessWidget {
|
||||
}
|
||||
}
|
||||
|
||||
_delayTest(List<Proxy> proxies) async {
|
||||
for (final proxy in proxies) {
|
||||
globalState.appController.setDelay(
|
||||
Delay(name: proxy.name, value: 0),
|
||||
);
|
||||
clashCore.getDelay(proxy.name).then((delay) {
|
||||
globalState.appController.setDelay(delay);
|
||||
});
|
||||
}
|
||||
await Future.delayed(httpTimeoutDuration + moreDuration);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Selector2<AppState, Config, ProxiesTabViewSelectorState>(
|
||||
@@ -213,25 +223,32 @@ class ProxiesTabView extends StatelessWidget {
|
||||
state.group.all,
|
||||
state.proxiesSortType,
|
||||
);
|
||||
return Align(
|
||||
alignment: Alignment.topCenter,
|
||||
child: GridView.builder(
|
||||
padding: const EdgeInsets.all(16),
|
||||
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
|
||||
crossAxisCount: _getColumns(state.viewMode),
|
||||
mainAxisSpacing: 8,
|
||||
crossAxisSpacing: 8,
|
||||
mainAxisExtent: _getItemHeight(context),
|
||||
return DelayTestButtonContainer(
|
||||
onClick: () async {
|
||||
await _delayTest(
|
||||
state.group.all,
|
||||
);
|
||||
},
|
||||
child: Align(
|
||||
alignment: Alignment.topCenter,
|
||||
child: GridView.builder(
|
||||
padding: const EdgeInsets.all(16),
|
||||
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
|
||||
crossAxisCount: _getColumns(state.viewMode),
|
||||
mainAxisSpacing: 8,
|
||||
crossAxisSpacing: 8,
|
||||
mainAxisExtent: _getItemHeight(context),
|
||||
),
|
||||
itemCount: proxies.length,
|
||||
itemBuilder: (_, index) {
|
||||
final proxy = proxies[index];
|
||||
return ProxyCard(
|
||||
key: ValueKey('$groupName.${proxy.name}'),
|
||||
proxy: proxy,
|
||||
groupName: groupName,
|
||||
);
|
||||
},
|
||||
),
|
||||
itemCount: proxies.length,
|
||||
itemBuilder: (_, index) {
|
||||
final proxy = proxies[index];
|
||||
return ProxyCard(
|
||||
key: ValueKey('$groupName.${proxy.name}'),
|
||||
proxy: proxy,
|
||||
groupName: groupName,
|
||||
);
|
||||
},
|
||||
),
|
||||
);
|
||||
},
|
||||
@@ -384,10 +401,12 @@ class ProxyCard extends StatelessWidget {
|
||||
|
||||
class DelayTestButtonContainer extends StatefulWidget {
|
||||
final Widget child;
|
||||
final Future Function() onClick;
|
||||
|
||||
const DelayTestButtonContainer({
|
||||
super.key,
|
||||
required this.child,
|
||||
required this.onClick,
|
||||
});
|
||||
|
||||
@override
|
||||
@@ -399,15 +418,11 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
|
||||
with SingleTickerProviderStateMixin {
|
||||
late AnimationController _controller;
|
||||
late Animation<double> _scale;
|
||||
late Animation<double> _opacity;
|
||||
|
||||
_healthcheck() async {
|
||||
if (globalState.healthcheckLock) return;
|
||||
_controller.forward();
|
||||
globalState.appController.healthcheck();
|
||||
Future.delayed(httpTimeoutDuration + moreDuration, () {
|
||||
_controller.reverse();
|
||||
});
|
||||
await widget.onClick();
|
||||
_controller.reverse();
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -416,7 +431,7 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
|
||||
_controller = AnimationController(
|
||||
vsync: this,
|
||||
duration: const Duration(
|
||||
milliseconds: 300,
|
||||
milliseconds: 1200,
|
||||
),
|
||||
);
|
||||
_scale = Tween<double>(
|
||||
@@ -432,19 +447,6 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
|
||||
),
|
||||
),
|
||||
);
|
||||
_opacity = Tween<double>(
|
||||
begin: 1.0,
|
||||
end: 0.0,
|
||||
).animate(
|
||||
CurvedAnimation(
|
||||
parent: _controller,
|
||||
curve: const Interval(
|
||||
0,
|
||||
1,
|
||||
curve: Curves.easeIn,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -455,6 +457,7 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
_controller.reverse();
|
||||
return FloatLayout(
|
||||
floatingWidget: FloatWrapper(
|
||||
child: AnimatedBuilder(
|
||||
@@ -465,10 +468,7 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
|
||||
height: 56,
|
||||
child: Transform.scale(
|
||||
scale: _scale.value,
|
||||
child: Opacity(
|
||||
opacity: _opacity.value,
|
||||
child: child!,
|
||||
),
|
||||
child: child,
|
||||
),
|
||||
);
|
||||
},
|
||||
|
||||
172
lib/fragments/resources.dart
Normal file
172
lib/fragments/resources.dart
Normal file
@@ -0,0 +1,172 @@
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:fl_clash/clash/clash.dart';
|
||||
import 'package:fl_clash/common/common.dart';
|
||||
import 'package:fl_clash/models/ffi.dart';
|
||||
import 'package:fl_clash/widgets/widgets.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:path/path.dart' hide context;
|
||||
|
||||
@immutable
|
||||
class GeoItem {
|
||||
final String label;
|
||||
final String fileName;
|
||||
|
||||
const GeoItem({
|
||||
required this.label,
|
||||
required this.fileName,
|
||||
});
|
||||
}
|
||||
|
||||
class Resources extends StatefulWidget {
|
||||
const Resources({super.key});
|
||||
|
||||
@override
|
||||
State<Resources> createState() => _ResourcesState();
|
||||
}
|
||||
|
||||
class _ResourcesState extends State<Resources> {
|
||||
_updateExternalProvider(
|
||||
String providerName,
|
||||
String providerType,
|
||||
) async {
|
||||
final commonScaffoldState = context.commonScaffoldState;
|
||||
await commonScaffoldState?.loadingRun(() async {
|
||||
final message = await clashCore.updateExternalProvider(
|
||||
providerName: providerName,
|
||||
providerType: providerType,
|
||||
);
|
||||
if (message.isNotEmpty) throw message;
|
||||
});
|
||||
setState(() {});
|
||||
}
|
||||
|
||||
Future<DateTime> _getGeoFileLastModified(String fileName) async {
|
||||
final homePath = await appPath.getHomeDirPath();
|
||||
return await File(join(homePath, fileName)).lastModified();
|
||||
}
|
||||
|
||||
Widget _buildExternalProviderSection() {
|
||||
return FutureBuilder<List<ExternalProvider>>(
|
||||
future: () async {
|
||||
await Future.delayed(const Duration(milliseconds: 200));
|
||||
return await clashCore.getExternalProviders();
|
||||
}(),
|
||||
builder: (_, snapshot) {
|
||||
return Center(
|
||||
child: FadeBox(
|
||||
key: const Key("external_providers"),
|
||||
child: snapshot.data == null || snapshot.data!.isEmpty
|
||||
? Container()
|
||||
: Section(
|
||||
title: appLocalizations.externalResources,
|
||||
child: Column(
|
||||
children: [
|
||||
for (final externalProvider in snapshot.data!)
|
||||
ListItem(
|
||||
title: Text(externalProvider.name),
|
||||
subtitle: Text(
|
||||
"${externalProvider.type} (${externalProvider.vehicleType})",
|
||||
),
|
||||
trailing: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Text(
|
||||
externalProvider.updateAt.lastUpdateTimeDesc,
|
||||
style: context.textTheme.bodyMedium,
|
||||
),
|
||||
const Padding(
|
||||
padding: EdgeInsets.only(left: 12,right: 4),
|
||||
child: VerticalDivider(
|
||||
endIndent: 2,
|
||||
width: 4,
|
||||
indent: 2,
|
||||
),
|
||||
),
|
||||
externalProvider.vehicleType == "HTTP"
|
||||
? IconButton(
|
||||
icon: const Icon(Icons.sync),
|
||||
onPressed: () {
|
||||
_updateExternalProvider(
|
||||
externalProvider.name,
|
||||
externalProvider.type,
|
||||
);
|
||||
},
|
||||
)
|
||||
: Container(),
|
||||
],
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildGeoDataSection() {
|
||||
const geoItems = <GeoItem>[
|
||||
GeoItem(label: "GeoIp", fileName: mmdbFileName),
|
||||
GeoItem(label: "GeoSite", fileName: geoSiteFileName),
|
||||
GeoItem(label: "ASN", fileName: asnFileName),
|
||||
];
|
||||
return Section(
|
||||
title: appLocalizations.geoData,
|
||||
child: Column(
|
||||
children: [
|
||||
for (final geoItem in geoItems)
|
||||
ListItem(
|
||||
title: Text(geoItem.label),
|
||||
subtitle: FutureBuilder<DateTime>(
|
||||
future: () async {
|
||||
await Future.delayed(const Duration(milliseconds: 200));
|
||||
return await _getGeoFileLastModified(geoItem.fileName);
|
||||
}(),
|
||||
builder: (_, snapshot) {
|
||||
return Container(
|
||||
alignment: Alignment.centerLeft,
|
||||
height: 24,
|
||||
child: FadeBox(
|
||||
key: Key("fade_box_${geoItem.label}"),
|
||||
child: snapshot.data == null
|
||||
? const SizedBox(
|
||||
width: 24,
|
||||
height: 24,
|
||||
child: CircularProgressIndicator(
|
||||
strokeWidth: 2,
|
||||
),
|
||||
)
|
||||
: Text(
|
||||
snapshot.data!.lastUpdateTimeDesc,
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
trailing: IconButton(
|
||||
icon: const Icon(Icons.sync),
|
||||
onPressed: () {
|
||||
_updateExternalProvider(
|
||||
geoItem.fileName,
|
||||
geoItem.label,
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return ListView(
|
||||
children: [
|
||||
_buildGeoDataSection(),
|
||||
_buildExternalProviderSection(),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -9,6 +9,8 @@
|
||||
"tools": "Tools",
|
||||
"logs": "Logs",
|
||||
"logsDesc": "Log capture records",
|
||||
"resources": "Resources",
|
||||
"resourcesDesc": "External resource related info",
|
||||
"trafficUsage": "Traffic usage",
|
||||
"coreInfo": "Core info",
|
||||
"nullCoreInfoDesc": "Unable to obtain core info",
|
||||
@@ -151,5 +153,11 @@
|
||||
"checkUpdate": "Check for updates",
|
||||
"discoverNewVersion": "Discover the new version",
|
||||
"checkUpdateError": "The current application is already the latest version",
|
||||
"goDownload": "Go to download"
|
||||
"goDownload": "Go to download",
|
||||
"unknown": "Unknown",
|
||||
"geoData": "GeoData",
|
||||
"externalResources": "External resources",
|
||||
"checking": "Checking...",
|
||||
"country": "Country",
|
||||
"ipCheckError": "Ip check timeout"
|
||||
}
|
||||
@@ -9,6 +9,8 @@
|
||||
"tools": "工具",
|
||||
"logs": "日志",
|
||||
"logsDesc": "日志捕获记录",
|
||||
"resources": "资源",
|
||||
"resourcesDesc": "外部资源相关信息",
|
||||
"trafficUsage": "流量统计",
|
||||
"coreInfo": "内核信息",
|
||||
"nullCoreInfoDesc": "无法获取内核信息",
|
||||
@@ -151,5 +153,11 @@
|
||||
"checkUpdate": "检查更新",
|
||||
"discoverNewVersion": "发现新版本",
|
||||
"checkUpdateError": "当前应用已经是最新版了",
|
||||
"goDownload": "前往下载"
|
||||
"goDownload": "前往下载",
|
||||
"unknown": "未知",
|
||||
"geoData": "地理数据",
|
||||
"externalResources": "外部资源",
|
||||
"checking": "检测中...",
|
||||
"country": "区域",
|
||||
"ipCheckError": "Ip检测超时"
|
||||
}
|
||||
@@ -80,6 +80,7 @@ class MessageLookup extends MessageLookupByLibrary {
|
||||
MessageLookupByLibrary.simpleMessage("Check for updates"),
|
||||
"checkUpdateError": MessageLookupByLibrary.simpleMessage(
|
||||
"The current application is already the latest version"),
|
||||
"checking": MessageLookupByLibrary.simpleMessage("Checking..."),
|
||||
"compatible":
|
||||
MessageLookupByLibrary.simpleMessage("Compatibility mode"),
|
||||
"compatibleDesc": MessageLookupByLibrary.simpleMessage(
|
||||
@@ -88,6 +89,7 @@ class MessageLookup extends MessageLookupByLibrary {
|
||||
"connectivity": MessageLookupByLibrary.simpleMessage("Connectivity:"),
|
||||
"core": MessageLookupByLibrary.simpleMessage("Core"),
|
||||
"coreInfo": MessageLookupByLibrary.simpleMessage("Core info"),
|
||||
"country": MessageLookupByLibrary.simpleMessage("Country"),
|
||||
"create": MessageLookupByLibrary.simpleMessage("Create"),
|
||||
"dark": MessageLookupByLibrary.simpleMessage("Dark"),
|
||||
"dashboard": MessageLookupByLibrary.simpleMessage("Dashboard"),
|
||||
@@ -109,16 +111,21 @@ class MessageLookup extends MessageLookupByLibrary {
|
||||
"edit": MessageLookupByLibrary.simpleMessage("Edit"),
|
||||
"en": MessageLookupByLibrary.simpleMessage("English"),
|
||||
"exit": MessageLookupByLibrary.simpleMessage("Exit"),
|
||||
"externalResources":
|
||||
MessageLookupByLibrary.simpleMessage("External resources"),
|
||||
"file": MessageLookupByLibrary.simpleMessage("File"),
|
||||
"fileDesc":
|
||||
MessageLookupByLibrary.simpleMessage("Directly upload profile"),
|
||||
"filterSystemApp":
|
||||
MessageLookupByLibrary.simpleMessage("Filter system app"),
|
||||
"geoData": MessageLookupByLibrary.simpleMessage("GeoData"),
|
||||
"global": MessageLookupByLibrary.simpleMessage("Global"),
|
||||
"goDownload": MessageLookupByLibrary.simpleMessage("Go to download"),
|
||||
"hours": MessageLookupByLibrary.simpleMessage("Hours"),
|
||||
"importFromURL":
|
||||
MessageLookupByLibrary.simpleMessage("Import from URL"),
|
||||
"ipCheckError":
|
||||
MessageLookupByLibrary.simpleMessage("Ip check timeout"),
|
||||
"just": MessageLookupByLibrary.simpleMessage("Just"),
|
||||
"language": MessageLookupByLibrary.simpleMessage("Language"),
|
||||
"light": MessageLookupByLibrary.simpleMessage("Light"),
|
||||
@@ -199,6 +206,9 @@ class MessageLookup extends MessageLookupByLibrary {
|
||||
MessageLookupByLibrary.simpleMessage("Only recovery profiles"),
|
||||
"recoverySuccess":
|
||||
MessageLookupByLibrary.simpleMessage("Recovery success"),
|
||||
"resources": MessageLookupByLibrary.simpleMessage("Resources"),
|
||||
"resourcesDesc": MessageLookupByLibrary.simpleMessage(
|
||||
"External resource related info"),
|
||||
"rule": MessageLookupByLibrary.simpleMessage("Rule"),
|
||||
"save": MessageLookupByLibrary.simpleMessage("Save"),
|
||||
"selectAll": MessageLookupByLibrary.simpleMessage("Select all"),
|
||||
@@ -229,6 +239,7 @@ class MessageLookup extends MessageLookupByLibrary {
|
||||
"unableToUpdateCurrentProfileDesc":
|
||||
MessageLookupByLibrary.simpleMessage(
|
||||
"unable to update current profile"),
|
||||
"unknown": MessageLookupByLibrary.simpleMessage("Unknown"),
|
||||
"update": MessageLookupByLibrary.simpleMessage("Update"),
|
||||
"upload": MessageLookupByLibrary.simpleMessage("Upload"),
|
||||
"url": MessageLookupByLibrary.simpleMessage("URL"),
|
||||
|
||||
@@ -65,6 +65,7 @@ class MessageLookup extends MessageLookupByLibrary {
|
||||
"cancelSelectAll": MessageLookupByLibrary.simpleMessage("取消全选"),
|
||||
"checkUpdate": MessageLookupByLibrary.simpleMessage("检查更新"),
|
||||
"checkUpdateError": MessageLookupByLibrary.simpleMessage("当前应用已经是最新版了"),
|
||||
"checking": MessageLookupByLibrary.simpleMessage("检测中..."),
|
||||
"compatible": MessageLookupByLibrary.simpleMessage("兼容模式"),
|
||||
"compatibleDesc":
|
||||
MessageLookupByLibrary.simpleMessage("开启将失去部分应用能力,获得全量的Clash的支持"),
|
||||
@@ -72,6 +73,7 @@ class MessageLookup extends MessageLookupByLibrary {
|
||||
"connectivity": MessageLookupByLibrary.simpleMessage("连通性:"),
|
||||
"core": MessageLookupByLibrary.simpleMessage("内核"),
|
||||
"coreInfo": MessageLookupByLibrary.simpleMessage("内核信息"),
|
||||
"country": MessageLookupByLibrary.simpleMessage("区域"),
|
||||
"create": MessageLookupByLibrary.simpleMessage("创建"),
|
||||
"dark": MessageLookupByLibrary.simpleMessage("深色"),
|
||||
"dashboard": MessageLookupByLibrary.simpleMessage("仪表盘"),
|
||||
@@ -90,13 +92,16 @@ class MessageLookup extends MessageLookupByLibrary {
|
||||
"edit": MessageLookupByLibrary.simpleMessage("编辑"),
|
||||
"en": MessageLookupByLibrary.simpleMessage("英语"),
|
||||
"exit": MessageLookupByLibrary.simpleMessage("退出"),
|
||||
"externalResources": MessageLookupByLibrary.simpleMessage("外部资源"),
|
||||
"file": MessageLookupByLibrary.simpleMessage("文件"),
|
||||
"fileDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"),
|
||||
"filterSystemApp": MessageLookupByLibrary.simpleMessage("过滤系统应用"),
|
||||
"geoData": MessageLookupByLibrary.simpleMessage("地理数据"),
|
||||
"global": MessageLookupByLibrary.simpleMessage("全局"),
|
||||
"goDownload": MessageLookupByLibrary.simpleMessage("前往下载"),
|
||||
"hours": MessageLookupByLibrary.simpleMessage("小时"),
|
||||
"importFromURL": MessageLookupByLibrary.simpleMessage("从URL导入"),
|
||||
"ipCheckError": MessageLookupByLibrary.simpleMessage("Ip检测超时"),
|
||||
"just": MessageLookupByLibrary.simpleMessage("刚刚"),
|
||||
"language": MessageLookupByLibrary.simpleMessage("语言"),
|
||||
"light": MessageLookupByLibrary.simpleMessage("浅色"),
|
||||
@@ -161,6 +166,8 @@ class MessageLookup extends MessageLookupByLibrary {
|
||||
"recoveryDesc": MessageLookupByLibrary.simpleMessage("从WebDAV恢复数据"),
|
||||
"recoveryProfiles": MessageLookupByLibrary.simpleMessage("仅恢复配置文件"),
|
||||
"recoverySuccess": MessageLookupByLibrary.simpleMessage("恢复成功"),
|
||||
"resources": MessageLookupByLibrary.simpleMessage("资源"),
|
||||
"resourcesDesc": MessageLookupByLibrary.simpleMessage("外部资源相关信息"),
|
||||
"rule": MessageLookupByLibrary.simpleMessage("规则"),
|
||||
"save": MessageLookupByLibrary.simpleMessage("保存"),
|
||||
"selectAll": MessageLookupByLibrary.simpleMessage("全选"),
|
||||
@@ -187,6 +194,7 @@ class MessageLookup extends MessageLookupByLibrary {
|
||||
"tunDesc": MessageLookupByLibrary.simpleMessage("仅在管理员模式生效"),
|
||||
"unableToUpdateCurrentProfileDesc":
|
||||
MessageLookupByLibrary.simpleMessage("无法更新当前配置文件"),
|
||||
"unknown": MessageLookupByLibrary.simpleMessage("未知"),
|
||||
"update": MessageLookupByLibrary.simpleMessage("更新"),
|
||||
"upload": MessageLookupByLibrary.simpleMessage("上传"),
|
||||
"url": MessageLookupByLibrary.simpleMessage("URL"),
|
||||
|
||||
@@ -150,6 +150,26 @@ class AppLocalizations {
|
||||
);
|
||||
}
|
||||
|
||||
/// `Resources`
|
||||
String get resources {
|
||||
return Intl.message(
|
||||
'Resources',
|
||||
name: 'resources',
|
||||
desc: '',
|
||||
args: [],
|
||||
);
|
||||
}
|
||||
|
||||
/// `External resource related info`
|
||||
String get resourcesDesc {
|
||||
return Intl.message(
|
||||
'External resource related info',
|
||||
name: 'resourcesDesc',
|
||||
desc: '',
|
||||
args: [],
|
||||
);
|
||||
}
|
||||
|
||||
/// `Traffic usage`
|
||||
String get trafficUsage {
|
||||
return Intl.message(
|
||||
@@ -1579,6 +1599,66 @@ class AppLocalizations {
|
||||
args: [],
|
||||
);
|
||||
}
|
||||
|
||||
/// `Unknown`
|
||||
String get unknown {
|
||||
return Intl.message(
|
||||
'Unknown',
|
||||
name: 'unknown',
|
||||
desc: '',
|
||||
args: [],
|
||||
);
|
||||
}
|
||||
|
||||
/// `GeoData`
|
||||
String get geoData {
|
||||
return Intl.message(
|
||||
'GeoData',
|
||||
name: 'geoData',
|
||||
desc: '',
|
||||
args: [],
|
||||
);
|
||||
}
|
||||
|
||||
/// `External resources`
|
||||
String get externalResources {
|
||||
return Intl.message(
|
||||
'External resources',
|
||||
name: 'externalResources',
|
||||
desc: '',
|
||||
args: [],
|
||||
);
|
||||
}
|
||||
|
||||
/// `Checking...`
|
||||
String get checking {
|
||||
return Intl.message(
|
||||
'Checking...',
|
||||
name: 'checking',
|
||||
desc: '',
|
||||
args: [],
|
||||
);
|
||||
}
|
||||
|
||||
/// `Country`
|
||||
String get country {
|
||||
return Intl.message(
|
||||
'Country',
|
||||
name: 'country',
|
||||
desc: '',
|
||||
args: [],
|
||||
);
|
||||
}
|
||||
|
||||
/// `Ip check timeout`
|
||||
String get ipCheckError {
|
||||
return Intl.message(
|
||||
'Ip check timeout',
|
||||
name: 'ipCheckError',
|
||||
desc: '',
|
||||
args: [],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class AppLocalizationDelegate extends LocalizationsDelegate<AppLocalizations> {
|
||||
|
||||
@@ -21,7 +21,6 @@ Future<void> main() async {
|
||||
mode: clashConfig.mode,
|
||||
isCompatible: config.isCompatible,
|
||||
selectedMap: config.currentSelectedMap,
|
||||
viewWidth: other.getViewWidth(),
|
||||
);
|
||||
await globalState.init(
|
||||
appState: appState,
|
||||
|
||||
@@ -32,7 +32,6 @@ class AppState with ChangeNotifier {
|
||||
|
||||
AppState({
|
||||
required Mode mode,
|
||||
double? viewWidth,
|
||||
required bool isCompatible,
|
||||
required SelectedMap selectedMap,
|
||||
}) : _navigationItems = [],
|
||||
@@ -40,7 +39,7 @@ class AppState with ChangeNotifier {
|
||||
_currentLabel = "dashboard",
|
||||
_traffics = [],
|
||||
_logs = [],
|
||||
_viewWidth = viewWidth ?? 0,
|
||||
_viewWidth = 0,
|
||||
_selectedMap = selectedMap,
|
||||
_sortNum = 0,
|
||||
_mode = mode,
|
||||
@@ -90,6 +89,8 @@ class AppState with ChangeNotifier {
|
||||
}
|
||||
}
|
||||
|
||||
bool get isStart => _runTime != null;
|
||||
|
||||
int? get runTime => _runTime;
|
||||
|
||||
set runTime(int? value) {
|
||||
@@ -167,6 +168,9 @@ class AppState with ChangeNotifier {
|
||||
|
||||
addLog(Log log) {
|
||||
_logs.add(log);
|
||||
if (_logs.length > 60) {
|
||||
_logs = _logs.sublist(_logs.length - 60);
|
||||
}
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
@@ -179,7 +183,6 @@ class AppState with ChangeNotifier {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
List<Group> get groups => _groups;
|
||||
|
||||
set groups(List<Group> value) {
|
||||
@@ -253,11 +256,7 @@ class AppState with ChangeNotifier {
|
||||
}
|
||||
}
|
||||
|
||||
ViewMode get viewMode {
|
||||
if (_viewWidth <= maxMobileWidth) return ViewMode.mobile;
|
||||
if (_viewWidth <= maxLaptopWidth) return ViewMode.laptop;
|
||||
return ViewMode.desktop;
|
||||
}
|
||||
ViewMode get viewMode => other.getViewMode(_viewWidth);
|
||||
|
||||
DelayMap get delayMap {
|
||||
return _delayMap;
|
||||
|
||||
@@ -16,7 +16,7 @@ class Tun with _$Tun {
|
||||
const factory Tun({
|
||||
@Default(false) bool enable,
|
||||
@Default(appName) String device,
|
||||
@Default(TunStack.gvisor) TunStack stack,
|
||||
@Default(TunStack.mixed) TunStack stack,
|
||||
@JsonKey(name: "dns-hijack") @Default(["any:53"]) List<String> dnsHijack,
|
||||
}) = _Tun;
|
||||
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
import 'package:fl_clash/enum/enum.dart';
|
||||
|
||||
class Result<T> {
|
||||
String? message;
|
||||
ResultType type;
|
||||
T? data;
|
||||
|
||||
Result({
|
||||
this.message,
|
||||
required this.type,
|
||||
this.data,
|
||||
});
|
||||
|
||||
Result.success([this.data]) : type = ResultType.success,
|
||||
message = null;
|
||||
|
||||
Result.error([this.message]) : type = ResultType.error,
|
||||
data = null;
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
return 'Result{message: $message, type: $type, data: $data}';
|
||||
}
|
||||
}
|
||||
@@ -1,78 +1,26 @@
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:json_annotation/json_annotation.dart';
|
||||
import 'package:freezed_annotation/freezed_annotation.dart';
|
||||
|
||||
import '../enum/enum.dart';
|
||||
import '../common/common.dart';
|
||||
import 'models.dart';
|
||||
|
||||
part 'generated/config.g.dart';
|
||||
part 'generated/config.freezed.dart';
|
||||
|
||||
@JsonSerializable()
|
||||
class AccessControl {
|
||||
AccessControlMode mode;
|
||||
List<String> acceptList;
|
||||
List<String> rejectList;
|
||||
bool isFilterSystemApp;
|
||||
@freezed
|
||||
class AccessControl with _$AccessControl {
|
||||
const factory AccessControl({
|
||||
@Default(AccessControlMode.rejectSelected) AccessControlMode mode,
|
||||
@Default([]) List<String> acceptList,
|
||||
@Default([]) List<String> rejectList,
|
||||
@Default(true) bool isFilterSystemApp,
|
||||
}) = _AccessControl;
|
||||
|
||||
AccessControl({
|
||||
this.isFilterSystemApp = true,
|
||||
this.mode = AccessControlMode.rejectSelected,
|
||||
this.acceptList = const [],
|
||||
this.rejectList = const [],
|
||||
});
|
||||
|
||||
@JsonKey(includeFromJson: false, includeToJson: false)
|
||||
List<String> get currentList =>
|
||||
mode == AccessControlMode.acceptSelected ? acceptList : rejectList;
|
||||
|
||||
set currentList(List<String> currentList) {
|
||||
if (mode == AccessControlMode.acceptSelected) {
|
||||
acceptList = currentList;
|
||||
} else {
|
||||
rejectList = currentList;
|
||||
}
|
||||
}
|
||||
|
||||
AccessControl copyWith({
|
||||
AccessControlMode? mode,
|
||||
List<String>? acceptList,
|
||||
List<String>? rejectList,
|
||||
bool? isFilterSystemApp,
|
||||
}) {
|
||||
return AccessControl(
|
||||
mode: mode ?? this.mode,
|
||||
acceptList: acceptList ?? this.acceptList,
|
||||
rejectList: rejectList ?? this.rejectList,
|
||||
isFilterSystemApp: isFilterSystemApp ?? this.isFilterSystemApp,
|
||||
);
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
return _$AccessControlToJson(this);
|
||||
}
|
||||
|
||||
factory AccessControl.fromJson(Map<String, dynamic> json) {
|
||||
return _$AccessControlFromJson(json);
|
||||
}
|
||||
|
||||
@override
|
||||
bool operator ==(Object other) =>
|
||||
identical(this, other) ||
|
||||
other is AccessControl &&
|
||||
runtimeType == other.runtimeType &&
|
||||
mode == other.mode &&
|
||||
acceptList == other.acceptList &&
|
||||
rejectList == other.rejectList &&
|
||||
isFilterSystemApp == other.isFilterSystemApp;
|
||||
|
||||
@override
|
||||
int get hashCode =>
|
||||
mode.hashCode ^
|
||||
acceptList.hashCode ^
|
||||
rejectList.hashCode ^
|
||||
isFilterSystemApp.hashCode;
|
||||
factory AccessControl.fromJson(Map<String, Object?> json) =>
|
||||
_$AccessControlFromJson(json);
|
||||
}
|
||||
|
||||
@JsonSerializable()
|
||||
@@ -102,13 +50,13 @@ class Config extends ChangeNotifier {
|
||||
_autoRun = false,
|
||||
_themeMode = ThemeMode.system,
|
||||
_openLog = false,
|
||||
_isCompatible = false,
|
||||
_isCompatible = true,
|
||||
_primaryColor = defaultPrimaryColor.value,
|
||||
_proxiesSortType = ProxiesSortType.none,
|
||||
_isMinimizeOnExit = true,
|
||||
_isAccessControl = false,
|
||||
_autoCheckUpdate = true,
|
||||
_accessControl = AccessControl(),
|
||||
_accessControl = const AccessControl(),
|
||||
_isAnimateToPage = true;
|
||||
|
||||
deleteProfileById(String id) {
|
||||
@@ -333,7 +281,7 @@ class Config extends ChangeNotifier {
|
||||
}
|
||||
}
|
||||
|
||||
@JsonKey(defaultValue: false)
|
||||
@JsonKey(defaultValue: true)
|
||||
bool get isCompatible {
|
||||
return _isCompatible;
|
||||
}
|
||||
@@ -357,17 +305,18 @@ class Config extends ChangeNotifier {
|
||||
}
|
||||
}
|
||||
|
||||
update([Config? config, RecoveryOption recoveryOptions = RecoveryOption.all]) {
|
||||
update(
|
||||
[Config? config, RecoveryOption recoveryOptions = RecoveryOption.all]) {
|
||||
if (config != null) {
|
||||
_profiles = config._profiles;
|
||||
for (final profile in config._profiles) {
|
||||
_setProfile(profile);
|
||||
}
|
||||
final onlyProfiles = recoveryOptions == RecoveryOption.onlyProfiles;
|
||||
if(_currentProfileId == null && onlyProfiles && profiles.isNotEmpty){
|
||||
if (_currentProfileId == null && onlyProfiles && profiles.isNotEmpty) {
|
||||
_currentProfileId = _profiles.first.id;
|
||||
}
|
||||
if(onlyProfiles) return;
|
||||
if (onlyProfiles) return;
|
||||
_currentProfileId = config._currentProfileId;
|
||||
_isCompatible = config._isCompatible;
|
||||
_autoLaunch = config._autoLaunch;
|
||||
|
||||
@@ -75,3 +75,16 @@ class Process with _$Process {
|
||||
factory Process.fromJson(Map<String, Object?> json) =>
|
||||
_$ProcessFromJson(json);
|
||||
}
|
||||
|
||||
@freezed
|
||||
class ExternalProvider with _$ExternalProvider {
|
||||
const factory ExternalProvider({
|
||||
required String name,
|
||||
required String type,
|
||||
@JsonKey(name: "vehicle-type") required String vehicleType,
|
||||
@JsonKey(name: "update-at") required DateTime updateAt,
|
||||
}) = _ExternalProvider;
|
||||
|
||||
factory ExternalProvider.fromJson(Map<String, Object?> json) =>
|
||||
_$ExternalProviderFromJson(json);
|
||||
}
|
||||
|
||||
@@ -135,7 +135,7 @@ class _$TunImpl implements _Tun {
|
||||
const _$TunImpl(
|
||||
{this.enable = false,
|
||||
this.device = appName,
|
||||
this.stack = TunStack.gvisor,
|
||||
this.stack = TunStack.mixed,
|
||||
@JsonKey(name: "dns-hijack")
|
||||
final List<String> dnsHijack = const ["any:53"]})
|
||||
: _dnsHijack = dnsHijack;
|
||||
|
||||
@@ -79,7 +79,7 @@ _$TunImpl _$$TunImplFromJson(Map<String, dynamic> json) => _$TunImpl(
|
||||
enable: json['enable'] as bool? ?? false,
|
||||
device: json['device'] as String? ?? appName,
|
||||
stack: $enumDecodeNullable(_$TunStackEnumMap, json['stack']) ??
|
||||
TunStack.gvisor,
|
||||
TunStack.mixed,
|
||||
dnsHijack: (json['dns-hijack'] as List<dynamic>?)
|
||||
?.map((e) => e as String)
|
||||
.toList() ??
|
||||
|
||||
241
lib/models/generated/config.freezed.dart
Normal file
241
lib/models/generated/config.freezed.dart
Normal file
@@ -0,0 +1,241 @@
|
||||
// coverage:ignore-file
|
||||
// GENERATED CODE - DO NOT MODIFY BY HAND
|
||||
// ignore_for_file: type=lint
|
||||
// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
|
||||
|
||||
part of '../config.dart';
|
||||
|
||||
// **************************************************************************
|
||||
// FreezedGenerator
|
||||
// **************************************************************************
|
||||
|
||||
T _$identity<T>(T value) => value;
|
||||
|
||||
final _privateConstructorUsedError = UnsupportedError(
|
||||
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
|
||||
|
||||
AccessControl _$AccessControlFromJson(Map<String, dynamic> json) {
|
||||
return _AccessControl.fromJson(json);
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
mixin _$AccessControl {
|
||||
AccessControlMode get mode => throw _privateConstructorUsedError;
|
||||
List<String> get acceptList => throw _privateConstructorUsedError;
|
||||
List<String> get rejectList => throw _privateConstructorUsedError;
|
||||
bool get isFilterSystemApp => throw _privateConstructorUsedError;
|
||||
|
||||
Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
|
||||
@JsonKey(ignore: true)
|
||||
$AccessControlCopyWith<AccessControl> get copyWith =>
|
||||
throw _privateConstructorUsedError;
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
abstract class $AccessControlCopyWith<$Res> {
|
||||
factory $AccessControlCopyWith(
|
||||
AccessControl value, $Res Function(AccessControl) then) =
|
||||
_$AccessControlCopyWithImpl<$Res, AccessControl>;
|
||||
@useResult
|
||||
$Res call(
|
||||
{AccessControlMode mode,
|
||||
List<String> acceptList,
|
||||
List<String> rejectList,
|
||||
bool isFilterSystemApp});
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
class _$AccessControlCopyWithImpl<$Res, $Val extends AccessControl>
|
||||
implements $AccessControlCopyWith<$Res> {
|
||||
_$AccessControlCopyWithImpl(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? mode = null,
|
||||
Object? acceptList = null,
|
||||
Object? rejectList = null,
|
||||
Object? isFilterSystemApp = null,
|
||||
}) {
|
||||
return _then(_value.copyWith(
|
||||
mode: null == mode
|
||||
? _value.mode
|
||||
: mode // ignore: cast_nullable_to_non_nullable
|
||||
as AccessControlMode,
|
||||
acceptList: null == acceptList
|
||||
? _value.acceptList
|
||||
: acceptList // ignore: cast_nullable_to_non_nullable
|
||||
as List<String>,
|
||||
rejectList: null == rejectList
|
||||
? _value.rejectList
|
||||
: rejectList // ignore: cast_nullable_to_non_nullable
|
||||
as List<String>,
|
||||
isFilterSystemApp: null == isFilterSystemApp
|
||||
? _value.isFilterSystemApp
|
||||
: isFilterSystemApp // ignore: cast_nullable_to_non_nullable
|
||||
as bool,
|
||||
) as $Val);
|
||||
}
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
abstract class _$$AccessControlImplCopyWith<$Res>
|
||||
implements $AccessControlCopyWith<$Res> {
|
||||
factory _$$AccessControlImplCopyWith(
|
||||
_$AccessControlImpl value, $Res Function(_$AccessControlImpl) then) =
|
||||
__$$AccessControlImplCopyWithImpl<$Res>;
|
||||
@override
|
||||
@useResult
|
||||
$Res call(
|
||||
{AccessControlMode mode,
|
||||
List<String> acceptList,
|
||||
List<String> rejectList,
|
||||
bool isFilterSystemApp});
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
class __$$AccessControlImplCopyWithImpl<$Res>
|
||||
extends _$AccessControlCopyWithImpl<$Res, _$AccessControlImpl>
|
||||
implements _$$AccessControlImplCopyWith<$Res> {
|
||||
__$$AccessControlImplCopyWithImpl(
|
||||
_$AccessControlImpl _value, $Res Function(_$AccessControlImpl) _then)
|
||||
: super(_value, _then);
|
||||
|
||||
@pragma('vm:prefer-inline')
|
||||
@override
|
||||
$Res call({
|
||||
Object? mode = null,
|
||||
Object? acceptList = null,
|
||||
Object? rejectList = null,
|
||||
Object? isFilterSystemApp = null,
|
||||
}) {
|
||||
return _then(_$AccessControlImpl(
|
||||
mode: null == mode
|
||||
? _value.mode
|
||||
: mode // ignore: cast_nullable_to_non_nullable
|
||||
as AccessControlMode,
|
||||
acceptList: null == acceptList
|
||||
? _value._acceptList
|
||||
: acceptList // ignore: cast_nullable_to_non_nullable
|
||||
as List<String>,
|
||||
rejectList: null == rejectList
|
||||
? _value._rejectList
|
||||
: rejectList // ignore: cast_nullable_to_non_nullable
|
||||
as List<String>,
|
||||
isFilterSystemApp: null == isFilterSystemApp
|
||||
? _value.isFilterSystemApp
|
||||
: isFilterSystemApp // ignore: cast_nullable_to_non_nullable
|
||||
as bool,
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
@JsonSerializable()
|
||||
class _$AccessControlImpl implements _AccessControl {
|
||||
const _$AccessControlImpl(
|
||||
{this.mode = AccessControlMode.rejectSelected,
|
||||
final List<String> acceptList = const [],
|
||||
final List<String> rejectList = const [],
|
||||
this.isFilterSystemApp = true})
|
||||
: _acceptList = acceptList,
|
||||
_rejectList = rejectList;
|
||||
|
||||
factory _$AccessControlImpl.fromJson(Map<String, dynamic> json) =>
|
||||
_$$AccessControlImplFromJson(json);
|
||||
|
||||
@override
|
||||
@JsonKey()
|
||||
final AccessControlMode mode;
|
||||
final List<String> _acceptList;
|
||||
@override
|
||||
@JsonKey()
|
||||
List<String> get acceptList {
|
||||
if (_acceptList is EqualUnmodifiableListView) return _acceptList;
|
||||
// ignore: implicit_dynamic_type
|
||||
return EqualUnmodifiableListView(_acceptList);
|
||||
}
|
||||
|
||||
final List<String> _rejectList;
|
||||
@override
|
||||
@JsonKey()
|
||||
List<String> get rejectList {
|
||||
if (_rejectList is EqualUnmodifiableListView) return _rejectList;
|
||||
// ignore: implicit_dynamic_type
|
||||
return EqualUnmodifiableListView(_rejectList);
|
||||
}
|
||||
|
||||
@override
|
||||
@JsonKey()
|
||||
final bool isFilterSystemApp;
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
return 'AccessControl(mode: $mode, acceptList: $acceptList, rejectList: $rejectList, isFilterSystemApp: $isFilterSystemApp)';
|
||||
}
|
||||
|
||||
@override
|
||||
bool operator ==(Object other) {
|
||||
return identical(this, other) ||
|
||||
(other.runtimeType == runtimeType &&
|
||||
other is _$AccessControlImpl &&
|
||||
(identical(other.mode, mode) || other.mode == mode) &&
|
||||
const DeepCollectionEquality()
|
||||
.equals(other._acceptList, _acceptList) &&
|
||||
const DeepCollectionEquality()
|
||||
.equals(other._rejectList, _rejectList) &&
|
||||
(identical(other.isFilterSystemApp, isFilterSystemApp) ||
|
||||
other.isFilterSystemApp == isFilterSystemApp));
|
||||
}
|
||||
|
||||
@JsonKey(ignore: true)
|
||||
@override
|
||||
int get hashCode => Object.hash(
|
||||
runtimeType,
|
||||
mode,
|
||||
const DeepCollectionEquality().hash(_acceptList),
|
||||
const DeepCollectionEquality().hash(_rejectList),
|
||||
isFilterSystemApp);
|
||||
|
||||
@JsonKey(ignore: true)
|
||||
@override
|
||||
@pragma('vm:prefer-inline')
|
||||
_$$AccessControlImplCopyWith<_$AccessControlImpl> get copyWith =>
|
||||
__$$AccessControlImplCopyWithImpl<_$AccessControlImpl>(this, _$identity);
|
||||
|
||||
@override
|
||||
Map<String, dynamic> toJson() {
|
||||
return _$$AccessControlImplToJson(
|
||||
this,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
abstract class _AccessControl implements AccessControl {
|
||||
const factory _AccessControl(
|
||||
{final AccessControlMode mode,
|
||||
final List<String> acceptList,
|
||||
final List<String> rejectList,
|
||||
final bool isFilterSystemApp}) = _$AccessControlImpl;
|
||||
|
||||
factory _AccessControl.fromJson(Map<String, dynamic> json) =
|
||||
_$AccessControlImpl.fromJson;
|
||||
|
||||
@override
|
||||
AccessControlMode get mode;
|
||||
@override
|
||||
List<String> get acceptList;
|
||||
@override
|
||||
List<String> get rejectList;
|
||||
@override
|
||||
bool get isFilterSystemApp;
|
||||
@override
|
||||
@JsonKey(ignore: true)
|
||||
_$$AccessControlImplCopyWith<_$AccessControlImpl> get copyWith =>
|
||||
throw _privateConstructorUsedError;
|
||||
}
|
||||
@@ -6,34 +6,6 @@ part of '../config.dart';
|
||||
// JsonSerializableGenerator
|
||||
// **************************************************************************
|
||||
|
||||
AccessControl _$AccessControlFromJson(Map<String, dynamic> json) =>
|
||||
AccessControl(
|
||||
isFilterSystemApp: json['isFilterSystemApp'] as bool? ?? true,
|
||||
mode: $enumDecodeNullable(_$AccessControlModeEnumMap, json['mode']) ??
|
||||
AccessControlMode.rejectSelected,
|
||||
acceptList: (json['acceptList'] as List<dynamic>?)
|
||||
?.map((e) => e as String)
|
||||
.toList() ??
|
||||
const [],
|
||||
rejectList: (json['rejectList'] as List<dynamic>?)
|
||||
?.map((e) => e as String)
|
||||
.toList() ??
|
||||
const [],
|
||||
);
|
||||
|
||||
Map<String, dynamic> _$AccessControlToJson(AccessControl instance) =>
|
||||
<String, dynamic>{
|
||||
'mode': _$AccessControlModeEnumMap[instance.mode]!,
|
||||
'acceptList': instance.acceptList,
|
||||
'rejectList': instance.rejectList,
|
||||
'isFilterSystemApp': instance.isFilterSystemApp,
|
||||
};
|
||||
|
||||
const _$AccessControlModeEnumMap = {
|
||||
AccessControlMode.acceptSelected: 'acceptSelected',
|
||||
AccessControlMode.rejectSelected: 'rejectSelected',
|
||||
};
|
||||
|
||||
Config _$ConfigFromJson(Map<String, dynamic> json) => Config()
|
||||
..profiles = (json['profiles'] as List<dynamic>?)
|
||||
?.map((e) => Profile.fromJson(e as Map<String, dynamic>))
|
||||
@@ -59,7 +31,7 @@ Config _$ConfigFromJson(Map<String, dynamic> json) => Config()
|
||||
? null
|
||||
: DAV.fromJson(json['dav'] as Map<String, dynamic>)
|
||||
..isAnimateToPage = json['isAnimateToPage'] as bool? ?? true
|
||||
..isCompatible = json['isCompatible'] as bool? ?? false
|
||||
..isCompatible = json['isCompatible'] as bool? ?? true
|
||||
..autoCheckUpdate = json['autoCheckUpdate'] as bool? ?? true;
|
||||
|
||||
Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
|
||||
@@ -93,3 +65,31 @@ const _$ProxiesSortTypeEnumMap = {
|
||||
ProxiesSortType.delay: 'delay',
|
||||
ProxiesSortType.name: 'name',
|
||||
};
|
||||
|
||||
_$AccessControlImpl _$$AccessControlImplFromJson(Map<String, dynamic> json) =>
|
||||
_$AccessControlImpl(
|
||||
mode: $enumDecodeNullable(_$AccessControlModeEnumMap, json['mode']) ??
|
||||
AccessControlMode.rejectSelected,
|
||||
acceptList: (json['acceptList'] as List<dynamic>?)
|
||||
?.map((e) => e as String)
|
||||
.toList() ??
|
||||
const [],
|
||||
rejectList: (json['rejectList'] as List<dynamic>?)
|
||||
?.map((e) => e as String)
|
||||
.toList() ??
|
||||
const [],
|
||||
isFilterSystemApp: json['isFilterSystemApp'] as bool? ?? true,
|
||||
);
|
||||
|
||||
Map<String, dynamic> _$$AccessControlImplToJson(_$AccessControlImpl instance) =>
|
||||
<String, dynamic>{
|
||||
'mode': _$AccessControlModeEnumMap[instance.mode]!,
|
||||
'acceptList': instance.acceptList,
|
||||
'rejectList': instance.rejectList,
|
||||
'isFilterSystemApp': instance.isFilterSystemApp,
|
||||
};
|
||||
|
||||
const _$AccessControlModeEnumMap = {
|
||||
AccessControlMode.acceptSelected: 'acceptSelected',
|
||||
AccessControlMode.rejectSelected: 'rejectSelected',
|
||||
};
|
||||
|
||||
@@ -1029,3 +1029,214 @@ abstract class _Process implements Process {
|
||||
_$$ProcessImplCopyWith<_$ProcessImpl> get copyWith =>
|
||||
throw _privateConstructorUsedError;
|
||||
}
|
||||
|
||||
ExternalProvider _$ExternalProviderFromJson(Map<String, dynamic> json) {
|
||||
return _ExternalProvider.fromJson(json);
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
mixin _$ExternalProvider {
|
||||
String get name => throw _privateConstructorUsedError;
|
||||
String get type => throw _privateConstructorUsedError;
|
||||
@JsonKey(name: "vehicle-type")
|
||||
String get vehicleType => throw _privateConstructorUsedError;
|
||||
@JsonKey(name: "update-at")
|
||||
DateTime get updateAt => throw _privateConstructorUsedError;
|
||||
|
||||
Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
|
||||
@JsonKey(ignore: true)
|
||||
$ExternalProviderCopyWith<ExternalProvider> get copyWith =>
|
||||
throw _privateConstructorUsedError;
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
abstract class $ExternalProviderCopyWith<$Res> {
|
||||
factory $ExternalProviderCopyWith(
|
||||
ExternalProvider value, $Res Function(ExternalProvider) then) =
|
||||
_$ExternalProviderCopyWithImpl<$Res, ExternalProvider>;
|
||||
@useResult
|
||||
$Res call(
|
||||
{String name,
|
||||
String type,
|
||||
@JsonKey(name: "vehicle-type") String vehicleType,
|
||||
@JsonKey(name: "update-at") DateTime updateAt});
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
class _$ExternalProviderCopyWithImpl<$Res, $Val extends ExternalProvider>
|
||||
implements $ExternalProviderCopyWith<$Res> {
|
||||
_$ExternalProviderCopyWithImpl(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? type = null,
|
||||
Object? vehicleType = null,
|
||||
Object? updateAt = null,
|
||||
}) {
|
||||
return _then(_value.copyWith(
|
||||
name: null == name
|
||||
? _value.name
|
||||
: name // ignore: cast_nullable_to_non_nullable
|
||||
as String,
|
||||
type: null == type
|
||||
? _value.type
|
||||
: type // ignore: cast_nullable_to_non_nullable
|
||||
as String,
|
||||
vehicleType: null == vehicleType
|
||||
? _value.vehicleType
|
||||
: vehicleType // ignore: cast_nullable_to_non_nullable
|
||||
as String,
|
||||
updateAt: null == updateAt
|
||||
? _value.updateAt
|
||||
: updateAt // ignore: cast_nullable_to_non_nullable
|
||||
as DateTime,
|
||||
) as $Val);
|
||||
}
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
abstract class _$$ExternalProviderImplCopyWith<$Res>
|
||||
implements $ExternalProviderCopyWith<$Res> {
|
||||
factory _$$ExternalProviderImplCopyWith(_$ExternalProviderImpl value,
|
||||
$Res Function(_$ExternalProviderImpl) then) =
|
||||
__$$ExternalProviderImplCopyWithImpl<$Res>;
|
||||
@override
|
||||
@useResult
|
||||
$Res call(
|
||||
{String name,
|
||||
String type,
|
||||
@JsonKey(name: "vehicle-type") String vehicleType,
|
||||
@JsonKey(name: "update-at") DateTime updateAt});
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
class __$$ExternalProviderImplCopyWithImpl<$Res>
|
||||
extends _$ExternalProviderCopyWithImpl<$Res, _$ExternalProviderImpl>
|
||||
implements _$$ExternalProviderImplCopyWith<$Res> {
|
||||
__$$ExternalProviderImplCopyWithImpl(_$ExternalProviderImpl _value,
|
||||
$Res Function(_$ExternalProviderImpl) _then)
|
||||
: super(_value, _then);
|
||||
|
||||
@pragma('vm:prefer-inline')
|
||||
@override
|
||||
$Res call({
|
||||
Object? name = null,
|
||||
Object? type = null,
|
||||
Object? vehicleType = null,
|
||||
Object? updateAt = null,
|
||||
}) {
|
||||
return _then(_$ExternalProviderImpl(
|
||||
name: null == name
|
||||
? _value.name
|
||||
: name // ignore: cast_nullable_to_non_nullable
|
||||
as String,
|
||||
type: null == type
|
||||
? _value.type
|
||||
: type // ignore: cast_nullable_to_non_nullable
|
||||
as String,
|
||||
vehicleType: null == vehicleType
|
||||
? _value.vehicleType
|
||||
: vehicleType // ignore: cast_nullable_to_non_nullable
|
||||
as String,
|
||||
updateAt: null == updateAt
|
||||
? _value.updateAt
|
||||
: updateAt // ignore: cast_nullable_to_non_nullable
|
||||
as DateTime,
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
@JsonSerializable()
|
||||
class _$ExternalProviderImpl implements _ExternalProvider {
|
||||
const _$ExternalProviderImpl(
|
||||
{required this.name,
|
||||
required this.type,
|
||||
@JsonKey(name: "vehicle-type") required this.vehicleType,
|
||||
@JsonKey(name: "update-at") required this.updateAt});
|
||||
|
||||
factory _$ExternalProviderImpl.fromJson(Map<String, dynamic> json) =>
|
||||
_$$ExternalProviderImplFromJson(json);
|
||||
|
||||
@override
|
||||
final String name;
|
||||
@override
|
||||
final String type;
|
||||
@override
|
||||
@JsonKey(name: "vehicle-type")
|
||||
final String vehicleType;
|
||||
@override
|
||||
@JsonKey(name: "update-at")
|
||||
final DateTime updateAt;
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
return 'ExternalProvider(name: $name, type: $type, vehicleType: $vehicleType, updateAt: $updateAt)';
|
||||
}
|
||||
|
||||
@override
|
||||
bool operator ==(Object other) {
|
||||
return identical(this, other) ||
|
||||
(other.runtimeType == runtimeType &&
|
||||
other is _$ExternalProviderImpl &&
|
||||
(identical(other.name, name) || other.name == name) &&
|
||||
(identical(other.type, type) || other.type == type) &&
|
||||
(identical(other.vehicleType, vehicleType) ||
|
||||
other.vehicleType == vehicleType) &&
|
||||
(identical(other.updateAt, updateAt) ||
|
||||
other.updateAt == updateAt));
|
||||
}
|
||||
|
||||
@JsonKey(ignore: true)
|
||||
@override
|
||||
int get hashCode =>
|
||||
Object.hash(runtimeType, name, type, vehicleType, updateAt);
|
||||
|
||||
@JsonKey(ignore: true)
|
||||
@override
|
||||
@pragma('vm:prefer-inline')
|
||||
_$$ExternalProviderImplCopyWith<_$ExternalProviderImpl> get copyWith =>
|
||||
__$$ExternalProviderImplCopyWithImpl<_$ExternalProviderImpl>(
|
||||
this, _$identity);
|
||||
|
||||
@override
|
||||
Map<String, dynamic> toJson() {
|
||||
return _$$ExternalProviderImplToJson(
|
||||
this,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
abstract class _ExternalProvider implements ExternalProvider {
|
||||
const factory _ExternalProvider(
|
||||
{required final String name,
|
||||
required final String type,
|
||||
@JsonKey(name: "vehicle-type") required final String vehicleType,
|
||||
@JsonKey(name: "update-at") required final DateTime updateAt}) =
|
||||
_$ExternalProviderImpl;
|
||||
|
||||
factory _ExternalProvider.fromJson(Map<String, dynamic> json) =
|
||||
_$ExternalProviderImpl.fromJson;
|
||||
|
||||
@override
|
||||
String get name;
|
||||
@override
|
||||
String get type;
|
||||
@override
|
||||
@JsonKey(name: "vehicle-type")
|
||||
String get vehicleType;
|
||||
@override
|
||||
@JsonKey(name: "update-at")
|
||||
DateTime get updateAt;
|
||||
@override
|
||||
@JsonKey(ignore: true)
|
||||
_$$ExternalProviderImplCopyWith<_$ExternalProviderImpl> get copyWith =>
|
||||
throw _privateConstructorUsedError;
|
||||
}
|
||||
|
||||
@@ -94,3 +94,21 @@ Map<String, dynamic> _$$ProcessImplToJson(_$ProcessImpl instance) =>
|
||||
'source': instance.source,
|
||||
'target': instance.target,
|
||||
};
|
||||
|
||||
_$ExternalProviderImpl _$$ExternalProviderImplFromJson(
|
||||
Map<String, dynamic> json) =>
|
||||
_$ExternalProviderImpl(
|
||||
name: json['name'] as String,
|
||||
type: json['type'] as String,
|
||||
vehicleType: json['vehicle-type'] as String,
|
||||
updateAt: DateTime.parse(json['update-at'] as String),
|
||||
);
|
||||
|
||||
Map<String, dynamic> _$$ExternalProviderImplToJson(
|
||||
_$ExternalProviderImpl instance) =>
|
||||
<String, dynamic>{
|
||||
'name': instance.name,
|
||||
'type': instance.type,
|
||||
'vehicle-type': instance.vehicleType,
|
||||
'update-at': instance.updateAt.toIso8601String(),
|
||||
};
|
||||
|
||||
@@ -20,6 +20,7 @@ mixin _$NavigationItem {
|
||||
String get label => throw _privateConstructorUsedError;
|
||||
String? get description => throw _privateConstructorUsedError;
|
||||
Widget get fragment => throw _privateConstructorUsedError;
|
||||
bool get keep => throw _privateConstructorUsedError;
|
||||
String? get path => throw _privateConstructorUsedError;
|
||||
List<NavigationItemMode> get modes => throw _privateConstructorUsedError;
|
||||
|
||||
@@ -39,6 +40,7 @@ abstract class $NavigationItemCopyWith<$Res> {
|
||||
String label,
|
||||
String? description,
|
||||
Widget fragment,
|
||||
bool keep,
|
||||
String? path,
|
||||
List<NavigationItemMode> modes});
|
||||
}
|
||||
@@ -60,6 +62,7 @@ class _$NavigationItemCopyWithImpl<$Res, $Val extends NavigationItem>
|
||||
Object? label = null,
|
||||
Object? description = freezed,
|
||||
Object? fragment = null,
|
||||
Object? keep = null,
|
||||
Object? path = freezed,
|
||||
Object? modes = null,
|
||||
}) {
|
||||
@@ -80,6 +83,10 @@ class _$NavigationItemCopyWithImpl<$Res, $Val extends NavigationItem>
|
||||
? _value.fragment
|
||||
: fragment // ignore: cast_nullable_to_non_nullable
|
||||
as Widget,
|
||||
keep: null == keep
|
||||
? _value.keep
|
||||
: keep // ignore: cast_nullable_to_non_nullable
|
||||
as bool,
|
||||
path: freezed == path
|
||||
? _value.path
|
||||
: path // ignore: cast_nullable_to_non_nullable
|
||||
@@ -105,6 +112,7 @@ abstract class _$$NavigationItemImplCopyWith<$Res>
|
||||
String label,
|
||||
String? description,
|
||||
Widget fragment,
|
||||
bool keep,
|
||||
String? path,
|
||||
List<NavigationItemMode> modes});
|
||||
}
|
||||
@@ -124,6 +132,7 @@ class __$$NavigationItemImplCopyWithImpl<$Res>
|
||||
Object? label = null,
|
||||
Object? description = freezed,
|
||||
Object? fragment = null,
|
||||
Object? keep = null,
|
||||
Object? path = freezed,
|
||||
Object? modes = null,
|
||||
}) {
|
||||
@@ -144,6 +153,10 @@ class __$$NavigationItemImplCopyWithImpl<$Res>
|
||||
? _value.fragment
|
||||
: fragment // ignore: cast_nullable_to_non_nullable
|
||||
as Widget,
|
||||
keep: null == keep
|
||||
? _value.keep
|
||||
: keep // ignore: cast_nullable_to_non_nullable
|
||||
as bool,
|
||||
path: freezed == path
|
||||
? _value.path
|
||||
: path // ignore: cast_nullable_to_non_nullable
|
||||
@@ -164,6 +177,7 @@ class _$NavigationItemImpl implements _NavigationItem {
|
||||
required this.label,
|
||||
this.description,
|
||||
required this.fragment,
|
||||
this.keep = true,
|
||||
this.path,
|
||||
final List<NavigationItemMode> modes = const [
|
||||
NavigationItemMode.mobile,
|
||||
@@ -180,6 +194,9 @@ class _$NavigationItemImpl implements _NavigationItem {
|
||||
@override
|
||||
final Widget fragment;
|
||||
@override
|
||||
@JsonKey()
|
||||
final bool keep;
|
||||
@override
|
||||
final String? path;
|
||||
final List<NavigationItemMode> _modes;
|
||||
@override
|
||||
@@ -192,7 +209,7 @@ class _$NavigationItemImpl implements _NavigationItem {
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
return 'NavigationItem(icon: $icon, label: $label, description: $description, fragment: $fragment, path: $path, modes: $modes)';
|
||||
return 'NavigationItem(icon: $icon, label: $label, description: $description, fragment: $fragment, keep: $keep, path: $path, modes: $modes)';
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -206,13 +223,14 @@ class _$NavigationItemImpl implements _NavigationItem {
|
||||
other.description == description) &&
|
||||
(identical(other.fragment, fragment) ||
|
||||
other.fragment == fragment) &&
|
||||
(identical(other.keep, keep) || other.keep == keep) &&
|
||||
(identical(other.path, path) || other.path == path) &&
|
||||
const DeepCollectionEquality().equals(other._modes, _modes));
|
||||
}
|
||||
|
||||
@override
|
||||
int get hashCode => Object.hash(runtimeType, icon, label, description,
|
||||
fragment, path, const DeepCollectionEquality().hash(_modes));
|
||||
fragment, keep, path, const DeepCollectionEquality().hash(_modes));
|
||||
|
||||
@JsonKey(ignore: true)
|
||||
@override
|
||||
@@ -228,6 +246,7 @@ abstract class _NavigationItem implements NavigationItem {
|
||||
required final String label,
|
||||
final String? description,
|
||||
required final Widget fragment,
|
||||
final bool keep,
|
||||
final String? path,
|
||||
final List<NavigationItemMode> modes}) = _$NavigationItemImpl;
|
||||
|
||||
@@ -240,6 +259,8 @@ abstract class _NavigationItem implements NavigationItem {
|
||||
@override
|
||||
Widget get fragment;
|
||||
@override
|
||||
bool get keep;
|
||||
@override
|
||||
String? get path;
|
||||
@override
|
||||
List<NavigationItemMode> get modes;
|
||||
|
||||
@@ -157,34 +157,30 @@ abstract class _StartButtonSelectorState implements StartButtonSelectorState {
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
mixin _$UpdateCurrentDelaySelectorState {
|
||||
String? get currentProxyName => throw _privateConstructorUsedError;
|
||||
bool get isCurrent => throw _privateConstructorUsedError;
|
||||
int? get delay => throw _privateConstructorUsedError;
|
||||
mixin _$CheckIpSelectorState {
|
||||
bool get isInit => throw _privateConstructorUsedError;
|
||||
bool get isStart => throw _privateConstructorUsedError;
|
||||
Map<String, String> get selectedMap => throw _privateConstructorUsedError;
|
||||
|
||||
@JsonKey(ignore: true)
|
||||
$UpdateCurrentDelaySelectorStateCopyWith<UpdateCurrentDelaySelectorState>
|
||||
get copyWith => throw _privateConstructorUsedError;
|
||||
$CheckIpSelectorStateCopyWith<CheckIpSelectorState> get copyWith =>
|
||||
throw _privateConstructorUsedError;
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
abstract class $UpdateCurrentDelaySelectorStateCopyWith<$Res> {
|
||||
factory $UpdateCurrentDelaySelectorStateCopyWith(
|
||||
UpdateCurrentDelaySelectorState value,
|
||||
$Res Function(UpdateCurrentDelaySelectorState) then) =
|
||||
_$UpdateCurrentDelaySelectorStateCopyWithImpl<$Res,
|
||||
UpdateCurrentDelaySelectorState>;
|
||||
abstract class $CheckIpSelectorStateCopyWith<$Res> {
|
||||
factory $CheckIpSelectorStateCopyWith(CheckIpSelectorState value,
|
||||
$Res Function(CheckIpSelectorState) then) =
|
||||
_$CheckIpSelectorStateCopyWithImpl<$Res, CheckIpSelectorState>;
|
||||
@useResult
|
||||
$Res call(
|
||||
{String? currentProxyName, bool isCurrent, int? delay, bool isInit});
|
||||
$Res call({bool isInit, bool isStart, Map<String, String> selectedMap});
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
class _$UpdateCurrentDelaySelectorStateCopyWithImpl<$Res,
|
||||
$Val extends UpdateCurrentDelaySelectorState>
|
||||
implements $UpdateCurrentDelaySelectorStateCopyWith<$Res> {
|
||||
_$UpdateCurrentDelaySelectorStateCopyWithImpl(this._value, this._then);
|
||||
class _$CheckIpSelectorStateCopyWithImpl<$Res,
|
||||
$Val extends CheckIpSelectorState>
|
||||
implements $CheckIpSelectorStateCopyWith<$Res> {
|
||||
_$CheckIpSelectorStateCopyWithImpl(this._value, this._then);
|
||||
|
||||
// ignore: unused_field
|
||||
final $Val _value;
|
||||
@@ -194,154 +190,136 @@ class _$UpdateCurrentDelaySelectorStateCopyWithImpl<$Res,
|
||||
@pragma('vm:prefer-inline')
|
||||
@override
|
||||
$Res call({
|
||||
Object? currentProxyName = freezed,
|
||||
Object? isCurrent = null,
|
||||
Object? delay = freezed,
|
||||
Object? isInit = null,
|
||||
Object? isStart = null,
|
||||
Object? selectedMap = null,
|
||||
}) {
|
||||
return _then(_value.copyWith(
|
||||
currentProxyName: freezed == currentProxyName
|
||||
? _value.currentProxyName
|
||||
: currentProxyName // ignore: cast_nullable_to_non_nullable
|
||||
as String?,
|
||||
isCurrent: null == isCurrent
|
||||
? _value.isCurrent
|
||||
: isCurrent // ignore: cast_nullable_to_non_nullable
|
||||
as bool,
|
||||
delay: freezed == delay
|
||||
? _value.delay
|
||||
: delay // ignore: cast_nullable_to_non_nullable
|
||||
as int?,
|
||||
isInit: null == isInit
|
||||
? _value.isInit
|
||||
: isInit // ignore: cast_nullable_to_non_nullable
|
||||
as bool,
|
||||
isStart: null == isStart
|
||||
? _value.isStart
|
||||
: isStart // ignore: cast_nullable_to_non_nullable
|
||||
as bool,
|
||||
selectedMap: null == selectedMap
|
||||
? _value.selectedMap
|
||||
: selectedMap // ignore: cast_nullable_to_non_nullable
|
||||
as Map<String, String>,
|
||||
) as $Val);
|
||||
}
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
abstract class _$$UpdateCurrentDelaySelectorStateImplCopyWith<$Res>
|
||||
implements $UpdateCurrentDelaySelectorStateCopyWith<$Res> {
|
||||
factory _$$UpdateCurrentDelaySelectorStateImplCopyWith(
|
||||
_$UpdateCurrentDelaySelectorStateImpl value,
|
||||
$Res Function(_$UpdateCurrentDelaySelectorStateImpl) then) =
|
||||
__$$UpdateCurrentDelaySelectorStateImplCopyWithImpl<$Res>;
|
||||
abstract class _$$CheckIpSelectorStateImplCopyWith<$Res>
|
||||
implements $CheckIpSelectorStateCopyWith<$Res> {
|
||||
factory _$$CheckIpSelectorStateImplCopyWith(_$CheckIpSelectorStateImpl value,
|
||||
$Res Function(_$CheckIpSelectorStateImpl) then) =
|
||||
__$$CheckIpSelectorStateImplCopyWithImpl<$Res>;
|
||||
@override
|
||||
@useResult
|
||||
$Res call(
|
||||
{String? currentProxyName, bool isCurrent, int? delay, bool isInit});
|
||||
$Res call({bool isInit, bool isStart, Map<String, String> selectedMap});
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
class __$$UpdateCurrentDelaySelectorStateImplCopyWithImpl<$Res>
|
||||
extends _$UpdateCurrentDelaySelectorStateCopyWithImpl<$Res,
|
||||
_$UpdateCurrentDelaySelectorStateImpl>
|
||||
implements _$$UpdateCurrentDelaySelectorStateImplCopyWith<$Res> {
|
||||
__$$UpdateCurrentDelaySelectorStateImplCopyWithImpl(
|
||||
_$UpdateCurrentDelaySelectorStateImpl _value,
|
||||
$Res Function(_$UpdateCurrentDelaySelectorStateImpl) _then)
|
||||
class __$$CheckIpSelectorStateImplCopyWithImpl<$Res>
|
||||
extends _$CheckIpSelectorStateCopyWithImpl<$Res, _$CheckIpSelectorStateImpl>
|
||||
implements _$$CheckIpSelectorStateImplCopyWith<$Res> {
|
||||
__$$CheckIpSelectorStateImplCopyWithImpl(_$CheckIpSelectorStateImpl _value,
|
||||
$Res Function(_$CheckIpSelectorStateImpl) _then)
|
||||
: super(_value, _then);
|
||||
|
||||
@pragma('vm:prefer-inline')
|
||||
@override
|
||||
$Res call({
|
||||
Object? currentProxyName = freezed,
|
||||
Object? isCurrent = null,
|
||||
Object? delay = freezed,
|
||||
Object? isInit = null,
|
||||
Object? isStart = null,
|
||||
Object? selectedMap = null,
|
||||
}) {
|
||||
return _then(_$UpdateCurrentDelaySelectorStateImpl(
|
||||
currentProxyName: freezed == currentProxyName
|
||||
? _value.currentProxyName
|
||||
: currentProxyName // ignore: cast_nullable_to_non_nullable
|
||||
as String?,
|
||||
isCurrent: null == isCurrent
|
||||
? _value.isCurrent
|
||||
: isCurrent // ignore: cast_nullable_to_non_nullable
|
||||
as bool,
|
||||
delay: freezed == delay
|
||||
? _value.delay
|
||||
: delay // ignore: cast_nullable_to_non_nullable
|
||||
as int?,
|
||||
return _then(_$CheckIpSelectorStateImpl(
|
||||
isInit: null == isInit
|
||||
? _value.isInit
|
||||
: isInit // ignore: cast_nullable_to_non_nullable
|
||||
as bool,
|
||||
isStart: null == isStart
|
||||
? _value.isStart
|
||||
: isStart // ignore: cast_nullable_to_non_nullable
|
||||
as bool,
|
||||
selectedMap: null == selectedMap
|
||||
? _value._selectedMap
|
||||
: selectedMap // ignore: cast_nullable_to_non_nullable
|
||||
as Map<String, String>,
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
|
||||
class _$UpdateCurrentDelaySelectorStateImpl
|
||||
implements _UpdateCurrentDelaySelectorState {
|
||||
const _$UpdateCurrentDelaySelectorStateImpl(
|
||||
{required this.currentProxyName,
|
||||
required this.isCurrent,
|
||||
required this.delay,
|
||||
required this.isInit});
|
||||
class _$CheckIpSelectorStateImpl implements _CheckIpSelectorState {
|
||||
const _$CheckIpSelectorStateImpl(
|
||||
{required this.isInit,
|
||||
required this.isStart,
|
||||
required final Map<String, String> selectedMap})
|
||||
: _selectedMap = selectedMap;
|
||||
|
||||
@override
|
||||
final String? currentProxyName;
|
||||
@override
|
||||
final bool isCurrent;
|
||||
@override
|
||||
final int? delay;
|
||||
@override
|
||||
final bool isInit;
|
||||
@override
|
||||
final bool isStart;
|
||||
final Map<String, String> _selectedMap;
|
||||
@override
|
||||
Map<String, String> get selectedMap {
|
||||
if (_selectedMap is EqualUnmodifiableMapView) return _selectedMap;
|
||||
// ignore: implicit_dynamic_type
|
||||
return EqualUnmodifiableMapView(_selectedMap);
|
||||
}
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
return 'UpdateCurrentDelaySelectorState(currentProxyName: $currentProxyName, isCurrent: $isCurrent, delay: $delay, isInit: $isInit)';
|
||||
return 'CheckIpSelectorState(isInit: $isInit, isStart: $isStart, selectedMap: $selectedMap)';
|
||||
}
|
||||
|
||||
@override
|
||||
bool operator ==(Object other) {
|
||||
return identical(this, other) ||
|
||||
(other.runtimeType == runtimeType &&
|
||||
other is _$UpdateCurrentDelaySelectorStateImpl &&
|
||||
(identical(other.currentProxyName, currentProxyName) ||
|
||||
other.currentProxyName == currentProxyName) &&
|
||||
(identical(other.isCurrent, isCurrent) ||
|
||||
other.isCurrent == isCurrent) &&
|
||||
(identical(other.delay, delay) || other.delay == delay) &&
|
||||
(identical(other.isInit, isInit) || other.isInit == isInit));
|
||||
other is _$CheckIpSelectorStateImpl &&
|
||||
(identical(other.isInit, isInit) || other.isInit == isInit) &&
|
||||
(identical(other.isStart, isStart) || other.isStart == isStart) &&
|
||||
const DeepCollectionEquality()
|
||||
.equals(other._selectedMap, _selectedMap));
|
||||
}
|
||||
|
||||
@override
|
||||
int get hashCode =>
|
||||
Object.hash(runtimeType, currentProxyName, isCurrent, delay, isInit);
|
||||
int get hashCode => Object.hash(runtimeType, isInit, isStart,
|
||||
const DeepCollectionEquality().hash(_selectedMap));
|
||||
|
||||
@JsonKey(ignore: true)
|
||||
@override
|
||||
@pragma('vm:prefer-inline')
|
||||
_$$UpdateCurrentDelaySelectorStateImplCopyWith<
|
||||
_$UpdateCurrentDelaySelectorStateImpl>
|
||||
get copyWith => __$$UpdateCurrentDelaySelectorStateImplCopyWithImpl<
|
||||
_$UpdateCurrentDelaySelectorStateImpl>(this, _$identity);
|
||||
_$$CheckIpSelectorStateImplCopyWith<_$CheckIpSelectorStateImpl>
|
||||
get copyWith =>
|
||||
__$$CheckIpSelectorStateImplCopyWithImpl<_$CheckIpSelectorStateImpl>(
|
||||
this, _$identity);
|
||||
}
|
||||
|
||||
abstract class _UpdateCurrentDelaySelectorState
|
||||
implements UpdateCurrentDelaySelectorState {
|
||||
const factory _UpdateCurrentDelaySelectorState(
|
||||
{required final String? currentProxyName,
|
||||
required final bool isCurrent,
|
||||
required final int? delay,
|
||||
required final bool isInit}) = _$UpdateCurrentDelaySelectorStateImpl;
|
||||
abstract class _CheckIpSelectorState implements CheckIpSelectorState {
|
||||
const factory _CheckIpSelectorState(
|
||||
{required final bool isInit,
|
||||
required final bool isStart,
|
||||
required final Map<String, String> selectedMap}) =
|
||||
_$CheckIpSelectorStateImpl;
|
||||
|
||||
@override
|
||||
String? get currentProxyName;
|
||||
@override
|
||||
bool get isCurrent;
|
||||
@override
|
||||
int? get delay;
|
||||
@override
|
||||
bool get isInit;
|
||||
@override
|
||||
bool get isStart;
|
||||
@override
|
||||
Map<String, String> get selectedMap;
|
||||
@override
|
||||
@JsonKey(ignore: true)
|
||||
_$$UpdateCurrentDelaySelectorStateImplCopyWith<
|
||||
_$UpdateCurrentDelaySelectorStateImpl>
|
||||
_$$CheckIpSelectorStateImplCopyWith<_$CheckIpSelectorStateImpl>
|
||||
get copyWith => throw _privateConstructorUsedError;
|
||||
}
|
||||
|
||||
@@ -667,155 +645,6 @@ abstract class _ProfilesSelectorState implements ProfilesSelectorState {
|
||||
get copyWith => throw _privateConstructorUsedError;
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
mixin _$PackageListSelectorState {
|
||||
AccessControl get accessControl => throw _privateConstructorUsedError;
|
||||
List<Package> get packages => throw _privateConstructorUsedError;
|
||||
|
||||
@JsonKey(ignore: true)
|
||||
$PackageListSelectorStateCopyWith<PackageListSelectorState> get copyWith =>
|
||||
throw _privateConstructorUsedError;
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
abstract class $PackageListSelectorStateCopyWith<$Res> {
|
||||
factory $PackageListSelectorStateCopyWith(PackageListSelectorState value,
|
||||
$Res Function(PackageListSelectorState) then) =
|
||||
_$PackageListSelectorStateCopyWithImpl<$Res, PackageListSelectorState>;
|
||||
@useResult
|
||||
$Res call({AccessControl accessControl, List<Package> packages});
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
class _$PackageListSelectorStateCopyWithImpl<$Res,
|
||||
$Val extends PackageListSelectorState>
|
||||
implements $PackageListSelectorStateCopyWith<$Res> {
|
||||
_$PackageListSelectorStateCopyWithImpl(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? accessControl = null,
|
||||
Object? packages = null,
|
||||
}) {
|
||||
return _then(_value.copyWith(
|
||||
accessControl: null == accessControl
|
||||
? _value.accessControl
|
||||
: accessControl // ignore: cast_nullable_to_non_nullable
|
||||
as AccessControl,
|
||||
packages: null == packages
|
||||
? _value.packages
|
||||
: packages // ignore: cast_nullable_to_non_nullable
|
||||
as List<Package>,
|
||||
) as $Val);
|
||||
}
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
abstract class _$$PackageListSelectorStateImplCopyWith<$Res>
|
||||
implements $PackageListSelectorStateCopyWith<$Res> {
|
||||
factory _$$PackageListSelectorStateImplCopyWith(
|
||||
_$PackageListSelectorStateImpl value,
|
||||
$Res Function(_$PackageListSelectorStateImpl) then) =
|
||||
__$$PackageListSelectorStateImplCopyWithImpl<$Res>;
|
||||
@override
|
||||
@useResult
|
||||
$Res call({AccessControl accessControl, List<Package> packages});
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
class __$$PackageListSelectorStateImplCopyWithImpl<$Res>
|
||||
extends _$PackageListSelectorStateCopyWithImpl<$Res,
|
||||
_$PackageListSelectorStateImpl>
|
||||
implements _$$PackageListSelectorStateImplCopyWith<$Res> {
|
||||
__$$PackageListSelectorStateImplCopyWithImpl(
|
||||
_$PackageListSelectorStateImpl _value,
|
||||
$Res Function(_$PackageListSelectorStateImpl) _then)
|
||||
: super(_value, _then);
|
||||
|
||||
@pragma('vm:prefer-inline')
|
||||
@override
|
||||
$Res call({
|
||||
Object? accessControl = null,
|
||||
Object? packages = null,
|
||||
}) {
|
||||
return _then(_$PackageListSelectorStateImpl(
|
||||
accessControl: null == accessControl
|
||||
? _value.accessControl
|
||||
: accessControl // ignore: cast_nullable_to_non_nullable
|
||||
as AccessControl,
|
||||
packages: null == packages
|
||||
? _value._packages
|
||||
: packages // ignore: cast_nullable_to_non_nullable
|
||||
as List<Package>,
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
|
||||
class _$PackageListSelectorStateImpl implements _PackageListSelectorState {
|
||||
const _$PackageListSelectorStateImpl(
|
||||
{required this.accessControl, required final List<Package> packages})
|
||||
: _packages = packages;
|
||||
|
||||
@override
|
||||
final AccessControl accessControl;
|
||||
final List<Package> _packages;
|
||||
@override
|
||||
List<Package> get packages {
|
||||
if (_packages is EqualUnmodifiableListView) return _packages;
|
||||
// ignore: implicit_dynamic_type
|
||||
return EqualUnmodifiableListView(_packages);
|
||||
}
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
return 'PackageListSelectorState(accessControl: $accessControl, packages: $packages)';
|
||||
}
|
||||
|
||||
@override
|
||||
bool operator ==(Object other) {
|
||||
return identical(this, other) ||
|
||||
(other.runtimeType == runtimeType &&
|
||||
other is _$PackageListSelectorStateImpl &&
|
||||
(identical(other.accessControl, accessControl) ||
|
||||
other.accessControl == accessControl) &&
|
||||
const DeepCollectionEquality().equals(other._packages, _packages));
|
||||
}
|
||||
|
||||
@override
|
||||
int get hashCode => Object.hash(runtimeType, accessControl,
|
||||
const DeepCollectionEquality().hash(_packages));
|
||||
|
||||
@JsonKey(ignore: true)
|
||||
@override
|
||||
@pragma('vm:prefer-inline')
|
||||
_$$PackageListSelectorStateImplCopyWith<_$PackageListSelectorStateImpl>
|
||||
get copyWith => __$$PackageListSelectorStateImplCopyWithImpl<
|
||||
_$PackageListSelectorStateImpl>(this, _$identity);
|
||||
}
|
||||
|
||||
abstract class _PackageListSelectorState implements PackageListSelectorState {
|
||||
const factory _PackageListSelectorState(
|
||||
{required final AccessControl accessControl,
|
||||
required final List<Package> packages}) = _$PackageListSelectorStateImpl;
|
||||
|
||||
@override
|
||||
AccessControl get accessControl;
|
||||
@override
|
||||
List<Package> get packages;
|
||||
@override
|
||||
@JsonKey(ignore: true)
|
||||
_$$PackageListSelectorStateImplCopyWith<_$PackageListSelectorStateImpl>
|
||||
get copyWith => throw _privateConstructorUsedError;
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
mixin _$ApplicationSelectorState {
|
||||
String? get locale => throw _privateConstructorUsedError;
|
||||
@@ -2219,3 +2048,159 @@ abstract class _MoreToolsSelectorState implements MoreToolsSelectorState {
|
||||
_$$MoreToolsSelectorStateImplCopyWith<_$MoreToolsSelectorStateImpl>
|
||||
get copyWith => throw _privateConstructorUsedError;
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
mixin _$PackageListSelectorState {
|
||||
AccessControl get accessControl => throw _privateConstructorUsedError;
|
||||
bool get isAccessControl => throw _privateConstructorUsedError;
|
||||
|
||||
@JsonKey(ignore: true)
|
||||
$PackageListSelectorStateCopyWith<PackageListSelectorState> get copyWith =>
|
||||
throw _privateConstructorUsedError;
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
abstract class $PackageListSelectorStateCopyWith<$Res> {
|
||||
factory $PackageListSelectorStateCopyWith(PackageListSelectorState value,
|
||||
$Res Function(PackageListSelectorState) then) =
|
||||
_$PackageListSelectorStateCopyWithImpl<$Res, PackageListSelectorState>;
|
||||
@useResult
|
||||
$Res call({AccessControl accessControl, bool isAccessControl});
|
||||
|
||||
$AccessControlCopyWith<$Res> get accessControl;
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
class _$PackageListSelectorStateCopyWithImpl<$Res,
|
||||
$Val extends PackageListSelectorState>
|
||||
implements $PackageListSelectorStateCopyWith<$Res> {
|
||||
_$PackageListSelectorStateCopyWithImpl(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? accessControl = null,
|
||||
Object? isAccessControl = null,
|
||||
}) {
|
||||
return _then(_value.copyWith(
|
||||
accessControl: null == accessControl
|
||||
? _value.accessControl
|
||||
: accessControl // ignore: cast_nullable_to_non_nullable
|
||||
as AccessControl,
|
||||
isAccessControl: null == isAccessControl
|
||||
? _value.isAccessControl
|
||||
: isAccessControl // ignore: cast_nullable_to_non_nullable
|
||||
as bool,
|
||||
) as $Val);
|
||||
}
|
||||
|
||||
@override
|
||||
@pragma('vm:prefer-inline')
|
||||
$AccessControlCopyWith<$Res> get accessControl {
|
||||
return $AccessControlCopyWith<$Res>(_value.accessControl, (value) {
|
||||
return _then(_value.copyWith(accessControl: value) as $Val);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
abstract class _$$PackageListSelectorStateImplCopyWith<$Res>
|
||||
implements $PackageListSelectorStateCopyWith<$Res> {
|
||||
factory _$$PackageListSelectorStateImplCopyWith(
|
||||
_$PackageListSelectorStateImpl value,
|
||||
$Res Function(_$PackageListSelectorStateImpl) then) =
|
||||
__$$PackageListSelectorStateImplCopyWithImpl<$Res>;
|
||||
@override
|
||||
@useResult
|
||||
$Res call({AccessControl accessControl, bool isAccessControl});
|
||||
|
||||
@override
|
||||
$AccessControlCopyWith<$Res> get accessControl;
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
class __$$PackageListSelectorStateImplCopyWithImpl<$Res>
|
||||
extends _$PackageListSelectorStateCopyWithImpl<$Res,
|
||||
_$PackageListSelectorStateImpl>
|
||||
implements _$$PackageListSelectorStateImplCopyWith<$Res> {
|
||||
__$$PackageListSelectorStateImplCopyWithImpl(
|
||||
_$PackageListSelectorStateImpl _value,
|
||||
$Res Function(_$PackageListSelectorStateImpl) _then)
|
||||
: super(_value, _then);
|
||||
|
||||
@pragma('vm:prefer-inline')
|
||||
@override
|
||||
$Res call({
|
||||
Object? accessControl = null,
|
||||
Object? isAccessControl = null,
|
||||
}) {
|
||||
return _then(_$PackageListSelectorStateImpl(
|
||||
accessControl: null == accessControl
|
||||
? _value.accessControl
|
||||
: accessControl // ignore: cast_nullable_to_non_nullable
|
||||
as AccessControl,
|
||||
isAccessControl: null == isAccessControl
|
||||
? _value.isAccessControl
|
||||
: isAccessControl // ignore: cast_nullable_to_non_nullable
|
||||
as bool,
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
|
||||
class _$PackageListSelectorStateImpl implements _PackageListSelectorState {
|
||||
const _$PackageListSelectorStateImpl(
|
||||
{required this.accessControl, required this.isAccessControl});
|
||||
|
||||
@override
|
||||
final AccessControl accessControl;
|
||||
@override
|
||||
final bool isAccessControl;
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
return 'PackageListSelectorState(accessControl: $accessControl, isAccessControl: $isAccessControl)';
|
||||
}
|
||||
|
||||
@override
|
||||
bool operator ==(Object other) {
|
||||
return identical(this, other) ||
|
||||
(other.runtimeType == runtimeType &&
|
||||
other is _$PackageListSelectorStateImpl &&
|
||||
(identical(other.accessControl, accessControl) ||
|
||||
other.accessControl == accessControl) &&
|
||||
(identical(other.isAccessControl, isAccessControl) ||
|
||||
other.isAccessControl == isAccessControl));
|
||||
}
|
||||
|
||||
@override
|
||||
int get hashCode => Object.hash(runtimeType, accessControl, isAccessControl);
|
||||
|
||||
@JsonKey(ignore: true)
|
||||
@override
|
||||
@pragma('vm:prefer-inline')
|
||||
_$$PackageListSelectorStateImplCopyWith<_$PackageListSelectorStateImpl>
|
||||
get copyWith => __$$PackageListSelectorStateImplCopyWithImpl<
|
||||
_$PackageListSelectorStateImpl>(this, _$identity);
|
||||
}
|
||||
|
||||
abstract class _PackageListSelectorState implements PackageListSelectorState {
|
||||
const factory _PackageListSelectorState(
|
||||
{required final AccessControl accessControl,
|
||||
required final bool isAccessControl}) = _$PackageListSelectorStateImpl;
|
||||
|
||||
@override
|
||||
AccessControl get accessControl;
|
||||
@override
|
||||
bool get isAccessControl;
|
||||
@override
|
||||
@JsonKey(ignore: true)
|
||||
_$$PackageListSelectorStateImplCopyWith<_$PackageListSelectorStateImpl>
|
||||
get copyWith => throw _privateConstructorUsedError;
|
||||
}
|
||||
|
||||
70
lib/models/ip.dart
Normal file
70
lib/models/ip.dart
Normal file
@@ -0,0 +1,70 @@
|
||||
class IpInfo {
|
||||
final String ip;
|
||||
final String countryCode;
|
||||
|
||||
const IpInfo({
|
||||
required this.ip,
|
||||
required this.countryCode,
|
||||
});
|
||||
|
||||
static IpInfo fromIpInfoIoJson(Map<String, dynamic> json) {
|
||||
return switch (json) {
|
||||
{
|
||||
"ip": final String ip,
|
||||
"country": final String country,
|
||||
} =>
|
||||
IpInfo(
|
||||
ip: ip,
|
||||
countryCode: country,
|
||||
),
|
||||
_ => throw const FormatException("invalid json"),
|
||||
};
|
||||
}
|
||||
|
||||
static IpInfo fromIpApiCoJson(Map<String, dynamic> json) {
|
||||
return switch (json) {
|
||||
{
|
||||
"ip": final String ip,
|
||||
"country_code": final String countryCode,
|
||||
} =>
|
||||
IpInfo(
|
||||
ip: ip,
|
||||
countryCode: countryCode,
|
||||
),
|
||||
_ => throw const FormatException("invalid json"),
|
||||
};
|
||||
}
|
||||
|
||||
static IpInfo fromIpSbJson(Map<String, dynamic> json) {
|
||||
return switch (json) {
|
||||
{
|
||||
"ip": final String ip,
|
||||
"country_code": final String countryCode,
|
||||
} =>
|
||||
IpInfo(
|
||||
ip: ip,
|
||||
countryCode: countryCode,
|
||||
),
|
||||
_ => throw const FormatException("invalid json"),
|
||||
};
|
||||
}
|
||||
|
||||
static IpInfo fromIpwhoIsJson(Map<String, dynamic> json) {
|
||||
return switch (json) {
|
||||
{
|
||||
"ip": final String ip,
|
||||
"country_code": final String countryCode,
|
||||
} =>
|
||||
IpInfo(
|
||||
ip: ip,
|
||||
countryCode: countryCode,
|
||||
),
|
||||
_ => throw const FormatException("invalid json"),
|
||||
};
|
||||
}
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
return 'IpInfo{ip: $ip, countryCode: $countryCode}';
|
||||
}
|
||||
}
|
||||
@@ -9,8 +9,8 @@ export 'log.dart';
|
||||
export 'system_color_scheme.dart';
|
||||
export 'connection.dart';
|
||||
export 'package.dart';
|
||||
export 'common.dart';
|
||||
export 'ffi.dart';
|
||||
export 'selector.dart';
|
||||
export 'navigation.dart';
|
||||
export 'dav.dart';
|
||||
export 'dav.dart';
|
||||
export 'ip.dart';
|
||||
@@ -11,6 +11,7 @@ class NavigationItem with _$NavigationItem {
|
||||
required String label,
|
||||
final String? description,
|
||||
required Widget fragment,
|
||||
@Default(true) bool keep,
|
||||
String? path,
|
||||
@Default([NavigationItemMode.mobile, NavigationItemMode.desktop])
|
||||
List<NavigationItemMode> modes,
|
||||
|
||||
@@ -5,11 +5,8 @@ import 'dart:typed_data';
|
||||
import 'package:fl_clash/clash/core.dart';
|
||||
import 'package:fl_clash/enum/enum.dart';
|
||||
import 'package:fl_clash/common/common.dart';
|
||||
import 'package:fl_clash/models/models.dart';
|
||||
import 'package:json_annotation/json_annotation.dart';
|
||||
|
||||
import 'common.dart';
|
||||
|
||||
part 'generated/profile.g.dart';
|
||||
|
||||
typedef SelectedMap = Map<String, String>;
|
||||
@@ -83,44 +80,28 @@ class Profile {
|
||||
Duration? autoUpdateDuration,
|
||||
this.autoUpdate = true,
|
||||
}) : id = id ?? DateTime.now().millisecondsSinceEpoch.toString(),
|
||||
autoUpdateDuration =
|
||||
autoUpdateDuration ?? defaultUpdateDuration,
|
||||
autoUpdateDuration = autoUpdateDuration ?? defaultUpdateDuration,
|
||||
selectedMap = selectedMap ?? {};
|
||||
|
||||
ProfileType get type => url == null ? ProfileType.file : ProfileType.url;
|
||||
|
||||
Future<Result<bool>> checkAndUpdate() async {
|
||||
Future<void> checkAndUpdate() async {
|
||||
final isExists = await check();
|
||||
if(!isExists){
|
||||
if(url != null){
|
||||
if (!isExists) {
|
||||
if (url != null) {
|
||||
return await update();
|
||||
}
|
||||
return Result.error();
|
||||
}
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
Future<Result<bool>> update() async {
|
||||
if (url == null) {
|
||||
return Result.error(
|
||||
appLocalizations.unableToUpdateCurrentProfileDesc,
|
||||
);
|
||||
}
|
||||
final responseResult = await Request.getFileResponseForUrl(url!);
|
||||
final response = responseResult.data;
|
||||
if (responseResult.type != ResultType.success || response == null) {
|
||||
return Result.error(responseResult.message);
|
||||
}
|
||||
final disposition = response.headers['content-disposition'];
|
||||
Future<void> update() async {
|
||||
final response = await request.getFileResponseForUrl(url!);
|
||||
final disposition = response.headers.value("content-disposition");
|
||||
label ??= other.getFileNameForDisposition(disposition) ?? id;
|
||||
final userinfo = response.headers['subscription-userinfo'];
|
||||
final userinfo = response.headers.value('subscription-userinfo');
|
||||
userInfo = UserInfo.formHString(userinfo);
|
||||
final saveResult = await saveFile(response.bodyBytes);
|
||||
if (saveResult.type == ResultType.error) {
|
||||
return Result.error(saveResult.message);
|
||||
}
|
||||
await saveFile(response.data);
|
||||
lastUpdateDate = DateTime.now();
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
Future<bool> check() async {
|
||||
@@ -128,10 +109,10 @@ class Profile {
|
||||
return await File(profilePath!).exists();
|
||||
}
|
||||
|
||||
Future<Result<void>> saveFile(Uint8List bytes) async {
|
||||
final isValidate = clashCore.validateConfig(utf8.decode(bytes));
|
||||
if (!isValidate) {
|
||||
return Result.error(appLocalizations.profileParseErrorDesc);
|
||||
Future<void> saveFile(Uint8List bytes) async {
|
||||
final message = await clashCore.validateConfig(utf8.decode(bytes));
|
||||
if (message.isNotEmpty) {
|
||||
throw message;
|
||||
}
|
||||
final path = await appPath.getProfilePath(id);
|
||||
final file = File(path!);
|
||||
@@ -141,7 +122,6 @@ class Profile {
|
||||
}
|
||||
await file.writeAsBytes(bytes);
|
||||
lastUpdateDate = DateTime.now();
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
import 'package:fl_clash/enum/enum.dart';
|
||||
import 'package:fl_clash/models/models.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:freezed_annotation/freezed_annotation.dart';
|
||||
import 'config.dart';
|
||||
import 'navigation.dart';
|
||||
import 'package.dart';
|
||||
import 'profile.dart';
|
||||
import 'proxy.dart';
|
||||
|
||||
part 'generated/selector.freezed.dart';
|
||||
|
||||
@@ -18,13 +14,12 @@ class StartButtonSelectorState with _$StartButtonSelectorState {
|
||||
}
|
||||
|
||||
@freezed
|
||||
class UpdateCurrentDelaySelectorState with _$UpdateCurrentDelaySelectorState {
|
||||
const factory UpdateCurrentDelaySelectorState({
|
||||
required String? currentProxyName,
|
||||
required bool isCurrent,
|
||||
required int? delay,
|
||||
class CheckIpSelectorState with _$CheckIpSelectorState {
|
||||
const factory CheckIpSelectorState({
|
||||
required bool isInit,
|
||||
}) = _UpdateCurrentDelaySelectorState;
|
||||
required bool isStart,
|
||||
required SelectedMap selectedMap,
|
||||
}) = _CheckIpSelectorState;
|
||||
}
|
||||
|
||||
@freezed
|
||||
@@ -44,14 +39,6 @@ class ProfilesSelectorState with _$ProfilesSelectorState {
|
||||
}) = _ProfilesSelectorState;
|
||||
}
|
||||
|
||||
@freezed
|
||||
class PackageListSelectorState with _$PackageListSelectorState {
|
||||
const factory PackageListSelectorState({
|
||||
required AccessControl accessControl,
|
||||
required List<Package> packages,
|
||||
}) = _PackageListSelectorState;
|
||||
}
|
||||
|
||||
@freezed
|
||||
class ApplicationSelectorState with _$ApplicationSelectorState {
|
||||
const factory ApplicationSelectorState({
|
||||
@@ -62,24 +49,23 @@ class ApplicationSelectorState with _$ApplicationSelectorState {
|
||||
}
|
||||
|
||||
@freezed
|
||||
class TrayContainerSelectorState with _$TrayContainerSelectorState{
|
||||
class TrayContainerSelectorState with _$TrayContainerSelectorState {
|
||||
const factory TrayContainerSelectorState({
|
||||
required Mode mode,
|
||||
required bool autoLaunch,
|
||||
required bool isRun,
|
||||
required String? locale,
|
||||
})=_TrayContainerSelectorState;
|
||||
}) = _TrayContainerSelectorState;
|
||||
}
|
||||
|
||||
@freezed
|
||||
class UpdateNavigationsSelector with _$UpdateNavigationsSelector{
|
||||
class UpdateNavigationsSelector with _$UpdateNavigationsSelector {
|
||||
const factory UpdateNavigationsSelector({
|
||||
required bool openLogs,
|
||||
required bool hasProxies,
|
||||
}) = _UpdateNavigationsSelector;
|
||||
}
|
||||
|
||||
|
||||
@freezed
|
||||
class HomeSelectorState with _$HomeSelectorState {
|
||||
const factory HomeSelectorState({
|
||||
@@ -98,21 +84,21 @@ class HomeBodySelectorState with _$HomeBodySelectorState {
|
||||
}
|
||||
|
||||
@freezed
|
||||
class ProxiesCardSelectorState with _$ProxiesCardSelectorState{
|
||||
class ProxiesCardSelectorState with _$ProxiesCardSelectorState {
|
||||
const factory ProxiesCardSelectorState({
|
||||
required bool isSelected,
|
||||
}) = _ProxiesCardSelectorState;
|
||||
}
|
||||
|
||||
@freezed
|
||||
class ProxiesSelectorState with _$ProxiesSelectorState{
|
||||
class ProxiesSelectorState with _$ProxiesSelectorState {
|
||||
const factory ProxiesSelectorState({
|
||||
required List<String> groupNames,
|
||||
}) = _ProxiesSelectorState;
|
||||
}
|
||||
|
||||
@freezed
|
||||
class ProxiesTabViewSelectorState with _$ProxiesTabViewSelectorState{
|
||||
class ProxiesTabViewSelectorState with _$ProxiesTabViewSelectorState {
|
||||
const factory ProxiesTabViewSelectorState({
|
||||
required ProxiesSortType proxiesSortType,
|
||||
required num sortNum,
|
||||
@@ -126,4 +112,12 @@ class MoreToolsSelectorState with _$MoreToolsSelectorState {
|
||||
const factory MoreToolsSelectorState({
|
||||
required List<NavigationItem> navigationItems,
|
||||
}) = _MoreToolsSelectorState;
|
||||
}
|
||||
}
|
||||
|
||||
@freezed
|
||||
class PackageListSelectorState with _$PackageListSelectorState {
|
||||
const factory PackageListSelectorState({
|
||||
required AccessControl accessControl,
|
||||
required bool isAccessControl,
|
||||
}) = _PackageListSelectorState;
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import 'package:fl_clash/common/common.dart';
|
||||
import 'package:fl_clash/models/models.dart';
|
||||
import 'package:fl_clash/state.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
@@ -56,54 +57,65 @@ class HomePage extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return PopContainer(
|
||||
child: Selector2<AppState, Config, HomeSelectorState>(
|
||||
selector: (_, appState, config) => HomeSelectorState(
|
||||
currentLabel: appState.currentLabel,
|
||||
navigationItems: appState.currentNavigationItems,
|
||||
viewMode: appState.viewMode,
|
||||
locale: config.locale,
|
||||
),
|
||||
builder: (_, state, child) {
|
||||
final viewMode = state.viewMode;
|
||||
final navigationItems = state.navigationItems;
|
||||
final currentLabel = state.currentLabel;
|
||||
final index = navigationItems.lastIndexWhere(
|
||||
(element) => element.label == currentLabel,
|
||||
);
|
||||
final currentIndex = index == -1 ? 0 : index;
|
||||
final navigationBar = _getNavigationBar(
|
||||
viewMode: viewMode,
|
||||
navigationItems: navigationItems,
|
||||
currentIndex: currentIndex,
|
||||
);
|
||||
final bottomNavigationBar =
|
||||
viewMode == ViewMode.mobile ? navigationBar : null;
|
||||
Widget body;
|
||||
if (viewMode != ViewMode.mobile) {
|
||||
body = Row(
|
||||
children: [
|
||||
navigationBar,
|
||||
Expanded(
|
||||
flex: 1,
|
||||
child: child!,
|
||||
)
|
||||
],
|
||||
);
|
||||
} else {
|
||||
body = child!;
|
||||
child: LayoutBuilder(
|
||||
builder: (_, container) {
|
||||
final appController = globalState.appController;
|
||||
final maxWidth = container.maxWidth;
|
||||
if (appController.appState.viewWidth != maxWidth) {
|
||||
globalState.appController.updateViewWidth(maxWidth);
|
||||
}
|
||||
return CommonScaffold(
|
||||
key: globalState.homeScaffoldKey,
|
||||
title: Intl.message(
|
||||
currentLabel,
|
||||
return Selector2<AppState, Config, HomeSelectorState>(
|
||||
selector: (_, appState, config) {
|
||||
return HomeSelectorState(
|
||||
currentLabel: appState.currentLabel,
|
||||
navigationItems: appState.currentNavigationItems,
|
||||
viewMode: other.getViewMode(maxWidth),
|
||||
locale: config.locale,
|
||||
);
|
||||
},
|
||||
builder: (_, state, child) {
|
||||
final viewMode = state.viewMode;
|
||||
final navigationItems = state.navigationItems;
|
||||
final currentLabel = state.currentLabel;
|
||||
final index = navigationItems.lastIndexWhere(
|
||||
(element) => element.label == currentLabel,
|
||||
);
|
||||
final currentIndex = index == -1 ? 0 : index;
|
||||
final navigationBar = _getNavigationBar(
|
||||
viewMode: viewMode,
|
||||
navigationItems: navigationItems,
|
||||
currentIndex: currentIndex,
|
||||
);
|
||||
final bottomNavigationBar =
|
||||
viewMode == ViewMode.mobile ? navigationBar : null;
|
||||
Widget body;
|
||||
if (viewMode != ViewMode.mobile) {
|
||||
body = Row(
|
||||
children: [
|
||||
navigationBar,
|
||||
Expanded(
|
||||
flex: 1,
|
||||
child: child!,
|
||||
)
|
||||
],
|
||||
);
|
||||
} else {
|
||||
body = child!;
|
||||
}
|
||||
return CommonScaffold(
|
||||
key: globalState.homeScaffoldKey,
|
||||
title: Intl.message(
|
||||
currentLabel,
|
||||
),
|
||||
body: body,
|
||||
bottomNavigationBar: bottomNavigationBar,
|
||||
);
|
||||
},
|
||||
child: const HomeBody(
|
||||
key: Key("home_boy"),
|
||||
),
|
||||
body: body,
|
||||
bottomNavigationBar: bottomNavigationBar,
|
||||
);
|
||||
},
|
||||
child: const HomeBody(
|
||||
key: Key("home_boy"),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -120,7 +132,7 @@ class HomeBody extends StatelessWidget {
|
||||
final currentIndex = index == -1 ? 0 : index;
|
||||
if (globalState.pageController != null) {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
globalState.appController.toPage(currentIndex);
|
||||
globalState.appController.toPage(currentIndex, hasAnimate: true);
|
||||
});
|
||||
} else {
|
||||
globalState.pageController = PageController(
|
||||
@@ -146,6 +158,7 @@ class HomeBody extends StatelessWidget {
|
||||
itemBuilder: (_, index) {
|
||||
final navigationItem = navigationItems[index];
|
||||
return KeepContainer(
|
||||
keep: navigationItem.keep,
|
||||
key: Key(navigationItem.label),
|
||||
child: navigationItem.fragment,
|
||||
);
|
||||
|
||||
@@ -70,7 +70,7 @@ class Proxy extends ProxyPlatform {
|
||||
});
|
||||
}
|
||||
|
||||
bool get isStart => startTime != null && startTime!.isBeforeNow();
|
||||
bool get isStart => startTime != null && startTime!.isBeforeNow;
|
||||
|
||||
startAfterHook(int? fd) {
|
||||
if (!isStart && fd != null) {
|
||||
|
||||
@@ -13,7 +13,6 @@ import 'common/common.dart';
|
||||
|
||||
class GlobalState {
|
||||
Timer? timer;
|
||||
Function? healthcheckLockDebounce;
|
||||
Timer? groupsUpdateTimer;
|
||||
Function? updateCurrentDelayDebounce;
|
||||
PageController? pageController;
|
||||
@@ -22,7 +21,6 @@ class GlobalState {
|
||||
late AppController appController;
|
||||
GlobalKey<CommonScaffoldState> homeScaffoldKey = GlobalKey();
|
||||
List<Function> updateFunctionLists = [];
|
||||
bool healthcheckLock = false;
|
||||
|
||||
startListenUpdate() {
|
||||
if (timer != null && timer!.isActive == true) return;
|
||||
@@ -38,7 +36,7 @@ class GlobalState {
|
||||
timer?.cancel();
|
||||
}
|
||||
|
||||
Future<String> updateClashConfig({
|
||||
Future<void> updateClashConfig({
|
||||
required ClashConfig clashConfig,
|
||||
required Config config,
|
||||
bool isPatch = true,
|
||||
@@ -46,12 +44,13 @@ class GlobalState {
|
||||
final profilePath = await appPath.getProfilePath(config.currentProfileId);
|
||||
await config.currentProfile?.checkAndUpdate();
|
||||
debugPrint("update config");
|
||||
return clashCore.updateConfig(UpdateConfigParams(
|
||||
final res = await clashCore.updateConfig(UpdateConfigParams(
|
||||
profilePath: profilePath,
|
||||
config: clashConfig,
|
||||
isPatch: isPatch,
|
||||
isCompatible: config.isCompatible,
|
||||
));
|
||||
if (res.isNotEmpty) throw res;
|
||||
}
|
||||
|
||||
updateCoreVersionInfo(AppState appState) {
|
||||
@@ -76,17 +75,16 @@ class GlobalState {
|
||||
stopListenUpdate();
|
||||
}
|
||||
|
||||
applyProfile({
|
||||
Future<void> applyProfile({
|
||||
required AppState appState,
|
||||
required Config config,
|
||||
required ClashConfig clashConfig,
|
||||
}) async {
|
||||
final res = await updateClashConfig(
|
||||
await updateClashConfig(
|
||||
clashConfig: clashConfig,
|
||||
config: config,
|
||||
isPatch: false,
|
||||
);
|
||||
if (res.isNotEmpty) return Result.error(res);
|
||||
await updateGroups(appState);
|
||||
changeProxy(
|
||||
appState: appState,
|
||||
@@ -121,19 +119,17 @@ class GlobalState {
|
||||
required Config config,
|
||||
required ClashConfig clashConfig,
|
||||
}) {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (config.profiles.isEmpty) {
|
||||
stopSystemProxy();
|
||||
return;
|
||||
}
|
||||
config.currentSelectedMap.forEach((key, value) {
|
||||
clashCore.changeProxy(
|
||||
ChangeProxyParams(
|
||||
groupName: key,
|
||||
proxyName: value,
|
||||
),
|
||||
);
|
||||
});
|
||||
if (config.profiles.isEmpty) {
|
||||
stopSystemProxy();
|
||||
return;
|
||||
}
|
||||
config.currentSelectedMap.forEach((key, value) {
|
||||
clashCore.changeProxy(
|
||||
ChangeProxyParams(
|
||||
groupName: key,
|
||||
proxyName: value,
|
||||
),
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -167,9 +163,7 @@ class GlobalState {
|
||||
title: Text(title),
|
||||
content: Container(
|
||||
width: 300,
|
||||
constraints: const BoxConstraints(
|
||||
maxHeight: 200
|
||||
),
|
||||
constraints: const BoxConstraints(maxHeight: 200),
|
||||
child: SingleChildScrollView(
|
||||
child: RichText(
|
||||
overflow: TextOverflow.visible,
|
||||
@@ -257,18 +251,22 @@ class GlobalState {
|
||||
);
|
||||
}
|
||||
|
||||
void updateCurrentDelay(
|
||||
String? proxyName,
|
||||
) {
|
||||
updateCurrentDelayDebounce ??= debounce<Function(String?)>((proxyName) {
|
||||
if (proxyName != null) {
|
||||
debugPrint("[delay]=====> $proxyName");
|
||||
clashCore.delay(
|
||||
proxyName,
|
||||
);
|
||||
}
|
||||
});
|
||||
updateCurrentDelayDebounce!([proxyName]);
|
||||
Future<T?> safeRun<T>(
|
||||
FutureOr<T> Function() futureFunction, {
|
||||
String? title,
|
||||
}) async {
|
||||
try {
|
||||
final res = await futureFunction();
|
||||
return res;
|
||||
} catch (e) {
|
||||
showMessage(
|
||||
title: title ?? appLocalizations.tip,
|
||||
message: TextSpan(
|
||||
text: e.toString(),
|
||||
),
|
||||
);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -38,16 +38,8 @@ class _ClashMessageContainerState extends State<ClashMessageContainer>
|
||||
|
||||
@override
|
||||
void onDelay(Delay delay) {
|
||||
globalState.healthcheckLock = true;
|
||||
final appController = globalState.appController;
|
||||
appController.setDelay(delay);
|
||||
globalState.healthcheckLockDebounce ??= debounce<Function()>(
|
||||
() async {
|
||||
globalState.healthcheckLock = false;
|
||||
},
|
||||
milliseconds: 5000,
|
||||
);
|
||||
globalState.healthcheckLockDebounce!();
|
||||
super.onDelay(delay);
|
||||
}
|
||||
|
||||
|
||||
@@ -2,8 +2,13 @@ import 'package:flutter/material.dart';
|
||||
|
||||
class KeepContainer extends StatefulWidget {
|
||||
final Widget child;
|
||||
final bool keep;
|
||||
|
||||
const KeepContainer({super.key, required this.child});
|
||||
const KeepContainer({
|
||||
super.key,
|
||||
required this.child,
|
||||
this.keep = true,
|
||||
});
|
||||
|
||||
@override
|
||||
State<KeepContainer> createState() => _KeepContainerState();
|
||||
@@ -11,7 +16,6 @@ class KeepContainer extends StatefulWidget {
|
||||
|
||||
class _KeepContainerState extends State<KeepContainer>
|
||||
with AutomaticKeepAliveClientMixin {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
super.build(context);
|
||||
@@ -19,5 +23,5 @@ class _KeepContainerState extends State<KeepContainer>
|
||||
}
|
||||
|
||||
@override
|
||||
bool get wantKeepAlive => true;
|
||||
bool get wantKeepAlive => widget.keep;
|
||||
}
|
||||
|
||||
@@ -27,11 +27,6 @@ class _WindowContainerState extends State<WindowContainer>
|
||||
windowManager.addListener(this);
|
||||
}
|
||||
|
||||
@override
|
||||
void onWindowResize() {
|
||||
globalState.appController.updateViewWidth();
|
||||
}
|
||||
|
||||
@override
|
||||
void onWindowClose() async {
|
||||
await globalState.appController.handleBackOrExit();
|
||||
|
||||
44
pubspec.lock
44
pubspec.lock
@@ -193,6 +193,14 @@ packages:
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "3.1.1"
|
||||
country_flags:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: country_flags
|
||||
sha256: dbc4f76e7c801619b2d841023e0327191ba00663f1f1b4770394e9bc6632c444
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "2.2.0"
|
||||
cross_file:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -218,7 +226,7 @@ packages:
|
||||
source: hosted
|
||||
version: "2.3.6"
|
||||
dio:
|
||||
dependency: transitive
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: dio
|
||||
sha256: "11e40df547d418cc0c4900a9318b26304e665da6fa4755399a9ff9efd09034b5"
|
||||
@@ -269,10 +277,10 @@ packages:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: file_picker
|
||||
sha256: "1bbf65dd997458a08b531042ec3794112a6c39c07c37ff22113d2e7e4f81d4e4"
|
||||
sha256: "29c90806ac5f5fb896547720b73b17ee9aed9bba540dc5d91fe29f8c5745b10a"
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "6.2.1"
|
||||
version: "8.0.3"
|
||||
file_selector_linux:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -398,7 +406,7 @@ packages:
|
||||
source: hosted
|
||||
version: "2.1.0"
|
||||
http:
|
||||
dependency: "direct main"
|
||||
dependency: transitive
|
||||
description:
|
||||
name: http
|
||||
sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
|
||||
@@ -433,10 +441,10 @@ packages:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: image_picker
|
||||
sha256: "33974eca2e87e8b4e3727f1b94fa3abcb25afe80b6bc2c4d449a0e150aedf720"
|
||||
sha256: "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a"
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "1.1.1"
|
||||
version: "1.1.2"
|
||||
image_picker_android:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -509,6 +517,22 @@ packages:
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "1.0.4"
|
||||
jovial_misc:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: jovial_misc
|
||||
sha256: f6e64f789ee311025bb367be9c9afe9759f76dd8209070b7f38e735b5f529eb1
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "0.8.5"
|
||||
jovial_svg:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: jovial_svg
|
||||
sha256: "000cafe183bdeba28f76d65bf93fc9b636d6f7eaa7e2a33e80c4345a28866ea8"
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "1.1.21"
|
||||
js:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -741,6 +765,14 @@ packages:
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "2.1.8"
|
||||
pointycastle:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: pointycastle
|
||||
sha256: "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe"
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "3.9.1"
|
||||
pool:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
||||
11
pubspec.yaml
11
pubspec.yaml
@@ -1,7 +1,7 @@
|
||||
name: fl_clash
|
||||
description: A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.
|
||||
publish_to: 'none'
|
||||
version: 0.8.7
|
||||
version: 0.8.15
|
||||
environment:
|
||||
sdk: '>=3.1.0 <4.0.0'
|
||||
|
||||
@@ -23,8 +23,7 @@ dependencies:
|
||||
launch_at_startup: ^0.2.2
|
||||
windows_single_instance: ^1.0.1
|
||||
json_annotation: ^4.9.0
|
||||
http: ^1.2.0
|
||||
file_picker: ^6.1.1
|
||||
file_picker: ^8.0.3
|
||||
mobile_scanner: 5.0.1
|
||||
app_links: ^3.5.0
|
||||
win32_registry: ^1.1.2
|
||||
@@ -34,10 +33,12 @@ dependencies:
|
||||
package_info_plus: ^7.0.0
|
||||
url_launcher: ^6.2.6
|
||||
freezed_annotation: ^2.4.1
|
||||
image_picker: ^1.1.1
|
||||
image_picker: ^1.1.2
|
||||
zxing2: ^0.2.3
|
||||
image: ^4.1.7
|
||||
webdav_client: ^1.2.2
|
||||
dio: ^5.4.3+1
|
||||
country_flags: ^2.2.0
|
||||
dev_dependencies:
|
||||
flutter_test:
|
||||
sdk: flutter
|
||||
@@ -51,7 +52,7 @@ dev_dependencies:
|
||||
flutter:
|
||||
uses-material-design: true
|
||||
assets:
|
||||
- assets/data/geoip.metadb
|
||||
- assets/data/
|
||||
- assets/images/
|
||||
ffigen:
|
||||
name: "ClashFFI"
|
||||
|
||||
Reference in New Issue
Block a user