Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
442c32b6eb | ||
|
|
949a2aaac3 | ||
|
|
c77463f337 | ||
|
|
00377d6070 | ||
|
|
f393b4b3e9 | ||
|
|
75e6cfde15 | ||
|
|
7bfe5617d9 | ||
|
|
97cc96c243 | ||
|
|
1821ee2f61 |
@@ -82,7 +82,7 @@ func updateConfig(s *C.char) bool {
|
||||
|
||||
//export getProxies
|
||||
func getProxies() *C.char {
|
||||
data, err := json.Marshal(tunnel.ProxiesWithProviders())
|
||||
data, err := json.Marshal(tunnel.Proxies())
|
||||
if err != nil {
|
||||
return C.CString("")
|
||||
}
|
||||
@@ -98,7 +98,7 @@ func changeProxy(s *C.char) bool {
|
||||
log.Infoln("Unmarshal ChangeProxyParams %v", err)
|
||||
return false
|
||||
}
|
||||
proxies := tunnel.ProxiesWithProviders()
|
||||
proxies := tunnel.Proxies()
|
||||
proxy := proxies[*params.GroupName]
|
||||
if proxy == nil {
|
||||
return false
|
||||
@@ -148,7 +148,7 @@ func asyncTestDelay(s *C.char) {
|
||||
ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*time.Duration(params.Timeout))
|
||||
defer cancel()
|
||||
|
||||
proxies := tunnel.ProxiesWithProviders()
|
||||
proxies := tunnel.Proxies()
|
||||
proxy := proxies[params.ProxyName]
|
||||
|
||||
delayData := &Delay{
|
||||
@@ -235,6 +235,7 @@ func getProviders() *C.char {
|
||||
return C.CString(string(data))
|
||||
}
|
||||
|
||||
|
||||
//export getProvider
|
||||
func getProvider(name *C.char) *C.char {
|
||||
providerName := C.GoString(name)
|
||||
|
||||
@@ -74,12 +74,15 @@ class ClashCore {
|
||||
final proxiesRawString = proxiesRaw.cast<Utf8>().toDartString();
|
||||
return Isolate.run<List<Group>>(() {
|
||||
final proxies = json.decode(proxiesRawString);
|
||||
final groupNames =
|
||||
(proxies[UsedProxy.GLOBAL.name]["all"] as List).where((e) {
|
||||
final groupsRaw = (proxies[UsedProxy.GLOBAL.name]["all"] as List)
|
||||
.where((e) {
|
||||
final proxy = proxies[e];
|
||||
return GroupTypeExtension.valueList.contains(proxy['type']);
|
||||
});
|
||||
final groupsRaw = [UsedProxy.GLOBAL.name, ...groupNames].map((groupName) {
|
||||
final excludeName = !UsedProxyExtension.valueList
|
||||
.where((element) => element != UsedProxy.GLOBAL.name)
|
||||
.contains(proxy['name']);
|
||||
final validType = GroupTypeExtension.valueList.contains(proxy['type']);
|
||||
return excludeName && validType;
|
||||
}).map((groupName) {
|
||||
final group = proxies[groupName];
|
||||
group["all"] = ((group["all"] ?? []) as List)
|
||||
.map(
|
||||
|
||||
@@ -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.7.5
|
||||
version: 0.7.2
|
||||
environment:
|
||||
sdk: '>=3.1.0 <4.0.0'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user