From 3b5c8620eebbdc8a98cb065f4a664f559ad87c66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=BD=E5=90=A7=EF=BC=8C=E4=BD=A0=E6=83=B3=E8=AF=B4?= =?UTF-8?q?=E5=95=A5?= Date: Mon, 3 Mar 2025 19:28:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E6=B7=BB=E5=8A=A0=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=81=9A=E5=87=86=E5=A4=87=EF=BC=8C=E6=9B=B4=E6=96=B0=E8=BE=85?= =?UTF-8?q?=E5=8A=A9=E8=84=9A=E6=9C=AC=20(#213)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add docs * with pnpm * update download-firefox.sh * update download-firefox.sh * update download-firefox.sh * update download-firefox.sh * update download-firefox.sh * 更新辅助脚本 * add linux arm64 github ci --- .github/workflows/linux-aarch64.yaml | 119 ++++++++++++++++++ .github/workflows/linux-x86_64.yaml | 3 + CHANGELOG-v3-x.x.x.md | 4 + docs/index.md | 7 ++ extension/manifest.json | 2 +- mkdocs.yml | 23 ++++ package.json | 10 +- tools/chromium.sh | 4 +- tools/download-chromium.sh | 1 + tools/download-firefox.sh | 11 +- tools/npm-init.sh | 29 +++++ tools/python3-init-docs.sh | 30 +++++ tools/python3-venv-init.sh | 26 ++++ ...n3-env-init.sh => python3-venv-install.sh} | 0 tools/requirements.txt | 43 +++++-- tools/setup-nodejs-runtime.sh | 4 +- 16 files changed, 293 insertions(+), 23 deletions(-) create mode 100644 .github/workflows/linux-aarch64.yaml create mode 100644 docs/index.md create mode 100644 mkdocs.yml create mode 100644 tools/npm-init.sh create mode 100644 tools/python3-init-docs.sh create mode 100644 tools/python3-venv-init.sh rename tools/{python3-env-init.sh => python3-venv-install.sh} (100%) diff --git a/.github/workflows/linux-aarch64.yaml b/.github/workflows/linux-aarch64.yaml new file mode 100644 index 00000000..1595972d --- /dev/null +++ b/.github/workflows/linux-aarch64.yaml @@ -0,0 +1,119 @@ +name: linux-aarch64 + +on: + push: + pull_request: + +env: + BRANCH_NAME: ${{ github.head_ref || github.ref_name }} + +jobs: + linux-aarch64: + if: 0 + runs-on: ubuntu-24.04-arm + steps: + - uses: actions/checkout@v4 + - name: Prepare Source Code + run: | + echo $PATH + env + docker info + id -u + id -g + who + cat /etc/os-release + hostnamectl + uname -s + uname -m + uname -r + + cat /proc/cpuinfo | grep name | cut -f2 -d: | uniq -c + cat /proc/cpuinfo| grep "physical id"| sort| uniq| wc -l + cat /proc/cpuinfo | grep "cpu cores" | uniq + cat /proc/cpuinfo| grep "processor"| wc -l + lscpu + + export IPV6=$(ip -6 address show | grep inet6 | awk '{print $2}' | cut -d'/' -f1 | sed -n '2p') + export IPV4=$(ip -4 address show | grep inet | grep -v 127.0.0 | awk '{print $2}' | cut -d'/' -f1 | sed -n '1p') + echo $IPV4 + echo $IPV6 + echo "X_IPV6=${IPV6}" >> $GITHUB_ENV + echo "X_IPV4=${IPV4}" >> $GITHUB_ENV + + sudo apt install -y jq curl + + echo ${{ env.BRANCH_NAME }} + echo ${{ github.actor }} + echo ${{ github.repository }} + echo ${{ github.repository_owner }} + echo ${{ github.head_ref }} + echo ${{ github.ref_name }} + + # sudo sed -i "s@security.ubuntu.com@azure.archive.ubuntu.com@g" /etc/apt/sources.list + # sudo sed -i "s@archive.ubuntu.com@azure.archive.ubuntu.com@g" /etc/apt/sources.list + + sudo apt install -y supervisor socat + + - name: Cache Chromium + uses: actions/cache@v4 + with: + path: | + install-build-deps.py + ${{ github.workspace }}/var/chrome-linux.zip + ${{ github.workspace }}/var/chrome-linux + key: ${{ runner.os }}-x86_64-chromium + + - name: Prepare Chromium Run Environment + run: | + set -x + # curl https://chromium.googlesource.com/chromium/src/+/refs/heads/main/build/install-build-deps.sh?format=TEXT | base64 --decode > install-build-deps.sh + test -f install-build-deps.py || curl https://chromium.googlesource.com/chromium/src/+/refs/heads/main/build/install-build-deps.py?format=TEXT | base64 --decode > install-build-deps.py + sudo python3 install-build-deps.py + # 解决中文显示问题 + sudo apt-get install -y locales fonts-wqy-zenhei + sudo localedef -c -f UTF-8 -i zh_CN zh_CN.utf8 + + - name: Download Chromium + run: | + set -x + if [ ! -f ${{ github.workspace }}/var/chrome-linux.zip ] ; then + bash tools/download-chromium.sh + fi + + - name: Cache Firefox + uses: actions/cache@v4 + with: + path: | + ${{ github.workspace }}/var/firefox.tar.bz2 + ${{ github.workspace }}/var/firefox/ + key: ${{ runner.os }}-x86_64-firefox + + - name: Download Firefox + shell: bash + run: | + set -x + if [ ! -f ${{ github.workspace }}/var/firefox.tar.bz2 ] ; then + bash tools/download-firefox.sh + fi + + - name: show browser version + shell: bash + run: | + ls -lha var/ + var/chrome-linux/chrome --version + var/firefox/firefox --version + + - name: Chromium Load Extension + run: | + set -x + # bash tools/chromium.sh --xvfb + # bash tools/chromium.sh --headless + nohup bash tools/chromium.sh --xvfb & + sleep 15 + bash tools/chromium-auto-test.sh + + - name: Firefox Load Extension + run: | + set -x + # bash tools/firefox.sh --xvfb + # bash tools/firefox.sh --headless diff --git a/.github/workflows/linux-x86_64.yaml b/.github/workflows/linux-x86_64.yaml index 9fb55b76..5351f94f 100644 --- a/.github/workflows/linux-x86_64.yaml +++ b/.github/workflows/linux-x86_64.yaml @@ -69,6 +69,9 @@ jobs: # curl https://chromium.googlesource.com/chromium/src/+/refs/heads/main/build/install-build-deps.sh?format=TEXT | base64 --decode > install-build-deps.sh test -f install-build-deps.py || curl https://chromium.googlesource.com/chromium/src/+/refs/heads/main/build/install-build-deps.py?format=TEXT | base64 --decode > install-build-deps.py sudo python3 install-build-deps.py + # 解决中文显示问题 + sudo apt-get install -y locales fonts-wqy-zenhei + sudo localedef -c -f UTF-8 -i zh_CN zh_CN.utf8 - name: Download Chromium run: | diff --git a/CHANGELOG-v3-x.x.x.md b/CHANGELOG-v3-x.x.x.md index 9aff9354..b6f64bef 100644 --- a/CHANGELOG-v3-x.x.x.md +++ b/CHANGELOG-v3-x.x.x.md @@ -1,5 +1,9 @@ # v3 +## 1.0.0 [2025-03-04 15:52:00 +0800] + + 1. 添加文档 + ## 0.12.1 [2024-08-02 16:14:00 +0800] 1. 修复打包扩展bug diff --git a/docs/index.md b/docs/index.md new file mode 100644 index 00000000..a63fe647 --- /dev/null +++ b/docs/index.md @@ -0,0 +1,7 @@ +# 文档 + + 请求地址重定向 工具文档 + +## 实现原理 + + 借助浏览器提供的API，实现请求地址重定向 diff --git a/extension/manifest.json b/extension/manifest.json index e637dfd0..375bfc7b 100644 --- a/extension/manifest.json +++ b/extension/manifest.json @@ -5,7 +5,7 @@ "icons": { "128": "icons/128.png" }, - "description": "将 Google CDN 替换为国内镜像 v3 更新日期：2024-08-02", + "description": "将 Google CDN 替换为国内镜像 v3 更新日期：2025-03-03", "background": { "service_worker": "js/background.js", "type": "module" diff --git a/mkdocs.yml b/mkdocs.yml new file mode 100644 index 00000000..abd91ac1 --- /dev/null +++ b/mkdocs.yml @@ -0,0 +1,23 @@ +theme: + name: material + features: + - navigation.tabs + - navigation.tabs.sticky + - navigation.instant + - navigation.instant.progress + - navigation.expand + - navigation.path + - navigation.top +site_name: DOCS +site_url: "" + +plugins: + - search + - offline + +nav: + - index.md + - base: + - base/index.md + - advance: + - advance/index.md diff --git a/package.json b/package.json index 52928ac5..d2f19b14 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,11 @@ "chromium-test": "bash tools/chromium.sh" }, "devDependencies": { - "@types/chrome": "^0.0.253", - "prettier": "^3.1.0", - "typescript": "^5.3.2", - "web-ext": "^7.9.0" + "@types/chrome": "^0.0.307", + "npm-check": "^6.0.1", + "pnpm": "^10.5.2", + "prettier": "^3.5.3", + "typescript": "^5.8.2", + "web-ext": "^8.4.0" } } diff --git a/tools/chromium.sh b/tools/chromium.sh index c880cc7c..b9f6ce24 100644 --- a/tools/chromium.sh +++ b/tools/chromium.sh @@ -78,7 +78,7 @@ cat >run-chromium.sh <requirements.txt diff --git a/tools/python3-env-init.sh b/tools/python3-venv-install.sh similarity index 100% rename from tools/python3-env-init.sh rename to tools/python3-venv-install.sh diff --git a/tools/requirements.txt b/tools/requirements.txt index e88a56fd..7938381e 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -1,10 +1,33 @@ -certifi==2023.7.22 -charset-normalizer==2.1.0 -greenlet==2.0.2 -idna==3.3 -pika==1.3.1 -playwright==1.35.0 -pyee==9.0.4 -requests==2.28.1 -typing_extensions==4.7.1 -urllib3==1.26.11 +babel==2.17.0 +backrefs==5.8 +certifi==2025.1.31 +charset-normalizer==3.4.1 +click==8.1.8 +colorama==0.4.6 +ghp-import==2.1.0 +greenlet==3.1.1 +idna==3.10 +Jinja2==3.1.5 +Markdown==3.7 +MarkupSafe==3.0.2 +mergedeep==1.3.4 +mkdocs==1.6.1 +mkdocs-get-deps==0.2.0 +mkdocs-material==9.6.7 +mkdocs-material-extensions==1.3.1 +packaging==24.2 +paginate==0.5.7 +pathspec==0.12.1 +platformdirs==4.3.6 +playwright==1.50.0 +pyee==12.1.1 +Pygments==2.19.1 +pymdown-extensions==10.14.3 +python-dateutil==2.9.0.post0 +PyYAML==6.0.2 +pyyaml_env_tag==0.1 +requests==2.32.3 +six==1.17.0 +typing_extensions==4.12.2 +urllib3==2.3.0 +watchdog==6.0.0 diff --git a/tools/setup-nodejs-runtime.sh b/tools/setup-nodejs-runtime.sh index e9097c5f..951a1966 100644 --- a/tools/setup-nodejs-runtime.sh +++ b/tools/setup-nodejs-runtime.sh @@ -51,9 +51,9 @@ case $ARCH in ;; esac -APP_VERSION='v20.15.1' +APP_VERSION='v22.14.0' APP_NAME='node' -VERSION='v20.15.1' +VERSION='v22.14.0' mkdir -p bin/runtime mkdir -p var/runtime