feat(api): Subscription Reconnection

packages/amplify/amplify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -6,9 +6,11 @@ import FlutterMacOS
 import Foundation
 
 import amplify_secure_storage
+import connectivity_plus_macos
 import path_provider_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin"))
+  ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
 }

packages/amplify/amplify_flutter/example/windows/flutter/generated_plugin_registrant.cc

@@ -6,6 +6,9 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <connectivity_plus_windows/connectivity_plus_windows_plugin.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
+  ConnectivityPlusWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin"));
 }

packages/amplify/amplify_flutter/example/windows/flutter/generated_plugins.cmake

@@ -3,6 +3,7 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  connectivity_plus_windows
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST

packages/amplify/amplify_flutter_android/android/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-18/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/default"/>
 </classpath>

packages/amplify/amplify_flutter_android/android/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>amplify_core</name>
+	<name>amplify_flutter_android</name>
 	<comment>Project amplify_core created by Buildship.</comment>
 	<projects>
 	</projects>
@@ -20,4 +20,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>0</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

packages/amplify_authenticator/example/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -6,9 +6,11 @@ import FlutterMacOS
 import Foundation
 
 import amplify_secure_storage
+import connectivity_plus_macos
 import path_provider_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin"))
+  ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
 }

packages/amplify_authenticator/example/windows/flutter/generated_plugin_registrant.cc

@@ -6,6 +6,9 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <connectivity_plus_windows/connectivity_plus_windows_plugin.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
+  ConnectivityPlusWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin"));
 }

packages/amplify_authenticator/example/windows/flutter/generated_plugins.cmake

@@ -3,6 +3,7 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  connectivity_plus_windows
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST

packages/amplify_core/lib/src/hub/amplify_hub_impl.dart

@@ -85,6 +85,10 @@ class AmplifyHubImpl extends AmplifyHub {
     Future.wait<void>([
       for (final stream in _availableStreams.values) stream.close(),
     ]).ignore();
+    Future.wait<void>([
+      for (final subs in _subscriptions.values)
+        for (final sub in subs) sub.cancel()
+    ]).ignore();
     _availableStreams.clear();
     _subscriptions.clear();
   }

packages/amplify_core/lib/src/hub/hub_channel.dart

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
@@ -28,4 +28,7 @@ enum HubChannel<HubEventPayload, E extends HubEvent<HubEventPayload>> {
 
   /// Events of the DataStore category.
   DataStore<DataStoreHubEventPayload, DataStoreHubEvent>(),
+
+  /// Events of the API category
+  Api<ApiHubEventPayload, ApiHubEvent>();
 }

packages/amplify_core/lib/src/plugin/amplify_api_plugin_interface.dart

@@ -14,6 +14,7 @@
  */
 
 import 'package:amplify_core/amplify_core.dart';
+import 'package:async/async.dart';
 import 'package:meta/meta.dart';
 
 abstract class APIPluginInterface extends AmplifyPluginInterface {

packages/amplify_core/lib/src/types/api/api_types.dart

@@ -13,6 +13,9 @@
  * permissions and limitations under the License.
  */
 
+// Packages
+export 'package:retry/retry.dart' show RetryOptions;
+
 // API Authorization
 export 'auth/api_auth_provider.dart';
 export 'auth/api_authorization_type.dart';
@@ -26,6 +29,10 @@ export 'graphql/graphql_request_type.dart';
 export 'graphql/graphql_response.dart';
 export 'graphql/graphql_response_error.dart';
 export 'graphql/graphql_subscription_operation.dart';
+export 'graphql/graphql_subscription_options.dart';
+
+export 'hub/api_hub_event.dart';
+export 'hub/api_subscription_hub_event.dart';
 
 export 'rest/rest_exception.dart';
 export 'rest/rest_operation.dart';

packages/amplify_core/lib/src/types/api/graphql/graphql_request.dart

@@ -27,14 +27,14 @@ class GraphQLRequest<T> {
   /// Only required if your backend has multiple GraphQL endpoints in the amplifyconfiguration.dart file. This parameter is then needed to specify which one to use for this request.
   final String? apiName;
 
+  /// A map of Strings to dynamically use for custom headers in the http request.
+  final Map<String, String>? headers;
+
   /// Authorization type to use for this request.
   ///
   /// If not supplied, the request will use the default endpoint mode.
   final APIAuthorizationType? authorizationMode;
 
-  /// A map of Strings to dynamically use for custom headers in the http request.
-  final Map<String, String>? headers;
-
   /// A map of values to dynamically use for variable names in the `document`.
   ///
   /// See https://graphql.org/learn/queries/#variables for more information.

packages/amplify_core/lib/src/types/api/graphql/graphql_subscription_options.dart

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+import 'package:retry/retry.dart';
+
+/// Configuration options for GraphQL Subscriptions and their WebSockets.
+class GraphQLSubscriptionOptions {
+  /// Configure the ping interval for AppSync polling for subscription connections.
+  final Duration? pingInterval;
+
+  /// Configure the exponential retry strategy options
+  /// see: https://pub.dev/documentation/retry/latest/retry/RetryOptions-class.html
+  final RetryOptions? retryOptions;
+
+  const GraphQLSubscriptionOptions({this.pingInterval, this.retryOptions});
+}

packages/amplify_core/lib/src/types/api/hub/api_hub_event.dart

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+import 'package:amplify_core/amplify_core.dart';
+
+class ApiHubEvent extends HubEvent<ApiHubEventPayload> {
+  ApiHubEvent(
+    super.eventName, {
+    super.payload,
+  });
+}
+
+abstract class ApiHubEventPayload {
+  const ApiHubEventPayload();
+}

packages/amplify_core/lib/src/types/api/hub/api_subscription_hub_event.dart

@@ -0,0 +1,177 @@
+/*
+ * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+import 'package:amplify_core/amplify_core.dart';
+
+/// {@template amplify_common.hub.api_network_state}
+/// Network states for graphql subscriptions.
+/// {@endtemplate}
+enum NetworkState {
+  /// {@macro amplify_common.hub.api_network_state_connected}
+  connected,
+
+  /// {@macro amplify_common.hub.api_network_state_disconnected}
+  disconnected,
+
+  /// {@macro amplify_common.hub.api_network_state_failed}
+  failed;
+}
+
+/// {@template amplify_common.hub.api_intended_state}
+/// The intended network states for graphql subscriptions.
+/// {@endtemplate}
+enum IntendedState {
+  /// {@macro amplify_common.hub.api_intended_state_connected}
+  connected,
+
+  /// {@macro amplify_common.hub.api_intended_state_disconnected}
+  disconnected;
+}
+
+/// {@template amplify_common.hub.api_subscription_status}
+/// A consolidated subscription connection status determined by the network and
+/// intended states.
+/// {@endtemplate}
+enum SubscriptionStatus {
+  /// {@macro amplify_common.hub.api_subscription_status_connected}
+  connected,
+
+  /// {@macro amplify_common.hub.api_subscription_status_disconnected}
+  disconnected,
+
+  /// {@macro amplify_common.hub.api_subscription_status_connected}
+  connecting,
+
+  /// {@macro amplify_common.hub.api_subscription_status_disconnected}
+  pendingDisconnected,
+
+  /// {@macro amplify_common.hub.api_subscription_status_failed}
+  failed;
+}
+
+class SubscriptionDetails extends ApiHubEventPayload
+    with
+        AWSEquatable<SubscriptionDetails>,
+        AWSSerializable<Map<String, Object?>>,
+        AWSDebuggable {
+  /// {@macro amplify_common.hub.api_network_state}
+  final NetworkState networkState;
+
+  /// {@macro amplify_common.hub.api_intended_state}
+  final IntendedState intendedState;
+
+  SubscriptionDetails(this.networkState, this.intendedState);
+
+  @override
+  List<Object?> get props => [intendedState, networkState];
+
+  @override
+  Map<String, String> toJson() => {
+        'networkState': networkState.name,
+        'intendedState': intendedState.name,
+      };
+
+  @override
+  String get runtimeTypeName => 'SubscriptionDetails';
+}
+
+class SubscriptionHubEvent extends ApiHubEvent
+    with
+        AWSEquatable<SubscriptionHubEvent>,
+        AWSSerializable<Map<String, Object?>>,
+        AWSDebuggable {
+  final SubscriptionDetails details;
+
+  static const String _name = 'SubscriptionHubEvent';
+
+  SubscriptionHubEvent._(this.details) : super(_name, payload: details);
+
+  /// {@template amplify_common.hub.api_subscription_status}
+  /// An overall status for GraphQL subscription connection, determined by the
+  /// underlying details [networkState] & [intendedState]
+  /// {@endtemplate}
+  SubscriptionStatus get status {
+    // Connection failed
+    if (details.networkState == NetworkState.failed) {
+      return SubscriptionStatus.failed;
+    }
+    // Connected with active subscriptions
+    if (details.networkState == NetworkState.connected &&
+        details.intendedState == IntendedState.connected) {
+      return SubscriptionStatus.connected;
+    }
+    // Disconnected with active subscriptions
+    if (details.networkState == NetworkState.disconnected &&
+        details.intendedState == IntendedState.connected) {
+      return SubscriptionStatus.connecting;
+    }
+    // Connected without active subscriptions
+    if (details.networkState == NetworkState.connected &&
+        details.intendedState == IntendedState.disconnected) {
+      return SubscriptionStatus.pendingDisconnected;
+    }
+
+    // disconnected without active subscriptions
+    return SubscriptionStatus.disconnected;
+  }
+
+  /// {@template amplify_common.hub.api_subscription_connected}
+  /// Emitted when a GraphQL subscription is connected.
+  /// {@endtemplate}
+  SubscriptionHubEvent.connected()
+      : this._(SubscriptionDetails(
+            NetworkState.connected, IntendedState.connected));
+
+  /// {@template amplify_common.hub.api_subscription_connected}
+  /// Emitted when a GraphQL subscription is connecting/reconnecting.
+  /// {@endtemplate}
+  SubscriptionHubEvent.connecting()
+      : this._(SubscriptionDetails(
+            NetworkState.disconnected, IntendedState.connected));
+
+  /// {@template amplify_common.hub.api_subscription_disconnected}
+  /// Emitted when a GraphQL subscription connection has disconnected.
+  /// {@endtemplate}
+  SubscriptionHubEvent.disconnected()
+      : this._(SubscriptionDetails(
+            NetworkState.disconnected, IntendedState.disconnected));
+
+  /// {@template amplify_common.hub.api_subscription_pending_disconnect}
+  /// Emitted when a GraphQL subscription connection is pending disconnect,
+  /// but should exist.
+  /// {@endtemplate}
+  SubscriptionHubEvent.pendingDisconnect()
+      : this._(SubscriptionDetails(
+            NetworkState.connected, IntendedState.disconnected));
+
+  /// {@template amplify_common.hub.api_subscription_failed}
+  /// Emitted when a GraphQL subscription connection has failed.
+  /// {@endtemplate}
+  SubscriptionHubEvent.failed()
+      : this._(SubscriptionDetails(
+            NetworkState.failed, IntendedState.disconnected));
+
+  @override
+  List<Object?> get props => [details, status];
+
+  @override
+  String get runtimeTypeName => 'SubscriptionHubEvent';
+
+  @override
+  Map<String, Object?> toJson() => <String, dynamic>{
+        'status': status.name,
+        'details': details.toJson(),
+      };
+}