Revert "Remove reqwest dependency (#354)" (#365)

This reverts commit 1d669a7.
TBD54566975 · Sep 23, 2024 · 83f2954 · 83f2954
1 parent 1d669a7
commit 83f2954
Show file tree

Hide file tree

Showing 40 changed files with 128 additions and 17,314 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/bindings/LICENSE b/bindings/LICENSE
diff --git a/bindings/web5_uniffi/libtargets/x86_64_unknown_linux_musl/Dockerfile b/bindings/web5_uniffi/libtargets/x86_64_unknown_linux_musl/Dockerfile
@@ -4,6 +4,7 @@ FROM --platform=linux/amd64 alpine:latest
 RUN apk add --no-cache \
     build-base \
     musl-dev \
+    openssl-dev \
     linux-headers \
     rustup \
     libgcc \
@@ -12,12 +13,21 @@ RUN apk add --no-cache \
     git \
     perl \
     make \
-    bash
+    bash \
+    openssl-libs-static
 
 # Install rust
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y --no-modify-path --default-toolchain 1.74.0
 ENV PATH="/root/.cargo/bin:${PATH}"
 
+# Set environment variables to ensure vendored OpenSSL is used
+ENV OPENSSL_STATIC=1
+ENV OPENSSL_LIB_DIR=/usr/lib
+ENV OPENSSL_INCLUDE_DIR=/usr/include
+ENV PKG_CONFIG_ALLOW_CROSS=1
+ENV PKG_CONFIG_PATH=/usr/lib/pkgconfig
+ENV LIBRARY_PATH="/usr/lib:/usr/local/lib"
+
 # Copy the source code to the container
 WORKDIR /usr/src/myapp
 COPY Cargo.toml ./
@@ -34,7 +44,7 @@ RUN cargo build --release --package web5_uniffi
 # Compile as a dynamic lib (.so) from our static lib (.a) while keeping dependencies self-contained
 RUN gcc -shared -o target/release/libweb5_uniffi.so -Wl,--whole-archive \
     target/release/libweb5_uniffi.a -Wl,--no-whole-archive -static-libgcc \
-    -Wl,-Bdynamic -fPIC
+    -L/usr/lib -lssl -lcrypto -Wl,-Bdynamic -fPIC
 
 # Set the entrypoint, so that we can `docker cp` the build output
 CMD tail -f /dev/null
diff --git a/bound/LICENSE b/bound/LICENSE
diff --git a/bound/typescript/dist/bundle.js b/bound/typescript/dist/bundle.js
diff --git a/bound/typescript/dist/src/crypto/dsa/ed25519.js b/bound/typescript/dist/src/crypto/dsa/ed25519.js
diff --git a/bound/typescript/dist/src/crypto/dsa/index.js b/bound/typescript/dist/src/crypto/dsa/index.js
diff --git a/bound/typescript/dist/src/crypto/jwk.js b/bound/typescript/dist/src/crypto/jwk.js
diff --git a/bound/typescript/dist/src/crypto/key_managers/in_memory_key_manager.js b/bound/typescript/dist/src/crypto/key_managers/in_memory_key_manager.js
diff --git a/bound/typescript/dist/src/crypto/key_managers/index.js b/bound/typescript/dist/src/crypto/key_managers/index.js
diff --git a/bound/typescript/dist/src/errors.js b/bound/typescript/dist/src/errors.js