From 8f5aada6e55b1d56f72dbf8c926a451048e57c2e Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Thu, 18 Nov 2021 18:16:04 +0100 Subject: [PATCH 01/71] Create Package.swift Update Package.swift --- Package.swift | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 Package.swift diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..4a7b673 --- /dev/null +++ b/Package.swift @@ -0,0 +1,29 @@ +// swift-tools-version:5.2 +// The swift-tools-version declares the minimum version of Swift required to build this package. +import PackageDescription + +let package = Package( + name: "SwiftOSC", + platforms: [ + .macOS(.v10_14), + .iOS(.v10), + .watchOS(.v5) + ], + products: [ + // Products define the executables and libraries produced by a package, and make them visible to other packages. + .library( + name: "SwiftOSC", + targets: ["SwiftOSC"]), + ], + dependencies: [ + // Dependencies declare other packages that this package depends on. + // .package(url: /* package url */, from: "1.0.0"), + ], + targets: [ + // Targets are the basic building blocks of a package. A target can define a module or a test suite. + // Targets can depend on other targets in this package, and on products in packages which this package depends on. + .target( + name: "SwiftOSC", + path: "Framework/SwiftOSC") + ] +) From f77c18ebb60e4ed4fc2399324daf57f48e480c4e Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Thu, 18 Nov 2021 18:51:03 +0100 Subject: [PATCH 02/71] Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift Update OSCServer.swift --- Framework/SwiftOSC/Network/OSCServer.swift | 33 ++++++++++++++++++---- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 1d1de0d..198e5b2 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -14,11 +14,14 @@ public class OSCServer { public var delegate: OSCDelegate? var listener: NWListener? - var port: NWEndpoint.Port + public private(set) var port: NWEndpoint.Port + public private(set) var name: String var queue: DispatchQueue var connection: NWConnection? - public init?(port: Int) { + public var running: Bool = false + + public init?(port: Int, bonjourName: String) { // check port range if port > 65535 && port >= 0{ @@ -26,6 +29,7 @@ public class OSCServer { return nil } + if bonjourName == nil { self.name = "OSCServer" } else { self.name = bonjourName } self.port = NWEndpoint.Port(integerLiteral: UInt16(port)) queue = DispatchQueue(label: "SwiftOSC Server") @@ -33,8 +37,19 @@ public class OSCServer { } func setupListener() { + + // advertise Bonjour + let udpOption = NWProtocolUDP.Options() + let params = NWParameters(dtls: nil, udp: udpOption) + params.includePeerToPeer = true + // create the listener - listener = try! NWListener(using: .udp, on: port) + listener = try! NWListener(using: params, on: port) + + // Bonjour service + listener?.service = NWListener.Service(name: name, + type: "_osc._udp", + domain: nil) // handle incoming connections server will only respond to the latest connection listener?.newConnectionHandler = { [weak self] (newConnection) in @@ -68,13 +83,14 @@ public class OSCServer { // start the listener listener?.start(queue: queue) + self.running = true } // receive func receive() { connection?.receiveMessage { [weak self] (content, context, isCompleted, error) in if let data = content { - data.printHexString() + // data.printHexString() self?.decodePacket(data) } @@ -92,7 +108,7 @@ public class OSCServer { if data[0] == 0x2f { // check if first character is "/" if let message = decodeMessage(data){ - print(message) + // print(message) self.sendToDelegate(message) } @@ -229,10 +245,15 @@ public class OSCServer { } } - public func restart() { + public func stop() { // destroy connection and listener connection?.forceCancel() listener?.cancel() + self.running = false + } + + public func restart() { + self.stop() // setup new listener setupListener() From c2692f279c8c1987c4261e6ff4e1ce8426647b24 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sat, 20 Nov 2021 20:39:38 +0100 Subject: [PATCH 03/71] Update OSCClient.swift --- Framework/SwiftOSC/Network/OSCClient.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCClient.swift b/Framework/SwiftOSC/Network/OSCClient.swift index 6287434..37ba13e 100644 --- a/Framework/SwiftOSC/Network/OSCClient.swift +++ b/Framework/SwiftOSC/Network/OSCClient.swift @@ -15,7 +15,7 @@ public class OSCClient { var queue: DispatchQueue var host: NWEndpoint.Host - var port: NWEndpoint.Port + public var port: NWEndpoint.Port public init?(host: String, port: Int) { From 4466177ae4edd9bcdb60d7280efbc6f4ca554b07 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sun, 21 Nov 2021 10:58:29 +0100 Subject: [PATCH 04/71] changed bonjourName to optional type --- Framework/SwiftOSC/Network/OSCServer.swift | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 198e5b2..f18a412 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -20,8 +20,9 @@ public class OSCServer { var connection: NWConnection? public var running: Bool = false + var bonjour: Bool = false - public init?(port: Int, bonjourName: String) { + public init?(port: Int, bonjourName: String?) { // check port range if port > 65535 && port >= 0{ @@ -29,7 +30,12 @@ public class OSCServer { return nil } - if bonjourName == nil { self.name = "OSCServer" } else { self.name = bonjourName } + // if bonjourName == nil { self.name = "OSCServer" } else { self.name = bonjourName } + + if bonjourName != nil { + bonjour = true + self.name = bonjourName + } self.port = NWEndpoint.Port(integerLiteral: UInt16(port)) queue = DispatchQueue(label: "SwiftOSC Server") @@ -37,19 +43,20 @@ public class OSCServer { } func setupListener() { - + // advertise Bonjour let udpOption = NWProtocolUDP.Options() let params = NWParameters(dtls: nil, udp: udpOption) - params.includePeerToPeer = true + if bonjour { params.includePeerToPeer = true } // create the listener listener = try! NWListener(using: params, on: port) // Bonjour service - listener?.service = NWListener.Service(name: name, - type: "_osc._udp", - domain: nil) + if bonjour { listener?.service = NWListener.Service(name: name, + type: "_osc._udp", + domain: nil) + } // handle incoming connections server will only respond to the latest connection listener?.newConnectionHandler = { [weak self] (newConnection) in From b5aab7c3dd792ddadea9323b0cac4434b34cc5cd Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sun, 21 Nov 2021 11:00:19 +0100 Subject: [PATCH 05/71] fix --- Framework/SwiftOSC/Network/OSCServer.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index f18a412..ea7927a 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -32,7 +32,8 @@ public class OSCServer { // if bonjourName == nil { self.name = "OSCServer" } else { self.name = bonjourName } - if bonjourName != nil { +// if bonjourName != nil { + if let bonjourName = bonjourName { bonjour = true self.name = bonjourName } From 199c5e8265c3ecb6fb98b7c4edef23b1bb874e17 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sun, 21 Nov 2021 11:02:44 +0100 Subject: [PATCH 06/71] change name type to optional --- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index ea7927a..8ac81c1 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -15,7 +15,7 @@ public class OSCServer { var listener: NWListener? public private(set) var port: NWEndpoint.Port - public private(set) var name: String + public private(set) var name: String? var queue: DispatchQueue var connection: NWConnection? From 49d8c7c0e1e535f6d72c4cd2829ab91e9a3f77b0 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sun, 21 Nov 2021 11:06:51 +0100 Subject: [PATCH 07/71] bonjourName default = nil --- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 8ac81c1..71a8a26 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -22,7 +22,7 @@ public class OSCServer { public var running: Bool = false var bonjour: Bool = false - public init?(port: Int, bonjourName: String?) { + public init?(port: Int, bonjourName: String? = nil) { // check port range if port > 65535 && port >= 0{ From 6bd6f56b76f705f485a5da4873836e06c0f4560f Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sun, 21 Nov 2021 10:58:29 +0100 Subject: [PATCH 08/71] compatibility with init changed bonjourName to optional type change name to optional type bonjourName default = nil --- Framework/SwiftOSC/Network/OSCServer.swift | 24 ++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 198e5b2..71a8a26 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -15,13 +15,14 @@ public class OSCServer { var listener: NWListener? public private(set) var port: NWEndpoint.Port - public private(set) var name: String + public private(set) var name: String? var queue: DispatchQueue var connection: NWConnection? public var running: Bool = false + var bonjour: Bool = false - public init?(port: Int, bonjourName: String) { + public init?(port: Int, bonjourName: String? = nil) { // check port range if port > 65535 && port >= 0{ @@ -29,7 +30,13 @@ public class OSCServer { return nil } - if bonjourName == nil { self.name = "OSCServer" } else { self.name = bonjourName } + // if bonjourName == nil { self.name = "OSCServer" } else { self.name = bonjourName } + +// if bonjourName != nil { + if let bonjourName = bonjourName { + bonjour = true + self.name = bonjourName + } self.port = NWEndpoint.Port(integerLiteral: UInt16(port)) queue = DispatchQueue(label: "SwiftOSC Server") @@ -37,19 +44,20 @@ public class OSCServer { } func setupListener() { - + // advertise Bonjour let udpOption = NWProtocolUDP.Options() let params = NWParameters(dtls: nil, udp: udpOption) - params.includePeerToPeer = true + if bonjour { params.includePeerToPeer = true } // create the listener listener = try! NWListener(using: params, on: port) // Bonjour service - listener?.service = NWListener.Service(name: name, - type: "_osc._udp", - domain: nil) + if bonjour { listener?.service = NWListener.Service(name: name, + type: "_osc._udp", + domain: nil) + } // handle incoming connections server will only respond to the latest connection listener?.newConnectionHandler = { [weak self] (newConnection) in From b622af925c687158ed88ab4171f1f36653ced611 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sun, 21 Nov 2021 22:34:01 +0100 Subject: [PATCH 09/71] [weak self] in 3x DispatchQueue.main.async --- Framework/SwiftOSC/Network/OSCServer.swift | 23 +++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 71a8a26..4afb9e3 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -30,9 +30,6 @@ public class OSCServer { return nil } - // if bonjourName == nil { self.name = "OSCServer" } else { self.name = bonjourName } - -// if bonjourName != nil { if let bonjourName = bonjourName { bonjour = true self.name = bonjourName @@ -110,8 +107,9 @@ public class OSCServer { func decodePacket(_ data: Data){ - DispatchQueue.main.async { - self.delegate?.didReceive(data) + DispatchQueue.main.async { [weak self] in + guard let strongSelf = self else { return } + strongSelf.delegate?.didReceive(data) } if data[0] == 0x2f { // check if first character is "/" @@ -229,23 +227,26 @@ public class OSCServer { } } func sendToDelegate(_ element: OSCElement){ - DispatchQueue.main.async { + DispatchQueue.main.async { [weak self] in + guard let strongSelf = self else { return } if let message = element as? OSCMessage { - self.delegate?.didReceive(message) + strongSelf.delegate?.didReceive(message) } if let bundle = element as? OSCBundle { // send to delegate at the correct time if bundle.timetag.secondsSinceNow < 0 { - self.delegate?.didReceive(bundle) + strongSelf.delegate?.didReceive(bundle) for element in bundle.elements { - self.sendToDelegate(element) + strongSelf.sendToDelegate(element) } } else { DispatchQueue.main.asyncAfter(deadline: .now() + bundle.timetag.secondsSinceNow, execute: { - self.delegate?.didReceive(bundle) + [weak self] in + guard let strongSelf = self else { return } + strongSelf.delegate?.didReceive(bundle) for element in bundle.elements { - self.sendToDelegate(element) + strongSelf.sendToDelegate(element) } }) } From da121239325d21fed80dfbedd64216ac81461ebd Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sun, 21 Nov 2021 22:42:14 +0100 Subject: [PATCH 10/71] class-only conformance for weak usage --- Framework/SwiftOSC/Network/OSCDelegate.swift | 2 +- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Framework/SwiftOSC/Network/OSCDelegate.swift b/Framework/SwiftOSC/Network/OSCDelegate.swift index bcb9bf2..75d7db5 100644 --- a/Framework/SwiftOSC/Network/OSCDelegate.swift +++ b/Framework/SwiftOSC/Network/OSCDelegate.swift @@ -8,7 +8,7 @@ import Foundation -public protocol OSCDelegate { +public protocol OSCDelegate: AnyObject { func didReceive(_ data: Data) func didReceive(_ bundle: OSCBundle) func didReceive(_ message: OSCMessage) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 4afb9e3..2d00741 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -11,7 +11,7 @@ import Network public class OSCServer { - public var delegate: OSCDelegate? + public weak var delegate: OSCDelegate? var listener: NWListener? public private(set) var port: NWEndpoint.Port From 3ff6bdb3d7bad4746f0335960ebd8d52a7280267 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sun, 21 Nov 2021 22:51:46 +0100 Subject: [PATCH 11/71] dirty fix for bundle in bundle (TotalMix crash bug data) --- Framework/SwiftOSC/Network/OSCServer.swift | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 2d00741..61f11f6 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -140,23 +140,25 @@ public class OSCServer { let length = Int(bundleData.subdata(in: Range(0...3)).toInt32()) let nextData = bundleData.subdata(in: 4.. Date: Sun, 21 Nov 2021 22:56:45 +0100 Subject: [PATCH 12/71] dirty fix 'type end found nil' --- Framework/SwiftOSC/Network/OSCServer.swift | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 61f11f6..6760789 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -176,7 +176,11 @@ public class OSCServer { //extract types messageData = messageData.subdata(in: (addressEnd/4+1)*4.. Date: Sun, 21 Nov 2021 23:28:12 +0100 Subject: [PATCH 13/71] Add autoreleasepool to matches functions. --- .../Addresses/OSCAddressPattern.swift | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Framework/SwiftOSC/Addresses/OSCAddressPattern.swift b/Framework/SwiftOSC/Addresses/OSCAddressPattern.swift index d760983..2cf8a80 100644 --- a/Framework/SwiftOSC/Addresses/OSCAddressPattern.swift +++ b/Framework/SwiftOSC/Addresses/OSCAddressPattern.swift @@ -180,20 +180,24 @@ public struct OSCAddressPattern { // Returns True if the address matches the address pattern. public func matches(_ address: OSCAddress)->Bool{ - if address.string.range(of: self.regex, options: .regularExpression) == nil { - return false - } else { - return true + var maches = true + autoreleasepool { + if address.string.range(of: self.regex, options: .regularExpression) == nil { + maches = false + } } + return maches } // Returns True if the address is along the path of the address pattern public func matches(path: OSCAddress)->Bool{ - if path.string.range(of: self.regexPath, options: .regularExpression) == nil { - return false - } else { - return true + var maches = true + autoreleasepool { + if path.string.range(of: self.regexPath, options: .regularExpression) == nil { + maches = false + } } + return maches } } From 5a222990ece954cd7ab5dd5bf28f7eb88c33bb3a Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sat, 11 Dec 2021 08:25:34 +0100 Subject: [PATCH 14/71] Update Package.swift Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 4a7b673..32c2e82 100644 --- a/Package.swift +++ b/Package.swift @@ -6,7 +6,7 @@ let package = Package( name: "SwiftOSC", platforms: [ .macOS(.v10_14), - .iOS(.v10), + .iOS(.v12), .watchOS(.v5) ], products: [ From b8665a131da7e856b87ebf4ae7d59ee0fb907ff6 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sun, 12 Dec 2021 01:47:17 +0100 Subject: [PATCH 15/71] changed var host to access level public private(set) changed var host to access level public --- Framework/SwiftOSC/Network/OSCClient.swift | 34 +++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Framework/SwiftOSC/Network/OSCClient.swift b/Framework/SwiftOSC/Network/OSCClient.swift index 37ba13e..59667bc 100644 --- a/Framework/SwiftOSC/Network/OSCClient.swift +++ b/Framework/SwiftOSC/Network/OSCClient.swift @@ -10,39 +10,39 @@ import Foundation import Network public class OSCClient { - + var connection: NWConnection? var queue: DispatchQueue - - var host: NWEndpoint.Host - public var port: NWEndpoint.Port - + + public private(set) var host: NWEndpoint.Host + public private(set) var port: NWEndpoint.Port + public init?(host: String, port: Int) { - + // check if string is empty if host == "" { - + NSLog("Invalid Hostname: No empty strings allowed.") return nil - + } if port > 65535 && port >= 0{ NSLog("Invalid Port: Out of range.") return nil } - + self.host = NWEndpoint.Host(host) self.port = NWEndpoint.Port(integerLiteral: UInt16(port)) - + queue = DispatchQueue(label: "SwiftOSC Client") setupConnection() } - + func setupConnection(){ - + // create the connection connection = NWConnection(host: host, port: port, using: .udp) - + // setup state update handler connection?.stateUpdateHandler = { [weak self] (newState) in switch newState { @@ -62,13 +62,13 @@ public class OSCClient { break } } - + // start the connection connection?.start(queue: queue) } - + public func send(_ element: OSCElement){ - + let data = element.oscData connection?.send(content: data, completion: .contentProcessed({ (error) in if let error = error { @@ -80,7 +80,7 @@ public class OSCClient { // destroy connection and listener connection?.forceCancel() - + // setup new listener setupConnection() } From 06b5741f90cba73d6927c31ab93cbde0d6a2c64e Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sat, 1 Jan 2022 13:28:41 +0100 Subject: [PATCH 16/71] Update README.md add Swift Package installation instructions --- README.md | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 01e2a54..1bd24bd 100644 --- a/README.md +++ b/README.md @@ -10,11 +10,23 @@ SwiftOSC is a Swift Open Sound Control (OSC) 1.1 client and server framework. ## Installation -``` +### [CocoaPods](http://cocoapods.org) + +````ruby pod 'SwiftOSC', '~> 2.0' +```` + +### [Swift Package Manager](https://swift.org/package-manager/) + +```swift +dependencies: [ + .package(url: "https://github.com/soundflix/SwiftOSC.git", from: "2.0") +] ``` -OR +Alternatively, you can add the package [directly via Xcode](https://developer.apple.com/documentation/xcode/adding_package_dependencies_to_your_app). + +OR install locally: ### Step 1 @@ -22,7 +34,7 @@ Clone or download repository from Github. ### Step 2 -Open SwiftOSC.xcworkspace and build SwiftOSC frameworks. +Open SwiftOSC.xcworkspace and build SwiftOSC frameworks. ### Step 3 @@ -47,7 +59,7 @@ var server = OSCServer(port: 8080) Setup server delegate to handle incoming OSC Data ```swift class OSCHandler: OSCServerDelegate { - + func didReceive(_ message: OSCMessage){ if let integer = message.arguments[0] as? Int { print("Received int \(integer)") @@ -93,7 +105,7 @@ client.send(message) ``` ## Known Issues - OSCClient loses connection following returning from being in the background. Call client.restart() in this situation.\ - + ## About From e9c2c57f089b2e1cde2ecae7a3b78d51ce89d83a Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sun, 2 Jan 2022 20:46:19 +0100 Subject: [PATCH 17/71] changed how "running" property is set --- Framework/SwiftOSC/Network/OSCServer.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 6760789..10237a0 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -77,10 +77,13 @@ public class OSCServer { switch newState { case .ready: NSLog("Listening on port \(String(describing: self?.listener?.port))") + self?.running = true case .failed(let error): NSLog("Listener failed with error \(error)") + self?.running = false case .cancelled: NSLog("Listener cancelled") + self?.running = false default: break } @@ -88,7 +91,6 @@ public class OSCServer { // start the listener listener?.start(queue: queue) - self.running = true } // receive From 669404e1a5457cb397ffbb8ce9cb0edf0ece4117 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sun, 2 Jan 2022 21:26:28 +0100 Subject: [PATCH 18/71] change to private(set): public private(set) var running --- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 10237a0..bd54830 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -19,7 +19,7 @@ public class OSCServer { var queue: DispatchQueue var connection: NWConnection? - public var running: Bool = false + public private(set) var running: Bool = false var bonjour: Bool = false public init?(port: Int, bonjourName: String? = nil) { From 2a87ca9df3a3e37d6521bd7ba8951739c7ca0f07 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sun, 2 Jan 2022 21:36:49 +0100 Subject: [PATCH 19/71] server fails: attempt 1 restart() --- Framework/SwiftOSC/Network/OSCServer.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index bd54830..faaf2d1 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -81,6 +81,7 @@ public class OSCServer { case .failed(let error): NSLog("Listener failed with error \(error)") self?.running = false + self?.restart() case .cancelled: NSLog("Listener cancelled") self?.running = false From c48403cfb59d493a66adbd2feec8015827fbde40 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Fri, 7 Jan 2022 13:31:20 +0100 Subject: [PATCH 20/71] 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 --- Framework/SwiftOSC/Network/OSCClient.swift | 9 ++++++++- Framework/SwiftOSC/Network/OSCServer.swift | 11 +++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Framework/SwiftOSC/Network/OSCClient.swift b/Framework/SwiftOSC/Network/OSCClient.swift index 59667bc..10503c3 100644 --- a/Framework/SwiftOSC/Network/OSCClient.swift +++ b/Framework/SwiftOSC/Network/OSCClient.swift @@ -11,7 +11,8 @@ import Network public class OSCClient { - var connection: NWConnection? + public var connection: NWConnection? // Access Control: changed 'var connection: NWConnection?' to public. + public private(set) var ready: Bool = false var queue: DispatchQueue public private(set) var host: NWEndpoint.Host @@ -47,18 +48,24 @@ public class OSCClient { connection?.stateUpdateHandler = { [weak self] (newState) in switch newState { case .ready: + self?.ready = true NSLog("SwiftOSC Client is ready. \(String(describing: self?.connection))") case .failed(let error): + self?.ready = false NSLog("SwiftOSC Client failed with error \(error)") NSLog("SWiftOSC Client is restarting.") self?.setupConnection() case .cancelled: + self?.ready = false break case .waiting(let error): + self?.ready = false NSLog("SwiftOSC Client waiting with error \(error)") case .preparing: + self?.ready = false break case .setup: + self?.ready = false break } } diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index faaf2d1..7ae2717 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -13,13 +13,13 @@ public class OSCServer { public weak var delegate: OSCDelegate? - var listener: NWListener? + public var listener: NWListener? public private(set) var port: NWEndpoint.Port public private(set) var name: String? var queue: DispatchQueue var connection: NWConnection? - public private(set) var running: Bool = false + public private(set) var ready: Bool = false var bonjour: Bool = false public init?(port: Int, bonjourName: String? = nil) { @@ -77,14 +77,14 @@ public class OSCServer { switch newState { case .ready: NSLog("Listening on port \(String(describing: self?.listener?.port))") - self?.running = true + self?.ready = true case .failed(let error): NSLog("Listener failed with error \(error)") - self?.running = false + self?.ready = false self?.restart() case .cancelled: NSLog("Listener cancelled") - self?.running = false + self?.ready = false default: break } @@ -267,7 +267,6 @@ public class OSCServer { // destroy connection and listener connection?.forceCancel() listener?.cancel() - self.running = false } public func restart() { From 417b8b9013a3f0eb4cade2d2830e7b4e1076d13e Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sat, 8 Jan 2022 22:40:38 +0100 Subject: [PATCH 21/71] Update OSCServer.swift --- Framework/SwiftOSC/Network/OSCServer.swift | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 7ae2717..0b8aed8 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -16,13 +16,16 @@ public class OSCServer { public var listener: NWListener? public private(set) var port: NWEndpoint.Port public private(set) var name: String? + public private(set) var domain: String var queue: DispatchQueue var connection: NWConnection? public private(set) var ready: Bool = false var bonjour: Bool = false - public init?(port: Int, bonjourName: String? = nil) { + public init?(port: Int, bonjourName: String? = nil, domain: String = nil) { + + self.domain = domain // check port range if port > 65535 && port >= 0{ @@ -53,7 +56,7 @@ public class OSCServer { // Bonjour service if bonjour { listener?.service = NWListener.Service(name: name, type: "_osc._udp", - domain: nil) + domain: domain) } // handle incoming connections server will only respond to the latest connection From d3707c38ab624f54c2a0280fb0e8ea6c927d25a5 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sat, 8 Jan 2022 22:43:00 +0100 Subject: [PATCH 22/71] Update OSCServer.swift --- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 0b8aed8..d83118d 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -16,7 +16,7 @@ public class OSCServer { public var listener: NWListener? public private(set) var port: NWEndpoint.Port public private(set) var name: String? - public private(set) var domain: String + public private(set) var domain: String? var queue: DispatchQueue var connection: NWConnection? From c63d9c80728a8b7acce20d0392372ffb7b1b0dfc Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sat, 8 Jan 2022 22:44:23 +0100 Subject: [PATCH 23/71] Update OSCServer.swift --- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index d83118d..2cf842d 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -23,7 +23,7 @@ public class OSCServer { public private(set) var ready: Bool = false var bonjour: Bool = false - public init?(port: Int, bonjourName: String? = nil, domain: String = nil) { + public init?(port: Int, bonjourName: String? = nil, domain: String? = nil) { self.domain = domain From ec6fbb7ae9980b2fcd0210fc6b822f860c7996b4 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Thu, 20 Jan 2022 15:38:49 +0100 Subject: [PATCH 24/71] test for Umlaut crash in String.Encoding.utf8 --- Framework/SwiftOSC/Types/OSCString.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Types/OSCString.swift b/Framework/SwiftOSC/Types/OSCString.swift index a3a0814..7b4faf7 100644 --- a/Framework/SwiftOSC/Types/OSCString.swift +++ b/Framework/SwiftOSC/Types/OSCString.swift @@ -28,6 +28,8 @@ extension String: OSCType { } } init(_ data:Data){ - self = String(data: data, encoding: String.Encoding.utf8)! + guard let dataString = String(data: data, encoding: String.Encoding.utf8) else { print(String(describing: data)) } // debug + self = dataString + // self = String(data: data, encoding: String.Encoding.utf8)! } } From c60cb58961fd6befdc1d73bbcd649f17e752b965 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Thu, 20 Jan 2022 15:40:18 +0100 Subject: [PATCH 25/71] fixed guard let with fall through --- Framework/SwiftOSC/Types/OSCString.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Types/OSCString.swift b/Framework/SwiftOSC/Types/OSCString.swift index 7b4faf7..ffe5587 100644 --- a/Framework/SwiftOSC/Types/OSCString.swift +++ b/Framework/SwiftOSC/Types/OSCString.swift @@ -28,7 +28,7 @@ extension String: OSCType { } } init(_ data:Data){ - guard let dataString = String(data: data, encoding: String.Encoding.utf8) else { print(String(describing: data)) } // debug + guard let dataString = String(data: data, encoding: String.Encoding.utf8) else { print(String(describing: data)); return } // debug self = dataString // self = String(data: data, encoding: String.Encoding.utf8)! } From 8ae212d6650e58be8ed4f828ee032e48ac7e4983 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Thu, 20 Jan 2022 15:42:04 +0100 Subject: [PATCH 26/71] self = "" --- Framework/SwiftOSC/Types/OSCString.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Types/OSCString.swift b/Framework/SwiftOSC/Types/OSCString.swift index ffe5587..1905804 100644 --- a/Framework/SwiftOSC/Types/OSCString.swift +++ b/Framework/SwiftOSC/Types/OSCString.swift @@ -28,7 +28,7 @@ extension String: OSCType { } } init(_ data:Data){ - guard let dataString = String(data: data, encoding: String.Encoding.utf8) else { print(String(describing: data)); return } // debug + guard let dataString = String(data: data, encoding: String.Encoding.utf8) else { print(String(describing: data)); self = ""; return } // debug self = dataString // self = String(data: data, encoding: String.Encoding.utf8)! } From 0319e84dabd20d59a2769239fc1b2ef136080333 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Thu, 20 Jan 2022 15:48:38 +0100 Subject: [PATCH 27/71] more verbose --- Framework/SwiftOSC/Types/OSCString.swift | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Framework/SwiftOSC/Types/OSCString.swift b/Framework/SwiftOSC/Types/OSCString.swift index 1905804..fac1014 100644 --- a/Framework/SwiftOSC/Types/OSCString.swift +++ b/Framework/SwiftOSC/Types/OSCString.swift @@ -28,8 +28,12 @@ extension String: OSCType { } } init(_ data:Data){ - guard let dataString = String(data: data, encoding: String.Encoding.utf8) else { print(String(describing: data)); self = ""; return } // debug + guard let dataString = String(data: data, encoding: String.Encoding.utf8) else { + print("SwiftOSC StringDataError: String(describing: data)) + self = "" + return } self = dataString - // self = String(data: data, encoding: String.Encoding.utf8)! + + // self = String(data: data, encoding: String.Encoding.utf8)! // was crashing on german umlaut characters } } From e95bae091729ac587e0bae88f2366dbed25789cb Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Thu, 20 Jan 2022 15:49:41 +0100 Subject: [PATCH 28/71] typo.. --- Framework/SwiftOSC/Types/OSCString.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Types/OSCString.swift b/Framework/SwiftOSC/Types/OSCString.swift index fac1014..754ca95 100644 --- a/Framework/SwiftOSC/Types/OSCString.swift +++ b/Framework/SwiftOSC/Types/OSCString.swift @@ -29,7 +29,7 @@ extension String: OSCType { } init(_ data:Data){ guard let dataString = String(data: data, encoding: String.Encoding.utf8) else { - print("SwiftOSC StringDataError: String(describing: data)) + print("SwiftOSC StringDataError: \(String(describing: data))") self = "" return } self = dataString From f63ce4ce922e59af35a7996a9527ed05c9575879 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Thu, 20 Jan 2022 16:05:40 +0100 Subject: [PATCH 29/71] added decoder String.Encoding.windowsCP1252 --- Framework/SwiftOSC/Types/OSCString.swift | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/Framework/SwiftOSC/Types/OSCString.swift b/Framework/SwiftOSC/Types/OSCString.swift index 754ca95..929825e 100644 --- a/Framework/SwiftOSC/Types/OSCString.swift +++ b/Framework/SwiftOSC/Types/OSCString.swift @@ -28,11 +28,18 @@ extension String: OSCType { } } init(_ data:Data){ - guard let dataString = String(data: data, encoding: String.Encoding.utf8) else { - print("SwiftOSC StringDataError: \(String(describing: data))") - self = "" - return } - self = dataString + if let dataString = String(data: data, encoding: String.Encoding.utf8) { + self = dataString + return + } + + if let dataString = String(data: data, encoding: String.Encoding.windowsCP1252) { + self = dataString + return + } + + print("SwiftOSC StringDataError: \(String(describing: data))") + self = "" // self = String(data: data, encoding: String.Encoding.utf8)! // was crashing on german umlaut characters } From 80fe5df8bfb1331e3b252b0ecc6963242650c4de Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Thu, 10 Feb 2022 22:51:19 +0100 Subject: [PATCH 30/71] added listener?.serviceRegistrationUpdateHandler --- Framework/SwiftOSC/Network/OSCServer.swift | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 2cf842d..4abf6dc 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -75,6 +75,21 @@ public class OSCServer { self?.receive() } + // handle service registration changes + listener?.serviceRegistrationUpdateHandler = { (serviceChange) in + switch serviceChange { + case .add(let endpoint): + switch endpoint { + case let .service(name, _, _, domain): + print("listening as name '\(name)', domain:'\(domain)'") + default: + break + } + default: + break + } + } + // Handle listener state changes listener?.stateUpdateHandler = { [weak self] (newState) in switch newState { From 18538f652b2dd39f28c1b4ed2c9ab0b5afa95fb7 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Thu, 10 Feb 2022 22:59:43 +0100 Subject: [PATCH 31/71] extended serviceRegistrationUpdateHandler --- Framework/SwiftOSC/Network/OSCServer.swift | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 4abf6dc..ae93f0b 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -77,11 +77,18 @@ public class OSCServer { // handle service registration changes listener?.serviceRegistrationUpdateHandler = { (serviceChange) in - switch serviceChange { + switch(serviceChange) { case .add(let endpoint): switch endpoint { - case let .service(name, _, _, domain): - print("listening as name '\(name)', domain:'\(domain)'") + case let .service(name: name, type: type, domain: domain, interface: interface): + print("Listener: Service registered:",name,type,domain,interface) + default: + break + } + case .remove(let endpoint): + switch endpoint { + case let .service(name: name, type: type, domain: domain, interface: interface): + print("Listener: Service removed:",name,type,domain,interface) default: break } From 539b04d520b1f6f9dc561702b8f49d135dd4d19c Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Fri, 11 Feb 2022 22:35:48 +0100 Subject: [PATCH 32/71] OSCClient queue = .main --- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index ae93f0b..8ca6e31 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -38,7 +38,7 @@ public class OSCServer { self.name = bonjourName } self.port = NWEndpoint.Port(integerLiteral: UInt16(port)) - queue = DispatchQueue(label: "SwiftOSC Server") + queue = .main // DispatchQueue(label: "SwiftOSC Server") setupListener() } From 9a172ca31359694304060cb8a5be5102817f8147 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Fri, 11 Feb 2022 22:41:30 +0100 Subject: [PATCH 33/71] removerd params.includePeerToPeer = true --- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 8ca6e31..e5429d1 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -48,7 +48,7 @@ public class OSCServer { // advertise Bonjour let udpOption = NWProtocolUDP.Options() let params = NWParameters(dtls: nil, udp: udpOption) - if bonjour { params.includePeerToPeer = true } + //if bonjour { params.includePeerToPeer = true } // create the listener listener = try! NWListener(using: params, on: port) From 2dea1db4a8802aa4ed4b636e81e8bfbdb28a62eb Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Fri, 11 Feb 2022 22:54:18 +0100 Subject: [PATCH 34/71] set listener = nil after .cancel() --- Framework/SwiftOSC/Network/OSCServer.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index e5429d1..d6b3947 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -292,6 +292,7 @@ public class OSCServer { // destroy connection and listener connection?.forceCancel() listener?.cancel() + listener = nil } public func restart() { From 8cab281bf8ed41872d071ef78cfc9c22452b46da Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Fri, 11 Feb 2022 23:05:21 +0100 Subject: [PATCH 35/71] removed ServiceRegistrationHandler --- Framework/SwiftOSC/Network/OSCServer.swift | 24 +--------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index d6b3947..f08c0e2 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -74,29 +74,7 @@ public class OSCServer { self?.connection?.start(queue: (self?.queue)!) self?.receive() } - - // handle service registration changes - listener?.serviceRegistrationUpdateHandler = { (serviceChange) in - switch(serviceChange) { - case .add(let endpoint): - switch endpoint { - case let .service(name: name, type: type, domain: domain, interface: interface): - print("Listener: Service registered:",name,type,domain,interface) - default: - break - } - case .remove(let endpoint): - switch endpoint { - case let .service(name: name, type: type, domain: domain, interface: interface): - print("Listener: Service removed:",name,type,domain,interface) - default: - break - } - default: - break - } - } - + // Handle listener state changes listener?.stateUpdateHandler = { [weak self] (newState) in switch newState { From 0098fc781f6fc874e7327179c22c325872f2a630 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Fri, 11 Feb 2022 23:09:22 +0100 Subject: [PATCH 36/71] changed back to custom DispatchQueue --- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index f08c0e2..6f60c6b 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -38,7 +38,7 @@ public class OSCServer { self.name = bonjourName } self.port = NWEndpoint.Port(integerLiteral: UInt16(port)) - queue = .main // DispatchQueue(label: "SwiftOSC Server") + queue = DispatchQueue(label: "SwiftOSC Server") // or .main setupListener() } From bbaa429674f619038ab4f181eae960ace10c8d15 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sat, 9 Apr 2022 14:17:21 +0200 Subject: [PATCH 37/71] changed stop() to not set listener = nil (it also deletes delegate assignment) --- Framework/SwiftOSC/Network/OSCServer.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 6f60c6b..1464392 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -270,11 +270,11 @@ public class OSCServer { // destroy connection and listener connection?.forceCancel() listener?.cancel() - listener = nil + // listener = nil } public func restart() { - self.stop() + stop() // setup new listener setupListener() From 9b31325d954130e1633f4d27131884982bb2cdc0 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sat, 9 Apr 2022 14:34:02 +0200 Subject: [PATCH 38/71] extended NSLog with server name --- Framework/SwiftOSC/Network/OSCServer.swift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 1464392..8460ae8 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -62,11 +62,11 @@ public class OSCServer { // handle incoming connections server will only respond to the latest connection listener?.newConnectionHandler = { [weak self] (newConnection) in - NSLog("New Connection from \(String(describing: newConnection))") + NSLog("\(name): New Connection from \(String(describing: newConnection))") // cancel previous connection if self?.connection != nil { - NSLog("Cancelling connection: \(String(describing: newConnection))") + NSLog("\(name): Cancelling connection: \(String(describing: newConnection))") self?.connection?.cancel() } @@ -79,14 +79,14 @@ public class OSCServer { listener?.stateUpdateHandler = { [weak self] (newState) in switch newState { case .ready: - NSLog("Listening on port \(String(describing: self?.listener?.port))") + NSLog("\(name): Listening on port \(String(describing: self?.listener?.port))") self?.ready = true case .failed(let error): - NSLog("Listener failed with error \(error)") + NSLog("\(name): Listener failed with error \(error)") self?.ready = false self?.restart() case .cancelled: - NSLog("Listener cancelled") + NSLog("\(name): Listener cancelled") self?.ready = false default: break From c44c972f86f34c97484e048a776e63f7efbafb7c Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sat, 9 Apr 2022 14:36:11 +0200 Subject: [PATCH 39/71] fixed name --- Framework/SwiftOSC/Network/OSCServer.swift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 8460ae8..7c167c4 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -62,11 +62,11 @@ public class OSCServer { // handle incoming connections server will only respond to the latest connection listener?.newConnectionHandler = { [weak self] (newConnection) in - NSLog("\(name): New Connection from \(String(describing: newConnection))") + NSLog("\(self.name): New Connection from \(String(describing: newConnection))") // cancel previous connection if self?.connection != nil { - NSLog("\(name): Cancelling connection: \(String(describing: newConnection))") + NSLog("\(self.name): Cancelling connection: \(String(describing: newConnection))") self?.connection?.cancel() } @@ -79,14 +79,14 @@ public class OSCServer { listener?.stateUpdateHandler = { [weak self] (newState) in switch newState { case .ready: - NSLog("\(name): Listening on port \(String(describing: self?.listener?.port))") + NSLog("\(self.name): Listening on port \(String(describing: self?.listener?.port))") self?.ready = true case .failed(let error): - NSLog("\(name): Listener failed with error \(error)") + NSLog("\(self.name): Listener failed with error \(error)") self?.ready = false self?.restart() case .cancelled: - NSLog("\(name): Listener cancelled") + NSLog("\(self.name): Listener cancelled") self?.ready = false default: break From 55d40ad15e162372021a2adab4160f4b31ecd4e0 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sat, 9 Apr 2022 14:37:28 +0200 Subject: [PATCH 40/71] fix name --- Framework/SwiftOSC/Network/OSCServer.swift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 7c167c4..c0ca9f6 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -62,11 +62,11 @@ public class OSCServer { // handle incoming connections server will only respond to the latest connection listener?.newConnectionHandler = { [weak self] (newConnection) in - NSLog("\(self.name): New Connection from \(String(describing: newConnection))") + NSLog("\(self.name ?? "SwiftOSC Server"): New Connection from \(String(describing: newConnection))") // cancel previous connection if self?.connection != nil { - NSLog("\(self.name): Cancelling connection: \(String(describing: newConnection))") + NSLog("\(self.name ?? "SwiftOSC Server"): Cancelling connection: \(String(describing: newConnection))") self?.connection?.cancel() } @@ -79,14 +79,14 @@ public class OSCServer { listener?.stateUpdateHandler = { [weak self] (newState) in switch newState { case .ready: - NSLog("\(self.name): Listening on port \(String(describing: self?.listener?.port))") + NSLog("\(self.name ?? "SwiftOSC Server"): Listening on port \(String(describing: self?.listener?.port))") self?.ready = true case .failed(let error): - NSLog("\(self.name): Listener failed with error \(error)") + NSLog("\(self.name ?? "SwiftOSC Server"): Listener failed with error \(error)") self?.ready = false self?.restart() case .cancelled: - NSLog("\(self.name): Listener cancelled") + NSLog("\(self.name ?? "SwiftOSC Server"): Listener cancelled") self?.ready = false default: break From 414d34aa4e64f894f034e4556d604842abc7e065 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sat, 9 Apr 2022 14:39:08 +0200 Subject: [PATCH 41/71] strongify self --- Framework/SwiftOSC/Network/OSCServer.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index c0ca9f6..498697d 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -61,7 +61,7 @@ public class OSCServer { // handle incoming connections server will only respond to the latest connection listener?.newConnectionHandler = { [weak self] (newConnection) in - + guard let self = self NSLog("\(self.name ?? "SwiftOSC Server"): New Connection from \(String(describing: newConnection))") // cancel previous connection @@ -77,6 +77,7 @@ public class OSCServer { // Handle listener state changes listener?.stateUpdateHandler = { [weak self] (newState) in + guard let self = self switch newState { case .ready: NSLog("\(self.name ?? "SwiftOSC Server"): Listening on port \(String(describing: self?.listener?.port))") From c38cc85d7493ec1ac88cf36e1c9971ead00180ac Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sat, 9 Apr 2022 14:41:03 +0200 Subject: [PATCH 42/71] fix guard expression --- Framework/SwiftOSC/Network/OSCServer.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 498697d..879d92c 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -61,7 +61,7 @@ public class OSCServer { // handle incoming connections server will only respond to the latest connection listener?.newConnectionHandler = { [weak self] (newConnection) in - guard let self = self + guard let self = self else { print("SwiftOSC Server newConnectionHandler error"); return } NSLog("\(self.name ?? "SwiftOSC Server"): New Connection from \(String(describing: newConnection))") // cancel previous connection @@ -77,7 +77,7 @@ public class OSCServer { // Handle listener state changes listener?.stateUpdateHandler = { [weak self] (newState) in - guard let self = self + guard let self = self else { print("SwiftOSC Server stateUpdateHandler error"); return } switch newState { case .ready: NSLog("\(self.name ?? "SwiftOSC Server"): Listening on port \(String(describing: self?.listener?.port))") From 26721524217fcf6a5b354a93d98dc9dd014570b1 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sat, 9 Apr 2022 14:43:48 +0200 Subject: [PATCH 43/71] changed handler to strongSelf & no optional chaining --- Framework/SwiftOSC/Network/OSCServer.swift | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 879d92c..8866e9e 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -62,17 +62,17 @@ public class OSCServer { // handle incoming connections server will only respond to the latest connection listener?.newConnectionHandler = { [weak self] (newConnection) in guard let self = self else { print("SwiftOSC Server newConnectionHandler error"); return } - NSLog("\(self.name ?? "SwiftOSC Server"): New Connection from \(String(describing: newConnection))") + NSLog("\(self.name): New Connection from \(String(describing: newConnection))") // cancel previous connection - if self?.connection != nil { - NSLog("\(self.name ?? "SwiftOSC Server"): Cancelling connection: \(String(describing: newConnection))") - self?.connection?.cancel() + if self.connection != nil { + NSLog("\(self.name): Cancelling connection: \(String(describing: newConnection))") + self.connection?.cancel() } - self?.connection = newConnection - self?.connection?.start(queue: (self?.queue)!) - self?.receive() + self.connection = newConnection + self.connection?.start(queue: (self.queue)!) + self.receive() } // Handle listener state changes @@ -80,15 +80,15 @@ public class OSCServer { guard let self = self else { print("SwiftOSC Server stateUpdateHandler error"); return } switch newState { case .ready: - NSLog("\(self.name ?? "SwiftOSC Server"): Listening on port \(String(describing: self?.listener?.port))") - self?.ready = true + NSLog("\(self.name): Listening on port \(String(describing: self.listener?.port))") + self.ready = true case .failed(let error): - NSLog("\(self.name ?? "SwiftOSC Server"): Listener failed with error \(error)") - self?.ready = false - self?.restart() + NSLog("\(self.name): Listener failed with error \(error)") + self.ready = false + self.restart() case .cancelled: - NSLog("\(self.name ?? "SwiftOSC Server"): Listener cancelled") - self?.ready = false + NSLog("\(self.name): Listener cancelled") + self.ready = false default: break } From bbca0a65a21f1f0e4275c67d93943cdc11a5c1d7 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sat, 9 Apr 2022 14:44:45 +0200 Subject: [PATCH 44/71] fix force unwrap --- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 8866e9e..250ad2b 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -71,7 +71,7 @@ public class OSCServer { } self.connection = newConnection - self.connection?.start(queue: (self.queue)!) + self.connection?.start(queue: (self.queue)) self.receive() } From cf325ac1006d7aedd34bf5cb6d0e3bfeda58cda3 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sat, 9 Apr 2022 14:46:58 +0200 Subject: [PATCH 45/71] fixed optional server name --- Framework/SwiftOSC/Network/OSCServer.swift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 250ad2b..3414c52 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -62,11 +62,11 @@ public class OSCServer { // handle incoming connections server will only respond to the latest connection listener?.newConnectionHandler = { [weak self] (newConnection) in guard let self = self else { print("SwiftOSC Server newConnectionHandler error"); return } - NSLog("\(self.name): New Connection from \(String(describing: newConnection))") + NSLog("\(self.name ?? "SwiftOSC server"): New Connection from \(String(describing: newConnection))") // cancel previous connection if self.connection != nil { - NSLog("\(self.name): Cancelling connection: \(String(describing: newConnection))") + NSLog("\(self.name ?? "SwiftOSC server"): Cancelling connection: \(String(describing: newConnection))") self.connection?.cancel() } @@ -80,14 +80,14 @@ public class OSCServer { guard let self = self else { print("SwiftOSC Server stateUpdateHandler error"); return } switch newState { case .ready: - NSLog("\(self.name): Listening on port \(String(describing: self.listener?.port))") + NSLog("\(self.name ?? "SwiftOSC server"): Listening on port \(String(describing: self.listener?.port))") self.ready = true case .failed(let error): - NSLog("\(self.name): Listener failed with error \(error)") + NSLog("\(self.name ?? "SwiftOSC server"): Listener failed with error \(error)") self.ready = false self.restart() case .cancelled: - NSLog("\(self.name): Listener cancelled") + NSLog("\(self.name ?? "SwiftOSC server"): Listener cancelled") self.ready = false default: break From bb4e054145a62a51be99fb2ff531c83f0a75d105 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sat, 9 Apr 2022 15:06:12 +0200 Subject: [PATCH 46/71] Update OSCServer.swift --- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 3414c52..bacf17b 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -64,7 +64,7 @@ public class OSCServer { guard let self = self else { print("SwiftOSC Server newConnectionHandler error"); return } NSLog("\(self.name ?? "SwiftOSC server"): New Connection from \(String(describing: newConnection))") - // cancel previous connection + // cancel previous connection // check if it's own port if self.connection != nil { NSLog("\(self.name ?? "SwiftOSC server"): Cancelling connection: \(String(describing: newConnection))") self.connection?.cancel() From 40589ef5cca06540a5c9606f7bbf500c6b45944d Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sat, 9 Apr 2022 15:10:28 +0200 Subject: [PATCH 47/71] unwrap port value, delegate --- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index bacf17b..d48a3b8 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -80,7 +80,7 @@ public class OSCServer { guard let self = self else { print("SwiftOSC Server stateUpdateHandler error"); return } switch newState { case .ready: - NSLog("\(self.name ?? "SwiftOSC server"): Listening on port \(String(describing: self.listener?.port))") + NSLog("\(self.name ?? "SwiftOSC server"): Listening on port \(String(describing: self.listener?.port ?? "")), delegate: \(String(describing: self.delegate ?? ""))") self.ready = true case .failed(let error): NSLog("\(self.name ?? "SwiftOSC server"): Listener failed with error \(error)") From 98ddc832e70f4f26b8a44d203b928b8f6c566870 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sat, 9 Apr 2022 15:14:10 +0200 Subject: [PATCH 48/71] Update OSCServer.swift --- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index d48a3b8..4a111e7 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -80,7 +80,7 @@ public class OSCServer { guard let self = self else { print("SwiftOSC Server stateUpdateHandler error"); return } switch newState { case .ready: - NSLog("\(self.name ?? "SwiftOSC server"): Listening on port \(String(describing: self.listener?.port ?? "")), delegate: \(String(describing: self.delegate ?? ""))") + NSLog("\(self.name ?? "SwiftOSC server"): Listening on port \(String(describing: self.listener?.port)), delegate: \(String(describing: self.delegate))") self.ready = true case .failed(let error): NSLog("\(self.name ?? "SwiftOSC server"): Listener failed with error \(error)") From c7c207362baa17fdfea306f2a824e19d03d08f2a Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sat, 9 Apr 2022 22:19:11 +0200 Subject: [PATCH 49/71] added stateUpdateHandler log messages --- Framework/SwiftOSC/Network/OSCClient.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Framework/SwiftOSC/Network/OSCClient.swift b/Framework/SwiftOSC/Network/OSCClient.swift index 10503c3..48bc969 100644 --- a/Framework/SwiftOSC/Network/OSCClient.swift +++ b/Framework/SwiftOSC/Network/OSCClient.swift @@ -56,15 +56,18 @@ public class OSCClient { NSLog("SWiftOSC Client is restarting.") self?.setupConnection() case .cancelled: + NSLog("SWiftOSC Client cancelled.") self?.ready = false break case .waiting(let error): self?.ready = false NSLog("SwiftOSC Client waiting with error \(error)") case .preparing: + NSLog("SWiftOSC Client is preparing.") self?.ready = false break case .setup: + NSLog("SWiftOSC Client is setting up.") self?.ready = false break } From d21af27d47a649611fa8166c6f795c935b88bcf7 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sun, 10 Apr 2022 13:05:05 +0200 Subject: [PATCH 50/71] "*** dirty fix 'type end found nil' *** " returns custom message --- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 4a111e7..8ab2e45 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -187,7 +187,7 @@ public class OSCServer { // TotalMix Bulk data crash // ERROR Thread 10: Fatal error: Unexpectedly found nil while unwrapping an Optional value // let typeEnd = messageData.firstIndex(of: 0x00)! - guard let typeEnd = messageData.firstIndex(of: 0x00) else { print("*** dirty fix 'type end found nil' *** "); return nil } + guard let typeEnd = messageData.firstIndex(of: 0x00) else { print("*** dirty fix 'type end found nil' *** ") return OSCMessage(OSCAddressPattern("/").add(String("*** dirty fix 'type end found nil' *** "))} //; return nil } let type = messageData.subdata(in: 1.. Date: Sun, 10 Apr 2022 13:06:25 +0200 Subject: [PATCH 51/71] Update OSCServer.swift --- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 8ab2e45..dc64895 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -187,7 +187,7 @@ public class OSCServer { // TotalMix Bulk data crash // ERROR Thread 10: Fatal error: Unexpectedly found nil while unwrapping an Optional value // let typeEnd = messageData.firstIndex(of: 0x00)! - guard let typeEnd = messageData.firstIndex(of: 0x00) else { print("*** dirty fix 'type end found nil' *** ") return OSCMessage(OSCAddressPattern("/").add(String("*** dirty fix 'type end found nil' *** "))} //; return nil } + guard let typeEnd = messageData.firstIndex(of: 0x00) else { print("*** dirty fix 'type end found nil' *** "); return OSCMessage(OSCAddressPattern("/")).add(String("*** dirty fix 'type end found nil' *** "))} //; return nil } let type = messageData.subdata(in: 1.. Date: Sun, 10 Apr 2022 13:12:53 +0200 Subject: [PATCH 52/71] Update OSCServer.swift --- Framework/SwiftOSC/Network/OSCServer.swift | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index dc64895..d9f1408 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -187,7 +187,15 @@ public class OSCServer { // TotalMix Bulk data crash // ERROR Thread 10: Fatal error: Unexpectedly found nil while unwrapping an Optional value // let typeEnd = messageData.firstIndex(of: 0x00)! - guard let typeEnd = messageData.firstIndex(of: 0x00) else { print("*** dirty fix 'type end found nil' *** "); return OSCMessage(OSCAddressPattern("/")).add(String("*** dirty fix 'type end found nil' *** "))} //; return nil } + guard let typeEnd = messageData.firstIndex(of: 0x00) else { + print("*** dirty fix 'type end found nil' *** ") + func buildCustomMessage() -> OSCMessage { + let customMessage: OSCMessage = OSCMessage(OSCAddressPattern("/")!) //.add(String("*** dirty fix 'type end found nil' *** ")) + customMessage.add(String("*** dirty fix 'type end found nil' *** ")) + return customMessage + } + buildCustomMessage() + return customMessage; return nil } let type = messageData.subdata(in: 1.. Date: Sun, 10 Apr 2022 13:13:58 +0200 Subject: [PATCH 53/71] Update OSCServer.swift --- Framework/SwiftOSC/Network/OSCServer.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index d9f1408..d2f7105 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -194,8 +194,7 @@ public class OSCServer { customMessage.add(String("*** dirty fix 'type end found nil' *** ")) return customMessage } - buildCustomMessage() - return customMessage; return nil } + return buildCustomMessage(); return nil } let type = messageData.subdata(in: 1.. Date: Sun, 10 Apr 2022 13:25:46 +0200 Subject: [PATCH 54/71] Update OSCServer.swift --- Framework/SwiftOSC/Network/OSCServer.swift | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index d2f7105..db94758 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -188,13 +188,15 @@ public class OSCServer { // ERROR Thread 10: Fatal error: Unexpectedly found nil while unwrapping an Optional value // let typeEnd = messageData.firstIndex(of: 0x00)! guard let typeEnd = messageData.firstIndex(of: 0x00) else { - print("*** dirty fix 'type end found nil' *** ") + //print("*** dirty fix 'type end found nil' *** ") func buildCustomMessage() -> OSCMessage { - let customMessage: OSCMessage = OSCMessage(OSCAddressPattern("/")!) //.add(String("*** dirty fix 'type end found nil' *** ")) - customMessage.add(String("*** dirty fix 'type end found nil' *** ")) + let customMessage: OSCMessage = OSCMessage(OSCAddressPattern("/OSCError")!) + customMessage.add(String("*** dirty fix 'type end found nil' ***")) return customMessage } - return buildCustomMessage(); return nil } + let customMessage = buildCustomMessage() + print("nOSC_ *** dirty fix 'type end found nil' *** ", customMessage.description) + return customMessage //; return nil } let type = messageData.subdata(in: 1.. Date: Sun, 10 Apr 2022 13:26:49 +0200 Subject: [PATCH 55/71] Update OSCServer.swift --- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index db94758..1a8d89d 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -196,7 +196,7 @@ public class OSCServer { } let customMessage = buildCustomMessage() print("nOSC_ *** dirty fix 'type end found nil' *** ", customMessage.description) - return customMessage //; return nil } + return customMessage } //; return nil } let type = messageData.subdata(in: 1.. Date: Sun, 10 Apr 2022 13:33:28 +0200 Subject: [PATCH 56/71] Update OSCServer.swift --- Framework/SwiftOSC/Network/OSCServer.swift | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 1a8d89d..08acd54 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -188,15 +188,14 @@ public class OSCServer { // ERROR Thread 10: Fatal error: Unexpectedly found nil while unwrapping an Optional value // let typeEnd = messageData.firstIndex(of: 0x00)! guard let typeEnd = messageData.firstIndex(of: 0x00) else { - //print("*** dirty fix 'type end found nil' *** ") func buildCustomMessage() -> OSCMessage { let customMessage: OSCMessage = OSCMessage(OSCAddressPattern("/OSCError")!) - customMessage.add(String("*** dirty fix 'type end found nil' ***")) + customMessage.add(String("OSC exception_ *** dirty fix 'type end found nil' *** (TotalMix bundle data with missing type end)")) return customMessage } let customMessage = buildCustomMessage() - print("nOSC_ *** dirty fix 'type end found nil' *** ", customMessage.description) - return customMessage } //; return nil } + print("OSC exception_ *** dirty fix 'type end found nil' *** (TotalMix bundle data with missing type end)", customMessage.description) + return customMessage } let type = messageData.subdata(in: 1.. Date: Sun, 10 Apr 2022 13:40:11 +0200 Subject: [PATCH 57/71] Update OSCServer.swift --- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 08acd54..ecd90b4 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -190,7 +190,7 @@ public class OSCServer { guard let typeEnd = messageData.firstIndex(of: 0x00) else { func buildCustomMessage() -> OSCMessage { let customMessage: OSCMessage = OSCMessage(OSCAddressPattern("/OSCError")!) - customMessage.add(String("OSC exception_ *** dirty fix 'type end found nil' *** (TotalMix bundle data with missing type end)")) + customMessage.add(String("\(name) OSC exception_ *** dirty fix 'type end found nil' *** (TotalMix bundle data with missing type end)")) return customMessage } let customMessage = buildCustomMessage() From f2dd56473494001ecc708ca2a2b1f7ce8abe1765 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sun, 10 Apr 2022 13:41:37 +0200 Subject: [PATCH 58/71] Update OSCServer.swift --- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index ecd90b4..a353cf3 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -190,7 +190,7 @@ public class OSCServer { guard let typeEnd = messageData.firstIndex(of: 0x00) else { func buildCustomMessage() -> OSCMessage { let customMessage: OSCMessage = OSCMessage(OSCAddressPattern("/OSCError")!) - customMessage.add(String("\(name) OSC exception_ *** dirty fix 'type end found nil' *** (TotalMix bundle data with missing type end)")) + customMessage.add(String("\(name ?? port) OSC exception_ *** dirty fix 'type end found nil' *** (TotalMix bundle data with missing type end)")) return customMessage } let customMessage = buildCustomMessage() From 2ebc88d791ee73d912d8798ea26abe624525da2f Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sun, 10 Apr 2022 13:43:01 +0200 Subject: [PATCH 59/71] Update OSCServer.swift --- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index a353cf3..9df3f08 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -190,7 +190,7 @@ public class OSCServer { guard let typeEnd = messageData.firstIndex(of: 0x00) else { func buildCustomMessage() -> OSCMessage { let customMessage: OSCMessage = OSCMessage(OSCAddressPattern("/OSCError")!) - customMessage.add(String("\(name ?? port) OSC exception_ *** dirty fix 'type end found nil' *** (TotalMix bundle data with missing type end)")) + customMessage.add(String("\(name ?? String(port)) OSC exception_ *** dirty fix 'type end found nil' *** (TotalMix bundle data with missing type end)")) return customMessage } let customMessage = buildCustomMessage() From bce526ad90c9b9e2632b92d707fb793dbf8e01b5 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sun, 10 Apr 2022 13:43:39 +0200 Subject: [PATCH 60/71] Update OSCServer.swift --- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 9df3f08..5735f0e 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -190,7 +190,7 @@ public class OSCServer { guard let typeEnd = messageData.firstIndex(of: 0x00) else { func buildCustomMessage() -> OSCMessage { let customMessage: OSCMessage = OSCMessage(OSCAddressPattern("/OSCError")!) - customMessage.add(String("\(name ?? String(port)) OSC exception_ *** dirty fix 'type end found nil' *** (TotalMix bundle data with missing type end)")) + customMessage.add(String("\(name ?? Int(port)) OSC exception_ *** dirty fix 'type end found nil' *** (TotalMix bundle data with missing type end)")) return customMessage } let customMessage = buildCustomMessage() From aeed959b08213f197086de132b1bcfb653d0a80e Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sun, 10 Apr 2022 13:58:31 +0200 Subject: [PATCH 61/71] Update OSCServer.swift --- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 5735f0e..2cd8ccb 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -190,7 +190,7 @@ public class OSCServer { guard let typeEnd = messageData.firstIndex(of: 0x00) else { func buildCustomMessage() -> OSCMessage { let customMessage: OSCMessage = OSCMessage(OSCAddressPattern("/OSCError")!) - customMessage.add(String("\(name ?? Int(port)) OSC exception_ *** dirty fix 'type end found nil' *** (TotalMix bundle data with missing type end)")) + customMessage.add(String("\(name ?? String(describing: self.listener?.port)) OSC exception_ *** dirty fix 'type end found nil' *** (TotalMix bundle data with missing type end)")) return customMessage } let customMessage = buildCustomMessage() From 9ed59981caa852bb32c0b02cd2161f97f2fa3084 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sun, 10 Apr 2022 14:01:10 +0200 Subject: [PATCH 62/71] Update OSCServer.swift --- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 2cd8ccb..81aef8b 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -190,7 +190,7 @@ public class OSCServer { guard let typeEnd = messageData.firstIndex(of: 0x00) else { func buildCustomMessage() -> OSCMessage { let customMessage: OSCMessage = OSCMessage(OSCAddressPattern("/OSCError")!) - customMessage.add(String("\(name ?? String(describing: self.listener?.port)) OSC exception_ *** dirty fix 'type end found nil' *** (TotalMix bundle data with missing type end)")) + customMessage.add(String("SwiftOSCServer '\(name ?? String(describing: self.listener?.port))' OSC exception_ *** dirty fix 'type end found nil' *** (TotalMix bundle data with missing type end)")) return customMessage } let customMessage = buildCustomMessage() From 0c59401c05901987704d1924115a046ed2088dfd Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sun, 10 Apr 2022 14:18:41 +0200 Subject: [PATCH 63/71] Update OSCServer.swift --- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 81aef8b..829d854 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -190,7 +190,7 @@ public class OSCServer { guard let typeEnd = messageData.firstIndex(of: 0x00) else { func buildCustomMessage() -> OSCMessage { let customMessage: OSCMessage = OSCMessage(OSCAddressPattern("/OSCError")!) - customMessage.add(String("SwiftOSCServer '\(name ?? String(describing: self.listener?.port))' OSC exception_ *** dirty fix 'type end found nil' *** (TotalMix bundle data with missing type end)")) + customMessage.add(String("SwiftOSCServer \(name ?? String(describing: self.listener?.port)) OSC exception_ *** dirty fix 'type end found nil' *** (TotalMix bundle data with missing type end)")) return customMessage } let customMessage = buildCustomMessage() From 0f964cb6d620673b2349365ee144410af7ae8237 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sun, 10 Apr 2022 14:24:01 +0200 Subject: [PATCH 64/71] Update OSCServer.swift --- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 829d854..a96a2f6 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -194,7 +194,7 @@ public class OSCServer { return customMessage } let customMessage = buildCustomMessage() - print("OSC exception_ *** dirty fix 'type end found nil' *** (TotalMix bundle data with missing type end)", customMessage.description) + NSLog("SwiftOSCServer exception_ *** dirty fix 'type end found nil' ***") return customMessage } let type = messageData.subdata(in: 1.. Date: Wed, 27 Apr 2022 23:45:00 +0200 Subject: [PATCH 65/71] changed OSCServer.connection to public --- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index a96a2f6..88725a9 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -18,7 +18,7 @@ public class OSCServer { public private(set) var name: String? public private(set) var domain: String? var queue: DispatchQueue - var connection: NWConnection? + public var connection: NWConnection? public private(set) var ready: Bool = false var bonjour: Bool = false From 939a80f601084c2701d60a338f0c706fa9063171 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Fri, 29 Apr 2022 08:51:47 +0200 Subject: [PATCH 66/71] fixed port range check --- Framework/SwiftOSC/Network/OSCClient.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCClient.swift b/Framework/SwiftOSC/Network/OSCClient.swift index 48bc969..9dd5de5 100644 --- a/Framework/SwiftOSC/Network/OSCClient.swift +++ b/Framework/SwiftOSC/Network/OSCClient.swift @@ -27,7 +27,7 @@ public class OSCClient { return nil } - if port > 65535 && port >= 0{ + if port > 65535 || port >= 0{ NSLog("Invalid Port: Out of range.") return nil } From 2a30d68e44f0c7da5807c5c199b29a8101388fa7 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Fri, 29 Apr 2022 08:53:26 +0200 Subject: [PATCH 67/71] Fixed port range check --- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 88725a9..216d942 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -28,7 +28,7 @@ public class OSCServer { self.domain = domain // check port range - if port > 65535 && port >= 0{ + if port > 65535 || port >= 0 { NSLog("Invalid Port: Out of range.") return nil } From ca6f1d2f2c3d902fbce5829c934ab67edba4587e Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Fri, 29 Apr 2022 09:11:41 +0200 Subject: [PATCH 68/71] Update OSCClient.swift --- Framework/SwiftOSC/Network/OSCClient.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCClient.swift b/Framework/SwiftOSC/Network/OSCClient.swift index 9dd5de5..b24b9e2 100644 --- a/Framework/SwiftOSC/Network/OSCClient.swift +++ b/Framework/SwiftOSC/Network/OSCClient.swift @@ -27,7 +27,7 @@ public class OSCClient { return nil } - if port > 65535 || port >= 0{ + if port > 65535 || port <= 0 { NSLog("Invalid Port: Out of range.") return nil } From 434e52c6b2798295b47d25ad739168b048dd69e4 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Fri, 29 Apr 2022 09:11:56 +0200 Subject: [PATCH 69/71] Update OSCServer.swift --- Framework/SwiftOSC/Network/OSCServer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 216d942..6a9bf1f 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -28,7 +28,7 @@ public class OSCServer { self.domain = domain // check port range - if port > 65535 || port >= 0 { + if port > 65535 || port <= 0 { NSLog("Invalid Port: Out of range.") return nil } From 9b8d239ca3016d44688d24d24fb8cb46e522c54d Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Sun, 1 May 2022 16:04:18 +0200 Subject: [PATCH 70/71] deleted 'ready' property, please rely on ...connection.stateUpdateHandler --- .../xcode/package.xcworkspace/contents.xcworkspacedata | 7 +++++++ Framework/SwiftOSC/Network/OSCClient.swift | 9 ++------- Framework/SwiftOSC/Network/OSCServer.swift | 4 ---- 3 files changed, 9 insertions(+), 11 deletions(-) create mode 100644 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Framework/SwiftOSC/Network/OSCClient.swift b/Framework/SwiftOSC/Network/OSCClient.swift index b24b9e2..33cca78 100644 --- a/Framework/SwiftOSC/Network/OSCClient.swift +++ b/Framework/SwiftOSC/Network/OSCClient.swift @@ -12,7 +12,6 @@ import Network public class OSCClient { public var connection: NWConnection? // Access Control: changed 'var connection: NWConnection?' to public. - public private(set) var ready: Bool = false var queue: DispatchQueue public private(set) var host: NWEndpoint.Host @@ -48,28 +47,24 @@ public class OSCClient { connection?.stateUpdateHandler = { [weak self] (newState) in switch newState { case .ready: - self?.ready = true NSLog("SwiftOSC Client is ready. \(String(describing: self?.connection))") case .failed(let error): - self?.ready = false NSLog("SwiftOSC Client failed with error \(error)") NSLog("SWiftOSC Client is restarting.") self?.setupConnection() case .cancelled: NSLog("SWiftOSC Client cancelled.") - self?.ready = false break case .waiting(let error): - self?.ready = false NSLog("SwiftOSC Client waiting with error \(error)") case .preparing: NSLog("SWiftOSC Client is preparing.") - self?.ready = false break case .setup: NSLog("SWiftOSC Client is setting up.") - self?.ready = false break + @unknown default: + fatalError() } } diff --git a/Framework/SwiftOSC/Network/OSCServer.swift b/Framework/SwiftOSC/Network/OSCServer.swift index 6a9bf1f..9c59c9a 100644 --- a/Framework/SwiftOSC/Network/OSCServer.swift +++ b/Framework/SwiftOSC/Network/OSCServer.swift @@ -20,7 +20,6 @@ public class OSCServer { var queue: DispatchQueue public var connection: NWConnection? - public private(set) var ready: Bool = false var bonjour: Bool = false public init?(port: Int, bonjourName: String? = nil, domain: String? = nil) { @@ -81,14 +80,11 @@ public class OSCServer { switch newState { case .ready: NSLog("\(self.name ?? "SwiftOSC server"): Listening on port \(String(describing: self.listener?.port)), delegate: \(String(describing: self.delegate))") - self.ready = true case .failed(let error): NSLog("\(self.name ?? "SwiftOSC server"): Listener failed with error \(error)") - self.ready = false self.restart() case .cancelled: NSLog("\(self.name ?? "SwiftOSC server"): Listener cancelled") - self.ready = false default: break } From e7ca5721467b10dc1bd369fb919a75cdd1ad4417 Mon Sep 17 00:00:00 2001 From: soundflix <80773469+soundflix@users.noreply.github.com> Date: Mon, 29 Aug 2022 14:12:04 +0200 Subject: [PATCH 71/71] Dev team changed --- Examples/iOS/OSCTest/OSCTest.xcodeproj/project.pbxproj | 4 ++-- .../OSCMonitor/OSCMonitor.xcodeproj/project.pbxproj | 10 ++++++++-- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ Framework/iOS/iOS.xcodeproj/project.pbxproj | 4 ++-- Framework/macOS/macOS.xcodeproj/project.pbxproj | 5 ++++- Framework/tvOS/tvOS.xcodeproj/project.pbxproj | 4 ++-- 6 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 Examples/macOS/OSCMonitor/OSCMonitor.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Examples/iOS/OSCTest/OSCTest.xcodeproj/project.pbxproj b/Examples/iOS/OSCTest/OSCTest.xcodeproj/project.pbxproj index 9e0a000..a7ba1f9 100644 --- a/Examples/iOS/OSCTest/OSCTest.xcodeproj/project.pbxproj +++ b/Examples/iOS/OSCTest/OSCTest.xcodeproj/project.pbxproj @@ -316,7 +316,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = M4VH59A389; + DEVELOPMENT_TEAM = FNLF39495D; INFOPLIST_FILE = "$(SRCROOT)/OSCTest/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -334,7 +334,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = M4VH59A389; + DEVELOPMENT_TEAM = FNLF39495D; INFOPLIST_FILE = "$(SRCROOT)/OSCTest/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", diff --git a/Examples/macOS/OSCMonitor/OSCMonitor.xcodeproj/project.pbxproj b/Examples/macOS/OSCMonitor/OSCMonitor.xcodeproj/project.pbxproj index 51270d1..97ff1bb 100644 --- a/Examples/macOS/OSCMonitor/OSCMonitor.xcodeproj/project.pbxproj +++ b/Examples/macOS/OSCMonitor/OSCMonitor.xcodeproj/project.pbxproj @@ -108,6 +108,8 @@ dependencies = ( ); name = OSCMonitor; + packageProductDependencies = ( + ); productName = OSCMonitor; productReference = 033827B21D3999590065A3A7 /* OSCMonitor.app */; productType = "com.apple.product-type.application"; @@ -124,7 +126,7 @@ TargetAttributes = { 033827B11D3999590065A3A7 = { CreatedOnToolsVersion = 8.0; - DevelopmentTeam = 638F7EDPVY; + DevelopmentTeam = FNLF39495D; DevelopmentTeamName = "Devin Roth (Personal Team)"; LastSwiftMigration = 0910; ProvisioningStyle = Automatic; @@ -133,13 +135,15 @@ }; buildConfigurationList = 033827AD1D3999590065A3A7 /* Build configuration list for PBXProject "OSCMonitor" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, Base, ); mainGroup = 033827A91D3999590065A3A7; + packageReferences = ( + ); productRefGroup = 033827B31D3999590065A3A7 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -298,6 +302,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COMBINE_HIDPI_IMAGES = YES; + DEVELOPMENT_TEAM = FNLF39495D; INFOPLIST_FILE = OSCMonitor/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.14; @@ -314,6 +319,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COMBINE_HIDPI_IMAGES = YES; + DEVELOPMENT_TEAM = FNLF39495D; INFOPLIST_FILE = OSCMonitor/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.14; diff --git a/Examples/macOS/OSCMonitor/OSCMonitor.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Examples/macOS/OSCMonitor/OSCMonitor.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Examples/macOS/OSCMonitor/OSCMonitor.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Framework/iOS/iOS.xcodeproj/project.pbxproj b/Framework/iOS/iOS.xcodeproj/project.pbxproj index 9d5ed84..dda1fe5 100644 --- a/Framework/iOS/iOS.xcodeproj/project.pbxproj +++ b/Framework/iOS/iOS.xcodeproj/project.pbxproj @@ -386,7 +386,7 @@ CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 638F7EDPVY; + DEVELOPMENT_TEAM = FNLF39495D; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -408,7 +408,7 @@ CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 638F7EDPVY; + DEVELOPMENT_TEAM = FNLF39495D; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; diff --git a/Framework/macOS/macOS.xcodeproj/project.pbxproj b/Framework/macOS/macOS.xcodeproj/project.pbxproj index e29c30c..01b5b8e 100644 --- a/Framework/macOS/macOS.xcodeproj/project.pbxproj +++ b/Framework/macOS/macOS.xcodeproj/project.pbxproj @@ -200,7 +200,7 @@ TargetAttributes = { 0339A3531D37FCEB0060ED91 = { CreatedOnToolsVersion = 8.0; - DevelopmentTeam = 638F7EDPVY; + DevelopmentTeam = FNLF39495D; DevelopmentTeamName = "Devin Roth (Personal Team)"; LastSwiftMigration = 1020; ProvisioningStyle = Automatic; @@ -387,6 +387,7 @@ CLANG_ENABLE_MODULES = YES; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = FNLF39495D; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -409,8 +410,10 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "Apple Development"; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = FNLF39495D; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; diff --git a/Framework/tvOS/tvOS.xcodeproj/project.pbxproj b/Framework/tvOS/tvOS.xcodeproj/project.pbxproj index 250201d..d794e2b 100644 --- a/Framework/tvOS/tvOS.xcodeproj/project.pbxproj +++ b/Framework/tvOS/tvOS.xcodeproj/project.pbxproj @@ -389,7 +389,7 @@ CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 638F7EDPVY; + DEVELOPMENT_TEAM = FNLF39495D; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -415,7 +415,7 @@ CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 638F7EDPVY; + DEVELOPMENT_TEAM = FNLF39495D; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath";