iOS: remove strong self references in plugins

player-ui · Oct 27, 2023 · 33664b3 · 33664b3
1 parent 80a0ff7
commit 33664b3
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 21 deletions.
diff --git a/ios/plugins/BaseBeaconPlugin/Sources/BaseBeaconPlugin.swift b/ios/plugins/BaseBeaconPlugin/Sources/BaseBeaconPlugin.swift
@@ -84,15 +84,15 @@ open class BaseBeaconPlugin<BeaconStruct: Decodable>: JSBasePlugin {
         for plugin in plugins {
             plugin.context = self.context
         }
-        let callback: @convention(block) (JSValue?) -> Void = { rawBeacon in
+        let callback: @convention(block) (JSValue?) -> Void = { [weak self] rawBeacon in
             guard
                 let object = rawBeacon?.toObject(),
                 let data = try? JSONSerialization.data(withJSONObject: object),
                 let beacon = try? AnyTypeDecodingContext(rawData: data)
                     .inject(to: JSONDecoder())
                     .decode(BeaconStruct.self, from: data)
             else { return }
-            self.callback?(beacon)
+            self?.callback?(beacon)
         }
         let jsCallback = JSValue(object: callback, in: context) as Any
         return [["callback": jsCallback, "plugins": plugins.map { $0.pluginRef }]]

diff --git a/ios/plugins/BeaconPlugin/Sources/SwiftUIBeaconPlugin.swift b/ios/plugins/BeaconPlugin/Sources/SwiftUIBeaconPlugin.swift
@@ -27,8 +27,9 @@ public class BeaconPlugin<BeaconStruct: Decodable>: BaseBeaconPlugin<BeaconStruc
 
     public func apply<P>(player: P) where P: HeadlessPlayer {
         guard let player = player as? SwiftUIPlayer else { return }
+        let beacon = self.beacon(assetBeacon:)
         player.hooks?.view.tap(name: "BeaconPlugin") { view in
-            AnyView(view.environment(\.beaconContext, BeaconContext(self.beacon(assetBeacon:))))
+            AnyView(view.environment(\.beaconContext, BeaconContext(beacon)))
         }
     }
 }

diff --git a/ios/plugins/ExpressionPlugin/Sources/ExpressionPlugin.swift b/ios/plugins/ExpressionPlugin/Sources/ExpressionPlugin.swift
@@ -31,12 +31,13 @@ public class ExpressionPlugin: JSBasePlugin, NativePlugin {
     override public func getArguments() -> [Any] {
         guard
             let map = context?.evaluateScript("Map")?.construct(withArguments: []),
-            let restWrapper = context?.evaluateScript("(fn) => (context, ...args) => fn(context, args)")
+            let restWrapper = context?.evaluateScript("(fn) => (context, ...args) => fn(context, args)"),
+            let context = self.context
         else { return [] }
         for (key, value) in expressions {
-            let callback: @convention(block) (JSValue?, JSValue?) -> JSValue? = { (context, params) in
+            let callback: @convention(block) (JSValue?, JSValue?) -> JSValue? = { (_, params) in
                 let args = params?.toObject() as? [Any] ?? []
-                return JSValue(object: value(args), in: self.context)
+                return JSValue(object: value(args), in: context)
             }
             let jsCallback = JSValue(object: callback, in: context)
             map.invokeMethod("set", withArguments: [key, restWrapper.call(withArguments: [jsCallback as Any]) as Any])

diff --git a/ios/plugins/ExternalActionPlugin/Sources/ExternalActionPlugin.swift b/ios/plugins/ExternalActionPlugin/Sources/ExternalActionPlugin.swift
@@ -42,13 +42,13 @@ public class ExternalActionPlugin: JSBasePlugin, NativePlugin {
      - returns: An array of arguments to construct the plugin
      */
     override public func getArguments() -> [Any] {
-            let callback: @convention(block) (JSValue, JSValue) -> JSValue? = { (state, options) in
+            let callback: @convention(block) (JSValue, JSValue) -> JSValue? = { [weak self] (state, options) in
                 guard
-                    let context = self.context,
+                    let context = self?.context,
                     let controllers = PlayerControllers(from: options),
                     let promise = JSUtilities.createPromise(context: context, handler: { (resolve, reject) in
                         do {
-                            try self.handler?(NavigationFlowExternalState(state), controllers) { transition in
+                            try self?.handler?(NavigationFlowExternalState(state), controllers) { transition in
                                 resolve(transition)
                             }
                         } catch {

diff --git a/ios/plugins/ExternalActionViewModifierPlugin/Sources/ExternalActionViewModifierPlugin.swift b/ios/plugins/ExternalActionViewModifierPlugin/Sources/ExternalActionViewModifierPlugin.swift
@@ -63,22 +63,22 @@ open class ExternalActionViewModifierPlugin<ModifierType: ExternalStateViewModif
      - returns: An array of arguments to construct the plugin
      */
     override open func getArguments() -> [Any] {
-        let callback: @convention(block) (JSValue, JSValue) -> JSValue? = { (state, options) in
+        let callback: @convention(block) (JSValue, JSValue) -> JSValue? = { [weak self] (state, options) in
             guard
-                let context = self.context,
+                let context = self?.context,
                 let controllers = PlayerControllers(from: options),
                 let promise = JSUtilities.createPromise(context: context, handler: { (resolve, reject) in
-                    self.isExternalState = true
+                    self?.isExternalState = true
                     let state = NavigationFlowExternalState(state)
-                    self.state = state
+                    self?.state = state
                     do {
-                        self.content = try self.handler?(state, controllers) { transition in
+                        self?.content = try self?.handler?(state, controllers) { transition in
                             resolve(transition)
                             withAnimation {
-                                self.isExternalState = false
-                                self.state = nil
+                                self?.isExternalState = false
+                                self?.state = nil
                             }
-                            self.content = nil
+                            self?.content = nil
                         }
                     } catch {
                         reject(JSValue(newErrorFromMessage: error.playerDescription, in: context) as Any)

diff --git a/ios/plugins/MetricsPlugin/Sources/MetricsPlugin.swift b/ios/plugins/MetricsPlugin/Sources/MetricsPlugin.swift
@@ -22,8 +22,8 @@ public class RequestTimePlugin: NativePlugin {
 
     public func apply<P>(player: P) where P: HeadlessPlayer {
         requestTimeWebPlugin.context = player.jsPlayerReference?.context
-        player.applyTo(MetricsPlugin.self) { plugin in
-            self.requestTimeWebPlugin.pluginRef?.invokeMethod("apply", withArguments: [plugin])
+        player.applyTo(MetricsPlugin.self) { [weak self] plugin in
+            self?.requestTimeWebPlugin.pluginRef?.invokeMethod("apply", withArguments: [plugin])
         }
     }
 }
@@ -74,9 +74,10 @@ public class MetricsPlugin: JSBasePlugin, NativePlugin, WithSymbol {
 
     public func apply<P>(player: P) where P: HeadlessPlayer {
         guard trackRenderTime, let player = player as? SwiftUIPlayer else { return }
+        let renderEnd = self.renderEnd
         player.hooks?.view.tap(name: pluginName, { (view) -> AnyView in
             AnyView(view.onAppear {
-                self.renderEnd()
+                renderEnd()
             })
         })
     }

diff --git a/ios/plugins/SwiftUICheckPathPlugin/Sources/SwiftUICheckPathPlugin.swift b/ios/plugins/SwiftUICheckPathPlugin/Sources/SwiftUICheckPathPlugin.swift
@@ -12,7 +12,7 @@ public class SwiftUICheckPathPlugin: BaseCheckPathPlugin, NativePlugin {
 
     public func apply<P>(player: P) where P: HeadlessPlayer {
         guard let player = player as? SwiftUIPlayer else { return }
-        player.hooks?.view.tap(name: self.pluginName) { view in
+        player.hooks?.view.tap(name: self.pluginName) { [weak self] view in
             AnyView(view.environment(\.checkPath, self))
         }
     }