Updated dependencies

colemancda · colemancda · commit 23542350c2f8 · 2022-04-27T12:21:33.000-07:00
diff --git a/Package.swift b/Package.swift
@@ -20,10 +20,6 @@ let package = Package(
             url: "https://github.com/PureSwift/Bluetooth.git",
             .branch("master")
         ),
-        .package(
-            url: "https://github.com/PureSwift/swift-system.git",
-            .branch("master")
-        ),
         .package(
             url: "https://github.com/PureSwift/Socket.git",
             .branch("main")
@@ -42,10 +38,6 @@ let package = Package(
                     package: "Bluetooth"
                 ),
                 "CBluetoothLinux",
-                .product(
-                    name: "SystemPackage",
-                    package: "swift-system"
-                ),
                 "Socket"
             ]
         ),
diff --git a/Sources/BluetoothLinux/BNEP/IOCTL/BNEPIO.swift b/Sources/BluetoothLinux/BNEP/IOCTL/BNEPIO.swift
@@ -6,6 +6,7 @@
 //
 
 import SystemPackage
+import Socket
 
 /// Bluetooth BNEP `ioctl` requests
 @frozen
diff --git a/Sources/BluetoothLinux/CMTP/IOCTL/CMTPIO.swift b/Sources/BluetoothLinux/CMTP/IOCTL/CMTPIO.swift
@@ -6,6 +6,7 @@
 //
 
 import SystemPackage
+import Socket
 
 /// Bluetooth CMTP `ioctl` requests
 @frozen
diff --git a/Sources/BluetoothLinux/HCI/HCIFileDescriptor.swift b/Sources/BluetoothLinux/HCI/HCIFileDescriptor.swift
@@ -181,14 +181,14 @@ internal extension Socket {
     }
 }
 
-internal extension FileDescriptor {
+internal extension SocketDescriptor {
     
     /// Creates an HCI socket binded to the specified address.
     @usableFromInline
     static func hci(
         _ address: HCISocketAddress,
         flags: SocketFlags = [.closeOnExec]
-    ) throws -> FileDescriptor {
+    ) throws -> SocketDescriptor {
         try bluetooth(
             .hci,
             bind: address,
diff --git a/Sources/BluetoothLinux/HCI/HCISocketOption.swift b/Sources/BluetoothLinux/HCI/HCISocketOption.swift
@@ -7,7 +7,7 @@
 
 import Bluetooth
 import BluetoothHCI
-import SystemPackage
+import Socket
 
 /// Bluetooth HCI Socket Option Identifier
 public enum HCISocketOption: Int32, SocketOptionID {
diff --git a/Sources/BluetoothLinux/HCI/HostController.swift b/Sources/BluetoothLinux/HCI/HostController.swift
@@ -38,15 +38,15 @@ public final class HostController: BluetoothHostControllerInterface {
             device: id,
             channel: .raw
         )
-        let fileDescriptor = try FileDescriptor.hci(address, flags: [.closeOnExec, .nonBlocking])
+        let fileDescriptor = try SocketDescriptor.hci(address, flags: [.closeOnExec, .nonBlocking])
         self.id = id
         self.socket = await Socket(fileDescriptor: fileDescriptor)
     }
     
     /// Initializes the Bluetooth controller with the specified address.
     public convenience init(address: BluetoothAddress) async throws {
         // open socket to query devices with ioctl()`
-        let fileDescriptor = try FileDescriptor.bluetooth(.hci, flags: [.closeOnExec])
+        let fileDescriptor = try SocketDescriptor.bluetooth(.hci, flags: [.closeOnExec])
         guard let deviceInfo = try fileDescriptor.closeAfter({
             try fileDescriptor.deviceList().first(where: {
                 try fileDescriptor.deviceInformation(for: $0.id).address == address
@@ -63,7 +63,7 @@ internal extension HostController {
         
     @usableFromInline
     static func loadDevices() throws -> HostControllerIO.DeviceList {
-        let fileDescriptor = try FileDescriptor.bluetooth(.hci, flags: [.closeOnExec])
+        let fileDescriptor = try SocketDescriptor.bluetooth(.hci, flags: [.closeOnExec])
         defer { try? fileDescriptor.close() }
         return try fileDescriptor.deviceList()
     }
diff --git a/Sources/BluetoothLinux/HCI/IOCTL/HCIDeviceDown.swift b/Sources/BluetoothLinux/HCI/IOCTL/HCIDeviceDown.swift
@@ -6,6 +6,7 @@
 //
 
 import SystemPackage
+import Socket
 
 public extension HostControllerIO {
     
@@ -29,7 +30,7 @@ public extension HostControllerIO {
 
 // MARK: - File Descriptor
 
-internal extension FileDescriptor {
+internal extension SocketDescriptor {
     
     @usableFromInline
     func deviceDown(for id: HostController.ID) throws {
@@ -43,7 +44,7 @@ public extension HostController {
     
     /// Disable the HCI device.
     static func disable(device id: HostController.ID) throws {
-        let fileDescriptor = try FileDescriptor.bluetooth(.hci, flags: [.closeOnExec])
+        let fileDescriptor = try SocketDescriptor.bluetooth(.hci, flags: [.closeOnExec])
         try fileDescriptor.closeAfter {
             try fileDescriptor.deviceDown(for: id)
         }
diff --git a/Sources/BluetoothLinux/HCI/IOCTL/HCIDeviceInformation.swift b/Sources/BluetoothLinux/HCI/IOCTL/HCIDeviceInformation.swift
@@ -7,6 +7,7 @@
 
 import Bluetooth
 import SystemPackage
+import Socket
 
 public extension HostControllerIO {
     
@@ -57,7 +58,7 @@ public extension HostControllerIO.DeviceInformation {
 
 // MARK: - File Descriptor
 
-internal extension FileDescriptor {
+internal extension SocketDescriptor {
     
     @usableFromInline
     func deviceInformation(for id: HostController.ID) throws -> HostControllerIO.DeviceInformation {
@@ -73,7 +74,7 @@ public extension HostController {
     
     /// Get device information.
     static func deviceInformation(for id: HostController.ID) throws -> HostControllerIO.DeviceInformation {
-        let fileDescriptor = try FileDescriptor.bluetooth(.hci, flags: [.closeOnExec])
+        let fileDescriptor = try SocketDescriptor.bluetooth(.hci, flags: [.closeOnExec])
         return try fileDescriptor.closeAfter {
             try fileDescriptor.deviceInformation(for: id)
         }
diff --git a/Sources/BluetoothLinux/HCI/IOCTL/HCIDeviceList.swift b/Sources/BluetoothLinux/HCI/IOCTL/HCIDeviceList.swift
@@ -7,6 +7,7 @@
 
 import Bluetooth
 import SystemPackage
+import Socket
 
 public extension HostControllerIO {
     
@@ -111,7 +112,7 @@ public extension HostControllerIO.DeviceList {
 
 // MARK: - File Descriptor
 
-internal extension FileDescriptor {
+internal extension SocketDescriptor {
     
     /// List all HCI devices.
     @usableFromInline
@@ -128,7 +129,7 @@ public extension HostController {
     
     /// Get device information.
     static func deviceList(count: Int = CInterop.HCIDeviceList.capacity) throws -> HostControllerIO.DeviceList {
-        let fileDescriptor = try FileDescriptor.bluetooth(.hci, flags: [.closeOnExec])
+        let fileDescriptor = try SocketDescriptor.bluetooth(.hci, flags: [.closeOnExec])
         return try fileDescriptor.closeAfter {
             try fileDescriptor.deviceList(count: count)
         }
diff --git a/Sources/BluetoothLinux/HCI/IOCTL/HCIDeviceUp.swift b/Sources/BluetoothLinux/HCI/IOCTL/HCIDeviceUp.swift
@@ -6,6 +6,7 @@
 //
 
 import SystemPackage
+import Socket
 
 public extension HostControllerIO {
     
@@ -29,7 +30,7 @@ public extension HostControllerIO {
 
 // MARK: - File Descriptor
 
-internal extension FileDescriptor {
+internal extension SocketDescriptor {
     
     @usableFromInline
     func deviceUp(for id: HostController.ID) throws {
@@ -43,7 +44,7 @@ public extension HostController {
     
     /// Open and initialize HCI device.
     static func enable(device id: HostController.ID) throws {
-        let fileDescriptor = try FileDescriptor.bluetooth(.hci, flags: [.closeOnExec])
+        let fileDescriptor = try SocketDescriptor.bluetooth(.hci, flags: [.closeOnExec])
         try fileDescriptor.closeAfter {
             try fileDescriptor.deviceUp(for: id)
         }
diff --git a/Sources/BluetoothLinux/HCI/IOCTL/HCIScan.swift b/Sources/BluetoothLinux/HCI/IOCTL/HCIScan.swift
@@ -10,6 +10,7 @@ import Foundation
 import BluetoothHCI
 import CBluetoothLinux
 import SystemPackage
+import Socket
 
 // MARK: - Methods
 
@@ -174,7 +175,7 @@ public extension HostControllerIO {
 
 // MARK: - File Descriptor
 
-internal extension FileDescriptor {
+internal extension SocketDescriptor {
     
     @usableFromInline
     func inquiry(
diff --git a/Sources/BluetoothLinux/HCI/IOCTL/HostControllerIO.swift b/Sources/BluetoothLinux/HCI/IOCTL/HostControllerIO.swift
@@ -5,7 +5,7 @@
 //  Created by Alsey Coleman Miller on 16/10/21.
 //
 
-import SystemPackage
+import Socket
 
 /// Bluetooth HCI `ioctl` requests
 @frozen
diff --git a/Sources/BluetoothLinux/HCI/SocketOptions/HCIFilterSocketOption.swift b/Sources/BluetoothLinux/HCI/SocketOptions/HCIFilterSocketOption.swift
@@ -8,6 +8,7 @@
 import Bluetooth
 import BluetoothHCI
 import SystemPackage
+import Socket
 
 public extension HCISocketOption {
     
diff --git a/Sources/BluetoothLinux/HIDP/IOCTL/HIDPIO.swift b/Sources/BluetoothLinux/HIDP/IOCTL/HIDPIO.swift
@@ -6,6 +6,7 @@
 //
 
 import SystemPackage
+import Socket
 
 /// Bluetooth HIDP `ioctl` requests
 @frozen
diff --git a/Sources/BluetoothLinux/Internal/CInterop.swift b/Sources/BluetoothLinux/Internal/CInterop.swift
@@ -8,6 +8,7 @@
 import Bluetooth
 import BluetoothHCI
 import SystemPackage
+import Socket
 import CBluetoothLinux
 
 public extension CInterop {
diff --git a/Sources/BluetoothLinux/Internal/CSocketAddress.swift b/Sources/BluetoothLinux/Internal/CSocketAddress.swift
@@ -1,4 +1,4 @@
-import SystemPackage
+import Socket
 
 @usableFromInline
 internal protocol CSocketAddress {
diff --git a/Sources/BluetoothLinux/Internal/Darwin.swift b/Sources/BluetoothLinux/Internal/Darwin.swift
@@ -7,6 +7,7 @@
 //
 
 import SystemPackage
+import Socket
 
 #if !os(Linux)
 #warning("This module will only run on Linux")
@@ -28,22 +29,22 @@ internal extension SocketAddressFamily {
     static var bluetooth: SocketAddressFamily { stub() }
 }
 
-internal extension FileDescriptor {
+internal extension SocketDescriptor {
     
-    static func socket<T: SocketProtocol>(
+    init<T: SocketProtocol>(
         _ protocolID: T,
         flags: SocketFlags,
         retryOnInterrupt: Bool = true
-    ) throws -> FileDescriptor {
+    ) throws {
         stub()
     }
     
-    static func socket<Address: SocketAddress>(
+    init<Address: SocketAddress>(
         _ protocolID: Address.ProtocolID,
         bind address: Address,
         flags: SocketFlags,
         retryOnInterrupt: Bool = true
-    ) throws -> FileDescriptor {
+    ) throws {
         stub()
     }
 }
diff --git a/Sources/BluetoothLinux/Internal/SocketDescriptor.swift b/Sources/BluetoothLinux/Internal/SocketDescriptor.swift
@@ -9,15 +9,16 @@ import Foundation
 import Bluetooth
 import BluetoothHCI
 import SystemPackage
+import Socket
 
-internal extension FileDescriptor {
+internal extension SocketDescriptor {
     
     @usableFromInline
     static func bluetooth(
         _ socketProtocol: BluetoothSocketProtocol,
         flags: SocketFlags = [.closeOnExec]
-    ) throws -> FileDescriptor {
-        return try socket(
+    ) throws -> SocketDescriptor {
+        return try self.init(
             socketProtocol,
             flags: flags
         )
@@ -28,13 +29,12 @@ internal extension FileDescriptor {
         _ socketProtocol: BluetoothSocketProtocol,
         bind address: Address,
         flags: SocketFlags = [.closeOnExec]
-    ) throws -> FileDescriptor {
-        return try socket(socketProtocol, bind: address, flags: flags)
+    ) throws -> SocketDescriptor {
+        return try self.init(socketProtocol, bind: address, flags: flags)
     }
     
     @usableFromInline
     func setNonblocking(retryOnInterrupt: Bool = true) throws {
-        
         var flags = try getStatus(retryOnInterrupt: retryOnInterrupt)
         flags.insert(.nonBlocking)
         try setStatus(flags, retryOnInterrupt: retryOnInterrupt)
diff --git a/Sources/BluetoothLinux/L2CAP/L2CAPFileDescriptor.swift b/Sources/BluetoothLinux/L2CAP/L2CAPFileDescriptor.swift
@@ -7,16 +7,16 @@
 
 import Bluetooth
 import BluetoothHCI
-import SystemPackage
+import Socket
 
-internal extension FileDescriptor {
+internal extension SocketDescriptor {
     
     /// Creates an L2CAP socket binded to the specified address.
     @usableFromInline
     static func l2cap(
         _ address: L2CAPSocketAddress,
         _ flags: SocketFlags
-    ) throws -> FileDescriptor {
+    ) throws -> SocketDescriptor {
         try bluetooth(
             .l2cap,
             bind: address,
diff --git a/Sources/BluetoothLinux/L2CAP/L2CAPSocket.swift b/Sources/BluetoothLinux/L2CAP/L2CAPSocket.swift
@@ -44,7 +44,7 @@ public actor L2CAPSocket: Bluetooth.L2CAPSocket {
     }
     
     internal init(
-        fileDescriptor: FileDescriptor,
+        fileDescriptor: SocketDescriptor,
         address: L2CAPSocketAddress
     ) async {
         self.socket = await Socket(fileDescriptor: fileDescriptor)
@@ -85,7 +85,7 @@ public actor L2CAPSocket: Bluetooth.L2CAPSocket {
             lowEnergy: address,
             isRandom: isRandom
         )
-        let fileDescriptor = try FileDescriptor.l2cap(address, [.closeOnExec, .nonBlocking])
+        let fileDescriptor = try SocketDescriptor.l2cap(address, [.closeOnExec, .nonBlocking])
         try fileDescriptor.closeIfThrows {
             try fileDescriptor.listen(backlog: backlog)
         }
@@ -140,7 +140,7 @@ public actor L2CAPSocket: Bluetooth.L2CAPSocket {
             protocolServiceMultiplexer: nil,
             channel: .att
         )
-        let fileDescriptor = try FileDescriptor.l2cap(localSocketAddress, [.closeOnExec, .nonBlocking])
+        let fileDescriptor = try SocketDescriptor.l2cap(localSocketAddress, [.closeOnExec, .nonBlocking])
         try await fileDescriptor.closeIfThrows {
             try await fileDescriptor.connect(to: destinationSocketAddress, sleep: 100_000_000)
         }
diff --git a/Sources/BluetoothLinux/L2CAP/L2CAPSocketOption.swift b/Sources/BluetoothLinux/L2CAP/L2CAPSocketOption.swift
@@ -6,6 +6,7 @@
 //
 
 import SystemPackage
+import Socket
 
 /// L2CAP Socket Options
 public enum L2CAPSocketOption: CInt, SocketOptionID {
diff --git a/Sources/BluetoothLinux/RFCOMM/IOCTL/RFCOMMCreateDevice.swift b/Sources/BluetoothLinux/RFCOMM/IOCTL/RFCOMMCreateDevice.swift
@@ -7,6 +7,7 @@
 
 import Bluetooth
 import SystemPackage
+import Socket
 
 public extension RFCOMMIO {
     
@@ -81,7 +82,7 @@ public extension RFCOMMIO.CreateDevice {
 
 // MARK: - File Descriptor
 
-internal extension FileDescriptor {
+internal extension SocketDescriptor {
     
     @usableFromInline
     func rfcommCreateDevice(
diff --git a/Sources/BluetoothLinux/RFCOMM/IOCTL/RFCOMMGetDeviceInformation.swift b/Sources/BluetoothLinux/RFCOMM/IOCTL/RFCOMMGetDeviceInformation.swift
diff --git a/Sources/BluetoothLinux/RFCOMM/IOCTL/RFCOMMGetDeviceList.swift b/Sources/BluetoothLinux/RFCOMM/IOCTL/RFCOMMGetDeviceList.swift
diff --git a/Sources/BluetoothLinux/RFCOMM/IOCTL/RFCOMMIO.swift b/Sources/BluetoothLinux/RFCOMM/IOCTL/RFCOMMIO.swift
diff --git a/Sources/BluetoothLinux/RFCOMM/IOCTL/RFCOMMReleaseDevice.swift b/Sources/BluetoothLinux/RFCOMM/IOCTL/RFCOMMReleaseDevice.swift
diff --git a/Sources/BluetoothLinux/RFCOMM/RFCOMMSocketOption.swift b/Sources/BluetoothLinux/RFCOMM/RFCOMMSocketOption.swift
diff --git a/Sources/BluetoothLinux/SocketAddress.swift b/Sources/BluetoothLinux/SocketAddress.swift
diff --git a/Sources/BluetoothLinux/SocketOption.swift b/Sources/BluetoothLinux/SocketOption.swift
diff --git a/Sources/BluetoothLinux/SocketOptionLevel.swift b/Sources/BluetoothLinux/SocketOptionLevel.swift
diff --git a/Sources/BluetoothLinux/SocketOptions/SecuritySocketOption.swift b/Sources/BluetoothLinux/SocketOptions/SecuritySocketOption.swift
diff --git a/Sources/BluetoothLinux/SocketProtocol.swift b/Sources/BluetoothLinux/SocketProtocol.swift
