Skip to content
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.

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

feat(datastore): refactor datastore category to use APICategoryGraphQLBehavior #3666

Merged
merged 36 commits into from
Jun 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
0720707
WIP
lawmicha Mar 4, 2024
1d47dcf
DataStore compiles without SDK dependency
lawmicha Mar 6, 2024
21990cd
Merge remote-tracking branch 'origin/main' into flutter-datastore-v2
5d Apr 2, 2024
6e29d88
refactor(datastore-v2): use api plugin with async sequences
5d Apr 4, 2024
276e13f
change to use Publisher operators for auth type streams
5d Apr 10, 2024
c03a50b
add nondeterminsitc operation for better testability
5d Apr 11, 2024
ccbfd66
fix unit test cases
5d Apr 16, 2024
3079ec7
Merge remote-tracking branch 'origin/main' into 5d/api-behavior
5d Apr 24, 2024
fa72566
fix broken unit test cases of AWSAPIPlugin
5d Apr 25, 2024
b44a9ce
fix broken AWSDataStorePlugin unit test cases
5d Apr 25, 2024
becb5f5
fix OutgoingMutationQueue test case
5d Apr 26, 2024
802d706
remove unused methods
5d Apr 26, 2024
5ad91f7
fix broken test cases of SyncMutationToCloudOperationTests
5d Apr 26, 2024
1a20c33
Merge remote-tracking branch 'origin/main' into 5d/api-behavior
5d Apr 26, 2024
acbb4e8
fix broken unit test cases of API and DataStore
5d Apr 26, 2024
1265d42
Merge remote-tracking branch 'origin/main' into flutter-datastore-v2
5d Apr 26, 2024
3983918
Merge branch 'flutter-datastore-v2' into 5d/sdk-core
5d Apr 26, 2024
cd1c885
Merge remote-tracking branch 'origin/main' into flutter-datastore-v2
5d Apr 29, 2024
3110657
resolve plugins build issues (#3654)
5d Apr 30, 2024
12445f4
Merge remote-tracking branch 'origin/main' into flutter-datastore-v2
5d May 1, 2024
678941c
remove lock from SyncMutationToCloudOperation
5d May 1, 2024
0868a9f
remove test case of retryable for signOut error
5d May 1, 2024
eefd597
Merge remote-tracking branch 'origin/main' into flutter-datastore-v2
5d May 13, 2024
9df1524
resolve comments
5d May 13, 2024
7415441
fix(datastore): propagate remote mutationEvents to Hub for sync recei…
5d May 16, 2024
75b9a45
rename the package to InternalAmplifyCredentials
5d May 17, 2024
472f89c
rewrite NondeterminsticOperation constructor with makeStream
5d May 17, 2024
cb938c7
Merge remote-tracking branch 'origin/main' into flutter-datastore-v2
5d May 17, 2024
a6b1684
resolve broken test case after merging latest orgin/main
5d May 17, 2024
cf7fe31
Merge remote-tracking branch 'origin/main' into flutter-datastore-v2
5d May 21, 2024
7e5883a
feat(amplify): make GraphQLOperationType extends from String (#3719)
5d May 29, 2024
82f9ec5
refactor(datastore): new enum to represent inferred and designated au…
5d May 29, 2024
3ee1924
Merge remote-tracking branch 'origin/main' into flutter-datastore-v2
5d May 29, 2024
c0ba0ae
fix(datastore): use error description to produce clearer error info (…
5d Jun 3, 2024
1de810e
Merge remote-tracking branch 'origin/main' into flutter-datastore-v2
5d Jun 3, 2024
4ce4aa7
Merge remote-tracking branch 'origin/main' into flutter-datastore-v2
5d Jun 3, 2024
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
92 changes: 92 additions & 0 deletions .swiftpm/xcode/xcshareddata/xcschemes/Amplify-Package.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,48 @@
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "AWSPluginsSDKCore"
BuildableName = "AWSPluginsSDKCore"
BlueprintName = "AWSPluginsSDKCore"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "AmplifyCredentials"
BuildableName = "AmplifyCredentials"
BlueprintName = "AmplifyCredentials"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "InternalAmplifyCredentials"
BuildableName = "InternalAmplifyCredentials"
BlueprintName = "InternalAmplifyCredentials"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
Expand Down Expand Up @@ -741,6 +783,56 @@
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "AmplifyNetworkUnitTests"
BuildableName = "AmplifyNetworkUnitTests"
BlueprintName = "AmplifyNetworkUnitTests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "InternalAmplifyNetworkUnitTests"
BuildableName = "InternalAmplifyNetworkUnitTests"
BlueprintName = "InternalAmplifyNetworkUnitTests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "AWSPluginsSDKCoreTests"
BuildableName = "AWSPluginsSDKCoreTests"
BlueprintName = "AWSPluginsSDKCoreTests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "AmplifyCredentialsTests"
BuildableName = "AmplifyCredentialsTests"
BlueprintName = "AmplifyCredentialsTests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "InternalAmplifyCredentialsTests"
BuildableName = "InternalAmplifyCredentialsTests"
BlueprintName = "InternalAmplifyCredentialsTests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
Expand Down
100 changes: 100 additions & 0 deletions Amplify/Categories/API/Operation/NondeterminsticOperation.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
//
// Copyright Amazon.com Inc. or its affiliates.
// All Rights Reserved.
//
// SPDX-License-Identifier: Apache-2.0
//


Check warning on line 8 in Amplify/Categories/API/Operation/NondeterminsticOperation.swift

View workflow job for this annotation

GitHub Actions / run-swiftlint

Limit vertical whitespace to a single empty line; currently 2 (vertical_whitespace)
import Combine
/**
A non-deterministic operation offers multiple paths to accomplish its task.
It attempts the next path if all preceding paths have failed with an error that allows for continuation.
*/
enum NondeterminsticOperationError: Error {
case totalFailure
case cancelled
}

final class NondeterminsticOperation<T> {
lawmicha marked this conversation as resolved.
Show resolved Hide resolved
/// operation that to be eval
typealias Operation = () async throws -> T
typealias OnError = (Error) -> Bool

private let operations: AsyncStream<Operation>
private var shouldTryNextOnError: OnError = { _ in true }
private var cancellables = Set<AnyCancellable>()
private var task: Task<Void, Never>?

deinit {
cancel()
}

init(operations: AsyncStream<Operation>, shouldTryNextOnError: OnError? = nil) {
self.operations = operations
if let shouldTryNextOnError {
self.shouldTryNextOnError = shouldTryNextOnError
}
}

convenience init(
operationStream: AnyPublisher<Operation, Never>,
shouldTryNextOnError: OnError? = nil
) {
var cancellables = Set<AnyCancellable>()
let (asyncStream, continuation) = AsyncStream.makeStream(of: Operation.self)
operationStream.sink { _ in
continuation.finish()
} receiveValue: {
continuation.yield($0)
}.store(in: &cancellables)

self.init(
operations: asyncStream,
shouldTryNextOnError: shouldTryNextOnError
)
self.cancellables = cancellables
}

/// Synchronous version of executing the operations
func execute() -> Future<T, Error> {
Future { [weak self] promise in
self?.task = Task { [weak self] in
do {
if let self {
promise(.success(try await self.run()))
} else {
promise(.failure(NondeterminsticOperationError.cancelled))
}
} catch {
promise(.failure(error))
}
}
}
}

/// Asynchronous version of executing the operations
func run() async throws -> T {
for await operation in operations {
if Task.isCancelled {
throw NondeterminsticOperationError.cancelled
}
do {
return try await operation()
} catch {
if shouldTryNextOnError(error) {
continue
} else {
throw error
}
}
}
throw NondeterminsticOperationError.totalFailure
}
lawmicha marked this conversation as resolved.
Show resolved Hide resolved

/// Cancel the operation
func cancel() {
task?.cancel()
cancellables = Set<AnyCancellable>()
}
}
Loading
Loading