lib name dns2socks_core

Author: ssrlive

.github/workflows/publish-exe.yml

@@ -9,6 +9,7 @@ jobs:
   build_publish:
     name: Publishing Tasks
     strategy:
+      fail-fast: false
       matrix:
         target:
           - x86_64-unknown-linux-gnu
@@ -47,16 +48,18 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
 
       - name: Prepare
+        if: ${{ !cancelled() }}
         shell: bash
         run: |
           cargo install cbindgen
           mkdir mypubdir4
           rustup target add ${{ matrix.target }}
           if [[ "${{ matrix.host_os }}" == "ubuntu-latest" ]]; then
-            sudo .github/workflows/install-cross.sh
+            cargo install cross --git https://github.com/cross-rs/cross.git --rev e281947
           fi
 
       - name: Build
+        if: ${{ !cancelled() }}
         shell: bash
         run: |
           if [[ "${{ matrix.host_os }}" == "ubuntu-latest" ]]; then
@@ -67,23 +70,27 @@ jobs:
           cbindgen --config cbindgen.toml -o target/dns2socks.h
           if [[ "${{ matrix.host_os }}" == "windows-latest" ]]; then
             powershell -Command "(Get-Item README.md).LastWriteTime = Get-Date"
-            powershell Compress-Archive -Path target/${{ matrix.target }}/release/dns2socks.exe, README.md, target/dns2socks.h, target/${{ matrix.target }}/release/dns2socks.dll -DestinationPath mypubdir4/dns2socks-${{ matrix.target }}.zip
+            powershell Compress-Archive -Path target/${{ matrix.target }}/release/dns2socks.exe, README.md, target/dns2socks.h, target/${{ matrix.target }}/release/dns2socks_core.dll -DestinationPath mypubdir4/dns2socks-${{ matrix.target }}.zip
           elif [[ "${{ matrix.host_os }}" == "macos-latest" ]]; then
-            zip -j mypubdir4/dns2socks-${{ matrix.target }}.zip target/${{ matrix.target }}/release/dns2socks README.md target/dns2socks.h target/${{ matrix.target }}/release/libdns2socks.dylib
+            zip -j mypubdir4/dns2socks-${{ matrix.target }}.zip target/${{ matrix.target }}/release/dns2socks README.md target/dns2socks.h target/${{ matrix.target }}/release/libdns2socks_core.dylib
             if [[ "${{ matrix.target }}" == "x86_64-apple-darwin" ]]; then
               ./build-aarch64-apple-ios.sh
               zip -r mypubdir4/dns2socks-aarch64-apple-ios-xcframework.zip ./dns2socks.xcframework/
               ./build-apple.sh
               zip -r mypubdir4/dns2socks-apple-xcframework.zip ./dns2socks.xcframework/
             fi
           elif [[ "${{ matrix.host_os }}" == "ubuntu-latest" ]]; then
-            zip -j mypubdir4/dns2socks-${{ matrix.target }}.zip target/${{ matrix.target }}/release/dns2socks README.md target/dns2socks.h target/${{ matrix.target }}/release/libdns2socks.so
+            zip -j mypubdir4/dns2socks-${{ matrix.target }}.zip target/${{ matrix.target }}/release/dns2socks README.md target/dns2socks.h target/${{ matrix.target }}/release/libdns2socks_core.so
           fi
 
       - name: Publish
+        if: ${{ !cancelled() }}
         uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           files: mypubdir4/*
 
+      - name: Abort on error
+        if: ${{ failure() }}
+        run: echo "Publish job failed" && false

.github/workflows/rust.yml

@@ -8,6 +8,7 @@ env:
 
 jobs:
   build_n_test:
+    if: ${{ !startsWith(github.ref, 'refs/tags/') }}
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
@@ -29,6 +30,7 @@ jobs:
       run: cargo build --verbose --tests --all-features
 
   build_android:
+    if: ${{ !startsWith(github.ref, 'refs/tags/') }}
     strategy:
       fail-fast: false
     runs-on: ubuntu-latest

Cargo.toml

@@ -9,6 +9,7 @@ description = "Convert DNS requests to SOCKS5 proxy."
 readme = "README.md"
 
 [lib]
+name = "dns2socks_core"
 crate-type = ["staticlib", "cdylib", "rlib"]
 
 [dependencies]

build-aarch64-apple-ios-debug.sh

@@ -22,5 +22,5 @@ EOF
 echo "Creating XCFramework"
 rm -rf ./dns2socks.xcframework
 xcodebuild -create-xcframework \
-    -library ./target/aarch64-apple-ios/debug/libdns2socks.a -headers ./target/include/ \
+    -library ./target/aarch64-apple-ios/debug/libdns2socks_core.a -headers ./target/include/ \
     -output ./dns2socks.xcframework

build-aarch64-apple-ios.sh

@@ -22,5 +22,5 @@ EOF
 echo "Creating XCFramework"
 rm -rf ./dns2socks.xcframework
 xcodebuild -create-xcframework \
-    -library ./target/aarch64-apple-ios/release/libdns2socks.a -headers ./target/include/ \
+    -library ./target/aarch64-apple-ios/release/libdns2socks_core.a -headers ./target/include/ \
     -output ./dns2socks.xcframework

build-apple.sh

@@ -36,20 +36,20 @@ EOF
 echo "lipo..."
 echo "Simulator"
 lipo -create \
-    target/aarch64-apple-ios-sim/release/libdns2socks.a \
-    target/x86_64-apple-ios/release/libdns2socks.a \
+    target/aarch64-apple-ios-sim/release/libdns2socks_core.a \
+    target/x86_64-apple-ios/release/libdns2socks_core.a \
     -output ./target/libdns2socks-ios-sim.a
 
 echo "MacOS"
 lipo -create \
-    target/aarch64-apple-darwin/release/libdns2socks.a \
-    target/x86_64-apple-darwin/release/libdns2socks.a \
+    target/aarch64-apple-darwin/release/libdns2socks_core.a \
+    target/x86_64-apple-darwin/release/libdns2socks_core.a \
     -output ./target/libdns2socks-macos.a
 
 echo "Creating XCFramework"
 rm -rf ./dns2socks.xcframework
 xcodebuild -create-xcframework \
-    -library ./target/aarch64-apple-ios/release/libdns2socks.a -headers ./target/include/ \
+    -library ./target/aarch64-apple-ios/release/libdns2socks_core.a -headers ./target/include/ \
     -library ./target/libdns2socks-ios-sim.a -headers ./target/include/ \
     -library ./target/libdns2socks-macos.a -headers ./target/include/ \
     -output ./dns2socks.xcframework

cbindgen.toml

@@ -6,10 +6,11 @@ include = [
     "dns2socks_start",
     "dns2socks_stop",
     "dns2socks_set_log_callback",
+]
+exclude = [
     "Java_com_github_shadowsocks_bg_Dns2socks_start",
-    "Java_com_github_shadowsocks_bg_Dns2socks_stop",
+    "Java_com_github_shadowsocks_bg_Dns2socks_stop",    
 ]
-exclude = []
 
 [export.rename]
 "ArgVerbosity" = "Dns2socksVerbosity"

src/android.rs

@@ -1,6 +1,6 @@
 #![cfg(target_os = "android")]
 
-use crate::{ArgProxy, ArgVerbosity, Config, main_entry};
+use crate::{ArgProxy, ArgVerbosity, Config, LIB_NAME, main_entry};
 use jni::{
     JNIEnv,
     objects::{JClass, JString},
@@ -33,7 +33,7 @@ pub unsafe extern "C" fn Java_com_github_shadowsocks_bg_Dns2socks_start(
     timeout: jint,
 ) -> jint {
     let verbosity: ArgVerbosity = verbosity.try_into().unwrap_or_default();
-    let filter_str = &format!("off,dns2socks={verbosity}");
+    let filter_str = &format!("off,{LIB_NAME}={verbosity}");
     let filter = android_logger::FilterBuilder::new().parse(filter_str).build();
     android_logger::init_once(
         android_logger::Config::default()

src/bin/dns2socks.rs

@@ -1,12 +1,12 @@
-use dns2socks::{Config, main_entry};
+use dns2socks_core::{Config, LIB_NAME, main_entry};
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
     let config = Config::parse_args();
 
     dotenvy::dotenv().ok();
 
-    let default = format!("{}={:?}", module_path!(), config.verbosity);
+    let default = format!("{}={:?},{LIB_NAME}={:?}", module_path!(), config.verbosity, config.verbosity);
     env_logger::Builder::from_env(env_logger::Env::default().default_filter_or(default)).init();
 
     let shutdown_token = tokio_util::sync::CancellationToken::new();

src/lib.rs

@@ -21,6 +21,8 @@ pub use api::{dns2socks_start, dns2socks_stop};
 pub use config::{ArgProxy, ArgVerbosity, Config, ProxyType};
 pub use dump_logger::dns2socks_set_log_callback;
 
+pub const LIB_NAME: &str = "dns2socks_core";
+
 const MAX_BUFFER_SIZE: usize = 4096;
 
 pub async fn main_entry(config: Config, shutdown_token: tokio_util::sync::CancellationToken) -> Result<()> {