react-native-litert-lm 0.3.2 → 0.3.4

package/cpp/HybridLiteRTLM.cpp

@@ -109,6 +109,34 @@ std::string HybridLiteRTLM::buildAudioMessageJson(const std::string& text, const
          "]}";
 }
 
+/**
+ * Strip Gemma / LiteRT-LM control tokens from model output.
+ * The iOS C API returns raw model text including stop/turn markers
+ * that the Android Kotlin SDK strips automatically.
+ */
+static std::string stripControlTokens(const std::string& text) {
+  static const char* tokens[] = {
+    "<end_of_turn>",
+    "<start_of_turn>model",
+    "<start_of_turn>user",
+    "<start_of_turn>",
+    "<eos>",
+  };
+  std::string result = text;
+  for (auto* tok : tokens) {
+    std::string t(tok);
+    size_t pos;
+    while ((pos = result.find(t)) != std::string::npos) {
+      result.erase(pos, t.length());
+    }
+  }
+  // Trim leading/trailing whitespace
+  size_t start = result.find_first_not_of(" \t\n\r");
+  if (start == std::string::npos) return "";
+  size_t end = result.find_last_not_of(" \t\n\r");
+  return result.substr(start, end - start + 1);
+}
+
 std::string HybridLiteRTLM::extractTextFromResponse(const std::string& jsonResponse) {
   // The C API response JSON is structured as:
   //   {"role":"model","content":[{"type":"text","text":"..."}]}
@@ -141,7 +169,7 @@ std::string HybridLiteRTLM::extractTextFromResponse(const std::string& jsonRespo
           result += jsonResponse[i];
         }
       }
-      return result;
+      return stripControlTokens(result);
     }
   }
   
@@ -164,11 +192,11 @@ std::string HybridLiteRTLM::extractTextFromResponse(const std::string& jsonRespo
         result += jsonResponse[i];
       }
     }
-    return result;
+    return stripControlTokens(result);
   }
   
-  // Fallback: return full response
-  return jsonResponse;
+  // Fallback: return full response (still strip control tokens)
+  return stripControlTokens(jsonResponse);
 }
 
 // =============================================================================
@@ -284,7 +312,7 @@ void HybridLiteRTLM::loadModelInternal(
       modelPath.c_str(),
       backend,
       visionBackend,
-      nullptr // audio executor not supported on iOS yet
+      "cpu" // audio executor: iOS XCFramework lacks compiled audio ops (INTERNAL ERROR at Invoke)
     );
     if (!settings) {
       return false;
@@ -476,9 +504,13 @@ void HybridLiteRTLM::streamCallbackFn(void* callback_data, const char* chunk,
   
   if (chunk) {
     std::string token(chunk);
-    ctx->fullResponse += token;
+    // Filter out Gemma control tokens from streamed chunks
+    std::string cleaned = stripControlTokens(token);
+    ctx->fullResponse += cleaned;
     ctx->tokenCount++;
-    ctx->onToken(token, false);
+    if (!cleaned.empty()) {
+      ctx->onToken(cleaned, false);
+    }
   }
 }
 
@@ -635,7 +667,12 @@ std::string HybridLiteRTLM::sendMessageWithAudioInternal(
     conversation_, msgJson.c_str(), nullptr);
   
   if (!response) {
-    throw std::runtime_error("LiteRT-LM: sendMessageWithAudio failed");
+    std::string errMsg = "LiteRT-LM: sendMessageWithAudio failed";
+    const char* nativeErr = litert_lm_get_last_error();
+    if (nativeErr && nativeErr[0] != '\0') {
+      errMsg += ": " + std::string(nativeErr);
+    }
+    throw std::runtime_error(errMsg);
   }
   
   const char* responseStr = litert_lm_json_response_get_string(response);

package/lib/hooks.js

@@ -51,6 +51,10 @@ function useModel(pathOrUrl, config) {
             enableMemoryTracking,
             maxMemorySnapshots,
         });
+        // Reset ready state — the new instance has no model loaded yet.
+        // This prevents stale isReady=true after Fast Refresh (which
+        // preserves useState but re-runs useEffect).
+        setIsReady(false);
         // Cleanup on unmount
         return () => {
             try {

package/lib/index.js

@@ -145,7 +145,7 @@ function checkBackendSupport(backend) {
  */
 function checkMultimodalSupport() {
     if (react_native_1.Platform.OS === "ios") {
-        return "Multimodal (image/audio) is experimental on iOS. Vision and audio executors may not be available in the current build.";
+        return "Multimodal (image/audio) is not available on iOS. The XCFramework lacks compiled vision and audio executor ops.";
     }
     return undefined;
 }

package/nitrogen/generated/android/LiteRTLMOnLoad.cpp

@@ -29,9 +29,9 @@ int initialize(JavaVM* vm) {
 }
 
 struct JHybridLiteRTLMSpecImpl: public jni::JavaClass<JHybridLiteRTLMSpecImpl, JHybridLiteRTLMSpec::JavaPart> {
-  static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/dev/litert/litertlm/HybridLiteRTLM;";
+  static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/dev/litert/litertlm/HybridLiteRTLM;";
   static std::shared_ptr<JHybridLiteRTLMSpec> create() {
-    static auto constructorFn = javaClassStatic()->getConstructor<JHybridLiteRTLMSpecImpl::javaobject()>();
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridLiteRTLMSpecImpl::javaobject()>();
     jni::local_ref<JHybridLiteRTLMSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
     return javaPart->getJHybridLiteRTLMSpec();
   }

package/nitrogen/generated/android/c++/JBackend.hpp

@@ -19,7 +19,7 @@ namespace margelo::nitro::litertlm {
    */
   struct JBackend final: public jni::JavaClass<JBackend> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/dev/litert/litertlm/Backend;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/dev/litert/litertlm/Backend;";
 
   public:
     /**

package/nitrogen/generated/android/c++/JFunc_void_double.hpp

@@ -23,7 +23,7 @@ namespace margelo::nitro::litertlm {
    */
   struct JFunc_void_double: public jni::JavaClass<JFunc_void_double> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/dev/litert/litertlm/Func_void_double;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/dev/litert/litertlm/Func_void_double;";
 
   public:
     /**
@@ -59,7 +59,7 @@ namespace margelo::nitro::litertlm {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/dev/litert/litertlm/Func_void_double_cxx;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/dev/litert/litertlm/Func_void_double_cxx;";
     static void registerNatives() {
       registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_double_cxx::invoke_cxx)});
     }

package/nitrogen/generated/android/c++/JFunc_void_std__string_bool.hpp

@@ -24,7 +24,7 @@ namespace margelo::nitro::litertlm {
    */
   struct JFunc_void_std__string_bool: public jni::JavaClass<JFunc_void_std__string_bool> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/dev/litert/litertlm/Func_void_std__string_bool;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/dev/litert/litertlm/Func_void_std__string_bool;";
 
   public:
     /**
@@ -60,7 +60,7 @@ namespace margelo::nitro::litertlm {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/dev/litert/litertlm/Func_void_std__string_bool_cxx;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/dev/litert/litertlm/Func_void_std__string_bool_cxx;";
     static void registerNatives() {
       registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_std__string_bool_cxx::invoke_cxx)});
     }

package/nitrogen/generated/android/c++/JGenerationStats.hpp

@@ -21,7 +21,7 @@ namespace margelo::nitro::litertlm {
    */
   struct JGenerationStats final: public jni::JavaClass<JGenerationStats> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/dev/litert/litertlm/GenerationStats;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/dev/litert/litertlm/GenerationStats;";
 
   public:
     /**

package/nitrogen/generated/android/c++/JHybridLiteRTLMSpec.hpp

@@ -21,11 +21,11 @@ namespace margelo::nitro::litertlm {
   class JHybridLiteRTLMSpec: public virtual HybridLiteRTLMSpec, public virtual JHybridObject {
   public:
     struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
-      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/dev/litert/litertlm/HybridLiteRTLMSpec;";
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/dev/litert/litertlm/HybridLiteRTLMSpec;";
       std::shared_ptr<JHybridLiteRTLMSpec> getJHybridLiteRTLMSpec();
     };
     struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
-      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/dev/litert/litertlm/HybridLiteRTLMSpec$CxxPart;";
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/dev/litert/litertlm/HybridLiteRTLMSpec$CxxPart;";
       static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
       static void registerNatives();
       using HybridBase::HybridBase;

package/nitrogen/generated/android/c++/JLLMConfig.hpp

@@ -24,7 +24,7 @@ namespace margelo::nitro::litertlm {
    */
   struct JLLMConfig final: public jni::JavaClass<JLLMConfig> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/dev/litert/litertlm/LLMConfig;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/dev/litert/litertlm/LLMConfig;";
 
   public:
     /**

package/nitrogen/generated/android/c++/JMemoryUsage.hpp

@@ -21,7 +21,7 @@ namespace margelo::nitro::litertlm {
    */
   struct JMemoryUsage final: public jni::JavaClass<JMemoryUsage> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/dev/litert/litertlm/MemoryUsage;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/dev/litert/litertlm/MemoryUsage;";
 
   public:
     /**

package/nitrogen/generated/android/c++/JMessage.hpp

@@ -23,7 +23,7 @@ namespace margelo::nitro::litertlm {
    */
   struct JMessage final: public jni::JavaClass<JMessage> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/dev/litert/litertlm/Message;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/dev/litert/litertlm/Message;";
 
   public:
     /**

package/nitrogen/generated/android/c++/JRole.hpp

@@ -19,7 +19,7 @@ namespace margelo::nitro::litertlm {
    */
   struct JRole final: public jni::JavaClass<JRole> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/dev/litert/litertlm/Role;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/dev/litert/litertlm/Role;";
 
   public:
     /**

package/nitrogen/generated/ios/LiteRTLM+autolinking.rb

@@ -56,5 +56,7 @@ def add_nitrogen_files(spec)
     "SWIFT_OBJC_INTEROP_MODE" => "objcxx",
     # Enables stricter modular headers
     "DEFINES_MODULE" => "YES",
+    # Disable auto-generated ObjC header for Swift (Static linkage on Xcode 26.4 breaks here)
+    "SWIFT_INSTALL_OBJC_HEADER" => "NO",
   })
 end

package/nitrogen/generated/ios/LiteRTLMAutolinking.mm

@@ -0,0 +1,35 @@
+///
+/// LiteRTLMAutolinking.mm
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#import <Foundation/Foundation.h>
+#import <NitroModules/HybridObjectRegistry.hpp>
+
+#import <type_traits>
+
+#include "HybridLiteRTLM.hpp"
+
+@interface LiteRTLMAutolinking : NSObject
+@end
+
+@implementation LiteRTLMAutolinking
+
++ (void) load {
+  using namespace margelo::nitro;
+  using namespace margelo::nitro::litertlm;
+
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "LiteRTLM",
+    []() -> std::shared_ptr<HybridObject> {
+      static_assert(std::is_default_constructible_v<HybridLiteRTLM>,
+                    "The HybridObject \"HybridLiteRTLM\" is not default-constructible! "
+                    "Create a public constructor that takes zero arguments to be able to autolink this HybridObject.");
+      return std::make_shared<HybridLiteRTLM>();
+    }
+  );
+}
+
+@end

package/nitrogen/generated/ios/LiteRTLMAutolinking.swift

@@ -0,0 +1,16 @@
+///
+/// LiteRTLMAutolinking.swift
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+import NitroModules
+
+// TODO: Use empty enums once Swift supports exporting them as namespaces
+//       See: https://github.com/swiftlang/swift/pull/83616
+public final class LiteRTLMAutolinking {
+  public typealias bridge = margelo.nitro.litertlm.bridge.swift
+
+  
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-litert-lm",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "litertLm": {
     "version": "0.10.1",
     "androidMavenVersion": "0.10.0",
@@ -77,6 +77,7 @@
   "devDependencies": {
     "@expo/config-plugins": "~55.0.0",
     "@types/react": "~19.2.10",
+    "react-native-nitro-modules": "^0.35.4",
     "release-it": "^19.2.4",
     "typescript": "^5.0.0"
   },
@@ -84,7 +85,7 @@
     "expo": ">=55.0.0",
     "react": "*",
     "react-native": "*",
-    "react-native-nitro-modules": "^0.35.0"
+    "react-native-nitro-modules": "^0.35.4"
   },
   "peerDependenciesMeta": {
     "expo": {

package/src/hooks.ts

@@ -108,6 +108,11 @@ export function useModel(
       maxMemorySnapshots,
     });
 
+    // Reset ready state — the new instance has no model loaded yet.
+    // This prevents stale isReady=true after Fast Refresh (which
+    // preserves useState but re-runs useEffect).
+    setIsReady(false);
+
     // Cleanup on unmount
     return () => {
       try {

package/src/index.ts

@@ -163,7 +163,7 @@ export function checkBackendSupport(backend: Backend): string | undefined {
  */
 export function checkMultimodalSupport(): string | undefined {
   if (Platform.OS === "ios") {
-    return "Multimodal (image/audio) is experimental on iOS. Vision and audio executors may not be available in the current build.";
+    return "Multimodal (image/audio) is not available on iOS. The XCFramework lacks compiled vision and audio executor ops.";
   }
   return undefined;
 }