@capgo/capacitor-updater 4.14.1 → 4.14.3

package/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdater.java

@@ -11,10 +11,12 @@ import android.os.Bundle;
 import android.util.Base64;
 import android.util.Log;
 import com.android.volley.BuildConfig;
+import com.android.volley.NetworkResponse;
 import com.android.volley.Request;
 import com.android.volley.RequestQueue;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
+import com.android.volley.toolbox.HttpHeaderParser;
 import com.android.volley.toolbox.JsonObjectRequest;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.plugin.WebView;
@@ -27,6 +29,7 @@ import java.io.FileOutputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.security.GeneralSecurityException;
@@ -60,7 +63,7 @@ public class CapacitorUpdater {
   private static final String bundleDirectory = "versions";
 
   public static final String TAG = "Capacitor-updater";
-  public static final String pluginVersion = "4.14.1";
+  public static final String pluginVersion = "4.14.3";
 
   public SharedPreferences.Editor editor;
   public SharedPreferences prefs;
@@ -672,6 +675,29 @@ public class CapacitorUpdater {
     return json;
   }
 
+  private JSObject createError(String message, VolleyError error) {
+    NetworkResponse response = error.networkResponse;
+    final JSObject retError = new JSObject();
+    retError.put("error", "response_error");
+    if (response != null) {
+      try {
+        String json = new String(
+          response.data,
+          HttpHeaderParser.parseCharset(response.headers)
+        );
+        Log.e(TAG, message + ": " + json);
+        retError.put("message", message + ": " + json);
+      } catch (UnsupportedEncodingException e) {
+        Log.e(TAG, message + ": " + e.toString());
+        retError.put("message", message + ": " + e.toString());
+      }
+    } else {
+      Log.e(TAG, message + ": " + error.toString());
+      retError.put("message", message + ": " + error.toString());
+    }
+    return retError;
+  }
+
   public void getLatest(final String updateUrl, final Callback callback) {
     JSONObject json = null;
     try {
@@ -717,11 +743,9 @@ public class CapacitorUpdater {
       new Response.ErrorListener() {
         @Override
         public void onErrorResponse(VolleyError error) {
-          Log.e(TAG, "Error getting Latest" + error.toString());
-          final JSObject retError = new JSObject();
-          retError.put("message", "Cannot set info: " + error.toString());
-          retError.put("error", "response_error");
-          callback.callback(retError);
+          callback.callback(
+            CapacitorUpdater.this.createError("Error get latest", error)
+          );
         }
       }
     );
@@ -784,11 +808,9 @@ public class CapacitorUpdater {
       new Response.ErrorListener() {
         @Override
         public void onErrorResponse(VolleyError error) {
-          Log.e(TAG, "Error set channel: " + error.toString());
-          final JSObject retError = new JSObject();
-          retError.put("message", "Cannot set channel: " + error.toString());
-          retError.put("error", "response_error");
-          callback.callback(retError);
+          callback.callback(
+            CapacitorUpdater.this.createError("Error set channel", error)
+          );
         }
       }
     );
@@ -846,11 +868,9 @@ public class CapacitorUpdater {
       new Response.ErrorListener() {
         @Override
         public void onErrorResponse(VolleyError error) {
-          Log.e(TAG, "Error get channel: " + error.toString());
-          final JSObject retError = new JSObject();
-          retError.put("message", "Error get channel: " + error.toString());
-          retError.put("error", "response_error");
-          callback.callback(retError);
+          callback.callback(
+            CapacitorUpdater.this.createError("Error get channel", error)
+          );
         }
       }
     );
@@ -888,7 +908,7 @@ public class CapacitorUpdater {
       new Response.ErrorListener() {
         @Override
         public void onErrorResponse(VolleyError error) {
-          Log.e(TAG, "Error sending stats: " + error.toString());
+          CapacitorUpdater.this.createError("Error send stats", error);
         }
       }
     );

package/ios/Plugin/CapacitorUpdater.swift

@@ -420,8 +420,8 @@ extension CustomError: LocalizedError {
                     latest.sessionKey = sessionKey
                 }
             case let .failure(error):
-                print("\(self.TAG) Error getting Latest", error )
-                latest.message = "Error getting Latest \(error)"
+                print("\(self.TAG) Error getting Latest", response.value, error )
+                latest.message = "Error getting Latest \(response.value)"
                 latest.error = "fail_response"
             }
             semaphore.signal()
@@ -471,7 +471,7 @@ extension CustomError: LocalizedError {
                         mainError = error as NSError
                     }
                 case let .failure(error):
-                    print("\(self.TAG) download error", error)
+                    print("\(self.TAG) download error", response.value!, error)
                     mainError = error as NSError
                 }
             }
@@ -645,8 +645,8 @@ extension CustomError: LocalizedError {
                     setChannel.message = message
                 }
             case let .failure(error):
-                print("\(self.TAG) Error set Channel", error)
-                setChannel.message = "Error set Channel \(error)"
+                print("\(self.TAG) Error set Channel", response.value, error)
+                setChannel.message = "Error set Channel \(String(describing: response.value))"
                 setChannel.error = "fail_response"
             }
             semaphore.signal()
@@ -683,8 +683,8 @@ extension CustomError: LocalizedError {
                     getChannel.allowSet = allowSet
                 }
             case let .failure(error):
-                print("\(self.TAG) Error get Channel", error )
-                getChannel.message = "Error get Channel \(error)"
+                print("\(self.TAG) Error get Channel", response.value, error)
+                getChannel.message = "Error get Channel \(String(describing: response.value)))"
                 getChannel.error = "fail_response"
             }
             semaphore.signal()
@@ -706,7 +706,7 @@ extension CustomError: LocalizedError {
                 case .success:
                     print("\(self.TAG) Stats send for \(action), version \(versionName)")
                 case let .failure(error):
-                    print("\(self.TAG) Error sending stats: ", error )
+                    print("\(self.TAG) Error sending stats: ", response.value, error)
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "4.14.1",
+  "version": "4.14.3",
   "license": "LGPL-3.0-only",
   "description": "OTA update for capacitor apps",
   "main": "dist/plugin.cjs.js",