mirror of
https://github.com/leonboe1/QuickDrop.git
synced 2026-11-19 12:56:06 +00:00
Add support for multiple services
This commit is contained in:
1 parent
e43e017803
commit
653fbeb096
1 file changed
+72
-46
@@ -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,24 +222,28 @@ 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)
|
||||||
"n": endpointInfo.serialize().urlSafeBase64EncodedString().data(using: .utf8)!
|
service.delegate = self
|
||||||
]))
|
service.setTXTRecord(NetService.data(fromTXTRecord: [
|
||||||
mdnsService?.publish()
|
"n": endpointInfo.serialize().urlSafeBase64EncodedString().data(using: .utf8)!
|
||||||
}
|
]))
|
||||||
|
service.publish()
|
||||||
|
return service
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func obtainUserConsent(for transfer: TransferMetadata, from device: RemoteDeviceInfo, connection: InboundNearbyConnection) {
|
func obtainUserConsent(for transfer: TransferMetadata, from device: RemoteDeviceInfo, connection: InboundNearbyConnection) {
|
||||||
guard let delegate=mainAppDelegate else {return}
|
guard let delegate=mainAppDelegate else {return}
|
||||||
@@ -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() {
|
||||||
foundServices.removeAll()
|
|
||||||
if browser==nil{
|
log("Device discovery requested.")
|
||||||
browser=NWBrowser(for: .bonjourWithTXTRecord(type: "_FC9F5ED42C8A._tcp.", domain: nil), using: .tcp)
|
|
||||||
browser?.browseResultsChangedHandler={newResults, changes in
|
if discoveryRefCount == 0 {
|
||||||
for change in changes{
|
foundServices.removeAll()
|
||||||
switch change{
|
|
||||||
case let .added(res):
|
log("Starting device discovery")
|
||||||
self.maybeAddFoundDevice(service: res)
|
|
||||||
case let .removed(res):
|
if browsers.isEmpty {
|
||||||
self.maybeRemoveFoundDevice(service: res)
|
for type in serviceTypes {
|
||||||
default:
|
|
||||||
break
|
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 {
|
||||||
browser?.start(queue: .main)
|
switch change {
|
||||||
}
|
case let .added(res):
|
||||||
discoveryRefCount+=1
|
self.maybeAddFoundDevice(service: res)
|
||||||
}
|
case let .removed(res):
|
||||||
|
self.maybeRemoveFoundDevice(service: res)
|
||||||
|
default:
|
||||||
|
log("Ignoring change \(change)")
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
browser.start(queue: .main)
|
||||||
|
browsers.append(browser)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user