Add support for multiple services

This commit is contained in:
Leon Böttger committed 2025-05-13 13:19:15 +02:00
1 parent e43e017803
commit 653fbeb096
1 file changed
+51 -25
+51 -25
View File
@@ -160,7 +160,7 @@ public class NearbyConnectionManager : NSObject, NetServiceDelegate, InboundNear
private var tcpListener:NWListener; private var tcpListener:NWListener;
public let endpointID:[UInt8]=generateEndpointID() public let endpointID:[UInt8]=generateEndpointID()
private var mdnsService:NetService? private var mdnsServices: [NetService] = []
private var activeConnections:[String:InboundNearbyConnection]=[:] private var activeConnections:[String:InboundNearbyConnection]=[:]
private var foundServices:[String:FoundServiceInfo]=[:] private var foundServices:[String:FoundServiceInfo]=[:]
private var shareExtensionDelegates:[ShareExtensionDelegate]=[] private var shareExtensionDelegates:[ShareExtensionDelegate]=[]
@@ -168,7 +168,9 @@ public class NearbyConnectionManager : NSObject, NetServiceDelegate, InboundNear
public var mainAppDelegate:(any MainAppDelegate)? public var mainAppDelegate:(any MainAppDelegate)?
private var discoveryRefCount=0 private var discoveryRefCount=0
private var browser:NWBrowser? let serviceTypes = ["_FC9F5ED42C8A._tcp."]
private var browsers: [NWBrowser] = []
public static let shared=NearbyConnectionManager() public static let shared=NearbyConnectionManager()
@@ -220,23 +222,27 @@ public class NearbyConnectionManager : NSObject, NetServiceDelegate, InboundNear
return id return id
} }
private func initMDNS(){ private func initMDNS() {
let nameBytes:[UInt8]=[ let nameBytes: [UInt8] = [
0x23, // PCP 0x23, // PCP
endpointID[0], endpointID[1], endpointID[2], endpointID[3], endpointID[0], endpointID[1], endpointID[2], endpointID[3],
0xFC, 0x9F, 0x5E, // Service ID hash 0xFC, 0x9F, 0x5E, // Service ID hash
0, 0 0, 0
] ]
let name=Data(nameBytes).urlSafeBase64EncodedString() let name = Data(nameBytes).urlSafeBase64EncodedString()
let endpointInfo=EndpointInfo(name: Host.current().localizedName!, deviceType: .computer) let endpointInfo = EndpointInfo(name: Host.current().localizedName!, deviceType: .computer)
let port:Int32=Int32(tcpListener.port!.rawValue) let port: Int32 = Int32(tcpListener.port!.rawValue)
mdnsService=NetService(domain: "", type: "_FC9F5ED42C8A._tcp.", name: name, port: port)
mdnsService?.delegate=self mdnsServices = serviceTypes.map { serviceType in
mdnsService?.setTXTRecord(NetService.data(fromTXTRecord: [ let service = NetService(domain: "", type: serviceType, name: name, port: port)
service.delegate = self
service.setTXTRecord(NetService.data(fromTXTRecord: [
"n": endpointInfo.serialize().urlSafeBase64EncodedString().data(using: .utf8)! "n": endpointInfo.serialize().urlSafeBase64EncodedString().data(using: .utf8)!
])) ]))
mdnsService?.publish() service.publish()
return service
}
} }
func obtainUserConsent(for transfer: TransferMetadata, from device: RemoteDeviceInfo, connection: InboundNearbyConnection) { func obtainUserConsent(for transfer: TransferMetadata, from device: RemoteDeviceInfo, connection: InboundNearbyConnection) {
@@ -255,35 +261,55 @@ public class NearbyConnectionManager : NSObject, NetServiceDelegate, InboundNear
conn.submitUserConsent(accepted: accept, storeInTemp: storeInTemp) conn.submitUserConsent(accepted: accept, storeInTemp: storeInTemp)
} }
public func startDeviceDiscovery(){
if discoveryRefCount==0{ public func startDeviceDiscovery() {
log("Device discovery requested.")
if discoveryRefCount == 0 {
foundServices.removeAll() foundServices.removeAll()
if browser==nil{
browser=NWBrowser(for: .bonjourWithTXTRecord(type: "_FC9F5ED42C8A._tcp.", domain: nil), using: .tcp) log("Starting device discovery")
browser?.browseResultsChangedHandler={newResults, changes in
for change in changes{ if browsers.isEmpty {
switch change{ for type in serviceTypes {
log("Starting browser for type \(type)")
let browser = NWBrowser(for: .bonjourWithTXTRecord(type: type, domain: nil), using: .tcp)
browser.browseResultsChangedHandler = { newResults, changes in
for change in changes {
switch change {
case let .added(res): case let .added(res):
self.maybeAddFoundDevice(service: res) self.maybeAddFoundDevice(service: res)
case let .removed(res): case let .removed(res):
self.maybeRemoveFoundDevice(service: res) self.maybeRemoveFoundDevice(service: res)
default: default:
log("Ignoring change \(change)")
break break
} }
} }
} }
browser.start(queue: .main)
browsers.append(browser)
} }
browser?.start(queue: .main)
} }
discoveryRefCount+=1
} }
discoveryRefCount += 1
}
public func stopDeviceDiscovery(){ public func stopDeviceDiscovery(){
discoveryRefCount-=1 discoveryRefCount -= 1
assert(discoveryRefCount>=0) assert(discoveryRefCount >= 0)
if discoveryRefCount==0{
browser?.cancel() if discoveryRefCount == 0 {
browser=nil for browser in browsers {
browser.cancel()
}
browsers.removeAll()
} }
} }