Fix interop tests (#651)

* Fix interop tests

* Keepalive cleanups

* Prepare for publish
This commit is contained in:
Moritz 2023-07-13 12:05:59 +02:00 committed by GitHub
parent 8886dfd24b
commit c7e07a09a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 17 additions and 13 deletions

View File

@ -1,8 +1,9 @@
## 3.2.3-wip
## 3.2.3
* Add const constructor to `GrpcError` fixing #606.
* Make `GrpcError` non-final to allow implementations.
* Only send keepalive pings on open connections.
* Fix interop tests.
## 3.2.2

View File

@ -21,6 +21,7 @@ export 'src/auth/auth_io.dart'
ServiceAccountAuthenticator;
export 'src/client/call.dart' show ClientCall;
export 'src/client/client.dart' show Client;
export 'src/client/client_keepalive.dart' show ClientKeepAliveOptions;
export 'src/client/client_transport_connector.dart'
show ClientTransportConnector;
export 'src/client/connection.dart' show ConnectionState;
@ -50,6 +51,7 @@ export 'src/server/server.dart'
ServerTlsCredentials,
ConnectionServer,
Server;
export 'src/server/server_keepalive.dart' show ServerKeepAliveOptions;
export 'src/server/service.dart' show ServiceMethod, Service;
export 'src/shared/api.dart';
export 'src/shared/codec.dart' show Codec, IdentityCodec, GzipCodec;

View File

@ -27,7 +27,7 @@ class ClientKeepAliveOptions {
const ClientKeepAliveOptions({
this.pingInterval,
this.timeout = const Duration(milliseconds: 20000),
this.timeout = const Duration(seconds: 20),
this.permitWithoutCalls = false,
});
@ -189,7 +189,7 @@ class ClientKeepAlive {
final void Function() ping;
final ClientKeepAliveOptions _options;
Duration get _pingInterval => _options.pingInterval ?? Duration(days: 365);
Duration get _pingInterval => _options.pingInterval!;
ClientKeepAlive({
required ClientKeepAliveOptions options,
@ -236,7 +236,9 @@ class ClientKeepAlive {
}
void _setState(KeepAliveEvent event) {
final newState = state.onEvent(event, this);
if (newState != null) state = newState;
if (_options.shouldSendPings) {
final newState = state.onEvent(event, this);
if (newState != null) state = newState;
}
}
}

View File

@ -90,7 +90,7 @@ class ConnectionServer {
final CodecRegistry? _codecRegistry;
final GrpcErrorHandler? _errorHandler;
final ServerKeepAliveOptions _keepAliveOptions;
final List<ServerHandler> _handlers = [];
final Map<ServerTransportConnection, List<ServerHandler>> _handlers = {};
final _connections = <ServerTransportConnection>[];
@ -117,6 +117,7 @@ class ConnectionServer {
InternetAddress? remoteAddress,
}) async {
_connections.add(connection);
_handlers[connection] = [];
// TODO(jakobr): Set active state handlers, close connection after idle
// timeout.
final onDataReceivedController = StreamController<void>();
@ -128,7 +129,7 @@ class ConnectionServer {
dataNotifier: onDataReceivedController.stream,
).handle();
connection.incomingStreams.listen((stream) {
_handlers.add(serveStream_(
_handlers[connection]!.add(serveStream_(
stream: stream,
clientCertificate: clientCertificate,
remoteAddress: remoteAddress,
@ -143,10 +144,11 @@ class ConnectionServer {
// half-closed tcp streams.
// Half-closed streams seems to not be fully supported by package:http2.
// https://github.com/dart-lang/http2/issues/42
for (var handler in _handlers) {
for (var handler in _handlers[connection]!) {
handler.cancel();
}
_connections.remove(connection);
_handlers.remove(connection);
await onDataReceivedController.close();
});
}

View File

@ -14,8 +14,7 @@ class ServerKeepAliveOptions {
final Duration minIntervalBetweenPingsWithoutData;
const ServerKeepAliveOptions({
this.minIntervalBetweenPingsWithoutData =
const Duration(milliseconds: 300000),
this.minIntervalBetweenPingsWithoutData = const Duration(minutes: 5),
this.maxBadPings = 2,
});
}

View File

@ -1,6 +1,6 @@
name: grpc
description: Dart implementation of gRPC, a high performance, open-source universal RPC framework.
version: 3.2.3-wip
version: 3.2.3
repository: https://github.com/grpc/grpc-dart

View File

@ -5,7 +5,6 @@ import 'package:grpc/grpc.dart';
import 'package:grpc/src/client/client_keepalive.dart';
import 'package:grpc/src/client/connection.dart';
import 'package:grpc/src/client/http2_connection.dart';
import 'package:grpc/src/server/server_keepalive.dart';
import 'package:http2/transport.dart';
import 'package:test/test.dart';

View File

@ -18,7 +18,6 @@ import 'dart:convert';
import 'package:grpc/grpc.dart';
import 'package:grpc/src/client/channel.dart' as base;
import 'package:grpc/src/client/client_keepalive.dart';
import 'package:grpc/src/client/http2_connection.dart';
import 'package:grpc/src/shared/message.dart';
import 'package:http2/transport.dart';