Release 4.12.3

code/default/gae_proxy/local/check_local_network.py

@@ -1,4 +1,3 @@
-
 import sys
 import os
 
@@ -8,27 +7,26 @@
 current_path = os.path.dirname(os.path.abspath(__file__))
 
 if __name__ == "__main__":
-    python_path = os.path.abspath( os.path.join(current_path, os.pardir, os.pardir))
+    python_path = os.path.abspath(os.path.join(current_path, os.pardir, os.pardir))
     root_path = os.path.abspath(os.path.join(current_path, os.pardir, os.pardir))
 
-    noarch_lib = os.path.abspath( os.path.join(python_path, 'lib', 'noarch'))
+    noarch_lib = os.path.abspath(os.path.join(python_path, 'lib', 'noarch'))
     sys.path.append(noarch_lib)
     sys.path.append(root_path)
 
     if sys.platform == "win32":
-        win32_lib = os.path.abspath( os.path.join(python_path, 'lib', 'win32'))
+        win32_lib = os.path.abspath(os.path.join(python_path, 'lib', 'win32'))
         sys.path.append(win32_lib)
     elif sys.platform.startswith("linux"):
-        linux_lib = os.path.abspath( os.path.join(python_path, 'lib', 'linux'))
+        linux_lib = os.path.abspath(os.path.join(python_path, 'lib', 'linux'))
         sys.path.append(linux_lib)
 
-
 from gae_proxy.local.config import config
 
 import simple_http_client
 from xlog import getLogger
-xlog = getLogger("gae_proxy")
 
+xlog = getLogger("gae_proxy")
 
 max_timeout = 5
 
@@ -46,10 +44,11 @@ def __init__(self, type="IPv4"):
         if config.PROXY_ENABLE:
             if config.PROXY_USER:
                 self.proxy = "%s://%s:%s@%s:%d" % \
-                    (config.PROXY_TYPE, config.PROXY_USER, config.PROXY_PASSWD, config.PROXY_HOST, config.PROXY_PORT)
+                             (config.PROXY_TYPE, config.PROXY_USER, config.PROXY_PASSWD, config.PROXY_HOST,
+                              config.PROXY_PORT)
             else:
                 self.proxy = "%s://%s:%d" % \
-                    (config.PROXY_TYPE, config.PROXY_HOST, config.PROXY_PORT)
+                             (config.PROXY_TYPE, config.PROXY_HOST, config.PROXY_PORT)
         else:
             self.proxy = None
 
@@ -98,7 +97,7 @@ def _test_host(self, url):
                 "accept-encoding": "gzip, deflate, sdch",
                 "accept-language": 'en-US,en;q=0.8,ja;q=0.6,zh-CN;q=0.4,zh;q=0.2',
                 "connection": "keep-alive"
-                }
+            }
             response = self.http_client.request("HEAD", url, header, "", read_payload=False)
             if response:
                 return True
@@ -158,20 +157,20 @@ def triger_check_network(self, fail=False, force=False):
 
 IPv4 = CheckNetwork("IPv4")
 IPv4.urls = [
-            "https://www.microsoft.com",
-            "https://www.apple.com",
-            "https://code.jquery.com",
-            "https://cdn.bootcss.com",
-            "https://cdnjs.cloudflare.com"]
-IPv4.triger_check_network()
+    "https://www.bing.com",
+    "https://code.jquery.com",
+    "https://cdn.bootcss.com",
+    "https://cdnjs.cloudflare.com"]
+# IPv4.triger_check_network()
 
 IPv6 = CheckNetwork("IPv6")
-IPv6.urls = ["https://ipv6.vm3.test-ipv6.com",
-             "http://[2001:470:1:18::115]",
-             "http://ipv6.lookup.test-ipv6.com",
-             "http://v6.myip.la"
-             ]
-IPv6.triger_check_network()
+IPv6.urls = [
+    "https://ipv6.vm3.test-ipv6.com",
+    "http://[2001:470:1:18::115]",
+    "http://ipv6.lookup.test-ipv6.com",
+    "http://v6.myip.la"
+]
+# IPv6.triger_check_network()
 
 
 def report_ok(ip):
@@ -198,5 +197,5 @@ def is_ok(ip=None):
 
 
 if __name__ == "__main__":
-    #print(IPv6._test_host("http://[2804:10:4068::202:82]"))
-    IPv4._test_host("https://www.baidu.com")
+    # print(IPv6._test_host("http://[2804:10:4068::202:82]"))
+    IPv4._test_host("https://www.baidu.com")

code/default/launcher/update.py

@@ -376,7 +376,7 @@ def check_loop():
 
     # wait gae_proxy to start
     # update need gae_proxy as proxy
-    time.sleep(1)
+    time.sleep(500)
 
     while True:
         check_update()

code/default/launcher/web_ui/index.html

@@ -443,7 +443,7 @@ <h2 id="title"></h2>
                 var currentVer = result['current_version'];
                 document.getElementById("version_on_logo").appendChild(document.createTextNode(currentVer));
 
-                getRELEASENOTE_ISSUEID(currentVer);
+                // getRELEASENOTE_ISSUEID(currentVer);
             }
         });
 
@@ -741,7 +741,7 @@ <h2 id="title"></h2>
         window.updateProgress_timer = $.timer(updateProgress, 1000, true);
         updateProgress();
         checkUpdateTimer = $.timer(getUpdateInfo, checkUpdateTimeout, true);
-        window.setTimeout(getUpdateInfo, 1000);
+        window.setTimeout(getUpdateInfo, 300*1000);
     });
 
     $('#update-now').click(updateVersion);

code/default/version.txt

@@ -1 +1 @@
-4.12.3
+4.12.4

code/default/x_tunnel/local/cloudflare_front/config.py

@@ -35,11 +35,11 @@ def __init__(self, fn):
         self.set_var("check_sni", 1)
 
         # host_manager
-        self.set_var("update_domains", 1)
+        self.set_var("update_domains", 0)
 
         # ip_manager
-        self.set_var("max_scan_ip_thread_num", 1)
-        self.set_var("max_good_ip_num", 50)
+        self.set_var("max_scan_ip_thread_num", 0)
+        self.set_var("max_good_ip_num", 100)
         self.set_var("target_handshake_time", 500)
         self.set_var("active_connect_interval", 3*60)
         self.set_var("scan_ip_interval", 10)

code/default/x_tunnel/local/heroku_front/config.py

@@ -35,7 +35,7 @@ def __init__(self, fn):
         self.set_var("check_sni", "*.herokuapp.com")
 
         # host_manager
-        self.set_var("update_domains", True)
+        self.set_var("update_domains", 0)
 
         # ip_manager
         self.set_var("max_scan_ip_thread_num", 0)