Compare commits
49 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
513ee9ff7a | ||
|
|
ddad3e40b9 | ||
|
|
eb9c3232ec | ||
|
|
e8c9c619bf | ||
|
|
17cd0cf1ed | ||
|
|
925c331498 | ||
|
|
0512d692f2 | ||
|
|
844ce8ffb0 | ||
|
|
d2588596df | ||
|
|
0e999e3deb | ||
|
|
8109bbf46c | ||
|
|
32ea45e5ea | ||
|
|
ecce17ad75 | ||
|
|
96738090cf | ||
|
|
4a8ea37142 | ||
|
|
a5fdb90da5 | ||
|
|
f9722cc761 | ||
|
|
f01fb2ed1d | ||
|
|
74f4481071 | ||
|
|
9018f512ae | ||
|
|
265fc4a701 | ||
|
|
755974fc9e | ||
|
|
ba8eab4fc9 | ||
|
|
f5cb46710f | ||
|
|
6483e80416 | ||
|
|
535e6dc3a5 | ||
|
|
ad86c20cfb | ||
|
|
665330e17a | ||
|
|
0eb001e717 | ||
|
|
a563991d74 | ||
|
|
3e2a30008c | ||
|
|
ff68d573d6 | ||
|
|
3223fca7ba | ||
|
|
006f9127fc | ||
|
|
a2709e155c | ||
|
|
684fa7b58e | ||
|
|
03b4da54b5 | ||
|
|
a904b55d11 | ||
|
|
d711935e2e | ||
|
|
98b1496eff | ||
|
|
442c32b6eb | ||
|
|
949a2aaac3 | ||
|
|
c77463f337 | ||
|
|
00377d6070 | ||
|
|
f393b4b3e9 | ||
|
|
75e6cfde15 | ||
|
|
7bfe5617d9 | ||
|
|
97cc96c243 | ||
|
|
1821ee2f61 |
@@ -34,8 +34,6 @@ on Mobile:
|
||||
|
||||
💡 Based on Material You Design, [Surfboard](https://github.com/getsurfboard/surfboard)-like UI
|
||||
|
||||
☁️ Supports data sync via WebDAV
|
||||
|
||||
✨ Support subscription link, Dark mode
|
||||
|
||||
## Contact
|
||||
|
||||
@@ -34,8 +34,6 @@ on Mobile:
|
||||
|
||||
💡 基本 Material You 设计, 类[Surfboard](https://github.com/getsurfboard/surfboard)用户界面
|
||||
|
||||
☁️ 支持通过WebDAV同步数据
|
||||
|
||||
✨ 支持一键导入订阅, 深色模式
|
||||
|
||||
## Contact
|
||||
|
||||
@@ -237,7 +237,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 {
|
||||
|
||||
0
lib/common/ip.dart
Normal file
0
lib/common/ip.dart
Normal file
@@ -3,6 +3,7 @@ import 'dart:io';
|
||||
import 'package:dio/dio.dart';
|
||||
import 'package:dio/io.dart';
|
||||
import 'package:fl_clash/common/common.dart';
|
||||
import 'package:fl_clash/models/ip.dart';
|
||||
import 'package:fl_clash/state.dart';
|
||||
|
||||
class Request {
|
||||
@@ -26,7 +27,7 @@ class Request {
|
||||
));
|
||||
}
|
||||
|
||||
_syncProxy(){
|
||||
_syncProxy() {
|
||||
final port = globalState.appController.clashConfig.mixedPort;
|
||||
if (_port != port) {
|
||||
_port = port;
|
||||
@@ -45,14 +46,14 @@ class Request {
|
||||
Future<Response> getFileResponseForUrl(String url) async {
|
||||
final response = await _dio
|
||||
.get(
|
||||
url,
|
||||
options: Options(
|
||||
responseType: ResponseType.bytes,
|
||||
),
|
||||
)
|
||||
url,
|
||||
options: Options(
|
||||
responseType: ResponseType.bytes,
|
||||
),
|
||||
)
|
||||
.timeout(
|
||||
httpTimeoutDuration,
|
||||
);
|
||||
httpTimeoutDuration,
|
||||
);
|
||||
return response;
|
||||
}
|
||||
|
||||
@@ -73,6 +74,29 @@ class Request {
|
||||
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;
|
||||
}
|
||||
}
|
||||
throw "无法检索ip";
|
||||
}
|
||||
}
|
||||
|
||||
final request = Request();
|
||||
|
||||
65
lib/models/ip.dart
Normal file
65
lib/models/ip.dart
Normal file
@@ -0,0 +1,65 @@
|
||||
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"),
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -12,4 +12,5 @@ export 'package.dart';
|
||||
export 'ffi.dart';
|
||||
export 'selector.dart';
|
||||
export 'navigation.dart';
|
||||
export 'dav.dart';
|
||||
export 'dav.dart';
|
||||
export 'ip.dart';
|
||||
@@ -121,19 +121,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,
|
||||
),
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -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.9
|
||||
version: 0.8.11
|
||||
environment:
|
||||
sdk: '>=3.1.0 <4.0.0'
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
// ignore_for_file: avoid_print
|
||||
|
||||
void main() async {
|
||||
String input = """
|
||||
您
|
||||
|
||||
Reference in New Issue
Block a user