Bump version 0.1.13

.github/workflows/publish-exe.yml

@@ -69,6 +69,8 @@ jobs:
           elif [[ "${{ matrix.host_os }}" == "macos-latest" ]]; then
             zip -j mypubdir4/socks-hub-${{ matrix.target }}.zip target/${{ matrix.target }}/release/socks-hub ./README.md ./socks_hub_ffi.h target/${{ matrix.target }}/release/libsocks_hub.dylib
             if [[ "${{ matrix.target }}" == "x86_64-apple-darwin" ]]; then
+              ./build-aarch64-apple-ios.sh
+              zip -r mypubdir4/socks-hub-aarch64-apple-ios-xcframework.zip ./socks-hub.xcframework/
               ./build-apple.sh
               zip -r mypubdir4/socks-hub-apple-xcframework.zip ./socks-hub.xcframework/
             fi

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "socks-hub"
-version = "0.1.12"
+version = "0.1.13"
 license = "MIT"
 repository = "https://github.com/ssrlive/socks-hub"
 homepage = "https://github.com/ssrlive/socks-hub"

build-apple-debug.sh → build-aarch64-apple-ios-debug.sh

@@ -11,7 +11,7 @@ echo "Generating includes..."
 mkdir -p target/include/
 rm -rf target/include/*
 cbindgen --config cbindgen.toml -l C -o target/include/socks-hub.h
-cat > target/include/module.modulemap <<EOF
+cat > target/include/socks-hub.modulemap <<EOF
 framework module socks-hub {
     umbrella header "socks-hub.h"
 

build-aarch64-apple-ios.sh

@@ -0,0 +1,27 @@
+#! /bin/sh
+
+echo "Setting up the rust environment..."
+rustup target add aarch64-apple-ios
+cargo install cbindgen
+
+echo "Building target aarch64-apple-ios..."
+cargo build --release --target aarch64-apple-ios
+
+echo "Generating includes..."
+mkdir -p target/include/
+rm -rf target/include/*
+cbindgen --config cbindgen.toml -l C -o target/include/socks-hub.h
+cat > target/include/socks-hub.modulemap <<EOF
+framework module socks-hub {
+    umbrella header "socks-hub.h"
+
+    export *
+    module * { export * }
+}
+EOF
+
+echo "Creating XCFramework"
+rm -rf ./socks-hub.xcframework
+xcodebuild -create-xcframework \
+    -library ./target/aarch64-apple-ios/release/libsocks_hub.a -headers ./target/include/ \
+    -output ./socks-hub.xcframework

build-apple.sh

@@ -25,7 +25,7 @@ echo "Generating includes..."
 mkdir -p target/include/
 rm -rf target/include/*
 cbindgen --config cbindgen.toml -l C -o target/include/socks-hub.h
-cat > target/include/module.modulemap <<EOF
+cat > target/include/socks-hub.modulemap <<EOF
 framework module socks-hub {
     umbrella header "socks-hub.h"
 

cbindgen.toml

@@ -2,7 +2,11 @@ language = "C"
 
 [export]
 include = ["socks_hub_run", "socks_hub_set_log_callback", "socks_hub_stop"]
-# exclude = ["Java_com_github_shadowsocks_bg_run", "Java_com_github_shadowsocks_bg_stop"]
+exclude = []
 
-[defines]
-# "feature = sockshub" = "DEFINE_SOCKSHUB"
+[export.rename]
+"ArgVerbosity" = "SocksHubVerbosity"
+"ProxyType" = "SocksHubProxyType"
+
+[enum]
+prefix_with_name = true

src/ffi.rs

@@ -39,7 +39,9 @@ pub unsafe extern "C" fn socks_hub_run(
     ctx: *mut c_void,
 ) -> c_int {
     log::set_max_level(verbosity.into());
-    log::set_boxed_logger(Box::<crate::dump_logger::DumpLogger>::default()).unwrap();
+    if let Err(err) = log::set_boxed_logger(Box::<crate::dump_logger::DumpLogger>::default()) {
+        log::error!("Failed to set logger: {}", err);
+    }
 
     let local_addr = std::ffi::CStr::from_ptr(local_addr).to_str().unwrap();
     let local_addr = local_addr.parse().unwrap();