Improve fairtool launch script

Author: marcprux

Sources/FairExpo/AltStoreAPI.swift

@@ -87,7 +87,8 @@ public struct AltStoreService : EndpointService {
                 } else if downloadResponse.downloadExpired == true {
                     // request processing, then continue to wait…
                     logger("download expired for adpid=\(adpid), requesting re-download…")
-                    let request = try await request(AltStoreService.ADPProcessRequest(adpID: adpid))
+                    let processing = try await request(AltStoreService.ADPProcessRequest(adpID: adpid))
+                    logger("request processing for adpid=\(adpid) with status \(processing.status ?? "unknown")")
                     try await Task.sleep(interval: 10)
                     continue
                 }
@@ -107,7 +108,7 @@ public struct AltStoreService : EndpointService {
                     // try requesting the download
                     logger("download unknown for adpid=\(adpid), requesting processing…")
                     // TODO: these seem to trigger a 202 with no data when processing is initiated
-                    let request = try? await request(AltStoreService.ADPProcessRequest(adpID: adpid))
+                    _ = try await requestOptional(AltStoreService.ADPProcessRequest(adpID: adpid))
                     try await Task.sleep(interval: 10)
                     continue
                 } else {

Sources/FairExpo/EndpointService.swift

@@ -110,6 +110,13 @@ extension EndpointService {
     public func request<A: APIRequest>(_ request: A, cache: URLRequest.CachePolicy? = nil) async throws -> A.Response where A.Service == Self {
         try await decode(data: try session.fetch(request: buildRequest(for: request, cache: cache)).data)
     }
+    
+    /// Perform a request, but permit the data to be empty and and return nil.
+    public func requestOptional<A: APIRequest>(_ request: A, cache: URLRequest.CachePolicy? = nil) async throws -> A.Response? where A.Service == Self {
+        let data = try await session.fetch(request: buildRequest(for: request, cache: cache)).data
+        if data.isEmpty { return nil }
+        return try decode(data: data)
+    }
 
     /// Fetches the web service for the given request, following the cursor until the `batchHandler` returns a non-`nil` response; the first response element will be returned
     @discardableResult public func requestBatches<T, A: CursoredAPIRequest>(_ request: A, cache: URLRequest.CachePolicy? = nil, interleaveDelay: TimeInterval? = 1.5, batchHandler: (_ requestIndex: Int, _ urlResponse: URLResponse?, _ batch: A.Response) throws -> T?) async throws -> T? where A.Service == Self {

scripts/package_fairtool.sh

@@ -28,9 +28,13 @@ done
 # make a shell script that launches the right binary
 cat > fairtool-bin/fairtool << "EOF"
 #!/bin/bash
-set -eu
+set -e
 FOLDER="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-${FOLDER}/$(uname -s)/$(uname -m)/fairtool ${@}
+OS=$(uname -s)
+ARCH=$(uname -m)
+FAIRTOOL="${FOLDER}"/"${OS}"/"${ARCH}"/fairtool
+if [ "${OS}" = "Darwin" ]; then xattr -c "${FAIRTOOL}"; fi
+"${FAIRTOOL}" "${@}"
 EOF
 chmod +x fairtool-bin/fairtool