Skip to content

attempt to fix #81 #92

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

Merged
InteractionEngineer merged 3 commits into from
May 14, 2026
Merged

attempt to fix #81 #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1d11d4
unvalidated fix: reduce excessive Cospend API requests when adding pr…
InteractionEngineer May 14, 2026
9574db5
fix: use switchToLatest for latest-only validation in AddProjectManua…
Copilot May 14, 2026
78aabbf
re-allow for duplicates in case of re-scan
InteractionEngineer May 14, 2026
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
49 changes: 28 additions & 21 deletions PayForMe/Views/Projects/Manual/AddProjectManualViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,10 @@ class AddProjectManualViewModel: ObservableObject {
.eraseToAnyPublisher()
}

var validatedInput: AnyPublisher<Project, Never> {
return Publishers.CombineLatest3(validatedAddress, $projectName, $projectPassword)
lazy var validatedInput: AnyPublisher<Project, Never> = {
Publishers.CombineLatest3(validatedAddress, $projectName, $projectPassword)
.debounce(for: 1, scheduler: DispatchQueue.main)
.compactMap { server, token, password in
.compactMap { server, token, password -> Project? in
if let address = server.address, address.isValidURL, !token.isEmpty, !password.isEmpty {
guard let url = URL(string: address) else { return nil }
return Project(name: token, password: password, token: token, backend: server.0, url: url)
Expand All @@ -140,28 +140,35 @@ class AddProjectManualViewModel: ObservableObject {
}
}
.removeDuplicates()
.share()
.eraseToAnyPublisher()
}

private var validatedServer: AnyPublisher<Int, Never> {
validatedInput.flatMap {
project in
Future { promise in
Task {
do {
let testedProject = try await NetworkService.shared.getProjectName(project)
self.lastProjectTestedSuccessfully = testedProject
promise(.success(200))
} catch {
promise(.success(-1))
}()

private lazy var validatedServer: AnyPublisher<Int, Never> = {
validatedInput
.map { project -> AnyPublisher<(Project?, Int), Never> in
Future<(Project?, Int), Never> { promise in
Task {
do {
let testedProject = try await NetworkService.shared.getProjectName(project)
promise(.success((testedProject, 200)))
} catch {
promise(.success((nil, -1)))
}
}
}
.eraseToAnyPublisher()
}
}
.removeDuplicates()
.receive(on: RunLoop.main)
.eraseToAnyPublisher()
}
.switchToLatest()
.receive(on: RunLoop.main)
.handleEvents(receiveOutput: { (project, _) in
self.lastProjectTestedSuccessfully = project
})
.map { (_, statusCode) in statusCode }
.removeDuplicates()
.share()
.eraseToAnyPublisher()
}()

private var errorTextPublisher: AnyPublisher<String, Never> {
validatedServer
Expand Down
3 changes: 1 addition & 2 deletions PayForMe/Views/Projects/QRCodes/AddProjectQRViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,12 @@ class AddProjectQRViewModel: ObservableObject {
.compactMap { $0 },
$name,
$passwordText
.debounce(for: 0.5, scheduler: RunLoop.main)
.debounce(for: 1, scheduler: RunLoop.main)
.compactMap { $0.isEmpty ? nil : $0 }
.removeDuplicates()
)
.map { url, token, password in
self.isTestingSubject.send(.connecting)
print("\(url) \(token) \(password)")
return Project(name: "", password: password, token: token, backend: .cospend, url: url)
}
.flatMap { project in
Expand Down
Loading