Fix swift-png compatibility issue (for CI) and clean up DNS resolution code slightly

Author: stackotter

Package.resolved

@@ -86,7 +86,7 @@ let package = Package(
     .package(url: "https://github.com/fourplusone/swift-package-zlib", from: "1.2.11"),
     .package(url: "https://github.com/stackotter/swift-image.git", branch: "master"),
     .package(url: "https://github.com/OpenCombine/OpenCombine.git", from: "0.13.0"),
-    .package(url: "https://github.com/stackotter/swift-png", revision: "2ef3b194250cf8827462fc84f36a4e0cdc471ef0"),
+    .package(url: "https://github.com/stackotter/swift-png", revision: "b11a34847192cec24fa91c23fe771e95eb2c08cc"),
     .package(url: "https://github.com/stackotter/ASN1Parser", branch: "main"),
     .package(url: "https://github.com/krzyzanowskim/CryptoSwift", from: "1.6.0"),
     .package(url: "https://github.com/Kitura/SwiftyRequest.git", from: "3.1.0"),

Sources/Core/Package.swift

@@ -142,30 +142,28 @@ public class ServerConnection {
         }
       }
 
-      // If `host` is an ip already, no need to perform DNS lookups
-      if isIp {
+      guard !isIp else {
         return (server.host, server.port ?? 25565)
-      } else {
-	      let resolver = Resolver()
-
-        // Check for SRV records if no port is specified
-        if server.port == nil {
-          do {
-            let records = try resolver.discover("_minecraft._tcp.\(server.host)")
-            if let record = records.first {
-              return (record.address, record.port.map(UInt16.init) ?? server.port ?? 25565)
-            }
-          } catch {}
-        }
+      }
 
-        // Check for regular records
-	      let records = try resolver.resolve(server.host)
-        if let record = records.first {
-          return (record.address, server.port ?? 25565)
+      // If `host` is an ip already, no need to perform DNS lookups
+      let resolver = Resolver(timeout: 10)
+
+      // Check for SRV records if no port is specified
+      if server.port == nil {
+        let records = try? resolver.discover("_minecraft._tcp.\(server.host)")
+        if let record = records?.first {
+          return (record.address, record.port.map(UInt16.init) ?? server.port ?? 25565)
         }
+      }
 
-        throw ServerConnectionError.failedToResolveHostname(hostname: server.host, nil)
+      // Check for regular records
+      let records = try resolver.resolve(server.host)
+      if let record = records.first {
+        return (record.address, server.port ?? 25565)
       }
+
+      throw ServerConnectionError.failedToResolveHostname(hostname: server.host, nil)
     } catch {
       throw ServerConnectionError.failedToResolveHostname(hostname: server.host, error)
     }