serve-sim 0.1.44-beta.99.3 → 0.1.44

package/Package.swift

@@ -23,7 +23,7 @@ let package = Package(
         .library(
             name: "serve-sim-native",
             type: .dynamic,
-            targets: ["SimNativeModule"]
+            targets: ["SimNative"]
         ),
     ],
     dependencies: [
@@ -31,40 +31,19 @@ let package = Package(
     ],
     targets: [
         .target(
-            name: "SimNativeModule",
+            name: "SimNative",
             dependencies: [
                 .product(name: "NodeAPI", package: "node-swift"),
                 .product(name: "NodeModuleSupport", package: "node-swift"),
             ],
-            path: "Sources",
-            // Sibling targets built by their own build.sh (Obj-C/ObjC++), not
-            // part of this SwiftPM package.
             exclude: [
-                "SimCameraInjector",
-                "SimCameraHelper",
-                "SimAXSettings",
-                "SimNative/build.sh",
-            ],
-            sources: [
-                "SimNative/sim-module.swift",
-                "SimNative/sim-capture.swift",
-                "SimStreamHelper/HIDInjector.swift",
-                "SimStreamHelper/FrameCapture.swift",
-                "SimStreamHelper/VideoEncoder.swift",
-                "SimStreamHelper/H264Encoder.swift",
-                "SimStreamHelper/StreamFormat.swift",
-                "SimStreamHelper/AccessibilityBridge.swift",
-                "SimStreamHelper/SimFrameworks.swift",
-                "SimStreamHelper/Xcode.swift",
+                "build.sh",
             ],
             linkerSettings: [
-                .linkedFramework("CoreVideo"),
-                .linkedFramework("CoreMedia"),
-                .linkedFramework("IOSurface"),
-                .linkedFramework("CoreGraphics"),
-                .linkedFramework("VideoToolbox"),
-                .linkedFramework("ImageIO"),
-                .linkedFramework("AppKit"),
+                .unsafeFlags([
+                    "-Xlinker", "-undefined",
+                    "-Xlinker", "dynamic_lookup",
+                ])
             ]
         ),
     ],

package/Sources/SimNative/build.sh

@@ -3,15 +3,11 @@
 # spawned serve-sim-bin helper. The JS bindings are written in Swift with
 # node-swift (see ../../Package.swift and sim-module.swift).
 #
-# Host-arch only (arm64 on Apple Silicon / CI). We use a plain `swift build`,
-# i.e. the NATIVE SwiftPM build system, because that is the only mode that
-# resolves node-swift's #NodeModule macro plugin: both `--arch X --arch Y`
-# (universal) and `--triple <other-arch>` force Xcode's XCBuild, which fails to
-# resolve the NodeAPIMacros plugin on stock toolchains ("missing target
-# NodeAPIMacros" / "unable to resolve module SwiftSyntax"). Cross-compiling the
-# x86_64 slice would therefore require an x86_64-native toolchain (Rosetta),
-# which isn't available everywhere; serve-sim targets Apple Silicon. napi_* stay
-# undefined and resolve against the host (Node/Bun) at dlopen via
+# We opt into the new `swiftbuild` build system, because it supports building universal
+# binaries with macros, which neither the legacy `native` build system nor the
+# perennially-janky legacy `xcode` build system had support for.
+#
+# napi_* stay undefined and resolve against the host (Node/Bun) at dlopen via
 # `-undefined dynamic_lookup`.
 set -euo pipefail
 HERE="$(cd "$(dirname "$0")" && pwd)"
@@ -26,25 +22,23 @@ if [ ! -d "$PKG/node_modules/node-swift" ]; then
   exit 1
 fi
 
-swift build \
-  -c release \
-  --product "$PRODUCT" \
-  --package-path "$PKG" \
-  --build-path "$BUILD_DIR" \
-  -Xlinker -undefined -Xlinker dynamic_lookup
-
-# `-print -quit` (not `| head`): under `pipefail`, head closing the pipe early
-# would SIGPIPE find and fail the script. Match by name rather than a fixed
-# subpath: the product dir varies by toolchain (native SwiftPM emits
-# .build/release/, the Xcode build system emits .build/out/Products/Release/).
-DYLIB="$(find "$BUILD_DIR" -name "lib${PRODUCT}.dylib" -type f -not -path '*.dSYM*' -print -quit)"
-if [ -z "$DYLIB" ]; then
-  echo "Build succeeded but lib${PRODUCT}.dylib was not found under $BUILD_DIR" >&2
+build_flags=(
+  -c release
+  --product "$PRODUCT"
+  --package-path "$PKG"
+  --build-path "$BUILD_DIR"
+  --build-system swiftbuild
+)
+swift build "${build_flags[@]}" >&2
+DYLIB="$(swift build --show-bin-path "${build_flags[@]}")/lib${PRODUCT}.dylib"
+if [ ! -f "$DYLIB" ]; then
+  echo "Expected build product not found at $DYLIB" >&2
   exit 1
 fi
 
 OUT="$OUT_DIR/${PRODUCT}.node"
-cp "$DYLIB" "$OUT"
+cp -a "$DYLIB" "$OUT"
+strip -x "$OUT"
 codesign -s - -f "$OUT" 2>/dev/null || true
 
 echo "Built: $OUT"