@amazon-devices/expo-image 2.0.9000000000 → 3.0.0

package/kepler/utils/SourceSelection.cpp

@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * PROPRIETARY/CONFIDENTIAL
+ * Use is subject to license terms.
+ */
+
+#include "SourceSelection.h"
+#include "../Constants.h"
+
+#include <apmf/iface/com/amazon/kepler/uitoolkit/react/JsType.h>
+
+#include <cmath>
+#include <limits>
+
+namespace expoimage {
+
+using apmf::iface::com::amazon::kepler::uitoolkit::react::JsType;
+
+std::string uriDecode(const std::string& input) {
+    std::string result;
+    result.reserve(input.size());
+    for (size_t i = 0; i < input.size(); ++i) {
+        if (input[i] == '%' && i + 2 < input.size()) {
+            auto hexVal = [](char c) -> int {
+                if (c >= '0' && c <= '9') return c - '0';
+                if (c >= 'A' && c <= 'F') return c - 'A' + 10;
+                if (c >= 'a' && c <= 'f') return c - 'a' + 10;
+                return -1;
+            };
+            int h = hexVal(input[i + 1]), l = hexVal(input[i + 2]);
+            if (h >= 0 && l >= 0) {
+                result += static_cast<char>(h * 16 + l);
+                i += 2;
+                continue;
+            }
+        }
+        result += input[i];
+    }
+    return result;
+}
+
+namespace {
+
+float readFloatField(View<IJsObject> elem, const Array<String>& keys, std::string_view name) {
+    if (!hasKey(keys, name)) return 0.0f;
+    auto type = elem->getElementValueType(name);
+    if (type.value == JsType::DOUBLE.value) return static_cast<float>(elem->getDouble(name));
+    if (type.value == JsType::INT.value) return static_cast<float>(elem->getInt(name));
+    return 0.0f;
+}
+
+}  // anonymous namespace
+
+ImageSourceInfo parseImageSource(View<IJsObject> elem) {
+    ImageSourceInfo info;
+    auto keys = elem->getAllKeys();
+    if (hasKey(keys, kUri)) info.uri = uriDecode(elem->getString(kUri));
+    info.width = readFloatField(elem, keys, kWidth);
+    info.height = readFloatField(elem, keys, kHeight);
+    return info;
+}
+
+std::optional<ImageSourceInfo> getBestSource(
+        const std::vector<ImageSourceInfo>& sources,
+        apmf::iface::com::amazon::kepler::uitoolkit::graphics::Size viewSize) {
+    if (sources.empty()) return std::nullopt;
+    if (sources.size() == 1) return sources.front();
+    float targetPx = viewSize.width * viewSize.height;
+    if (targetPx == 0) return std::nullopt;
+    const ImageSourceInfo* best = nullptr;
+    double bestFit = std::numeric_limits<double>::max();
+    for (const auto& s : sources) {
+        double fit = std::abs(1.0 - (double(s.width * s.height) / targetPx));
+        if (fit < bestFit) { bestFit = fit; best = &s; }
+    }
+    return best ? std::optional(*best) : std::nullopt;
+}
+
+}  // namespace expoimage

package/kepler/utils/SourceSelection.h

@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * PROPRIETARY/CONFIDENTIAL
+ * Use is subject to license terms.
+ */
+
+#pragma once
+
+#include <apmf/array.h>
+#include <apmf/iface/com/amazon/kepler/uitoolkit/graphics/Size.h>
+#include <apmf/iface/com/amazon/kepler/uitoolkit/react/IJsObject.h>
+#include <apmf/string.h>
+
+#include "../ImageSourceInfo.h"
+
+#include <optional>
+#include <string>
+#include <string_view>
+#include <vector>
+
+namespace expoimage {
+
+using apmf::detail::View;
+using apmf::String;
+template <typename T>
+using Array = apmf::Array<T>;
+using apmf::iface::com::amazon::kepler::uitoolkit::react::IJsObject;
+
+/** Returns true if the key exists in the array of strings. */
+inline bool hasKey(const Array<String>& keys, std::string_view target) {
+    return std::any_of(keys.begin(), keys.end(), [&](const auto& k) {
+        return std::string_view(k) == target;
+    });
+}
+
+inline bool startsWith(const std::string& str, const std::string& prefix) {
+    if (str.size() < prefix.size()) return false;
+    for (size_t i = 0; i < prefix.size(); ++i) {
+        char a = str[i];
+        char b = prefix[i];
+        if (a >= 'A' && a <= 'Z') a += 32;
+        if (b >= 'A' && b <= 'Z') b += 32;
+        if (a != b) return false;
+    }
+    return true;
+}
+
+/** Decodes percent-encoded characters in a URI string (e.g., %5E → ^). */
+std::string uriDecode(const std::string& input);
+
+/** Returns true if the uri is a blurhash or thumbhash URI (locally decoded, no network). */
+inline bool isHashUri(const std::string& uri) {
+    return startsWith(uri, "blurhash") || startsWith(uri, "thumbhash");
+}
+
+/** Parses an IJsObject into an ImageSourceInfo (uri, width, height). */
+ImageSourceInfo parseImageSource(View<IJsObject> elem);
+
+/** Selects the best source from a list based on pixel count vs view size. */
+std::optional<ImageSourceInfo> getBestSource(
+        const std::vector<ImageSourceInfo>& sources,
+        apmf::iface::com::amazon::kepler::uitoolkit::graphics::Size viewSize);
+
+}  // namespace expoimage

package/package.json

@@ -1 +1 @@
-{"name": "@amazon-devices/expo-image", "title": "Expo Image", "version": "2.0.9000000000+1.6.0", "description": "A cross-platform, performant image component for React Native and Expo with Web support", "main": "build/index.js", "types": "build/index.d.ts", "sideEffects": false, "scripts": {"build": "expo-module build", "clean": "expo-module clean", "lint": "expo-module lint", "test": "expo-module test", "prepublishOnly": "expo-module prepublishOnly", "expo-module": "expo-module"}, "homepage": "https://docs.expo.dev/versions/latest/sdk/image/", "repository": {"type": "git", "url": "https://github.com/expo/expo.git", "directory": "packages/expo-image"}, "kepler": {"temporary-alias-for-package": {"name": "expo-image", "version": "1.6.0"}}, "keywords": ["react-native"], "author": "650 Industries, Inc.", "license": "See license in LICENSE", "dependencies": {"@amazon-devices/keplerscript-turbomodule-api": "^1.0.0"}, "devDependencies": {"expo-module-scripts": "^3.0.0"}, "peerDependencies": {"expo": "*"}}
+{"name": "@amazon-devices/expo-image", "title": "Expo Image", "version": "3.0.0+1.6.0", "description": "A cross-platform, performant image component for React Native and Expo with Web support", "main": "build/index.js", "types": "build/index.d.ts", "sideEffects": false, "scripts": {"build": "expo-module build", "clean": "expo-module clean", "lint": "expo-module lint", "test": "expo-module test", "prepublishOnly": "expo-module prepublishOnly", "expo-module": "expo-module"}, "homepage": "https://docs.expo.dev/versions/latest/sdk/image/", "repository": {"type": "git", "url": "https://github.com/expo/expo.git", "directory": "packages/expo-image"}, "kepler": {"temporary-alias-for-package": {"name": "expo-image", "version": "1.6.0"}}, "keywords": ["react-native"], "author": "650 Industries, Inc.", "license": "See license in LICENSE", "dependencies": {"@amazon-devices/keplerscript-turbomodule-api": "^1.0.0"}, "devDependencies": {"expo-module-scripts": "^3.0.0"}, "peerDependencies": {"expo": "^50.0.0-alpha.1"}}

package/react-native.config.js

@@ -10,10 +10,18 @@ module.exports = {
         platforms: {
             kepler: {
                 autolink: {
-                    ExpoImageLib: {
-                        provider: 'system',
-                        turbomodules: ['ExpoImage'],
-                        components: ['ExpoImageComponent'],
+                    ExpoImageTMAppLib: {
+                        libraryName: 'libexpo-image-3.so',
+                        linkDynamic: true,
+                        turbomodules: ['ExpoImageAppTM'],
+                        provider: 'application',
+                    },
+                    ExpoImageViewAppLib: {
+                        uiComponentName: '/com.amazon.kepler.uitoolkit.react.expoimageapp',
+                        linkDynamic: true,
+                        components: ['ExpoImageAppComponent'],
+                        turbomodules: [],
+                        provider: 'application',
                     },
                 },
             },

package/src/ExpoImageModules.kepler.ts

@@ -4,4 +4,4 @@ import ExpoImageComponent from './ImageViewNativeComponent';
 
 type Spec = KeplerTurboModule;
 export const NativeExpoImage = ExpoImageComponent;
-export const ExpoImageModule = TurboModuleRegistry.getEnforcing<Spec>('ExpoImage') as Spec;
+export const ExpoImageModule = TurboModuleRegistry.getEnforcing<Spec>('ExpoImageAppTM') as Spec;

package/src/ImageViewNativeComponent.ts

@@ -25,7 +25,7 @@ export type ImageViewNativeComponentProps = Omit<ImageNativeProps, 'tintColor' |
   onProgress: (event: NativeSyntheticEvent<ImageProgressEventData>) => void;
 };
 
-const ImageViewNativeComponent = registerNativeComponent<ImageViewNativeComponentProps>('ExpoImageComponent', {
+const ImageViewNativeComponent = registerNativeComponent<ImageViewNativeComponentProps>('ExpoImageAppComponent', {
   validAttributes: {
     placeholder: true,
     pointerEvents: true,

package/kepler/ExpoImage.cpp

@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * PROPRIETARY/CONFIDENTIAL
- *
- * Use is subject to license terms.
- */
-
-#include "ExpoImage.h"
-
-#include <KeplerScript/appinit/KeplerScriptApplication.h>
-#include <KeplerScript/components/ImageSourceBuilder.h>
-#include <KeplerScript/logger/KPLog.h>
-#include <KeplerScript/utils/image/KeplerScriptImageLoaderDelegate.h>
-
-#include "utils/PrefetchImageLoaderDelegate.h"
-
-
-ExpoImage::ExpoImage(std::shared_ptr<IExpoImageCacheHandler> handler) : volta::react::KeplerTurboModule("ExpoImage") {
-    volta::react::KPLog.debug("ExpoImage constructor {}", name());
-
-    if (handler) {
-        cacheHandler = std::move(handler);
-    } else {
-        cacheHandler = std::make_shared<ExpoImageCacheHandler>();
-    }
-}
-
-void ExpoImage::aggregateMethods(
-        volta::react::MethodAggregator<volta::react::KeplerTurboModule>& methodAggregator) const noexcept {
-    methodAggregator.addMethod("prefetch", 1, &ExpoImage::prefetch);
-    methodAggregator.addMethod("clearMemoryCache", 0, &ExpoImage::clearMemoryCache);
-    methodAggregator.addMethod("clearDiskCache", 0, &ExpoImage::clearDiskCache);
-}
-
-volta::react::Promise ExpoImage::prefetch(const std::vector<std::string> urls) {
-    volta::react::KPLog.debug("ExpoImage :: prefetch ");
-    return volta::react::Promise([handler = cacheHandler, urls = urls](std::shared_ptr<volta::react::Promise> promise) {
-        auto delegate = std::make_shared<PrefetchImageLoaderDelegate>(urls.size(), [promise](bool success) {
-            promise->resolve(success);
-        });
-
-        for (const auto& url : urls) {
-            // KeplerScriptImageCacheHandler::prefetch does not emit any events to `delegate`
-            // As a workaround `load` is used, but sometimes does not keep image in cache
-            const volta::ImageSource imageSourceUrl = volta::react::buildImageSource(url);
-            volta::ImageDetails details(imageSourceUrl, volta::ImageOptions{}, static_cast<uint8_t>(0));
-            handler->load(details, delegate);
-            // cacheHandler.prefetch(url, 1, delegate);
-        }
-    });
-}
-
-
-void ExpoImage::clearMemoryCache() {
-    volta::react::KPLog.debug("ExpoImage :: clearMemoryCache");
-    cacheHandler->clearMemoryCache();
-}
-
-void ExpoImage::clearDiskCache() {
-    volta::react::KPLog.debug("ExpoImage :: clearDiskCache");
-    cacheHandler->clearDiskCache();
-}

package/kepler/ExpoImage.h

@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * PROPRIETARY/CONFIDENTIAL
- *
- * Use is subject to license terms.
- */
-#pragma once
-
-#include <KeplerScript/modules/KeplerTurboModule.h>
-#include "ExpoImageCacheHandler.h"
-#include <string>
-
-
-class ExpoImage : public volta::react::KeplerTurboModule {
-public:
-    explicit ExpoImage(std::shared_ptr<IExpoImageCacheHandler> cacheHandler = nullptr);
-
-    volta::react::Promise prefetch(const std::vector<std::string> urls);
-    void clearMemoryCache();
-    void clearDiskCache();
-
-protected:
-    void aggregateMethods(
-            volta::react::MethodAggregator<volta::react::KeplerTurboModule>& methodAggregator) const noexcept override;
-
-private:
-    std::shared_ptr<IExpoImageCacheHandler> cacheHandler = nullptr;
-};

package/kepler/ExpoImageCacheHandler.cpp

@@ -1,15 +0,0 @@
-#include "ExpoImageCacheHandler.h"
-
-void ExpoImageCacheHandler::clearMemoryCache() {
-    cacheHandler.clearMemoryCache();
-}
-
-void ExpoImageCacheHandler::clearDiskCache() {
-    cacheHandler.clearPersistentCache();
-}
-
-void ExpoImageCacheHandler::load(
-        volta::ImageDetails& imageDetails,
-        const volta::react::KeplerScriptImageLoaderDelegate::Shared& delegate) {
-    cacheHandler.load(imageDetails, delegate);
-}

package/kepler/ExpoImageCacheHandler.h

@@ -1,28 +0,0 @@
-#pragma once
-
-#include <KeplerScript/utils/image/KeplerScriptImageCacheHandler.h>
-#include <Volta/cache/image/ImageUtil.h>
-
-class IExpoImageCacheHandler {
-public:
-    virtual ~IExpoImageCacheHandler() = default;
-
-    virtual void clearMemoryCache() = 0;
-    virtual void clearDiskCache() = 0;
-
-    virtual void load(
-            volta::ImageDetails& imageDetails,
-            const volta::react::KeplerScriptImageLoaderDelegate::Shared& keplerScriptImageLoaderDelegate) = 0;
-};
-
-class ExpoImageCacheHandler : public IExpoImageCacheHandler {
-public:
-    void clearMemoryCache() override;
-    void clearDiskCache() override;
-    void load(
-            volta::ImageDetails& imageDetails,
-            const volta::react::KeplerScriptImageLoaderDelegate::Shared& keplerScriptImageLoaderDelegate) override;
-
-private:
-    volta::react::KeplerScriptImageCacheHandler cacheHandler;
-};