update

Author: vickiegpt

CodeApp/Managers/TerminalInstance.swift

@@ -15,13 +15,13 @@ private struct WasmerDisplayFrame {
     let stride: UInt32
     let format: UInt32
     let data: UnsafePointer<UInt8>?
-    let dataLen: Int
+    let dataLen: UInt
     let frameID: UInt64
 }
 
 private typealias WasmerDisplayFrameCallback =
     @convention(c) (
-        UnsafePointer<WasmerDisplayFrame>?,
+        UnsafeRawPointer?,
         UnsafeMutableRawPointer?
     ) -> Void
 
@@ -43,11 +43,11 @@ private func wasmer_display_enqueue_input_event(
 
 private let protonDisplayFrameCallback: WasmerDisplayFrameCallback = { framePointer, userData in
     guard let framePointer, let userData else { return }
-    let frame = framePointer.pointee
+    let frame = framePointer.bindMemory(to: WasmerDisplayFrame.self, capacity: 1).pointee
     guard frame.format == 1, let data = frame.data, frame.dataLen > 0 else { return }
 
     let terminal = Unmanaged<TerminalInstance>.fromOpaque(userData).takeUnretainedValue()
-    let copiedFrame = Data(bytes: data, count: frame.dataLen)
+    let copiedFrame = Data(bytes: data, count: Int(frame.dataLen))
     terminal.presentProtonFrame(
         width: Int(frame.width),
         height: Int(frame.height),
@@ -318,7 +318,7 @@ class TerminalInstance: NSObject, WKScriptMessageHandler, WKNavigationDelegate,
         _ = wasmer_display_enqueue_input_event(eventType, code, x, y, value, modifiers)
     }
 
-    private func presentProtonFrame(
+    fileprivate func presentProtonFrame(
         width: Int,
         height: Int,
         stride: Int,

Resources/WasmerRuntime.xcframework/ios-arm64/libwasmer_ios.a

@@ -32,4 +32,7 @@ wasmer-derive = { path = "./wasmer/lib/derive" }
 opt-level = "z"     # Optimize for size
 lto = false         # Avoid iOS staticlib bitcode/LTO duplicate-symbol issues
 codegen-units = 1   # Better optimization
-strip = true        # Strip symbols
+debug = 0           # Do not emit debug info into archive members
+incremental = false # Keep release builds deterministic and compact
+panic = "abort"     # Remove unwinding tables from the iOS static library
+strip = "symbols"   # Strip symbols where rustc can do so directly

wasmer-ios/Cargo.toml

@@ -50,6 +50,63 @@ fi
 
 export PATH="$(dirname "$CARGO_BIN"):$(dirname "$RUSTUP_BIN"):/opt/homebrew/opt/llvm/bin:/opt/homebrew/bin:$PATH"
 
+RUST_TOOLCHAIN="${WASMER_IOS_TOOLCHAIN:-}"
+if [ -n "$RUST_TOOLCHAIN" ]; then
+    echo "Using Rust toolchain override: $RUST_TOOLCHAIN"
+fi
+
+RUSTFLAGS_BASE="-C debuginfo=0 -C strip=symbols -C embed-bitcode=no -C link-dead-code=no"
+if [ "${WASMER_IOS_Z_SMALL:-0}" = "1" ]; then
+    if [ "$RUST_TOOLCHAIN" != "nightly" ] && [[ "$RUST_TOOLCHAIN" != nightly-* ]]; then
+        echo "WASMER_IOS_Z_SMALL=1 requires WASMER_IOS_TOOLCHAIN=nightly or a nightly-* toolchain."
+        exit 1
+    fi
+    if ! "$RUSTUP_BIN" run "$RUST_TOOLCHAIN" rustc -Z help 2>/dev/null | grep -qE '^[[:space:]]+-Z[[:space:]]+small[=[:space:]]'; then
+        echo "The selected nightly toolchain does not support -Zsmall."
+        echo "Use WASMER_IOS_RUSTFLAGS for supported nightly size flags instead."
+        exit 1
+    fi
+    RUSTFLAGS_BASE="$RUSTFLAGS_BASE -Zsmall"
+fi
+export RUSTFLAGS="${RUSTFLAGS:-} $RUSTFLAGS_BASE ${WASMER_IOS_RUSTFLAGS:-}"
+echo "RUSTFLAGS: $RUSTFLAGS"
+
+cargo_build() {
+    if [ -n "$RUST_TOOLCHAIN" ]; then
+        "$RUSTUP_BIN" run "$RUST_TOOLCHAIN" cargo build "$@"
+    else
+        "$CARGO_BIN" build "$@"
+    fi
+}
+
+rustup_target_add() {
+    if [ -n "$RUST_TOOLCHAIN" ]; then
+        "$RUSTUP_BIN" target add --toolchain "$RUST_TOOLCHAIN" "$@"
+    else
+        "$RUSTUP_BIN" target add "$@"
+    fi
+}
+
+strip_static_library() {
+    local library="$1"
+    local strip_bin
+    strip_bin="$(
+        command -v llvm-strip 2>/dev/null || \
+        xcrun -find llvm-strip 2>/dev/null || \
+        xcrun -find strip 2>/dev/null || \
+        command -v strip 2>/dev/null || \
+        true
+    )"
+    if [ -z "$strip_bin" ]; then
+        echo "warning: strip not found; leaving $library unstripped"
+        return 0
+    fi
+
+    "$strip_bin" -S -x "$library" 2>/dev/null || \
+        "$strip_bin" -S "$library" 2>/dev/null || \
+        echo "warning: could not strip $library"
+}
+
 # Setup LLVM for bindgen
 export LLVM_CONFIG_PATH="${LLVM_CONFIG_PATH:-/opt/homebrew/opt/llvm/bin/llvm-config}"
 
@@ -59,9 +116,9 @@ SIM_SDK=$(xcrun --sdk iphonesimulator --show-sdk-path)
 
 # Install iOS targets if not already installed
 echo "Installing Rust iOS targets..."
-"$RUSTUP_BIN" target add aarch64-apple-ios
-"$RUSTUP_BIN" target add aarch64-apple-ios-sim
-"$RUSTUP_BIN" target add x86_64-apple-ios
+rustup_target_add aarch64-apple-ios
+rustup_target_add aarch64-apple-ios-sim
+rustup_target_add x86_64-apple-ios
 
 # Clean previous builds
 echo "Cleaning previous builds..."
@@ -72,17 +129,20 @@ rm -rf target/universal-sim/release/libwasmer_ios.a
 # Build for iOS device (ARM64)
 echo "Building for iOS device (aarch64-apple-ios)..."
 export BINDGEN_EXTRA_CLANG_ARGS="--target=arm64-apple-ios -isysroot $IOS_SDK"
-"$CARGO_BIN" build --release --target aarch64-apple-ios
+cargo_build --release --target aarch64-apple-ios
+strip_static_library target/aarch64-apple-ios/release/libwasmer_ios.a
 
 # Build for iOS Simulator (ARM64 - Apple Silicon Macs)
 echo "Building for iOS Simulator ARM64 (aarch64-apple-ios-sim)..."
 export BINDGEN_EXTRA_CLANG_ARGS="--target=arm64-apple-ios-simulator -isysroot $SIM_SDK"
-"$CARGO_BIN" build --release --target aarch64-apple-ios-sim
+cargo_build --release --target aarch64-apple-ios-sim
+strip_static_library target/aarch64-apple-ios-sim/release/libwasmer_ios.a
 
 # Build for iOS Simulator (x86_64 - Intel Macs)
 echo "Building for iOS Simulator x86_64 (x86_64-apple-ios)..."
 export BINDGEN_EXTRA_CLANG_ARGS="--target=x86_64-apple-ios-simulator -isysroot $SIM_SDK"
-"$CARGO_BIN" build --release --target x86_64-apple-ios
+cargo_build --release --target x86_64-apple-ios
+strip_static_library target/x86_64-apple-ios/release/libwasmer_ios.a
 
 # Create lipo binary for simulator (combine arm64-sim and x86_64)
 echo "Creating universal simulator library..."
@@ -91,6 +151,7 @@ lipo -create \
     target/aarch64-apple-ios-sim/release/libwasmer_ios.a \
     target/x86_64-apple-ios/release/libwasmer_ios.a \
     -output target/universal-sim/release/libwasmer_ios.a
+strip_static_library target/universal-sim/release/libwasmer_ios.a
 
 # Create XCFramework
 echo "Creating XCFramework..."