Merge branch 'txthinking:master' into master

afboyxiyang · Aug 25, 2024 · fefe562 · fefe562
2 parents 2a95d9b + 206135a
commit fefe562
Show file tree

Hide file tree

Showing 10 changed files with 769 additions and 289 deletions.
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -0,0 +1,43 @@
+# Simple workflow for deploying static content to GitHub Pages
+name: Deploy static content to Pages
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["master"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  # Single deploy job since we're just deploying
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          # Upload entire repository
+          path: './docs'
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
diff --git a/README.md b/README.md
diff --git a/docs/build.sh b/docs/build.sh
@@ -10,12 +10,13 @@ echo '**❤️  [Shiliew - A network app designed for those who value their time
 
 cat getting-started.md >> ../readme.md
 cat gui.md >> ../readme.md
-cat resources.md >> ../readme.md
 
 echo '# CLI Documentation' >> ../readme.md
+echo 'Each subcommand has a `--example` parameter that can print the minimal example of usage' >> ../readme.md
 jb '$1`brook mdpage`.split("\n").filter(v=>!v.startsWith("[")).join("\n").replace("```\n```", "```\nbrook --help\n```").split("\n").forEach(v=> echo(v.startsWith("**") && !v.startsWith("**Usage") ? "- "+v : v))' >> ../readme.md
 
 cat example.md >> ../readme.md
+cat resources.md >> ../readme.md
 
 markdown ../readme.md ./index.html
 
diff --git a/docs/example.md b/docs/example.md
@@ -262,16 +262,4 @@ brook relay --from :9999 --to 1.2.3.4:9999
 brook socks5tohttp --socks5 127.0.0.1:1080 --listen 127.0.0.1:8010
 ```
 
-## brook pac creates pac server
-
-```
-brook pac --listen 127.0.0.1:8080 --proxy 'SOCKS5 127.0.0.1:1080; SOCKS 127.0.0.1:1080; DIRECT' --bypassDomainList ...
-```
-
-## brook pac creates pac file
-
-```
-brook pac --file proxy.pac --proxy 'SOCKS5 127.0.0.1:1080; SOCKS 127.0.0.1:1080; DIRECT' --bypassDomainList ...
-```
-
 ## There are countless examples; for more feature suggestions, it's best to look at the commands and parameters in the CLI documentation one by one, and blog, YouTube...
diff --git a/docs/getting-started.md b/docs/getting-started.md
@@ -14,7 +14,7 @@ nami install brook
 brook server -l :9999 -p hello
 ```
 
-## GUI Client
+## Client
 
 | iOS | Android      | Mac    |Windows      |Linux        |OpenWrt      |
 | --- | --- | --- | --- | --- | --- |

diff --git a/docs/gui.md b/docs/gui.md
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/resources.md b/docs/resources.md
@@ -5,15 +5,13 @@
 | [nami](https://github.com/txthinking/nami) | A clean and tidy decentralized package manager |
 | [joker](https://github.com/txthinking/joker) | Joker can turn process into daemon. Zero-Configuration |
 | [nico](https://github.com/txthinking/nico) | Nico can work with brook wsserver together |
-| [zhen](https://github.com/txthinking/zhen) | zhen - process and cron manager |
+| [z](https://github.com/txthinking/z) | z - process manager |
 | [tun2brook](https://github.com/txthinking/tun2brook) | Proxy all traffic just one line command |
 | [mad](https://github.com/txthinking/mad) | Generate root CA and derivative certificate for any domains and any IPs |
 | [hancock](https://github.com/txthinking/hancock) | Manage multiple remote servers and execute commands remotely |
 | [sshexec](https://github.com/txthinking/sshexec) | A command-line tool to execute remote command through ssh |
 | [jb](https://github.com/txthinking/jb) | write script in an easier way than bash |
 | [bash](https://github.com/txthinking/bash) | Many one-click scripts |
-| [pacman](https://archlinux.org/packages/extra/x86_64/brook/) | `pacman -S brook` |
-| [brew](https://formulae.brew.sh/formula/brook) | `brew install brook` |
 | [docker](https://hub.docker.com/r/txthinking/brook) | `docker run txthinking/brook` | 
 
 | Resources | Description |

diff --git a/ping/ping.json b/ping/ping.json
@@ -1,7 +1,7 @@
 {
     "version": "20240606",
-    "text": "Clean the web with Brook",
-    "link": "https://www.txthinking.com/talks/articles/brook-clean-the-web-en.article",
-    "text_zh": "使用 Brook 净化互联网",
-    "link_zh": "https://www.txthinking.com/talks/articles/brook-clean-the-web.article"
+    "text": "Brook Client Basic Knowledge",
+    "link": "https://www.txthinking.com/talks/articles/brook-en.article",
+    "text_zh": "Brook 客户端基础知识",
+    "link_zh": "https://www.txthinking.com/talks/articles/brook.article"
 }
diff --git a/programmable/modules/instagram_system_dns.tengo b/programmable/modules/instagram_system_dns.tengo
@@ -6,6 +6,11 @@ modules = append(modules, {
     dnsquery: func(m) {
         text := import("text")
         l := [
+            "analytics.google.com",
+            "apple.com",
+            "comodoca.com",
+            "autonavi.com",
+            "giphy.com",
             "facebook.com",
             "fbcdn.net",
             "facebook.net",