Run local packages’ tests as well on CI

.github/workflows/swift-tests.yml

@@ -19,10 +19,6 @@ jobs:
             path: .
           - name: BitLogger
             path: localPackages/BitLogger
-          - name: BitFoundation
-            path: localPackages/BitFoundation
-          - name: Noise
-            path: localPackages/Noise
 
     steps:
       - name: Checkout code

Package.swift

@@ -17,8 +17,6 @@ let package = Package(
     ],
     dependencies:[
         .package(path: "localPackages/Arti"),
-        .package(path: "localPackages/Noise"),
-        .package(path: "localPackages/BitFoundation"),
         .package(path: "localPackages/BitLogger"),
         .package(url: "https://github.com/21-DOT-DEV/swift-secp256k1", exact: "0.21.1")
     ],
@@ -27,9 +25,7 @@ let package = Package(
             name: "bitchat",
             dependencies: [
                 .product(name: "P256K", package: "swift-secp256k1"),
-                .product(name: "BitFoundation", package: "BitFoundation"),
                 .product(name: "BitLogger", package: "BitLogger"),
-                .product(name: "Noise", package: "Noise"),
                 .product(name: "Tor", package: "Arti")
             ],
             path: "bitchat",
@@ -48,17 +44,15 @@ let package = Package(
         ),
         .testTarget(
             name: "bitchatTests",
-            dependencies: [
-                "bitchat",
-                .product(name: "BitFoundation", package: "BitFoundation")
-            ],
+            dependencies: ["bitchat"],
             path: "bitchatTests",
             exclude: [
                 "Info.plist",
                 "README.md"
             ],
             resources: [
-                .process("Localization")
+                .process("Localization"),
+                .process("Noise")
             ]
         )
     ]

bitchat.xcodeproj/project.pbxproj

@@ -10,10 +10,6 @@
 		17901751FD8010AFC8E750F2 /* bitchatShareExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 61F92EBA29C47C0FCC482F1F /* bitchatShareExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		3EE336D150427F736F32B56C /* P256K in Frameworks */ = {isa = PBXBuildFile; productRef = B1D9136AA0083366353BFA2F /* P256K */; };
 		885BBED78092484A5B069461 /* P256K in Frameworks */ = {isa = PBXBuildFile; productRef = 4EB6BA1B8464F1EA38F4E286 /* P256K */; };
-		A63163B62F80CB2500B8B128 /* Noise in Frameworks */ = {isa = PBXBuildFile; productRef = A63163B52F80CB2500B8B128 /* Noise */; };
-		A63163B82F80CB2D00B8B128 /* Noise in Frameworks */ = {isa = PBXBuildFile; productRef = A63163B72F80CB2D00B8B128 /* Noise */; };
-		A6BCF9482F80953E001CF9B9 /* BitFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = A6BCF9472F80953E001CF9B9 /* BitFoundation */; };
-		A6BCF94A2F809550001CF9B9 /* BitFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = A6BCF9492F809550001CF9B9 /* BitFoundation */; };
 		A6E3E5702E77036A0032EA8A /* BitLogger in Frameworks */ = {isa = PBXBuildFile; productRef = A6E3E56F2E77036A0032EA8A /* BitLogger */; };
 		A6E3E5722E7703760032EA8A /* BitLogger in Frameworks */ = {isa = PBXBuildFile; productRef = A6E3E5712E7703760032EA8A /* BitLogger */; };
 		A6E3EA7F2E7706720032EA8A /* Tor in Frameworks */ = {isa = PBXBuildFile; productRef = A6E3EA7E2E7706720032EA8A /* Tor */; };
@@ -158,20 +154,16 @@
 			isa = PBXFrameworksBuildPhase;
 			files = (
 				A6E3E5722E7703760032EA8A /* BitLogger in Frameworks */,
-				A63163B82F80CB2D00B8B128 /* Noise in Frameworks */,
 				3EE336D150427F736F32B56C /* P256K in Frameworks */,
 				A6E3EA812E7706A80032EA8A /* Tor in Frameworks */,
-				A6BCF94A2F809550001CF9B9 /* BitFoundation in Frameworks */,
 			);
 		};
 		B5A5CC493FFB3D8966548140 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			files = (
 				A6E3E5702E77036A0032EA8A /* BitLogger in Frameworks */,
-				A63163B62F80CB2500B8B128 /* Noise in Frameworks */,
 				885BBED78092484A5B069461 /* P256K in Frameworks */,
 				A6E3EA7F2E7706720032EA8A /* Tor in Frameworks */,
-				A6BCF9482F80953E001CF9B9 /* BitFoundation in Frameworks */,
 			);
 		};
 /* End PBXFrameworksBuildPhase section */
@@ -231,8 +223,6 @@
 				B1D9136AA0083366353BFA2F /* P256K */,
 				A6E3E5712E7703760032EA8A /* BitLogger */,
 				A6E3EA802E7706A80032EA8A /* Tor */,
-				A6BCF9492F809550001CF9B9 /* BitFoundation */,
-				A63163B72F80CB2D00B8B128 /* Noise */,
 			);
 			productName = bitchat_macOS;
 			productReference = 8F3A7C058C2C8E1A06C8CF8B /* bitchat.app */;
@@ -313,8 +303,6 @@
 				4EB6BA1B8464F1EA38F4E286 /* P256K */,
 				A6E3E56F2E77036A0032EA8A /* BitLogger */,
 				A6E3EA7E2E7706720032EA8A /* Tor */,
-				A6BCF9472F80953E001CF9B9 /* BitFoundation */,
-				A63163B52F80CB2500B8B128 /* Noise */,
 			);
 			productName = bitchat_iOS;
 			productReference = 96D0D41CA19EE5A772AA8434 /* bitchat.app */;
@@ -356,8 +344,6 @@
 				B8C407587481BBB190741C93 /* XCRemoteSwiftPackageReference "swift-secp256k1" */,
 				A6E3E56E2E77036A0032EA8A /* XCLocalSwiftPackageReference "localPackages/BitLogger" */,
 				A6E3EA7D2E7706720032EA8A /* XCLocalSwiftPackageReference "localPackages/Arti" */,
-				A6BCF9462F80953E001CF9B9 /* XCLocalSwiftPackageReference "localPackages/BitFoundation" */,
-				A63163B42F80CB2500B8B128 /* XCLocalSwiftPackageReference "localPackages/Noise" */,
 			);
 			preferredProjectObjectVersion = 90;
 			projectDirPath = "";
@@ -923,14 +909,6 @@
 /* End XCConfigurationList section */
 
 /* Begin XCLocalSwiftPackageReference section */
-		A63163B42F80CB2500B8B128 /* XCLocalSwiftPackageReference "localPackages/Noise" */ = {
-			isa = XCLocalSwiftPackageReference;
-			relativePath = localPackages/Noise;
-		};
-		A6BCF9462F80953E001CF9B9 /* XCLocalSwiftPackageReference "localPackages/BitFoundation" */ = {
-			isa = XCLocalSwiftPackageReference;
-			relativePath = localPackages/BitFoundation;
-		};
 		A6E3E56E2E77036A0032EA8A /* XCLocalSwiftPackageReference "localPackages/BitLogger" */ = {
 			isa = XCLocalSwiftPackageReference;
 			relativePath = localPackages/BitLogger;
@@ -958,24 +936,6 @@
 			package = B8C407587481BBB190741C93 /* XCRemoteSwiftPackageReference "swift-secp256k1" */;
 			productName = P256K;
 		};
-		A63163B52F80CB2500B8B128 /* Noise */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = Noise;
-		};
-		A63163B72F80CB2D00B8B128 /* Noise */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = A63163B42F80CB2500B8B128 /* XCLocalSwiftPackageReference "localPackages/Noise" */;
-			productName = Noise;
-		};
-		A6BCF9472F80953E001CF9B9 /* BitFoundation */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = BitFoundation;
-		};
-		A6BCF9492F809550001CF9B9 /* BitFoundation */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = A6BCF9462F80953E001CF9B9 /* XCLocalSwiftPackageReference "localPackages/BitFoundation" */;
-			productName = BitFoundation;
-		};
 		A6E3E56F2E77036A0032EA8A /* BitLogger */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = BitLogger;

bitchat/BitchatApp.swift

@@ -8,7 +8,6 @@
 
 import Tor
 import SwiftUI
-import BitFoundation
 import UserNotifications
 
 @main

bitchat/Identity/IdentityModels.swift

@@ -81,7 +81,6 @@
 ///
 
 import Foundation
-import BitFoundation
 
 // MARK: - Three-Layer Identity Model
 

bitchat/Identity/SecureIdentityStateManager.swift

@@ -91,7 +91,6 @@
 ///
 
 import BitLogger
-import BitFoundation
 import Foundation
 import CryptoKit
 

bitchat/Models/BitchatMessage+Media.swift

@@ -6,7 +6,6 @@
 // For more information, see <https://unlicense.org>
 //
 
-import BitFoundation
 import Foundation
 
 extension BitchatMessage {

bitchat/Models/BitchatMessage.swift

@@ -6,39 +6,33 @@
 // For more information, see <https://unlicense.org>
 //
 
-import class Foundation.DateFormatter
-
-import struct Foundation.AttributedString
-import struct Foundation.Data
-import struct Foundation.Date
-import struct Foundation.TimeInterval
-import struct Foundation.UUID
+import Foundation
 
 /// Represents a user-visible message in the BitChat system.
 /// Handles both broadcast messages and private encrypted messages,
 /// with support for mentions, replies, and delivery tracking.
 /// - Note: This is the primary data model for chat messages
-public final class BitchatMessage: Codable {
-    public let id: String
-    public let sender: String
-    public let content: String
-    public let timestamp: Date
-    public let isRelay: Bool
-    public let originalSender: String?
-    public let isPrivate: Bool
-    public let recipientNickname: String?
-    public let senderPeerID: PeerID?
-    public let mentions: [String]?  // Array of mentioned nicknames
-    public var deliveryStatus: DeliveryStatus? // Delivery tracking
-
+final class BitchatMessage: Codable {
+    let id: String
+    let sender: String
+    let content: String
+    let timestamp: Date
+    let isRelay: Bool
+    let originalSender: String?
+    let isPrivate: Bool
+    let recipientNickname: String?
+    let senderPeerID: PeerID?
+    let mentions: [String]?  // Array of mentioned nicknames
+    var deliveryStatus: DeliveryStatus? // Delivery tracking
+    
     // Cached formatted text (not included in Codable)
     private var _cachedFormattedText: [String: AttributedString] = [:]
     
-    public func getCachedFormattedText(isDark: Bool, isSelf: Bool) -> AttributedString? {
+    func getCachedFormattedText(isDark: Bool, isSelf: Bool) -> AttributedString? {
         return _cachedFormattedText["\(isDark)-\(isSelf)"]
     }
     
-    public func setCachedFormattedText(_ text: AttributedString, isDark: Bool, isSelf: Bool) {
+    func setCachedFormattedText(_ text: AttributedString, isDark: Bool, isSelf: Bool) {
         _cachedFormattedText["\(isDark)-\(isSelf)"] = text
     }
     
@@ -48,7 +42,7 @@ public final class BitchatMessage: Codable {
         case isPrivate, recipientNickname, senderPeerID, mentions, deliveryStatus
     }
     
-    public init(
+    init(
         id: String? = nil,
         sender: String,
         content: String,
@@ -78,7 +72,7 @@ public final class BitchatMessage: Codable {
 // MARK: - Equatable Conformance
 
 extension BitchatMessage: Equatable {
-    public static func == (lhs: BitchatMessage, rhs: BitchatMessage) -> Bool {
+    static func == (lhs: BitchatMessage, rhs: BitchatMessage) -> Bool {
         return lhs.id == rhs.id &&
                lhs.sender == rhs.sender &&
                lhs.content == rhs.content &&
@@ -336,14 +330,14 @@ extension BitchatMessage {
         return formatter
     }()
     
-    public var formattedTimestamp: String {
+    var formattedTimestamp: String {
         Self.timestampFormatter.string(from: timestamp)
     }
 }
 
 extension Array where Element == BitchatMessage {
     /// Filters out empty ones and deduplicate by ID while preserving order (from oldest to newest)
-    public func cleanedAndDeduped() -> [Element] {
+    func cleanedAndDeduped() -> [Element] {
         let arr = filter { $0.content.trimmed.isEmpty == false }
         guard arr.count > 1 else {
             return arr

bitchat/Models/BitchatPacket.swift

@@ -6,26 +6,25 @@
 // For more information, see <https://unlicense.org>
 //
 
-import struct Foundation.Data
-import struct Foundation.Date
+import Foundation
 
 /// The core packet structure for all BitChat protocol messages.
 /// Encapsulates all data needed for routing through the mesh network,
 /// including TTL for hop limiting and optional encryption.
 /// - Note: Packets larger than BLE MTU (512 bytes) are automatically fragmented
-public struct BitchatPacket: Codable {
+struct BitchatPacket: Codable {
     let version: UInt8
-    public let type: UInt8
-    public let senderID: Data
-    public let recipientID: Data?
-    public let timestamp: UInt64
-    public let payload: Data
-    public var signature: Data?
-    public var ttl: UInt8
-    public var route: [Data]?
-    public var isRSR: Bool
+    let type: UInt8
+    let senderID: Data
+    let recipientID: Data?
+    let timestamp: UInt64
+    let payload: Data
+    var signature: Data?
+    var ttl: UInt8
+    var route: [Data]?
+    var isRSR: Bool
     
-    public init(type: UInt8, senderID: Data, recipientID: Data?, timestamp: UInt64, payload: Data, signature: Data?, ttl: UInt8, version: UInt8 = 1, route: [Data]? = nil, isRSR: Bool = false) {
+    init(type: UInt8, senderID: Data, recipientID: Data?, timestamp: UInt64, payload: Data, signature: Data?, ttl: UInt8, version: UInt8 = 1, route: [Data]? = nil, isRSR: Bool = false) {
         self.version = version
         self.type = type
         self.senderID = senderID
@@ -66,18 +65,18 @@ public struct BitchatPacket: Codable {
         BinaryProtocol.encode(self)
     }
     
-    public func toBinaryData(padding: Bool = true) -> Data? {
+    func toBinaryData(padding: Bool = true) -> Data? {
         BinaryProtocol.encode(self, padding: padding)
     }
 
     // Backward-compatible helper (defaults to padded encoding)
-    public func toBinaryData() -> Data? {
+    func toBinaryData() -> Data? {
         toBinaryData(padding: true)
     }
     
     /// Create binary representation for signing (without signature and TTL fields)
     /// TTL is excluded because it changes during packet relay operations
-    public func toBinaryDataForSigning() -> Data? {
+    func toBinaryDataForSigning() -> Data? {
         // Create a copy without signature and with fixed TTL for signing
         // TTL must be excluded because it changes during relay
         let unsignedPacket = BitchatPacket(
@@ -95,7 +94,7 @@ public struct BitchatPacket: Codable {
         return BinaryProtocol.encode(unsignedPacket)
     }
     
-    public static func from(_ data: Data) -> BitchatPacket? {
+    static func from(_ data: Data) -> BitchatPacket? {
         BinaryProtocol.decode(data)
     }
 }

bitchat/Models/BitchatPeer.swift

@@ -1,6 +1,5 @@
 import Foundation
 import CoreBluetooth
-import BitFoundation
 
 /// Represents a peer in the BitChat network with all associated metadata
 struct BitchatPeer: Equatable {

bitchat/Models/MessagePadding.swift

@@ -6,7 +6,7 @@
 // For more information, see <https://unlicense.org>
 //
 
-import struct Foundation.Data
+import Foundation
 
 /// Provides privacy-preserving message padding to obscure actual content length.
 /// Uses PKCS#7-style padding with random bytes to prevent traffic analysis.

bitchat/Models/PeerID.swift

@@ -1,27 +1,15 @@
 //
 // PeerID.swift
-// BitFoundation
+// bitchat
 //
 // This is free and unencumbered software released into the public domain.
 // For more information, see <https://unlicense.org>
 //
 
-import struct Foundation.Data
-import struct Foundation.CharacterSet
+import Foundation
 
-public struct PeerID: Equatable, Hashable, Sendable {
-    enum Constants {
-        /// 16
-        static let nostrConvKeyPrefixLength = 16
-        /// 8
-        static let nostrShortKeyDisplayLength = 8
-        /// 64
-        fileprivate static let maxIDLength = 64
-        /// 16
-        fileprivate static let hexIDLength = 16 // 8 bytes = 16 hex chars
-    }
-
-    public enum Prefix: String, CaseIterable, Sendable {
+struct PeerID: Equatable, Hashable {
+    enum Prefix: String, CaseIterable {
         /// When no prefix is provided
         case empty = ""
         /// `"mesh:"`
@@ -35,15 +23,15 @@ public struct PeerID: Equatable, Hashable, Sendable {
         /// `"nostr:"` (+ 8 characters hex)
         case geoChat = "nostr:"
     }
-
-    public let prefix: Prefix
-
+    
+    let prefix: Prefix
+    
     /// Returns the actual value without any prefix
-    public let bare: String
-
+    let bare: String
+    
     /// Returns the full `id` value by combining `(prefix + bare)`
-    public var id: String { prefix.rawValue + bare }
-
+    var id: String { prefix.rawValue + bare }
+    
     // Private so the callers have to go through a convenience init
     private init(prefix: Prefix, bare: any StringProtocol) {
         self.prefix = prefix
@@ -53,17 +41,17 @@ public struct PeerID: Equatable, Hashable, Sendable {
 
 // MARK: - Convenience Inits
 
-public extension PeerID {
+extension PeerID {
     /// Convenience init to create GeoDM PeerID by appending `"nostr_"` to the first 16 characters of `pubKey`
     init(nostr_ pubKey: String) {
-        self.init(prefix: .geoDM, bare: pubKey.prefix(Constants.nostrConvKeyPrefixLength))
+        self.init(prefix: .geoDM, bare: pubKey.prefix(TransportConfig.nostrConvKeyPrefixLength))
     }
-
+    
     /// Convenience init to create GeoChat PeerID by appending `"nostr:"` to the first 8 characters of `pubKey`
     init(nostr pubKey: String) {
-        self.init(prefix: .geoChat, bare: pubKey.prefix(Constants.nostrShortKeyDisplayLength))
+        self.init(prefix: .geoChat, bare: pubKey.prefix(TransportConfig.nostrShortKeyDisplayLength))
     }
-
+    
     /// Convenience init to create PeerID from String/Substring by splitting it into prefix and bare parts
     init(str: any StringProtocol) {
         if let prefix = Prefix.allCases.first(where: { $0 != .empty && str.hasPrefix($0.rawValue) }) {
@@ -72,23 +60,23 @@ public extension PeerID {
             self.init(prefix: .empty, bare: str)
         }
     }
-
+    
     /// Convenience init to handle `Optional<String>`
     init?(str: (any StringProtocol)?) {
         guard let str else { return nil }
         self.init(str: str)
     }
-
+    
     /// Convenience init to create PeerID by converting Data to String
     init?(data: Data) {
         self.init(str: String(data: data, encoding: .utf8))
     }
-
+    
     /// Convenience init to "hide" hex-encoding implementation detail
     init(hexData: Data) {
         self.init(str: hexData.hexEncodedString())
     }
-
+    
     /// Convenience init to "hide" hex-encoding implementation detail
     init?(hexData: Data?) {
         guard let hexData else { return nil }
@@ -98,12 +86,12 @@ public extension PeerID {
 
 // MARK: - Noise Public Key Helpers
 
-public extension PeerID {
+extension PeerID {
     /// Derive the stable 16-hex peer ID from a Noise static public key
     init(publicKey: Data) {
         self.init(str: publicKey.sha256Fingerprint().prefix(16))
     }
-
+    
     /// Returns a 16-hex short peer ID derived from a 64-hex Noise public key if needed
     func toShort() -> PeerID {
         if let noiseKey {
@@ -116,11 +104,11 @@ public extension PeerID {
 // MARK: - Codable
 
 extension PeerID: Codable {
-    public init(from decoder: any Decoder) throws {
+    init(from decoder: any Decoder) throws {
         self.init(str: try decoder.singleValueContainer().decode(String.self))
     }
-
-    public func encode(to encoder: any Encoder) throws {
+    
+    func encode(to encoder: any Encoder) throws {
         var container = encoder.singleValueContainer()
         try container.encode(id)
     }
@@ -128,27 +116,27 @@ extension PeerID: Codable {
 
 // MARK: - Helpers
 
-public extension PeerID {
+extension PeerID {
     var isEmpty: Bool {
         id.isEmpty
     }
-
+    
     /// Returns true if `id` starts with "`nostr:`"
     var isGeoChat: Bool {
         prefix == .geoChat
     }
-
+    
     /// Returns true if `id` starts with "`nostr_`"
     var isGeoDM: Bool {
         prefix == .geoDM
     }
-
+    
     func toPercentEncoded() -> String {
         id.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? id
     }
 }
 
-public extension PeerID {
+extension PeerID {
     var routingData: Data? {
         if let direct = Data(hexString: id), direct.count == 8 { return direct }
         if let bareData = Data(hexString: bare), bareData.count == 8 { return bareData }
@@ -164,45 +152,50 @@ public extension PeerID {
 
 // MARK: - Validation
 
-public extension PeerID {
+extension PeerID {
+    private enum Constants {
+        static let maxIDLength = 64
+        static let hexIDLength = 16 // 8 bytes = 16 hex chars
+    }
+    
     /// Validates a peer ID from any source (short 16-hex, full 64-hex, or internal alnum/-/_ up to 64)
     var isValid: Bool {
         if prefix != .empty {
             return PeerID(str: bare).isValid
         }
-
+        
         // Accept short routing IDs (exact 16-hex) or Full Noise key hex (exact 64-hex)
         if isShort || isNoiseKeyHex {
             return true
         }
-
+        
         // If length equals short or full but isn't valid hex, reject
         if id.count == Constants.hexIDLength || id.count == Constants.maxIDLength {
             return false
         }
-
+        
         // Internal format: alphanumeric + dash/underscore up to 63 (not 16 or 64)
         let validCharset = CharacterSet.alphanumerics.union(CharacterSet(charactersIn: "-_"))
         return !id.isEmpty &&
                 id.count < Constants.maxIDLength &&
                 id.rangeOfCharacter(from: validCharset.inverted) == nil
     }
-
+    
     /// Returns true if the `bare` id is all hex
     var isHex: Bool {
         bare.allSatisfy { $0.isHexDigit }
     }
-
+    
     /// Short routing IDs (exact 16-hex)
     var isShort: Bool {
         bare.count == Constants.hexIDLength && isHex
     }
-
+    
     /// Full Noise key hex (exact 64-hex)
     var isNoiseKeyHex: Bool {
         noiseKey != nil
     }
-
+    
     /// Full Noise key (exact 64-hex) as Data
     var noiseKey: Data? {
         guard bare.count == Constants.maxIDLength else { return nil }
@@ -213,7 +206,7 @@ public extension PeerID {
 // MARK: - Comparable
 
 extension PeerID: Comparable {
-    public static func < (lhs: PeerID, rhs: PeerID) -> Bool {
+    static func < (lhs: PeerID, rhs: PeerID) -> Bool {
         lhs.id < rhs.id
     }
 }
@@ -222,7 +215,7 @@ extension PeerID: Comparable {
 
 extension PeerID: CustomStringConvertible {
     /// So it returns the actual `id` like before even inside another String
-    public var description: String {
+    var description: String {
         id
     }
 }

bitchat/Models/ReadReceipt.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import BitFoundation
 
 struct ReadReceipt: Codable {
     let originalMessageID: String

bitchat/Noise/NoiseProtocol.swift

@@ -78,7 +78,6 @@
 ///
 
 import BitLogger
-import BitFoundation
 import Foundation
 import CryptoKit
 
@@ -924,7 +923,7 @@ extension NoisePattern {
 
 // MARK: - Errors
 
-public enum NoiseError: Error {
+enum NoiseError: Error {
     case uninitializedCipher
     case invalidCiphertext
     case handshakeComplete

bitchat/Noise/NoiseRateLimiter.swift

@@ -7,10 +7,9 @@
 //
 
 import BitLogger
-import BitFoundation
 import Foundation
 
-public final class NoiseRateLimiter {
+final class NoiseRateLimiter {
     private var handshakeTimestamps: [PeerID: [Date]] = [:]
     private var messageTimestamps: [PeerID: [Date]] = [:]
     
@@ -19,10 +18,8 @@ public final class NoiseRateLimiter {
     private var globalMessageTimestamps: [Date] = []
     
     private let queue = DispatchQueue(label: "chat.bitchat.noise.ratelimit", attributes: .concurrent)
-
-    public init() {}
-
-    public func allowHandshake(from peerID: PeerID) -> Bool {
+    
+    func allowHandshake(from peerID: PeerID) -> Bool {
         return queue.sync(flags: .barrier) {
             let now = Date()
             let oneMinuteAgo = now.addingTimeInterval(-60)
@@ -51,7 +48,7 @@ public final class NoiseRateLimiter {
         }
     }
     
-    public func allowMessage(from peerID: PeerID) -> Bool {
+    func allowMessage(from peerID: PeerID) -> Bool {
         return queue.sync(flags: .barrier) {
             let now = Date()
             let oneSecondAgo = now.addingTimeInterval(-1)
@@ -87,7 +84,7 @@ public final class NoiseRateLimiter {
         }
     }
 
-    public func resetAll() {
+    func resetAll() {
         queue.async(flags: .barrier) {
             self.handshakeTimestamps.removeAll()
             self.messageTimestamps.removeAll()

bitchat/Noise/NoiseSecurityConstants.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-public enum NoiseSecurityConstants {
+enum NoiseSecurityConstants {
     // Maximum message size to prevent memory exhaustion
     static let maxMessageSize = 65535 // 64KB as per Noise spec
     
@@ -28,10 +28,10 @@ public enum NoiseSecurityConstants {
     static let maxSessionsPerPeer = 3
     
     // Rate limiting
-    public static let maxHandshakesPerMinute = 10
-    public static let maxMessagesPerSecond = 100
+    static let maxHandshakesPerMinute = 10
+    static let maxMessagesPerSecond = 100
     
     // Global rate limiting (across all peers)
-    public static let maxGlobalHandshakesPerMinute = 30
-    public static let maxGlobalMessagesPerSecond = 500
+    static let maxGlobalHandshakesPerMinute = 30
+    static let maxGlobalMessagesPerSecond = 500
 }

bitchat/Noise/NoiseSecurityError.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-public enum NoiseSecurityError: Error {
+enum NoiseSecurityError: Error {
     case sessionExpired
     case sessionExhausted
     case messageTooLarge

bitchat/Noise/NoiseSecurityValidator.swift

@@ -8,15 +8,15 @@
 
 import Foundation
 
-public struct NoiseSecurityValidator {
+struct NoiseSecurityValidator {
     
     /// Validate message size
-    public static func validateMessageSize(_ data: Data) -> Bool {
+    static func validateMessageSize(_ data: Data) -> Bool {
         return data.count <= NoiseSecurityConstants.maxMessageSize
     }
     
     /// Validate handshake message size
-    public static func validateHandshakeMessageSize(_ data: Data) -> Bool {
+    static func validateHandshakeMessageSize(_ data: Data) -> Bool {
         return data.count <= NoiseSecurityConstants.maxHandshakeMessageSize
     }
 }

bitchat/Noise/NoiseSession.swift

@@ -9,9 +9,8 @@
 import BitLogger
 import Foundation
 import CryptoKit
-import BitFoundation
 
-public class NoiseSession {
+class NoiseSession {
     let peerID: PeerID
     let role: NoiseRole
     private let keychain: KeychainManagerProtocol
@@ -182,7 +181,7 @@ public class NoiseSession {
         }
     }
     
-    public func isEstablished() -> Bool {
+    func isEstablished() -> Bool {
         return sessionQueue.sync {
             if case .established = state {
                 return true
@@ -217,8 +216,8 @@ public class NoiseSession {
             sentHandshakeMessages.removeAll()
             
             // Clear handshake hash
-            if handshakeHash != nil {
-                keychain.secureClear(&handshakeHash!)
+            if var hash = handshakeHash {
+                keychain.secureClear(&hash)
             }
             handshakeHash = nil
             

bitchat/Noise/NoiseSessionError.swift

@@ -6,7 +6,7 @@
 // For more information, see <https://unlicense.org>
 //
 
-public enum NoiseSessionError: Error, Equatable {
+enum NoiseSessionError: Error, Equatable {
     case invalidState
     case notEstablished
     case sessionNotFound

bitchat/Noise/NoiseSessionManager.swift

@@ -9,9 +9,8 @@
 import BitLogger
 import CryptoKit
 import Foundation
-import BitFoundation
 
-public final class NoiseSessionManager {
+final class NoiseSessionManager {
     private var sessions: [PeerID: NoiseSession] = [:]
     private let localStaticKey: Curve25519.KeyAgreement.PrivateKey
     private let keychain: KeychainManagerProtocol
@@ -19,10 +18,10 @@ public final class NoiseSessionManager {
     private let managerQueue = DispatchQueue(label: "chat.bitchat.noise.manager", attributes: .concurrent)
     
     // Callbacks
-    public var onSessionEstablished: ((PeerID, Curve25519.KeyAgreement.PublicKey) -> Void)?
+    var onSessionEstablished: ((PeerID, Curve25519.KeyAgreement.PublicKey) -> Void)?
     var onSessionFailed: ((PeerID, Error) -> Void)?
     
-    public init(localStaticKey: Curve25519.KeyAgreement.PrivateKey, keychain: KeychainManagerProtocol) {
+    init(localStaticKey: Curve25519.KeyAgreement.PrivateKey, keychain: KeychainManagerProtocol) {
         self.localStaticKey = localStaticKey
         self.keychain = keychain
         self.sessionFactory = { peerID, role in
@@ -49,13 +48,13 @@ public final class NoiseSessionManager {
     
     // MARK: - Session Management
     
-    public func getSession(for peerID: PeerID) -> NoiseSession? {
+    func getSession(for peerID: PeerID) -> NoiseSession? {
         return managerQueue.sync {
             return sessions[peerID]
         }
     }
     
-    public func removeSession(for peerID: PeerID) {
+    func removeSession(for peerID: PeerID) {
         managerQueue.sync(flags: .barrier) {
             if let session = sessions.removeValue(forKey: peerID) {
                 session.reset() // Clear sensitive data before removing
@@ -63,7 +62,7 @@ public final class NoiseSessionManager {
         }
     }
 
-    public func removeAllSessions() {
+    func removeAllSessions() {
         managerQueue.sync(flags: .barrier) {
             for (_, session) in sessions {
                 session.reset()
@@ -74,7 +73,7 @@ public final class NoiseSessionManager {
     
     // MARK: - Handshake Helpers
     
-    public func initiateHandshake(with peerID: PeerID) throws -> Data {
+    func initiateHandshake(with peerID: PeerID) throws -> Data {
         return try managerQueue.sync(flags: .barrier) {
             // Check if we already have an established session
             if let existingSession = sessions[peerID], existingSession.isEstablished() {
@@ -103,7 +102,7 @@ public final class NoiseSessionManager {
         }
     }
     
-    public func handleIncomingHandshake(from peerID: PeerID, message: Data) throws -> Data? {
+    func handleIncomingHandshake(from peerID: PeerID, message: Data) throws -> Data? {
         // Process everything within the synchronized block to prevent race conditions
         return try managerQueue.sync(flags: .barrier) {
             var shouldCreateNew = false
@@ -173,7 +172,7 @@ public final class NoiseSessionManager {
     
     // MARK: - Encryption/Decryption
     
-    public func encrypt(_ plaintext: Data, for peerID: PeerID) throws -> Data {
+    func encrypt(_ plaintext: Data, for peerID: PeerID) throws -> Data {
         guard let session = getSession(for: peerID) else {
             throw NoiseSessionError.sessionNotFound
         }
@@ -181,7 +180,7 @@ public final class NoiseSessionManager {
         return try session.encrypt(plaintext)
     }
     
-    public func decrypt(_ ciphertext: Data, from peerID: PeerID) throws -> Data {
+    func decrypt(_ ciphertext: Data, from peerID: PeerID) throws -> Data {
         guard let session = getSession(for: peerID) else {
             throw NoiseSessionError.sessionNotFound
         }
@@ -191,13 +190,13 @@ public final class NoiseSessionManager {
     
     // MARK: - Key Management
     
-    public func getRemoteStaticKey(for peerID: PeerID) -> Curve25519.KeyAgreement.PublicKey? {
+    func getRemoteStaticKey(for peerID: PeerID) -> Curve25519.KeyAgreement.PublicKey? {
         return getSession(for: peerID)?.getRemoteStaticPublicKey()
     }
     
     // MARK: - Session Rekeying
     
-    public func getSessionsNeedingRekey() -> [(peerID: PeerID, needsRekey: Bool)] {
+    func getSessionsNeedingRekey() -> [(peerID: PeerID, needsRekey: Bool)] {
         return managerQueue.sync {
             var needingRekey: [(peerID: PeerID, needsRekey: Bool)] = []
             
@@ -213,7 +212,7 @@ public final class NoiseSessionManager {
         }
     }
     
-    public func initiateRekey(for peerID: PeerID) throws {
+    func initiateRekey(for peerID: PeerID) throws {
         // Remove old session
         removeSession(for: peerID)
         

bitchat/Nostr/NostrEmbeddedBitChat.swift

@@ -1,5 +1,4 @@
 import Foundation
-import BitFoundation
 
 // MARK: - BitChat-over-Nostr Adapter
 

bitchat/Nostr/NostrIdentityBridge.swift

@@ -1,4 +1,3 @@
-import BitFoundation
 import Foundation
 import CryptoKit
 

bitchat/Protocols/BinaryEncodingUtils.swift

@@ -5,15 +5,70 @@
 // Binary encoding utilities for efficient protocol messages
 //
 
-import struct Foundation.Data
-import struct Foundation.Date
+import Foundation
+import CryptoKit
+
+// MARK: - Hex Encoding/Decoding
+
+extension Data {
+    func hexEncodedString() -> String {
+        if self.isEmpty {
+            return ""
+        }
+        return self.map { String(format: "%02x", $0) }.joined()
+    }
+
+    func sha256Hex() -> String {
+        let digest = SHA256.hash(data: self)
+        return digest.map { String(format: "%02x", $0) }.joined()
+    }
+    
+    /// Initialize Data from a hex string.
+    /// - Parameter hexString: A hex string, optionally prefixed with "0x" or "0X".
+    ///   Whitespace is trimmed. Must have even length after prefix removal.
+    /// - Returns: nil if the string has odd length or contains invalid hex characters.
+    init?(hexString: String) {
+        var hex = hexString.trimmed
+
+        // Remove optional 0x prefix
+        if hex.hasPrefix("0x") || hex.hasPrefix("0X") {
+            hex = String(hex.dropFirst(2))
+        }
+
+        // Reject odd-length strings
+        guard hex.count % 2 == 0 else {
+            return nil
+        }
+
+        // Reject empty strings
+        guard !hex.isEmpty else {
+            self = Data()
+            return
+        }
+
+        let len = hex.count / 2
+        var data = Data(capacity: len)
+        var index = hex.startIndex
+
+        for _ in 0..<len {
+            let nextIndex = hex.index(index, offsetBy: 2)
+            guard let byte = UInt8(String(hex[index..<nextIndex]), radix: 16) else {
+                return nil
+            }
+            data.append(byte)
+            index = nextIndex
+        }
+
+        self = data
+    }
+}
 
 // MARK: - Binary Encoding Utilities
 
 extension Data {
     // MARK: Writing
     
-    @inlinable public mutating func appendUInt8(_ value: UInt8) {
+    @inlinable mutating func appendUInt8(_ value: UInt8) {
         self.append(value)
     }
     
@@ -35,7 +90,7 @@ extension Data {
         }
     }
     
-    public mutating func appendString(_ string: String, maxLength: Int = 255) {
+    mutating func appendString(_ string: String, maxLength: Int = 255) {
         guard let data = string.data(using: .utf8) else { return }
         let length = Swift.min(data.count, maxLength)
         
@@ -48,7 +103,7 @@ extension Data {
         self.append(data.prefix(length))
     }
     
-    public mutating func appendData(_ data: Data, maxLength: Int = 65535) {
+    mutating func appendData(_ data: Data, maxLength: Int = 65535) {
         let length = Swift.min(data.count, maxLength)
         
         if maxLength <= 255 {
@@ -60,12 +115,12 @@ extension Data {
         self.append(data.prefix(length))
     }
     
-    public mutating func appendDate(_ date: Date) {
+    mutating func appendDate(_ date: Date) {
         let timestamp = UInt64(date.timeIntervalSince1970 * 1000) // milliseconds
         self.appendUInt64(timestamp)
     }
     
-    public mutating func appendUUID(_ uuid: String) {
+    mutating func appendUUID(_ uuid: String) {
         // Convert UUID string to 16 bytes
         var uuidData = Data(count: 16)
         
@@ -86,7 +141,7 @@ extension Data {
     
     // MARK: Reading
     
-    @inlinable public func readUInt8(at offset: inout Int) -> UInt8? {
+    @inlinable func readUInt8(at offset: inout Int) -> UInt8? {
         guard offset >= 0 && offset < self.count else { return nil }
         let value = self[offset]
         offset += 1
@@ -120,7 +175,7 @@ extension Data {
         return value
     }
     
-    public func readString(at offset: inout Int, maxLength: Int = 255) -> String? {
+    func readString(at offset: inout Int, maxLength: Int = 255) -> String? {
         let length: Int
         
         if maxLength <= 255 {
@@ -139,7 +194,7 @@ extension Data {
         return String(data: stringData, encoding: .utf8)
     }
     
-    public func readData(at offset: inout Int, maxLength: Int = 65535) -> Data? {
+    func readData(at offset: inout Int, maxLength: Int = 65535) -> Data? {
         let length: Int
         
         if maxLength <= 255 {
@@ -158,12 +213,12 @@ extension Data {
         return data
     }
     
-    public func readDate(at offset: inout Int) -> Date? {
+    func readDate(at offset: inout Int) -> Date? {
         guard let timestamp = readUInt64(at: &offset) else { return nil }
         return Date(timeIntervalSince1970: Double(timestamp) / 1000.0)
     }
     
-    public func readUUID(at offset: inout Int) -> String? {
+    func readUUID(at offset: inout Int) -> String? {
         guard offset + 16 <= self.count else { return nil }
         
         let uuidData = self[offset..<offset + 16]
@@ -184,7 +239,7 @@ extension Data {
         return result.uppercased()
     }
     
-    public func readFixedBytes(at offset: inout Int, count: Int) -> Data? {
+    func readFixedBytes(at offset: inout Int, count: Int) -> Data? {
         guard offset + count <= self.count else { return nil }
         
         let data = self[offset..<offset + count]

bitchat/Protocols/BinaryProtocol.swift

@@ -88,31 +88,40 @@
 /// - Platform-optimized byte swapping
 ///
 
-import struct Foundation.Data
-import class Foundation.NSData
-private import BitLogger
+import Foundation
+import BitLogger
+
+extension Data {
+    func trimmingNullBytes() -> Data {
+        // Find the first null byte
+        if let nullIndex = self.firstIndex(of: 0) {
+            return self.prefix(nullIndex)
+        }
+        return self
+    }
+}
 
 /// Implements binary encoding and decoding for BitChat protocol messages.
 /// Provides static methods for converting between BitchatPacket objects and
 /// their binary wire format representation.
 /// - Note: All multi-byte values use network byte order (big-endian)
-public struct BinaryProtocol {
-    public static let v1HeaderSize = 14
+struct BinaryProtocol {
+    static let v1HeaderSize = 14
     static let v2HeaderSize = 16
-    public static let senderIDSize = 8
-    public static let recipientIDSize = 8
-    public static let signatureSize = 64
+    static let senderIDSize = 8
+    static let recipientIDSize = 8
+    static let signatureSize = 64
 
     // Field offsets within packet header
-    public struct Offsets {
+    struct Offsets {
         static let version = 0
         static let type = 1
         static let ttl = 2
         static let timestamp = 3
-        public static let flags = 11  // After version(1) + type(1) + ttl(1) + timestamp(8)
+        static let flags = 11  // After version(1) + type(1) + ttl(1) + timestamp(8)
     }
 
-    public static func headerSize(for version: UInt8) -> Int? {
+    static func headerSize(for version: UInt8) -> Int? {
         switch version {
         case 1: return v1HeaderSize
         case 2: return v2HeaderSize
@@ -124,11 +133,11 @@ public struct BinaryProtocol {
         return version == 2 ? 4 : 2
     }
     
-    public struct Flags {
-        public static let hasRecipient: UInt8 = 0x01
-        public static let hasSignature: UInt8 = 0x02
-        public static let isCompressed: UInt8 = 0x04
-        public static let hasRoute: UInt8 = 0x08
+    struct Flags {
+        static let hasRecipient: UInt8 = 0x01
+        static let hasSignature: UInt8 = 0x02
+        static let isCompressed: UInt8 = 0x04
+        static let hasRoute: UInt8 = 0x08
         static let isRSR: UInt8 = 0x10
     }
     
@@ -257,7 +266,7 @@ public struct BinaryProtocol {
     }
     
     // Decode binary data to BitchatPacket
-    public static func decode(_ data: Data) -> BitchatPacket? {
+    static func decode(_ data: Data) -> BitchatPacket? {
         // Try decode as-is first (robust when padding wasn't applied)
         if let pkt = decodeCore(data) { return pkt }
         // If that fails, try after removing padding

bitchat/Protocols/BitchatFilePacket.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import BitFoundation
 import BitLogger
 
 /// TLV payload for Bluetooth mesh file transfers (voice notes, images, generic files).

bitchat/Protocols/BitchatProtocol.swift

@@ -60,7 +60,40 @@
 
 import Foundation
 import CoreBluetooth
-import BitFoundation
+
+// MARK: - Message Types
+
+/// Simplified BitChat protocol message types.
+/// Reduced from 24 types to just 6 essential ones.
+/// All private communication metadata (receipts, status) is embedded in noiseEncrypted payloads.
+enum MessageType: UInt8 {
+    // Public messages (unencrypted)
+    case announce = 0x01        // "I'm here" with nickname
+    case message = 0x02         // Public chat message  
+    case leave = 0x03           // "I'm leaving"
+    case requestSync = 0x21     // GCS filter-based sync request (local-only)
+    
+    // Noise encryption
+    case noiseHandshake = 0x10  // Handshake (init or response determined by payload)
+    case noiseEncrypted = 0x11  // All encrypted payloads (messages, receipts, etc.)
+    
+    // Fragmentation (simplified)
+    case fragment = 0x20        // Single fragment type for large messages
+    case fileTransfer = 0x22    // Binary file/audio/image payloads
+    
+    var description: String {
+        switch self {
+        case .announce: return "announce"
+        case .message: return "message"
+        case .leave: return "leave"
+        case .requestSync: return "requestSync"
+        case .noiseHandshake: return "noiseHandshake"
+        case .noiseEncrypted: return "noiseEncrypted"
+        case .fragment: return "fragment"
+        case .fileTransfer: return "fileTransfer"
+        }
+    }
+}
 
 // MARK: - Noise Payload Types
 
@@ -98,6 +131,35 @@ enum LazyHandshakeState {
     case failed(Error)         // Handshake failed
 }
 
+// MARK: - Delivery Status
+
+// Delivery status for messages
+enum DeliveryStatus: Codable, Equatable, Hashable {
+    case sending
+    case sent  // Left our device
+    case delivered(to: String, at: Date)  // Confirmed by recipient
+    case read(by: String, at: Date)  // Seen by recipient
+    case failed(reason: String)
+    case partiallyDelivered(reached: Int, total: Int)  // For rooms
+    
+    var displayText: String {
+        switch self {
+        case .sending:
+            return "Sending..."
+        case .sent:
+            return "Sent"
+        case .delivered(let nickname, _):
+            return "Delivered to \(nickname)"
+        case .read(let nickname, _):
+            return "Read by \(nickname)"
+        case .failed(let reason):
+            return "Failed: \(reason)"
+        case .partiallyDelivered(let reached, let total):
+            return "Delivered to \(reached)/\(total)"
+        }
+    }
+}
+
 // MARK: - Delegate Protocol
 
 protocol BitchatDelegate: AnyObject {

bitchat/Services/BLE/BLEService.swift

@@ -1,5 +1,4 @@
 import BitLogger
-import BitFoundation
 import Foundation
 import CoreBluetooth
 import Combine

bitchat/Services/CommandProcessor.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import BitFoundation
 
 /// Result of command processing
 enum CommandResult {

bitchat/Services/FavoritesPersistenceService.swift

@@ -1,5 +1,4 @@
 import BitLogger
-import BitFoundation
 import Foundation
 import Combine
 

bitchat/Services/KeychainManager.swift

@@ -7,10 +7,76 @@
 //
 
 import BitLogger
-import BitFoundation
 import Foundation
 import Security
 
+// MARK: - Keychain Error Types
+// BCH-01-009: Proper error classification to distinguish expected states from critical failures
+
+/// Result of a keychain read operation with proper error classification
+enum KeychainReadResult {
+    case success(Data)
+    case itemNotFound        // Expected: key doesn't exist yet
+    case accessDenied        // Critical: app lacks keychain access
+    case deviceLocked        // Recoverable: device is locked
+    case authenticationFailed // Recoverable: biometric/passcode failed
+    case otherError(OSStatus) // Unexpected error
+
+    var isRecoverableError: Bool {
+        switch self {
+        case .deviceLocked, .authenticationFailed:
+            return true
+        default:
+            return false
+        }
+    }
+}
+
+/// Result of a keychain save operation with proper error classification
+enum KeychainSaveResult {
+    case success
+    case duplicateItem       // Can retry with update
+    case accessDenied        // Critical: app lacks keychain access
+    case deviceLocked        // Recoverable: device is locked
+    case storageFull         // Critical: no space available
+    case otherError(OSStatus)
+
+    var isRecoverableError: Bool {
+        switch self {
+        case .duplicateItem, .deviceLocked:
+            return true
+        default:
+            return false
+        }
+    }
+}
+
+protocol KeychainManagerProtocol {
+    func saveIdentityKey(_ keyData: Data, forKey key: String) -> Bool
+    func getIdentityKey(forKey key: String) -> Data?
+    func deleteIdentityKey(forKey key: String) -> Bool
+    func deleteAllKeychainData() -> Bool
+
+    func secureClear(_ data: inout Data)
+    func secureClear(_ string: inout String)
+
+    func verifyIdentityKeyExists() -> Bool
+
+    // BCH-01-009: Methods with proper error classification
+    /// Get identity key with detailed result for error handling
+    func getIdentityKeyWithResult(forKey key: String) -> KeychainReadResult
+    /// Save identity key with detailed result for error handling
+    func saveIdentityKeyWithResult(_ keyData: Data, forKey key: String) -> KeychainSaveResult
+
+    // MARK: - Generic Data Storage (consolidated from KeychainHelper)
+    /// Save data with a custom service name
+    func save(key: String, data: Data, service: String, accessible: CFString?)
+    /// Load data from a custom service
+    func load(key: String, service: String) -> Data?
+    /// Delete data from a custom service
+    func delete(key: String, service: String)
+}
+
 final class KeychainManager: KeychainManagerProtocol {
     // Use consistent service name for all keychain items
     private let service = BitchatApp.bundleID

bitchat/Services/MessageFormattingEngine.swift

@@ -6,7 +6,6 @@
 // This is free and unencumbered software released into the public domain.
 //
 
-import BitFoundation
 import Foundation
 import SwiftUI
 

bitchat/Services/MessageRouter.swift

@@ -1,5 +1,4 @@
 import BitLogger
-import BitFoundation
 import Foundation
 
 /// Routes messages using available transports (Mesh, Nostr, etc.)

bitchat/Services/NoiseEncryptionService.swift

@@ -83,8 +83,6 @@
 ///
 
 import BitLogger
-import BitFoundation
-import Noise
 import Foundation
 import CryptoKit
 

bitchat/Services/NostrTransport.swift

@@ -1,5 +1,4 @@
 import BitLogger
-import BitFoundation
 import Foundation
 import Combine
 

bitchat/Services/NotificationService.swift

@@ -6,7 +6,6 @@
 // For more information, see <https://unlicense.org>
 //
 
-import BitFoundation
 import Foundation
 import UserNotifications
 #if os(iOS)

bitchat/Services/NotificationStreamAssembler.swift

@@ -7,7 +7,6 @@
 //
 
 import BitLogger
-import BitFoundation
 import Foundation
 
 struct NotificationStreamAssembler {

bitchat/Services/PrivateChatManager.swift

@@ -7,7 +7,6 @@
 //
 
 import BitLogger
-import BitFoundation
 import Foundation
 import SwiftUI
 

bitchat/Services/Transport.swift

@@ -1,4 +1,3 @@
-import BitFoundation
 import Foundation
 import Combine
 

bitchat/Services/TransportConfig.swift

@@ -133,6 +133,9 @@ enum TransportConfig {
     static let nostrShortKeyDisplayLength: Int = 8
     static let nostrConvKeyPrefixLength: Int = 16
 
+    // Compression
+    static let compressionThresholdBytes: Int = 100
+
     // Message deduplication
     static let messageDedupMaxAgeSeconds: TimeInterval = 300
     static let messageDedupMaxCount: Int = 1000

bitchat/Services/UnifiedPeerService.swift

@@ -7,7 +7,6 @@
 //
 
 import BitLogger
-import BitFoundation
 import Foundation
 import Combine
 import SwiftUI

bitchat/Sync/GossipSyncManager.swift

@@ -1,6 +1,5 @@
 import Foundation
 import BitLogger
-import BitFoundation
 
 // Gossip-based sync manager using on-demand GCS filters
 final class GossipSyncManager {

bitchat/Sync/PacketIdUtil.swift

@@ -1,4 +1,3 @@
-import struct BitFoundation.BitchatPacket
 import Foundation
 import CryptoKit
 

bitchat/Sync/RequestSyncManager.swift

@@ -8,7 +8,6 @@
 
 import Foundation
 import BitLogger
-import BitFoundation
 
 /// Manages outgoing sync requests and validates incoming responses.
 ///

bitchat/Sync/SyncTypeFlags.swift

@@ -1,4 +1,3 @@
-import BitFoundation
 import Foundation
 
 /// Bitfield describing which message types are covered by a REQUEST_SYNC round.

bitchat/Utils/CompressionUtil.swift

@@ -6,12 +6,12 @@
 // For more information, see <https://unlicense.org>
 //
 
-import struct Foundation.Data
-private import Compression
+import Foundation
+import Compression
 
 struct CompressionUtil {
     // Compression threshold - don't compress if data is smaller than this
-    static let compressionThreshold = Constants.compressionThresholdBytes // bytes
+    static let compressionThreshold = TransportConfig.compressionThresholdBytes // bytes
     
     // Compress data using zlib algorithm (most compatible)
     static func compress(_ data: Data) -> Data? {

bitchat/Utils/Data+SHA256.swift

@@ -0,0 +1,22 @@
+//
+//  Data+SHA256.swift
+//  bitchat
+//
+//  Created by Islam on 26/09/2025.
+//
+
+import struct Foundation.Data
+import struct CryptoKit.SHA256
+
+extension Data {
+    /// Returns the hex representation of SHA256 hash
+    func sha256Fingerprint() -> String {
+        // Implementation matches existing fingerprint generation in NoiseEncryptionService
+        sha256Hash().hexEncodedString()
+    }
+    
+    /// Returns the SHA256 hash wrapped in Data
+    func sha256Hash() -> Data {
+        Data(SHA256.hash(data: self))
+    }
+}

bitchat/Utils/FileTransferLimits.swift

@@ -1,13 +1,15 @@
+import Foundation
+
 /// Centralized thresholds for Bluetooth file transfers to keep payload sizes sane on constrained radios.
-public enum FileTransferLimits {
+enum FileTransferLimits {
     /// Absolute ceiling enforced for any file payload (voice, image, other).
-    public static let maxPayloadBytes: Int = 1 * 1024 * 1024 // 1 MiB
+    static let maxPayloadBytes: Int = 1 * 1024 * 1024 // 1 MiB
     /// Voice notes stay small for low-latency relays.
-    public static let maxVoiceNoteBytes: Int = 512 * 1024 // 512 KiB
+    static let maxVoiceNoteBytes: Int = 512 * 1024 // 512 KiB
     /// Compressed images after downscaling should comfortably fit under this budget.
-    public static let maxImageBytes: Int = 512 * 1024 // 512 KiB
+    static let maxImageBytes: Int = 512 * 1024 // 512 KiB
     /// Worst-case size once TLV metadata and binary packet framing are included for the largest payloads.
-    public static let maxFramedFileBytes: Int = {
+    static let maxFramedFileBytes: Int = {
         let maxMetadataBytes = Int(UInt16.max) * 2 // fileName + mimeType TLVs
         let tlvEnvelopeOverhead = 18 + maxMetadataBytes // TLV tags + lengths + metadata bytes
         let binaryEnvelopeOverhead = BinaryProtocol.v2HeaderSize
@@ -17,7 +19,7 @@ public enum FileTransferLimits {
         return maxPayloadBytes + tlvEnvelopeOverhead + binaryEnvelopeOverhead
     }()
 
-    public static func isValidPayload(_ size: Int) -> Bool {
+    static func isValidPayload(_ size: Int) -> Bool {
         size <= maxPayloadBytes
     }
 }

bitchat/Utils/PeerDisplayNameResolver.swift

@@ -1,5 +1,4 @@
 import Foundation
-import BitFoundation
 
 /// Resolves a stable display name for peers, adding a short suffix when collisions exist.
 struct PeerDisplayNameResolver {

bitchat/Utils/String+Ext.swift

@@ -1,12 +1,12 @@
 //
 // String+Ext.swift
-// BitFoundation
+// bitchat
 //
 // This is free and unencumbered software released into the public domain.
 // For more information, see <https://unlicense.org>
 //
 
-public extension StringProtocol {
+extension StringProtocol {
     var trimmed: String {
         trimmingCharacters(in: .whitespacesAndNewlines)
     }

bitchat/ViewModels/ChatViewModel.swift

@@ -78,7 +78,6 @@
 ///
 
 import BitLogger
-import BitFoundation
 import Foundation
 import SwiftUI
 import Combine

bitchat/ViewModels/Extensions/ChatViewModel+Nostr.swift

@@ -8,7 +8,6 @@
 import Foundation
 import Combine
 import BitLogger
-import BitFoundation
 import SwiftUI
 import Tor
 

bitchat/ViewModels/Extensions/ChatViewModel+PrivateChat.swift

@@ -8,7 +8,6 @@
 import Foundation
 import Combine
 import BitLogger
-import BitFoundation
 import SwiftUI
 
 extension ChatViewModel {

bitchat/ViewModels/PublicMessagePipeline.swift

@@ -5,7 +5,6 @@
 // Handles batching and deduplication of public chat messages before surfacing them to the UI.
 //
 
-import BitFoundation
 import Foundation
 
 @MainActor

bitchat/ViewModels/PublicTimelineStore.swift

@@ -5,7 +5,6 @@
 // Maintains mesh and geohash public timelines with simple caps and helpers.
 //
 
-import BitFoundation
 import Foundation
 
 struct PublicTimelineStore {

bitchat/Views/Components/DeliveryStatusView.swift

@@ -7,7 +7,6 @@
 //
 
 import SwiftUI
-import BitFoundation
 
 struct DeliveryStatusView: View {
     @Environment(\.colorScheme) private var colorScheme

bitchat/Views/Components/TextMessageView.swift

@@ -7,7 +7,6 @@
 //
 
 import SwiftUI
-import BitFoundation
 
 struct TextMessageView: View {
     @Environment(\.colorScheme) private var colorScheme: ColorScheme

bitchat/Views/ContentView.swift

@@ -15,7 +15,6 @@ import AppKit
 #endif
 import UniformTypeIdentifiers
 import BitLogger
-import BitFoundation
 
 /// On macOS 14+, disables the default system focus ring on TextFields.
 /// On earlier macOS versions and on iOS this is a no-op.

bitchat/Views/FingerprintView.swift

@@ -7,7 +7,6 @@
 //
 
 import SwiftUI
-import BitFoundation
 
 struct FingerprintView: View {
     @ObservedObject var viewModel: ChatViewModel

bitchat/Views/Media/MediaMessageView.swift

@@ -6,7 +6,6 @@
 //
 
 import SwiftUI
-import BitFoundation
 
 struct MediaMessageView: View {
     @Environment(\.colorScheme) private var colorScheme

bitchat/Views/MeshPeerList.swift

@@ -1,5 +1,4 @@
 import SwiftUI
-import BitFoundation
 
 struct MeshPeerList: View {
     @ObservedObject var viewModel: ChatViewModel

bitchat/Views/MessageListView.swift

@@ -5,7 +5,6 @@
 //  Created by Islam on 30/03/2026.
 //
 
-import BitFoundation
 import SwiftUI
 
 private struct MessageDisplayItem: Identifiable {

bitchat/_PreviewHelpers/BitchatMessage+Preview.swift

@@ -6,7 +6,6 @@
 // For more information, see <https://unlicense.org>
 //
 
-import BitFoundation
 import Foundation
 
 extension BitchatMessage {

bitchat/_PreviewHelpers/PreviewKeychainManager.swift

@@ -6,7 +6,6 @@
 // For more information, see <https://unlicense.org>
 //
 
-import BitFoundation
 import Foundation
 
 final class PreviewKeychainManager: KeychainManagerProtocol {

bitchatTests/BLEServiceCoreTests.swift

@@ -8,7 +8,6 @@
 import Testing
 import Foundation
 import CoreBluetooth
-import BitFoundation
 @testable import bitchat
 
 struct BLEServiceCoreTests {

bitchatTests/BLEServiceTests.swift

@@ -8,7 +8,6 @@
 
 import Testing
 import CoreBluetooth
-@testable import BitFoundation // to avoid unnecessary public's
 @testable import bitchat
 
 struct BLEServiceTests {

bitchatTests/BitchatPeerTests.swift

@@ -1,6 +1,5 @@
 import Foundation
 import Testing
-import BitFoundation
 @testable import bitchat
 
 @Suite("BitchatPeer Tests")

bitchatTests/ChatViewModelDeliveryStatusTests.swift

@@ -7,7 +7,6 @@
 
 import Testing
 import Foundation
-import BitFoundation
 @testable import bitchat
 
 // MARK: - Test Helpers

bitchatTests/ChatViewModelExtensionsTests.swift

@@ -13,7 +13,6 @@ import UIKit
 #else
 import AppKit
 #endif
-import BitFoundation
 @testable import bitchat
 
 // MARK: - Test Helpers

bitchatTests/ChatViewModelRefactoringTests.swift

@@ -8,7 +8,6 @@
 
 import Testing
 import Foundation
-import BitFoundation
 @testable import bitchat
 
 struct ChatViewModelRefactoringTests {

bitchatTests/ChatViewModelTests.swift

@@ -8,7 +8,6 @@
 
 import Testing
 import Foundation
-import BitFoundation
 @testable import bitchat
 
 // MARK: - Test Helpers

bitchatTests/CommandProcessorTests.swift

@@ -1,6 +1,5 @@
 import Foundation
 import Testing
-import BitFoundation
 @testable import bitchat
 
 @Suite(.serialized)

bitchatTests/EndToEnd/PrivateChatE2ETests.swift

@@ -9,8 +9,6 @@
 import Testing
 import CryptoKit
 import struct Foundation.UUID
-import Noise
-@testable import BitFoundation // to avoid unnecessary public's
 @testable import bitchat
 
 struct PrivateChatE2ETests {

bitchatTests/EndToEnd/PublicChatE2ETests.swift

@@ -8,7 +8,6 @@
 
 import Testing
 import struct Foundation.UUID
-@testable import BitFoundation // to avoid unnecessary public's
 @testable import bitchat
 
 struct PublicChatE2ETests {

bitchatTests/Fragmentation/FragmentationTests.swift

@@ -9,7 +9,6 @@
 import Testing
 import Foundation
 import CoreBluetooth
-import BitFoundation
 @testable import bitchat
 
 struct FragmentationTests {

bitchatTests/GossipSyncManagerTests.swift

@@ -1,6 +1,5 @@
 import Foundation
 import Testing
-import BitFoundation
 @testable import bitchat
 
 struct GossipSyncManagerTests {

bitchatTests/Integration/IntegrationTests.swift

@@ -9,8 +9,6 @@
 import Foundation
 import CryptoKit
 import Testing
-import Noise
-@testable import BitFoundation // to avoid unnecessary public's
 @testable import bitchat
 
 struct IntegrationTests {

bitchatTests/Integration/TestNetworkHelper.swift

@@ -8,8 +8,6 @@
 
 import Foundation
 import CryptoKit
-import Noise
-@testable import BitFoundation // to avoid unnecessary public's
 @testable import bitchat
 
 final class TestNetworkHelper {

bitchatTests/KeychainErrorHandlingTests.swift

@@ -9,7 +9,7 @@
 
 import Testing
 import Foundation
-import BitFoundation
+@testable import bitchat
 
 struct KeychainErrorHandlingTests {
 
@@ -145,6 +145,67 @@ struct KeychainErrorHandlingTests {
             throw KeychainTestError("Expected save success, got \(saveResult)")
         }
     }
+
+    // MARK: - NoiseEncryptionService Integration Tests
+
+    @Test func noiseEncryptionService_generatesNewIdentityWhenMissing() throws {
+        let keychain = MockKeychain()
+
+        // Create service with empty keychain - should generate new identity
+        let service = NoiseEncryptionService(keychain: keychain)
+
+        // Should have generated and saved keys
+        #expect(service.getStaticPublicKeyData().count == 32)
+        #expect(service.getSigningPublicKeyData().count == 32)
+
+        // Keys should be persisted
+        let noiseKeyResult = keychain.getIdentityKeyWithResult(forKey: "noiseStaticKey")
+        switch noiseKeyResult {
+        case .success:
+            // Expected - key was saved
+            break
+        default:
+            throw KeychainTestError("Expected noise key to be saved")
+        }
+    }
+
+    @Test func noiseEncryptionService_loadsExistingIdentity() throws {
+        let keychain = MockKeychain()
+
+        // Create first service to generate identity
+        let service1 = NoiseEncryptionService(keychain: keychain)
+        let originalPublicKey = service1.getStaticPublicKeyData()
+        let originalSigningKey = service1.getSigningPublicKeyData()
+
+        // Create second service - should load same identity
+        let service2 = NoiseEncryptionService(keychain: keychain)
+
+        #expect(service2.getStaticPublicKeyData() == originalPublicKey)
+        #expect(service2.getSigningPublicKeyData() == originalSigningKey)
+    }
+
+    @Test func noiseEncryptionService_handlesAccessDeniedGracefully() throws {
+        let keychain = MockKeychain()
+        keychain.simulatedReadError = .accessDenied
+
+        // Service should still initialize with ephemeral key
+        let service = NoiseEncryptionService(keychain: keychain)
+
+        // Should have an identity (ephemeral)
+        #expect(service.getStaticPublicKeyData().count == 32)
+        #expect(service.getSigningPublicKeyData().count == 32)
+    }
+
+    @Test func noiseEncryptionService_handlesDeviceLockedGracefully() throws {
+        let keychain = MockKeychain()
+        keychain.simulatedReadError = .deviceLocked
+
+        // Service should still initialize with ephemeral key
+        let service = NoiseEncryptionService(keychain: keychain)
+
+        // Should have an identity (ephemeral)
+        #expect(service.getStaticPublicKeyData().count == 32)
+    }
 }
 
 // Helper error type for tests

bitchatTests/MessageFormattingEngineTests.swift

@@ -9,7 +9,6 @@
 import Testing
 import Foundation
 import SwiftUI
-import BitFoundation
 @testable import bitchat
 
 struct MessageFormattingEngineTests {

bitchatTests/Mocks/MockBLEBus.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import BitFoundation
 @testable import bitchat
 
 final class MockBLEBus {

bitchatTests/Mocks/MockBLEService.swift

@@ -8,7 +8,6 @@
 
 import Foundation
 import CoreBluetooth
-@testable import BitFoundation // to avoid unnecessary public's
 @testable import bitchat
 
 /// In-memory BLE test harness used by E2E/Integration tests.

bitchatTests/Mocks/MockIdentityManager.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import BitFoundation
 @testable import bitchat
 
 final class MockIdentityManager: SecureIdentityStateManagerProtocol {

bitchatTests/Mocks/MockKeychain.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import BitFoundation
 @testable import bitchat
 
 final class MockKeychain: KeychainManagerProtocol {

bitchatTests/Mocks/MockTransport.swift

@@ -9,7 +9,6 @@
 import Foundation
 import Combine
 import CoreBluetooth
-import BitFoundation
 @testable import bitchat
 
 /// Mock Transport implementation for testing ChatViewModel in isolation.

bitchatTests/Noise/NoiseCoverageTests.swift

@@ -1,8 +1,8 @@
 import CryptoKit
 import Foundation
 import Testing
-import BitFoundation
-@testable import Noise
+
+@testable import bitchat
 
 @Suite("Noise Coverage Tests")
 struct NoiseCoverageTests {

bitchatTests/Noise/NoiseProtocolTests.swift

@@ -9,8 +9,8 @@
 import CryptoKit
 import Foundation
 import Testing
-import BitFoundation
-@testable import Noise
+
+@testable import bitchat
 
 // MARK: - Test Vector Support
 
@@ -613,7 +613,9 @@ struct NoiseProtocolTests {
     
     private func loadTestVectors() throws -> [NoiseTestVector] {
         // Try to load from test bundle
-        guard let url = Bundle.module.url(forResource: "NoiseTestVectors", withExtension: "json") else {
+        let testBundle = Bundle(for: MockKeychain.self)
+        guard let url = testBundle.url(forResource: "NoiseTestVectors", withExtension: "json")
+        else {
             throw NSError(
                 domain: "NoiseTests", code: 1,
                 userInfo: [

bitchatTests/Noise/NoiseRateLimiterTests.swift

@@ -1,6 +1,5 @@
 import XCTest
-import BitFoundation
-@testable import Noise
+@testable import bitchat
 
 final class NoiseRateLimiterTests: XCTestCase {
     func test_allowHandshake_blocksAfterPerPeerLimit() {

bitchatTests/NoiseEncryptionTests.swift

@@ -1,78 +0,0 @@
-//
-// NoiseEncryptionTests.swift
-// bitchat
-//
-// This is free and unencumbered software released into the public domain.
-// For more information, see <https://unlicense.org>
-//
-
-import Testing
-@testable import bitchat
-
-struct NoiseEncryptionTests {
-    @Test func generatesNewIdentityWhenMissing() throws {
-        let keychain = MockKeychain()
-
-        // Create service with empty keychain - should generate new identity
-        let service = NoiseEncryptionService(keychain: keychain)
-
-        // Should have generated and saved keys
-        #expect(service.getStaticPublicKeyData().count == 32)
-        #expect(service.getSigningPublicKeyData().count == 32)
-
-        // Keys should be persisted
-        let noiseKeyResult = keychain.getIdentityKeyWithResult(forKey: "noiseStaticKey")
-        switch noiseKeyResult {
-        case .success:
-            // Expected - key was saved
-            break
-        default:
-            throw KeychainTestError("Expected noise key to be saved")
-        }
-    }
-
-    @Test func loadsExistingIdentity() throws {
-        let keychain = MockKeychain()
-
-        // Create first service to generate identity
-        let service1 = NoiseEncryptionService(keychain: keychain)
-        let originalPublicKey = service1.getStaticPublicKeyData()
-        let originalSigningKey = service1.getSigningPublicKeyData()
-
-        // Create second service - should load same identity
-        let service2 = NoiseEncryptionService(keychain: keychain)
-
-        #expect(service2.getStaticPublicKeyData() == originalPublicKey)
-        #expect(service2.getSigningPublicKeyData() == originalSigningKey)
-    }
-
-    @Test func handlesAccessDeniedGracefully() throws {
-        let keychain = MockKeychain()
-        keychain.simulatedReadError = .accessDenied
-
-        // Service should still initialize with ephemeral key
-        let service = NoiseEncryptionService(keychain: keychain)
-
-        // Should have an identity (ephemeral)
-        #expect(service.getStaticPublicKeyData().count == 32)
-        #expect(service.getSigningPublicKeyData().count == 32)
-    }
-
-    @Test func handlesDeviceLockedGracefully() throws {
-        let keychain = MockKeychain()
-        keychain.simulatedReadError = .deviceLocked
-
-        // Service should still initialize with ephemeral key
-        let service = NoiseEncryptionService(keychain: keychain)
-
-        // Should have an identity (ephemeral)
-        #expect(service.getStaticPublicKeyData().count == 32)
-    }
-}
-
-// TODO: Reuse
-private struct KeychainTestError: Error, CustomStringConvertible {
-    let message: String
-    init(_ message: String) { self.message = message }
-    var description: String { message }
-}

bitchatTests/NostrProtocolTests.swift

@@ -8,7 +8,6 @@
 import Testing
 import CryptoKit
 import Foundation
-import BitFoundation
 @testable import bitchat
 
 struct NostrProtocolTests {

bitchatTests/NotificationStreamAssemblerTests.swift

@@ -1,6 +1,5 @@
 import Testing
 import Foundation
-import BitFoundation
 @testable import bitchat
 
 struct NotificationStreamAssemblerTests {

bitchatTests/Protocol/BinaryProtocolPaddingTests.swift

@@ -6,7 +6,7 @@
 //
 
 import Testing
-@testable import BitFoundation
+@testable import bitchat
 
 struct BinaryProtocolPaddingTests {
     @Test func padded_vs_unpadded_length() throws {

bitchatTests/Protocol/BinaryProtocolTests.swift

@@ -8,7 +8,7 @@
 
 import Testing
 import Foundation
-@testable import BitFoundation
+@testable import bitchat
 
 struct BinaryProtocolTests {
     
@@ -805,13 +805,3 @@ struct BinaryProtocolTests {
         // We don't assert the result, just that no crash happens
     }
 }
-
-private extension Data {
-    func trimmingNullBytes() -> Data {
-        // Find the first null byte
-        if let nullIndex = self.firstIndex(of: 0) {
-            return self.prefix(nullIndex)
-        }
-        return self
-    }
-}

bitchatTests/ProtocolContractTests.swift

@@ -2,7 +2,6 @@ import Testing
 import Foundation
 import Combine
 import CoreBluetooth
-import BitFoundation
 @testable import bitchat
 
 private final class DefaultDelegateProbe: BitchatDelegate {

bitchatTests/Protocols/BinaryEncodingUtilsTests.swift

@@ -1,6 +1,5 @@
 import Foundation
 import XCTest
-@testable import BitFoundation // to avoid unnecessary public's
 @testable import bitchat
 
 final class BinaryEncodingUtilsTests: XCTestCase {

bitchatTests/PublicMessagePipelineTests.swift

@@ -7,7 +7,6 @@
 
 import Testing
 import Foundation
-import BitFoundation
 @testable import bitchat
 
 @MainActor

bitchatTests/ReadReceiptTests.swift

@@ -1,6 +1,5 @@
 import Foundation
 import Testing
-import BitFoundation
 @testable import bitchat
 
 @Suite("ReadReceipt Tests")