Revert "Send DAP events through DDS"
This reverts commit 5292ee88395048f788a4058271dc6e7ec55e34c5.
Reason for revert: Causes failure on `sse_smoke_test` because it needs to set up an event handler.
Original change's description:
> Send DAP events through DDS
>
> Change-Id: Ib40306b8e47d74b02b6cbf348c2b5833cfb31a9d
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/309080
> Commit-Queue: Helin Shiah <helinx@google.com>
> Reviewed-by: Ben Konyi <bkonyi@google.com>
Change-Id: I62b12de8e2478441d9a7a4177ed1090aa845467f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/310740
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Derek Xu <derekx@google.com>
Commit-Queue: Helin Shiah <helinx@google.com>
diff --git a/pkg/dds/CHANGELOG.md b/pkg/dds/CHANGELOG.md
index 178ad7a..1661f3a 100644
--- a/pkg/dds/CHANGELOG.md
+++ b/pkg/dds/CHANGELOG.md
@@ -1,6 +1,3 @@
-# 2.9.2
-- Added notifications for DAP events.
-
# 2.9.1
- [DAP] `runInTerminal` requests are now sent after first responding to the `launchRequest`.
- [DAP] Skipped tests are now marked with `!` instead of `✓` in `Output` events.
diff --git a/pkg/dds/lib/src/dap/adapters/dds_hosted_adapter.dart b/pkg/dds/lib/src/dap/adapters/dds_hosted_adapter.dart
index c2eb924..7e2d115 100644
--- a/pkg/dds/lib/src/dap/adapters/dds_hosted_adapter.dart
+++ b/pkg/dds/lib/src/dap/adapters/dds_hosted_adapter.dart
@@ -19,7 +19,6 @@
DartAttachRequestArguments>
with PidTracker, VmServiceInfoFileUtils, PackageConfigUtils, TestAdapter {
Uri? ddsUri;
- void Function(Event)? eventHandler;
@override
final parseLaunchArgs = DartLaunchRequestArguments.fromJson;
@@ -122,17 +121,4 @@
throw potentialException;
}
}
-
- @override
- void sendEventToChannel(Event event) {
- if (eventHandler == null) {
- throw Exception("No event handler for DDS hosted adapter");
- } else {
- eventHandler!(event);
- }
- }
-
- void setEventHandler(void Function(Event) eventHandler) {
- this.eventHandler = eventHandler;
- }
}
diff --git a/pkg/dds/lib/src/dap/base_debug_adapter.dart b/pkg/dds/lib/src/dap/base_debug_adapter.dart
index fbdbb9e..f955b57 100644
--- a/pkg/dds/lib/src/dap/base_debug_adapter.dart
+++ b/pkg/dds/lib/src/dap/base_debug_adapter.dart
@@ -205,10 +205,6 @@
event: eventType ?? eventTypes[body.runtimeType]!,
body: body,
);
- sendEventToChannel(event);
- }
-
- void sendEventToChannel(Event event) {
_channel.sendEvent(event);
}
diff --git a/pkg/dds/lib/src/dap_handler.dart b/pkg/dds/lib/src/dap_handler.dart
index ef4e1a6..f4b874f 100644
--- a/pkg/dds/lib/src/dap_handler.dart
+++ b/pkg/dds/lib/src/dap_handler.dart
@@ -3,9 +3,6 @@
// BSD-style license that can be found in the LICENSE file.
import 'dart:async';
-import 'dart:convert';
-
-import 'package:dds_service_extensions/dap.dart';
import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc;
import '../dap.dart';
@@ -44,20 +41,8 @@
};
}
- _handleEvent(Event event) {
- dds.streamManager.streamNotify(DapEventStreams.kDAP, {
- 'streamId': DapEventStreams.kDAP,
- 'event': {
- 'kind': DapEventKind.kDAPEvent,
- 'timestamp': DateTime.now().millisecondsSinceEpoch,
- 'dapData': jsonEncode(event),
- },
- });
- }
-
Future<void> _startAdapter(DdsHostedAdapter adapter) async {
adapter.ddsUri = dds.uri;
- adapter.setEventHandler(_handleEvent);
// TODO(helin24): Most likely we'll want the client to do these
// initialization steps so that clients can differentiate capabilities. This
diff --git a/pkg/dds/pubspec.yaml b/pkg/dds/pubspec.yaml
index 9fa1a9c..10bf503 100644
--- a/pkg/dds/pubspec.yaml
+++ b/pkg/dds/pubspec.yaml
@@ -1,5 +1,5 @@
name: dds
-version: 2.9.2
+version: 2.9.1
description: >-
A library used to spawn the Dart Developer Service, used to communicate with
a Dart VM Service instance.
@@ -13,8 +13,8 @@
async: ^2.4.1
browser_launcher: ^1.0.0
collection: ^1.15.0
- dds_service_extensions: ^1.6.0
- dap: ^1.6.0
+ dds_service_extensions: ^1.3.0
+ dap: ^1.0.0
devtools_shared: ^2.14.1
http_multi_server: ^3.0.0
json_rpc_2: ^3.0.0
@@ -27,7 +27,7 @@
sse: ^4.0.0
stack_trace: ^1.10.0
stream_channel: ^2.0.0
- vm_service: '>=11.7.2 <12.0.0'
+ vm_service: '>=11.0.0 <12.0.0'
web_socket_channel: ^2.0.0
# We use 'any' version constraints here as we get our package versions from
diff --git a/pkg/dds/test/dap_handler_test.dart b/pkg/dds/test/dap_handler_test.dart
index a0becc7..84f7e54 100644
--- a/pkg/dds/test/dap_handler_test.dart
+++ b/pkg/dds/test/dap_handler_test.dart
@@ -7,7 +7,7 @@
import 'package:dap/dap.dart';
import 'package:dds/dds.dart';
-import 'package:dds_service_extensions/dap.dart';
+import 'package:dds_service_extensions/src/dap.dart';
import 'package:test/test.dart';
import 'package:vm_service/vm_service_io.dart';
diff --git a/pkg/dds_service_extensions/CHANGELOG.md b/pkg/dds_service_extensions/CHANGELOG.md
index acdab27..7a1ba9a 100644
--- a/pkg/dds_service_extensions/CHANGELOG.md
+++ b/pkg/dds_service_extensions/CHANGELOG.md
@@ -1,6 +1,3 @@
-## 1.6.0
-- Made DAP extensions methods accessible in lib.
-
## 1.5.0
- Added `DdsExtension.postEvent`.
diff --git a/pkg/dds_service_extensions/lib/dap.dart b/pkg/dds_service_extensions/lib/src/dap.dart
similarity index 74%
rename from pkg/dds_service_extensions/lib/dap.dart
rename to pkg/dds_service_extensions/lib/src/dap.dart
index 1fb1985..07ad724 100644
--- a/pkg/dds_service_extensions/lib/dap.dart
+++ b/pkg/dds_service_extensions/lib/src/dap.dart
@@ -29,8 +29,6 @@
vm.addTypeFactory('DapResponse', DapResponse.parse);
_factoriesRegistered = true;
}
-
- Stream<vm.Event> get onDAPEvent => onEvent(DapEventStreams.kDAP);
}
class DapResponse extends vm.Response {
@@ -52,19 +50,3 @@
final dap.Response dapResponse;
}
-
-extension DapEvents on vm.Event {
- dap.Event get dapData {
- assert(json != null);
- return dap.Event.fromJson(json!['dapData']);
- }
-}
-
-abstract class DapEventStreams extends vm.EventStreams {
- static const String kDAP = 'DAP';
-}
-
-abstract class DapEventKind extends vm.EventKind {
- /// Notification that a DAP event occurred.
- static const String kDAPEvent = 'DAPEvent';
-}
diff --git a/pkg/dds_service_extensions/pubspec.yaml b/pkg/dds_service_extensions/pubspec.yaml
index b7701d6..cc3f4ce 100644
--- a/pkg/dds_service_extensions/pubspec.yaml
+++ b/pkg/dds_service_extensions/pubspec.yaml
@@ -1,5 +1,5 @@
name: dds_service_extensions
-version: 1.6.0
+version: 1.5.0
description: >-
Extension methods for `package:vm_service`, used to make requests a
Dart Development Service (DDS) instance.
@@ -11,7 +11,7 @@
dependencies:
async: ^2.4.1
dap: ^1.0.0
- vm_service: ^11.7.2
+ vm_service: ^11.0.0
# We use 'any' version constraints here as we get our package versions from
# the dart-lang/sdk repo's DEPS file. Note that this is a special case; the
diff --git a/pkg/vm_service/CHANGELOG.md b/pkg/vm_service/CHANGELOG.md
index 0b881ce..8363a88 100644
--- a/pkg/vm_service/CHANGELOG.md
+++ b/pkg/vm_service/CHANGELOG.md
@@ -1,6 +1,3 @@
-## 11.7.2
-- Make Event classes abstract to permit `dap` event stream extensions.
-
## 11.7.1
- Expose RPC error codes that were defined in `package:dds`.
diff --git a/pkg/vm_service/lib/src/vm_service.dart b/pkg/vm_service/lib/src/vm_service.dart
index 79793ad..14c0532 100644
--- a/pkg/vm_service/lib/src/vm_service.dart
+++ b/pkg/vm_service/lib/src/vm_service.dart
@@ -2834,7 +2834,9 @@
}
/// An enum of available event streams.
-abstract class EventStreams {
+class EventStreams {
+ EventStreams._();
+
static const String kVM = 'VM';
static const String kIsolate = 'Isolate';
static const String kDebug = 'Debug';
@@ -2851,7 +2853,9 @@
/// Adding new values to `EventKind` is considered a backwards compatible
/// change. Clients should ignore unrecognized events.
-abstract class EventKind {
+class EventKind {
+ EventKind._();
+
/// Notification that VM identifying information has changed. Currently used
/// to notify of changes to the VM debugging name via setVMName.
static const String kVMUpdate = 'VMUpdate';
diff --git a/pkg/vm_service/pubspec.yaml b/pkg/vm_service/pubspec.yaml
index 863d539..8f5274a 100644
--- a/pkg/vm_service/pubspec.yaml
+++ b/pkg/vm_service/pubspec.yaml
@@ -1,5 +1,5 @@
name: vm_service
-version: 11.7.2
+version: 11.7.1
description: >-
A library to communicate with a service implementing the Dart VM
service protocol.
