Release 5.0.7, support openai and bing.

Michael-X-Net · Michael-X-Net · commit 17c429c59047 · 2023-02-10T16:48:05.000-11:00
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # XX-Net (翻墙VPN)
 * 可靠稳定的的翻墙系统，已经连续8年可靠提供服务  
 * 支持Android/iOS/Windows/Mac/Linux  
+* 独有的流量混淆算法，保证网络稳定可靠不被识别
 
 <br>
 
@@ -14,12 +15,9 @@
 
 
 ### 最新公告：
- 2023-01-13
-* 新版 5.0.6，提升稳定性和性能，4.x.x 的需要重新下载安装，不能应用内升级。
-* 免费用户可以无限流量访问google, Wikipedia 和 twitter，但部分地区（比如上海、北京）封锁严重，需要购买套餐才能连接接。
-* GAE 模块需要手动开启.   
-  没有绑卡无法工作, 想使用GAE模块请手动启用, 老id需要重新部署。  
-  https://github.com/XX-net/XX-Net/tree/master/code/default/gae_proxy/server
+ 2023-02-11
+* 新版 5.0.7，支持openai/bing等网站，简化界面
+* 4.x.x 的需要重新下载安装，不能应用内升级。
 
   
 <br>
diff --git a/code/default/launcher/web_control.py b/code/default/launcher/web_control.py
@@ -316,7 +316,7 @@ def req_index_handler(self):
         else:
             right_content = b""
 
-        data = index_content % (menu_content, right_content)
+        data = index_content % (config.enable_gae_proxy, menu_content, right_content)
         self.send_response('text/html', data)
 
     def req_config_handler(self):
@@ -508,6 +508,11 @@ def req_config_handler(self):
                         module_init.start("gae_proxy")
                     else:
                         module_init.stop("gae_proxy")
+
+                    if config.enable_smart_router:
+                        module_init.stop("smart_router")
+                        module_init.start("smart_router")
+
                     self.load_module_menus()
                     data = '{"res":"success"}'
             elif 'x_tunnel_enable' in reqs:
diff --git a/code/default/launcher/web_ui/index.html b/code/default/launcher/web_ui/index.html
@@ -35,6 +35,7 @@
     var head = document.getElementsByTagName('head')[0];
     head.appendChild(meta);
 
+    var gae_enabled = %d;
 </script>
 <body>
 <div id="header" class="navbar navbar-inverse navbar-fixed-top">
diff --git a/code/default/smart_router/local/__init__.py b/code/default/smart_router/local/__init__.py
@@ -103,6 +103,7 @@ def start(args):
         g.gae_proxy = proc_handler["gae_proxy"]["imp"].local
         g.gae_proxy_listen_port = g.gae_proxy.config.config.listen_port
     else:
+        g.gae_proxy = None
         xlog.debug("gae_proxy not running")
 
     if "x_tunnel" in proc_handler:
diff --git a/code/default/smart_router/local/gfw_black_list.txt b/code/default/smart_router/local/gfw_black_list.txt
@@ -487,6 +487,7 @@ bignews.org
 bigsound.org
 biliworld.com
 billypan.com
+bing.com
 binux.me
 bipic.net
 bit.do
@@ -750,6 +751,7 @@ cftfc.com
 cgdepot.org
 cgst.edu
 ch.shvoong.com
+challenges.cloudflare.com
 change.org
 changeip.name
 changeip.net
@@ -3260,6 +3262,7 @@ opedialogue.org
 open.com.hk
 open.demonii.si
 openallweb.com
+openai.com
 opendemocracy.net
 opendn.xyz
 openervpn.in
diff --git a/code/default/smart_router/local/web_control.py b/code/default/smart_router/local/web_control.py
@@ -103,6 +103,7 @@ def req_config_handler(self):
 
         if cmd == "get":
             data = {
+                "gae_enabled": g.gae_proxy is not None,
                 "pac_policy": g.config.pac_policy,
                 "country": g.config.country_code,
                 "auto_direct":g.config.auto_direct,
diff --git a/code/default/smart_router/web_ui/config_general.html b/code/default/smart_router/web_ui/config_general.html
@@ -20,8 +20,7 @@
         </div>
         <div class="span4">
             <select id="pac-policy">
-                <option value="black_GAE">{{ _("Black->GAEProxy" ) }}</option>
-                <option value="black_X-Tunnel">{{ _("Black->X-Tunnel" ) }}</option>
+<!--                <option value="black_X-Tunnel">{{ _("Black->X-Tunnel" ) }}</option>-->
                 <option value="smart-router">{{ _("All Smart-Router" ) }}</option>
                 <option value="all_X-Tunnel">{{ _("All->X-Tunnel" ) }}</option>
             </select>
@@ -42,14 +41,14 @@
         </div> <!-- .span8 -->
     </div> <!-- .row-fluid -->
 
-    <div class="row-fluid">
+    <div class="row-fluid" id="auto_try_gae_proxy_div" hidden>
         <div class="config_label">{{ _( "Auto-Try GAEProxy" ) }}</div> <!-- .span4 -->
         <div class="config_switch">
             <input id="auto-gae" type="checkbox" data-toggle="switch"/>
         </div> <!-- .span8 -->
     </div> <!-- .row-fluid -->
 
-    <div class="row-fluid">
+    <div class="row-fluid" id="enable_fake_ca_div" hidden>
         <div class="config_label">{{ _( "Enable Fake CA" ) }}</div> <!-- .span4 -->
         <div class="config_switch">
             <input id="enable_fake_ca" type="checkbox" data-toggle="switch"/>
@@ -71,6 +70,15 @@
     });
 </script>
 <script type="text/javascript">
+    if (gae_enabled){
+        var new_option = document.getElementById("pac-policy").appendChild(document.createElement("option"));
+        new_option.value = "{{ _("Black->GAEProxy" ) }}";
+        new_option.text = "black_GAE";
+
+        $("#auto_try_gae_proxy_div").show();
+        $("#enable_fake_ca_div").show();
+    }
+
     function getSmartRouterConfig() {
         $.ajax({
             type: 'POST',
diff --git a/code/default/smart_router/web_ui/config_rules.html b/code/default/smart_router/web_ui/config_rules.html
@@ -9,7 +9,7 @@
         </div> <!-- .span10 -->
     </div> <!-- .row-fluid -->
 
-    <div class="row-fluid">
+    <div class="row-fluid" id="gae-list-div" hidden>
         <div class="span2">
             <label for="gae-list">{{ _( "GAEProxy List" ) }}</label>
         </div> <!-- .span2 -->
@@ -27,7 +27,7 @@
         </div> <!-- .span10 -->
     </div> <!-- .row-fluid -->
 
-    <div class="row-fluid">
+    <div class="row-fluid" hidden>
         <div class="span2">
             <label for="redirect-https-list">{{ _( "Redirect HTTPS" ) }}</label>
         </div> <!-- .span2 -->
@@ -54,6 +54,10 @@
 </form> <!-- #import-export-ip -->
 
 <script type="text/javascript">
+
+    if (gae_enabled){
+        $("#gae-list-div").show();
+    }
     $.ajax({
         type: 'POST',
         url: '/module/smart_router/control/rules',
diff --git a/code/default/version.txt b/code/default/version.txt
@@ -1 +1 @@
-5.0.6
+5.0.7
diff --git a/code/default/x_tunnel/local/web_control.py b/code/default/x_tunnel/local/web_control.py
@@ -454,6 +454,7 @@ def is_server_available(server):
 
                 if is_server_available(server):
                     if server != g.config.server_host:
+                        xlog.info("change server to %s", server)
                         g.server_host = g.config.server_host = server
                         g.server_port = g.config.server_port = 443
                         g.config.save()
diff --git a/code/default/x_tunnel/web_ui/config.html b/code/default/x_tunnel/web_ui/config.html
@@ -1078,26 +1078,26 @@ <h5>{{ _("Transfer Bandwidth") }}</h5>
         $('button[type=submit]', '#adv-setting').attr('disabled', 'disabled');
 
         var server = $("#server-selector").val();
-        var promoter = $("#promoter").val();
-        if (promoter.length != 0 && promoter.length != 8) {
-            tip('{{ _("Promoter is invalid.") }}', 'error', false);
-            window.refresh_timer.stop();
-            return;
-        }
-
-        var promote_code = window.promote_code;
-        if (promoter == promote_code){
-            tip('{{ _("Can\'t promote yourself.") }}', 'error', false);
-            window.refresh_timer.stop();
-            return;
-        }
+<!--        var promoter = $("#promoter").val();-->
+<!--        if (promoter.length != 0 && promoter.length != 8) {-->
+<!--            tip('{{ _("Promoter is invalid.") }}', 'error', false);-->
+<!--            window.refresh_timer.stop();-->
+<!--            return;-->
+<!--        }-->
+
+<!--        var promote_code = window.promote_code;-->
+<!--        if (promoter == promote_code){-->
+<!--            tip('{{ _("Can\'t promote yourself.") }}', 'error', false);-->
+<!--            window.refresh_timer.stop();-->
+<!--            return;-->
+<!--        }-->
 
         $.ajax({
             type: 'POST',
             url: '/module/x_tunnel/control/config?cmd=set',
             data: {
                 'server': server,
-                'promoter': promoter
+<!--                'promoter': promoter-->
             },
             dataType: 'JSON',
             success: function (result) {
