Finish Sparkle fallback plumbing

Author: lawrencecchen

Sources/Update/UpdateDriver.swift

@@ -118,7 +118,7 @@ class UpdateDriver: NSObject, SPUUserDriver {
         let details = formatErrorForLog(error)
         UpdateLogStore.shared.append("show updater error: \(details)")
         if usesStandardPresentation,
-           let manualDownloadURL = UpdateViewModel.manualDownloadURL(for: error) {
+           let manualDownloadURL = UpdateViewModel.manualDownloadURL(for: error, infoFeedURLString: lastFeedURLString) {
             clearCustomStateForStandardPresentation()
             presentManualDownloadAlert(for: error, manualDownloadURL: manualDownloadURL) { [weak self] shouldRetry in
                 self?.finishUserInitiatedCheckPresentation()

Sources/Update/UpdatePopoverView.swift

@@ -345,7 +345,7 @@ fileprivate struct UpdateErrorView: View {
             technicalDetails: error.technicalDetails,
             feedURLString: error.feedURLString
         )
-        let manualDownloadURL = UpdateViewModel.manualDownloadURL(for: error.error)
+        let manualDownloadURL = UpdateViewModel.manualDownloadURL(for: error)
 
         VStack(alignment: .leading, spacing: 16) {
             VStack(alignment: .leading, spacing: 8) {

Sources/Update/UpdateViewModel.swift

@@ -353,6 +353,10 @@ class UpdateViewModel: ObservableObject {
         return URL(string: isNightly ? manualDownloadNightlyDMGURLString : manualDownloadDMGURLString)
     }
 
+    static func manualDownloadURL(for updateError: UpdateState.Error) -> URL? {
+        manualDownloadURL(for: updateError.error, infoFeedURLString: updateError.feedURLString)
+    }
+
     private static func networkError(from error: NSError) -> NSError? {
         if error.domain == NSURLErrorDomain {
             return error

cmuxTests/ShortcutAndCommandPaletteTests.swift

@@ -997,6 +997,24 @@ final class UpdateViewModelPresentationTests: XCTestCase {
         )
     }
 
+    func testUpdateStateErrorManualDownloadURLUsesFeedURLString() {
+        let updateError = UpdateState.Error(
+            error: NSError(
+                domain: SUSparkleErrorDomain,
+                code: 4005,
+                userInfo: [NSLocalizedDescriptionKey: "Failed to create installation cache directory"]
+            ),
+            retry: {},
+            dismiss: {},
+            feedURLString: "https://github.com/manaflow-ai/cmux/releases/download/nightly/appcast.xml"
+        )
+
+        XCTAssertEqual(
+            UpdateViewModel.manualDownloadURL(for: updateError)?.absoluteString,
+            "https://github.com/manaflow-ai/cmux/releases/download/nightly/cmux-nightly-macos.dmg"
+        )
+    }
+
     func testSparkleInstallationErrorDetailsUseSparkleCodeName() {
         let error = NSError(
             domain: SUSparkleErrorDomain,

scripts/codesign_app_bundle.sh

@@ -67,12 +67,9 @@ resolve_sparkle_version_dir() {
 
 code_paths_by_depth() {
   local root="$1"
-  find "$root" -mindepth 1 \
-    \( -name '*.framework' -o -name '*.xpc' -o -name '*.app' -o -name '*.dylib' \) \
-    -print |
-    awk -F/ '{print NF ":" $0}' |
-    LC_ALL=C sort -t: -k1,1nr -k2,2 |
-    cut -d: -f2-
+  find "$root" -depth -mindepth 1 \
+    \( -name '*.framework' -o -name '*.xpc' -o -name '*.app' -o -name '*.bundle' -o -name '*.dylib' \) \
+    -print
 }
 
 FRAMEWORKS_DIR="$APP_PATH/Contents/Frameworks"
@@ -85,16 +82,9 @@ fi
 
 if [ -n "$SPARKLE_VERSION_DIR" ]; then
   sign_without_entitlements "$SPARKLE_VERSION_DIR/Autoupdate"
-  if [ -d "$SPARKLE_VERSION_DIR/XPCServices" ]; then
-    while IFS= read -r dependency; do
-      sign_without_entitlements "$dependency"
-    done < <(code_paths_by_depth "$SPARKLE_VERSION_DIR/XPCServices")
-  fi
   while IFS= read -r dependency; do
     sign_without_entitlements "$dependency"
-  done < <(
-    find "$SPARKLE_VERSION_DIR" -mindepth 1 -maxdepth 1 -name '*.app' -print | LC_ALL=C sort
-  )
+  done < <(code_paths_by_depth "$SPARKLE_VERSION_DIR")
 fi
 
 sign_without_entitlements "$SPARKLE_FRAMEWORK"
@@ -106,12 +96,6 @@ if [ -d "$FRAMEWORKS_DIR" ]; then
     esac
     sign_without_entitlements "$dependency"
   done < <(code_paths_by_depth "$FRAMEWORKS_DIR")
-  while IFS= read -r dependency; do
-    [ "$dependency" = "$SPARKLE_FRAMEWORK" ] && continue
-    sign_without_entitlements "$dependency"
-  done < <(
-    find "$FRAMEWORKS_DIR" -mindepth 1 -maxdepth 1 -name '*.bundle' -print | LC_ALL=C sort
-  )
 fi
 
 sign_with_entitlements "$APP_PATH/Contents/Resources/bin/cmux"

tests/test_ci_codesign_app_bundle.sh

@@ -11,8 +11,10 @@ trap 'rm -rf "$TMP_DIR"' EXIT
 APP_PATH="$TMP_DIR/cmux.app"
 SPARKLE_FRAMEWORK="$APP_PATH/Contents/Frameworks/Sparkle.framework"
 SPARKLE_VERSION_DIR="$SPARKLE_FRAMEWORK/Versions/B"
-EXTRA_SPARKLE_XPC="$SPARKLE_VERSION_DIR/XPCServices/InstallerStatus.xpc"
+NESTED_SPARKLE_XPC="$SPARKLE_VERSION_DIR/XPCServices/Installer.xpc/Contents/XPCServices/InstallerStatus.xpc"
+NESTED_SPARKLE_FRAMEWORK="$SPARKLE_VERSION_DIR/Updater.app/Contents/Frameworks/UpdaterSupport.framework"
 OTHER_FRAMEWORK="$APP_PATH/Contents/Frameworks/Sentry.framework"
+NESTED_SENTRY_BUNDLE="$OTHER_FRAMEWORK/Resources/Crashpad.bundle"
 CLI_PATH="$APP_PATH/Contents/Resources/bin/cmux"
 HELPER_PATH="$APP_PATH/Contents/Resources/bin/ghostty"
 ENTITLEMENTS="cmux.entitlements"
@@ -25,9 +27,10 @@ fi
 mkdir -p \
   "$SPARKLE_VERSION_DIR/XPCServices/Installer.xpc" \
   "$SPARKLE_VERSION_DIR/XPCServices/Downloader.xpc" \
-  "$EXTRA_SPARKLE_XPC" \
+  "$NESTED_SPARKLE_XPC" \
+  "$NESTED_SPARKLE_FRAMEWORK" \
   "$SPARKLE_VERSION_DIR/Updater.app" \
-  "$OTHER_FRAMEWORK" \
+  "$NESTED_SENTRY_BUNDLE" \
   "$(dirname "$CLI_PATH")"
 ln -s B "$SPARKLE_FRAMEWORK/Versions/Current"
 touch \
@@ -47,35 +50,37 @@ line_number_regex() {
 
 installer_line="$(line_number_regex 'Installer\.xpc$')"
 downloader_line="$(line_number_regex 'Downloader\.xpc$')"
-extra_xpc_line="$(line_number_regex 'InstallerStatus\.xpc$')"
+nested_xpc_line="$(line_number_regex 'InstallerStatus\.xpc$')"
 autoupdate_line="$(line_number_regex '/Autoupdate$')"
+updater_support_line="$(line_number_regex 'UpdaterSupport\.framework$')"
 updater_line="$(line_number_regex 'Updater\.app$')"
 sparkle_line="$(line_number_regex 'Sparkle\.framework$')"
+nested_bundle_line="$(line_number_regex 'Crashpad\.bundle$')"
 sentry_line="$(line_number_regex 'Sentry\.framework$')"
 cli_line="$(line_number_regex '/Resources/bin/cmux$')"
 helper_line="$(line_number_regex '/Resources/bin/ghostty$')"
 app_line="$(line_number_regex '--entitlements cmux\.entitlements .*/cmux\.app$')"
 verify_line="$(line_number_regex '--verify --deep --strict --verbose=2 .*/cmux\.app$')"
 
-for value_name in installer_line downloader_line extra_xpc_line autoupdate_line updater_line sparkle_line sentry_line cli_line helper_line app_line verify_line; do
+for value_name in installer_line downloader_line nested_xpc_line autoupdate_line updater_support_line updater_line sparkle_line nested_bundle_line sentry_line cli_line helper_line app_line verify_line; do
   if [ -z "${!value_name}" ]; then
     echo "FAIL: expected $value_name in signing plan"
     printf '%s\n' "$OUTPUT"
     exit 1
   fi
 done
 
-if [ "$installer_line" -ge "$sparkle_line" ] || [ "$downloader_line" -ge "$sparkle_line" ] || [ "$extra_xpc_line" -ge "$sparkle_line" ] || [ "$autoupdate_line" -ge "$sparkle_line" ] || [ "$updater_line" -ge "$sparkle_line" ]; then
+if [ "$nested_xpc_line" -ge "$installer_line" ] || [ "$installer_line" -ge "$sparkle_line" ] || [ "$downloader_line" -ge "$sparkle_line" ] || [ "$autoupdate_line" -ge "$sparkle_line" ] || [ "$updater_support_line" -ge "$updater_line" ] || [ "$updater_line" -ge "$sparkle_line" ]; then
   echo "FAIL: Sparkle nested components must be signed before Sparkle.framework"
   exit 1
 fi
 
-if [ "$sparkle_line" -ge "$sentry_line" ] || [ "$sentry_line" -ge "$cli_line" ] || [ "$helper_line" -ge "$app_line" ] || [ "$app_line" -ge "$verify_line" ]; then
+if [ "$nested_bundle_line" -ge "$sentry_line" ] || [ "$sparkle_line" -ge "$sentry_line" ] || [ "$sentry_line" -ge "$cli_line" ] || [ "$helper_line" -ge "$app_line" ] || [ "$app_line" -ge "$verify_line" ]; then
   echo "FAIL: signing order is incorrect"
   exit 1
 fi
 
-for sparkle_component in Installer.xpc Downloader.xpc InstallerStatus.xpc /Autoupdate Updater.app Sparkle.framework Sentry.framework; do
+for sparkle_component in Installer.xpc Downloader.xpc InstallerStatus.xpc /Autoupdate UpdaterSupport.framework Updater.app Crashpad.bundle Sparkle.framework Sentry.framework; do
   if printf '%s\n' "$OUTPUT" | grep -F "$sparkle_component" | grep -Fq -- '--entitlements'; then
     echo "FAIL: $sparkle_component must not be signed with app entitlements"
     exit 1