Release 0.1.2 with network reachability.

Author: Alex Rupérez

CHANGELOG.md

@@ -1,8 +1,13 @@
+# Release 0.1.2
+
+- [x] Network reachability
+- [x] HTTP body bug fixed
+
 # Release 0.1.1
 
 - [x] [Alamofire](https://github.com/Alamofire/Alamofire) Implementation
 - [x] [Moya](https://github.com/Moya/Moya)Provider Compatible
 
 # Release 0.1.0
 
-- [x] First public release.
+- [x] First public release

Core/NetReachability.swift

@@ -0,0 +1,208 @@
+//
+//  NetReachability.swift
+//  Net
+//
+//  Created by Alex Rupérez on 25/4/17.
+//
+//
+
+#if !os(watchOS)
+import SystemConfiguration
+
+public class NetReachability {
+
+    public enum Connection {
+        case ethernetOrWiFi, wwan
+    }
+
+    public enum Status {
+        case unknown, unreachable, reachable(Connection)
+    }
+
+    public typealias ReachabilityClosure = (Status) -> Swift.Void
+
+    public static let shared = NetReachability()
+
+    public var reachable: Bool { return reachableWWAN || reachableEthernetOrWiFi }
+
+    public var reachableWWAN: Bool { return current == .reachable(.wwan) }
+
+    public var reachableEthernetOrWiFi: Bool { return current == .reachable(.ethernetOrWiFi) }
+
+    public var queue = DispatchQueue.main
+
+    public var listener: ReachabilityClosure?
+
+    public var current: Status {
+        guard let flags = self.flags else {
+            return .unknown
+        }
+        return status(flags)
+    }
+
+    private var flags: SCNetworkReachabilityFlags? {
+        var flags = SCNetworkReachabilityFlags()
+        guard SCNetworkReachabilityGetFlags(reachability, &flags) else {
+            return nil
+        }
+        return flags
+    }
+
+    private let reachability: SCNetworkReachability
+    private var previous: SCNetworkReachabilityFlags
+
+    public convenience init?() {
+        var address = sockaddr_in()
+        address.sin_len = UInt8(MemoryLayout<sockaddr_in>.size)
+        address.sin_family = sa_family_t(AF_INET)
+
+        guard let reachability = withUnsafePointer(to: &address, { pointer in
+            return pointer.withMemoryRebound(to: sockaddr.self, capacity: MemoryLayout<sockaddr>.size) {
+                return SCNetworkReachabilityCreateWithAddress(nil, $0)
+            }
+        }) else {
+            return nil
+        }
+
+        self.init(reachability)
+    }
+
+    public convenience init?(_ host: String) {
+        guard let reachability = SCNetworkReachabilityCreateWithName(nil, host) else {
+            return nil
+        }
+
+        self.init(reachability)
+    }
+
+    private init(_ reachability: SCNetworkReachability) {
+        self.reachability = reachability
+        self.previous = SCNetworkReachabilityFlags()
+    }
+
+    deinit {
+        stop()
+    }
+
+    @discardableResult public func start() -> Bool {
+        var context = SCNetworkReachabilityContext()
+        context.info = Unmanaged.passUnretained(self).toOpaque()
+
+        let callbackEnabled = SCNetworkReachabilitySetCallback(reachability, { (_, flags, info) in
+                let reachability = Unmanaged<NetReachability>.fromOpaque(info!).takeUnretainedValue()
+                reachability.notify(flags)
+        }, &context)
+
+        let queueEnabled = SCNetworkReachabilitySetDispatchQueue(reachability, queue)
+
+        queue.async {
+            self.previous = SCNetworkReachabilityFlags()
+            self.notify(self.flags ?? SCNetworkReachabilityFlags())
+        }
+
+        return callbackEnabled && queueEnabled
+    }
+
+    public func stop() {
+        SCNetworkReachabilitySetCallback(reachability, nil, nil)
+        SCNetworkReachabilitySetDispatchQueue(reachability, nil)
+    }
+
+    func notify(_ flags: SCNetworkReachabilityFlags) {
+        guard previous != flags else {
+            return
+        }
+
+        previous = flags
+        listener?(status(flags))
+    }
+
+    func status(_ flags: SCNetworkReachabilityFlags) -> Status {
+        guard flags.contains(.reachable) else {
+            return .unreachable
+        }
+
+        var networkStatus: Status = .unreachable
+
+        if !flags.contains(.connectionRequired) {
+            networkStatus = .reachable(.ethernetOrWiFi)
+        }
+
+        if flags.contains(.connectionOnDemand) || flags.contains(.connectionOnTraffic) {
+            if !flags.contains(.interventionRequired) {
+                networkStatus = .reachable(.ethernetOrWiFi)
+            }
+        }
+
+        #if os(iOS)
+        if flags.contains(.isWWAN) {
+            networkStatus = .reachable(.wwan)
+        }
+        #endif
+
+        return networkStatus
+    }
+
+}
+
+extension NetReachability.Status: Equatable {
+
+    public static func ==(lhs: NetReachability.Status, rhs: NetReachability.Status) -> Bool {
+        switch (lhs, rhs) {
+        case (.unknown, .unknown):
+            return true
+        case (.unreachable, .unreachable):
+            return true
+        case let (.reachable(lhsConnectionType), .reachable(rhsConnectionType)):
+            return lhsConnectionType == rhsConnectionType
+        default:
+            return false
+        }
+    }
+
+}
+
+extension NetReachability.Status: CustomStringConvertible {
+
+    public var description: String {
+        switch self {
+        case .reachable(let connection):
+            return "Reachable: \(connection)"
+        case .unreachable:
+            return "Unreachable"
+        default:
+            return "Unknown"
+        }
+    }
+    
+}
+
+extension NetReachability.Status: CustomDebugStringConvertible {
+
+    public var debugDescription: String {
+        return description
+    }
+
+}
+
+extension NetReachability.Connection: CustomStringConvertible {
+
+    public var description: String {
+        switch self {
+        case .ethernetOrWiFi:
+            return "Ethernet/WiFi"
+        default:
+            return "WWAN"
+        }
+    }
+    
+}
+
+extension NetReachability.Connection: CustomDebugStringConvertible {
+
+    public var debugDescription: String {
+        return description
+    }
+
+}
+#endif

Example/Info.plist

@@ -2,11 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-	</dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -22,9 +17,14 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>1.0</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>

Net.xcodeproj/project.pbxproj

@@ -52,6 +52,10 @@
 		81ACB7E71E84020F006D05DD /* NetContentType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81ACB7E21E83D0C8006D05DD /* NetContentType.swift */; };
 		81ACB8041E85443F006D05DD /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 81ACB8021E85443F006D05DD /* Info.plist */; };
 		81ACB8061E854565006D05DD /* NetRequestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81ACB8031E85443F006D05DD /* NetRequestTests.swift */; };
+		81D1C30E1EAF965C008DB282 /* NetReachability.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D1C30D1EAF965C008DB282 /* NetReachability.swift */; };
+		81D1C30F1EAF965C008DB282 /* NetReachability.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D1C30D1EAF965C008DB282 /* NetReachability.swift */; };
+		81D1C3101EAF965C008DB282 /* NetReachability.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D1C30D1EAF965C008DB282 /* NetReachability.swift */; };
+		81D1C3111EAF965C008DB282 /* NetReachability.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D1C30D1EAF965C008DB282 /* NetReachability.swift */; };
 		C588218FED700E8243A6592A /* Pods_macOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F272790255D2800FEC64E9AC /* Pods_macOS.framework */; };
 		D51B42421E9D74AE0029620C /* NetCacheControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = D51B42411E9D74AE0029620C /* NetCacheControl.swift */; };
 		D51B42431E9D74AE0029620C /* NetCacheControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = D51B42411E9D74AE0029620C /* NetCacheControl.swift */; };
@@ -254,6 +258,7 @@
 		81ACB7E21E83D0C8006D05DD /* NetContentType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetContentType.swift; sourceTree = "<group>"; };
 		81ACB8021E85443F006D05DD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		81ACB8031E85443F006D05DD /* NetRequestTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetRequestTests.swift; sourceTree = "<group>"; };
+		81D1C30D1EAF965C008DB282 /* NetReachability.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetReachability.swift; sourceTree = "<group>"; };
 		9F7D88A9A8889F4F28FF0F2E /* Pods_tvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_tvOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B9AE96E101962D64F0C19898 /* Pods-watchOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-watchOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-watchOS/Pods-watchOS.release.xcconfig"; sourceTree = "<group>"; };
 		BDEBF5187C4616AAB70C6601 /* Pods-watchOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-watchOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-watchOS/Pods-watchOS.debug.xcconfig"; sourceTree = "<group>"; };
@@ -513,6 +518,7 @@
 				D5468BE91EAD3CAF00E1354D /* NetResponse+Cached​URLResponse.swift */,
 				D579EE681EAE813A00A2F311 /* NetResponse+HTTPURLResponse.swift */,
 				818FC92C1E82BFD800FEC5A3 /* NetError.swift */,
+				81D1C30D1EAF965C008DB282 /* NetReachability.swift */,
 			);
 			path = Core;
 			sourceTree = "<group>";
@@ -1007,6 +1013,7 @@
 			files = (
 				D579EE111EAE3AF500A2F311 /* NetAlamofire.swift in Sources */,
 				818FC9341E82C26200FEC5A3 /* NetResponse.swift in Sources */,
+				81D1C30E1EAF965C008DB282 /* NetReachability.swift in Sources */,
 				D579EE301EAE7E3200A2F311 /* NetAlamofire+Download.swift in Sources */,
 				D5468BE51EAD3C5E00E1354D /* NetRequest+URLRequest.swift in Sources */,
 				D579EE7B1EAE8E1C00A2F311 /* NetURLSession+Upload.swift in Sources */,
@@ -1054,6 +1061,7 @@
 			files = (
 				D579EE121EAE3AF500A2F311 /* NetAlamofire.swift in Sources */,
 				818FC9351E82C26300FEC5A3 /* NetResponse.swift in Sources */,
+				81D1C30F1EAF965C008DB282 /* NetReachability.swift in Sources */,
 				D579EE311EAE7E3200A2F311 /* NetAlamofire+Download.swift in Sources */,
 				D5468BE61EAD3C5E00E1354D /* NetRequest+URLRequest.swift in Sources */,
 				D579EE831EAE8E1D00A2F311 /* NetURLSession+Upload.swift in Sources */,
@@ -1093,6 +1101,7 @@
 			files = (
 				D579EE131EAE3AF500A2F311 /* NetAlamofire.swift in Sources */,
 				818FC9361E82C26400FEC5A3 /* NetResponse.swift in Sources */,
+				81D1C3101EAF965C008DB282 /* NetReachability.swift in Sources */,
 				D579EE321EAE7E3200A2F311 /* NetAlamofire+Download.swift in Sources */,
 				D5468BE71EAD3C5E00E1354D /* NetRequest+URLRequest.swift in Sources */,
 				D579EE8B1EAE8E1E00A2F311 /* NetURLSession+Upload.swift in Sources */,
@@ -1132,6 +1141,7 @@
 			files = (
 				D579EE141EAE3AF500A2F311 /* NetAlamofire.swift in Sources */,
 				818FC9371E82C26400FEC5A3 /* NetResponse.swift in Sources */,
+				81D1C3111EAF965C008DB282 /* NetReachability.swift in Sources */,
 				D579EE331EAE7E3200A2F311 /* NetAlamofire+Download.swift in Sources */,
 				D5468BE81EAD3C5E00E1354D /* NetRequest+URLRequest.swift in Sources */,
 				D579EE931EAE8E1E00A2F311 /* NetURLSession+Upload.swift in Sources */,
@@ -1260,8 +1270,8 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CURRENT_PROJECT_VERSION = "$(DYLIB_CURRENT_VERSION)";
 				DEVELOPMENT_TEAM = 3VW789WSMP;
-				DYLIB_COMPATIBILITY_VERSION = 0.1.0;
-				DYLIB_CURRENT_VERSION = 0.1.1;
+				DYLIB_COMPATIBILITY_VERSION = 0.1.2;
+				DYLIB_CURRENT_VERSION = 0.1.2;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1306,8 +1316,8 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CURRENT_PROJECT_VERSION = "$(DYLIB_CURRENT_VERSION)";
 				DEVELOPMENT_TEAM = 3VW789WSMP;
-				DYLIB_COMPATIBILITY_VERSION = 0.1.0;
-				DYLIB_CURRENT_VERSION = 0.1.1;
+				DYLIB_COMPATIBILITY_VERSION = 0.1.2;
+				DYLIB_CURRENT_VERSION = 0.1.2;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;

NetClient.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'NetClient'
-  s.version          = '0.1.1'
+  s.version          = '0.1.2'
   s.summary          = 'Versatile HTTP networking library written in Swift 3.'
 
   s.homepage         = 'https://github.com/intelygenz/NetClient-iOS'

README.md

@@ -25,6 +25,7 @@
 - [x] Request and Response Interceptors
 - [x] Asynchronous and synchronous task execution
 - [x] Inference of response object type
+- [x] Network reachability
 - [x] watchOS Compatible
 - [x] tvOS Compatible
 - [x] macOS Compatible
@@ -70,12 +71,12 @@ let request = NetRequest.builder("YOUR_URL")!
             .setCache(.reloadIgnoringLocalCacheData)
             .setMethod(.PATCH)
             .setTimeout(20)
-            .setStringBody("body")
+            .setJSONBody(["foo", "bar"])
             .setContentType(.json)
             .setServiceType(.background)
             .setCacheControls([.maxAge(500)])
             .setURLParameters(["foo": "bar"])
-            .setAcceptEncodings([.gzip])
+            .setAcceptEncodings([.gzip, .deflate])
             .setBasicAuthorization(user: "user", password: "password")
             .setHeaders(["foo": "bar"])
             .build()