libimobiledev libs almost build

Sources/Shared/Connections/ConnectionManager.swift

@@ -5,7 +5,7 @@
 //  Created by Riley Testut on 5/23/19.
 //  Copyright © 2019 Riley Testut. All rights reserved.
 //
-#if false
+
 import Foundation
 import Network
 import SideKit
@@ -156,4 +156,3 @@ private extension ConnectionManager {
         }
     }
 }
-#endif

Sources/Shared/Connections/ServerProtocol.swift

@@ -0,0 +1,468 @@
+//
+//  ServerProtocol.swift
+//  AltServer
+//
+//  Created by Riley Testut on 5/24/19.
+//  Copyright © 2019 Riley Testut. All rights reserved.
+//
+
+import Foundation
+import AltSign
+import SideKit
+
+public let ALTServerServiceType = "_altserver._tcp"
+
+protocol ServerMessageProtocol: Codable
+{
+	var version: Int { get }
+	var identifier: String { get }
+}
+
+public enum ServerRequest: Decodable
+{
+	case anisetteData(AnisetteDataRequest)
+	case prepareApp(PrepareAppRequest)
+	case beginInstallation(BeginInstallationRequest)
+	case installProvisioningProfiles(InstallProvisioningProfilesRequest)
+	case removeProvisioningProfiles(RemoveProvisioningProfilesRequest)
+	case removeApp(RemoveAppRequest)
+	case enableUnsignedCodeExecution(EnableUnsignedCodeExecutionRequest)
+	case unknown(identifier: String, version: Int)
+
+	var identifier: String {
+		switch self
+		{
+		case .anisetteData(let request): return request.identifier
+		case .prepareApp(let request): return request.identifier
+		case .beginInstallation(let request): return request.identifier
+		case .installProvisioningProfiles(let request): return request.identifier
+		case .removeProvisioningProfiles(let request): return request.identifier
+		case .removeApp(let request): return request.identifier
+		case .enableUnsignedCodeExecution(let request): return request.identifier
+		case .unknown(let identifier, _): return identifier
+		}
+	}
+
+	var version: Int {
+		switch self
+		{
+		case .anisetteData(let request): return request.version
+		case .prepareApp(let request): return request.version
+		case .beginInstallation(let request): return request.version
+		case .installProvisioningProfiles(let request): return request.version
+		case .removeProvisioningProfiles(let request): return request.version
+		case .removeApp(let request): return request.version
+		case .enableUnsignedCodeExecution(let request): return request.version
+		case .unknown(_, let version): return version
+		}
+	}
+
+	private enum CodingKeys: String, CodingKey
+	{
+		case identifier
+		case version
+	}
+
+	public init(from decoder: Decoder) throws
+	{
+		let container = try decoder.container(keyedBy: CodingKeys.self)
+
+		let version = try container.decode(Int.self, forKey: .version)
+
+		let identifier = try container.decode(String.self, forKey: .identifier)
+		switch identifier
+		{
+		case "AnisetteDataRequest":
+			let request = try AnisetteDataRequest(from: decoder)
+			self = .anisetteData(request)
+
+		case "PrepareAppRequest":
+			let request = try PrepareAppRequest(from: decoder)
+			self = .prepareApp(request)
+
+		case "BeginInstallationRequest":
+			let request = try BeginInstallationRequest(from: decoder)
+			self = .beginInstallation(request)
+
+		case "InstallProvisioningProfilesRequest":
+			let request = try InstallProvisioningProfilesRequest(from: decoder)
+			self = .installProvisioningProfiles(request)
+
+		case "RemoveProvisioningProfilesRequest":
+			let request = try RemoveProvisioningProfilesRequest(from: decoder)
+			self = .removeProvisioningProfiles(request)
+
+		case "RemoveAppRequest":
+			let request = try RemoveAppRequest(from: decoder)
+			self = .removeApp(request)
+
+		case "EnableUnsignedCodeExecutionRequest":
+			let request = try EnableUnsignedCodeExecutionRequest(from: decoder)
+			self = .enableUnsignedCodeExecution(request)
+
+		default:
+			self = .unknown(identifier: identifier, version: version)
+		}
+	}
+}
+
+public enum ServerResponse: Decodable
+{
+	case anisetteData(AnisetteDataResponse)
+	case installationProgress(InstallationProgressResponse)
+	case installProvisioningProfiles(InstallProvisioningProfilesResponse)
+	case removeProvisioningProfiles(RemoveProvisioningProfilesResponse)
+	case removeApp(RemoveAppResponse)
+	case enableUnsignedCodeExecution(EnableUnsignedCodeExecutionResponse)
+	case error(ErrorResponse)
+	case unknown(identifier: String, version: Int)
+
+	var identifier: String {
+		switch self
+		{
+		case .anisetteData(let response): return response.identifier
+		case .installationProgress(let response): return response.identifier
+		case .installProvisioningProfiles(let response): return response.identifier
+		case .removeProvisioningProfiles(let response): return response.identifier
+		case .removeApp(let response): return response.identifier
+		case .enableUnsignedCodeExecution(let response): return response.identifier
+		case .error(let response): return response.identifier
+		case .unknown(let identifier, _): return identifier
+		}
+	}
+
+	var version: Int {
+		switch self
+		{
+		case .anisetteData(let response): return response.version
+		case .installationProgress(let response): return response.version
+		case .installProvisioningProfiles(let response): return response.version
+		case .removeProvisioningProfiles(let response): return response.version
+		case .removeApp(let response): return response.version
+		case .enableUnsignedCodeExecution(let response): return response.version
+		case .error(let response): return response.version
+		case .unknown(_, let version): return version
+		}
+	}
+
+	private enum CodingKeys: String, CodingKey
+	{
+		case identifier
+		case version
+	}
+
+	public init(from decoder: Decoder) throws
+	{
+		let container = try decoder.container(keyedBy: CodingKeys.self)
+
+		let version = try container.decode(Int.self, forKey: .version)
+
+		let identifier = try container.decode(String.self, forKey: .identifier)
+		switch identifier
+		{
+		case "AnisetteDataResponse":
+			let response = try AnisetteDataResponse(from: decoder)
+			self = .anisetteData(response)
+
+		case "InstallationProgressResponse":
+			let response = try InstallationProgressResponse(from: decoder)
+			self = .installationProgress(response)
+
+		case "InstallProvisioningProfilesResponse":
+			let response = try InstallProvisioningProfilesResponse(from: decoder)
+			self = .installProvisioningProfiles(response)
+
+		case "RemoveProvisioningProfilesResponse":
+			let response = try RemoveProvisioningProfilesResponse(from: decoder)
+			self = .removeProvisioningProfiles(response)
+
+		case "RemoveAppResponse":
+			let response = try RemoveAppResponse(from: decoder)
+			self = .removeApp(response)
+
+		case "EnableUnsignedCodeExecutionResponse":
+			let response = try EnableUnsignedCodeExecutionResponse(from: decoder)
+			self = .enableUnsignedCodeExecution(response)
+
+		case "ErrorResponse":
+			let response = try ErrorResponse(from: decoder)
+			self = .error(response)
+
+		default:
+			self = .unknown(identifier: identifier, version: version)
+		}
+	}
+}
+
+// _Don't_ provide generic SuccessResponse, as that would prevent us
+// from easily changing response format for a request in the future.
+public struct ErrorResponse: ServerMessageProtocol
+{
+	public var version = 2
+	public var identifier = "ErrorResponse"
+
+	public var error: ALTServerError {
+		return (self.serverError?.underlyingError as? ALTServerError)!
+	}
+	private var serverError: ALTServerError?
+
+	// Legacy (v1)
+	private var errorCode: ALTServerError.RawValue
+
+	public init(error: ALTServerError)
+	{
+		self.serverError = ALTServerError(error)
+		self.errorCode = error.errorCode
+	}
+}
+
+public struct AnisetteDataRequest: ServerMessageProtocol
+{
+	public var version = 1
+	public var identifier = "AnisetteDataRequest"
+
+	public init()
+	{
+	}
+}
+
+public struct AnisetteDataResponse: ServerMessageProtocol
+{
+	public var version = 1
+	public var identifier = "AnisetteDataResponse"
+
+	public var anisetteData: ALTAnisetteData
+
+	private enum CodingKeys: String, CodingKey
+	{
+		case identifier
+		case version
+		case anisetteData
+	}
+
+	public init(anisetteData: ALTAnisetteData)
+	{
+		self.anisetteData = anisetteData
+	}
+
+	public init(from decoder: Decoder) throws
+	{
+		let container = try decoder.container(keyedBy: CodingKeys.self)
+		self.version = try container.decode(Int.self, forKey: .version)
+		self.identifier = try container.decode(String.self, forKey: .identifier)
+
+		let json = try container.decode([String: String].self, forKey: .anisetteData)
+
+//		if let anisetteData = ALTAnisetteData() //(json: json)
+//		{
+//			self.anisetteData = anisetteData
+//		}
+//		else
+//		{
+			throw DecodingError.dataCorruptedError(forKey: CodingKeys.anisetteData, in: container, debugDescription: "Couuld not parse anisette data from JSON")
+//		}
+	}
+
+	public func encode(to encoder: Encoder) throws
+	{
+		var container = encoder.container(keyedBy: CodingKeys.self)
+		try container.encode(self.version, forKey: .version)
+		try container.encode(self.identifier, forKey: .identifier)
+
+//		let json = self.anisetteData.json()
+//		try container.encode(json, forKey: .anisetteData)
+	}
+}
+
+public struct PrepareAppRequest: ServerMessageProtocol
+{
+	public var version = 1
+	public var identifier = "PrepareAppRequest"
+
+	public var udid: String
+	public var contentSize: Int
+
+	public var fileURL: URL?
+
+	public init(udid: String, contentSize: Int, fileURL: URL? = nil)
+	{
+		self.udid = udid
+		self.contentSize = contentSize
+		self.fileURL = fileURL
+	}
+}
+
+public struct BeginInstallationRequest: ServerMessageProtocol
+{
+	public var version = 3
+	public var identifier = "BeginInstallationRequest"
+
+	// If activeProfiles is non-nil, then AltServer should remove all profiles except active ones.
+	public var activeProfiles: Set<String>?
+
+	public var bundleIdentifier: String?
+
+	public init(activeProfiles: Set<String>?, bundleIdentifier: String?)
+	{
+		self.activeProfiles = activeProfiles
+		self.bundleIdentifier = bundleIdentifier
+	}
+}
+
+public struct InstallationProgressResponse: ServerMessageProtocol
+{
+	public var version = 1
+	public var identifier = "InstallationProgressResponse"
+
+	public var progress: Double
+
+	public init(progress: Double)
+	{
+		self.progress = progress
+	}
+}
+
+public struct InstallProvisioningProfilesRequest: ServerMessageProtocol
+{
+	public var version = 1
+	public var identifier = "InstallProvisioningProfilesRequest"
+
+	public var udid: String
+	public var provisioningProfiles: Set<ALTProvisioningProfile>
+
+	// If activeProfiles is non-nil, then AltServer should remove all profiles except active ones.
+	public var activeProfiles: Set<String>?
+
+	private enum CodingKeys: String, CodingKey
+	{
+		case identifier
+		case version
+		case udid
+		case provisioningProfiles
+		case activeProfiles
+	}
+
+	public init(udid: String, provisioningProfiles: Set<ALTProvisioningProfile>, activeProfiles: Set<String>?)
+	{
+		self.udid = udid
+		self.provisioningProfiles = provisioningProfiles
+		self.activeProfiles = activeProfiles
+	}
+
+	public init(from decoder: Decoder) throws
+	{
+		let container = try decoder.container(keyedBy: CodingKeys.self)
+		self.version = try container.decode(Int.self, forKey: .version)
+		self.identifier = try container.decode(String.self, forKey: .identifier)
+		self.udid = try container.decode(String.self, forKey: .udid)
+
+		let rawProvisioningProfiles = try container.decode([Data].self, forKey: .provisioningProfiles)
+		let provisioningProfiles = try rawProvisioningProfiles.map { (data) -> ALTProvisioningProfile in
+			guard let profile = ALTProvisioningProfile(data: data) else {
+				throw DecodingError.dataCorruptedError(forKey: CodingKeys.provisioningProfiles, in: container, debugDescription: "Could not parse provisioning profile from data.")
+			}
+			return profile
+		}
+
+		self.provisioningProfiles = Set(provisioningProfiles)
+		self.activeProfiles = try container.decodeIfPresent(Set<String>.self, forKey: .activeProfiles)
+	}
+
+	public func encode(to encoder: Encoder) throws
+	{
+		var container = encoder.container(keyedBy: CodingKeys.self)
+		try container.encode(self.version, forKey: .version)
+		try container.encode(self.identifier, forKey: .identifier)
+		try container.encode(self.udid, forKey: .udid)
+
+		try container.encode(self.provisioningProfiles.map { $0.data }, forKey: .provisioningProfiles)
+		try container.encodeIfPresent(self.activeProfiles, forKey: .activeProfiles)
+	}
+}
+
+public struct InstallProvisioningProfilesResponse: ServerMessageProtocol
+{
+	public var version = 1
+	public var identifier = "InstallProvisioningProfilesResponse"
+
+	public init()
+	{
+	}
+}
+
+public struct RemoveProvisioningProfilesRequest: ServerMessageProtocol
+{
+	public var version = 1
+	public var identifier = "RemoveProvisioningProfilesRequest"
+
+	public var udid: String
+	public var bundleIdentifiers: Set<String>
+
+	public init(udid: String, bundleIdentifiers: Set<String>)
+	{
+		self.udid = udid
+		self.bundleIdentifiers = bundleIdentifiers
+	}
+}
+
+public struct RemoveProvisioningProfilesResponse: ServerMessageProtocol
+{
+	public var version = 1
+	public var identifier = "RemoveProvisioningProfilesResponse"
+
+	public init()
+	{
+	}
+}
+
+public struct RemoveAppRequest: ServerMessageProtocol
+{
+	public var version = 1
+	public var identifier = "RemoveAppRequest"
+
+	public var udid: String
+	public var bundleIdentifier: String
+
+	public init(udid: String, bundleIdentifier: String)
+	{
+		self.udid = udid
+		self.bundleIdentifier = bundleIdentifier
+	}
+}
+
+public struct RemoveAppResponse: ServerMessageProtocol
+{
+	public var version = 1
+	public var identifier = "RemoveAppResponse"
+
+	public init()
+	{
+	}
+}
+
+public struct EnableUnsignedCodeExecutionRequest: ServerMessageProtocol
+{
+	public var version = 1
+	public var identifier = "EnableUnsignedCodeExecutionRequest"
+
+	public var udid: String
+	public var processID: Int?
+	public var processName: String?
+
+	public init(udid: String, processID: Int? = nil, processName: String? = nil)
+	{
+		self.udid = udid
+		self.processID = processID
+		self.processName = processName
+	}
+}
+
+public struct EnableUnsignedCodeExecutionResponse: ServerMessageProtocol
+{
+	public var version = 1
+	public var identifier = "EnableUnsignedCodeExecutionResponse"
+
+	public init()
+	{
+	}
+}

Sources/SideDaemon/DaemonRequestHandler.swift

@@ -7,6 +7,8 @@
 //
 
 import Foundation
+import Shared
+import SideKit
 
 typealias DaemonConnectionManager = ConnectionManager<DaemonRequestHandler>
 

Sources/SideStore/Intents/ViewAppIntentHandler.swift

@@ -6,7 +6,6 @@
 //  Copyright © 2020 Riley Testut. All rights reserved.
 //
 
-import SideStoreCore
 import Intents
 
 @available(iOS 14, *)

Sources/SideStore/Resources/XIB/AboutPatreonHeaderView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -53,13 +53,13 @@
                                                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="TFB-qo-cbh">
                                                     <rect key="frame" x="195" y="0.0" width="83" height="55"/>
                                                     <subviews>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="Zpb-k3-y7l">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="Zpb-k3-y7l">
                                                             <rect key="frame" x="0.0" y="0.0" width="83" height="50"/>
                                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
                                                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VOu-b8-uEL">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VOu-b8-uEL">
                                                             <rect key="frame" x="0.0" y="52" width="83" height="3"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                             <color key="textColor" white="1" alpha="0.65000000000000002" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -126,7 +126,7 @@ If you would subscribe to the patreon that would support us and make sure we can
     <resources>
         <image name="SideStore" width="180" height="180"/>
         <namedColor name="SettingsHighlighted">
-            <color red="0.23529411764705882" green="0.0" blue="0.40392156862745099" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.38823529411764707" green="0.011764705882352941" blue="0.58823529411764708" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
 </document>

Sources/SideStoreCore/Extensions/FileManager+SharedDirectories.swift

@@ -7,11 +7,15 @@
 //
 
 import Foundation
+import Shared
 
 public extension FileManager {
     var altstoreSharedDirectory: URL? {
-        guard let appGroup = Bundle.main.appGroups.first else { return nil }
-
+		#if SWIFT_PACKAGE
+		guard let appGroup = Bundle.main.appGroups.first else { return nil }
+		#else
+		guard let appGroup = Bundle.main.appGroups.first else { return nil }
+		#endif
         let sharedDirectoryURL = containerURL(forSecurityApplicationGroupIdentifier: appGroup)
         return sharedDirectoryURL
     }

Sources/SideStoreCore/Model/StoreApp.swift

@@ -15,11 +15,11 @@ import Roxas
 public extension StoreApp {
 	#if SWIFT_PACKAGE
 		#if ALPHA
-			static let altstoreAppID = Bundle.main.Info.appbundleIdentifier
+			static let altstoreAppID = Bundle.Info.appbundleIdentifier
 		#elseif BETA
-			static let altstoreAppID = Bundle.main.Info.appbundleIdentifier
+			static let altstoreAppID = Bundle.Info.appbundleIdentifier
 		#else
-			static let altstoreAppID = Bundle.main.Info.appbundleIdentifier
+			static let altstoreAppID = Bundle.Info.appbundleIdentifier
 		#endif
 	#else
 		#if ALPHA

Sources/libimobiledevice/libimobiledevice-glue/include

@@ -1 +0,0 @@
-../dependencies/libimobiledevice-glue/include

Sources/libimobiledevice/libimobiledevice-glue/include/common.h

@@ -0,0 +1 @@
+../../dependencies/libimobiledevice-glue/src/common.h

Sources/libimobiledevice/libplist/include

@@ -1 +0,0 @@
-../dependencies/libplist/include

Sources/libimobiledevice/libplist/include/base64.h

@@ -0,0 +1 @@
+../src/base64.h

Sources/libimobiledevice/libplist/include/bytearray.h

@@ -0,0 +1 @@
+../src/bytearray.h

Sources/libimobiledevice/libplist/include/hashtable.h

@@ -0,0 +1 @@
+../src/hashtable.h

Sources/libimobiledevice/libplist/include/plist.h

@@ -0,0 +1 @@
+../src/plist.h

Sources/libimobiledevice/libplist/include/ptrarray.h

@@ -0,0 +1 @@
+../src/ptrarray.h

Sources/libimobiledevice/libplist/include/strbuf.h

@@ -0,0 +1 @@
+../src/strbuf.h

Sources/libimobiledevice/libplist/include/time64.h

@@ -0,0 +1 @@
+../src/time64.h

Sources/libimobiledevice/libplist/include/time64_limits.h

@@ -0,0 +1 @@
+../src/time64_limits.h

Sources/libimobiledevice/libplist/libcnary/node.c

@@ -0,0 +1 @@
+../../dependencies/libplist/libcnary/node.c

Sources/libimobiledevice/libplist/libcnary/node_list.c

@@ -0,0 +1 @@
+../../dependencies/libplist/libcnary/node_list.c

Sources/libimobiledevice/libusbmuxd/include

@@ -1 +0,0 @@
-../dependencies/libusbmuxd/include