Merge branch 'release/0.3.22'

Author: yulingtianxia

dart_native/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.22
+
+* [Fix] Callbacks from multi-isolates on iOS.
+
 ## 0.3.21
 
 * [Fix] Some crash on Android.

dart_native/example/ios/Podfile.lock

@@ -23,7 +23,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   CocoaLumberjack: e8955b9d337ac307103b0a34fd141c32f27e53c5
-  dart_native: 5de43456852385997b9b29dbf40f85d82c265e1a
+  dart_native: 628e1d0112ce8c6a09fc506004a16820b20a2d16
   Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
 
 PODFILE CHECKSUM: f10e42e188a012076f9d5e111f499229a501832a

dart_native/example/ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -76,7 +76,6 @@
 				AD7A5062BD98140867CF8A5E /* Pods-Runner.release.xcconfig */,
 				9CB3F088E1519AF7D9E72E82 /* Pods-Runner.profile.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -186,7 +185,7 @@
 				};
 			};
 			buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
-			compatibilityVersion = "Xcode 9.3";
+			compatibilityVersion = "Xcode 12.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -378,6 +377,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = D3RCVUP6VH;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -509,6 +509,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = D3RCVUP6VH;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -535,6 +536,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = D3RCVUP6VH;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

dart_native/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Profile"

dart_native/example/ios/Runner/AppDelegate.m

@@ -1,12 +1,25 @@
 #import "AppDelegate.h"
 #import "GeneratedPluginRegistrant.h"
 #import <CocoaLumberjack/CocoaLumberjack.h>
+
+#if __has_include(<dart_native/dart_native.h>)
+#import <dart_native/dart_native.h>
+#else
+@import dart_native;
+#endif
+
 #import "RuntimeSon.h"
 
+
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application
     didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+#if DEBUG
+    DartNativeSetThrowException(true);
+#else
+    DartNativeSetThrowException(false);
+#endif
     FlutterViewController *controller = (FlutterViewController*)self.window.rootViewController;
 
     FlutterMethodChannel *channel = [FlutterMethodChannel methodChannelWithName:@"sample.dartnative.com"

dart_native/example/ios/Runner/RuntimeStub.m

@@ -27,7 +27,7 @@ - (instancetype)init {
     self = [super init];
     if (self) {
         _object = [NSObject new];
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_global_queue(QOS_CLASS_DEFAULT, 0), ^{
             [NSNotificationCenter.defaultCenter postNotificationName:@"SampleDartNotification" object:nil];
         });
     }
@@ -232,7 +232,7 @@ - (void)fooCompletion:(void (^)(void))block {
 
 - (void)fooCStringBlock:(CStringRetBlock)block {
     char *arg = "test c-string";
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_global_queue(QOS_CLASS_DEFAULT, 0), ^{
         if (block) {
             char *result = block(arg);
             DDLogInfo(@"%s result: %s", __FUNCTION__, result);
@@ -242,15 +242,15 @@ - (void)fooCStringBlock:(CStringRetBlock)block {
 
 - (void)fooDelegate:(id<SampleDelegate>)delegate {
     DDLogInfo(@"%s arg: %@", __FUNCTION__, delegate);
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_global_queue(QOS_CLASS_DEFAULT, 0), ^{
         NSObject *result = [delegate callback];
         DDLogInfo(@"%s callback result:%@", __FUNCTION__, result);
     });
 }
 
 - (void)fooStructDelegate:(id<SampleDelegate>)delegate {
     DDLogInfo(@"%s arg: %@", __FUNCTION__, delegate);
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_global_queue(QOS_CLASS_DEFAULT, 0), ^{
         CGRect result = [delegate callbackStruct:CGRectMake(1.1, 2.2, 3.3, 4.4)];
         DDLogInfo(@"%s callback result:%@", __FUNCTION__, NSStringFromCGRect(result));
     });

dart_native/example/lib/ios/unit_test.dart

@@ -160,9 +160,11 @@ testIOS(RuntimeStub stub, DelegateStub delegate) {
 
 void _checkTimer(String isolateID) async {
   RuntimeStub stub = RuntimeStub();
+  DelegateStub delegate = DelegateStub();
   Timer.periodic(new Duration(seconds: 1), (Timer t) {
     stub.fooCompletion(() {
       print('hello completion block on $isolateID!');
     });
+    stub.fooDelegate(delegate);
   });
 }

dart_native/example/pubspec.lock

@@ -168,7 +168,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.3.21"
+    version: "0.3.22"
   dart_native_gen:
     dependency: transitive
     description:

dart_native/ios/Classes/DNAssociatedDartObject.h

@@ -0,0 +1,28 @@
+//
+//  DNDartPortsContainer.h
+//  dart_native
+//
+//  Created by 杨萧玉 on 2021/7/18.
+//
+
+#import <Foundation/Foundation.h>
+#import "dart_api_dl.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DNAssociatedDartObject : NSObject
+
+@property (nonatomic, readonly, weak) NSObject *host;
+// Object can be passed on multi-isolates.
+@property (nonatomic, readonly) NSSet<NSNumber *> *dartPorts;
+
+- (instancetype)initWithHost:(NSObject *)host
+                  storageKey:(const void *)storageKey;
++ (instancetype)attachHost:(NSObject *)host
+                  dartPort:(Dart_Port)dartPort
+                storageKey:(const void *)storageKey;
++ (instancetype)objectForHost:(NSObject *)host
+                   storageKey:(const void *)storageKey;
+@end
+
+NS_ASSUME_NONNULL_END

dart_native/ios/Classes/DNAssociatedDartObject.m

@@ -0,0 +1,74 @@
+//
+//  DNDartPortsContainer.m
+//  dart_native
+//
+//  Created by 杨萧玉 on 2021/7/18.
+//
+
+#import "DNAssociatedDartObject.h"
+#import <objc/runtime.h>
+#import "native_runtime.h"
+
+@interface DNAssociatedDartObject ()
+
+@property (nonatomic) NSMutableSet<NSNumber *> *internalDartPorts;
+@property (nonatomic) dispatch_queue_t portsQueue;
+
+@end
+
+@implementation DNAssociatedDartObject
+
+- (instancetype)initWithHost:(NSObject *)host
+                  storageKey:(nonnull const void *)storageKey {
+    self = [super init];
+    if (self) {
+        _host = host;
+        _internalDartPorts = [NSMutableSet set];
+        _portsQueue = dispatch_queue_create("com.dartnative.associatedobject", DISPATCH_QUEUE_CONCURRENT);
+        objc_setAssociatedObject(host, storageKey, self, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+    }
+    return self;
+}
+
++ (instancetype)attachHost:(NSObject *)host
+                  dartPort:(Dart_Port)dartPort
+                storageKey:(nonnull const void *)storageKey {
+    if (!host) {
+        return nil;
+    }
+    __kindof DNAssociatedDartObject *object = [self objectForHost:host
+                                                       storageKey:storageKey];
+    if (!object && (!objc_isTaggedPointer((__bridge const void *)(host)) ||
+               [host isKindOfClass:NSClassFromString(@"__NSMallocBlock")])) {
+        object = [[self alloc] initWithHost:host storageKey:storageKey];
+    }
+    [object addDartPort:dartPort];
+    return object;
+}
+
++ (instancetype)objectForHost:(NSObject *)host
+                   storageKey:(nonnull const void *)storageKey {
+    return objc_getAssociatedObject(host, storageKey);
+}
+
+- (NSSet<NSNumber *> *)dartPorts {
+    __block NSSet<NSNumber *> *temp;
+    dispatch_sync(self.portsQueue, ^{
+        temp = [self.internalDartPorts copy];
+    });
+    return temp;
+}
+
+- (void)addDartPort:(Dart_Port)port {
+    dispatch_barrier_async(self.portsQueue, ^{
+        [self.internalDartPorts addObject:@(port)];
+    });
+}
+
+- (void)removeDartPort:(Dart_Port)port {
+    dispatch_barrier_async(self.portsQueue, ^{
+        [self.internalDartPorts removeObject:@(port)];
+    });
+}
+
+@end