Skip to content

async/await #13

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

Draft
vamsii777 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

async/await #13

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
101 changes: 55 additions & 46 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ let package = Package(
targets: ["VaporSMTPKit"]),
],
dependencies: [
.package(url: "https://github.com/Joannis/SMTPKitten.git", "0.1.0" ..< "0.2.0"),
.package(url: "https://github.com/Joannis/SMTPKitten.git", "0.2.0" ..< "0.2.3"),
.package(url: "https://github.com/vapor/vapor.git", from: "4.0.0"),
],
targets: [
Expand Down
36 changes: 21 additions & 15 deletions Sources/VaporSMTPKit/VaporSMTPKit.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,20 @@ import Vapor
import SMTPKitten

extension Application {

public func sendMail(
_ mail: Mail,
withCredentials credentials: SMTPCredentials,
preventedDomains: Set<String> = ["example.com"]
) -> EventLoopFuture<Void> {
return sendMails([mail], withCredentials: credentials, preventedDomains: preventedDomains)
) async throws {
try await sendMails([mail], withCredentials: credentials, preventedDomains: preventedDomains)
}

public func sendMails(
_ mails: [Mail],
withCredentials credentials: SMTPCredentials,
preventedDomains: Set<String> = ["example.com"]
) -> EventLoopFuture<Void> {
) async throws {
func filterMailAddress(_ address: MailUser) -> Bool {
for domain in preventedDomains {
if address.email.contains(domain) {
Expand All @@ -25,7 +26,7 @@ extension Application {
return true
}

let mails = mails.compactMap { mail -> Mail? in
let filteredMails = mails.compactMap { mail -> Mail? in
var mail = mail

mail.to = mail.to.filter(filterMailAddress)
Expand All @@ -39,21 +40,26 @@ extension Application {
return mail
}


return SMTPClient.connect(
let client = try await SMTPClient.connect(
hostname: credentials.hostname,
port: credentials.port,
ssl: credentials.ssl,
eventLoop: self.eventLoopGroup.next()
).flatMap { client in
client.login(
user: credentials.email,
password: credentials.password
).flatMap {
let sent = mails.map(client.sendMail)
return EventLoopFuture.andAllSucceed(sent, on: self.eventLoopGroup.next())
ssl: credentials.ssl
)

try await client.login(
user: credentials.email,
password: credentials.password
)

let sent: () = await withThrowingTaskGroup(of: Void.self) { group in
for mail in filteredMails {
group.addTask {
try await client.sendMail(mail)
}
}
}

_ = sent
}
}

Expand Down