1.5.0 (#18)

makoni · gevartosky · web-flow · commit 380fe3318b5a · 2024-04-08T17:56:02.000+03:00
* swift-docc-plugin 1.3.0 * async-http-client 1.19.0 * replaced deprecated .createNew with the new .singleton * Adding _find capability. (#13) * docs * tabs * renames * added test for find method with body * docs added * findError added * tests renamed * added test for find method with generic type * docs * README updated * updated dependencies * docs updated * try Swift 5.7.1 * Update build-ubuntu.yml * Swift 5.7.3 * Revert "Swift 5.7.3" This reverts commit ab8f67a. * updated dependencies * Docs updated * Delete .github/workflows/CodeQL.yml * dependencies updated * fixed when update method didn’t use passed dateEncodingStrategy * noData error added * migrating to new HTTPClientRequest from HTTPClient.Request wip * migrating to new HTTPClientRequest from HTTPClient.Request wip * migrating to new HTTPClientRequest from HTTPClient.Request wip * migrating to new HTTPClientRequest from HTTPClient.Request wip * migrating to new HTTPClientRequest from HTTPClient.Request wip * migrating to new HTTPClientRequest from HTTPClient.Request wip * … * migrating to new HTTPClientRequest from HTTPClient.Request wip * rename * tests updated * auth fixed * collect body bytes before returning response * param renamed to make keep backward compatibility with old methods * marking old find as deprecated * private * deprecated message * renames * moved deprecations * docs * docs * added Codable to CouchDBRepresentable protocol * added RowsResponse model * docs * Vapor tutorial updated * docs * docs and refactoring * docs and refactoring * Tutorials updated * docs * platforms list updated * minimum swift version 5.8 * workflow updated * Update build-ubuntu.yml * Update build-macos.yml * import NIOFoundationCompat to fix building on Ubuntu * using async-http-client from 1.21.0. Not calling http * Using HTTPClient.shared if eventLoopGroup not provided. No more calls httpClient.syncShutdown() if using shared singleton --------- Co-authored-by: Gregório Gevartosky Torrezan <greg.gevartosky@gmail.com>
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -11,7 +11,7 @@ let package = Package(
 		.library(name: "CouchDBClient", targets: ["CouchDBClient"]),
 	],
 	dependencies: [
-		.package(url: "https://github.com/swift-server/async-http-client.git", from: "1.0.0"),
+		.package(url: "https://github.com/swift-server/async-http-client", from: "1.21.0"),
 		.package(url: "https://github.com/apple/swift-docc-plugin", from: "1.3.0")
 	],
 	targets: [
diff --git a/Sources/CouchDBClient/CouchDB+Deprecated.swift b/Sources/CouchDBClient/CouchDB+Deprecated.swift
@@ -64,12 +64,14 @@ extension CouchDBClient {
 		if let eventLoopGroup = eventLoopGroup {
 			httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup))
 		} else {
-			httpClient = HTTPClient(eventLoopGroupProvider: .singleton)
+			httpClient = HTTPClient.shared
 		}
 
 		defer {
-			DispatchQueue.main.async {
-				try? httpClient.syncShutdown()
+			if eventLoopGroup != nil {
+				DispatchQueue.main.async {
+					try? httpClient.syncShutdown()
+				}
 			}
 		}
 
@@ -110,12 +112,14 @@ extension CouchDBClient {
 		if let eventLoopGroup = eventLoopGroup {
 			httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup))
 		} else {
-			httpClient = HTTPClient(eventLoopGroupProvider: .singleton)
+			httpClient = HTTPClient.shared
 		}
 
 		defer {
-			DispatchQueue.main.async {
-				try? httpClient.syncShutdown()
+			if eventLoopGroup != nil {
+				DispatchQueue.main.async {
+					try? httpClient.syncShutdown()
+				}
 			}
 		}
 
diff --git a/Sources/CouchDBClient/CouchDBClient.swift b/Sources/CouchDBClient/CouchDBClient.swift
@@ -166,12 +166,14 @@ public class CouchDBClient {
 		if let eventLoopGroup = eventLoopGroup {
 			httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup))
 		} else {
-			httpClient = HTTPClient(eventLoopGroupProvider: .singleton)
+			httpClient = HTTPClient.shared
 		}
 
 		defer {
-			DispatchQueue.main.async {
-				try? httpClient.syncShutdown()
+			if eventLoopGroup != nil {
+				DispatchQueue.main.async {
+					try? httpClient.syncShutdown()
+				}
 			}
 		}
 
@@ -214,12 +216,14 @@ public class CouchDBClient {
 		if let eventLoopGroup = eventLoopGroup {
 			httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup))
 		} else {
-			httpClient = HTTPClient(eventLoopGroupProvider: .singleton)
+			httpClient = HTTPClient.shared
 		}
 
 		defer {
-			DispatchQueue.main.async {
-				try? httpClient.syncShutdown()
+			if eventLoopGroup != nil {
+				DispatchQueue.main.async {
+					try? httpClient.syncShutdown()
+				}
 			}
 		}
 
@@ -253,12 +257,14 @@ public class CouchDBClient {
 		if let eventLoopGroup = eventLoopGroup {
 			httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup))
 		} else {
-			httpClient = HTTPClient(eventLoopGroupProvider: .singleton)
+			httpClient = HTTPClient.shared
 		}
 
 		defer {
-			DispatchQueue.main.async {
-				try? httpClient.syncShutdown()
+			if eventLoopGroup != nil {
+				DispatchQueue.main.async {
+					try? httpClient.syncShutdown()
+				}
 			}
 		}
 
@@ -312,12 +318,14 @@ public class CouchDBClient {
 		if let eventLoopGroup = eventLoopGroup {
 			httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup))
 		} else {
-			httpClient = HTTPClient(eventLoopGroupProvider: .singleton)
+			httpClient = HTTPClient.shared
 		}
 
 		defer {
-			DispatchQueue.main.async {
-				try? httpClient.syncShutdown()
+			if eventLoopGroup != nil {
+				DispatchQueue.main.async {
+					try? httpClient.syncShutdown()
+				}
 			}
 		}
 
@@ -426,12 +434,14 @@ public class CouchDBClient {
 		if let eventLoopGroup = eventLoopGroup {
 			httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup))
 		} else {
-			httpClient = HTTPClient(eventLoopGroupProvider: .singleton)
+			httpClient = HTTPClient.shared
 		}
 
 		defer {
-			DispatchQueue.main.async {
-				try? httpClient.syncShutdown()
+			if eventLoopGroup != nil {
+				DispatchQueue.main.async {
+					try? httpClient.syncShutdown()
+				}
 			}
 		}
 
@@ -580,12 +590,14 @@ public class CouchDBClient {
 		if let eventLoopGroup = eventLoopGroup {
 			httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup))
 		} else {
-			httpClient = HTTPClient(eventLoopGroupProvider: .singleton)
+			httpClient = HTTPClient.shared
 		}
 
 		defer {
-			DispatchQueue.main.async {
-				try? httpClient.syncShutdown()
+			if eventLoopGroup != nil {
+				DispatchQueue.main.async {
+					try? httpClient.syncShutdown()
+				}
 			}
 		}
 
@@ -661,12 +673,14 @@ public class CouchDBClient {
 		if let eventLoopGroup = eventLoopGroup {
 			httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup))
 		} else {
-			httpClient = HTTPClient(eventLoopGroupProvider: .singleton)
+			httpClient = HTTPClient.shared
 		}
 		
 		defer {
-			DispatchQueue.main.async {
-				try? httpClient.syncShutdown()
+			if eventLoopGroup != nil {
+				DispatchQueue.main.async {
+					try? httpClient.syncShutdown()
+				}
 			}
 		}
 
@@ -803,12 +817,14 @@ public class CouchDBClient {
 		if let eventLoopGroup = eventLoopGroup {
 			httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup))
 		} else {
-			httpClient = HTTPClient(eventLoopGroupProvider: .singleton)
+			httpClient = HTTPClient.shared
 		}
 
 		defer {
-			DispatchQueue.main.async {
-				try? httpClient.syncShutdown()
+			if eventLoopGroup != nil {
+				DispatchQueue.main.async {
+					try? httpClient.syncShutdown()
+				}
 			}
 		}
 
@@ -915,12 +931,14 @@ public class CouchDBClient {
 		if let eventLoopGroup = eventLoopGroup {
 			httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup))
 		} else {
-			httpClient = HTTPClient(eventLoopGroupProvider: .singleton)
+			httpClient = HTTPClient.shared
 		}
 
 		defer {
-			DispatchQueue.main.async {
-				try? httpClient.syncShutdown()
+			if eventLoopGroup != nil {
+				DispatchQueue.main.async {
+					try? httpClient.syncShutdown()
+				}
 			}
 		}
 
@@ -1006,12 +1024,14 @@ internal extension CouchDBClient {
 		if let eventLoopGroup = eventLoopGroup {
 			httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup))
 		} else {
-			httpClient = HTTPClient(eventLoopGroupProvider: .singleton)
+			httpClient = HTTPClient.shared
 		}
 
 		defer {
-			DispatchQueue.main.async {
-				try? httpClient.syncShutdown()
+			if eventLoopGroup != nil {
+				DispatchQueue.main.async {
+					try? httpClient.syncShutdown()
+				}
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -64,12 +64,14 @@ extension CouchDBClient {`
`64`	`64`	`if let eventLoopGroup = eventLoopGroup {`
`65`	`65`	`httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup))`
`66`	`66`	`} else {`
`67`		`- httpClient = HTTPClient(eventLoopGroupProvider: .singleton)`
	`67`	`+ httpClient = HTTPClient.shared`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`defer {`
`71`		`- DispatchQueue.main.async {`
`72`		`- try? httpClient.syncShutdown()`
	`71`	`+ if eventLoopGroup != nil {`
	`72`	`+ DispatchQueue.main.async {`
	`73`	`+ try? httpClient.syncShutdown()`
	`74`	`+ }`
`73`	`75`	`}`
`74`	`76`	`}`
`75`	`77`
`@@ -110,12 +112,14 @@ extension CouchDBClient {`
`110`	`112`	`if let eventLoopGroup = eventLoopGroup {`
`111`	`113`	`httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup))`
`112`	`114`	`} else {`
`113`		`- httpClient = HTTPClient(eventLoopGroupProvider: .singleton)`
	`115`	`+ httpClient = HTTPClient.shared`
`114`	`116`	`}`
`115`	`117`
`116`	`118`	`defer {`
`117`		`- DispatchQueue.main.async {`
`118`		`- try? httpClient.syncShutdown()`
	`119`	`+ if eventLoopGroup != nil {`
	`120`	`+ DispatchQueue.main.async {`
	`121`	`+ try? httpClient.syncShutdown()`
	`122`	`+ }`
`119`	`123`	`}`
`120`	`124`	`}`
`121`	`125`
Original file line number	Diff line number	Diff line change
`@@ -166,12 +166,14 @@ public class CouchDBClient {`
`166`	`166`	`if let eventLoopGroup = eventLoopGroup {`
`167`	`167`	`httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup))`
`168`	`168`	`} else {`
`169`		`- httpClient = HTTPClient(eventLoopGroupProvider: .singleton)`
	`169`	`+ httpClient = HTTPClient.shared`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`defer {`
`173`		`- DispatchQueue.main.async {`
`174`		`- try? httpClient.syncShutdown()`
	`173`	`+ if eventLoopGroup != nil {`
	`174`	`+ DispatchQueue.main.async {`
	`175`	`+ try? httpClient.syncShutdown()`
	`176`	`+ }`
`175`	`177`	`}`
`176`	`178`	`}`
`177`	`179`
`@@ -214,12 +216,14 @@ public class CouchDBClient {`
`214`	`216`	`if let eventLoopGroup = eventLoopGroup {`
`215`	`217`	`httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup))`
`216`	`218`	`} else {`
`217`		`- httpClient = HTTPClient(eventLoopGroupProvider: .singleton)`
	`219`	`+ httpClient = HTTPClient.shared`
`218`	`220`	`}`
`219`	`221`
`220`	`222`	`defer {`
`221`		`- DispatchQueue.main.async {`
`222`		`- try? httpClient.syncShutdown()`
	`223`	`+ if eventLoopGroup != nil {`
	`224`	`+ DispatchQueue.main.async {`
	`225`	`+ try? httpClient.syncShutdown()`
	`226`	`+ }`
`223`	`227`	`}`
`224`	`228`	`}`
`225`	`229`
`@@ -253,12 +257,14 @@ public class CouchDBClient {`
`253`	`257`	`if let eventLoopGroup = eventLoopGroup {`
`254`	`258`	`httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup))`
`255`	`259`	`} else {`
`256`		`- httpClient = HTTPClient(eventLoopGroupProvider: .singleton)`
	`260`	`+ httpClient = HTTPClient.shared`
`257`	`261`	`}`
`258`	`262`
`259`	`263`	`defer {`
`260`		`- DispatchQueue.main.async {`
`261`		`- try? httpClient.syncShutdown()`
	`264`	`+ if eventLoopGroup != nil {`
	`265`	`+ DispatchQueue.main.async {`
	`266`	`+ try? httpClient.syncShutdown()`
	`267`	`+ }`
`262`	`268`	`}`
`263`	`269`	`}`
`264`	`270`
`@@ -312,12 +318,14 @@ public class CouchDBClient {`
`312`	`318`	`if let eventLoopGroup = eventLoopGroup {`
`313`	`319`	`httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup))`
`314`	`320`	`} else {`
`315`		`- httpClient = HTTPClient(eventLoopGroupProvider: .singleton)`
	`321`	`+ httpClient = HTTPClient.shared`
`316`	`322`	`}`
`317`	`323`
`318`	`324`	`defer {`
`319`		`- DispatchQueue.main.async {`
`320`		`- try? httpClient.syncShutdown()`
	`325`	`+ if eventLoopGroup != nil {`
	`326`	`+ DispatchQueue.main.async {`
	`327`	`+ try? httpClient.syncShutdown()`
	`328`	`+ }`
`321`	`329`	`}`
`322`	`330`	`}`
`323`	`331`
`@@ -426,12 +434,14 @@ public class CouchDBClient {`
`426`	`434`	`if let eventLoopGroup = eventLoopGroup {`
`427`	`435`	`httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup))`
`428`	`436`	`} else {`
`429`		`- httpClient = HTTPClient(eventLoopGroupProvider: .singleton)`
	`437`	`+ httpClient = HTTPClient.shared`
`430`	`438`	`}`
`431`	`439`
`432`	`440`	`defer {`
`433`		`- DispatchQueue.main.async {`
`434`		`- try? httpClient.syncShutdown()`
	`441`	`+ if eventLoopGroup != nil {`
	`442`	`+ DispatchQueue.main.async {`
	`443`	`+ try? httpClient.syncShutdown()`
	`444`	`+ }`
`435`	`445`	`}`
`436`	`446`	`}`
`437`	`447`
`@@ -580,12 +590,14 @@ public class CouchDBClient {`
`580`	`590`	`if let eventLoopGroup = eventLoopGroup {`
`581`	`591`	`httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup))`
`582`	`592`	`} else {`
`583`		`- httpClient = HTTPClient(eventLoopGroupProvider: .singleton)`
	`593`	`+ httpClient = HTTPClient.shared`
`584`	`594`	`}`
`585`	`595`
`586`	`596`	`defer {`
`587`		`- DispatchQueue.main.async {`
`588`		`- try? httpClient.syncShutdown()`
	`597`	`+ if eventLoopGroup != nil {`
	`598`	`+ DispatchQueue.main.async {`
	`599`	`+ try? httpClient.syncShutdown()`
	`600`	`+ }`
`589`	`601`	`}`
`590`	`602`	`}`
`591`	`603`
`@@ -661,12 +673,14 @@ public class CouchDBClient {`
`661`	`673`	`if let eventLoopGroup = eventLoopGroup {`
`662`	`674`	`httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup))`
`663`	`675`	`} else {`
`664`		`- httpClient = HTTPClient(eventLoopGroupProvider: .singleton)`
	`676`	`+ httpClient = HTTPClient.shared`
`665`	`677`	`}`
`666`	`678`
`667`	`679`	`defer {`
`668`		`- DispatchQueue.main.async {`
`669`		`- try? httpClient.syncShutdown()`
	`680`	`+ if eventLoopGroup != nil {`
	`681`	`+ DispatchQueue.main.async {`
	`682`	`+ try? httpClient.syncShutdown()`
	`683`	`+ }`
`670`	`684`	`}`
`671`	`685`	`}`
`672`	`686`
`@@ -803,12 +817,14 @@ public class CouchDBClient {`
`803`	`817`	`if let eventLoopGroup = eventLoopGroup {`
`804`	`818`	`httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup))`
`805`	`819`	`} else {`
`806`		`- httpClient = HTTPClient(eventLoopGroupProvider: .singleton)`
	`820`	`+ httpClient = HTTPClient.shared`
`807`	`821`	`}`
`808`	`822`
`809`	`823`	`defer {`
`810`		`- DispatchQueue.main.async {`
`811`		`- try? httpClient.syncShutdown()`
	`824`	`+ if eventLoopGroup != nil {`
	`825`	`+ DispatchQueue.main.async {`
	`826`	`+ try? httpClient.syncShutdown()`
	`827`	`+ }`
`812`	`828`	`}`
`813`	`829`	`}`
`814`	`830`
`@@ -915,12 +931,14 @@ public class CouchDBClient {`
`915`	`931`	`if let eventLoopGroup = eventLoopGroup {`
`916`	`932`	`httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup))`
`917`	`933`	`} else {`
`918`		`- httpClient = HTTPClient(eventLoopGroupProvider: .singleton)`
	`934`	`+ httpClient = HTTPClient.shared`
`919`	`935`	`}`
`920`	`936`
`921`	`937`	`defer {`
`922`		`- DispatchQueue.main.async {`
`923`		`- try? httpClient.syncShutdown()`
	`938`	`+ if eventLoopGroup != nil {`
	`939`	`+ DispatchQueue.main.async {`
	`940`	`+ try? httpClient.syncShutdown()`
	`941`	`+ }`
`924`	`942`	`}`
`925`	`943`	`}`
`926`	`944`
`@@ -1006,12 +1024,14 @@ internal extension CouchDBClient {`
`1006`	`1024`	`if let eventLoopGroup = eventLoopGroup {`
`1007`	`1025`	`httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup))`
`1008`	`1026`	`} else {`
`1009`		`- httpClient = HTTPClient(eventLoopGroupProvider: .singleton)`
	`1027`	`+ httpClient = HTTPClient.shared`
`1010`	`1028`	`}`
`1011`	`1029`
`1012`	`1030`	`defer {`
`1013`		`- DispatchQueue.main.async {`
`1014`		`- try? httpClient.syncShutdown()`
	`1031`	`+ if eventLoopGroup != nil {`
	`1032`	`+ DispatchQueue.main.async {`
	`1033`	`+ try? httpClient.syncShutdown()`
	`1034`	`+ }`
`1015`	`1035`	`}`
`1016`	`1036`	`}`
`1017`	`1037`