react-native-worklets 0.11.2 → 0.11.4

package/Common/cpp/worklets/RunLoop/AsyncQueueImpl.cpp

@@ -9,11 +9,40 @@
 #include <thread>
 #include <utility>
 
+#if __APPLE__
+extern "C" {
+void *objc_autoreleasePoolPush(void);
+void objc_autoreleasePoolPop(void *pool);
+}
+#endif // __APPLE__
+
 namespace worklets {
 
 using namespace facebook;
 
+#if __APPLE__
+namespace {
+
+class ScopedAutoreleasePool {
+ public:
+  ScopedAutoreleasePool() : pool_(objc_autoreleasePoolPush()) {}
+  ~ScopedAutoreleasePool() {
+    objc_autoreleasePoolPop(pool_);
+  }
+  ScopedAutoreleasePool(const ScopedAutoreleasePool &) = delete;
+  ScopedAutoreleasePool &operator=(const ScopedAutoreleasePool &) = delete;
+
+ private:
+  void *const pool_;
+};
+
+} // namespace
+#endif // __APPLE__
+
 void AsyncQueueImpl::runLoop(const std::shared_ptr<AsyncQueueState> &state) {
+#if __APPLE__
+  const ScopedAutoreleasePool threadAutoreleasePool;
+#endif // __APPLE__
   while (state->running) {
     std::unique_lock<std::mutex> lock(state->mutex);
     state->cv.wait(lock, [state] { return !state->queue.empty() || !state->running; });
@@ -26,6 +55,9 @@ void AsyncQueueImpl::runLoop(const std::shared_ptr<AsyncQueueState> &state) {
     auto job = std::move(state->queue.front());
     state->queue.pop();
     lock.unlock();
+#if __APPLE__
+    const ScopedAutoreleasePool autoreleasePool;
+#endif // __APPLE__
     job();
   }
 }

package/android/src/networking/com/swmansion/worklets/WorkletsModule.kt

@@ -14,7 +14,6 @@ import com.facebook.react.turbomodule.core.CallInvokerHolderImpl
 import com.facebook.soloader.SoLoader
 import com.swmansion.worklets.runloop.AnimationFrameCallback
 import com.swmansion.worklets.runloop.AnimationFrameQueue
-import java.util.concurrent.atomic.AtomicBoolean
 
 @Suppress("KotlinJniMissingFunction")
 @ReactModule(name = WorkletsModule.NAME)
@@ -50,7 +49,8 @@ class WorkletsModule(
      * Invalidating concurrently could be fatal. It shouldn't happen in a normal flow, but it doesn't
      * cost us much to add synchronization for extra safety.
      */
-    private val mInvalidated = AtomicBoolean(false)
+    private val mInvalidationLock = Any()
+    private var mInvalidated = false
 
     @OptIn(FrameworkAPI::class)
     private external fun initHybrid(
@@ -161,9 +161,17 @@ class WorkletsModule(
         return mSlowAnimationsEnabled
     }
 
+    override fun initialize() {
+        reactApplicationContext.addLifecycleEventListener(this)
+    }
+
     override fun invalidate() {
-        if (mInvalidated.getAndSet(true)) {
-            return
+        synchronized(mInvalidationLock) {
+            if (mInvalidated) {
+                return
+            }
+            mInvalidated = true
+            reactApplicationContext.removeLifecycleEventListener(this)
         }
         if (mHybridData != null && mHybridData!!.isValid) {
             invalidateCpp()
@@ -176,11 +184,21 @@ class WorkletsModule(
     private external fun startCpp()
 
     override fun onHostResume() {
-        mAnimationFrameQueue.resume()
+        synchronized(mInvalidationLock) {
+            if (mInvalidated) {
+                return
+            }
+            mAnimationFrameQueue.resume()
+        }
     }
 
     override fun onHostPause() {
-        mAnimationFrameQueue.pause()
+        synchronized(mInvalidationLock) {
+            if (mInvalidated) {
+                return
+            }
+            mAnimationFrameQueue.pause()
+        }
     }
 
     override fun onHostDestroy() {}

package/android/src/no-networking/com/swmansion/worklets/WorkletsModule.kt

@@ -11,7 +11,6 @@ import com.facebook.react.turbomodule.core.CallInvokerHolderImpl
 import com.facebook.soloader.SoLoader
 import com.swmansion.worklets.runloop.AnimationFrameCallback
 import com.swmansion.worklets.runloop.AnimationFrameQueue
-import java.util.concurrent.atomic.AtomicBoolean
 
 @Suppress("KotlinJniMissingFunction")
 @ReactModule(name = WorkletsModule.NAME)
@@ -46,7 +45,8 @@ class WorkletsModule(
      * Invalidating concurrently could be fatal. It shouldn't happen in a normal flow, but it doesn't
      * cost us much to add synchronization for extra safety.
      */
-    private val mInvalidated = AtomicBoolean(false)
+    private val mInvalidationLock = Any()
+    private var mInvalidated = false
 
     @OptIn(FrameworkAPI::class)
     private external fun initHybrid(
@@ -117,9 +117,17 @@ class WorkletsModule(
         return mSlowAnimationsEnabled
     }
 
+    override fun initialize() {
+        reactApplicationContext.addLifecycleEventListener(this)
+    }
+
     override fun invalidate() {
-        if (mInvalidated.getAndSet(true)) {
-            return
+        synchronized(mInvalidationLock) {
+            if (mInvalidated) {
+                return
+            }
+            mInvalidated = true
+            reactApplicationContext.removeLifecycleEventListener(this)
         }
         if (mHybridData != null && mHybridData!!.isValid) {
             invalidateCpp()
@@ -132,11 +140,21 @@ class WorkletsModule(
     private external fun startCpp()
 
     override fun onHostResume() {
-        mAnimationFrameQueue.resume()
+        synchronized(mInvalidationLock) {
+            if (mInvalidated) {
+                return
+            }
+            mAnimationFrameQueue.resume()
+        }
     }
 
     override fun onHostPause() {
-        mAnimationFrameQueue.pause()
+        synchronized(mInvalidationLock) {
+            if (mInvalidated) {
+                return
+            }
+            mAnimationFrameQueue.pause()
+        }
     }
 
     override fun onHostDestroy() {}

package/lib/module/debug/jsVersion.js

@@ -5,5 +5,5 @@
  * version used to build the native part of the library in runtime. Remember to
  * keep this in sync with the version declared in `package.json`
  */
-export const jsVersion = '0.11.2';
+export const jsVersion = '0.11.4';
 //# sourceMappingURL=jsVersion.js.map

package/lib/typescript/debug/jsVersion.d.ts

@@ -3,5 +3,5 @@
  * version used to build the native part of the library in runtime. Remember to
  * keep this in sync with the version declared in `package.json`
  */
-export declare const jsVersion = "0.11.2";
+export declare const jsVersion = "0.11.4";
 //# sourceMappingURL=jsVersion.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-worklets",
-  "version": "0.11.2",
+  "version": "0.11.4",
   "description": "The React Native multithreading library",
   "keywords": [
     "react-native",

package/plugin/index.js

@@ -424,6 +424,7 @@ var require_globals = __commonJS({
     exports2.isGeneratedWorkletFile = isGeneratedWorkletFile;
     exports2.initializeGlobals = initializeGlobals;
     exports2.addCustomGlobals = addCustomGlobals;
+    var assert_1 = require("assert");
     var path_1 = __importDefault(require("path"));
     var autoworkletization_12 = require_autoworkletization();
     var types_12 = require_types();
@@ -565,7 +566,8 @@ var require_globals = __commonJS({
         addCustomGlobals(state);
       }
       const userImportForwarding = state.opts.importForwarding;
-      state.opts.importForwarding = {
+      (0, assert_1.strict)(state.importForwarding === void 0, "state.importForwarding should be undefined at this point");
+      state.importForwarding = {
         relativePaths: [
           ...defaultAllowedPaths,
           ...(_a = userImportForwarding === null || userImportForwarding === void 0 ? void 0 : userImportForwarding.relativePaths) !== null && _a !== void 0 ? _a : []
@@ -624,7 +626,7 @@ var require_imports = __commonJS({
           var _a;
           if (nodePath.get("callee").isIdentifier({ name: "require" }) && ((_a = nodePath.get("arguments")[0]) === null || _a === void 0 ? void 0 : _a.isStringLiteral())) {
             const requiredModule = nodePath.get("arguments")[0];
-            if (requiredModule.node.value.startsWith(".") && canForwardRelativeImport(state.file.opts.filename || "", state.opts.importForwarding.relativePaths)) {
+            if (requiredModule.node.value.startsWith(".") && canForwardRelativeImport(state.file.opts.filename || "", state.importForwarding.relativePaths)) {
               requiredModule.replaceWith(createImportPathLiteral(requiredModule.node.value, state));
             }
           }
@@ -721,13 +723,13 @@ var require_closure = __commonJS({
             scope = scope.parent;
           }
           if (state.opts.bundleMode && (0, imports_1.isImport)(binding)) {
-            if ((0, imports_1.isImportRelative)(binding) && (0, imports_1.canForwardRelativeImport)(state.filename, state.opts.importForwarding.relativePaths)) {
+            if ((0, imports_1.isImportRelative)(binding) && (0, imports_1.canForwardRelativeImport)(state.filename, state.importForwarding.relativePaths)) {
               capturedNames.add(name);
               relativeBindingsToImport.add(binding);
               return;
             }
             const source = binding.path.parentPath.node.source.value;
-            if ((0, imports_1.canForwardModuleImport)(source, state.opts.importForwarding.moduleNames)) {
+            if ((0, imports_1.canForwardModuleImport)(source, state.importForwarding.moduleNames)) {
               capturedNames.add(name);
               moduleBindingsToImport.add(binding);
               return;

package/src/debug/jsVersion.ts

@@ -5,4 +5,4 @@
  * version used to build the native part of the library in runtime. Remember to
  * keep this in sync with the version declared in `package.json`
  */
-export const jsVersion = '0.11.2';
+export const jsVersion = '0.11.4';