Prep devtools_app_shared and devtools_extensions for release (#8224)

flutter · Aug 21, 2024 · ba9f12d · ba9f12d
1 parent 0c63f82
commit ba9f12d
Show file tree

Hide file tree

Showing 37 changed files with 76 additions and 65 deletions.
diff --git a/flutter-candidate.txt b/flutter-candidate.txt
@@ -1 +1 @@
-92ac5653386e88931e680c1d62034fe6a4cf7fff
+b74fa8afc7e2365f96098e6ff0fb150beb22682a
diff --git a/packages/devtools_app/lib/src/screens/vm_developer/vm_service_private_extensions.dart b/packages/devtools_app/lib/src/screens/vm_developer/vm_service_private_extensions.dart
@@ -561,16 +561,6 @@ enum FunctionKind {
   }
 }
 
-extension CodeRefPrivateViewExtension on CodeRef {
-  static const _functionKey = 'function';
-
-  /// Returns the function from which this code object was generated.
-  FuncRef? get function {
-    final functionJson = json![_functionKey] as Map<String, dynamic>?;
-    return FuncRef.parse(functionJson);
-  }
-}
-
 /// An extension on [Code] which allows for access to VM internal fields.
 extension CodePrivateViewExtension on Code {
   static const _disassemblyKey = '_disassembly';

diff --git a/packages/devtools_app/pubspec.yaml b/packages/devtools_app/pubspec.yaml
@@ -54,7 +54,7 @@ dependencies:
   stream_channel: ^2.1.1
   string_scanner: ^1.1.0
   unified_analytics: ^6.1.0
-  vm_service: ^14.2.1
+  vm_service: ^14.2.5
   vm_service_protos: ^1.0.0
   vm_snapshot_analysis: ^0.7.6
   web: ^1.0.0

diff --git a/packages/devtools_app/test/test_infra/goldens/codeview_scrollbars.png b/packages/devtools_app/test/test_infra/goldens/codeview_scrollbars.png
diff --git a/...s_app/test/test_infra/goldens/integration_inspector_errors_2_error_selected.png b/...s_app/test/test_infra/goldens/integration_inspector_errors_2_error_selected.png
diff --git a/...es/devtools_app/test/test_infra/goldens/integration_inspector_select_center.png b/...es/devtools_app/test/test_infra/goldens/integration_inspector_select_center.png
diff --git a/...pp/test/test_infra/goldens/integration_inspector_v2_errors_2_error_selected.png b/...pp/test/test_infra/goldens/integration_inspector_v2_errors_2_error_selected.png
diff --git a/...p/test/test_infra/goldens/integration_inspector_v2_hideable_widget_selected.png b/...p/test/test_infra/goldens/integration_inspector_v2_hideable_widget_selected.png
diff --git a/...infra/goldens/integration_inspector_v2_hideable_widget_selected_from_search.png b/...infra/goldens/integration_inspector_v2_hideable_widget_selected_from_search.png
diff --git a/...est_infra/goldens/integration_inspector_v2_implementation_widgets_collapsed.png b/...est_infra/goldens/integration_inspector_v2_implementation_widgets_collapsed.png
diff --git a/...t/test_infra/goldens/integration_inspector_v2_implementation_widgets_hidden.png b/...t/test_infra/goldens/integration_inspector_v2_implementation_widgets_hidden.png
diff --git a/...devtools_app/test/test_infra/goldens/integration_inspector_v2_select_center.png b/...devtools_app/test/test_infra/goldens/integration_inspector_v2_select_center.png
diff --git a/...s/devtools_app/test/test_infra/goldens/memory/load_offline_data_profile_tab.png b/...s/devtools_app/test/test_infra/goldens/memory/load_offline_data_profile_tab.png
diff --git a/...ges/devtools_app/test/test_infra/goldens/memory/load_offline_data_trace_tab.png b/...ges/devtools_app/test/test_infra/goldens/memory/load_offline_data_trace_tab.png
diff --git a/packages/devtools_app/test/test_infra/goldens/memory_diff_empty1.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_empty1.png
diff --git a/packages/devtools_app/test/test_infra/goldens/memory_diff_empty2.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_empty2.png
diff --git a/packages/devtools_app/test/test_infra/goldens/memory_diff_selected_class.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_selected_class.png
diff --git a/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_custom_diff.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_custom_diff.png
diff --git a/...ges/devtools_app/test/test_infra/goldens/memory_diff_snapshot_custom_single.png b/...ges/devtools_app/test/test_infra/goldens/memory_diff_snapshot_custom_single.png
diff --git a/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_except_diff.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_except_diff.png
diff --git a/...ges/devtools_app/test/test_infra/goldens/memory_diff_snapshot_except_single.png b/...ges/devtools_app/test/test_infra/goldens/memory_diff_snapshot_except_single.png
diff --git a/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_only_diff.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_only_diff.png
diff --git a/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_only_single.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_only_single.png
diff --git a/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_scene_diff.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_scene_diff.png
diff --git a/...ages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_scene_single.png b/...ages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_scene_single.png
diff --git a/...ages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_showAll_diff.png b/...ages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_showAll_diff.png
diff --git a/...es/devtools_app/test/test_infra/goldens/memory_diff_snapshot_showAll_single.png b/...es/devtools_app/test/test_infra/goldens/memory_diff_snapshot_showAll_single.png
diff --git a/packages/devtools_app/test/test_infra/goldens/memory_diff_three_snapshots1.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_three_snapshots1.png
diff --git a/packages/devtools_app/test/test_infra/goldens/memory_diff_three_snapshots2.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_three_snapshots2.png
diff --git a/...evtools_app/test/test_infra/goldens/shared/disconnect_observer_disconnected.png b/...evtools_app/test/test_infra/goldens/shared/disconnect_observer_disconnected.png
diff --git a/packages/devtools_app/test/vm_developer/object_inspector/vm_code_display_test.dart b/packages/devtools_app/test/vm_developer/object_inspector/vm_code_display_test.dart
@@ -39,12 +39,12 @@ void main() {
         id: 'code-obj',
         kind: 'Dart',
         name: 'testFuncCode',
+        function: testFunction,
       );
 
       final offset = pow(2, 20) as int;
       const addressCount = 1000;
       testCode.json = {
-        'function': testFunction.toJson(),
         '_objectPool': {
           'id': 'pool-id',
           'length': 0,

diff --git a/packages/devtools_app_shared/CHANGELOG.md b/packages/devtools_app_shared/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.2.3
+* Bump `web` dependency to `^1.0.0`
+* Bump `pointer_interceptor` dependency to `^0.10.1+1`
+* Add better error handling in `ServiceExtensionManager`.
+
 ## 0.2.2
 * Lookup the connected app package root from an expression evaluation when
 the connected app is a Dart or Flutter test.

diff --git a/packages/devtools_app_shared/lib/src/service/service_extension_manager.dart b/packages/devtools_app_shared/lib/src/service/service_extension_manager.dart
@@ -208,19 +208,27 @@ final class ServiceExtensionManager with DisposerMixin {
     }
     _checkForFirstFrameStarted = true;
 
-    final value = await _service!.callServiceExtension(
-      extensions.didSendFirstFrameEvent,
-      isolateId: lastMainIsolate.id,
-    );
-    if (lastMainIsolate != _isolateManager.mainIsolate.value) {
-      // The active isolate has changed since we started querying the first
-      // frame.
-      return;
-    }
-    final didSendFirstFrameEvent = value.json!['enabled'] == 'true';
+    try {
+      final value = await _service!.callServiceExtension(
+        extensions.didSendFirstFrameEvent,
+        isolateId: lastMainIsolate.id,
+      );
+      if (lastMainIsolate != _isolateManager.mainIsolate.value) {
+        // The active isolate has changed since we started querying the first
+        // frame.
+        return;
+      }
+      final didSendFirstFrameEvent = value.json!['enabled'] == 'true';
 
-    if (didSendFirstFrameEvent) {
-      await _onFrameEventReceived();
+      if (didSendFirstFrameEvent) {
+        await _onFrameEventReceived();
+      }
+    } on RPCError catch (e) {
+      if (e.code == RPCErrorKind.kServerError.code) {
+        // Connection disappeared
+        return;
+      }
+      rethrow;
     }
   }
 
@@ -362,41 +370,49 @@ final class ServiceExtensionManager with DisposerMixin {
       if (_isolateManager.mainIsolate.value != mainIsolate) return;
 
       assert(value != null);
-      if (value is bool) {
-        Future<void> call(String? isolateId, bool value) async {
+      try {
+        if (value is bool) {
+          Future<void> call(String? isolateId, bool value) async {
+            await _service!.callServiceExtension(
+              name,
+              isolateId: isolateId,
+              args: {'enabled': value},
+            );
+          }
+
+          final description = extensions.serviceExtensionsAllowlist[name];
+          if (description?.shouldCallOnAllIsolates ?? false) {
+            // TODO(jacobr): be more robust instead of just assuming that if the
+            // service extension is available on one isolate it is available on
+            // all. For example, some isolates may still be initializing so may
+            // not expose the service extension yet.
+            await _service!.forEachIsolate((isolate) async {
+              await call(isolate.id, value);
+            });
+          } else {
+            await call(mainIsolate?.id, value);
+          }
+        } else if (value is String) {
           await _service!.callServiceExtension(
             name,
-            isolateId: isolateId,
-            args: {'enabled': value},
+            isolateId: mainIsolate?.id,
+            args: {'value': value},
+          );
+        } else if (value is double) {
+          await _service!.callServiceExtension(
+            name,
+            isolateId: mainIsolate?.id!,
+            // The param name for a numeric service extension will be the last part
+            // of the extension name (ext.flutter.extensionName => extensionName).
+            args: {name.substring(name.lastIndexOf('.') + 1): value},
           );
         }
-
-        final description = extensions.serviceExtensionsAllowlist[name];
-        if (description?.shouldCallOnAllIsolates ?? false) {
-          // TODO(jacobr): be more robust instead of just assuming that if the
-          // service extension is available on one isolate it is available on
-          // all. For example, some isolates may still be initializing so may
-          // not expose the service extension yet.
-          await _service!.forEachIsolate((isolate) async {
-            await call(isolate.id, value);
-          });
-        } else {
-          await call(mainIsolate?.id, value);
+      } on RPCError catch (e) {
+        if (e.code == RPCErrorKind.kServerError.code) {
+          // Connection disappeared
+          return;
         }
-      } else if (value is String) {
-        await _service!.callServiceExtension(
-          name,
-          isolateId: mainIsolate?.id,
-          args: {'value': value},
-        );
-      } else if (value is double) {
-        await _service!.callServiceExtension(
-          name,
-          isolateId: mainIsolate?.id!,
-          // The param name for a numeric service extension will be the last part
-          // of the extension name (ext.flutter.extensionName => extensionName).
-          args: {name.substring(name.lastIndexOf('.') + 1): value},
-        );
+        rethrow;
       }
     }
 

diff --git a/packages/devtools_app_shared/pubspec.yaml b/packages/devtools_app_shared/pubspec.yaml
@@ -1,6 +1,6 @@
 name: devtools_app_shared
 description: Package of Dart & Flutter structures shared between devtools_app and devtools extensions.
-version: 0.2.2
+version: 0.2.3
 repository: https://github.com/flutter/devtools/tree/master/packages/devtools_app_shared
 
 environment:
@@ -10,7 +10,7 @@ environment:
 dependencies:
   collection: ^1.15.0
   dds_service_extensions: ^2.0.0
-  devtools_shared: ^10.0.1
+  devtools_shared: ^10.0.2
   dtd: ^2.1.0
   flutter:
     sdk: flutter

diff --git a/packages/devtools_extensions/CHANGELOG.md b/packages/devtools_extensions/CHANGELOG.md
@@ -1,7 +1,8 @@
-## 0.3.0-wip
+## 0.3.0-dev.0
 * Add `ExtensionManager.copyToClipboard` method.
 * Add `DevToolsExtensionEventType.copyToClipboard` enum type.
 * Add `CopyToClipboardExtensionEvent` extension event type. 
+* Bump `web` dependency to `^1.0.0`.
 
 ## 0.2.2
 * Load the IDE Theme from the extension URL instead of creating

diff --git a/packages/devtools_extensions/README.md b/packages/devtools_extensions/README.md
@@ -184,7 +184,7 @@ Now it is time to build your extension.
 
     From the directory where you want your extension source code to live, run the following
     command, replacing `some_pkg_devtools_extension` with 
-    `<your_package_name>_devtools_extension``:
+    `<your_package_name>_devtools_extension`:
     ```console
     flutter create --template app --platforms web some_pkg_devtools_extension
     ```

diff --git a/packages/devtools_extensions/pubspec.yaml b/packages/devtools_extensions/pubspec.yaml
@@ -1,21 +1,20 @@
 name: devtools_extensions
 description: A package for building and supporting extensions for Dart DevTools.
-version: 0.3.0-wip
+version: 0.3.0-dev.0
 
 repository: https://github.com/flutter/devtools/tree/master/packages/devtools_extensions
 
 environment:
-  # TODO(kenz): bump min SDK versions to next beta.
-  sdk: ">=3.4.3 <4.0.0"
-  flutter: ">=3.22.2"
+  sdk: ">=3.6.0-149.3.beta <4.0.0"
+  flutter: ">=3.25.0-0.1.pre"
 
 executables:
   devtools_extensions: devtools_extensions
 
 dependencies:
   args: ^2.4.2
-  devtools_shared: ^10.0.1
-  devtools_app_shared: ^0.2.2
+  devtools_shared: ^10.0.2
+  devtools_app_shared: ^0.2.3
   flutter:
     sdk: flutter
   io: ^1.0.4