🎉 0.3.1

XDSEC · Jan 2, 2025 · d3a7c26 · d3a7c26
1 parent 1ae2c45
commit d3a7c26
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 49 deletions.
diff --git a/.github/workflows/cli.yaml b/.github/workflows/cli.yaml
@@ -13,7 +13,7 @@ on:
 
 env:
   APP_NAME: "WebSocketReflectorX"
-  APP_VERSION: "0.3.0"
+  APP_VERSION: "0.3.1"
 
 #-------------------------------------------------------------------------------
 # Workflow jobs
@@ -79,43 +79,6 @@ jobs:
             wsrx-cli-${{env.APP_VERSION}}-linux64-gnu.tar.gz
             wsrx-cli-${{env.APP_VERSION}}-linux64-musl.tar.gz
 
-  ## macOS build ###############################################################
-  build-mac:
-    name: "macOS CI build"
-    runs-on: macos-12
-    steps:
-      # Checkout repository (and submodules)
-      - name: Checkout repository (and submodules)
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      # Setup Rust
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-
-      # Build application
-      - name: Build application
-        run: cargo build --release --features=binary
-
-      # Deploy application
-      - name: Compress Binaries
-        run: zip -r -y -X wsrx-cli-${{env.APP_VERSION}}-macOS-x86_64.zip target/release/wsrx
-
-      # Upload application ZIP
-      - name: Upload application ZIP
-        uses: actions/upload-artifact@v4
-        with:
-          name: wsrx-cli-${{env.APP_VERSION}}-macOS-x86_64.zip
-          path: wsrx-cli-${{env.APP_VERSION}}-macOS-x86_64.zip
-
-      - name: Release
-        uses: softprops/action-gh-release@v2
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          files: wsrx-cli-${{env.APP_VERSION}}-macOS-x86_64.zip
-
   ## macOS build ###############################################################
   build-mac-arm:
     name: "macOS ARM CI build"

diff --git a/.github/workflows/commit.yaml b/.github/workflows/commit.yaml
@@ -18,7 +18,7 @@ on:
 
 env:
   APP_NAME: "WebSocketReflectorX"
-  APP_VERSION: "0.3.0"
+  APP_VERSION: "0.3.1"
   QT_VERSION: "6.8.1"
 
 #-------------------------------------------------------------------------------

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ on:
 
 env:
   APP_NAME: "WebSocketReflectorX"
-  APP_VERSION: "0.3.0"
+  APP_VERSION: "0.3.1"
   QT_VERSION: "6.8.1"
 
 #-------------------------------------------------------------------------------

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20)
 
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 3)
-set(VERSION_PATCH 0)
+set(VERSION_PATCH 1)
 
 execute_process(
   COMMAND git describe --always --dirty

diff --git a/deploy_linux.sh b/deploy_linux.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 export APP_NAME="WebSocketReflectorX"
-export APP_VERSION=0.3.0
+export APP_VERSION=0.3.1
 export GIT_VERSION=$(git rev-parse --short HEAD)
 
 echo "> $APP_NAME packager (Linux x86_64) [v$APP_VERSION]"

diff --git a/deploy_macos.sh b/deploy_macos.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 export APP_NAME="WebSocketReflectorX"
-export APP_VERSION=0.3.0
+export APP_VERSION=0.3.1
 export GIT_VERSION=$(git rev-parse --short HEAD)
 
 arch=x86_64

diff --git a/deploy_windows.sh b/deploy_windows.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 export APP_NAME="WebSocketReflectorX"
-export APP_VERSION=0.3.0
+export APP_VERSION=0.3.1
 export GIT_VERSION=$(git rev-parse --short HEAD)
 
 echo "> $APP_NAME packager (Windows x86_64) [v$APP_VERSION]"

diff --git a/wsrx/Cargo.toml b/wsrx/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wsrx"
-version = "0.3.0"
+version = "0.3.1"
 edition = "2021"
 authors = ["Reverier-Xu <reverier.xu@xdsec.club>"]
 description = "Controlled TCP-over-WebSocket forwarding tunnel."

diff --git a/wsrx/src/cli/daemon.rs b/wsrx/src/cli/daemon.rs
@@ -125,8 +125,7 @@ fn build_router(secret: Option<String>) -> axum::Router {
         .allow_headers(Any)
         .allow_origin(Any);
     axum::Router::new()
-        .nest(
-            "/",
+        .merge(
             axum::Router::new()
                 .route(
                     "/pool",
@@ -142,8 +141,7 @@ fn build_router(secret: Option<String>) -> axum::Router {
                 .layer(cors_layer)
                 .with_state(state.clone()),
         )
-        .nest(
-            "/",
+        .merge(
             axum::Router::new()
                 .route("/connect", get(get_cors_status).post(add_pending_origin))
                 .layer(any_origin_layer)