Feature/zpf (#564)

* iOS: fix memory leak of blur effect * js: fix callback cause memory leak
doric-pub · Dec 20, 2022 · be4fb05 · be4fb05
1 parent c60754c
commit be4fb05
Show file tree

Hide file tree

Showing 13 changed files with 77 additions and 22 deletions.
diff --git a/doric-demo/src/Counter.ts b/doric-demo/src/Counter.ts
@@ -73,14 +73,22 @@ class CounterView extends ViewHolder {
 class CounterVM extends ViewModel<CountModel, CounterView> {
   onAttached(s: CountModel, vh: CounterView) {
     vh.counter.onClick = () => {
-      Promise.resolve(this.getState().count).then(count => {
-        Promise.resolve().then(() => {
-          this.updateState((state) => {
-            state.count = count + 1;
-          });
-        })
-      })
+      setInterval(() => {
+        // this.updateState(state => {
+        //   state.count++
+        // })
+        this.context.callNative("demo", "test2", "sdfsf")
+        //loge("setInterval")
+      }, 1)
     };
+    vh.number.onClick = () => {
+      setInterval(() => {
+        // this.updateState(state => {
+        //   state.count++
+        // })
+        this.context.callNative("demo", "test")
+      }, 1)
+    }
   }
   onBind(s: CountModel, vh: CounterView) {
     vh.number.text = `${s.count}`;

diff --git a/doric-iOS/Example/Example/DemoLibrary.m b/doric-iOS/Example/Example/DemoLibrary.m
@@ -11,8 +11,11 @@ @interface DoricDemoPlugin : DoricNativePlugin
 
 @implementation DoricDemoPlugin
 - (void)test {
+}
+
+- (void)test2:(NSString *)val withPromise:(DoricPromise *)promise {
     dispatch_async(dispatch_get_main_queue(), ^{
-        ShowToast(@"Test called", DoricGravityCenter);
+        [promise resolve:nil];
     });
 }
 @end

diff --git a/doric-iOS/Example/Example/ViewController.m b/doric-iOS/Example/Example/ViewController.m
@@ -46,10 +46,7 @@ - (void)viewDidLoad {
     [Doric registerLibrary:[DemoLibrary new]];
     [Doric enablePerformance:YES];
     [Doric enableRenderSnapshot:YES];
-}
 
-- (void)viewDidAppear:(BOOL)animated {
-    [super viewDidAppear:animated];
     [self.view addSubview:[[UITableView new] also:^(UITableView *it) {
         it.width = self.view.width;
         it.height = self.view.height;
@@ -59,6 +56,10 @@ - (void)viewDidAppear:(BOOL)animated {
     }]];
 }
 
+- (void)viewDidAppear:(BOOL)animated {
+    [super viewDidAppear:animated];
+}
+
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
     return self.demoFilePaths.count;
 }

diff --git a/doric-iOS/Pod/Classes/Shader/DoricBlurEffectViewNode.m b/doric-iOS/Pod/Classes/Shader/DoricBlurEffectViewNode.m
@@ -29,10 +29,12 @@ @interface DoricBlurEffectView : UIVisualEffectView
 @implementation DoricBlurEffectView
 - (instancetype)initWithEffect:(UIVisualEffect *)effect {
     if (self = [super initWithEffect:effect]) {
+        __weak typeof(self) weakSelf = self;
         _animator = [[UIViewPropertyAnimator alloc]
                 initWithDuration:1
                            curve:UIViewAnimationCurveLinear
                       animations:^{
+                          __strong typeof(weakSelf) self = weakSelf;
                           self.effect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleLight];
                       }];
         _animator.fractionComplete = MIN(1, MAX(0, 15.0f / 200));
@@ -52,9 +54,6 @@ - (void)setRadius:(NSUInteger)radius {
     self.animator.fractionComplete = MIN(1, MAX(0, (radius / 200.f)));
 }
 
-- (void)dealloc {
-    [self.animator stopAnimation:YES];
-}
 @end
 
 @interface DoricBlurEffectViewNode ()
@@ -90,4 +89,8 @@ - (void)blendView:(UIView *)view forPropName:(NSString *)name propValue:(id)prop
         [super blendView:view forPropName:name propValue:prop];
     }
 }
+
+- (void)dealloc {
+    [self.visualEffectView.animator stopAnimation:YES];
+};
 @end
diff --git a/doric-js/bundle/doric-sandbox.es5.js b/doric-js/bundle/doric-sandbox.es5.js
@@ -17203,6 +17203,7 @@ var doric = (function (exports) {
 	    }
 	    hookBeforeNativeCall(context);
 	    Reflect.apply(callback.resolve, context, argumentsList);
+	    context.callbacks.delete(callbackId);
 	}
 	function jsCallReject(contextId, callbackId, args) {
 	    var arguments$1 = arguments;
@@ -17223,6 +17224,7 @@ var doric = (function (exports) {
 	    }
 	    hookBeforeNativeCall(context);
 	    Reflect.apply(callback.reject, context.entity, argumentsList);
+	    context.callbacks.delete(callbackId);
 	}
 	var Context = /** @class */ (function () {
 	    function Context(id) {

diff --git a/doric-js/bundle/doric-sandbox.js b/doric-js/bundle/doric-sandbox.js
@@ -1247,6 +1247,9 @@ var doric = (function (exports) {
         }
         hookBeforeNativeCall(context);
         Reflect.apply(callback.resolve, context, argumentsList);
+        if (callback.retained !== true) {
+            context.callbacks.delete(callbackId);
+        }
     }
     function jsCallReject(contextId, callbackId, args) {
         const context = gContexts.get(contextId);
@@ -1265,6 +1268,9 @@ var doric = (function (exports) {
         }
         hookBeforeNativeCall(context);
         Reflect.apply(callback.reject, context.entity, argumentsList);
+        if (callback.retained !== true) {
+            context.callbacks.delete(callbackId);
+        }
     }
     class Context {
         constructor(id) {
@@ -1328,7 +1334,8 @@ var doric = (function (exports) {
             const functionId = uniqueId('function');
             this.callbacks.set(functionId, {
                 resolve: func,
-                reject: () => { loge("This should not be called"); }
+                reject: () => { loge("This should not be called"); },
+                retained: true,
             });
             return functionId;
         }

diff --git a/doric-js/bundle/doric-vm.js b/doric-js/bundle/doric-vm.js
@@ -1258,6 +1258,9 @@ function jsCallResolve(contextId, callbackId, args) {
     }
     hookBeforeNativeCall(context);
     Reflect.apply(callback.resolve, context, argumentsList);
+    if (callback.retained !== true) {
+        context.callbacks.delete(callbackId);
+    }
 }
 function jsCallReject(contextId, callbackId, args) {
     const context = gContexts.get(contextId);
@@ -1276,6 +1279,9 @@ function jsCallReject(contextId, callbackId, args) {
     }
     hookBeforeNativeCall(context);
     Reflect.apply(callback.reject, context.entity, argumentsList);
+    if (callback.retained !== true) {
+        context.callbacks.delete(callbackId);
+    }
 }
 class Context {
     constructor(id) {
@@ -1339,7 +1345,8 @@ class Context {
         const functionId = uniqueId('function');
         this.callbacks.set(functionId, {
             resolve: func,
-            reject: () => { loge("This should not be called"); }
+            reject: () => { loge("This should not be called"); },
+            retained: true,
         });
         return functionId;
     }

diff --git a/doric-js/lib/src/runtime/sandbox.d.ts b/doric-js/lib/src/runtime/sandbox.d.ts
@@ -7,6 +7,7 @@ export declare class Context {
     callbacks: Map<string, {
         resolve: Function;
         reject: Function;
+        retained?: boolean;
     }>;
     classes: Map<string, ClassType<object>>;
     hookBeforeNativeCall(): void;

diff --git a/doric-js/lib/src/runtime/sandbox.js b/doric-js/lib/src/runtime/sandbox.js
@@ -45,6 +45,9 @@ export function jsCallResolve(contextId, callbackId, args) {
     }
     hookBeforeNativeCall(context);
     Reflect.apply(callback.resolve, context, argumentsList);
+    if (callback.retained !== true) {
+        context.callbacks.delete(callbackId);
+    }
 }
 export function jsCallReject(contextId, callbackId, args) {
     const context = gContexts.get(contextId);
@@ -63,6 +66,9 @@ export function jsCallReject(contextId, callbackId, args) {
     }
     hookBeforeNativeCall(context);
     Reflect.apply(callback.reject, context.entity, argumentsList);
+    if (callback.retained !== true) {
+        context.callbacks.delete(callbackId);
+    }
 }
 export class Context {
     constructor(id) {
@@ -126,7 +132,8 @@ export class Context {
         const functionId = uniqueId('function');
         this.callbacks.set(functionId, {
             resolve: func,
-            reject: () => { loge("This should not be called"); }
+            reject: () => { loge("This should not be called"); },
+            retained: true,
         });
         return functionId;
     }

diff --git a/doric-js/src/runtime/sandbox.es5.ts b/doric-js/src/runtime/sandbox.es5.ts
@@ -84,6 +84,9 @@ export function jsCallResolve(contextId: string, callbackId: string, args?: any)
     }
     hookBeforeNativeCall(context)
     Reflect.apply(callback.resolve, context, argumentsList)
+    if (callback.retained !== true) {
+        context.callbacks.delete(callbackId)
+    }
 }
 
 export function jsCallReject(contextId: string, callbackId: string, args?: any) {
@@ -103,12 +106,15 @@ export function jsCallReject(contextId: string, callbackId: string, args?: any)
     }
     hookBeforeNativeCall(context)
     Reflect.apply(callback.reject, context.entity, argumentsList)
+    if (callback.retained !== true) {
+        context.callbacks.delete(callbackId)
+    }
 }
 
 export class Context {
     entity: any
     id: string
-    callbacks: Map<string, { resolve: Function, reject: Function }> = new Map
+    callbacks: Map<string, { resolve: Function, reject: Function, retained?: boolean }> = new Map
     classes: Map<string, ClassType<object>> = new Map
 
     hookBeforeNativeCall() {
@@ -144,7 +150,8 @@ export class Context {
         const functionId = uniqueId('function')
         this.callbacks.set(functionId, {
             resolve: func,
-            reject: () => { loge("This should not be called") }
+            reject: () => { loge("This should not be called") },
+            retained: true,
         })
         return functionId
     }

diff --git a/doric-js/src/runtime/sandbox.ts b/doric-js/src/runtime/sandbox.ts
@@ -95,6 +95,9 @@ export function jsCallResolve(contextId: string, callbackId: string, args?: any)
     }
     hookBeforeNativeCall(context)
     Reflect.apply(callback.resolve, context, argumentsList)
+    if (callback.retained !== true) {
+        context.callbacks.delete(callbackId)
+    }
 }
 
 export function jsCallReject(contextId: string, callbackId: string, args?: any) {
@@ -114,12 +117,15 @@ export function jsCallReject(contextId: string, callbackId: string, args?: any)
     }
     hookBeforeNativeCall(context)
     Reflect.apply(callback.reject, context.entity, argumentsList)
+    if (callback.retained !== true) {
+        context.callbacks.delete(callbackId)
+    }
 }
 
 export class Context {
     entity: any
     id: string
-    callbacks: Map<string, { resolve: Function, reject: Function }> = new Map
+    callbacks: Map<string, { resolve: Function, reject: Function, retained?: boolean }> = new Map
     classes: Map<string, ClassType<object>> = new Map
 
     hookBeforeNativeCall() {
@@ -182,7 +188,8 @@ export class Context {
         const functionId = uniqueId('function')
         this.callbacks.set(functionId, {
             resolve: func,
-            reject: () => { loge("This should not be called") }
+            reject: () => { loge("This should not be called") },
+            retained: true,
         })
         return functionId
     }

diff --git a/doric-web/dist/index.js b/doric-web/dist/index.js
diff --git a/doric-web/dist/index.js.map b/doric-web/dist/index.js.map