Drop CommonServerImplProxy (#691)
diff --git a/lib/src/common_server_impl.dart b/lib/src/common_server_impl.dart
index 214d5a7..b4108ca 100644
--- a/lib/src/common_server_impl.dart
+++ b/lib/src/common_server_impl.dart
@@ -8,10 +8,8 @@
import 'dart:convert';
import 'package:crypto/crypto.dart';
-import 'package:http/http.dart' as http;
import 'package:logging/logging.dart';
import 'package:pedantic/pedantic.dart';
-import 'package:protobuf/protobuf.dart' as $pb;
import '../version.dart';
import 'analysis_servers.dart';
@@ -34,133 +32,6 @@
String get version;
}
-class CommonServerImplProxy implements CommonServerImpl {
- const CommonServerImplProxy(this._proxyTarget);
- final String _proxyTarget;
- final bool _nullSafety = false;
-
- Future<R> _postToProxy<R extends $pb.GeneratedMessage>(
- String url, $pb.GeneratedMessage request, R responseProto) async {
- final proxyResponse = http.post(url,
- headers: {'Content-Type': 'application/json; charset=utf-8'},
- body: _jsonEncoder.convert(request.toProto3Json()));
-
- return proxyResponse.then((response) async {
- if (response.statusCode == 200) {
- return responseProto
- ..mergeFromProto3Json(JsonDecoder().convert(response.body));
- } else {
- final err = proto.BadRequest.create()
- ..mergeFromProto3Json(JsonDecoder().convert(response.body));
- throw BadRequest(err.error.message);
- }
- });
- }
-
- @override
- Future<proto.AnalysisResults> analyze(proto.SourceRequest request) {
- final url = '${_proxyTarget}api/dartservices/v2/analyze';
- return _postToProxy(url, request, proto.AnalysisResults.create());
- }
-
- @override
- Future<proto.AssistsResponse> assists(proto.SourceRequest request) {
- final url = '${_proxyTarget}api/dartservices/v2/assists';
- return _postToProxy(url, request, proto.AssistsResponse.create());
- }
-
- @override
- Future<proto.CompileResponse> compile(proto.CompileRequest request) {
- final url = '${_proxyTarget}api/dartservices/v2/compile';
- return _postToProxy(url, request, proto.CompileResponse.create());
- }
-
- @override
- Future<proto.CompileDDCResponse> compileDDC(proto.CompileDDCRequest request) {
- final url = '${_proxyTarget}api/dartservices/v2/compileDDC';
- return _postToProxy(url, request, proto.CompileDDCResponse.create());
- }
-
- @override
- Future<proto.CompleteResponse> complete(proto.SourceRequest request) {
- final url = '${_proxyTarget}api/dartservices/v2/complete';
- return _postToProxy(url, request, proto.CompleteResponse.create());
- }
-
- @override
- Future<proto.DocumentResponse> document(proto.SourceRequest request) {
- final url = '${_proxyTarget}api/dartservices/v2/document';
- return _postToProxy(url, request, proto.DocumentResponse.create());
- }
-
- @override
- Future<proto.FixesResponse> fixes(proto.SourceRequest request) {
- final url = '${_proxyTarget}api/dartservices/v2/fixes';
- return _postToProxy(url, request, proto.FixesResponse.create());
- }
-
- @override
- Future<proto.FormatResponse> format(proto.SourceRequest request) {
- final url = '${_proxyTarget}api/dartservices/v2/format';
- return _postToProxy(url, request, proto.FormatResponse.create());
- }
-
- @override
- Future<proto.VersionResponse> version(proto.VersionRequest request) {
- final url = '${_proxyTarget}api/dartservices/v2/version';
- return _postToProxy(url, request, proto.VersionResponse.create());
- }
-
- @override
- Future<String> _checkCache(String query) => null;
-
- @override
- Future<proto.CompileDDCResponse> _compileDDC(String source) => null;
-
- @override
- Future<proto.CompileResponse> _compileDart2js(String source,
- {bool returnSourceMap = false}) =>
- null;
-
- @override
- Future<void> _setCache(String query, String result) => null;
-
- @override
- bool get analysisServersRunning => true;
-
- @override
- Future<void> init() => null;
-
- @override
- bool get isHealthy => true;
-
- @override
- bool get isRestarting => false;
-
- @override
- Future<dynamic> shutdown() => null;
-
- @override
- AnalysisServersWrapper get _analysisServers => null;
-
- @override
- Compiler get _compiler => null;
-
- @override
- ServerCache get _cache => null;
-
- @override
- ServerContainer get _container => null;
-
- @override
- set _analysisServers(AnalysisServersWrapper analysisServers) => null;
-
- @override
- set _compiler(Compiler compiler) => null;
-}
-
-final JsonEncoder _jsonEncoder = const JsonEncoder.withIndent(' ');
-
class CommonServerImpl {
final ServerContainer _container;
final ServerCache _cache;
diff --git a/pubspec.lock b/pubspec.lock
index e667b2d..6cbbbfc 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -42,7 +42,7 @@
name: bazel_worker
url: "https://pub.dartlang.org"
source: hosted
- version: "0.1.25"
+ version: "1.0.0"
boolean_selector:
dependency: transitive
description:
@@ -63,7 +63,7 @@
name: build_config
url: "https://pub.dartlang.org"
source: hosted
- version: "0.4.5"
+ version: "0.4.6"
build_daemon:
dependency: transitive
description:
@@ -98,14 +98,14 @@
name: built_collection
url: "https://pub.dartlang.org"
source: hosted
- version: "4.3.2"
+ version: "5.0.0"
built_value:
dependency: transitive
description:
name: built_value
url: "https://pub.dartlang.org"
source: hosted
- version: "7.1.0"
+ version: "8.0.4"
charcode:
dependency: transitive
description:
@@ -154,7 +154,7 @@
name: convert
url: "https://pub.dartlang.org"
source: hosted
- version: "2.1.1"
+ version: "3.0.0"
coverage:
dependency: "direct dev"
description:
@@ -168,7 +168,7 @@
name: crypto
url: "https://pub.dartlang.org"
source: hosted
- version: "2.1.5"
+ version: "3.0.1"
dart_style:
dependency: transitive
description:
@@ -189,7 +189,7 @@
name: expected_output
url: "https://pub.dartlang.org"
source: hosted
- version: "1.2.2"
+ version: "2.0.0"
file:
dependency: transitive
description:
@@ -203,7 +203,7 @@
name: fixnum
url: "https://pub.dartlang.org"
source: hosted
- version: "0.10.11"
+ version: "1.0.0"
glob:
dependency: transitive
description:
@@ -301,7 +301,7 @@
name: mime
url: "https://pub.dartlang.org"
source: hosted
- version: "0.9.7"
+ version: "1.0.0"
mock_request:
dependency: "direct dev"
description:
@@ -350,14 +350,14 @@
name: protobuf
url: "https://pub.dartlang.org"
source: hosted
- version: "1.1.3"
+ version: "2.0.0"
pub_semver:
dependency: transitive
description:
name: pub_semver
url: "https://pub.dartlang.org"
source: hosted
- version: "1.4.4"
+ version: "2.0.0"
pubspec_parse:
dependency: transitive
description:
@@ -371,7 +371,7 @@
name: quiver
url: "https://pub.dartlang.org"
source: hosted
- version: "2.1.5"
+ version: "3.0.1"
shelf:
dependency: "direct main"
description:
@@ -420,7 +420,7 @@
name: source_gen
url: "https://pub.dartlang.org"
source: hosted
- version: "0.9.10+2"
+ version: "0.9.10+3"
source_map_stack_trace:
dependency: transitive
description:
@@ -525,14 +525,14 @@
name: vm_service
url: "https://pub.dartlang.org"
source: hosted
- version: "5.5.0"
+ version: "6.2.0"
watcher:
dependency: transitive
description:
name: watcher
url: "https://pub.dartlang.org"
source: hosted
- version: "0.9.7+15"
+ version: "1.0.0"
web_socket_channel:
dependency: transitive
description:
@@ -553,6 +553,6 @@
name: yaml
url: "https://pub.dartlang.org"
source: hosted
- version: "2.2.1"
+ version: "3.1.0"
sdks:
dart: ">=2.12.0 <3.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 80d041b..dfb0175 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -9,15 +9,15 @@
analysis_server_lib: ^0.1.4
analyzer: ^0.41.2
args: ^2.0.0
- bazel_worker: ^0.1.23
- crypto: ^2.0.0
+ bazel_worker: ^1.0.0
+ crypto: ^3.0.1
dartis: ^0.5.0
http: ^0.12.0
logging: ^0.11.0
meta: ^1.1.8
path: ^1.6.2
- protobuf: ^1.0.1
- quiver: ^2.0.3
+ protobuf: ^2.0.0
+ quiver: ^3.0.1
shelf: ^0.7.5
shelf_router: ^0.7.0+1
@@ -26,7 +26,7 @@
build_runner: ^1.10.6
codemirror: ^0.5.6
coverage: ^0.15.2
- expected_output: ^1.2.0
+ expected_output: ^2.0.0
grinder: ^0.9.0
mock_request: ^1.0.7
pedantic: ^1.11.0
diff --git a/tool/grind.dart b/tool/grind.dart
index 4162143..1200768 100644
--- a/tool/grind.dart
+++ b/tool/grind.dart
@@ -50,18 +50,6 @@
arguments: ['bin/server_dev.dart', '--port', '8084', '--null-safety']);
}
-@Task()
-@Depends(buildStorageArtifacts)
-Future<void> serveWithProxyTarget() async {
- await runWithLogging(Platform.executable, arguments: [
- 'bin/server_dev.dart',
- '--port',
- '8082',
- '--proxy-target',
- 'https://v1.api.dartpad.dev/'
- ]);
-}
-
const _dartImageName = 'google/dart';
final _dockerVersionMatcher = RegExp('^FROM $_dartImageName:(.*)\$');
const _dockerFileName = 'cloud_run.Dockerfile';
