[in_app_purchase_android] Implement BillingClient connection management and introduce BillingClientManager

packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.5
+
+* Fixes the management of `BillingClient` connection.
+* Introduces `BillingClientManager`.
+
 ## 0.2.4+2
 
 * Updates links for the merge of flutter/plugins into flutter/packages.

packages/in_app_purchase/in_app_purchase_android/lib/billing_client_wrappers.dart

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+export 'src/billing_client_wrappers/billing_client_manager.dart';
 export 'src/billing_client_wrappers/billing_client_wrapper.dart';
 export 'src/billing_client_wrappers/purchase_wrapper.dart';
 export 'src/billing_client_wrappers/sku_details_wrapper.dart';

packages/in_app_purchase/in_app_purchase_android/lib/src/billing_client_wrappers/billing_client_manager.dart

@@ -0,0 +1,156 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:flutter/widgets.dart';
+
+import 'billing_client_wrapper.dart';
+import 'purchase_wrapper.dart';
+
+/// Abstraction of result of [BillingClient] operation that includes
+/// a [BillingResponse].
+abstract class HasBillingResponse {
+  /// The status of the operation.
+  abstract final BillingResponse responseCode;
+}
+
+/// Utility class that manages a [BillingClient] connection.
+///
+/// Connection is initialized on creation of [BillingClientManager].
+/// If [BillingClient] sends `onBillingServiceDisconnected` event or any
+/// operation returns [BillingResponse.serviceDisconnected], connection is
+/// re-initialized.
+///
+/// [BillingClient] instance is not exposed directly. It can be accessed via
+/// [run] and [runRaw] methods that handle the connection management.
+///
+/// Consider calling [dispose] after the [BillingClient] is no longer needed.
+class BillingClientManager {
+  /// Creates the [BillingClientManager].
+  ///
+  /// Immediately initializes connection to the underlying [BillingClient].
+  BillingClientManager() {
+    _connect();
+  }
+
+  /// Stream of `onPurchasesUpdated` events from the [BillingClient].
+  ///
+  /// This is a broadcast stream, so it can be listened to multiple times.
+  /// A "done" event will be sent after [dispose] is called.
+  late final Stream<PurchasesResultWrapper> purchasesUpdatedStream =
+      _purchasesUpdatedController.stream;
+
+  /// [BillingClient] instance managed by this [BillingClientManager].
+  ///
+  /// In order to access the [BillingClient], consider using [run] and [runRaw]
+  /// methods.
+  @visibleForTesting
+  late final BillingClient client = BillingClient(_onPurchasesUpdated);
+
+  final StreamController<PurchasesResultWrapper> _purchasesUpdatedController =
+      StreamController<PurchasesResultWrapper>.broadcast();
+
+  bool _isConnecting = false;
+  bool _isDisposed = false;
+
+  // Initialized immediately in the constructor, so it's always safe to access.
+  late Future<void> _readyFuture;
+
+  /// Executes the given [block] with access to the underlying [BillingClient].
+  ///
+  /// If necessary, waits for the underlying [BillingClient] to connect.
+  /// If given [block] returns [BillingResponse.serviceDisconnected], it will
+  /// be transparently retried after the connection is restored. Because
+  /// of this, [block] may be called multiple times.
+  ///
+  /// A response with [BillingResponse.serviceDisconnected] may be returned
+  /// in case of [dispose] being called during the operation.
+  ///
+  /// See [runRaw] for operations that do not return a subclass
+  /// of [HasBillingResponse].
+  Future<R> run<R extends HasBillingResponse>(
+    Future<R> Function(BillingClient client) block,
+  ) async {
+    assert(_debugAssertNotDisposed());
+    await _readyFuture;
+    final R result = await block(client);
+    if (result.responseCode == BillingResponse.serviceDisconnected &&
+        !_isDisposed) {
+      await _connect();
+      return run(block);
+    } else {
+      return result;
+    }
+  }
+
+  /// Executes the given [block] with access to the underlying [BillingClient].
+  ///
+  /// If necessary, waits for the underlying [BillingClient] to connect.
+  /// Designed only for operations that do not return a subclass
+  /// of [HasBillingResponse] (e.g. [BillingClient.isReady],
+  /// [BillingClient.isFeatureSupported]).
+  ///
+  /// See [runRaw] for operations that return a subclass
+  /// of [HasBillingResponse].
+  Future<R> runRaw<R>(Future<R> Function(BillingClient client) block) async {
+    assert(_debugAssertNotDisposed());
+    await _readyFuture;
+    return block(client);
+  }
+
+  /// Ends connection to the [BillingClient].
+  ///
+  /// Consider calling [dispose] after you no longer need the [BillingClient]
+  /// API to free up the resources.
+  ///
+  /// After calling [dispose] :
+  /// - Further connection attempts will not be made;
+  /// - [purchasesUpdatedStream] will be closed;
+  /// - Calls to [run] and [runRaw] will throw.
+  void dispose() {
+    assert(_debugAssertNotDisposed());
+    _isDisposed = true;
+    client.endConnection();
+    _purchasesUpdatedController.close();
+  }
+
+  // If disposed, does nothing.
+  // If currently connecting, waits for it to complete.
+  // Otherwise, starts a new connection.
+  Future<void> _connect() {
+    if (_isDisposed) {
+      return Future<void>.value();
+    }
+    if (_isConnecting) {
+      return _readyFuture;
+    }
+    _isConnecting = true;
+    _readyFuture = Future<void>.sync(() async {
+      await client.startConnection(onBillingServiceDisconnected: _connect);
+      _isConnecting = false;
+    });
+    return _readyFuture;
+  }
+
+  void _onPurchasesUpdated(PurchasesResultWrapper event) {
+    if (_isDisposed) {
+      return;
+    }
+    _purchasesUpdatedController.add(event);
+  }
+
+  bool _debugAssertNotDisposed() {
+    assert(() {
+      if (_isDisposed) {
+        throw FlutterError(
+          'A BillingClientManager was used after being disposed.\n'
+          'Once you have called dispose() on a BillingClientManager, it can no longer be used.',
+        );
+      }
+      return true;
+    }());
+    return true;
+  }
+}

packages/in_app_purchase/in_app_purchase_android/lib/src/billing_client_wrappers/billing_client_wrapper.dart

@@ -51,6 +51,12 @@ typedef PurchasesUpdatedListener = void Function(
 /// `com.android.billingclient.api.BillingClient` API as much as possible, with
 /// some minor changes to account for language differences. Callbacks have been
 /// converted to futures where appropriate.
+///
+/// Connection to [BillingClient] may be lost at any time (see
+/// `onBillingServiceDisconnected` param of [startConnection] and
+/// [BillingResponse.serviceDisconnected]).
+/// Consider using [BillingClientManager] that handles these disconnections
+/// transparently.
 class BillingClient {
   /// Creates a billing client.
   BillingClient(PurchasesUpdatedListener onPurchasesUpdated) {

packages/in_app_purchase/in_app_purchase_android/lib/src/billing_client_wrappers/purchase_wrapper.dart

@@ -6,6 +6,7 @@ import 'package:flutter/foundation.dart';
 import 'package:in_app_purchase_platform_interface/in_app_purchase_platform_interface.dart';
 import 'package:json_annotation/json_annotation.dart';
 
+import 'billing_client_manager.dart';
 import 'billing_client_wrapper.dart';
 import 'sku_details_wrapper.dart';
 
@@ -265,7 +266,7 @@ class PurchaseHistoryRecordWrapper {
 @JsonSerializable()
 @BillingResponseConverter()
 @immutable
-class PurchasesResultWrapper {
+class PurchasesResultWrapper implements HasBillingResponse {
   /// Creates a [PurchasesResultWrapper] with the given purchase result details.
   const PurchasesResultWrapper(
       {required this.responseCode,
@@ -300,6 +301,7 @@ class PurchasesResultWrapper {
   ///
   /// This can represent either the status of the "query purchase history" half
   /// of the operation and the "user made purchases" transaction itself.
+  @override
   final BillingResponse responseCode;
 
   /// The list of successful purchases made in this transaction.
@@ -316,7 +318,7 @@ class PurchasesResultWrapper {
 @JsonSerializable()
 @BillingResponseConverter()
 @immutable
-class PurchasesHistoryResult {
+class PurchasesHistoryResult implements HasBillingResponse {
   /// Creates a [PurchasesHistoryResult] with the provided history.
   const PurchasesHistoryResult(
       {required this.billingResult, required this.purchaseHistoryRecordList});
@@ -325,6 +327,9 @@ class PurchasesHistoryResult {
   factory PurchasesHistoryResult.fromJson(Map<String, dynamic> map) =>
       _$PurchasesHistoryResultFromJson(map);
 
+  @override
+  BillingResponse get responseCode => billingResult.responseCode;
+
   @override
   bool operator ==(Object other) {
     if (identical(other, this)) {

packages/in_app_purchase/in_app_purchase_android/lib/src/billing_client_wrappers/sku_details_wrapper.dart

@@ -5,6 +5,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:json_annotation/json_annotation.dart';
 
+import 'billing_client_manager.dart';
 import 'billing_client_wrapper.dart';
 
 // WARNING: Changes to `@JsonSerializable` classes need to be reflected in the
@@ -182,7 +183,7 @@ class SkuDetailsWrapper {
 /// Returned by [BillingClient.querySkuDetails].
 @JsonSerializable()
 @immutable
-class SkuDetailsResponseWrapper {
+class SkuDetailsResponseWrapper implements HasBillingResponse {
   /// Creates a [SkuDetailsResponseWrapper] with the given purchase details.
   @visibleForTesting
   const SkuDetailsResponseWrapper(
@@ -202,6 +203,9 @@ class SkuDetailsResponseWrapper {
   @JsonKey(defaultValue: <SkuDetailsWrapper>[])
   final List<SkuDetailsWrapper> skuDetailsList;
 
+  @override
+  BillingResponse get responseCode => billingResult.responseCode;
+
   @override
   bool operator ==(Object other) {
     if (other.runtimeType != runtimeType) {
@@ -221,7 +225,7 @@ class SkuDetailsResponseWrapper {
 @JsonSerializable()
 @BillingResponseConverter()
 @immutable
-class BillingResultWrapper {
+class BillingResultWrapper implements HasBillingResponse {
   /// Constructs the object with [responseCode] and [debugMessage].
   const BillingResultWrapper({required this.responseCode, this.debugMessage});
 
@@ -239,6 +243,7 @@ class BillingResultWrapper {
   }
 
   /// Response code returned in the Play Billing API calls.
+  @override
   final BillingResponse responseCode;
 
   /// Debug message returned in the Play Billing API calls.