Skip to content

Removed ObjC class exports #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ypopovych wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Removed ObjC class exports #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Kronos.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
26447D7D1D6E54D400159BEE /* DNSResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26447D741D6E54D400159BEE /* DNSResolver.swift */; };
26447D7E1D6E54D400159BEE /* InternetAddress.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26447D751D6E54D400159BEE /* InternetAddress.swift */; };
26447D7F1D6E54D400159BEE /* Data+Bytes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26447D761D6E54D400159BEE /* Data+Bytes.swift */; };
26447D801D6E54D400159BEE /* NSTimer+ClosureKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26447D771D6E54D400159BEE /* NSTimer+ClosureKit.swift */; };
26447D811D6E54D400159BEE /* NTPClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26447D781D6E54D400159BEE /* NTPClient.swift */; };
26447D821D6E54D400159BEE /* NTPPacket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26447D791D6E54D400159BEE /* NTPPacket.swift */; };
26447D831D6E54D400159BEE /* NTPProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26447D7A1D6E54D400159BEE /* NTPProtocol.swift */; };
Expand Down Expand Up @@ -41,7 +40,6 @@
26447D741D6E54D400159BEE /* DNSResolver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DNSResolver.swift; sourceTree = "<group>"; };
26447D751D6E54D400159BEE /* InternetAddress.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InternetAddress.swift; sourceTree = "<group>"; };
26447D761D6E54D400159BEE /* Data+Bytes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Data+Bytes.swift"; sourceTree = "<group>"; };
26447D771D6E54D400159BEE /* NSTimer+ClosureKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSTimer+ClosureKit.swift"; sourceTree = "<group>"; };
26447D781D6E54D400159BEE /* NTPClient.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NTPClient.swift; sourceTree = "<group>"; };
26447D791D6E54D400159BEE /* NTPPacket.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NTPPacket.swift; sourceTree = "<group>"; };
26447D7A1D6E54D400159BEE /* NTPProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NTPProtocol.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -118,7 +116,6 @@
26447D741D6E54D400159BEE /* DNSResolver.swift */,
26447D751D6E54D400159BEE /* InternetAddress.swift */,
26447D761D6E54D400159BEE /* Data+Bytes.swift */,
26447D771D6E54D400159BEE /* NSTimer+ClosureKit.swift */,
26447D781D6E54D400159BEE /* NTPClient.swift */,
26447D791D6E54D400159BEE /* NTPPacket.swift */,
26447D7A1D6E54D400159BEE /* NTPProtocol.swift */,
Expand Down Expand Up @@ -249,7 +246,6 @@
26447D7F1D6E54D400159BEE /* Data+Bytes.swift in Sources */,
26447D841D6E54D400159BEE /* TimeFreeze.swift in Sources */,
26447D821D6E54D400159BEE /* NTPPacket.swift in Sources */,
26447D801D6E54D400159BEE /* NSTimer+ClosureKit.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
16 changes: 6 additions & 10 deletions Sources/DNSResolver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,29 +51,25 @@ final class DNSResolver {
retain: nil, release: nil, copyDescription: kCopyNoOperation)

let hostReference = CFHostCreateWithName(kCFAllocatorDefault, host as CFString).takeUnretainedValue()
resolver.timer = Timer.scheduledTimer(timeInterval: timeout, target: resolver,
selector: #selector(DNSResolver.onTimeout),
userInfo: hostReference, repeats: false)

resolver.timer = Timer.scheduledTimer(withTimeInterval: timeout, repeats: false) { [unowned resolver] _ in
resolver.onTimeout(hostReference: hostReference)
}

CFHostSetClient(hostReference, callback, &clientContext)
CFHostScheduleWithRunLoop(hostReference, CFRunLoopGetMain(), CFRunLoopMode.commonModes.rawValue)
CFHostStartInfoResolution(hostReference, .addresses, nil)
}

@objc
private func onTimeout() {
private func onTimeout(hostReference: CFHost) {
defer {
self.completion?([])
self.timer = nil

// Manually release the previously retained self.
Unmanaged.passUnretained(self).release()
}

guard let userInfo = self.timer?.userInfo else {
return
}

let hostReference = unsafeBitCast(userInfo as AnyObject, to: CFHost.self)
CFHostCancelInfoResolution(hostReference, .addresses)
CFHostUnscheduleFromRunLoop(hostReference, CFRunLoopGetMain(), CFRunLoopMode.commonModes.rawValue)
CFHostSetClient(hostReference, nil, nil)
Expand Down
52 changes: 0 additions & 52 deletions Sources/NSTimer+ClosureKit.swift
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Sources/NTPClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ final class NTPClient {
completion: UnsafeMutableRawPointer(retainedCallback.toOpaque())
)

timer = BlockTimer.scheduledTimer(withTimeInterval: timeout, repeated: true) { _ in
timer = Timer.scheduledTimer(withTimeInterval: timeout, repeats: true) { _ in
bridgeCallback(nil, TimeInterval.infinity)
retainedCallback.release()

Expand Down
2 changes: 1 addition & 1 deletion Tests/KronosTests/DNSResolverTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ final class DNSResolverTests: XCTestCase {

func testResolveOneIP() {
let expectation = self.expectation(description: "Query host's DNS for a single IP")
DNSResolver.resolve(host: "test.com") { addresses in
DNSResolver.resolve(host: "httpbin.net") { addresses in
XCTAssertEqual(addresses.count, 1)
expectation.fulfill()
}
Expand Down