@shopify/react-native-skia 2.3.6 → 2.3.8

package/apple/SkiaCVPixelBufferUtils.mm

@@ -30,16 +30,12 @@
 #include <TargetConditionals.h>
 #if TARGET_RT_BIG_ENDIAN
 #define FourCC2Str(fourcc)                                                     \
-  (const char[]) {                                                             \
-    *((char *)&fourcc), *(((char *)&fourcc) + 1), *(((char *)&fourcc) + 2),    \
-        *(((char *)&fourcc) + 3), 0                                            \
-  }
+  (const char[]){*((char *)&fourcc), *(((char *)&fourcc) + 1),                 \
+                 *(((char *)&fourcc) + 2), *(((char *)&fourcc) + 3), 0}
 #else
 #define FourCC2Str(fourcc)                                                     \
-  (const char[]) {                                                             \
-    *(((char *)&fourcc) + 3), *(((char *)&fourcc) + 2),                        \
-        *(((char *)&fourcc) + 1), *(((char *)&fourcc) + 0), 0                  \
-  }
+  (const char[]){*(((char *)&fourcc) + 3), *(((char *)&fourcc) + 2),           \
+                 *(((char *)&fourcc) + 1), *(((char *)&fourcc) + 0), 0}
 #endif
 
 // pragma MARK: TextureHolder

package/cpp/api/JsiSkCanvas.h

@@ -242,8 +242,10 @@ public:
   }
 
   JSI_HOST_FUNCTION(getTotalMatrix) {
-    auto matrix = std::make_shared<JsiSkMatrix>(getContext(), _canvas->getTotalMatrix());
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, matrix, getContext());
+    auto matrix =
+        std::make_shared<JsiSkMatrix>(getContext(), _canvas->getTotalMatrix());
+    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, matrix,
+                                                       getContext());
   }
 
   JSI_HOST_FUNCTION(drawPoints) {

package/cpp/api/JsiSkTextStyle.h

@@ -137,7 +137,7 @@ public:
     }
     if (object.hasProperty(runtime, "halfLeading")) {
       auto propValue = object.getProperty(runtime, "halfLeading");
-      retVal.setHalfLeading(propValue.asNumber());
+      retVal.setHalfLeading(propValue.getBool());
     }
     if (object.hasProperty(runtime, "letterSpacing")) {
       auto propValue = object.getProperty(runtime, "letterSpacing");

package/cpp/api/recorder/Drawings.h

@@ -486,17 +486,6 @@ public:
     convertProperty(runtime, object, "rect", props.rect, variables);
   }
 
-  ~ImageCmd() {
-    if (props.image.has_value()) {
-      auto image = props.image.value();
-      if (image) {
-        _context->runOnMainThread([image]() {
-          // Image will be deleted when this lambda is destroyed on main thread
-        });
-      }
-    }
-  }
-
   void draw(DrawingCtx *ctx) {
     auto [x, y, width, height, rect, fit, image, sampling] = props;
     if (image.has_value()) {
@@ -806,15 +795,6 @@ public:
     convertProperty(runtime, object, "picture", props.picture, variables);
   }
 
-  ~PictureCmd() {
-    auto picture = props.picture;
-    if (picture) {
-      _context->runOnMainThread([picture]() {
-        // Picture will be deleted when this lambda is destroyed on main thread
-      });
-    }
-  }
-
   void draw(DrawingCtx *ctx) { ctx->canvas->drawPicture(props.picture); }
 };
 
@@ -951,15 +931,6 @@ public:
     convertProperty(runtime, object, "sampling", props.sampling, variables);
   }
 
-  ~AtlasCmd() {
-    auto image = props.image;
-    if (image) {
-      _context->runOnMainThread([image]() {
-        // Image will be deleted when this lambda is destroyed on main thread
-      });
-    }
-  }
-
   void draw(DrawingCtx *ctx) {
     if (props.image) {
       // Validate transforms and sprites have the same size
@@ -990,4 +961,4 @@ public:
   }
 };
 
-} // namespace RNSkia
+} // namespace RNSkia

package/cpp/api/recorder/RNRecorder.h

@@ -29,7 +29,22 @@ public:
   Variables variables;
 
   Recorder() = default;
-  ~Recorder() = default;
+  ~Recorder() {
+    if (!_context || commands.empty()) {
+      return;
+    }
+
+    auto context = _context;
+    using CommandList = std::vector<std::unique_ptr<Command>>;
+    auto pendingCommands = std::make_shared<CommandList>(std::move(commands));
+
+    context->runOnMainThread(
+        [pendingCommands = std::move(pendingCommands)]() mutable {
+          // Destroy the recorded commands on the main thread to ensure GPU
+          // backed resources release safely.
+          pendingCommands->clear();
+        });
+  }
 
   void savePaint(jsi::Runtime &runtime, const jsi::Object &props,
                  bool standalone) {
@@ -652,4 +667,4 @@ public:
   }
 };
 
-} // namespace RNSkia
+} // namespace RNSkia

package/cpp/jsi/RuntimeLifecycleMonitor.cpp

@@ -1,5 +1,6 @@
 #include "RuntimeLifecycleMonitor.h"
 
+#include <mutex>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
@@ -9,25 +10,43 @@ namespace RNJsi {
 static std::unordered_map<jsi::Runtime *,
                           std::unordered_set<RuntimeLifecycleListener *>>
     listeners;
+static std::mutex listenersMutex;
 
 struct RuntimeLifecycleMonitorObject : public jsi::HostObject {
   jsi::Runtime *_rt;
   explicit RuntimeLifecycleMonitorObject(jsi::Runtime *rt) : _rt(rt) {}
   ~RuntimeLifecycleMonitorObject() {
-    auto listenersSet = listeners.find(_rt);
-    if (listenersSet != listeners.end()) {
-      for (auto listener : listenersSet->second) {
-        listener->onRuntimeDestroyed(_rt);
+    std::unordered_set<RuntimeLifecycleListener *> listenersCopy;
+    {
+      std::lock_guard<std::mutex> lock(listenersMutex);
+      auto listenersSet = listeners.find(_rt);
+      if (listenersSet != listeners.end()) {
+        listenersCopy = listenersSet->second;
+        listeners.erase(listenersSet);
       }
-      listeners.erase(listenersSet);
+    }
+    for (auto listener : listenersCopy) {
+      listener->onRuntimeDestroyed(_rt);
     }
   }
 };
 
 void RuntimeLifecycleMonitor::addListener(jsi::Runtime &rt,
                                           RuntimeLifecycleListener *listener) {
-  auto listenersSet = listeners.find(&rt);
-  if (listenersSet == listeners.end()) {
+  bool shouldInstallMonitor = false;
+  {
+    std::lock_guard<std::mutex> lock(listenersMutex);
+    auto listenersSet = listeners.find(&rt);
+    if (listenersSet == listeners.end()) {
+      std::unordered_set<RuntimeLifecycleListener *> newSet;
+      newSet.insert(listener);
+      listeners.emplace(&rt, std::move(newSet));
+      shouldInstallMonitor = true;
+    } else {
+      listenersSet->second.insert(listener);
+    }
+  }
+  if (shouldInstallMonitor) {
     // We install a global host object in the provided runtime, this way we can
     // use that host object destructor to get notified when the runtime is being
     // terminated. We use a unique name for the object as it gets saved with the
@@ -36,16 +55,12 @@ void RuntimeLifecycleMonitor::addListener(jsi::Runtime &rt,
         rt, "__rnskia_rt_lifecycle_monitor",
         jsi::Object::createFromHostObject(
             rt, std::make_shared<RuntimeLifecycleMonitorObject>(&rt)));
-    std::unordered_set<RuntimeLifecycleListener *> newSet;
-    newSet.insert(listener);
-    listeners.emplace(&rt, std::move(newSet));
-  } else {
-    listenersSet->second.insert(listener);
   }
 }
 
 void RuntimeLifecycleMonitor::removeListener(
     jsi::Runtime &rt, RuntimeLifecycleListener *listener) {
+  std::lock_guard<std::mutex> lock(listenersMutex);
   auto listenersSet = listeners.find(&rt);
   if (listenersSet == listeners.end()) {
     // nothing to do here

package/cpp/jsi/ViewProperty.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <atomic>
 #include <functional>
 #include <jsi/jsi.h>
 #include <memory>
@@ -7,10 +8,35 @@
 #include <variant>
 
 #include "JsiSkPicture.h"
+#include "RuntimeLifecycleMonitor.h"
 
 namespace RNJsi {
 namespace jsi = facebook::jsi;
 
+class RuntimeAwareRuntimeGuard : public RuntimeLifecycleListener {
+public:
+  explicit RuntimeAwareRuntimeGuard(jsi::Runtime &runtime)
+      : _runtime(&runtime) {
+    RuntimeLifecycleMonitor::addListener(runtime, this);
+  }
+
+  ~RuntimeAwareRuntimeGuard() override {
+    auto runtime = _runtime.load();
+    if (runtime != nullptr) {
+      RuntimeLifecycleMonitor::removeListener(*runtime, this);
+    }
+  }
+
+  void onRuntimeDestroyed(jsi::Runtime *) override {
+    _runtime.store(nullptr);
+  }
+
+  jsi::Runtime *getRuntime() const { return _runtime.load(); }
+
+private:
+  std::atomic<jsi::Runtime *> _runtime;
+};
+
 class ViewProperty {
 public:
   ViewProperty(jsi::Runtime &runtime, const jsi::Value &value) {
@@ -31,8 +57,15 @@ public:
   ViewProperty(jsi::Runtime &runtime, const jsi::Value &value,
                PlatformContext platformContext, size_t nativeId) {
     // Set the onSize callback with all the necessary context
+    auto runtimeGuard = std::make_shared<RuntimeAwareRuntimeGuard>(runtime);
     _value = std::function<void(int, int)>(
-        [&runtime, platformContext, nativeId](int width, int height) {
+        [runtimeGuard, platformContext, nativeId](int width, int height) {
+          auto runtimePtr = runtimeGuard->getRuntime();
+          if (runtimePtr == nullptr) {
+            return;
+          }
+
+          jsi::Runtime &runtime = *runtimePtr;
           jsi::Object size(runtime);
           auto pd = platformContext->getPixelDensity();
           size.setProperty(runtime, "width", jsi::Value(width / pd));

package/package.json

@@ -8,7 +8,7 @@
     "setup-skia-web": "scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "2.3.6",
+  "version": "2.3.8",
   "skia": {
     "version": "m142",
     "checksums": {

package/scripts/install-skia.mjs

@@ -77,64 +77,89 @@ const runCommand = (command, args) => {
   });
 };
 
-const downloadToFile = (url, destPath) => {
+const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
+
+const downloadToFile = (url, destPath, maxRetries = 5) => {
   fs.mkdirSync(path.dirname(destPath), { recursive: true });
-  return new Promise((resolve, reject) => {
-    const request = (currentUrl) => {
-      https
-        .get(currentUrl, { headers: { "User-Agent": "node" } }, (res) => {
-          if (
-            res.statusCode &&
-            [301, 302, 303, 307, 308].includes(res.statusCode)
-          ) {
-            const { location } = res.headers;
-            if (location) {
-              res.resume();
-              request(location);
-            } else {
-              reject(new Error(`Redirect without location for ${currentUrl}`));
+
+  const attemptDownload = (retryCount = 0) => {
+    return new Promise((resolve, reject) => {
+      const request = (currentUrl) => {
+        https
+          .get(currentUrl, { headers: { "User-Agent": "node" } }, (res) => {
+            if (
+              res.statusCode &&
+              [301, 302, 303, 307, 308].includes(res.statusCode)
+            ) {
+              const { location } = res.headers;
+              if (location) {
+                res.resume();
+                request(location);
+              } else {
+                reject(new Error(`Redirect without location for ${currentUrl}`));
+              }
+              return;
             }
-            return;
-          }
 
-          if (res.statusCode !== 200) {
-            reject(
-              new Error(
+            if (res.statusCode !== 200) {
+              const error = new Error(
                 `Failed to download: ${res.statusCode} ${res.statusMessage}`
-              )
-            );
-            res.resume();
-            return;
-          }
-
-          const fileStream = fs.createWriteStream(destPath);
-          res.pipe(fileStream);
+              );
+              error.statusCode = res.statusCode;
+              reject(error);
+              res.resume();
+              return;
+            }
 
-          fileStream.on("finish", () => {
-            fileStream.close((err) => {
-              if (err) {
-                // If closing the stream errors, perform the same cleanup and reject.
-                fileStream.destroy();
-                fs.unlink(destPath, () => reject(err));
-              } else {
-                resolve();
-              }
+            const fileStream = fs.createWriteStream(destPath);
+            res.pipe(fileStream);
+
+            fileStream.on("finish", () => {
+              fileStream.close((err) => {
+                if (err) {
+                  // If closing the stream errors, perform the same cleanup and reject.
+                  fileStream.destroy();
+                  fs.unlink(destPath, () => reject(err));
+                } else {
+                  resolve();
+                }
+              });
             });
-          });
 
-          const cleanup = (error) => {
-            fileStream.destroy();
-            fs.unlink(destPath, () => reject(error));
-          };
+            const cleanup = (error) => {
+              fileStream.destroy();
+              fs.unlink(destPath, () => reject(error));
+            };
+
+            res.on("error", cleanup);
+            fileStream.on("error", cleanup);
+          })
+          .on("error", reject);
+      };
 
-          res.on("error", cleanup);
-          fileStream.on("error", cleanup);
-        })
-        .on("error", reject);
-    };
+      request(url);
+    });
+  };
 
-    request(url);
-  });
+  const downloadWithRetry = async (retryCount = 0) => {
+    try {
+      await attemptDownload(retryCount);
+    } catch (error) {
+      const isRateLimit = error.statusCode === 403 || error.message.includes('rate limit');
+      const shouldRetry = retryCount < maxRetries && (isRateLimit || error.code === 'ECONNRESET' || error.code === 'ETIMEDOUT');
+
+      if (shouldRetry) {
+        const delay = Math.pow(2, retryCount) * 1000; // 1s, 2s, 4s, 8s, 16s
+        console.log(`   ⚠️  Download failed (${error.message}), retrying in ${delay/1000}s... (attempt ${retryCount + 1}/${maxRetries})`);
+        await sleep(delay);
+        return downloadWithRetry(retryCount + 1);
+      } else {
+        throw error;
+      }
+    }
+  };
+
+  return downloadWithRetry();
 };
 
 const extractTarGz = async (archivePath, destDir) => {