Try to fix SONAME...

Qard · Qard · commit 230f16081068 · 2025-07-16T01:07:12.000+08:00
diff --git a/.cargo/cargo.toml b/.cargo/cargo.toml
@@ -0,0 +1,5 @@
+[target.x86_64-unknown-linux-gnu]
+rustflags = ["-C", "link-args=-Wl,-export-dynamic"]
+
+[target.aarch64-unknown-linux-gnu]
+rustflags = ["-C", "link-args=-Wl,-export-dynamic"]
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -326,15 +326,85 @@ jobs:
         uses: addnab/docker-run-action@v3
         with:
           image: ${{ steps.docker.outputs.IMAGE }}
-          options: -v ${{ steps.docker.outputs.PNPM_STORE_PATH }}:${{ steps.docker.outputs.PNPM_STORE_PATH }} -v ${{ github.workspace }}:${{ github.workspace }} -w ${{ github.workspace }} --platform ${{ steps.docker.outputs.PLATFORM }}
+          options: -v ${{ steps.docker.outputs.PNPM_STORE_PATH }}:${{ steps.docker.outputs.PNPM_STORE_PATH }} -v ${{ github.workspace }}:${{ github.workspace }} -w ${{ github.workspace }} --platform ${{ steps.docker.outputs.PLATFORM }} -e CI=true -e GITHUB_ACTIONS=true
           run: |
-            # Install Python 3.9+ (any version will work with abi3-py39)
+            # Install Python 3.x
             apt-get update -y
-            apt-get install -y python3 python3-dev
+            apt-get install -y python3 python3-dev patchelf
+
+            echo "=== Starting test setup ==="
+            echo "Current directory: $(pwd)"
+            echo "Python version: $(python3 --version)"
+            echo "Patchelf version: $(patchelf --version)"
+            echo "Using combined approach: SONAME patching + programmatic RTLD_GLOBAL"
+            echo "CI environment: CI=$CI, GITHUB_ACTIONS=$GITHUB_ACTIONS"
+
+            # Check what .node files exist
+            echo "=== Available .node files ==="
+            ls -la *.node || echo "No .node files found"
+
+            # Check what .node files exist and patch Python dependencies
+            echo "=== Checking .node file Python dependencies ==="
+            for file in *.node; do
+              if [ -f "$file" ]; then
+                case "$file" in
+                  *linux*)
+                    echo "Checking $file..."
+                    echo "Python dependencies before patching:"
+                    ldd "$file" 2>/dev/null | grep python || echo "No Python dependencies found"
+                    
+                    # Check if we need to patch SONAME
+                    current_python_lib=$(ldd "$file" 2>/dev/null | grep "libpython" | head -1 | awk '{print $1}')
+                    if [ -n "$current_python_lib" ]; then
+                      echo "Current Python library: $current_python_lib"
+                      
+                      # Find the actual Python library on the system
+                      system_python_lib=$(find /usr/lib* -name "libpython3*.so.*" -type f 2>/dev/null | head -1)
+                      if [ -n "$system_python_lib" ]; then
+                        system_python_soname=$(basename "$system_python_lib")
+                        echo "System Python library: $system_python_soname"
+                        
+                        # Only patch if they're different
+                        if [ "$current_python_lib" != "$system_python_soname" ]; then
+                          echo "Patching SONAME from $current_python_lib to $system_python_soname"
+                          patchelf --replace-needed "$current_python_lib" "$system_python_soname" "$file"
+                          echo "SONAME patching completed"
+                        else
+                          echo "SONAME already matches system Python"
+                        fi
+                      else
+                        echo "Warning: Could not find system Python library"
+                      fi
+                    else
+                      echo "No Python library dependency found"
+                    fi
+                    
+                    echo "Python dependencies after patching:"
+                    ldd "$file" 2>/dev/null | grep python || echo "No Python dependencies found"
+                    echo "---"
+                    ;;
+                  *)
+                    echo "Skipping non-Linux file: $file"
+                    ;;
+                esac
+              fi
+            done
 
             # Install pnpm and run tests
+            echo "=== Installing pnpm ==="
             corepack disable
             npm i -gf pnpm
+
+            echo "=== Running pnpm install ==="
+            # Should be non-interactive in CI environment
+            pnpm install --prefer-offline
+
+            echo "=== Setting up Python library path ==="
+            export LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH
+            echo "LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
+
+
+            echo "=== Running tests ==="
             pnpm test
 
   publish:
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,7 +27,7 @@ http-rewriter = { git = "ssh://git@github.com/platformatic/http-rewriter.git" }
 # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
 napi = { version = "3.0.0-beta.8", default-features = false, features = ["napi4"], optional = true }
 napi-derive = { version = "3.0.0-beta.8", optional = true }
-pyo3 = { version = "0.25.1", features = ["auto-initialize", "experimental-async", "abi3-py39"] }
+pyo3 = { version = "0.25.1", features = ["auto-initialize", "experimental-async"] }
 pyo3-async-runtimes = { version = "0.25.0", features = ["tokio-runtime"] }
 thiserror = "2.0.12"
 tokio = { version = "1.45.1", features = ["full"] }
diff --git a/src/asgi/mod.rs b/src/asgi/mod.rs
@@ -5,6 +5,19 @@ use std::{
   path::{Path, PathBuf},
 };
 
+#[cfg(target_os = "linux")]
+use std::os::raw::c_void;
+
+#[cfg(target_os = "linux")]
+unsafe extern "C" {
+  fn dlopen(filename: *const i8, flag: i32) -> *mut c_void;
+}
+
+#[cfg(target_os = "linux")]
+const RTLD_GLOBAL: i32 = 0x100;
+#[cfg(target_os = "linux")]
+const RTLD_NOW: i32 = 0x2;
+
 use bytes::BytesMut;
 use http_handler::{Handler, Request, RequestExt, Response, extensions::DocumentRoot};
 use pyo3::exceptions::PyRuntimeError;
@@ -35,6 +48,54 @@ pub use websocket::{
   WebSocketConnectionScope, WebSocketReceiveMessage, WebSocketSendException, WebSocketSendMessage,
 };
 
+/// Load Python library with RTLD_GLOBAL on Linux to make symbols available
+#[cfg(target_os = "linux")]
+fn ensure_python_symbols_global() {
+  unsafe {
+    // Try to find the system Python library dynamically
+    use std::process::Command;
+    
+    // First try to find the Python library using find command
+    if let Ok(output) = Command::new("find")
+      .args(&["/usr/lib", "/usr/lib64", "/usr/local/lib", "-name", "libpython3*.so.*", "-type", "f"])
+      .output()
+    {
+      let output_str = String::from_utf8_lossy(&output.stdout);
+      for lib_path in output_str.lines() {
+        if let Ok(lib_cstring) = CString::new(lib_path) {
+          let handle = dlopen(lib_cstring.as_ptr(), RTLD_NOW | RTLD_GLOBAL);
+          if !handle.is_null() {
+            // Successfully loaded Python library with RTLD_GLOBAL
+            return;
+          }
+        }
+      }
+    }
+    
+    // Fallback to common library names if find command fails
+    let python_libs = [
+      "libpython3.12.so.1.0\0",
+      "libpython3.11.so.1.0\0",
+      "libpython3.10.so.1.0\0",
+      "libpython3.9.so.1.0\0",
+      "libpython3.8.so.1.0\0",
+    ];
+
+    for lib_name in &python_libs {
+      let handle = dlopen(lib_name.as_ptr() as *const i8, RTLD_NOW | RTLD_GLOBAL);
+      if !handle.is_null() {
+        // Successfully loaded Python library with RTLD_GLOBAL
+        break;
+      }
+    }
+  }
+}
+
+#[cfg(not(target_os = "linux"))]
+fn ensure_python_symbols_global() {
+  // On non-Linux platforms, this is typically not needed
+}
+
 /// Core ASGI handler that loads and manages a Python ASGI application
 pub struct Asgi {
   app_function: PyObject,
@@ -47,6 +108,9 @@ impl Asgi {
     docroot: Option<String>,
     app_target: Option<PythonHandlerTarget>,
   ) -> Result<Self, HandlerError> {
+    // Ensure Python symbols are globally available before initializing
+    ensure_python_symbols_global();
+
     // Determine document root
     let docroot = PathBuf::from(if let Some(docroot) = docroot {
       docroot
