@aguacerowx/react-native 0.0.2 → 0.0.3

package/android/src/main/java/com/aguacerowx/reactnative/WeatherFrameProcessorModule.java

@@ -1,3 +1,5 @@
+// packages/com/aguacerowx/reactnative/WeatherFrameProcessorModule.java
+
 package com.aguacerowx.reactnative;
 
 import androidx.annotation.NonNull;
@@ -10,6 +12,7 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.modules.network.OkHttpClientProvider; 
 
 import org.json.JSONObject;
 
@@ -17,12 +20,16 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
+
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
 
 public class WeatherFrameProcessorModule extends ReactContextBaseJavaModule {
 
@@ -59,74 +66,73 @@ public class WeatherFrameProcessorModule extends ReactContextBaseJavaModule {
             FileOutputStream fos = null;
             try {
                 if (taskToken != this.currentRunToken) {
-                    // Task was cancelled, do nothing.
-                    return;
+                    return; // Task was cancelled
                 }
-                
-                // 1. Network Request (This part is perfect, no changes needed)
+
+                // --- START OF REPLACEMENT ---
+
+                // 1. Get the shared OkHttpClient instance from React Native
+                OkHttpClient client = OkHttpClientProvider.getOkHttpClient();
+
+                // 2. Get request details from options
                 String urlString = options.getString("url");
                 String apiKey = options.getString("apiKey");
                 String bundleId = options.getString("bundleId");
-                URL requestUrl = new URL(urlString);
-                HttpURLConnection conn = (HttpURLConnection) requestUrl.openConnection();
-                conn.setRequestMethod("GET");
-                conn.setRequestProperty("x-api-key", apiKey);
+
+                // 3. Build the OkHttp Request
+                Request.Builder requestBuilder = new Request.Builder()
+                        .url(urlString)
+                        .header("x-api-key", apiKey);
+
                 if (bundleId != null) {
-                    conn.setRequestProperty("x-app-identifier", bundleId);
-                }
-                
-                if (conn.getResponseCode() != 200) { 
-                    throw new IOException("HTTP Error: " + conn.getResponseCode()); 
+                    requestBuilder.header("x-app-identifier", bundleId);
                 }
                 
-                ByteArrayOutputStream result = new ByteArrayOutputStream();
-                byte[] buffer = new byte[8192];
-                int length;
-                while ((length = conn.getInputStream().read(buffer)) != -1) {
-                    result.write(buffer, 0, length);
+                Request request = requestBuilder.build();
+
+                String responseString;
+                // 4. Execute the request and handle the response
+                try (Response response = client.newCall(request).execute()) {
+                    if (!response.isSuccessful()) {
+                        throw new IOException("HTTP Error: " + response.code());
+                    }
+                    
+                    ResponseBody body = response.body();
+                    if (body == null) {
+                        throw new IOException("Response body was null");
+                    }
+                    responseString = body.string();
                 }
-                String responseString = result.toString(StandardCharsets.UTF_8.name());
-                JSONObject jsonResponse = new JSONObject(responseString);
-                conn.disconnect();
 
+                // --- END OF REPLACEMENT ---
+
+                // The rest of your logic remains the same
+                JSONObject jsonResponse = new JSONObject(responseString);
                 String b64CompressedData = jsonResponse.getString("data");
                 JSONObject encoding = jsonResponse.getJSONObject("encoding");
-                
-                // --- START OF EDITS ---
 
-                // 2. Decode Base64 into the RAW COMPRESSED bytes.
-                //    DO NOT decompress it here.
                 byte[] compressedData = Base64.decode(b64CompressedData, Base64.DEFAULT);
 
-                // 3. Write the SMALL, COMPRESSED data to a file.
                 File cacheDir = reactContext.getCacheDir();
-                // Use a predictable filename to avoid creating duplicate files for the same frame
                 String fileName = "frame_" + urlString.hashCode() + ".zst";
                 File dataFile = new File(cacheDir, fileName);
                 
                 fos = new FileOutputStream(dataFile);
-                fos.write(compressedData); // Write the compressed bytes
+                fos.write(compressedData);
                 fos.flush();
                 fos.close();
-                fos = null; // Set to null after successful close
+                fos = null;
 
-                // 4. Prepare Success Response with the file path and metadata
                 WritableMap responseMap = Arguments.createMap();
                 responseMap.putString("filePath", dataFile.getAbsolutePath());
                 responseMap.putDouble("scale", encoding.getDouble("scale"));
                 responseMap.putDouble("offset", encoding.getDouble("offset"));
                 responseMap.putDouble("missing", encoding.getDouble("missing_quantized"));
-                
-                // We still pass this for the very first frame to load instantly without a flicker.
-                // The preloader logic on the JS side will ignore this and just use the filePath.
                 responseMap.putString("dataAsBase64", b64CompressedData);
 
                 callback.invoke(null, responseMap);
 
-                // --- END OF EDITS ---
-
             } catch (Exception e) {
-                // Don't invoke callback if task was cancelled, to avoid spamming logs
                 if (taskToken == this.currentRunToken) {
                     android.util.Log.e("AguaceroWX", "Error processing frame", e);
                     callback.invoke(e.getMessage(), null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aguacerowx/react-native",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Native weather rendering for React Native",
   "main": "index.js",
   "react-native": "index.js",