chore(crate): remove openssl

spider-rs · Jan 27, 2025 · 220d7c6 · 220d7c6
1 parent bdf84f1
commit 220d7c6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 44 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -38,22 +38,22 @@ jobs:
           - host: windows-latest
             target: i686-pc-windows-msvc
             build: |
-              choco install openssl.light
-              set OPENSSL_LIB_DIR=C:\Program Files\OpenSSL\lib
-              set OPENSSL_INCLUDE_DIR=C:\Program Files\OpenSSL\include
+              choco install .light
+              set _LIB_DIR=C:\Program Files\\lib
+              set _INCLUDE_DIR=C:\Program Files\\include
               yarn build --target i686-pc-windows-msvc
               # timeout issue - signals not working with swc core
               # yarn test
           - host: ubuntu-latest
             target: x86_64-unknown-linux-gnu
             setup: |
               sudo apt-get update
-              sudo apt-get install -y gcc build-essential cmake openssl libssl-dev ca-certificates libc6 perl
+              sudo apt-get install -y gcc build-essential cmake  ca-certificates libc6 perl
             build: yarn build --target x86_64-unknown-linux-gnu
           # - host: ubuntu-latest
           #   target: x86_64-unknown-linux-musl
           #   setup: |
-          #     sudo apt-get update && sudo apt-get install -y build-essential pkg-config cmake musl-tools musl-dev openssl libssl-dev ca-certificates gcc g++ libc6
+          #     sudo apt-get update && sudo apt-get install -y build-essential pkg-config cmake musl-tools musl-dev  ca-certificates gcc g++ libc6
           #     export CC=musl-gcc
           #   docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
           #   build: yarn build --target x86_64-unknown-linux-musl
@@ -67,32 +67,32 @@ jobs:
             docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64
             setup: |
               sudo apt-get update
-              sudo apt-get install -y gcc-aarch64-linux-gnu build-essential cmake openssl libssl-dev ca-certificates gcc libc6 perl pkg-config
+              sudo apt-get install -y gcc-aarch64-linux-gnu build-essential cmake  ca-certificates gcc libc6 perl pkg-config
             build: yarn build --target aarch64-unknown-linux-gnu
           # - host: ubuntu-latest
           #   target: armv7-unknown-linux-gnueabihf
           #   setup: |
           #     sudo apt-get update
-          #     sudo apt-get install build-essential pkg-config perl gcc cmake libc6 ca-certificates openssl libssl-dev gcc-arm-linux-gnueabihf -y
+          #     sudo apt-get install build-essential pkg-config perl gcc cmake libc6 ca-certificates  gcc-arm-linux-gnueabihf -y
           #   build: yarn build --target armv7-unknown-linux-gnueabihf
           #   env:
           #     CXXFLAGS: '--stdlib=libc++ -L/usr/lib/llvm-18/lib -static'
           - host: ubuntu-latest
             target: aarch64-linux-android
             setup: |
               sudo apt-get update
-              sudo apt-get install -y build-essential cmake openssl libssl-dev openssl
+              sudo apt-get install -y build-essential cmake  
             build: yarn build --target aarch64-linux-android
           - host: ubuntu-latest
             target: armv7-linux-androideabi
             setup: |
               sudo apt-get update
-              sudo apt-get install -y build-essential cmake openssl libssl-dev perl libc6 gcc ca-certificates
+              sudo apt-get install -y build-essential cmake  perl libc6 gcc ca-certificates
             build: yarn build --target armv7-linux-androideabi
           # - host: ubuntu-latest
           #   target: aarch64-unknown-linux-musl
           #   setup: |
-          #     sudo apt-get update && sudo apt-get install -y pkg-config clang perl-utils build-essential musl-tools musl-dev ca-certificates gcc g++ libc6 perl openssl libssl-dev
+          #     sudo apt-get update && sudo apt-get install -y pkg-config clang perl-utils build-essential musl-tools musl-dev ca-certificates gcc g++ libc6 perl 
           #     export CC=musl-gcc
           #   docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
           #   build: |
@@ -104,9 +104,9 @@ jobs:
           - host: windows-latest
             target: aarch64-pc-windows-msvc
             build: |
-              choco install openssl.light
-              set OPENSSL_LIB_DIR=C:\Program Files\OpenSSL-Win64\lib
-              set OPENSSL_INCLUDE_DIR=C:\Program Files\OpenSSL-Win64\include
+              choco install .light
+              set _LIB_DIR=C:\Program Files\-Win64\lib
+              set _INCLUDE_DIR=C:\Program Files\-Win64\include
               yarn build --target aarch64-pc-windows-msvc
     name: stable - ${{ matrix.settings.target }} - node@20
     runs-on: ${{ matrix.settings.host }}
@@ -188,7 +188,7 @@ jobs:
   #         environment_variables: DEBUG RUSTUP_IO_THREADS
   #         shell: bash
   #         run: |
-  #           sudo pkg install -y -f curl node libnghttp2 npm openssl
+  #           sudo pkg install -y -f curl node libnghttp2 npm 
   #           sudo npm install -g yarn --ignore-scripts
   #           curl https://sh.rustup.rs -sSf --output rustup.sh
   #           sh rustup.sh -y --profile minimal --default-toolchain stable

diff --git a/Cargo.toml b/Cargo.toml
@@ -16,38 +16,9 @@ napi-derive = "2"
 num_cpus = "1"
 serde = "1"
 serde_json = "1"
-spider = { version = "2", features = ["cron", "regex", "cookies", "socks", "chrome", "control", "chrome_intercept", "cache", "openai", "serde", "real_browser", "headers" ] }
+spider = { version = "2", features = ["cron", "regex", "cookies", "socks", "chrome", "control", "chrome_intercept", "cache", "openai", "serde", "real_browser", "headers", "reqwest_rustls_tls" ] }
 spider_scraper = "0.1"
 
-[target.x86_64-unknown-linux-gnu.dependencies]
-openssl-sys = { version = "0.9", features = ["vendored"] }
-openssl = { version = "0.10", features = ["vendored"] }
-
-[target.aarch64-unknown-linux-musl.dependencies]
-openssl-sys = { version = "0.9", features = ["vendored"] }
-openssl = { version = "0.10", features = ["vendored"] }
-
-[target.aarch64-unknown-linux-gnu.dependencies]
-openssl-sys = { version = "0.9", features = ["vendored"] }
-openssl = { version = "0.10", features = ["vendored"] }
-
-[target.armv7-unknown-linux-gnueabihf.dependencies]
-openssl-sys = { version = "0.9", features = ["vendored"] }
-openssl = { version = "0.10", features = ["vendored"] }
-
-[target.x86_64-unknown-linux-musl.dependencies]
-openssl-sys = { version = "0.9", features = ["vendored"] }
-openssl = { version = "0.10", features = ["vendored"] }
-
-[target.armv7-linux-androideabi.dependencies]
-openssl-sys = { version = "0.9", features = ["vendored"] }
-openssl = { version = "0.10", features = ["vendored"] }
-
-[target.aarch64-linux-android.dependencies]
-openssl-sys = { version = "0.9", features = ["vendored"] }
-openssl = { version = "0.10", features = ["vendored"] }
-
-
 [build-dependencies]
 napi-build = "2"