mirror of
https://github.com/xtool-org/xtool.git
synced 2026-11-21 10:45:53 +03:00
Compare commits
8 Commits
@@ -1299,7 +1299,6 @@ public enum Components {
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/appAvailabilityV2`.
|
||||
public var appAvailabilityV2: Components.Schemas.App.RelationshipsPayload.AppAvailabilityV2Payload?
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/inAppPurchases`.
|
||||
@available(*, deprecated)
|
||||
public struct InAppPurchasesPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/inAppPurchases/links`.
|
||||
public var links: Components.Schemas.RelationshipLinks?
|
||||
@@ -1358,7 +1357,6 @@ public enum Components {
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/inAppPurchases`.
|
||||
@available(*, deprecated)
|
||||
public var inAppPurchases: Components.Schemas.App.RelationshipsPayload.InAppPurchasesPayload?
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/subscriptionGroups`.
|
||||
public struct SubscriptionGroupsPayload: Codable, Hashable, Sendable {
|
||||
@@ -5021,6 +5019,8 @@ public enum Components {
|
||||
case ios = "IOS"
|
||||
case macOs = "MAC_OS"
|
||||
case universal = "UNIVERSAL"
|
||||
case services = "SERVICES"
|
||||
case macos = "MACOS"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CapabilityOption`.
|
||||
public struct CapabilityOption: Codable, Hashable, Sendable {
|
||||
|
||||
@@ -3,6 +3,7 @@ info:
|
||||
title: Overlay for App Store Connect API
|
||||
version: 1.0.0
|
||||
actions:
|
||||
# this field is required when using the private Xcode API
|
||||
- target: '$.components.schemas.BundleIdCapabilityCreateRequest.properties.data.properties.relationships'
|
||||
update:
|
||||
properties:
|
||||
@@ -20,6 +21,22 @@ actions:
|
||||
required: [id, type]
|
||||
required: [data]
|
||||
required: [capability]
|
||||
# we don't use this but it triggers a deprecation warning. see:
|
||||
# https://github.com/apple/swift-openapi-generator/issues/715
|
||||
- target: '$.components.schemas.App.properties.relationships.properties.inAppPurchases'
|
||||
update:
|
||||
deprecated: false
|
||||
# openapi-generator expects response enums to be exhaustive. Apple's ASC OpenAPI spec
|
||||
# misses some cases that they do, actually, return.
|
||||
- target: '$.components.schemas.Device.properties.attributes.properties.deviceClass'
|
||||
update:
|
||||
enum: ["APPLE_VISION_PRO"]
|
||||
enum:
|
||||
- APPLE_VISION_PRO
|
||||
- target: '$.components.schemas.BundleIdPlatform'
|
||||
update:
|
||||
enum:
|
||||
- SERVICES
|
||||
# the spec already declares MAC_OS but ASC sometimes seems to
|
||||
# spell this as MACOS instead. see:
|
||||
# https://github.com/xtool-org/xtool/issues/64
|
||||
- MACOS
|
||||
|
||||
@@ -15,15 +15,14 @@ public struct BuildSettings: Sendable {
|
||||
|
||||
public init(
|
||||
configuration: BuildConfiguration,
|
||||
triple: String,
|
||||
packagePath: String = ".",
|
||||
options: [String] = []
|
||||
) async throws {
|
||||
self.packagePath = packagePath
|
||||
self.configuration = configuration
|
||||
self.options = options
|
||||
|
||||
// TODO: allow customizing?
|
||||
self.triple = "arm64-apple-ios"
|
||||
self.triple = triple
|
||||
|
||||
// on macOS we don't explicitly install a Swift SDK but
|
||||
// SwiftPM vends "implicit" Darwin SDKs as of Swift 6.1,
|
||||
|
||||
@@ -17,7 +17,8 @@ extension DeveloperAPIClient {
|
||||
),
|
||||
transport: httpClient.asOpenAPITransport,
|
||||
middlewares: [
|
||||
auth.middleware
|
||||
auth.middleware,
|
||||
LoggingMiddleware(),
|
||||
]
|
||||
)
|
||||
}
|
||||
@@ -219,3 +220,39 @@ public struct DeveloperAPIASCAuthMiddleware: ClientMiddleware {
|
||||
return try await next(request, body, baseURL)
|
||||
}
|
||||
}
|
||||
|
||||
struct LoggingMiddleware: ClientMiddleware {
|
||||
static let regex: NSRegularExpression? = {
|
||||
guard let pat = ProcessInfo.processInfo.environment["XTL_DEV_LOG"] else { return nil }
|
||||
return try? NSRegularExpression(pattern: pat)
|
||||
}()
|
||||
|
||||
func intercept(
|
||||
_ request: HTTPRequest,
|
||||
body: HTTPBody?,
|
||||
baseURL: URL,
|
||||
operationID: String,
|
||||
next: (HTTPRequest, HTTPBody?, URL) async throws -> (HTTPResponse, HTTPBody?)
|
||||
) async throws -> (HTTPResponse, HTTPBody?) {
|
||||
var (response, body) = try await next(request, body, baseURL)
|
||||
|
||||
guard Self.regex?.firstMatch(
|
||||
in: operationID,
|
||||
range: NSRange(operationID.startIndex..., in: operationID)
|
||||
) != nil
|
||||
else { return (response, body) }
|
||||
|
||||
print("\n\(operationID) response status -> \(response.status)")
|
||||
|
||||
if let unwrapped = body {
|
||||
let data = try await Data(collecting: unwrapped, upTo: .max)
|
||||
// body may only be consumable once, replace it with the collected data
|
||||
body = .init(data)
|
||||
|
||||
let text = String(decoding: data, as: UTF8.self)
|
||||
print("\(operationID) response body -> \(text)")
|
||||
}
|
||||
|
||||
return (response, body)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,6 +18,9 @@ struct PackOperation {
|
||||
}
|
||||
}
|
||||
|
||||
static let defaultTriple = "arm64-apple-ios"
|
||||
|
||||
var triple: String?
|
||||
var buildOptions = BuildOptions(configuration: .debug)
|
||||
var xcode = false
|
||||
|
||||
@@ -39,6 +42,7 @@ struct PackOperation {
|
||||
|
||||
let buildSettings = try await BuildSettings(
|
||||
configuration: buildOptions.configuration,
|
||||
triple: triple ?? Self.defaultTriple,
|
||||
options: []
|
||||
)
|
||||
|
||||
@@ -90,8 +94,16 @@ struct DevBuildCommand: AsyncParsableCommand {
|
||||
help: "Output a .ipa file instead of a .app"
|
||||
) var ipa = false
|
||||
|
||||
@Option(
|
||||
help: ArgumentHelp(
|
||||
"Custom target triple to build for",
|
||||
discussion: "Defaults to '\(PackOperation.defaultTriple)'"
|
||||
)
|
||||
) var triple: String?
|
||||
|
||||
func run() async throws {
|
||||
let url = try await PackOperation(
|
||||
triple: triple,
|
||||
buildOptions: packOptions
|
||||
).run()
|
||||
|
||||
@@ -136,10 +148,39 @@ struct DevRunCommand: AsyncParsableCommand {
|
||||
|
||||
@OptionGroup var packOptions: PackOperation.BuildOptions
|
||||
|
||||
#if os(macOS)
|
||||
@Flag(
|
||||
name: .shortAndLong,
|
||||
help: "Target the iOS Simulator"
|
||||
) var simulator = false
|
||||
|
||||
var triple: String? {
|
||||
if simulator {
|
||||
#if arch(arm64)
|
||||
return "arm64-apple-ios-simulator"
|
||||
#elseif arch(x86_64)
|
||||
return "x86_64-apple-ios-simulator"
|
||||
#else
|
||||
#error("Unsupported architecture")
|
||||
#endif
|
||||
}
|
||||
return nil
|
||||
}
|
||||
#else
|
||||
var triple: String? { nil }
|
||||
#endif
|
||||
|
||||
@OptionGroup var connectionOptions: ConnectionOptions
|
||||
|
||||
func run() async throws {
|
||||
let output = try await PackOperation(buildOptions: packOptions).run()
|
||||
let output = try await PackOperation(triple: triple, buildOptions: packOptions).run()
|
||||
|
||||
#if os(macOS)
|
||||
if simulator {
|
||||
try await SimInstallOperation(path: output).run()
|
||||
return
|
||||
}
|
||||
#endif
|
||||
|
||||
let token = try AuthToken.saved()
|
||||
|
||||
@@ -175,3 +216,20 @@ struct DevCommand: AsyncParsableCommand {
|
||||
}
|
||||
|
||||
extension BuildConfiguration: ExpressibleByArgument {}
|
||||
|
||||
#if os(macOS)
|
||||
struct SimInstallOperation {
|
||||
var path: URL
|
||||
|
||||
// TODO: allow customizing this
|
||||
var simulator = "booted"
|
||||
|
||||
func run() async throws {
|
||||
let process = Process()
|
||||
process.executableURL = URL(fileURLWithPath: "/usr/bin/xcrun")
|
||||
process.arguments = ["simctl", "install", simulator, path.path]
|
||||
try await process.runUntilExit()
|
||||
print("Installed to simulator")
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -6,5 +6,7 @@ ENABLE_HARDENED_RUNTIME = YES
|
||||
PRODUCT_NAME = xtool
|
||||
PRODUCT_MODULE_NAME = XToolMac
|
||||
|
||||
INFOPLIST_KEY_LSApplicationCategoryType = public.app-category.developer-tools
|
||||
|
||||
#include? "Private-Team.xcconfig"
|
||||
#include? "Private.xcconfig"
|
||||
|
||||
Reference in New Issue
Block a user