From 0b4263140d5e9a583d4717bb3b314010e07790b0 Mon Sep 17 00:00:00 2001 From: zhom <2717306+zhom@users.noreply.github.com> Date: Fri, 25 Jul 2025 11:18:32 +0400 Subject: [PATCH] refactor: switch to banderole from pkg --- .github/workflows/codeql.yml | 2 +- .github/workflows/lint-rs.yml | 6 +++--- .github/workflows/release.yml | 4 ++-- .github/workflows/rolling-release.yml | 4 ++-- .gitignore | 5 ++++- nodecar/copy-binary.sh | 4 ++-- nodecar/package.json | 15 +++++++-------- src-tauri/src/lib.rs | 1 - src-tauri/src/proxy_manager.rs | 3 +-- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index d8ae55e..87ea2e6 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -80,7 +80,7 @@ jobs: shell: bash run: | mkdir -p src-tauri/binaries - cp nodecar/dist/nodecar src-tauri/binaries/nodecar-x86_64-unknown-linux-gnu + cp nodecar/nodecar-bin src-tauri/binaries/nodecar-x86_64-unknown-linux-gnu - name: Initialize CodeQL uses: github/codeql-action/init@b1e4dc3db58c9601794e22a9f6d28d45461b9dbf #v3.29.0 diff --git a/.github/workflows/lint-rs.yml b/.github/workflows/lint-rs.yml index bcd4c1f..dbf8be9 100644 --- a/.github/workflows/lint-rs.yml +++ b/.github/workflows/lint-rs.yml @@ -88,11 +88,11 @@ jobs: run: | mkdir -p src-tauri/binaries if [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then - cp nodecar/dist/nodecar src-tauri/binaries/nodecar-x86_64-unknown-linux-gnu + cp nodecar/nodecar-bin src-tauri/binaries/nodecar-x86_64-unknown-linux-gnu elif [[ "${{ matrix.os }}" == "macos-latest" ]]; then - cp nodecar/dist/nodecar src-tauri/binaries/nodecar-aarch64-apple-darwin + cp nodecar/nodecar-bin src-tauri/binaries/nodecar-aarch64-apple-darwin elif [[ "${{ matrix.os }}" == "windows-latest" ]]; then - cp nodecar/dist/nodecar.exe src-tauri/binaries/nodecar-x86_64-pc-windows-msvc.exe + cp nodecar/nodecar-bin.exe src-tauri/binaries/nodecar-x86_64-pc-windows-msvc.exe fi - name: Create empty 'dist' directory diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e25f953..688d791 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -154,9 +154,9 @@ jobs: run: | mkdir -p src-tauri/binaries if [[ "${{ matrix.platform }}" == "windows-latest" ]]; then - cp nodecar/dist/nodecar.exe src-tauri/binaries/nodecar-${{ matrix.target }}.exe + cp nodecar/nodecar-bin.exe src-tauri/binaries/nodecar-${{ matrix.target }}.exe else - cp nodecar/dist/nodecar src-tauri/binaries/nodecar-${{ matrix.target }} + cp nodecar/nodecar-bin src-tauri/binaries/nodecar-${{ matrix.target }} fi - name: Build frontend diff --git a/.github/workflows/rolling-release.yml b/.github/workflows/rolling-release.yml index 079e4d9..c063416 100644 --- a/.github/workflows/rolling-release.yml +++ b/.github/workflows/rolling-release.yml @@ -153,9 +153,9 @@ jobs: run: | mkdir -p src-tauri/binaries if [[ "${{ matrix.platform }}" == "windows-latest" ]]; then - cp nodecar/dist/nodecar.exe src-tauri/binaries/nodecar-${{ matrix.target }}.exe + cp nodecar/nodecar-bin.exe src-tauri/binaries/nodecar-${{ matrix.target }}.exe else - cp nodecar/dist/nodecar src-tauri/binaries/nodecar-${{ matrix.target }} + cp nodecar/nodecar-bin src-tauri/binaries/nodecar-${{ matrix.target }} fi - name: Build frontend diff --git a/.gitignore b/.gitignore index 48e1df7..70911c8 100644 --- a/.gitignore +++ b/.gitignore @@ -46,4 +46,7 @@ yarn-error.log* # typescript *.tsbuildinfo -!**/.gitkeep \ No newline at end of file +!**/.gitkeep + +# nodecar +nodecar/nodecar-bin \ No newline at end of file diff --git a/nodecar/copy-binary.sh b/nodecar/copy-binary.sh index 8b9c640..3dba05a 100755 --- a/nodecar/copy-binary.sh +++ b/nodecar/copy-binary.sh @@ -22,7 +22,7 @@ if [ -z "$TARGET_TRIPLE" ]; then fi # Copy the file with target triple suffix -cp "dist/nodecar${EXT}" "../src-tauri/binaries/nodecar-${TARGET_TRIPLE}${EXT}" +cp "nodecar-bin${EXT}" "../src-tauri/binaries/nodecar-${TARGET_TRIPLE}${EXT}" # Also copy a generic version for Tauri to find -cp "dist/nodecar${EXT}" "../src-tauri/binaries/nodecar${EXT}" \ No newline at end of file +cp "nodecar-bin${EXT}" "../src-tauri/binaries/nodecar${EXT}" \ No newline at end of file diff --git a/nodecar/package.json b/nodecar/package.json index 276fff5..be2458b 100644 --- a/nodecar/package.json +++ b/nodecar/package.json @@ -10,20 +10,19 @@ "start": "tsc && node ./dist/index.js", "test": "tsc && node ./dist/test-proxy.js", "rename-binary": "sh ./copy-binary.sh", - "build": "tsc && pkg ./dist/index.js --targets latest-macos-arm64 --output dist/nodecar && pnpm rename-binary", - "build:mac-aarch64": "tsc && pkg ./dist/index.js --targets latest-macos-arm64 --output dist/nodecar && pnpm rename-binary", - "build:mac-x86_64": "tsc && pkg ./dist/index.js --targets latest-macos-x64 --output dist/nodecar && pnpm rename-binary", - "build:linux-x64": "tsc && pkg ./dist/index.js --targets latest-linux-x64 --output dist/nodecar && pnpm rename-binary", - "build:linux-arm64": "tsc && pkg ./dist/index.js --targets latest-linux-arm64 --output dist/nodecar && pnpm rename-binary", - "build:win-x64": "tsc && pkg ./dist/index.js --targets latest-win-x64 --output dist/nodecar && pnpm rename-binary", - "build:win-arm64": "tsc && pkg ./dist/index.js --targets latest-win-arm64 --output dist/nodecar && pnpm rename-binary" + "build": "tsc && banderole bundle . --output nodecar-bin && pnpm rename-binary", + "build:mac-aarch64": "tsc && banderole bundle . --output nodecar-bin && pnpm rename-binary", + "build:mac-x86_64": "tsc && banderole bundle . --output nodecar-bin && pnpm rename-binary", + "build:linux-x64": "tsc && banderole bundle . --output nodecar-bin && pnpm rename-binary", + "build:linux-arm64": "tsc && banderole bundle . --output nodecar-bin && pnpm rename-binary", + "build:win-x64": "tsc && banderole bundle . --output nodecar-bin && pnpm rename-binary", + "build:win-arm64": "tsc && banderole bundle . --output nodecar-bin && pnpm rename-binary" }, "keywords": [], "author": "", "license": "AGPL-3.0", "dependencies": { "@types/node": "^24.1.0", - "@yao-pkg/pkg": "^6.5.1", "camoufox-js": "^0.6.1", "commander": "^14.0.0", "dotenv": "^17.2.0", diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index fa3fa19..b637590 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -137,7 +137,6 @@ async fn handle_url_open(app: tauri::AppHandle, url: String) -> Result<(), Strin Ok(()) } - #[tauri::command] async fn create_stored_proxy( name: String, diff --git a/src-tauri/src/proxy_manager.rs b/src-tauri/src/proxy_manager.rs index 03f8e75..f28db6c 100644 --- a/src-tauri/src/proxy_manager.rs +++ b/src-tauri/src/proxy_manager.rs @@ -476,8 +476,7 @@ mod tests { .unwrap() .to_path_buf(); let nodecar_dir = project_root.join("nodecar"); - let nodecar_dist = nodecar_dir.join("dist"); - let nodecar_binary = nodecar_dist.join("nodecar"); + let nodecar_binary = nodecar_dir.join("nodecar-bin"); // Check if binary already exists if nodecar_binary.exists() {