Rust: SargonOS &Drivers more Profile Logic | Swift: Shared State (working example app)!

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sargon"
-version = "1.0.2"
+version = "1.1.0"
 edition = "2021"
 build = "build.rs"
 

Package.swift

@@ -81,8 +81,7 @@ let package = Package(
 				.target(name: "Sargon"),
 				.product(name: "CustomDump", package: "swift-custom-dump"),
 			],
-			path: "apple/Tests",
-			swiftSettings: swiftSettings
+			path: "apple/Tests"
 		),
 	]
 )

apple/Sources/Sargon/Drivers/EventBus/EventBus.swift

@@ -26,9 +26,15 @@ public final actor EventBus {
 	/// A stream we multicast on.
 	private let stream = AsyncThrowingPassthroughSubject<Element, any Error>()
 	private let subject: Subject
+#if DEBUG
 	public init() {
 		subject = .init()
 	}
+#else
+	private init() {
+		subject = .init()
+	}
+#endif
 }
 
 extension EventBus {

apple/Sources/Sargon/Drivers/EventBus/EventNotification+Swiftified.swift

@@ -18,7 +18,7 @@ extension EventProfileModified {
 extension Event {
 	public var profileModified: EventProfileModified? {
 		switch self {
-		case let .modifiedProfile(change): return change
+		case let .profileModified(change): return change
 		default: return nil
 		}
 	}

apple/Sources/Sargon/Drivers/FileSystem/FileSystemDriver+Data+ContentsOf+URL.swift

@@ -45,8 +45,7 @@
 	) throws -> T {
 		let url = URL(file: path)
 		guard url.startAccessingSecurityScopedResource() else {
-			// FIXME CYON change to specific error
-			throw CommonError.Unknown
+			throw CommonError.NotPermissionToAccessFile(path: path)
 		}
 		defer { url.stopAccessingSecurityScopedResource() }
 		return try io(url)

apple/Sources/Sargon/Drivers/TestDrivers/SecureStorage/SecureStorageDriver+InsecureTestOnlyEphemeral_SecureStorage.swift

@@ -9,11 +9,6 @@ import Foundation
 import SargonUniFFI
 
 #if DEBUG
-extension SecureStorageDriver where Self == Insecure︕！TestOnly︕！Ephemeral︕！SecureStorage {
-	public init(keychainService: String) {
-		self.init(keychainService: keychainService)
-	}
-}
 
 /// ‼️ NEVER USE IN PRODUCTION ‼️
 /// An INSECURE ephemeral storage conforming to `SecureStorageDriver` meant

apple/Sources/Sargon/Extensions/Methods/System/Event/EventKind+Wrap+Functions.swift

@@ -0,0 +1,25 @@
+//
+//  File.swift
+//  
+//
+//  Created by Alexander Cyon on 2024-05-24.
+//
+
+import Foundation
+import SargonUniFFI
+
+extension EventKind {
+	public static let allCases: [Self] = eventKindAll()
+
+	public var affectsCurrentAccounts: Bool {
+		eventKindAffectsCurrentAccounts(eventKind: self)
+	}
+
+	public var affectsCurrentNetwork: Bool {
+		eventKindAffectsCurrentNetwork(eventKind: self)
+	}
+
+	public var affectsSavedGateways: Bool {
+		eventKindAffectsSavedGateways(eventKind: self)
+	}
+}

apple/Sources/Sargon/Extensions/Swiftified/System/BIOS/BIOS+Swiftified.swift

@@ -11,35 +11,6 @@ import SargonUniFFI
 public typealias BIOS = Bios
 extension BIOS: @unchecked Sendable {}
 
-
-extension Drivers {
-	public convenience init(
-		bundle: Bundle,
-		userDefaultsSuite: String,
-		secureStorageDriver: SecureStorageDriver
-	) {
-		self.init(
-			appVersion: (bundle.infoDictionary?["CFBundleShortVersionString"] as? String) ?? "Unknown",
-			userDefaultsSuite: userDefaultsSuite,
-			secureStorageDriver: secureStorageDriver
-		)
-	}
-
-	public convenience init(
-		appVersion: String,
-		userDefaultsSuite: String,
-		secureStorageDriver: SecureStorageDriver
-	) {
-		self.init(
-			secureStorage: secureStorageDriver,
-			hostInfo: HostInfo(appVersion: appVersion),
-			unsafeStorage: UnsafeStorage(
-				userDefaults: .init(suiteName: userDefaultsSuite)!
-			)
-		)
-	}
-}
-
 extension BIOS {
 
 	public convenience init(

apple/Sources/Sargon/Extensions/Swiftified/System/Drivers/Drivers+Swiftified.swift

@@ -10,6 +10,36 @@ import SargonUniFFI
 
 
 extension Drivers: @unchecked Sendable {}
+
+
+extension Drivers {
+	public convenience init(
+		bundle: Bundle,
+		userDefaultsSuite: String,
+		secureStorageDriver: SecureStorageDriver
+	) {
+		self.init(
+			appVersion: (bundle.infoDictionary?["CFBundleShortVersionString"] as? String) ?? "Unknown",
+			userDefaultsSuite: userDefaultsSuite,
+			secureStorageDriver: secureStorageDriver
+		)
+	}
+
+	public convenience init(
+		appVersion: String,
+		userDefaultsSuite: String,
+		secureStorageDriver: SecureStorageDriver
+	) {
+		self.init(
+			secureStorage: secureStorageDriver,
+			hostInfo: HostInfo(appVersion: appVersion),
+			unsafeStorage: UnsafeStorage(
+				userDefaults: .init(suiteName: userDefaultsSuite)!
+			)
+		)
+	}
+}
+
 extension Drivers {
 
 	public convenience init(

apple/Sources/Sargon/Extensions/Swiftified/System/Event/EventKind+Swiftified.swift

@@ -0,0 +1,16 @@
+//
+//  File.swift
+//  
+//
+//  Created by Alexander Cyon on 2024-05-24.
+//
+
+import Foundation
+import SargonUniFFI
+
+extension EventKind: SargonModel {
+	public static let sample: Self = .accountAdded
+	public static let sampleOther: Self = .accountUpdated
+}
+extension EventKind: CaseIterable {}
+

apple/Sources/Sargon/SargonOS/BIOS+Static+Shared.swift

@@ -9,34 +9,42 @@
 import SargonUniFFI
 
 extension BIOS {
-	private nonisolated(unsafe) static var _shared: BIOS!
 
 	public nonisolated(unsafe) static var shared: BIOS {
 		guard let shared = Self._shared else {
-			fatalError("BIOS not created, create it with `BIOS.createShared:bundle:keychainService:userDefaultsSuite`")
+			fatalError("BIOS not created, create it with `BIOS.creatingShared:drivers`")
 		}
 		return shared
 	}
 
 	/// Can be access later with `OS.shared`
 	@discardableResult
-	public static func createdShared(
-		bundle: Bundle,
-		userDefaultsSuite: String,
-		secureStorageDriver: SecureStorageDriver
+	public static func creatingShared(
+		drivers: Drivers
+	) -> BIOS {
+		Self._creatingShared(drivers: drivers, isEmulatingFreshInstall: false)
+	}
+
+}
+
+extension BIOS {
+	private nonisolated(unsafe) static var _shared: BIOS!
+
+	/// Can be access later with `OS.shared`
+	@discardableResult
+	public static func _creatingShared(
+		drivers: Drivers,
+		isEmulatingFreshInstall: Bool
 	) -> BIOS {
 		Self.settingShared(
-			shared: BIOS(
-				bundle: bundle,
-				userDefaultsSuite: userDefaultsSuite,
-				secureStorageDriver: secureStorageDriver
-			)
+			shared: BIOS(drivers: drivers),
+			isEmulatingFreshInstall: isEmulatingFreshInstall
 		)
 	}
 
 	/// Can be access later with `OS.shared`
 	@discardableResult
-	public static func settingShared(
+	internal static func settingShared(
 		shared: BIOS,
 		isEmulatingFreshInstall: Bool = false
 	) -> BIOS {

apple/Sources/Sargon/SargonOS/SargonOS+Static+Shared.swift

@@ -15,20 +15,34 @@
 }
 
 extension SargonOS {
-	internal nonisolated(unsafe) static var _shared: SargonOS!
 
 	public nonisolated(unsafe) static var shared: SargonOS {
 		guard let shared = Self._shared else {
-			fatalError("OS not created, create it with `SargonOS.createdSharedBootingWith:bios`")
+			fatalError("`SargonOS.shared` not created, create it with `SargonOS.creatingShared:bootingWith` and pass it a `BIOS`.")
 		}
 		return shared
 	}
 
 	/// Can be access later with `OS.shared`
 	@discardableResult
-	public static func createdSharedBootingWith(
-		bios: BIOS,
-		isEmulatingFreshInstall: Bool = false
+	public static func creatingShared(
+		bootingWith bios: BIOS
+	) async throws -> SargonOS {
+		try await _creatingShared(
+			bootingWith: bios,
+			isEmulatingFreshInstall: false
+		)
+	}
+
+}
+
+extension SargonOS {
+
+	/// Can be access later with `OS.shared`
+	@discardableResult
+	internal static func _creatingShared(
+		bootingWith bios: BIOS,
+		isEmulatingFreshInstall: Bool
 	) async throws -> SargonOS {
 		if !isEmulatingFreshInstall, _shared != nil {
 			throw SargonOSAlreadyBooted()
@@ -37,4 +51,8 @@
 		Self._shared = shared
 		return shared
 	}
+
+	internal nonisolated(unsafe) static var _shared: SargonOS!
+
 }
+

apple/Tests/IntegrationTests/DriversTests/EventBusDriverTests.swift

@@ -8,7 +8,6 @@ class EventBusDriverTests: DriverTest<EventBus> {
 
 	func test() async throws {
 		let sut = SUT()
-
 
 		let task = Task {
 			var notifications = Set<EventNotification>()
@@ -22,7 +21,7 @@ class EventBusDriverTests: DriverTest<EventBus> {
 		let os = try await TestOS(bios: bios)
 		try await os.createAccount()
 		let notifications = await task.value
-		XCTAssertEqual(Set(notifications.map(\.event.kind)), Set([.booted, .profileSaved, .addedAccount]))
+		XCTAssertEqual(Set(notifications.map(\.event.kind)), Set([.booted, .profileSaved, .accountAdded]))
 	}
 
 }
@@ -72,7 +71,7 @@ extension Drivers {
 		)
 	}
 
-	static func withSecureStorage(_ entropyProvider: some EntropyProviderDriver) -> Drivers {
+	static func withEntropyProvider(_ entropyProvider: some EntropyProviderDriver) -> Drivers {
 		Drivers(
 			networking: .shared,
 			secureStorage: .shared,
@@ -124,7 +123,7 @@ extension Drivers {
 		)
 	}
 
-	static func withEventBus(_ fileSystem: some FileSystemDriver) -> Drivers {
+	static func withFileSystem(_ fileSystem: some FileSystemDriver) -> Drivers {
 		Drivers(
 			networking: .shared,
 			secureStorage: .shared,
@@ -137,7 +136,7 @@ extension Drivers {
 		)
 	}
 
-	static func withEventBus(_ unsafeStorage: some UnsafeStorageDriver) -> Drivers {
+	static func withUnsafeStorage(_ unsafeStorage: some UnsafeStorageDriver) -> Drivers {
 		Drivers(
 			networking: .shared,
 			secureStorage: .shared,

apple/Tests/IntegrationTests/DriversTests/FileSystemDriverTests.swift

@@ -15,7 +15,9 @@ class FileSystemDriverTests: DriverTest<FileSystem> {
 		try await sut.saveToFile(path: path, data: data)
 		let loaded = try await sut.loadFromFile(path: path)
 		XCTAssertEqual(loaded, data)
-		try await sut.deleteFile(path: path)
 
+		XCTAssertTrue(FileManager.default.fileExists(atPath: path))
+		try await sut.deleteFile(path: path)
+		XCTAssertFalse(FileManager.default.fileExists(atPath: path))
 	}
 }

apple/Tests/IntegrationTests/SargonOS/BIOSTests.swift

@@ -1,16 +1,36 @@
 import CustomDump
 import Foundation
-import Sargon
+@testable import Sargon
 import SargonUniFFI
 import XCTest
 
+extension BIOS {
+	static func creatingShared(
+		bundle: Bundle = .main,
+		userDefaultsSuite: String = "test",
+		secureStorageDriver: SecureStorageDriver = Insecure︕！TestOnly︕！Ephemeral︕！SecureStorage.init(
+			keychainService: "test"
+		)
+	) -> BIOS {
+		Self.creatingShared(drivers: .init(bundle: bundle, userDefaultsSuite: userDefaultsSuite, secureStorageDriver: secureStorageDriver))
+	}
+}
+
 final class BIOSTests: OSTest {
 	typealias SUT = BIOS
 
 	func test_set_shared() {
-		let sut = SUT.createdShared(bundle: .main, userDefaultsSuite: "test", secureStorageDriver: Insecure︕！TestOnly︕！Ephemeral︕！SecureStorage(keychainService: "test"))
+		let sut = SUT.creatingShared()
+
 		XCTAssertTrue(SUT.shared === sut)
-		let new = SUT.settingShared(shared: .test(secureStorageDriver: Insecure︕！TestOnly︕！Ephemeral︕！SecureStorage.init(keychainService: "other")), isEmulatingFreshInstall: true)
+		let new = SUT.settingShared(
+			shared: .test(
+				secureStorageDriver: Insecure︕！TestOnly︕！Ephemeral︕！SecureStorage.init(
+					keychainService: "other"
+				)
+			),
+			isEmulatingFreshInstall: true
+		)
 
 		XCTAssertFalse(sut === new)
 		XCTAssertTrue(SUT.shared === new)