_defaultGraphQLSocketMessageDecoder to return non-nullable Map (#354)

gql-dart · Aug 30, 2022 · c13e2fe · c13e2fe
1 parent 016b334
commit c13e2fe
Showing 1 changed file with 60 additions and 51 deletions.
diff --git a/links/gql_websocket_link/lib/src/link.dart b/links/gql_websocket_link/lib/src/link.dart
@@ -81,9 +81,9 @@ class WebSocketLink extends Link {
   /// ```
   final GraphQLSocketMessageDecoder graphQLSocketMessageDecoder;
 
-  static Map<String, dynamic>? _defaultGraphQLSocketMessageDecoder(
+  static Map<String, dynamic> _defaultGraphQLSocketMessageDecoder(
           dynamic message) =>
-      json.decode(message as String) as Map<String, dynamic>?;
+      json.decode(message as String) as Map<String, dynamic>;
 
   /// Automatically recreate the channel when connection is lost,
   /// and re send all active subscriptions. `true` by default.
@@ -330,58 +330,67 @@ class WebSocketLink extends Link {
   }
 
   Future<GraphQLSocketMessage> _parseSocketMessage(dynamic message) async {
-    final Map<String, dynamic> map =
-        await graphQLSocketMessageDecoder(message)!;
-    final String type = (map["type"] ?? "unknown") as String;
-    final dynamic payload = map["payload"] ?? <String, dynamic>{};
-    final String id = (map["id"] ?? "none") as String;
-
-    switch (type) {
-      case MessageTypes.connectionAck:
-        return ConnectionAck();
-      case MessageTypes.connectionError:
-        return ConnectionError(payload);
-      case MessageTypes.connectionKeepAlive:
-        return ConnectionKeepAlive();
-      case MessageTypes.data:
-        final dynamic data = payload["data"];
-        final dynamic errors = payload["errors"];
-        final dynamic extensions = payload["extensions"];
-        return SubscriptionData(id, data, errors, extensions);
-      case MessageTypes.error:
-        List<Map<String, Object?>>? _tryCastErrors(List<Object?> list) {
-          final allAreErrors = list.every(
-            (map) =>
-                map is Map<String, Object?> &&
-                map["message"] is String &&
-                (map["path"] is List?) &&
-                (map["locations"] is List?) &&
-                (map["extensions"] is Map<String, Object?>?),
-          );
-          return allAreErrors ? list.cast() : null;
-        }
-        Object? extensions;
-        List<Map<String, Object?>>? errors;
-        if (payload is List) {
-          errors = _tryCastErrors(payload);
-        } else if (payload is Map) {
-          if (payload["errors"] is List) {
-            extensions = payload["extensions"];
-            errors = _tryCastErrors(payload["errors"] as List);
-          } else {
-            errors = _tryCastErrors([payload]);
-            // only pass root level extensions if they weren't passed as
-            // extensions in the error
-            if (errors == null) {
+    try {
+      final Map<String, dynamic> map =
+          await graphQLSocketMessageDecoder(message)!;
+      final String type = (map["type"] ?? "unknown") as String;
+      final dynamic payload = map["payload"] ?? <String, dynamic>{};
+      final String id = (map["id"] ?? "none") as String;
+
+      switch (type) {
+        case MessageTypes.connectionAck:
+          return ConnectionAck();
+        case MessageTypes.connectionError:
+          return ConnectionError(payload);
+        case MessageTypes.connectionKeepAlive:
+          return ConnectionKeepAlive();
+        case MessageTypes.data:
+          final dynamic data = payload["data"];
+          final dynamic errors = payload["errors"];
+          final dynamic extensions = payload["extensions"];
+          return SubscriptionData(id, data, errors, extensions);
+        case MessageTypes.error:
+          List<Map<String, Object?>>? _tryCastErrors(List<Object?> list) {
+            final allAreErrors = list.every(
+              (map) =>
+                  map is Map<String, Object?> &&
+                  map["message"] is String &&
+                  (map["path"] is List?) &&
+                  (map["locations"] is List?) &&
+                  (map["extensions"] is Map<String, Object?>?),
+            );
+            return allAreErrors ? list.cast() : null;
+          }
+          Object? extensions;
+          List<Map<String, Object?>>? errors;
+          if (payload is List) {
+            errors = _tryCastErrors(payload);
+          } else if (payload is Map) {
+            if (payload["errors"] is List) {
               extensions = payload["extensions"];
+              errors = _tryCastErrors(payload["errors"] as List);
+            } else {
+              errors = _tryCastErrors([payload]);
+              // only pass root level extensions if they weren't passed as
+              // extensions in the error
+              if (errors == null) {
+                extensions = payload["extensions"];
+              }
             }
           }
-        }
-        return SubscriptionError(id, payload, errors, extensions);
-      case MessageTypes.complete:
-        return SubscriptionComplete(id);
-      default:
-        return UnknownData(map);
+          return SubscriptionError(id, payload, errors, extensions);
+        case MessageTypes.complete:
+          return SubscriptionComplete(id);
+        default:
+          return UnknownData(map);
+      }
+    } catch (e, s) {
+      throw WebSocketLinkServerException(
+        originalException: e,
+        originalStackTrace: s,
+        parsedResponse: null,
+        requestMessage: null,
+      );
     }
   }