Return to configuring the minimum and maximum buffer size through StreamOptions

Author: Ryan Dingman

Sources/Subprocess/Platforms/Subprocess+Darwin.swift

@@ -58,7 +58,7 @@ public struct PlatformOptions: Sendable {
     /// i.e. Detach from the terminal.
     public var createSession: Bool = false
 
-    private(set) var preferredStreamBufferSizeRange: (any RangeExpression & Sendable)? = nil
+    public var streamOptions: StreamOptions = .init()
 
     /// An ordered list of steps in order to tear down the child
     /// process in case the parent task is cancelled before
@@ -85,16 +85,18 @@ public struct PlatformOptions: Sendable {
             ) throws -> Void
         )? = nil
 
-    public init() {
-        self.preferredStreamBufferSizeRange = nil
-    }
+    public init() {}
+}
 
-    public init<R>(preferredStreamBufferSizeRange: R?) where R: RangeExpression & Sendable, R.Bound == Int {
-        self.preferredStreamBufferSizeRange = preferredStreamBufferSizeRange
-    }
+extension PlatformOptions {
+    public struct StreamOptions: Sendable {
+        let minimumBufferSize: Int?
+        let maximumBufferSize: Int?
 
-    mutating func setPreferredStreamBufferSizeRange<R>(_ range: R?) where R: RangeExpression & Sendable, R.Bound == Int {
-        self.preferredStreamBufferSizeRange = range
+        public init(minimumBufferSize: Int? = nil, maximumBufferSize: Int? = nil) {
+            self.minimumBufferSize = minimumBufferSize
+            self.maximumBufferSize = maximumBufferSize
+        }
     }
 }
 

Sources/Subprocess/Platforms/Subprocess+Linux.swift

@@ -177,7 +177,7 @@ public struct PlatformOptions: Sendable {
     // i.e. Detach from the terminal.
     public var createSession: Bool = false
 
-    private(set) var preferredStreamBufferSizeRange: (any RangeExpression & Sendable)? = nil
+    public var streamOptions: StreamOptions = .init()
 
     /// An ordered list of steps in order to tear down the child
     /// process in case the parent task is cancelled before
@@ -197,16 +197,18 @@ public struct PlatformOptions: Sendable {
     /// call any necessary process setup functions.
     public var preSpawnProcessConfigurator: (@convention(c) @Sendable () -> Void)? = nil
 
-    public init() {
-        self.preferredStreamBufferSizeRange = nil
-    }
+    public init() {}
+}
 
-    public init<R>(preferredStreamBufferSizeRange: R?) where R: RangeExpression & Sendable, R.Bound == Int {
-        self.preferredStreamBufferSizeRange = preferredStreamBufferSizeRange
-    }
+extension PlatformOptions {
+    public struct StreamOptions: Sendable {
+        public let minimumBufferSize: Int?
+        public let maximumBufferSize: Int?
 
-    mutating func setPreferredStreamBufferSizeRange<R>(_ range: R?) where R: RangeExpression & Sendable, R.Bound == Int {
-        self.preferredStreamBufferSizeRange = range
+        public init(minimumBufferSize: Int? = nil, maximumBufferSize: Int? = nil) {
+            self.minimumBufferSize = minimumBufferSize
+            self.maximumBufferSize = maximumBufferSize
+        }
     }
 }
 

Sources/Subprocess/Platforms/Subprocess+Unix.swift

@@ -439,22 +439,12 @@ extension CreatedPipe {
                 }
             )
 
-            if let preferredStreamBufferSizeRange = options.preferredStreamBufferSizeRange {
-                if let range = preferredStreamBufferSizeRange as? Range<Int> {
-                    dispatchIO.setLimit(lowWater: range.lowerBound)
-                    dispatchIO.setLimit(highWater: range.upperBound)
-                } else if let range = preferredStreamBufferSizeRange as? ClosedRange<Int> {
-                    dispatchIO.setLimit(lowWater: range.lowerBound)
-                    dispatchIO.setLimit(highWater: range.upperBound)
-                } else if let range = preferredStreamBufferSizeRange as? PartialRangeFrom<Int> {
-                    dispatchIO.setLimit(lowWater: range.lowerBound)
-                } else if let range = preferredStreamBufferSizeRange as? PartialRangeUpTo<Int> {
-                    dispatchIO.setLimit(highWater: range.upperBound - 1)
-                } else if let range = preferredStreamBufferSizeRange as? PartialRangeThrough<Int> {
-                    dispatchIO.setLimit(highWater: range.upperBound)
-                } else {
-                    fatalError("Unsupported preferredStreamBufferSizeRange: \(preferredStreamBufferSizeRange)")
-                }
+            if let minimumBufferSize = options.streamOptions.minimumBufferSize {
+                dispatchIO.setLimit(lowWater: minimumBufferSize)
+            }
+
+            if let maximumBufferSize = options.streamOptions.maximumBufferSize {
+                dispatchIO.setLimit(lowWater: maximumBufferSize)
             }
 
             readEnd = .init(

Tests/SubprocessTests/SubprocessTests+Unix.swift

@@ -676,7 +676,7 @@ extension SubprocessUnixTests {
         """
 
         var platformOptions = PlatformOptions()
-        platformOptions.setPreferredStreamBufferSizeRange(0...)
+        platformOptions.streamOptions = .init(minimumBufferSize: 0)
 
         let start = ContinuousClock().now