@dr33m/react-native-litert-lm 0.6.2 → 0.6.3

package/android/src/main/java/com/margelo/nitro/dev/litert/litertlm/HybridLiteRTLM.kt

@@ -749,14 +749,36 @@ class HybridLiteRTLM : HybridLiteRTLMSpec() {
         // for it while holding the lock would block loadModel behind it.
         cancelInFlightGeneration()
         synchronized(initLock) {
+            /*
+             * Dropped first, closed second.
+             *
+             * These used to be nulled after their `close()` calls, inside one
+             * try. A close that threw — and closing a conversation that has
+             * just been cancelled is exactly when one does — skipped the rest
+             * of the block and left a retired engine still referenced. Nothing
+             * downstream could tell: `isReady()` reads `engine != null`, so the
+             * instance went on reporting itself loaded, and the next
+             * `resetConversation()` called `createConversation` on a closed
+             * engine and threw "Engine is not initialized" from deep in the SDK.
+             *
+             * Letting go of the references first makes that impossible: after
+             * this block the instance is unloaded whatever the native side did.
+             */
+            val retiredConversation = conversation
+            val retiredEngine = engine
+            conversation = null
+            engine = null
+            loadedModelPath = null
+
+            try {
+                retiredConversation?.close()
+            } catch (e: Exception) {
+                Log.w(TAG, "Error closing conversation: ${e.message}")
+            }
             try {
-                conversation?.close()
-                conversation = null
-                engine?.close()        // Direct call
-                engine = null 
-                loadedModelPath = null
+                retiredEngine?.close()
             } catch (e: Exception) {
-                Log.e(TAG, "Error closing resources", e)
+                Log.w(TAG, "Error closing engine: ${e.message}")
             }
         }
     }
@@ -825,7 +847,12 @@ class HybridLiteRTLM : HybridLiteRTLMSpec() {
         //   - Kotlin:   Not yet available — track at https://github.com/google-ai-edge/LiteRT-LM
         //
         // Once the Kotlin SDK exposes this, wire it via ConversationConfig here.
-        conversation = engine!!.createConversation(convConfig)
+        // Checked rather than forced: this runs from `resetConversation`, which
+        // JS calls on paths that do not first ask whether anything is loaded.
+        // A named error beats a null-pointer dereference from inside the SDK.
+        val activeEngine = engine
+            ?: throw RuntimeException("Cannot create a conversation: no model is loaded.")
+        conversation = activeEngine.createConversation(convConfig)
     }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dr33m/react-native-litert-lm",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "litertLm": {
     "version": "0.15.0",
     "androidMavenVersion": "0.15.0",