diff --git a/lib/network/components/request_rewrite_manager.dart b/lib/network/components/request_rewrite_manager.dart index a413b87..350c519 100644 --- a/lib/network/components/request_rewrite_manager.dart +++ b/lib/network/components/request_rewrite_manager.dart @@ -285,6 +285,7 @@ class RequestRewrites { } var rewriteItems = await getRewriteItems(rewriteRule); rewriteItems.where((item) => item.enabled).forEach((item) => _replaceResponse(response, item)); + logger.d('rewrite response $response'); } //替换相应 diff --git a/lib/network/handler.dart b/lib/network/handler.dart index c9f059f..f155a13 100644 --- a/lib/network/handler.dart +++ b/lib/network/handler.dart @@ -222,7 +222,7 @@ class HttpResponseProxyHandler extends ChannelHandler { } //重写响应 - requestRewrites?.responseRewrite(msg.request?.requestUrl, msg); + await requestRewrites?.responseRewrite(msg.request?.requestUrl, msg); listener?.onResponse(clientChannel, msg); //发送给客户端 diff --git a/lib/ui/content/body.dart b/lib/ui/content/body.dart index 9f4984f..4885927 100644 --- a/lib/ui/content/body.dart +++ b/lib/ui/content/body.dart @@ -14,6 +14,7 @@ import 'package:network_proxy/ui/component/json/theme.dart'; import 'package:network_proxy/ui/component/multi_window.dart'; import 'package:network_proxy/ui/component/utils.dart'; import 'package:network_proxy/ui/desktop/toolbar/setting/request_rewrite.dart'; +import 'package:network_proxy/ui/mobile/setting/request_rewrite.dart'; import 'package:network_proxy/utils/num.dart'; import 'package:network_proxy/utils/platform.dart'; import 'package:window_manager/window_manager.dart'; @@ -155,6 +156,7 @@ class HttpBodyState extends State { ); } + // showRequestRewrite() async { HttpRequest? request; bool isRequest = widget.httpMessage is HttpRequest; @@ -181,11 +183,7 @@ class HttpBodyState extends State { if (!mounted) return; if (Platforms.isMobile()) { - // Navigator.push(context, MaterialPageRoute(builder: (_) => RewriteRule(rule: rule))).then((value) async { - // if (value is RequestRewriteRule) { - // RequestRewrites.instance.then((it) => it.flushRequestRewriteConfig()); - // } - // }); + Navigator.push(context, MaterialPageRoute(builder: (_) => RewriteRule(rule: rule, items: rewriteItems))); } else { showDialog( context: context, diff --git a/lib/ui/desktop/desktop.dart b/lib/ui/desktop/desktop.dart index ab98f9e..95263d5 100644 --- a/lib/ui/desktop/desktop.dart +++ b/lib/ui/desktop/desktop.dart @@ -142,7 +142,7 @@ class _DesktopHomePagePageState extends State implements EventL '3. 修复脚本导入中文乱码;\n' '4. 手机端外部代理配置是否展示抓包;\n' '5. 桌面端请求重写新窗口打开;\n' - '6. 请求重写升级,支持请求行、header、状态码重写;' + '6. 请求重写升级,支持请求行、header、状态码重写;\n' '7. 展示请求/响应报文大小;' , style: TextStyle(fontSize: 14))); diff --git a/lib/ui/mobile/mobile.dart b/lib/ui/mobile/mobile.dart index 8d72ff7..5e9f921 100644 --- a/lib/ui/mobile/mobile.dart +++ b/lib/ui/mobile/mobile.dart @@ -124,7 +124,7 @@ class MobileHomeState extends State implements EventListener { '3. 修复脚本导入中文乱码;\n' '4. 手机端外部代理配置是否展示抓包;\n' '5. 桌面端请求重写新窗口打开;\n' - '6. 请求重写升级,支持请求行、header、状态码重写;' + '6. 请求重写升级,支持请求行、header、状态码重写;\n' '7. 展示请求/响应报文大小' ; diff --git a/linux/build.sh b/linux/build.sh index cd3a6cc..baf31dd 100644 --- a/linux/build.sh +++ b/linux/build.sh @@ -4,14 +4,14 @@ cd ../build/linux/x64/release rm -rf package mkdir -p package/DEBIAN echo "Package: ProxyPin" >> package/DEBIAN/control -echo "Version: 1.0.2" >> package/DEBIAN/control +echo "Version: 1.0.5" >> package/DEBIAN/control echo "Priority: optional" >> package/DEBIAN/control echo "Architecture: amd64" >> package/DEBIAN/control echo "Depends: ca-certificates" >> package/DEBIAN/control echo "Section: utils" >> package/DEBIAN/control echo "Maintainer: wanghongenpin@gmail.com" >> package/DEBIAN/control echo "Homepage: https://github.com/wanghongenpin/network_proxy_flutter" >> package/DEBIAN/control -echo "Description: http抓包" >> package/DEBIAN/control +echo "Description: http\https Capture packets" >> package/DEBIAN/control echo "" >> package/DEBIAN/control mkdir -p package/usr/share/applications cp ../../../../linux/proxy-pin.desktop package/usr/share/applications diff --git a/linux/my_application.cc b/linux/my_application.cc index 7d00ae6..a96f9d6 100644 --- a/linux/my_application.cc +++ b/linux/my_application.cc @@ -53,7 +53,7 @@ static void my_application_activate(GApplication* application) { if (g_file_test("assets", G_FILE_TEST_IS_DIR)) { gtk_window_set_icon_from_file(window, "assets/icon.png", NULL); // For debug mode } else { - gtk_window_set_icon_from_file(window, "data/flutter_assets/assets/icon.png", NULL); // For release mode + gtk_window_set_icon_from_file(window, "/opt/proxypin/data/flutter_assets/assets/icon.png", NULL); // For release mode } g_autoptr(FlDartProject) project = fl_dart_project_new(); diff --git a/pubspec.yaml b/pubspec.yaml index 4fd40a4..b46f111 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: network_proxy description: ProxyPin publish_to: 'none' # Remove this line if you wish to publish to pub.dev -version: 1.0.5+2 +version: 1.0.5+3 environment: sdk: '>=3.0.2 <4.0.0'