google · AirChen · Aug 9, 2020 · Aug 10, 2020
diff --git a/Promises.xcodeproj/project.pbxproj b/Promises.xcodeproj/project.pbxproj
@@ -106,11 +106,15 @@
 		035D15F9209220150089EF3D /* FBLPromise+Await.m in Sources */ = {isa = PBXBuildFile; fileRef = 035D15E6208EF8750089EF3D /* FBLPromise+Await.m */; };
 		0391947B2095B73200C40218 /* Promise+DelayTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 039194792095B72300C40218 /* Promise+DelayTests.swift */; };
 		0391947E2095B9C600C40218 /* FBLPromise+DelayTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0391947C2095B9BE00C40218 /* FBLPromise+DelayTests.m */; };
+		07CA416524DC21B900DF147C /* FBLPromise+Observer.m in Sources */ = {isa = PBXBuildFile; fileRef = 07CA416424DC21B900DF147C /* FBLPromise+Observer.m */; };
+		07CA416624DC220900DF147C /* FBLPromise+Observer.m in Sources */ = {isa = PBXBuildFile; fileRef = 07CA416424DC21B900DF147C /* FBLPromise+Observer.m */; };
+		07CA416724DC221900DF147C /* FBLPromise+Observer.h in Headers */ = {isa = PBXBuildFile; fileRef = 07CA416324DC21AD00DF147C /* FBLPromise+Observer.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4ADC8B8C20E54A4E00D10D3D /* FBLPromise+Retry.m in Sources */ = {isa = PBXBuildFile; fileRef = 4ADC8B8B20E54A4E00D10D3D /* FBLPromise+Retry.m */; };
 		4ADC8B8E20E54A5900D10D3D /* FBLPromise+Retry.h in Headers */ = {isa = PBXBuildFile; fileRef = 4ADC8B8D20E54A5900D10D3D /* FBLPromise+Retry.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4ADC8B9020E54A7500D10D3D /* Promise+Retry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4ADC8B8F20E54A7500D10D3D /* Promise+Retry.swift */; };
 		4ADC8B9220E54A8800D10D3D /* Promise+RetryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4ADC8B9120E54A8800D10D3D /* Promise+RetryTests.swift */; };
 		4ADC8B9420E54A9E00D10D3D /* FBLPromise+RetryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4ADC8B9320E54A9E00D10D3D /* FBLPromise+RetryTests.m */; };
+		5A93506224E030F8009E1AB8 /* FBLPromise+ObserverTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A93506124E030F8009E1AB8 /* FBLPromise+ObserverTests.m */; };
 		OBJ_134 /* PromisesTestHelpers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "Promises::PromisesTestHelpers::Product" /* PromisesTestHelpers.framework */; };
 		OBJ_135 /* Promises.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "Promises::Promises::Product" /* Promises.framework */; };
 		OBJ_136 /* FBLPromisesTestHelpers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "Promises::FBLPromisesTestHelpers::Product" /* FBLPromisesTestHelpers.framework */; };
@@ -402,11 +406,14 @@
 		035D15F320915B490089EF3D /* FBLPromise+AwaitTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "FBLPromise+AwaitTests.m"; sourceTree = "<group>"; };
 		039194792095B72300C40218 /* Promise+DelayTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Promise+DelayTests.swift"; sourceTree = "<group>"; };
 		0391947C2095B9BE00C40218 /* FBLPromise+DelayTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "FBLPromise+DelayTests.m"; sourceTree = "<group>"; };
+		07CA416324DC21AD00DF147C /* FBLPromise+Observer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "FBLPromise+Observer.h"; sourceTree = "<group>"; };
+		07CA416424DC21B900DF147C /* FBLPromise+Observer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "FBLPromise+Observer.m"; sourceTree = "<group>"; };
 		4ADC8B8B20E54A4E00D10D3D /* FBLPromise+Retry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "FBLPromise+Retry.m"; sourceTree = "<group>"; };
 		4ADC8B8D20E54A5900D10D3D /* FBLPromise+Retry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "FBLPromise+Retry.h"; sourceTree = "<group>"; };
 		4ADC8B8F20E54A7500D10D3D /* Promise+Retry.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Promise+Retry.swift"; sourceTree = "<group>"; };
 		4ADC8B9120E54A8800D10D3D /* Promise+RetryTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Promise+RetryTests.swift"; sourceTree = "<group>"; };
 		4ADC8B9320E54A9E00D10D3D /* FBLPromise+RetryTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "FBLPromise+RetryTests.m"; sourceTree = "<group>"; };
+		5A93506124E030F8009E1AB8 /* FBLPromise+ObserverTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "FBLPromise+ObserverTests.m"; sourceTree = "<group>"; };
 		"Promises::FBLPromises::Product" /* FBLPromises.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = FBLPromises.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		"Promises::FBLPromisesInteroperabilityTests::Product" /* FBLPromisesInteroperabilityTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; path = FBLPromisesInteroperabilityTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		"Promises::FBLPromisesPerformanceTests::Product" /* FBLPromisesPerformanceTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; path = FBLPromisesPerformanceTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -593,6 +600,7 @@
 				0320406B204547D300D2D16C /* FBLPromise+Catch.m */,
 				035D15EE20911AB70089EF3D /* FBLPromise+Delay.m */,
 				0320404F204547D300D2D16C /* FBLPromise+Do.m */,
+				07CA416424DC21B900DF147C /* FBLPromise+Observer.m */,
 				03204068204547D300D2D16C /* FBLPromise+Race.m */,
 				0320406E204547D300D2D16C /* FBLPromise+Recover.m */,
 				03326C312084642000872827 /* FBLPromise+Reduce.m */,
@@ -620,6 +628,7 @@
 				03204053204547D300D2D16C /* FBLPromise+Catch.h */,
 				035D15F120911ACA0089EF3D /* FBLPromise+Delay.h */,
 				0320405B204547D300D2D16C /* FBLPromise+Do.h */,
+				07CA416324DC21AD00DF147C /* FBLPromise+Observer.h */,
 				03204064204547D300D2D16C /* FBLPromise+Race.h */,
 				03204054204547D300D2D16C /* FBLPromise+Recover.h */,
 				03326C342084643600872827 /* FBLPromise+Reduce.h */,
@@ -704,6 +713,7 @@
 			children = (
 				03204090204547D400D2D16C /* FBLPromise+AllTests.m */,
 				0320408A204547D400D2D16C /* FBLPromise+AlwaysTests.m */,
+				5A93506124E030F8009E1AB8 /* FBLPromise+ObserverTests.m */,
 				03204089204547D400D2D16C /* FBLPromise+AnyTests.m */,
 				03204093204547D400D2D16C /* FBLPromise+AsyncTests.m */,
 				035D15F320915B490089EF3D /* FBLPromise+AwaitTests.m */,
@@ -769,6 +779,7 @@
 				035D15F220911AD30089EF3D /* FBLPromise+Delay.h in Headers */,
 				032B8109204549080097BF12 /* FBLPromise+Any.h in Headers */,
 				032B8102204549080097BF12 /* FBLPromise+Do.h in Headers */,
+				07CA416724DC221900DF147C /* FBLPromise+Observer.h in Headers */,
 				032B8100204549080097BF12 /* FBLPromise+Async.h in Headers */,
 				032B80FC204549080097BF12 /* FBLPromise.h in Headers */,
 				032B8106204549080097BF12 /* FBLPromise+Then.h in Headers */,
@@ -1064,7 +1075,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 0;
 			files = (
+				07CA416524DC21B900DF147C /* FBLPromise+Observer.m in Sources */,
 				032B81242045494B0097BF12 /* FBLPromise+ThenInteroperabilityTests.m in Sources */,
+				5A93506224E030F8009E1AB8 /* FBLPromise+ObserverTests.m in Sources */,
 				032B81232045494B0097BF12 /* FBLPromise+CatchInteroperabilityTests.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1189,6 +1202,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 0;
 			files = (
+				07CA416624DC220900DF147C /* FBLPromise+Observer.m in Sources */,
 				032B80F8204549000097BF12 /* FBLPromise+Timeout.m in Sources */,
 				032B80F7204549000097BF12 /* FBLPromise+Then.m in Sources */,
 				032B80F2204549000097BF12 /* FBLPromise+Catch.m in Sources */,

diff --git a/Sources/FBLPromises/FBLPromise+Observer.m b/Sources/FBLPromises/FBLPromise+Observer.m
@@ -0,0 +1,80 @@
+/**
+ Copyright 2018 Google Inc. 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.
+ You may obtain a copy of the License at:
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License 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 "FBLPromise+Observer.h"
+
+@implementation FBLPromiseObserver
+{
+    FBLPromiseOnFulfillBlock _fulfillBlock;
+    FBLPromiseOnRejectBlock _rejectBlock;
+}
+
+- (void)fulfill:(nullable id)value {
+    if (_fulfillBlock) {
+        _fulfillBlock(value);
+    }
+}
+
+- (void)reject:(nullable NSError *)error {
+    if (_rejectBlock) {
+        _rejectBlock(error);
+    }
+}
+
+- (void)registerSignalFulfill:(FBLPromiseOnFulfillBlock)fulfill reject:(FBLPromiseOnRejectBlock)rejct {
+    _fulfillBlock = fulfill;
+    _rejectBlock = rejct;
+}
+
+- (void)unregister {
+    _fulfillBlock = nil;
+    _rejectBlock = nil;
+}
+
+@end
+
+@interface FBLPromise ()
+- (void)observeOnQueue:(dispatch_queue_t)queue
+               fulfill:(FBLPromiseOnFulfillBlock)onFulfill
+                reject:(FBLPromiseOnRejectBlock)onReject NS_SWIFT_UNAVAILABLE("");
+@end
+
+@implementation FBLPromise (Observer)
+- (instancetype)addObserver:(FBLPromiseObserver *)observer {
+    return [self onQueue:self.class.defaultDispatchQueue addObserver:observer];
+}
+
+- (instancetype)onQueue:(dispatch_queue_t)queue addObserver:(FBLPromiseObserver *)observer {
+    NSParameterAssert(queue);
+    NSParameterAssert(observer);
+
+    [self observeOnQueue:queue fulfill:^(id  _Nullable value) {
+        [observer fulfill:value];
+    } reject:^(NSError * _Nonnull error) {
+        [observer reject:error];
+    }];
+    return self;
+}
+@end
+
+@implementation FBLPromise (DotSyntax_ObserverAdditions)
+- (FBLPromise* (^)(FBLPromiseObserver *))addObserver {
+  return ^(FBLPromiseObserver *observer) {
+    return [self addObserver:observer];
+  };
+}
+@end
diff --git a/Sources/FBLPromises/include/FBLPromise+Observer.h b/Sources/FBLPromises/include/FBLPromise+Observer.h
@@ -0,0 +1,39 @@
+/**
+ Copyright 2018 Google Inc. 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.
+ You may obtain a copy of the License at:
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License 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 "FBLPromise.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef void (^FBLPromiseOnFulfillBlock)(id __nullable value) NS_SWIFT_UNAVAILABLE("");
+typedef void (^FBLPromiseOnRejectBlock)(NSError *error) NS_SWIFT_UNAVAILABLE("");
+
+@interface FBLPromiseObserver : NSObject
+- (void)fulfill:(nullable id)value;
+- (void)reject:(nullable NSError *)error;
+- (void)registerSignalFulfill:(FBLPromiseOnFulfillBlock)fulfill reject:(FBLPromiseOnRejectBlock)rejct;
+- (void)unregister;
+@end
+
+@interface FBLPromise (Observer)
+- (instancetype)addObserver:(FBLPromiseObserver *)observer;
+@end
+
+@interface FBLPromise<Value>(DotSyntax_ObserverAdditions)
+- (FBLPromise* (^)(FBLPromiseObserver *))addObserver FBL_PROMISES_DOT_SYNTAX NS_SWIFT_UNAVAILABLE("");
+@end
+NS_ASSUME_NONNULL_END
diff --git a/Sources/FBLPromises/include/FBLPromises.h b/Sources/FBLPromises/include/FBLPromises.h
@@ -30,3 +30,4 @@
 #import "FBLPromise+Timeout.h"
 #import "FBLPromise+Validate.h"
 #import "FBLPromise+Wrap.h"
+#import "FBLPromise+Observer.h"
diff --git a/Tests/FBLPromisesTests/FBLPromise+ObserverTests.m b/Tests/FBLPromisesTests/FBLPromise+ObserverTests.m
@@ -0,0 +1,57 @@
+//
+//  FBLPromise+ObserverTests.m
+//  FBLPromisesInteroperabilityTests
+//
+//  Created by air on 2020/8/9.
+//
+
+#import <XCTest/XCTest.h>
+
+#import "FBLPromise+Async.h"
+#import "FBLPromise+Observer.h"
+#import "FBLPromisesTestHelpers.h"
+
+@interface FBLPromiseObserverTests : XCTestCase
+@end
+
+@implementation FBLPromiseObserverTests
+
+- (void)testRegisterBlocks {
+    FBLPromise<NSNumber *> *promise1 =
+        [FBLPromise async:^(FBLPromiseFulfillBlock fulfill, FBLPromiseRejectBlock __unused _) {
+          FBLDelay(0.1, ^{
+            fulfill(@42);
+          });
+        }];
+    FBLPromise<NSString *> *promise2 =
+    [FBLPromise async:^(FBLPromiseFulfillBlock fulfill, FBLPromiseRejectBlock __unused _) {
+      FBLDelay(0.5, ^{
+        fulfill(@"Hello world!");
+      });
+    }];
+    FBLPromise<NSString *> *promise3 =
+        [FBLPromise async:^(FBLPromiseFulfillBlock __unused _, FBLPromiseRejectBlock reject) {
+          FBLDelay(1, ^{
+            reject([NSError errorWithDomain:FBLPromiseErrorDomain code:42 userInfo:nil]);
+          });
+        }];
+
+
+    FBLPromiseObserver *observer = [[FBLPromiseObserver alloc] init];
+    promise1.addObserver(observer);
+    promise2.addObserver(observer);
+    promise3.addObserver(observer);
+
+    // Receive all
+    [observer registerSignalFulfill:^(id  _Nullable value) {
+        XCTAssertNotNil(value);
+    } reject:^(NSError * _Nonnull error) {
+        XCTAssertEqual(error.code, 42);
+    }];
+
+    FBLDelay(2, ^{
+        [observer unregister];
+    });
+}
+
+@end