chore: update functions based on API Doc modification

Author: SelaseKay

Diff for: packages/cloud_functions/cloud_functions/android/src/main/java/io/flutter/plugins/firebase/functions/FirebaseFunctionsStreamHandler.java

@@ -62,8 +62,4 @@ private void httpsStreamCall(Map<String, Object> arguments, EventChannel.EventSi
       events.error("firebase_functions", e.getMessage(), null);
     }
   }
-
-  public Object getResult() {
-    return subscriber.getResult();
-  }
 }

Diff for: packages/cloud_functions/cloud_functions/android/src/main/java/io/flutter/plugins/firebase/functions/FlutterFirebaseFunctionsPlugin.java

@@ -38,8 +38,6 @@ public class FlutterFirebaseFunctionsPlugin
   private MethodChannel channel;
   private FlutterPluginBinding pluginBinding;
 
-  private FirebaseFunctionsStreamHandler streamHandler;
-
   /**
    * Default Constructor.
    *
@@ -66,7 +64,7 @@ private void registerEventChannel(Map<String, Object> arguments) {
     final EventChannel eventChannel =
         new EventChannel(pluginBinding.getBinaryMessenger(), eventChannelName);
     FirebaseFunctions functions = getFunctions(arguments);
-    streamHandler = new FirebaseFunctionsStreamHandler(functions);
+    FirebaseFunctionsStreamHandler streamHandler = new FirebaseFunctionsStreamHandler(functions);
     eventChannel.setStreamHandler(streamHandler);
   }
 
@@ -129,25 +127,11 @@ private Task<Object> httpsFunctionCall(Map<String, Object> arguments) {
     return taskCompletionSource.getTask();
   }
 
-  private void getCompleteResult(Result result) {
-    cachedThreadPool.execute(
-        () -> {
-          try {
-            Object completeResult = streamHandler.getResult();
-            result.success(completeResult);
-          } catch (Exception e) {
-            result.error("firebase_functions", e.getMessage(), getExceptionDetails(e));
-          }
-        });
-  }
-
   @Override
   public void onMethodCall(MethodCall call, @NonNull final Result result) {
     if (call.method.equals("FirebaseFunctions#registerEventChannel")) {
       registerEventChannel(call.arguments());
       result.success(null);
-    } else if (call.method.equals("FirebaseFunctions#getCompleteResult")) {
-      getCompleteResult(result);
     } else if (call.method.equals("FirebaseFunctions#call")) {
       httpsFunctionCall(call.arguments())
           .addOnCompleteListener(

Diff for: packages/cloud_functions/cloud_functions/android/src/main/java/io/flutter/plugins/firebase/functions/StreamResponseSubscriber.java

@@ -8,7 +8,8 @@
 import android.os.Looper;
 import com.google.firebase.functions.StreamResponse;
 import io.flutter.plugin.common.EventChannel;
-import java.util.concurrent.CountDownLatch;
+import java.util.HashMap;
+import java.util.Map;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 
@@ -18,10 +19,6 @@ public class StreamResponseSubscriber implements Subscriber<StreamResponse> {
 
   private final Handler mainThreadHandler = new Handler(Looper.getMainLooper());
 
-  private CountDownLatch latch = new CountDownLatch(1);
-
-  private Object result;
-
   public StreamResponseSubscriber(EventChannel.EventSink eventSink) {
     this.eventSink = eventSink;
   }
@@ -34,20 +31,22 @@ public void onSubscribe(Subscription s) {
 
   @Override
   public void onNext(StreamResponse streamResponse) {
+    Map<String, Object> messageMap = new HashMap<>();
     if (streamResponse instanceof StreamResponse.Message) {
       Object message = ((StreamResponse.Message) streamResponse).getMessage().getData();
-      mainThreadHandler.post(() -> eventSink.success(message));
+      messageMap.put("message", message);
+      mainThreadHandler.post(() -> eventSink.success(messageMap));
     } else {
-      this.result = ((StreamResponse.Result) streamResponse).getResult().getData();
-      latch.countDown();
+      Object result = ((StreamResponse.Result) streamResponse).getResult().getData();
+      messageMap.put("result", result);
+      mainThreadHandler.post(() -> eventSink.success(messageMap));
     }
   }
 
   @Override
   public void onError(Throwable t) {
     if (eventSink != null) {
       eventSink.error("firebase_functions", t.getMessage(), null);
-      latch.countDown();
     }
   }
 
@@ -61,16 +60,6 @@ public void onComplete() {
   public void cancel() {
     if (subscription != null) {
       subscription.cancel();
-      latch.countDown();
-    }
-  }
-
-  public Object getResult() {
-    try {
-      latch.await();
-      return this.result;
-    } catch (Exception e) {
-      throw new RuntimeException(e);
     }
   }
 }

Diff for: packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/FirebaseFunctionsPlugin.swift

@@ -19,7 +19,6 @@ let kFLTFirebaseFunctionsChannelName = "plugins.flutter.io/firebase_functions"
 
 public class FirebaseFunctionsPlugin: NSObject, FLTFirebasePluginProtocol, FlutterPlugin {
   private let binaryMessenger: FlutterBinaryMessenger
-  private var streamHandler: FunctionsStreamHandler?
 
   init(binaryMessenger: FlutterBinaryMessenger) {
     self.binaryMessenger = binaryMessenger
@@ -66,18 +65,11 @@ public class FirebaseFunctionsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt
     let eventChannelName = "\(kFLTFirebaseFunctionsChannelName)/\(eventChannelId)"
     let eventChannel = FlutterEventChannel(name: eventChannelName, binaryMessenger: binaryMessenger)
     let functions = getFunctions(arguments: arguments)
-    streamHandler = FunctionsStreamHandler(functions: functions)
+    let streamHandler = FunctionsStreamHandler(functions: functions)
     eventChannel.setStreamHandler(streamHandler)
   }
 
   public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
-    if call.method == "FirebaseFunctions#getCompleteResult" {
-      Task {
-        await getCompleteResult(result: result)
-      }
-      return
-    }
-
     guard let arguments = call.arguments as? [String: Any] else {
       result(FlutterError(code: "invalid_arguments",
                           message: "Invalid arguments",
@@ -157,11 +149,6 @@ public class FirebaseFunctionsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt
     }
   }
 
-  private func getCompleteResult(result: @escaping FlutterResult) async {
-    let value = await streamHandler?.getResult()
-    result(value)
-  }
-
   private func getFunctions(arguments: [String: Any]) -> Functions {
     let appName = arguments["appName"] as? String ?? ""
     let region = arguments["region"] as? String

Diff for: packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/FunctionsStreamHandler.swift

@@ -13,13 +13,9 @@ import FirebaseFunctions
 class FunctionsStreamHandler: NSObject, FlutterStreamHandler {
   var functions: Functions
   private var streamTask: Task<Void, Never>?
-  @MainActor private var streamResult: Any?
-  private let continuation: AsyncStream<Any?>.Continuation
-  private let stream: AsyncStream<Any?>
 
   init(functions: Functions) {
     self.functions = functions
-    (stream, continuation) = AsyncStream.makeStream(of: Any?.self)
     super.init()
   }
 
@@ -33,7 +29,6 @@ class FunctionsStreamHandler: NSObject, FlutterStreamHandler {
 
   func onCancel(withArguments arguments: Any?) -> FlutterError? {
     streamTask?.cancel()
-    continuation.finish()
     return nil
   }
 
@@ -84,10 +79,11 @@ class FunctionsStreamHandler: NSObject, FlutterStreamHandler {
           await MainActor.run {
             switch response {
             case let .message(message):
-              events(message.value)
+              var wrappedMessage: [String: Any?] = ["message": message.value]
+              events(wrappedMessage)
             case let .result(result):
-              self.streamResult = result.value
-              continuation.yield(result.value)
+              var wrappedResult: [String: Any?] = ["result": result.value]
+              events(wrappedResult)
             }
           }
         }
@@ -96,26 +92,14 @@ class FunctionsStreamHandler: NSObject, FlutterStreamHandler {
           events(FlutterError(code: "unknown",
                               message: error.localizedDescription,
                               details: ["code": "unknown", "message": error.localizedDescription]))
-          continuation.yield(nil)
-          continuation.finish()
         }
       }
     } else {
       await MainActor.run {
         events(FlutterError(code: "unknown",
                             message: "Streaming requires iOS 15+",
                             details: nil))
-        continuation.yield(nil)
       }
-      continuation.finish()
     }
   }
-
-  @MainActor
-  func getResult() async -> Any? {
-    for await result in stream {
-      return result
-    }
-    return nil
-  }
 }

Diff for: packages/cloud_functions/cloud_functions/lib/cloud_functions.dart

@@ -8,7 +8,6 @@ import 'dart:async';
 // ignore: unnecessary_import
 import 'dart:typed_data';
 
-import 'package:cloud_functions/src/https_callable_stream_result.dart';
 import 'package:cloud_functions_platform_interface/cloud_functions_platform_interface.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart'
@@ -22,3 +21,4 @@ part 'src/firebase_functions.dart';
 part 'src/https_callable.dart';
 part 'src/https_callable_result.dart';
 part 'src/https_callable_stream.dart';
+part 'src/https_callable_stream_result.dart';

Diff for: packages/cloud_functions/cloud_functions/lib/src/https_callable_stream.dart

@@ -5,20 +5,23 @@
 
 part of '../cloud_functions.dart';
 
-class HttpsCallableStream<R> {
+class HttpsCallableStream {
   HttpsCallableStream._(this.delegate);
 
   /// Returns the underlying [HttpsCallableStream] delegate for this
   /// [HttpsCallableStreamsPlatform] instance. This is useful for testing purposes only.
   @visibleForTesting
   final HttpsCallableStreamsPlatform delegate;
 
-  Stream<Chunk<T>> stream<T>([Object? input]) async* {
+  Stream<StreamResponse> stream<T, R>([Object? input]) async* {
     await for (final value in delegate.stream(input)) {
-      yield Chunk<T>(value);
+      if (value is Map) {
+        if (value.containsKey('message')) {
+          yield Chunk<T>(value['message'] as T);
+        } else if (value.containsKey('result')) {
+          yield Result<R>(HttpsCallableResult._(value['result'] as R));
+        }
+      }
     }
   }
-
-  Future<Result<R>> get data async =>
-      Result<R>(HttpsCallableResult<R>._(await delegate.data));
 }

Diff for: packages/cloud_functions/cloud_functions/lib/src/https_callable_stream_result.dart

@@ -3,19 +3,19 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:cloud_functions/cloud_functions.dart';
+part of '../cloud_functions.dart';
 
 /// Represents a response from a Server-Sent Event (SSE) stream.
-sealed class StreamResponse<T> {}
+sealed class StreamResponse {}
 
 /// A chunk received during the stream.
-class Chunk<T> extends StreamResponse<T> {
+class Chunk<T> extends StreamResponse {
   final T partialData;
   Chunk(this.partialData);
 }
 
 /// The final result of the computation, marking the end of the stream.
-class Result<T> extends StreamResponse<T> {
-  final HttpsCallableResult<T> result;
+class Result<R> extends StreamResponse {
+  final HttpsCallableResult<R> result;
   Result(this.result);
 }