Remove asyncEval call

packages/shared_preferences/shared_preferences_tool/lib/src/shared_preferences_state.dart

@@ -17,7 +17,6 @@ class SharedPreferencesState {
     this.allKeys = const <String>[],
     this.selectedKey,
     this.editing = false,
-    this.isWebPlatform = false,
   });
 
   /// A list of all keys in the shared preferences of the target debug session.
@@ -30,9 +29,6 @@ class SharedPreferencesState {
   /// Whether the user is editing the value of the selected key.
   final bool editing;
 
-  /// Whether the current target debug session's platform is web or not.
-  final bool isWebPlatform;
-
   /// Creates a copy of this [SharedPreferencesState] but replacing the given
   /// fields with the new values.
   SharedPreferencesState copyWith({

packages/shared_preferences/shared_preferences_tool/lib/src/shared_preferences_state_notifier.dart

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:devtools_app_shared/service.dart';
 import 'package:flutter/material.dart';
 
 import 'async_state.dart';
@@ -18,11 +17,9 @@ class SharedPreferencesStateNotifier extends ValueNotifier<_State> {
   /// You don't need to call this constructor directly. Use [SharedPreferencesStateNotifierProvider] instead.
   SharedPreferencesStateNotifier(
     this._eval,
-    this._connectedApp,
   ) : super(const _State.loading());
 
   final SharedPreferencesToolEval _eval;
-  final ConnectedApp? _connectedApp;
 
   List<String> _keys = <String>[];
 
@@ -32,13 +29,13 @@ class SharedPreferencesStateNotifier extends ValueNotifier<_State> {
   Future<void> fetchAllKeys() async {
     value = const _State.loading();
     try {
-      final bool isWebPlatform = await _connectedApp?.isDartWebApp ?? false;
-      if (isWebPlatform) {
-        value = const _State.data(SharedPreferencesState(
-          isWebPlatform: true,
-        ));
-        return;
-      }
+      // final bool isWebPlatform = await _connectedApp?.isDartWebApp ?? false;
+      // if (isWebPlatform) {
+      //   value = const _State.data(SharedPreferencesState(
+      //     isWebPlatform: true,
+      //   ));
+      //   return;
+      // }
 
       _keys = await _eval.fetchAllKeys();
       value = _State.data(SharedPreferencesState(

packages/shared_preferences/shared_preferences_tool/lib/src/shared_preferences_state_provider.dart

@@ -35,7 +35,6 @@ enum _StateInheritedModelAspect {
   selectedKey,
   selectedKeyData,
   editing,
-  isWebPlatform,
 }
 
 /// An inherited model that provides a [SharedPreferencesState] to its descendants.
@@ -74,8 +73,6 @@ class _SharedPreferencesStateInheritedModel
           state.selectedKeyDataState != oldWidget.state.selectedKeyDataState,
         _StateInheritedModelAspect.editing =>
           state.editingState != oldWidget.state.editingState,
-        _StateInheritedModelAspect.isWebPlatform =>
-          state.isWebPlatform != oldWidget.state.isWebPlatform,
       },
     );
   }
@@ -101,8 +98,6 @@ extension on AsyncState<SharedPreferencesState> {
       );
 
   bool get editingState => dataOrNull?.editing ?? false;
-
-  bool get isWebPlatform => dataOrNull?.isWebPlatform ?? false;
 }
 
 @visibleForTesting
@@ -225,22 +220,6 @@ class SharedPreferencesStateProvider extends StatefulWidget {
         .editingState;
   }
 
-  /// Returns whether the target debug session is a web platform from the closest
-  /// _SharedPreferencesStateInheritedModel ancestor.
-  ///
-  /// Use of this method will cause the given [context] to rebuild whenever the
-  /// platform changes.
-  /// This will not cause a rebuild when any other part of the state changes.
-  static bool isWebPlatformOf(BuildContext context) {
-    return context
-        .dependOnInheritedWidgetOfExactType<
-            _SharedPreferencesStateInheritedModel>(
-          aspect: _StateInheritedModelAspect.isWebPlatform,
-        )!
-        .state
-        .isWebPlatform;
-  }
-
   /// The required child widget.
   final Widget child;
 
@@ -262,10 +241,7 @@ class _SharedPreferencesStateProviderState
       serviceManager: serviceManager,
     );
     final SharedPreferencesToolEval toolEval = SharedPreferencesToolEval(eval);
-    _notifier = SharedPreferencesStateNotifier(
-      toolEval,
-      serviceManager.connectedApp,
-    );
+    _notifier = SharedPreferencesStateNotifier(toolEval);
     _notifier.fetchAllKeys();
   }
 

packages/shared_preferences/shared_preferences_tool/lib/src/shared_preferences_tool_eval.dart

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// ignore_for_file: missing_whitespace_between_adjacent_strings
+
 import 'package:devtools_app_shared/service.dart';
 import 'package:vm_service/vm_service.dart';
 
@@ -116,10 +118,59 @@ class SharedPreferencesToolEval {
 }
 
 extension on EvalOnDartLibrary {
+  /// Evaluates the given [method] on the shared preferences instance.
+  ///
+  /// Returns the [InstanceRef] of the result.
+  /// The [isAlive] parameter is used to dispose the evaluation if the
+  /// caller is disposed.
+  ///
+  /// This method is actually a workaround for the asyncEval method, which is
+  /// not working for web targets.
   Future<InstanceRef> prefsEval(String method, Disposable? isAlive) async {
-    return (await asyncEval(
-      '(await SharedPreferences.getInstance()).$method',
+    // Create a empty list in memory to hold the shared preferences instance.
+    // It could've been anything that can handle values passed by reference.
+    final InstanceRef prefsHolderRef = await safeEval(
+      '[]',
+      isAlive: isAlive,
+    );
+
+    // Add the shared preferences instance to the list once the future completes
+    await eval(
+      'SharedPreferences.getInstance().then(prefsHolder.add);',
+      scope: <String, String>{
+        'prefsHolder': prefsHolderRef.id!,
+      },
+      isAlive: isAlive,
+    );
+
+    InstanceRef? prefsRef;
+    // The maximum number of retries to get the shared preferences instance.
+    // Means a max of 1 second of waiting.
+    const int maxRetries = 20;
+    int retryCount = 0;
+
+    // Wait until the shared preferences instance is added to the list.
+    while (prefsRef == null) {
+      retryCount++;
+      // A break condition to avoid infinite loop.
+      if (retryCount > maxRetries) {
+        throw StateError('Failed to get shared preferences instance.');
+      }
+      final Instance holderInstance =
+          await safeGetInstance(prefsHolderRef, isAlive);
+      final dynamic prefsInstance = holderInstance.elements?.firstOrNull;
+      prefsRef = prefsInstance != null ? prefsInstance as InstanceRef : null;
+      if (prefsRef == null) {
+        await Future<void>.delayed(const Duration(milliseconds: 50));
+      }
+    }
+
+    return (await eval(
+      'prefs.$method',
       isAlive: isAlive,
+      scope: <String, String>{
+        'prefs': prefsRef.id!,
+      },
     ))!;
   }
 

packages/shared_preferences/shared_preferences_tool/lib/src/ui/shared_preferences_body.dart

@@ -3,11 +3,8 @@
 // found in the LICENSE file.
 
 import 'package:devtools_app_shared/ui.dart';
-import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
-import 'package:url_launcher/url_launcher.dart';
 
-import '../shared_preferences_state_provider.dart';
 import 'data_panel.dart';
 import 'keys_panel.dart';
 
@@ -19,14 +16,6 @@ class SharedPreferencesBody extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final bool isWebPlatform = SharedPreferencesStateProvider.isWebPlatformOf(
-      context,
-    );
-
-    if (isWebPlatform) {
-      return const _WebUnavailableMessage();
-    }
-
     final Axis splitAxis = SplitPane.axisFor(context, 0.85);
 
     return SplitPane(
@@ -39,48 +28,3 @@ class SharedPreferencesBody extends StatelessWidget {
     );
   }
 }
-
-class _WebUnavailableMessage extends StatelessWidget {
-  const _WebUnavailableMessage();
-
-  @override
-  Widget build(BuildContext context) {
-    final ThemeData theme = Theme.of(context);
-
-    return Center(
-      child: Container(
-        width: 400.0,
-        padding: const EdgeInsets.all(largeSpacing),
-        child: Text.rich(
-          textAlign: TextAlign.center,
-          TextSpan(
-            children: <InlineSpan>[
-              TextSpan(
-                text: 'The shared preferences tool is not available for web '
-                    'platforms yet. Once this ',
-                style: theme.regularTextStyle,
-              ),
-              TextSpan(
-                text: 'issue',
-                style: theme.linkTextStyle,
-                recognizer: TapGestureRecognizer()
-                  ..onTap = () {
-                    launchUrl(
-                      Uri.parse(
-                        'https://github.com/flutter/devtools/issues/7766',
-                      ),
-                    );
-                  },
-              ),
-              TextSpan(
-                text: ' is resolved, this tool will be updated to support web '
-                    'platforms.',
-                style: theme.regularTextStyle,
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}

packages/shared_preferences/shared_preferences_tool/pubspec.yaml

@@ -12,7 +12,6 @@ dependencies:
   devtools_extensions: ^0.1.1
   flutter:
     sdk: flutter
-  url_launcher: ^6.2.6
   vm_service: ^14.2.1
 
 dev_dependencies:

packages/shared_preferences/shared_preferences_tool/test/src/shared_preferences_state_notifier_test.dart

@@ -20,7 +20,6 @@ import 'shared_preferences_state_notifier_test.mocks.dart';
 void main() {
   group('SharedPreferencesStateNotifier', () {
     late MockSharedPreferencesToolEval evalMock;
-    late MockConnectedApp connectedApp;
     late SharedPreferencesStateNotifier notifier;
 
     setUpAll(() {
@@ -29,20 +28,7 @@ void main() {
 
     setUp(() {
       evalMock = MockSharedPreferencesToolEval();
-      connectedApp = MockConnectedApp();
-      when(connectedApp.isDartWebApp).thenAnswer((_) async => false);
-      notifier = SharedPreferencesStateNotifier(evalMock, connectedApp);
-    });
-
-    test('should set isWebPlatform value from connectedApp', () async {
-      for (final bool value in <bool>[true, false]) {
-        when(connectedApp.isDartWebApp).thenAnswer((_) async => value);
-        await notifier.fetchAllKeys();
-        expect(
-          notifier.value.dataOrNull!.isWebPlatform,
-          equals(value),
-        );
-      }
+      notifier = SharedPreferencesStateNotifier(evalMock);
     });
 
     test('should start in the loading state', () {

packages/shared_preferences/shared_preferences_tool/test/src/ui/shared_preferences_body_test.dart

@@ -7,9 +7,6 @@ library;
 
 import 'package:devtools_extensions/devtools_extensions.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:mockito/mockito.dart';
-import 'package:shared_preferences_tool/src/async_state.dart';
-import 'package:shared_preferences_tool/src/shared_preferences_state.dart';
 import 'package:shared_preferences_tool/src/shared_preferences_state_provider.dart';
 import 'package:shared_preferences_tool/src/ui/data_panel.dart';
 import 'package:shared_preferences_tool/src/ui/keys_panel.dart';
@@ -39,37 +36,5 @@ void main() {
         expect(find.byType(DataPanel), findsOneWidget);
       },
     );
-
-    testWidgets(
-      'should show web unavailable message when running on web',
-      (WidgetTester tester) async {
-        final MockSharedPreferencesStateNotifier notifier =
-            MockSharedPreferencesStateNotifier();
-        when(notifier.value).thenReturn(
-          const AsyncState<SharedPreferencesState>.data(
-            SharedPreferencesState(
-              isWebPlatform: true,
-            ),
-          ),
-        );
-
-        await tester.pumpWidget(
-          DevToolsExtension(
-            requiresRunningApplication: false,
-            child: InnerSharedPreferencesStateProvider(
-              notifier: notifier,
-              child: const SharedPreferencesBody(),
-            ),
-          ),
-        );
-
-        expect(
-          find.textContaining(
-            'The shared preferences tool is not available for web',
-          ),
-          findsOneWidget,
-        );
-      },
-    );
   });
 }