From 01d7d19b1189dfa7405f414c2695f6c094e589a0 Mon Sep 17 00:00:00 2001
From: ospab <ospab@ospab.host>
Date: Fri, 19 Jun 2026 18:24:51 +0300
Subject: [PATCH] Restore Session import for Windows compatibility and fix
 Flutter build

---
 ostp-client/src/tunnel/inbounds/tun.rs   | 1 +
 ostp-flutter/lib/ui/settings_screen.dart | 5 +++--
 ostp-flutter/pubspec.yaml                | 2 +-
 ostp-gui/src-tauri/tauri.conf.json       | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ostp-client/src/tunnel/inbounds/tun.rs b/ostp-client/src/tunnel/inbounds/tun.rs
index 6746545..3d6a9f9 100644
--- a/ostp-client/src/tunnel/inbounds/tun.rs
+++ b/ostp-client/src/tunnel/inbounds/tun.rs
@@ -1,6 +1,7 @@
 use anyhow::{anyhow, Result};
 use std::sync::Arc;
 use crate::config::{ClientConfig, InboundConfig};
+#[allow(unused_imports)]
 use crate::tunnel::router::{Router, Session};
 use crate::tunnel::outbounds::OutboundManager;
 use tokio::sync::watch;
diff --git a/ostp-flutter/lib/ui/settings_screen.dart b/ostp-flutter/lib/ui/settings_screen.dart
index 8e9732c..fb2a975 100644
--- a/ostp-flutter/lib/ui/settings_screen.dart
+++ b/ostp-flutter/lib/ui/settings_screen.dart
@@ -527,8 +527,9 @@ class _SettingsScreenState extends State<SettingsScreen> {
     if (_dnsDomainCtrl.text.trim().isNotEmpty) {
       queryParams.add('domain=${Uri.encodeComponent(_dnsDomainCtrl.text.trim())}');
     }
-    if (_dnsRegion != 'Global') {
-      queryParams.add('region=${Uri.encodeComponent(_dnsRegion)}');
+    final resolver = _dnsRegionCtrl.text.trim();
+    if (resolver.isNotEmpty && resolver != '1.1.1.1') {
+      queryParams.add('resolver=${Uri.encodeComponent(resolver)}');
     }
     if (_pbkCtrl.text.trim().isNotEmpty) {
       queryParams.add('pbk=${Uri.encodeComponent(_pbkCtrl.text.trim())}');
diff --git a/ostp-flutter/pubspec.yaml b/ostp-flutter/pubspec.yaml
index 1cfee18..b893b65 100644
--- a/ostp-flutter/pubspec.yaml
+++ b/ostp-flutter/pubspec.yaml
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.3.11+24
+version: 0.3.12+25
 
 environment:
   sdk: ^3.11.4
diff --git a/ostp-gui/src-tauri/tauri.conf.json b/ostp-gui/src-tauri/tauri.conf.json
index 7e66dde..a276bc0 100644
--- a/ostp-gui/src-tauri/tauri.conf.json
+++ b/ostp-gui/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "ostp-gui",
-  "version": "0.3.11",
+  "version": "0.3.12",
   "identifier": "com.ospab.ostp",
   "build": {
     "frontendDist": "../src"