fix: solve memory issue of cancelBlock

ab180 · Apr 16, 2024 · 980726b · 980726b
1 parent 951f594
commit 980726b
Show file tree

Hide file tree

Showing 20 changed files with 255 additions and 345 deletions.
diff --git a/Source/Concurrency/Contract/Chain/ContractCatch.swift b/Source/Concurrency/Contract/Chain/ContractCatch.swift
@@ -29,7 +29,7 @@ extension Contract {
                     contract.reject(error)
                 }
             },
-            onCanceled: { contract.cancel() }
+            onCanceled: { [weak contract] in contract?.cancel() }
         )
 
         return contract
@@ -51,7 +51,7 @@ extension Contract {
                 block(error)
                 contract.reject(error)
             },
-            onCanceled: { contract.cancel() }
+            onCanceled: { [weak contract] in contract?.cancel() }
         )
 
         return contract

diff --git a/Source/Concurrency/Contract/Chain/ContractFilter.swift b/Source/Concurrency/Contract/Chain/ContractFilter.swift
@@ -22,7 +22,7 @@ extension Contract {
                 if block(value) { contract.resolve(value) }
             },
             onRejected: { error in contract.reject(error) },
-            onCanceled: { contract.cancel() }
+            onCanceled: { [weak contract] in contract?.cancel() }
         )
 
         return contract
@@ -43,7 +43,7 @@ extension Contract {
                 contract.resolve(result)
             },
             onRejected: { error in contract.reject(error) },
-            onCanceled: { contract.cancel() }
+            onCanceled: { [weak contract] in contract?.cancel() }
         )
 
         return contract
@@ -77,15 +77,15 @@ extension Contract {
                         contract.resolve(result)
                     },
                     onRejected: { _ in },
-                    onCanceled: { contract.cancel() }
+                    onCanceled: { [weak contract] in contract?.cancel() }
                 )
                 self?.subscribe(
                     queue: queue,
-                    onCanceled: { promise.cancel() }
+                    onCanceled: { [weak promise] in promise?.cancel() }
                 )
             },
             onRejected: { error in contract.reject(error) },
-            onCanceled: { contract.cancel() }
+            onCanceled: { [weak contract] in contract?.cancel() }
         )
 
         return contract
@@ -118,15 +118,15 @@ extension Contract {
                         contract.resolve($0)
                     },
                     onRejected: { _ in },
-                    onCanceled: { contract.cancel() }
+                    onCanceled: { [weak contract] in contract?.cancel() }
                 )
                 self?.subscribe(
                     queue: queue,
-                    onCanceled: { promise.cancel() }
+                    onCanceled: { [weak promise] in promise?.cancel() }
                 )
             },
             onRejected: { error in contract.reject(error) },
-            onCanceled: { contract.cancel() }
+            onCanceled: { [weak contract] in contract?.cancel() }
         )
 
         return contract

diff --git a/Source/Concurrency/Contract/Chain/ContractFinally.swift b/Source/Concurrency/Contract/Chain/ContractFinally.swift
@@ -27,7 +27,7 @@ extension Contract {
                 block()
                 contract.reject(error)
             },
-            onCanceled: { contract.cancel() }
+            onCanceled: { [weak contract] in contract?.cancel() }
         )
 
         return contract

diff --git a/Source/Concurrency/Contract/Chain/ContractRecover.swift b/Source/Concurrency/Contract/Chain/ContractRecover.swift
@@ -29,7 +29,7 @@ extension Contract {
                     contract.reject(error)
                 }
             },
-            onCanceled: { contract.cancel() }
+            onCanceled: { [weak contract] in contract?.cancel() }
         )
 
         return contract
@@ -69,19 +69,19 @@ extension Contract {
                             defer { finish() }
                             contract.reject($0)
                         },
-                        onCanceled: { contract.cancel() }
+                        onCanceled: { [weak contract] in contract?.cancel() }
                     )
                     self?.subscribe(
                         queue: queue,
-                        onCanceled: { promise.cancel() }
+                        onCanceled: { [weak promise] in promise?.cancel() }
                     )
                 }
                 catch let error {
                     defer { finish() }
                     contract.reject(error)
                 }
             },
-            onCanceled: { contract.cancel() }
+            onCanceled: { [weak contract] in contract?.cancel() }
         )
 
         return contract
@@ -105,7 +105,7 @@ extension Contract {
                 let result = block(error)
                 contract.resolve(result)
             },
-            onCanceled: { contract.cancel() }
+            onCanceled: { [weak contract] in contract?.cancel() }
         )
 
         return contract
@@ -144,14 +144,14 @@ extension Contract {
                         defer { finish() }
                         contract.reject($0)
                     },
-                    onCanceled: { contract.cancel() }
+                    onCanceled: { [weak contract] in contract?.cancel() }
                 )
                 self?.subscribe(
                     queue: queue,
-                    onCanceled: { promise.cancel() }
+                    onCanceled: { [weak promise] in promise?.cancel() }
                 )
             },
-            onCanceled: { contract.cancel() }
+            onCanceled: { [weak contract] in contract?.cancel() }
         )
 
         return contract

diff --git a/Source/Concurrency/Contract/Chain/ContractThen.swift b/Source/Concurrency/Contract/Chain/ContractThen.swift
@@ -29,7 +29,7 @@ extension Contract {
                 }
             },
             onRejected: { error in contract.reject(error) },
-            onCanceled: { contract.cancel() }
+            onCanceled: { [weak contract] in contract?.cancel() }
         )
 
         return contract
@@ -68,11 +68,11 @@ extension Contract {
                             defer { finish() }
                             contract.reject($0)
                         },
-                        onCanceled: { contract.cancel() }
+                        onCanceled: { [weak contract] in contract?.cancel() }
                     )
                     self?.subscribe(
                         queue: queue,
-                        onCanceled: { promise.cancel() }
+                        onCanceled: { [weak promise] in promise?.cancel() }
                     )
                 }
                 catch let error {
@@ -81,7 +81,7 @@ extension Contract {
                 }
             },
             onRejected: { error in contract.reject(error) },
-            onCanceled: { contract.cancel() }
+            onCanceled: { [weak contract] in contract?.cancel() }
         )
 
         return contract
@@ -105,7 +105,7 @@ extension Contract where Failure == Never {
                 contract.resolve(result)
             },
             onRejected: { _ in },
-            onCanceled: { contract.cancel() }
+            onCanceled: { [weak contract] in contract?.cancel() }
         )
 
         return contract
@@ -143,15 +143,15 @@ extension Contract where Failure == Never {
                         defer { finish() }
                         contract.reject($0)
                     },
-                    onCanceled: { contract.cancel() }
+                    onCanceled: { [weak contract] in contract?.cancel() }
                 )
                 self?.subscribe(
                     queue: queue,
-                    onCanceled: { promise.cancel() }
+                    onCanceled: { [weak promise] in promise?.cancel() }
                 )
             },
             onRejected: { _ in },
-            onCanceled: { contract.cancel() }
+            onCanceled: { [weak contract] in contract?.cancel() }
         )
 
         return contract

diff --git a/Source/Concurrency/Promise/Attribute/PromiseConvert.swift b/Source/Concurrency/Promise/Attribute/PromiseConvert.swift
@@ -31,7 +31,7 @@ extension Promise {
             queue: queue,
             onResolved: { promiseReturn.resolve($0) },
             onRejected: { promiseReturn.reject($0) },
-            onCanceled: { promiseReturn.cancel() }
+            onCanceled: { [weak promiseReturn] in promiseReturn?.cancel() }
         )
 
         return promiseReturn
@@ -44,7 +44,7 @@ extension Promise {
             queue: queue,
             onResolved: { _ in promiseReturn.resolve(()) },
             onRejected: { promiseReturn.reject($0) },
-            onCanceled: { promiseReturn.cancel() }
+            onCanceled: { [weak promiseReturn] in promiseReturn?.cancel() }
         )
 
         return promiseReturn
@@ -57,7 +57,7 @@ extension Promise {
             queue: queue,
             onResolved: { promiseReturn.resolve($0) },
             onRejected: { promiseReturn.reject($0) },
-            onCanceled: { promiseReturn.cancel() }
+            onCanceled: { [weak promiseReturn] in promiseReturn?.cancel() }
         )
 
         return promiseReturn
@@ -72,7 +72,7 @@ extension Promise where Failure == Never {
             queue: queue,
             onResolved: { promiseReturn.resolve($0) },
             onRejected: { _ in },
-            onCanceled: { promiseReturn.cancel() }
+            onCanceled: { [weak promiseReturn] in promiseReturn?.cancel() }
         )
 
         return promiseReturn
@@ -85,7 +85,7 @@ extension Promise where Failure == Never {
             queue: queue,
             onResolved: { promiseReturn.resolve($0) },
             onRejected: { _ in },
-            onCanceled: { promiseReturn.cancel() }
+            onCanceled: { [weak promiseReturn] in promiseReturn?.cancel() }
         )
 
         return promiseReturn
@@ -98,7 +98,7 @@ extension Promise where Failure == Never {
             queue: queue,
             onResolved: { _ in promiseReturn.resolve(()) },
             onRejected: { _ in },
-            onCanceled: { promiseReturn.cancel() }
+            onCanceled: { [weak promiseReturn] in promiseReturn?.cancel() }
         )
 
         return promiseReturn
@@ -111,7 +111,7 @@ extension Promise where Failure == Never {
             queue: queue,
             onResolved: { promiseReturn.resolve($0) },
             onRejected: { _ in },
-            onCanceled: { promiseReturn.cancel() }
+            onCanceled: { [weak promiseReturn] in promiseReturn?.cancel() }
         )
 
         return promiseReturn

diff --git a/Source/Concurrency/Promise/Attribute/PromiseDelay.swift b/Source/Concurrency/Promise/Attribute/PromiseDelay.swift
@@ -37,7 +37,7 @@ extension Promise {
                 }
             },
             onRejected: { promiseReturn.reject($0) },
-            onCanceled: { promiseReturn.cancel() }
+            onCanceled: { [weak promiseReturn] in promiseReturn?.cancel() }
         )
 
         return promiseReturn

diff --git a/Source/Concurrency/Promise/Attribute/PromiseTimeout.swift b/Source/Concurrency/Promise/Attribute/PromiseTimeout.swift
@@ -39,7 +39,7 @@ extension Promise {
             queue: queue,
             onResolved: { promiseReturn.resolve($0) },
             onRejected: { promiseReturn.reject($0) },
-            onCanceled: { promiseReturn.cancel() }
+            onCanceled: { [weak promiseReturn] in promiseReturn?.cancel() }
         )
 
         queue.asyncAfter(deadline: .now() + interval) {

diff --git a/Source/Concurrency/Promise/Chain/PromiseCatch.swift b/Source/Concurrency/Promise/Chain/PromiseCatch.swift
@@ -29,7 +29,7 @@ extension Promise {
                     promiseReturn.reject(error)
                 }
             },
-            onCanceled: { promiseReturn.cancel() }
+            onCanceled: { [weak promiseReturn] in promiseReturn?.cancel() }
         )
 
         return promiseReturn
@@ -48,7 +48,7 @@ extension Promise {
             queue: queue,
             onResolved: { promiseReturn.resolve($0) },
             onRejected: { block($0); promiseReturn.reject($0) },
-            onCanceled: { promiseReturn.cancel() }
+            onCanceled: { [weak promiseReturn] in promiseReturn?.cancel() }
         )
 
         return promiseReturn

diff --git a/Source/Concurrency/Promise/Chain/PromiseFinally.swift b/Source/Concurrency/Promise/Chain/PromiseFinally.swift
@@ -21,7 +21,7 @@ extension Promise {
             queue: queue,
             onResolved: { block(); promiseReturn.resolve($0) },
             onRejected: { block(); promiseReturn.reject($0) },
-            onCanceled: { promiseReturn.cancel() }
+            onCanceled: { [weak promiseReturn] in promiseReturn?.cancel() }
         )
 
         return promiseReturn

diff --git a/Source/Concurrency/Promise/Chain/PromiseRecover.swift b/Source/Concurrency/Promise/Chain/PromiseRecover.swift
@@ -28,7 +28,7 @@ extension Promise {
                     promiseReturn.reject(error)
                 }
             },
-            onCanceled: { promiseReturn.cancel() }
+            onCanceled: { [weak promiseReturn] in promiseReturn?.cancel() }
         )
 
         return promiseReturn
@@ -53,17 +53,17 @@ extension Promise {
                         queue: queue,
                         onResolved: { promiseReturn.resolve($0) },
                         onRejected: { promiseReturn.reject($0) },
-                        onCanceled: { promiseReturn.cancel() }
+                        onCanceled: { [weak promiseReturn] in promiseReturn?.cancel() }
                     )
                     self?.subscribe(
                         queue: queue,
-                        onCanceled: { promise.cancel() }
+                        onCanceled: { [weak promise] in promise?.cancel() }
                     )
                 } catch let error {
                     promiseReturn.reject(error)
                 }
             },
-            onCanceled: { promiseReturn.cancel() }
+            onCanceled: { [weak promiseReturn] in promiseReturn?.cancel() }
         )
 
         return promiseReturn
@@ -87,7 +87,7 @@ extension Promise {
                 let value = block($0)
                 promiseReturn.resolve(value)
             },
-            onCanceled: { promiseReturn.cancel() }
+            onCanceled: { [weak promiseReturn] in promiseReturn?.cancel() }
         )
 
         return promiseReturn
@@ -111,14 +111,14 @@ extension Promise {
                     queue: queue,
                     onResolved: { promiseReturn.resolve($0) },
                     onRejected: { promiseReturn.reject($0) },
-                    onCanceled: { promiseReturn.cancel() }
+                    onCanceled: { [weak promiseReturn] in promiseReturn?.cancel() }
                 )
                 self?.subscribe(
                     queue: queue,
-                    onCanceled: { promise.cancel() }
+                    onCanceled: { [weak promise] in promise?.cancel() }
                 )
             },
-            onCanceled: { promiseReturn.cancel() }
+            onCanceled: { [weak promiseReturn] in promiseReturn?.cancel() }
         )
 
         return promiseReturn