[pull] master from XX-net:master

.github/ISSUE_TEMPLATE.md

@@ -1,17 +1,26 @@
+# 规则：
 * 请不要只写标题，不写内容，请先清空或另起新行，不遵守规则的提问会被自动关闭。
 
-* X-Tunnel 支付后流量未及时到帐请直接向 [email protected] 发邮件，并附上帐号、交易单号等详细信息。
-
-* 是否试过[最新的版本](https://github.com/XX-net/XX-Net/releases )？
+* 登陆问题、602问题， 请发邮件到  [email protected] ，附上帐号，请参考： 
+  https://github.com/XX-net/XX-Net/wiki/%E5%A6%82%E4%BD%95%E6%8A%A5%E5%91%8A%E9%97%AE%E9%A2%98
 
 * 是否查看过 [Wiki](https://github.com/XX-net/XX-Net/wiki )？
 
 * 是否以相关关键词搜索过类似 issues？
 
-* 描述遇到的问题，贴出所有能帮助分析问题的状态页和日志，如包含大量文本时，请上传为 txt 文件：
-
 * 如果问题得到解决，请务必回复相关情况，谢谢。
 
 * 即使最终无法解决你遇到的问题，这也是正常的，因为系统和网络环境千差万别。最终结果也能帮助到后来者，请保持正常交流，再寻它法。
 
 * 请不要只写标题，不写内容，请先清空或另起新行，不遵守规则的提问会被自动关闭。
+
+
+# 提问模版：
+- 操作系统：  
+- 客户端版本号：  
+- 问题现象：  
+- 日志文件：  
+
+# 日志文件获取方法：
+访问 http://localhost:8085/?module=launcher&menu=about 或进入 [系统] -> [关于]
+点 收集调试信息 后面的 [下载] 按钮。

.github/workflows/lint_python.yml

@@ -2,30 +2,106 @@ name: lint_python
 on:
   pull_request:
   push:
-  #  branches: [master]
+    branches: [test]
 jobs:
-  lint_python:
+  testing_linux:
     runs-on: ubuntu-latest
-    # strategy:
-    #  matrix:
-    #    os: [ubuntu-latest, macos-latest, windows-latest]
-    #    python-version: [2.7, 3.5, 3.6, 3.7, 3.8]  # , pypy3]
+    strategy:
+       matrix:
+         python-version: [ '3.10' ]  # 3.8, 3.9,
     steps:
-      - uses: actions/checkout@master
-      - uses: actions/setup-python@master
-      # with:
-      #   python-version: ${{ matrix.python-version }}
-      - run: pip install black codespell flake8 isort pytest reorder-python-imports
-      - run: black --check . || true
-      # - run: black --diff . || true
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - run: pip install pytest
+
+      # - run: pip install  reorder-python-imports codespell flake8 isort
       # - if: matrix.python-version >= 3.6
       #  run: |
       #    pip install black
       #    black --check . || true
-      - run: codespell --quiet-level=2 || true  # --ignore-words-list="" --skip=""
-      - run: flake8 code --count --select=E9,F63,F7,F82 --show-source --statistics --exclude=code/default/gae_proxy/server
+      # - run: black --diff . || true
+
+#      - run: codespell --quiet-level=2 || true  # --ignore-words-list="" --skip=""
+#      - run: flake8 code --count --select=E9,F63,F7,F82 --show-source --statistics --exclude=code/default/gae_proxy/server,code/default/lib/noarch/six.py
       # isort and reorder-python-imports are two ways of doing the same thing
-      - run: isort --recursive . || true
-      - run: reorder-python-imports . || true
+#      - run: isort --recursive . || true
+#      - run: reorder-python-imports . || true
+
+      - run: pip install -r requirements.txt || true
+      - shell: bash
+        env:
+          XTUNNEL_USER: ${{ secrets.XTUNNEL_USER }}
+          XTUNNEL_PASS: ${{ secrets.XTUNNEL_PASS }}
+          PYTHONPATH: ./code/default:./code/default/lib/noarch
+        run: |
+          pytest -v code/default || true
+
+      - name: Integrate testing
+        shell: bash
+        env:
+          XTUNNEL_USER: ${{ secrets.XTUNNEL_USER }}
+          XTUNNEL_PASS: ${{ secrets.XTUNNEL_PASS }}
+          PYTHONPATH: ./code/default:./code/default/lib/noarch
+        run: |
+          python code/default/launcher/tests/integrate_testing.py
+
+  testing_windows:
+    runs-on: windows-latest
+    strategy:
+       matrix:
+         python-version: [3.8, '3.10']
+    steps:
+      - uses: actions/checkout@master
+      - uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - run: pip install pytest
+      - run: pip install -r requirements.txt || true
+      - shell: bash
+        env:
+          XTUNNEL_USER: ${{ secrets.XTUNNEL_USER }}
+          XTUNNEL_PASS: ${{ secrets.XTUNNEL_PASS }}
+          PYTHONPATH: ./code/default:./code/default/lib/noarch
+        run: |
+          pytest -v code/default || true
+
+      - name: Integrate testing
+        shell: bash
+        env:
+          XTUNNEL_USER: ${{ secrets.XTUNNEL_USER }}
+          XTUNNEL_PASS: ${{ secrets.XTUNNEL_PASS }}
+          PYTHONPATH: ./code/default:./code/default/lib/noarch
+        run: |
+          python code/default/launcher/tests/integrate_testing.py
+
+  testing_mac:
+    runs-on: macos-latest
+    strategy:
+       matrix:
+         python-version: ['3.10']
+    steps:
+      - uses: actions/checkout@master
+      - uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - run: pip install pytest
+
       - run: pip install -r requirements.txt || true
-      - run: pytest . || true
+      - shell: bash
+        env:
+          XTUNNEL_USER: ${{ secrets.XTUNNEL_USER }}
+          XTUNNEL_PASS: ${{ secrets.XTUNNEL_PASS }}
+          PYTHONPATH: ./code/default:./code/default/lib/noarch
+        run: |
+          pytest -v code/default || true
+
+      - name: Integrate testing
+        shell: bash
+        env:
+          XTUNNEL_USER: ${{ secrets.XTUNNEL_USER }}
+          XTUNNEL_PASS: ${{ secrets.XTUNNEL_PASS }}
+          PYTHONPATH: ./code/default:./code/default/lib/noarch
+        run: |
+          python code/default/launcher/tests/integrate_testing.py

.github/workflows/notify_aur_upgrade.yml

@@ -0,0 +1,18 @@
+name: notify_aur_upgrade
+on:
+  push:
+
+jobs:
+  Notify:
+    name: Notify
+    if: startsWith(github.ref, 'refs/tags')
+    runs-on: ubuntu-latest
+    steps:
+      - run: |
+          curl -L \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer 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"\
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/lisuke/PKGBUILD/actions/workflows/xx-net.yml/dispatches \
+            -d '{"ref":"master"}'

.gitignore

@@ -1,17 +1,26 @@
 .idea
-data
+/data*
 *~
 *.pyc
 *.swp
 *.pot
 *.mo
 *.xpi
 *pybabel_update.sh
-
+core
 .DS_Store
 desktop.ini
 /SwitchyOmega/AutoProxy.xpi
 /SwitchyOmega/SwitchyOmega.crx
 /code/default/gae_proxy/server/lib/
 /code/default/gae_proxy/local/ipv6_tunnel/enable_ipv6_temp.bat
 /code/default/gae_proxy/local/ipv6_tunnel/set_best_server_temp.bat
+.pytest_cache
+*.log
+code/version.txt
+
+
+# Babel files
+messages.po-e
+messages.pot
+translated.po

README.md

@@ -1,19 +1,38 @@
-# XX-Net
+:rocket: XX-Net (翻墙VPN)
+=========
+这是一个稳健可靠的翻墙系统，已经连续运行 9 年！  
+我们不去研究墙有什么缺陷，因为所有的缺陷都会被慢慢的补上。  
+我们的策略是化身为普通流量，完全无法区分，最终隐身在茫茫的网络连接中。。。
+
+:electric_plug: 功能特性
+=========
+* 支持多平台： Android/iOS/Windows/Mac/Linux   
+* 采用独特的混淆算法，让您的流量在网络中无法被识别  
+* 开源绿色软件，无需安装，可以支持多台设备同时连接
+* 模拟Chrome浏览器行为，完全无法识别，稳定翻墙
+* 内置 ChatGPT，每个套餐赠送 ChatGPT-3.5 一百万token 
+
 
-* 安全的翻墙工具  
 <br>
 
-### [__下载页面__](https://github.com/XX-net/XX-Net/blob/master/code/default/download.md)
-###### [中文文档](https://github.com/XX-net/XX-Net/wiki/%E4%B8%AD%E6%96%87%E6%96%87%E6%A1%A3) &nbsp; &nbsp; &nbsp;[English](https://github.com/XX-net/XX-Net/wiki/English-Home-Page) &nbsp; &nbsp; &nbsp;[فارسی صفحه اصلی](https://github.com/XX-net/XX-Net/wiki/Persian-home-page) 
+### 官网下载: [https://xx-net.com](https://xx-net.com)
+### Telegram: [https://t.me/xxnetshare](https://t.me/xxnetshare)
+### Twitter: [https://twitter.com/XXNetDev](https://twitter.com/XXNetDev)
+###
+###### [中文帮助文档](https://github.com/XX-net/XX-Net/wiki/%E4%B8%AD%E6%96%87%E6%96%87%E6%A1%A3) &nbsp; &nbsp; &nbsp;[English Document](https://github.com/XX-net/XX-Net/wiki/English-Home-Page) &nbsp; &nbsp; &nbsp;[فارسی صفحه اصلی](https://github.com/XX-net/XX-Net/wiki/Persian-home-page) 
 
 <br>
 
 
 ### 最新公告：
- 2021-11-14
-* 新版 4.5.6, 修复新版Mac/Linux下python 3.10 的库兼容性问题。
-* GAE 模块默认关闭.   
-  没有绑卡无法工作, 想使用GAE模块请手动启用, 暂时没有流量控制功能，请注意流量费用。
+ 2024-03-06
+* 最新版5.9.10, 更新黑名单列表。
+* 5.9.0 升级GAE服务端到python3
+* 5.8.8 改进iOS下连接性能
+* 5.7.0 为X-Tunnel增加新通道
+* 5.6.0 重构代码，减少系统资源消耗
+* 5.1.0，内置ChatGPT
+* 原来是4.x.x 老版本的，需要重新下载新版安装，不能应用内升级。
 
 
 <br>

code/app_info.json

@@ -0,0 +1,3 @@
+{
+  "app_name": "XX-Net"
+}

code/default/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) [2015], [XX-Net]
+Copyright (c) [2022], [XX-Net]
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

code/default/babel_update.py

@@ -0,0 +1,44 @@
+#!/usr/env/bin python
+
+import os
+
+
+# pip install googletrans==4.0.0-rc1
+from googletrans import Translator
+import polib
+
+
+translator = Translator(service_urls=[
+      'translate.google.com',
+    ])
+
+for lang in ["ru_RU"]:  # "fa_IR",
+    for module in ["launcher", "smart_router", "x_tunnel"]:  #
+        source_po = polib.pofile(f'{module}/lang/zh_CN/LC_MESSAGES/messages.po')
+        lang_path = f'{module}/lang/{lang}/LC_MESSAGES'
+        if not os.path.isdir(lang_path):
+            os.makedirs(lang_path, exist_ok=True)
+
+        new_fp = f'{lang_path}/translated.po'
+        with open(new_fp, "w") as fd:
+            fd.write("")
+
+        new_po = polib.pofile(new_fp)
+
+        for entry in source_po:
+            try:
+                result = translator.translate(entry.msgid, dest=lang[0:2])
+                res_text = result.text
+            except Exception as e:
+                print(f"translate {entry.msgid} failed, e:{e}")
+                res_text = ""
+
+            new_entry = polib.POEntry(
+                msgid=entry.msgid,
+                msgstr=res_text,
+                occurrences=entry.occurrences )
+
+            new_po.append(new_entry)
+
+        new_po.save(new_fp)
+        print(f"module {module} translated to {lang}.")

code/default/download.md

@@ -1,14 +1,18 @@
 
 ## 下载(Download)：
-稳定版(Stable version 4.5.6)：  
-[Windows 版下载](https://github.com/XX-net/XX-Net/releases/download/4.5.6/XX-Net-windows-4.5.6.7z)  
-[Mac 版下载](https://github.com/XX-net/XX-Net/releases/download/4.5.6/XX-Net-mac-4.5.6.7z)  
-[Linux 版下载](https://github.com/XX-net/XX-Net/archive/4.5.6.zip)  
+稳定版(Stable version 4.12.5)：   
+[Win10 版下载](https://github.com/XX-net/XX-Net/releases/download/4.12.5/XX-Net-win10-4.12.5.7z)   
+[Win7 版下载](https://github.com/XX-net/XX-Net/releases/download/4.12.5/XX-Net-win7-4.12.5.7z)   
+[Mac 版下载](https://github.com/XX-net/XX-Net/releases/download/4.12.5/XX-Net-mac-4.12.5.7z)  
+[Linux 版下载](https://github.com/XX-net/XX-Net/archive/4.12.5.zip)  
+[Android版下载](https://github.com/XX-net/XX-Net/releases/download/4.12.5/XX-Net-4.12.5.apk)  
 
 
-测试版(Test version 4.5.6)：  
-[Windows 版下载](https://github.com/XX-net/XX-Net/releases/download/4.5.6/XX-Net-windows-4.5.6.7z)     
-[Mac 版下载](https://github.com/XX-net/XX-Net/releases/download/4.5.6/XX-Net-mac-4.5.6.7z)    
-[Linux 版下载](https://github.com/XX-net/XX-Net/archive/4.5.6.zip)  
 
 
+测试版(Test version 4.13.7)：  
+[Win10 版下载](https://github.com/XX-net/XX-Net/releases/download/4.12.6/XX-Net-win10-4.12.6.7z)   
+[Win7 版下载](https://github.com/XX-net/XX-Net/releases/download/4.12.6/XX-Net-win7-4.12.6.7z)   
+[Mac 版下载](https://github.com/XX-net/XX-Net/releases/download/4.12.6/XX-Net-mac-4.12.6.7z)  
+[Linux 版下载](https://github.com/XX-net/XX-Net/archive/4.12.6.zip)  
+[Android版下载](https://github.com/XX-net/XX-Net/releases/download/4.12.6/XX-Net-4.12.6.apk)  

code/default/gae_proxy/local/appid_manager.py

@@ -45,7 +45,7 @@ def get(self):
                 if time_to_reset > 0:
                     self.logger.warn("all appid out of quota, wait %d seconds to reset", time_to_reset)
                     sleep_end = time.time() + time_to_reset
-                    while len(self.working_appid_list) == 0 & time.time() < sleep_end:
+                    while len(self.working_appid_list) == 0 and time.time() < sleep_end:
                         time.sleep(1)
                     return None
                 else:
@@ -75,7 +75,7 @@ def report_out_of_quota(self, appid):
 
     def report_not_exist(self, appid, ip):
         self.logger.debug("report_not_exist:%s %s", appid, ip)
-        th = threading.Thread(target=self.process_appid_not_exist, args=(appid, ip))
+        th = threading.Thread(target=self.process_appid_not_exist, args=(appid, ip), name="process_appid_not_exist")
         th.start()
 
     def process_appid_not_exist(self, appid, ip):