Skip to content
Merged
Changes from all commits
Commits
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
29 changes: 19 additions & 10 deletions packages/graphql/lib/src/core/query_manager.dart
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
import 'dart:async';

import 'package:graphql/src/utilities/helpers.dart';
import 'package:graphql/src/utilities/response.dart';
import 'package:meta/meta.dart';
import 'package:collection/collection.dart';

import 'package:gql_exec/gql_exec.dart';
import 'package:gql_link/gql_link.dart' show Link;

import 'package:graphql/src/cache/cache.dart';
import 'package:graphql/src/core/observable_query.dart';
import 'package:graphql/src/core/_base_options.dart';
import 'package:graphql/src/core/_query_write_handling.dart';
import 'package:graphql/src/core/mutation_options.dart';
import 'package:graphql/src/core/observable_query.dart';
import 'package:graphql/src/core/policies.dart';
import 'package:graphql/src/core/query_options.dart';
import 'package:graphql/src/core/query_result.dart';
import 'package:graphql/src/core/policies.dart';
import 'package:graphql/src/exceptions.dart';
import 'package:graphql/src/scheduler/scheduler.dart';

import 'package:graphql/src/core/_query_write_handling.dart';
import 'package:graphql/src/utilities/helpers.dart';
import 'package:graphql/src/utilities/response.dart';
import 'package:meta/meta.dart';

typedef DeepEqualsFn = bool Function(dynamic a, dynamic b);
typedef AsyncDeepEqualsFn = Future<bool> Function(dynamic a, dynamic b);
Expand Down Expand Up @@ -272,6 +269,7 @@ class QueryManager {
bool rereadFromCache = false;

try {
final completer = Completer<Response>();
// execute the request through the provided link(s)
Stream<Response> responseStream = link.request(request);

Expand All @@ -282,7 +280,18 @@ class QueryManager {
if (timeout case final Duration timeout) {
responseStream = responseStream.timeout(timeout);
}
response = await responseStream.first;

// Listen for the first response or error
responseStream.listen(completer.complete,
onError: (Object error, StackTrace stackTrace) {
if (!completer.isCompleted) {
// We return the first error encountered
completer.completeError(error, stackTrace);
}
});

// Await the response or error
response = await completer.future;

queryResult = mapFetchResultToQueryResult(
response,
Expand Down