languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-16 01:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove deps from reloader

Browse source 
R=paulberry@google.com

Review-Url: https://codereview.chromium.org/2937983002 .
This commit is contained in:
Sigmund Cherem 2017-06-14 10:57:21 -07:00
parent e03744a740
commit 5e5e62f9d8
6 changed files with 101 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/front_end/example/incremental_reload/run.dart
View file

@ -46,7 +46,7 @@ import 'dart:io';
import 'dart:async';
import 'dart:convert' show ASCII;
import 'package:front_end/src/vm/reload.dart';
import '../../tool/vm/reload.dart';
import 'compiler_with_invalidation.dart';

96
pkg/front_end/lib/src/vm/reload.dart
View file

@ -1,96 +0,0 @@
// Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
/// A helper library to connect to an existing VM and trigger a hot-reload via
/// its service protocol.
///
/// Usage:
///
/// ```
/// var reloader = new VmReloader();
/// await reloader.reload(uriToEntryScript);
/// ...
/// await reloader.disconnect();
/// ```
library front_end.src.vm.reload;
import 'dart:async';
import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc;
import 'package:stream_channel/stream_channel.dart';
import 'package:web_socket_channel/io.dart';
/// A user API to trigger hot reloads on a running VM via the VM's service
/// protocol.
class VmReloader {
/// Port used to connect to the vm service protocol, typically 8181.
final int port;
/// An peer point used to send service protocol messages. The service
/// protocol uses JSON rpc on top of web-sockets.
json_rpc.Peer get rpc => _rpc ??= _createPeer();
json_rpc.Peer _rpc;
/// The main isolate ID of the running VM. Needed to indicate to the VM which
/// isolate to reload.
FutureOr<String> get mainId async => _mainId ??= await _computeMainId();
String _mainId;
VmReloader([this.port = 8181]);
/// Establishes the JSON rpc connection.
json_rpc.Peer _createPeer() {
StreamChannel socket =
new IOWebSocketChannel.connect('ws://127.0.0.1:$port/ws');
var peer = new json_rpc.Peer(socket);
peer.listen().then((_) {
if (VERBOSE_DEBUG) print('connection to vm-service closed');
return disconnect();
}).catchError((e) {
if (VERBOSE_DEBUG) print('error connecting to the vm-service');
return disconnect();
});
return peer;
}
/// Retrieves the ID of the main isolate using the service protocol.
Future<String> _computeMainId() async {
var vm = await rpc.sendRequest('getVM');
var isolates = vm['isolates'];
for (var isolate in isolates) {
if (isolate['name'].contains(r'$main')) {
return isolate['id'];
}
}
return isolates.first['id'];
}
/// Send a request to the VM to reload sources from [entryUri].
///
/// This will establish a connection with the VM assuming it is running on the
/// local machine and listening on [port] for service protocol requests.
///
/// The result is the JSON map received from the reload request.
Future<Map> reload(Uri entryUri) async {
var id = await mainId;
var result = await rpc.sendRequest('reloadSources', {
'isolateId': id,
'rootLibUri': entryUri.path,
});
return result;
}
/// Close any connections used to communicate with the VM.
Future disconnect() async {
if (_rpc == null) return null;
this._mainId = null;
if (!_rpc.isClosed) {
var future = _rpc.close();
_rpc = null;
return future;
}
return null;
}
}
const VERBOSE_DEBUG = false;

3
pkg/front_end/pubspec.yaml
View file

@ -14,3 +14,6 @@ dev_dependencies:
package_config: '^1.0.0'
test: ^0.12.0
test_reflective_loader: ^0.1.0
json_rpc_2: ^2.0.4
stream_channel: ^1.6.1
web_socket_channel: ^1.0.4

3
pkg/front_end/test/src/incremental/hot_reload_e2e_test.dart
View file

@ -17,11 +17,12 @@ import 'package:front_end/incremental_kernel_generator.dart';
import 'package:front_end/memory_file_system.dart';
import 'package:front_end/src/incremental/byte_store.dart';
import 'package:front_end/src/testing/hybrid_file_system.dart';
import 'package:front_end/src/vm/reload.dart';
import 'package:kernel/ast.dart';
import 'package:kernel/binary/limited_ast_to_binary.dart';
import 'package:test/test.dart';
import '../../../tool/vm/reload.dart';
main() {
IncrementalKernelGenerator compiler;
MemoryFileSystem fs;

1
pkg/front_end/test/subpackage_relationships_test.dart
View file

@ -139,7 +139,6 @@ final subpackageRules = {
'lib/src/testing': new SubpackageRules(allowedDependencies: [
'lib',
]),
'lib/src/vm': new SubpackageRules(allowedDependencies: []),
};
/// Rules for what a subpackage may depend directly on.

99
pkg/front_end/tool/vm/reload.dart
View file

@ -2,11 +2,102 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
import 'package:front_end/src/vm/reload.dart';
/// A helper library to connect to an existing VM and trigger a hot-reload via
/// its service protocol.
///
/// Usage:
///
/// ```
/// var reloader = new VmReloader();
/// await reloader.reload(uriToEntryScript);
/// ...
/// await reloader.disconnect();
/// ```
library front_end.src.vm.reload;
/// Connects to an existing VM's service protocol and issues a hot-reload
/// request. The VM must have been launched with `--observe` to enable the
/// service protocol.
import 'dart:async';
import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc;
import 'package:stream_channel/stream_channel.dart';
import 'package:web_socket_channel/io.dart';
/// A user API to trigger hot reloads on a running VM via the VM's service
/// protocol.
class VmReloader {
/// Port used to connect to the vm service protocol, typically 8181.
final int port;
/// An peer point used to send service protocol messages. The service
/// protocol uses JSON rpc on top of web-sockets.
json_rpc.Peer get rpc => _rpc ??= _createPeer();
json_rpc.Peer _rpc;
/// The main isolate ID of the running VM. Needed to indicate to the VM which
/// isolate to reload.
FutureOr<String> get mainId async => _mainId ??= await _computeMainId();
String _mainId;
VmReloader([this.port = 8181]);
/// Establishes the JSON rpc connection.
json_rpc.Peer _createPeer() {
StreamChannel socket =
new IOWebSocketChannel.connect('ws://127.0.0.1:$port/ws');
var peer = new json_rpc.Peer(socket);
peer.listen().then((_) {
if (VERBOSE_DEBUG) print('connection to vm-service closed');
return disconnect();
}).catchError((e) {
if (VERBOSE_DEBUG) print('error connecting to the vm-service');
return disconnect();
});
return peer;
}
/// Retrieves the ID of the main isolate using the service protocol.
Future<String> _computeMainId() async {
var vm = await rpc.sendRequest('getVM');
var isolates = vm['isolates'];
for (var isolate in isolates) {
if (isolate['name'].contains(r'$main')) {
return isolate['id'];
}
}
return isolates.first['id'];
}
/// Send a request to the VM to reload sources from [entryUri].
///
/// This will establish a connection with the VM assuming it is running on the
/// local machine and listening on [port] for service protocol requests.
///
/// The result is the JSON map received from the reload request.
Future<Map> reload(Uri entryUri) async {
var id = await mainId;
var result = await rpc.sendRequest('reloadSources', {
'isolateId': id,
'rootLibUri': entryUri.path,
});
return result;
}
/// Close any connections used to communicate with the VM.
Future disconnect() async {
if (_rpc == null) return null;
this._mainId = null;
if (!_rpc.isClosed) {
var future = _rpc.close();
_rpc = null;
return future;
}
return null;
}
}
const VERBOSE_DEBUG = false;
/// This library can be used as a script as well. It connects to an existing
/// VM's service protocol and issues a hot-reload request. The VM must have been
/// launched with `--observe` to enable the service protocol.
///
// TODO(sigmund): provide flags to configure the vm-service port.
main(List<String> args) async {