Save encoded URI for ACX DevTools

dwds/debug_extension_mv3/web/cross_extension_communication.dart

@@ -8,7 +8,6 @@ library cross_extension_communication;
 import 'package:js/js.dart';
 
 import 'chrome_api.dart';
-import 'data_types.dart';
 import 'debug_session.dart';
 import 'logger.dart';
 import 'storage.dart';
@@ -85,7 +84,7 @@ void _respondWithChromeResult(Object? chromeResult, Function sendResponse) {
 }
 
 void _respondWithEncodedUri(int tabId, Function sendResponse) async {
-  final encodedUri = await fetchStorageObject<EncodedUri>(
+  final encodedUri = await fetchStorageObject<String>(
       type: StorageObject.encodedUri, tabId: tabId);
   sendResponse(encodedUri ?? '');
 }

dwds/debug_extension_mv3/web/data_serializers.dart

@@ -21,7 +21,6 @@ part 'data_serializers.g.dart';
   DevToolsOpener,
   DevToolsUrl,
   DevToolsRequest,
-  EncodedUri,
   ExtensionEvent,
   ExtensionRequest,
   ExtensionResponse,

dwds/debug_extension_mv3/web/data_types.dart

@@ -35,18 +35,6 @@ abstract class DevToolsOpener
   bool get newWindow;
 }
 
-// TODO(elliette): Standardize on uri or url here and across DWDS, instead of a
-// combination of both.
-abstract class EncodedUri implements Built<EncodedUri, EncodedUriBuilder> {
-  static Serializer<EncodedUri> get serializer => _$encodedUriSerializer;
-
-  factory EncodedUri([Function(EncodedUriBuilder) updates]) = _$EncodedUri;
-
-  EncodedUri._();
-
-  String get uri;
-}
-
 abstract class DevToolsUrl implements Built<DevToolsUrl, DevToolsUrlBuilder> {
   static Serializer<DevToolsUrl> get serializer => _$devToolsUrlSerializer;
 

dwds/debug_extension_mv3/web/debug_session.dart

@@ -247,6 +247,13 @@ void _routeDwdsEvent(String eventData, SocketClient client, int tabId) {
     if (message.method == 'dwds.devtoolsUri') {
       _openDevTools(message.params, dartAppTabId: tabId);
     }
+    if (message.method == 'dwds.encodedUri') {
+      setStorageObject(
+        type: StorageObject.encodedUri,
+        value: message.params,
+        tabId: tabId,
+      );
+    }
   }
 }
 

dwds/debug_extension_mv3/web/storage.dart

@@ -44,7 +44,8 @@ Future<bool> setStorageObject<T>({
   void Function()? callback,
 }) {
   final storageKey = _createStorageKey(type, tabId);
-  final json = jsonEncode(serializers.serialize(value));
+  final json =
+      value is String ? value : jsonEncode(serializers.serialize(value));
   final storageObj = <String, String>{storageKey: json};
   final completer = Completer<bool>();
   final storageArea = _getStorageArea(type.persistance);
@@ -73,9 +74,13 @@ Future<T?> fetchStorageObject<T>({required StorageObject type, int? tabId}) {
       debugWarn('Does not exist.', prefix: storageKey);
       completer.complete(null);
     } else {
-      final value = serializers.deserialize(jsonDecode(json)) as T;
       debugLog('Fetched: $json', prefix: storageKey);
-      completer.complete(value);
+      if (T == String) {
+        completer.complete(json as T);
+      } else {
+        final value = serializers.deserialize(jsonDecode(json)) as T;
+        completer.complete(value);
+      }
     }
   }));
   return completer.future;