Skip to content
Merged
Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions packages/celest_cloud/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

- feat: Add `Operations.waitOperation`
- chore: Update license
- chore: Improve gRPC interface

# 0.1.4

Expand Down
93 changes: 77 additions & 16 deletions packages/celest_cloud/lib/src/cloud/cloud.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/// @docImport 'dart:io';
library;

import 'package:celest_cloud/src/cloud/authentication/authentication.dart';
import 'package:celest_cloud/src/cloud/cloud_protocol.dart';
import 'package:celest_cloud/src/cloud/cloud_protocol.grpc.dart';
Expand All @@ -15,32 +18,90 @@ import 'package:os_detect/os_detect.dart' as os;
import 'package:protobuf/protobuf.dart';

class CelestCloud {
CelestCloud({
factory CelestCloud({
required Uri uri,
Authenticator authenticator = const Authenticator.static(),
ClientType? clientType,
Logger? logger,
String? userAgent,
http.Client? httpClient,
}) : _protocol = kIsWeb
? CloudProtocolHttp(
uri: uri,
httpClient: httpClient,
authenticator: authenticator,
logger: logger,
)
: CloudProtocolGrpc(
uri: uri,
userAgent: userAgent,
authenticator: authenticator,
logger: logger,
),
}) {
return kIsWeb
? CelestCloud.http(
uri,
authenticator: authenticator,
clientType: clientType,
logger: logger,
httpClient: httpClient,
)
: CelestCloud.grpc(
uri,
authenticator: authenticator,
clientType: clientType,
logger: logger,
userAgent: userAgent,
httpClient: httpClient,
);
}

CelestCloud._({
required CloudProtocol protocol,
Uri? uri,
Authenticator authenticator = const Authenticator.static(),
ClientType? clientType,
Logger? logger,
http.Client? httpClient,
}) : _protocol = protocol,
_baseUri = uri,
_httpClient = httpClient,
_authenticator = authenticator,
_clientType = clientType ?? _defaultClientType,
_logger = logger ?? Logger('Celest.Cloud');

CelestCloud.http(
Uri uri, {
Authenticator authenticator = const Authenticator.static(),
ClientType? clientType,
Logger? logger,
http.Client? httpClient,
}) : this._(
uri: uri,
authenticator: authenticator,
protocol: CloudProtocolHttp(
uri: uri,
httpClient: httpClient,
authenticator: authenticator,
logger: logger,
),
clientType: clientType,
logger: logger,
httpClient: httpClient,
);

/// Creates a gRPC interface for Celest Cloud.
///
/// [address] must be either a [Uri] or [InternetAddress].
CelestCloud.grpc(
Object address, {
Authenticator authenticator = const Authenticator.static(),
ClientType? clientType,
String? userAgent,
Logger? logger,
http.Client? httpClient,
}) : this._(
uri: address is Uri ? address : null,
authenticator: authenticator,
protocol: CloudProtocolGrpc(
host: address,
userAgent: userAgent,
authenticator: authenticator,
logger: logger,
),
clientType: clientType,
logger: logger,
httpClient: httpClient,
);

static final _defaultClientType = kIsWeb
? ClientType.WEB
: os.isAndroid
Expand All @@ -63,7 +124,7 @@ class CelestCloud {
ProjectEnvironment(),
]);

final Uri _baseUri;
final Uri? _baseUri;
final http.Client? _httpClient;
final Authenticator _authenticator;

Expand All @@ -72,7 +133,7 @@ class CelestCloud {
final Logger _logger;

late final CloudProtocolHttp _httpProtocol = CloudProtocolHttp(
uri: _baseUri,
uri: _baseUri!,
authenticator: _authenticator,
httpClient: _httpClient,
logger: _logger,
Expand Down
31 changes: 19 additions & 12 deletions packages/celest_cloud/lib/src/cloud/cloud_protocol.grpc.dart
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,33 @@ import 'package:logging/logging.dart';

final class CloudProtocolGrpc implements CloudProtocol {
CloudProtocolGrpc({
required Uri uri,
required Object host,
required Authenticator authenticator,
String? userAgent,
Logger? logger,
}) : _channel = AuthenticatingGrpcChannel(
uri.host,
switch (host) {
final Uri uri => uri.host,
_ => host,
},
authenticator: authenticator,
options: ChannelOptions(
credentials: uri.scheme == 'http'
? const ChannelCredentials.insecure()
: const ChannelCredentials.secure(),
credentials: switch (host) {
Uri(scheme: 'https') => const ChannelCredentials.secure(),
_ => const ChannelCredentials.insecure(),
},
userAgent: userAgent ?? 'celest/dart',
),
port: uri.hasPort
? uri.port
: switch (uri.scheme) {
'http' => 80,
'https' => 443,
_ => throw Exception('Unsupported scheme: ${uri.scheme}'),
},
port: switch (host) {
final Uri uri => uri.hasPort
? uri.port
: switch (uri.scheme) {
'http' => 80,
'https' => 443,
_ => throw Exception('Unsupported scheme: ${uri.scheme}'),
},
_ => 50051,
},
),
_interceptors = [
RevokingGrpcInterceptor(
Expand Down