grpc
/
grpc-dart
mirror of https://github.com/grpc/grpc-dart.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Export less from grpc-web.dart (#188) 

* export less stuff from grpc-web.dart
This commit is contained in:
Sigurd Meldgaard 2019-06-11 16:24:45 +02:00 committed by GitHub
parent 8aa5b51760
commit 224b5c3fe2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 64 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/grpc.dart
View File

@ -21,27 +21,21 @@ export 'src/auth/auth.dart'
ServiceAccountAuthenticator,
JwtServiceAccountAuthenticator;
export 'src/client/call.dart' show ClientCall;
export 'src/client/call.dart' show CallOptions, ClientCall, MetadataProvider;
export 'src/client/client.dart' show Client;
export 'src/client/common.dart' show Response, ResponseStream, ResponseFuture;
export 'src/client/connection.dart' show ConnectionState;
export 'src/client/http2_channel.dart' show ClientChannel;
export 'src/client/http2_connection.dart' show ClientConnection, Http2ClientConnection;
export 'src/client/method.dart' show ClientMethod;
export 'src/client/options.dart'
show
defaultIdleTimeout,
BackoffStrategy,
defaultBackoffStrategy,
MetadataProvider,
CallOptions;
ChannelOptions;
export 'src/client/transport/http2_credentials.dart'
show
BadCertificateHandler,
allowBadCertificates,
ChannelCredentials,
ChannelOptions;
show BadCertificateHandler, allowBadCertificates, ChannelCredentials;
export 'src/server/call.dart' show ServiceCall;
export 'src/server/handler.dart' show ServerHandler;

21
lib/grpc_web.dart
View File

@ -14,29 +14,12 @@
// limitations under the License.
export 'src/auth/auth.dart'
show
BaseAuthenticator,
HttpBasedAuthenticator,
ComputeEngineAuthenticator,
JwtServiceAccountAuthenticator;
show HttpBasedAuthenticator, JwtServiceAccountAuthenticator;
export 'src/client/call.dart' show ClientCall;
export 'src/client/call.dart' show MetadataProvider, CallOptions;
export 'src/client/client.dart' show Client;
export 'src/client/common.dart' show Response, ResponseStream, ResponseFuture;
export 'src/client/method.dart' show ClientMethod;
export 'src/client/options.dart'
show
defaultIdleTimeout,
BackoffStrategy,
defaultBackoffStrategy,
ChannelOptions,
MetadataProvider,
CallOptions;
export 'src/client/transport/transport.dart';
export 'src/client/web_channel.dart' show GrpcWebClientChannel;
export 'src/shared/status.dart' show StatusCode, GrpcError;
export 'src/shared/streams.dart' show GrpcHttpEncoder, GrpcHttpDecoder;
export 'src/shared/timeout.dart' show toTimeoutString, fromTimeoutString;

2
lib/service_api.dart
View File

@ -18,10 +18,10 @@
/// Mainly intended to be imported by generated code.
library service_api;
export 'src/client/call.dart' show CallOptions;
export 'src/client/channel.dart' show ClientChannel;
export 'src/client/client.dart' show Client;
export 'src/client/common.dart' show ResponseFuture, ResponseStream;
export 'src/client/method.dart' show ClientMethod;
export 'src/client/options.dart' show CallOptions;
export 'src/server/call.dart' show ServiceCall;
export 'src/server/service.dart' show Service, ServiceMethod;

2
lib/src/auth/auth.dart
View File

@ -21,7 +21,7 @@ import 'package:googleapis_auth/src/crypto/rsa_sign.dart';
import 'package:grpc/src/shared/status.dart';
import 'package:http/http.dart' as http;
import '../client/options.dart';
import '../client/call.dart';
const _tokenExpirationThreshold = const Duration(seconds: 30);

49
lib/src/client/call.dart
View File

@ -32,6 +32,55 @@ const _reservedHeaders = const [
'user-agent',
];
/// Provides per-RPC metadata.
///
/// Metadata providers will be invoked for every RPC, and can add their own
/// metadata to the RPC. If the function returns a [Future], the RPC will await
/// completion of the returned [Future] before transmitting the request.
///
/// The metadata provider is given the current [metadata] map (possibly modified
/// by previous metadata providers) and the [uri] that is being called, and is
/// expected to modify the map before returning or before completing the
/// returned [Future].
typedef FutureOr<void> MetadataProvider(
Map<String, String> metadata, String uri);
/// Runtime options for an RPC.
class CallOptions {
final Map<String, String> metadata;
final Duration timeout;
final List<MetadataProvider> metadataProviders;
CallOptions._(this.metadata, this.timeout, this.metadataProviders);
/// Creates a [CallOptions] object.
///
/// [CallOptions] can specify static [metadata], set the [timeout], and
/// configure per-RPC metadata [providers]. The metadata [providers] are
/// invoked in order for every RPC, and can modify the outgoing metadata
/// (including metadata provided by previous providers).
factory CallOptions(
{Map<String, String> metadata,
Duration timeout,
List<MetadataProvider> providers}) {
return new CallOptions._(new Map.unmodifiable(metadata ?? {}), timeout,
new List.unmodifiable(providers ?? []));
}
factory CallOptions.from(Iterable<CallOptions> options) =>
options.fold(new CallOptions(), (p, o) => p.mergedWith(o));
CallOptions mergedWith(CallOptions other) {
if (other == null) return this;
final mergedMetadata = new Map.from(metadata)..addAll(other.metadata);
final mergedTimeout = other.timeout ?? timeout;
final mergedProviders = new List.from(metadataProviders)
..addAll(other.metadataProviders);
return new CallOptions._(new Map.unmodifiable(mergedMetadata),
mergedTimeout, new List.unmodifiable(mergedProviders));
}
}
/// An active call to a gRPC endpoint.
class ClientCall<Q, R> implements Response {
final ClientMethod<Q, R> _method;

1
lib/src/client/client.dart
View File

@ -18,7 +18,6 @@ import 'dart:async';
import 'call.dart';
import 'channel.dart';
import 'method.dart';
import 'options.dart';
/// Base class for client stubs.
class Client {

1
lib/src/client/connection.dart
View File

@ -61,4 +61,3 @@ abstract class ClientConnection {
/// made on this connection.
Future<void> terminate();
}

1
lib/src/client/http2_channel.dart
View File

@ -16,6 +16,7 @@
import 'channel.dart';
import 'connection.dart';
import 'http2_connection.dart' show Http2ClientConnection;
import 'options.dart';
import 'transport/http2_credentials.dart';
/// A channel to a virtual gRPC endpoint.

1
lib/src/client/http2_connection.dart
View File

@ -26,6 +26,7 @@ import 'call.dart';
import 'connection.dart' hide ClientConnection;
import 'connection.dart' as connection;
import 'options.dart';
import 'transport/http2_credentials.dart';
import 'transport/http2_transport.dart';
import 'transport/transport.dart';

54
lib/src/client/options.dart
View File

@ -13,8 +13,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
import 'dart:async';
import 'dart:math';
import 'transport/http2_credentials.dart';
const defaultIdleTimeout = const Duration(minutes: 5);
@ -39,57 +39,11 @@ class ChannelOptions {
final Duration idleTimeout;
final BackoffStrategy backoffStrategy;
final ChannelCredentials credentials;
const ChannelOptions({
this.credentials,
this.idleTimeout = defaultIdleTimeout,
this.backoffStrategy = defaultBackoffStrategy,
});
}
/// Provides per-RPC metadata.
///
/// Metadata providers will be invoked for every RPC, and can add their own
/// metadata to the RPC. If the function returns a [Future], the RPC will await
/// completion of the returned [Future] before transmitting the request.
///
/// The metadata provider is given the current [metadata] map (possibly modified
/// by previous metadata providers) and the [uri] that is being called, and is
/// expected to modify the map before returning or before completing the
/// returned [Future].
typedef FutureOr<void> MetadataProvider(
Map<String, String> metadata, String uri);
/// Runtime options for an RPC.
class CallOptions {
final Map<String, String> metadata;
final Duration timeout;
final List<MetadataProvider> metadataProviders;
CallOptions._(this.metadata, this.timeout, this.metadataProviders);
/// Creates a [CallOptions] object.
///
/// [CallOptions] can specify static [metadata], set the [timeout], and
/// configure per-RPC metadata [providers]. The metadata [providers] are
/// invoked in order for every RPC, and can modify the outgoing metadata
/// (including metadata provided by previous providers).
factory CallOptions(
{Map<String, String> metadata,
Duration timeout,
List<MetadataProvider> providers}) {
return new CallOptions._(new Map.unmodifiable(metadata ?? {}), timeout,
new List.unmodifiable(providers ?? []));
}
factory CallOptions.from(Iterable<CallOptions> options) =>
options.fold(new CallOptions(), (p, o) => p.mergedWith(o));
CallOptions mergedWith(CallOptions other) {
if (other == null) return this;
final mergedMetadata = new Map.from(metadata)..addAll(other.metadata);
final mergedTimeout = other.timeout ?? timeout;
final mergedProviders = new List.from(metadataProviders)
..addAll(other.metadataProviders);
return new CallOptions._(new Map.unmodifiable(mergedMetadata),
mergedTimeout, new List.unmodifiable(mergedProviders));
}
}

10
lib/src/client/transport/http2_credentials.dart
View File

@ -30,16 +30,6 @@ typedef bool BadCertificateHandler(X509Certificate certificate, String host);
/// certificates, etc.
bool allowBadCertificates(X509Certificate certificate, String host) => true;
class ChannelOptions extends options.ChannelOptions {
final ChannelCredentials credentials;
const ChannelOptions({
this.credentials,
Duration idleTimeout = options.defaultIdleTimeout,
options.BackoffStrategy backoffStrategy = options.defaultBackoffStrategy,
}) : super(idleTimeout: idleTimeout, backoffStrategy: backoffStrategy);
}
class ChannelCredentials {
final bool isSecure;
final String authority;

3
lib/src/client/transport/xhr_transport.dart
View File

@ -190,6 +190,5 @@ class XhrClientConnection extends ClientConnection {
}
@override
Future<void> shutdown() async {
}
Future<void> shutdown() async {}
}

4
lib/src/client/web_channel.dart
View File

@ -23,10 +23,8 @@ import 'transport/xhr_transport.dart';
/// A channel to a grpc-web endpoint.
class GrpcWebClientChannel extends ClientChannelBase {
final Uri uri;
ChannelOptions options;
GrpcWebClientChannel.xhr(this.uri, {this.options: const ChannelOptions()})
: super();
GrpcWebClientChannel.xhr(this.uri) : super();
@override
ClientConnection createConnection() {