anlicheng/swiftlib_sdlan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
anlicheng 2025-08-01 12:03:26 +08:00
parent d1452ce0b7
commit 1f629a58a0
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Sources/Punchnet/SDLContext.swift
View File

@ -47,8 +47,8 @@ public class SDLContext: @unchecked Sendable {
let rsaCipher: RSACipher let rsaCipher: RSACipher
// 依赖的变量 // 依赖的变量
var udpHoleActor: SDLUDPHoleActor? var udpHoleActor: SDLUDPHole?
var superClientActor: SDLSuperClientActor? var superClientActor: SDLSuperClient?
// 数据包读取任务 // 数据包读取任务
private var readTask: Task<(), Never>? private var readTask: Task<(), Never>?
@ -93,8 +93,8 @@ public class SDLContext: @unchecked Sendable {
} }
public func start() async throws { public func start() async throws {
self.udpHoleActor = try await SDLUDPHoleActor() self.udpHoleActor = try await SDLUDPHole()
self.superClientActor = try await SDLSuperClientActor(host: self.config.superHost, port: self.config.superPort) self.superClientActor = try await SDLSuperClient(host: self.config.superHost, port: self.config.superPort)
self.noticeClient = try await SDLNoticeClient() self.noticeClient = try await SDLNoticeClient()
try await withThrowingTaskGroup(of: Void.self) { group in try await withThrowingTaskGroup(of: Void.self) { group in
@ -160,7 +160,7 @@ public class SDLContext: @unchecked Sendable {
self.readTask?.cancel() self.readTask?.cancel()
} }
private func handleSuperEvent(event: SDLSuperClientActor.SuperEvent) async throws { private func handleSuperEvent(event: SDLSuperClient.SuperEvent) async throws {
switch event { switch event {
case .ready: case .ready:
NSLog("[SDLContext] get registerSuper, mac address: \(Self.formatMacAddress(mac: self.devAddr.mac))") NSLog("[SDLContext] get registerSuper, mac address: \(Self.formatMacAddress(mac: self.devAddr.mac))")
@ -273,7 +273,7 @@ public class SDLContext: @unchecked Sendable {
// try await self.udpHole?.start() // try await self.udpHole?.start()
} }
private func handleUDPEvent(event: SDLUDPHoleActor.UDPEvent) async throws { private func handleUDPEvent(event: SDLUDPHole.UDPEvent) async throws {
switch event { switch event {
case .ready: case .ready:
// 获取当前网络的类型 // 获取当前网络的类型

4
Sources/Punchnet/SDLNatProber.swift
View File

@ -22,7 +22,7 @@ struct SDLNatProber {
} }
// 获取当前所处的网络的nat类型 // 获取当前所处的网络的nat类型
static func getNatType(udpHole: SDLUDPHoleActor?, config: SDLConfiguration) async -> NatType { static func getNatType(udpHole: SDLUDPHole?, config: SDLConfiguration) async -> NatType {
guard let udpHole else { guard let udpHole else {
return .blocked return .blocked
} }
@ -67,7 +67,7 @@ struct SDLNatProber {
} }
} }
private static func getNatAddress(_ udpHole: SDLUDPHoleActor, remoteAddress: SocketAddress, attr: SDLProbeAttr) async -> SocketAddress? { private static func getNatAddress(_ udpHole: SDLUDPHole, remoteAddress: SocketAddress, attr: SDLProbeAttr) async -> SocketAddress? {
let stunProbeReply = try? await udpHole.stunProbe(remoteAddress: remoteAddress, attr: attr, timeout: 5) let stunProbeReply = try? await udpHole.stunProbe(remoteAddress: remoteAddress, attr: attr, timeout: 5)
return stunProbeReply?.socketAddress() return stunProbeReply?.socketAddress()

2
Sources/Punchnet/SDLSuperClientActor.swift → Sources/Punchnet/SDLSuperClient.swift
View File

@ -10,7 +10,7 @@ import NIOCore
import NIOPosix import NIOPosix
// --MARK: 和SuperNode的客户端 // --MARK: 和SuperNode的客户端
actor SDLSuperClientActor { actor SDLSuperClient {
private let group = MultiThreadedEventLoopGroup(numberOfThreads: 1) private let group = MultiThreadedEventLoopGroup(numberOfThreads: 1)
private let asyncChannel: NIOAsyncChannel<ByteBuffer,ByteBuffer> private let asyncChannel: NIOAsyncChannel<ByteBuffer,ByteBuffer>
private let (writeStream, writeContinuation) = AsyncStream.makeStream(of: TcpMessage.self, bufferingPolicy: .unbounded) private let (writeStream, writeContinuation) = AsyncStream.makeStream(of: TcpMessage.self, bufferingPolicy: .unbounded)

2
Sources/Punchnet/SDLUDPHoleActor.swift → Sources/Punchnet/SDLUDPHole.swift
View File

@ -16,7 +16,7 @@ struct UDPMessage {
} }
// 处理和sn-server服务器之间的通讯 // 处理和sn-server服务器之间的通讯
actor SDLUDPHoleActor { actor SDLUDPHole {
private let group = MultiThreadedEventLoopGroup(numberOfThreads: 1) private let group = MultiThreadedEventLoopGroup(numberOfThreads: 1)
private let asyncChannel: NIOAsyncChannel<AddressedEnvelope<ByteBuffer>, AddressedEnvelope<ByteBuffer>> private let asyncChannel: NIOAsyncChannel<AddressedEnvelope<ByteBuffer>, AddressedEnvelope<ByteBuffer>>
private let (writeStream, continuation) = AsyncStream.makeStream(of: UDPMessage.self, bufferingPolicy: .unbounded) private let (writeStream, continuation) = AsyncStream.makeStream(of: UDPMessage.self, bufferingPolicy: .unbounded)