Skip to content

Commit c48403c

Browse files
committed
Access Control: changed 'var connection: NWConnection?' to public.
I want to test 'NWConnection.State' possibilities. We should integrate some kind of status checking. added public var state: NWConnection.State correction: self.state Update OSCClient.swift Update OSCClient.swift Update OSCClient.swift Update OSCServer.swift Update OSCClient.swift Update OSCClient.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift
1 parent 2a87ca9 commit c48403c

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

Framework/SwiftOSC/Network/OSCClient.swift

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import Network
1111

1212
public class OSCClient {
1313

14-
var connection: NWConnection?
14+
public var connection: NWConnection? // Access Control: changed 'var connection: NWConnection?' to public.
15+
public private(set) var ready: Bool = false
1516
var queue: DispatchQueue
1617

1718
public private(set) var host: NWEndpoint.Host
@@ -47,18 +48,24 @@ public class OSCClient {
4748
connection?.stateUpdateHandler = { [weak self] (newState) in
4849
switch newState {
4950
case .ready:
51+
self?.ready = true
5052
NSLog("SwiftOSC Client is ready. \(String(describing: self?.connection))")
5153
case .failed(let error):
54+
self?.ready = false
5255
NSLog("SwiftOSC Client failed with error \(error)")
5356
NSLog("SWiftOSC Client is restarting.")
5457
self?.setupConnection()
5558
case .cancelled:
59+
self?.ready = false
5660
break
5761
case .waiting(let error):
62+
self?.ready = false
5863
NSLog("SwiftOSC Client waiting with error \(error)")
5964
case .preparing:
65+
self?.ready = false
6066
break
6167
case .setup:
68+
self?.ready = false
6269
break
6370
}
6471
}

Framework/SwiftOSC/Network/OSCServer.swift

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ public class OSCServer {
1313

1414
public weak var delegate: OSCDelegate?
1515

16-
var listener: NWListener?
16+
public var listener: NWListener?
1717
public private(set) var port: NWEndpoint.Port
1818
public private(set) var name: String?
1919
var queue: DispatchQueue
2020
var connection: NWConnection?
2121

22-
public private(set) var running: Bool = false
22+
public private(set) var ready: Bool = false
2323
var bonjour: Bool = false
2424

2525
public init?(port: Int, bonjourName: String? = nil) {
@@ -77,14 +77,14 @@ public class OSCServer {
7777
switch newState {
7878
case .ready:
7979
NSLog("Listening on port \(String(describing: self?.listener?.port))")
80-
self?.running = true
80+
self?.ready = true
8181
case .failed(let error):
8282
NSLog("Listener failed with error \(error)")
83-
self?.running = false
83+
self?.ready = false
8484
self?.restart()
8585
case .cancelled:
8686
NSLog("Listener cancelled")
87-
self?.running = false
87+
self?.ready = false
8888
default:
8989
break
9090
}
@@ -267,7 +267,6 @@ public class OSCServer {
267267
// destroy connection and listener
268268
connection?.forceCancel()
269269
listener?.cancel()
270-
self.running = false
271270
}
272271

273272
public func restart() {

0 commit comments

Comments
 (0)