@javascriptcommon/react-native-webview 13.19.0 → 13.19.1

package/android/src/main/java/com/reactnativecommunity/webview/RNCWebView.java

@@ -178,6 +178,7 @@ public class RNCWebView extends WebView implements LifecycleEventListener {
     public static void enqueueBgScript(String script) {
         RNCWebView v = EMBED_INSTANCE;
         if (v != null && script != null) {
+            v.noteActivity();
             v.pendingBgScripts.add(script);
             v.bgInjectHandler.post(v.drainRunnable);  // immediate drain (FIFO)
         }
@@ -213,10 +214,39 @@ public class RNCWebView extends WebView implements LifecycleEventListener {
     private static final long KEEP_ALIVE_INTERVAL_MS = 200;
     private boolean keepAliveRunning = false;
 
+    // The tick only earns its keep while the page has something to do: a track
+    // playing (the page reports its position every second), loading, or being
+    // driven by the app. Paused, it ran on for as long as the process lived —
+    // five evaluations a second, each waking the renderer and the main thread,
+    // with the screen off, for nothing. So it stops after this long without any
+    // activity (a script from the app, a message from the page) and the next
+    // one starts it again, on the same main-thread handler and before that
+    // script is drained, so a play or a navigate never lands on a renderer the
+    // tick was supposed to be keeping awake.
+    private static final long KEEP_ALIVE_IDLE_MS = 60_000;
+    private volatile long lastActivityAt = 0;
+
+    private final Runnable resumeKeepAliveRunnable = new Runnable() {
+        @Override
+        public void run() { if (contentBlockerEnabled) startKeepAlive(); }
+    };
+
+    /** Something is happening on the embed page: keep (or start) the tick. Any thread. */
+    void noteActivity() {
+        lastActivityAt = android.os.SystemClock.elapsedRealtime();
+        if (contentBlockerEnabled && !keepAliveRunning) {
+            bgInjectHandler.postAtFrontOfQueue(resumeKeepAliveRunnable);
+        }
+    }
+
     private final Runnable keepAliveRunnable = new Runnable() {
         @Override
         public void run() {
             if (!keepAliveRunning) return;
+            if (android.os.SystemClock.elapsedRealtime() - lastActivityAt > KEEP_ALIVE_IDLE_MS) {
+                stopKeepAlive();
+                return;
+            }
             // Throws once the WebView is destroyed; the flag above normally gets
             // there first, but a destroy racing this tick must not take the app.
             try { evaluateJavascript("1+1", null); } catch (Throwable ignored) { }
@@ -227,6 +257,7 @@ public class RNCWebView extends WebView implements LifecycleEventListener {
     private void startKeepAlive() {
         if (keepAliveRunning) return;
         keepAliveRunning = true;
+        lastActivityAt = android.os.SystemClock.elapsedRealtime();
         // Logged because there is no way to tell from outside whether the tick
         // is running: it evaluates a script with no observable effect, which is
         // the whole point of it. One line at each edge, never per tick.
@@ -457,6 +488,9 @@ public class RNCWebView extends WebView implements LifecycleEventListener {
     }
 
     protected void evaluateJavascriptWithFallback(String script) {
+        // The app driving the page (injectJavaScript, the frame-gated channel)
+        // is activity too; the keep-alive's own "1+1" does not come through here.
+        noteActivity();
         evaluateJavascript(script, null);
     }
 
@@ -486,6 +520,7 @@ public class RNCWebView extends WebView implements LifecycleEventListener {
     }
 
     public void onMessage(String message, String sourceUrl) {
+        noteActivity();
         ThemedReactContext reactContext = getThemedReactContext();
         RNCWebView mWebView = this;
 
@@ -576,6 +611,10 @@ public class RNCWebView extends WebView implements LifecycleEventListener {
     }
 
     protected void cleanupCallbacksAndDestroy() {
+        // A message from the page racing the teardown must not start the tick
+        // again on a destroyed view (noteActivity is gated on this flag).
+        contentBlockerEnabled = false;
+        bgInjectHandler.removeCallbacks(resumeKeepAliveRunnable);
         stopKeepAlive();
         bgInjectHandler.removeCallbacks(drainRunnable);
         if (EMBED_INSTANCE == this) EMBED_INSTANCE = null;

package/apple/RNCWebViewImpl.m

@@ -315,6 +315,7 @@ RCTAutoInsetsProtocol>
 
 - (void)dealloc
 {
+  [self stopKeepWebViewActiveTimer];
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   if (@available(iOS 11.0, *)) {
     [self.webView.configuration.websiteDataStore.httpCookieStore removeObserver:self];
@@ -548,6 +549,35 @@ RCTAutoInsetsProtocol>
     }
 }
 
+// The keep-alive tick belongs to one WKWebView. It used to be created with
+// `target:self` and never invalidated: a scheduled NSTimer retains its target,
+// so destroyWebView (Fabric's prepareForRecycle) left it firing 5 times a
+// second for the rest of the process, kept this view alive with it, and a
+// recycled view that built a new WKWebView started a second one next to it.
+// Every WebView the app ever mounted (the embed engine, each rebuilt
+// extraction page, sign-in and import pages) added a tick that never stopped.
+// Now the timer holds the view weakly, there is at most one per view, and it
+// ends with the WKWebView it keeps alive.
+- (void)startKeepWebViewActiveTimer {
+    [self stopKeepWebViewActiveTimer];
+    __weak RNCWebViewImpl *weakSelf = self;
+    self.keepWebViewActiveTimer = [NSTimer scheduledTimerWithTimeInterval:0.2
+                                    repeats:YES
+                                    block:^(NSTimer *timer) {
+        RNCWebViewImpl *strongSelf = weakSelf;
+        if (strongSelf == nil) {
+            [timer invalidate];
+            return;
+        }
+        [strongSelf _keepWKWebViewActive:timer];
+    }];
+}
+
+- (void)stopKeepWebViewActiveTimer {
+    [self.keepWebViewActiveTimer invalidate];
+    self.keepWebViewActiveTimer = nil;
+}
+
 - (void)didMoveToWindow
 {
   if (self.window != nil && _webView == nil) {
@@ -612,11 +642,7 @@ RCTAutoInsetsProtocol>
     [self setKeyboardDisplayRequiresUserAction: _savedKeyboardDisplayRequiresUserAction];
     [self visitSource];
 
-    self.keepWebViewActiveTimer = [NSTimer scheduledTimerWithTimeInterval:0.2
-                                    target:self
-                                    selector:@selector(_keepWKWebViewActive:)
-                                    userInfo:nil
-                                    repeats:YES];
+    [self startKeepWebViewActiveTimer];
   }
 
 #if !TARGET_OS_OSX
@@ -655,6 +681,7 @@ RCTAutoInsetsProtocol>
 - (void)removeFromSuperview
 #endif
 {
+  [self stopKeepWebViewActiveTimer];
   if (_webView) {
     [_webView.configuration.userContentController removeScriptMessageHandlerForName:HistoryShimName];
     [_webView.configuration.userContentController removeScriptMessageHandlerForName:MessageHandlerName];

package/package.json

@@ -10,7 +10,7 @@
     "Thibault Malbranche <malbranche.thibault@gmail.com>"
   ],
   "license": "MIT",
-  "version": "13.19.0",
+  "version": "13.19.1",
   "homepage": "https://github.com/react-native-webview/react-native-webview#readme",
   "scripts": {
     "android": "react-native run-android",