anlicheng/punchnet-macos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix superClient

Browse Source
This commit is contained in:
anlicheng 2026-05-27 20:16:26 +08:00
parent e7f58dce03
commit 2618ac3d05
1 changed files with 24 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
Tun/Super/SDLSuperClient.swift
View File

@ -62,42 +62,17 @@ final class SDLSuperClient: @unchecked Sendable {
return
}
let stateStream = self.makeStateStream()
defer {
self.stop()
}
let stateStream = Self.makeStateStream(for: self.connection)
let promise = AsyncPromise<Bool>()
self.connection.start(queue: self.queue)
try await withTaskCancellationHandler {
try await withThrowingTaskGroup { group in
group.addTask {
do {
for try await state in stateStream {
switch state {
case .ready:
await promise.succeed(true)
default:
()
}
}
} catch let err {
await promise.fail(err)
throw err
}
}
group.addTask {
_ = try await promise.value()
try Task.checkCancellation()
try await self.readLoop()
}
try await group.next()
}
self.connection.start(queue: self.queue)
try await self.waitUntilReady(stateStream)
try await self.readLoop()
} onCancel: {
self.stop()
self.connection.cancel()
}
}
@ -113,24 +88,36 @@ final class SDLSuperClient: @unchecked Sendable {
preconditionFailure("invalid super server IP: \(ip)")
}
private static func makeStateStream(for connection: NWConnection) -> AsyncThrowingStream<NWConnection.State, Error> {
private func makeStateStream() -> AsyncThrowingStream<NWConnection.State, Error> {
let connection = self.connection
return AsyncThrowingStream(bufferingPolicy: .bufferingNewest(16)) { continuation in
connection.stateUpdateHandler = { state in
connection.stateUpdateHandler = { [weak self] state in
SDLLogger.log("[SDLSuperClient] new state: \(state)", for: .debug)
switch state {
case .failed(let error):
continuation.finish(throwing: error)
let wrappedError = SDLSuperError.connectionFailed(error)
self?.finishMessageStream(throwing: wrappedError)
continuation.finish(throwing: wrappedError)
case .cancelled:
self?.finishMessageStream(throwing: SDLSuperError.connectionCancelled)
continuation.finish(throwing: SDLSuperError.connectionCancelled)
default:
continuation.yield(state)
}
}
}
}
continuation.onTermination = { _ in
connection.stateUpdateHandler = nil
private func waitUntilReady(_ stateStream: AsyncThrowingStream<NWConnection.State, Error>) async throws {
for try await state in stateStream {
try Task.checkCancellation()
if case .ready = state {
return
}
}
throw SDLSuperError.connectionCancelled
}
private func readLoop() async throws {