@capgo/capacitor-updater 7.4.0 → 7.6.0

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

@@ -35,6 +35,7 @@ import java.util.Objects;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import okhttp3.*;
+import okhttp3.HttpUrl;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -699,6 +700,16 @@ public class CapgoUpdater {
                             assert responseBody != null;
                             String responseData = responseBody.string();
                             JSONObject jsonResponse = new JSONObject(responseData);
+
+                            // Check for server-side errors first
+                            if (jsonResponse.has("error")) {
+                                Map<String, Object> retError = new HashMap<>();
+                                retError.put("message", jsonResponse.getString("error"));
+                                retError.put("error", "server_error");
+                                callback.callback(retError);
+                                return;
+                            }
+
                             Map<String, Object> ret = new HashMap<>();
 
                             Iterator<String> keys = jsonResponse.keys();
@@ -798,6 +809,16 @@ public class CapgoUpdater {
                             assert responseBody != null;
                             String responseData = responseBody.string();
                             JSONObject jsonResponse = new JSONObject(responseData);
+
+                            // Check for server-side errors first
+                            if (jsonResponse.has("error")) {
+                                Map<String, Object> retError = new HashMap<>();
+                                retError.put("message", jsonResponse.getString("error"));
+                                retError.put("error", "server_error");
+                                callback.callback(retError);
+                                return;
+                            }
+
                             Map<String, Object> ret = new HashMap<>();
 
                             Iterator<String> keys = jsonResponse.keys();
@@ -912,6 +933,16 @@ public class CapgoUpdater {
                             assert responseBody != null;
                             String responseData = responseBody.string();
                             JSONObject jsonResponse = new JSONObject(responseData);
+
+                            // Check for server-side errors first
+                            if (jsonResponse.has("error")) {
+                                Map<String, Object> retError = new HashMap<>();
+                                retError.put("message", jsonResponse.getString("error"));
+                                retError.put("error", "server_error");
+                                callback.callback(retError);
+                                return;
+                            }
+
                             Map<String, Object> ret = new HashMap<>();
 
                             Iterator<String> keys = jsonResponse.keys();
@@ -934,6 +965,109 @@ public class CapgoUpdater {
             );
     }
 
+    public void listChannels(final Callback callback) {
+        String channelUrl = this.channelUrl;
+        if (channelUrl == null || channelUrl.isEmpty()) {
+            logger.error("Channel URL is not set");
+            final Map<String, Object> retError = new HashMap<>();
+            retError.put("message", "Channel URL is not set");
+            retError.put("error", "missing_config");
+            callback.callback(retError);
+            return;
+        }
+
+        // Auto-detect values
+        String appId = this.appId;
+        String platform = "android";
+        boolean isEmulator = this.isEmulator();
+        boolean isProd = this.isProd();
+
+        // Build URL with query parameters
+        HttpUrl.Builder urlBuilder = HttpUrl.parse(channelUrl).newBuilder();
+        urlBuilder.addQueryParameter("app_id", appId);
+        urlBuilder.addQueryParameter("platform", platform);
+        urlBuilder.addQueryParameter("is_emulator", String.valueOf(isEmulator));
+        urlBuilder.addQueryParameter("is_prod", String.valueOf(isProd));
+
+        Request request = new Request.Builder().url(urlBuilder.build()).get().build();
+
+        client
+            .newCall(request)
+            .enqueue(
+                new okhttp3.Callback() {
+                    @Override
+                    public void onFailure(@NonNull Call call, @NonNull IOException e) {
+                        Map<String, Object> retError = new HashMap<>();
+                        retError.put("message", "Request failed: " + e.getMessage());
+                        retError.put("error", "network_error");
+                        callback.callback(retError);
+                    }
+
+                    @Override
+                    public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException {
+                        try (ResponseBody responseBody = response.body()) {
+                            if (!response.isSuccessful()) {
+                                Map<String, Object> retError = new HashMap<>();
+                                retError.put("message", "Server error: " + response.code());
+                                retError.put("error", "response_error");
+                                callback.callback(retError);
+                                return;
+                            }
+
+                            assert responseBody != null;
+                            String data = responseBody.string();
+
+                            try {
+                                Map<String, Object> ret = new HashMap<>();
+
+                                try {
+                                    // Try to parse as direct array first
+                                    JSONArray channelsJson = new JSONArray(data);
+                                    List<Map<String, Object>> channelsList = new ArrayList<>();
+
+                                    for (int i = 0; i < channelsJson.length(); i++) {
+                                        JSONObject channelJson = channelsJson.getJSONObject(i);
+                                        Map<String, Object> channel = new HashMap<>();
+                                        channel.put("id", channelJson.optString("id", ""));
+                                        channel.put("name", channelJson.optString("name", ""));
+                                        channel.put("public", channelJson.optBoolean("public", false));
+                                        channel.put("allow_self_set", channelJson.optBoolean("allow_self_set", false));
+                                        channelsList.add(channel);
+                                    }
+
+                                    // Wrap in channels object for JS API
+                                    ret.put("channels", channelsList);
+
+                                    logger.info("Channels listed successfully");
+                                    callback.callback(ret);
+                                } catch (JSONException arrayException) {
+                                    // If not an array, try to parse as error object
+                                    try {
+                                        JSONObject json = new JSONObject(data);
+                                        if (json.has("error")) {
+                                            Map<String, Object> retError = new HashMap<>();
+                                            retError.put("message", json.getString("error"));
+                                            retError.put("error", "server_error");
+                                            callback.callback(retError);
+                                            return;
+                                        }
+                                    } catch (JSONException objException) {
+                                        // If neither array nor object, throw parse error
+                                        throw arrayException;
+                                    }
+                                }
+                            } catch (JSONException e) {
+                                Map<String, Object> retError = new HashMap<>();
+                                retError.put("message", "JSON parse error: " + e.getMessage());
+                                retError.put("error", "parse_error");
+                                callback.callback(retError);
+                            }
+                        }
+                    }
+                }
+            );
+    }
+
     public void sendStats(final String action) {
         this.sendStats(action, this.getCurrentBundle().getVersionName());
     }

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

@@ -0,0 +1,72 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package ee.forgr.capacitor_updater;
+
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+
+public class ShakeDetector implements SensorEventListener {
+
+    public interface Listener {
+        void onShakeDetected();
+    }
+
+    private static final float SHAKE_THRESHOLD = 12.0f; // Acceleration threshold for shake detection
+    private static final int SHAKE_TIMEOUT = 500; // Minimum time between shake events (ms)
+
+    private Listener listener;
+    private SensorManager sensorManager;
+    private Sensor accelerometer;
+    private long lastShakeTime = 0;
+
+    public ShakeDetector(Listener listener) {
+        this.listener = listener;
+    }
+
+    public void start(SensorManager sensorManager) {
+        this.sensorManager = sensorManager;
+        this.accelerometer = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
+
+        if (accelerometer != null) {
+            sensorManager.registerListener(this, accelerometer, SensorManager.SENSOR_DELAY_GAME);
+        }
+    }
+
+    public void stop() {
+        if (sensorManager != null) {
+            sensorManager.unregisterListener(this);
+        }
+    }
+
+    @Override
+    public void onSensorChanged(SensorEvent event) {
+        if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
+            float x = event.values[0];
+            float y = event.values[1];
+            float z = event.values[2];
+
+            // Calculate the acceleration magnitude (excluding gravity)
+            float acceleration = (float) Math.sqrt(x * x + y * y + z * z) - SensorManager.GRAVITY_EARTH;
+
+            // Check if acceleration exceeds threshold and enough time has passed
+            long currentTime = System.currentTimeMillis();
+            if (Math.abs(acceleration) > SHAKE_THRESHOLD && currentTime - lastShakeTime > SHAKE_TIMEOUT) {
+                lastShakeTime = currentTime;
+                if (listener != null) {
+                    listener.onShakeDetected();
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onAccuracyChanged(Sensor sensor, int accuracy) {
+        // Not needed for shake detection
+    }
+}

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

@@ -0,0 +1,169 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package ee.forgr.capacitor_updater;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.hardware.SensorManager;
+import com.getcapacitor.Bridge;
+import com.getcapacitor.BridgeActivity;
+
+public class ShakeMenu implements ShakeDetector.Listener {
+
+    private CapacitorUpdaterPlugin plugin;
+    private BridgeActivity activity;
+    private ShakeDetector shakeDetector;
+    private boolean isShowing = false;
+    private Logger logger;
+
+    public ShakeMenu(CapacitorUpdaterPlugin plugin, BridgeActivity activity, Logger logger) {
+        this.plugin = plugin;
+        this.activity = activity;
+        this.logger = logger;
+
+        SensorManager sensorManager = (SensorManager) activity.getSystemService(Activity.SENSOR_SERVICE);
+        this.shakeDetector = new ShakeDetector(this);
+        this.shakeDetector.start(sensorManager);
+    }
+
+    public void stop() {
+        if (shakeDetector != null) {
+            shakeDetector.stop();
+        }
+    }
+
+    @Override
+    public void onShakeDetected() {
+        logger.info("Shake detected");
+
+        // Check if shake menu is enabled
+        if (!plugin.shakeMenuEnabled) {
+            logger.info("Shake menu is disabled");
+            return;
+        }
+
+        // Prevent multiple dialogs
+        if (isShowing) {
+            logger.info("Dialog already showing");
+            return;
+        }
+
+        isShowing = true;
+        showShakeMenu();
+    }
+
+    private void showShakeMenu() {
+        activity.runOnUiThread(() -> {
+            try {
+                String appName = activity.getPackageManager().getApplicationLabel(activity.getApplicationInfo()).toString();
+                String title = "Preview " + appName + " Menu";
+                String message = "What would you like to do?";
+                String okButtonTitle = "Go Home";
+                String reloadButtonTitle = "Reload app";
+                String cancelButtonTitle = "Close menu";
+
+                CapgoUpdater updater = plugin.implementation;
+                Bridge bridge = activity.getBridge();
+
+                AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+                builder.setTitle(title);
+                builder.setMessage(message);
+
+                // Go Home button
+                builder.setPositiveButton(
+                    okButtonTitle,
+                    new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int id) {
+                            try {
+                                BundleInfo current = updater.getCurrentBundle();
+                                logger.info("Current bundle: " + current.toString());
+
+                                BundleInfo next = updater.getNextBundle();
+                                logger.info("Next bundle: " + (next != null ? next.toString() : "null"));
+
+                                if (next != null && !next.isBuiltin()) {
+                                    logger.info("Setting bundle to: " + next.toString());
+                                    updater.set(next);
+                                    String path = updater.getCurrentBundlePath();
+                                    logger.info("Setting server path: " + path);
+                                    if (updater.isUsingBuiltin()) {
+                                        bridge.setServerAssetPath(path);
+                                    } else {
+                                        bridge.setServerBasePath(path);
+                                    }
+                                } else {
+                                    logger.info("Resetting to builtin");
+                                    updater.reset();
+                                    String path = updater.getCurrentBundlePath();
+                                    bridge.setServerAssetPath(path);
+                                }
+
+                                // Try to delete the current bundle
+                                try {
+                                    updater.delete(current.getId());
+                                } catch (Exception err) {
+                                    logger.warn("Cannot delete version " + current.getId() + ": " + err.getMessage());
+                                }
+
+                                logger.info("Reload app done");
+                            } catch (Exception e) {
+                                logger.error("Error in Go Home action: " + e.getMessage());
+                            } finally {
+                                dialog.dismiss();
+                                isShowing = false;
+                            }
+                        }
+                    }
+                );
+
+                // Reload button
+                builder.setNeutralButton(
+                    reloadButtonTitle,
+                    new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int id) {
+                            try {
+                                logger.info("Reloading webview");
+                                String pathHot = updater.getCurrentBundlePath();
+                                bridge.setServerBasePath(pathHot);
+                                activity.runOnUiThread(() -> {
+                                    if (bridge.getWebView() != null) {
+                                        bridge.getWebView().reload();
+                                    }
+                                });
+                            } catch (Exception e) {
+                                logger.error("Error in Reload action: " + e.getMessage());
+                            } finally {
+                                dialog.dismiss();
+                                isShowing = false;
+                            }
+                        }
+                    }
+                );
+
+                // Cancel button
+                builder.setNegativeButton(
+                    cancelButtonTitle,
+                    new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int id) {
+                            logger.info("Shake menu cancelled");
+                            dialog.dismiss();
+                            isShowing = false;
+                        }
+                    }
+                );
+
+                AlertDialog dialog = builder.create();
+                dialog.setOnDismissListener(dialogInterface -> isShowing = false);
+                dialog.show();
+            } catch (Exception e) {
+                logger.error("Error showing shake menu: " + e.getMessage());
+                isShowing = false;
+            }
+        });
+    }
+}

package/dist/docs.json

@@ -547,6 +547,31 @@
         ],
         "slug": "getchannel"
       },
+      {
+        "name": "listChannels",
+        "signature": "() => Promise<ListChannelsResult>",
+        "parameters": [],
+        "returns": "Promise<ListChannelsResult>",
+        "tags": [
+          {
+            "name": "returns",
+            "text": "A Promise that resolves with the available channels"
+          },
+          {
+            "name": "throws",
+            "text": "{Error}"
+          },
+          {
+            "name": "since",
+            "text": "7.5.0"
+          }
+        ],
+        "docs": "List all channels available for this device that allow self-assignment",
+        "complexTypes": [
+          "ListChannelsResult"
+        ],
+        "slug": "listchannels"
+      },
       {
         "name": "setCustomId",
         "signature": "(options: SetCustomIdOptions) => Promise<void>",
@@ -986,6 +1011,65 @@
           "BundleInfo"
         ],
         "slug": "getnextbundle"
+      },
+      {
+        "name": "setShakeMenu",
+        "signature": "(options: SetShakeMenuOptions) => Promise<void>",
+        "parameters": [
+          {
+            "name": "options",
+            "docs": "Contains enabled boolean to enable or disable shake menu",
+            "type": "SetShakeMenuOptions"
+          }
+        ],
+        "returns": "Promise<void>",
+        "tags": [
+          {
+            "name": "param",
+            "text": "options Contains enabled boolean to enable or disable shake menu"
+          },
+          {
+            "name": "returns"
+          },
+          {
+            "name": "throws",
+            "text": "{Error}"
+          },
+          {
+            "name": "since",
+            "text": "7.5.0"
+          }
+        ],
+        "docs": "Enable or disable the shake menu for debugging/testing purposes",
+        "complexTypes": [
+          "SetShakeMenuOptions"
+        ],
+        "slug": "setshakemenu"
+      },
+      {
+        "name": "isShakeMenuEnabled",
+        "signature": "() => Promise<ShakeMenuEnabled>",
+        "parameters": [],
+        "returns": "Promise<ShakeMenuEnabled>",
+        "tags": [
+          {
+            "name": "returns",
+            "text": "The current state of shake menu"
+          },
+          {
+            "name": "throws",
+            "text": "{Error}"
+          },
+          {
+            "name": "since",
+            "text": "7.5.0"
+          }
+        ],
+        "docs": "Get the current state of the shake menu",
+        "complexTypes": [
+          "ShakeMenuEnabled"
+        ],
+        "slug": "isshakemenuenabled"
       }
     ],
     "properties": []
@@ -1595,6 +1679,86 @@
         }
       ]
     },
+    {
+      "name": "ListChannelsResult",
+      "slug": "listchannelsresult",
+      "docs": "",
+      "tags": [],
+      "methods": [],
+      "properties": [
+        {
+          "name": "channels",
+          "tags": [
+            {
+              "text": "7.5.0",
+              "name": "since"
+            }
+          ],
+          "docs": "List of available channels",
+          "complexTypes": [
+            "ChannelInfo"
+          ],
+          "type": "ChannelInfo[]"
+        }
+      ]
+    },
+    {
+      "name": "ChannelInfo",
+      "slug": "channelinfo",
+      "docs": "",
+      "tags": [],
+      "methods": [],
+      "properties": [
+        {
+          "name": "id",
+          "tags": [
+            {
+              "text": "7.5.0",
+              "name": "since"
+            }
+          ],
+          "docs": "The channel ID",
+          "complexTypes": [],
+          "type": "string"
+        },
+        {
+          "name": "name",
+          "tags": [
+            {
+              "text": "7.5.0",
+              "name": "since"
+            }
+          ],
+          "docs": "The channel name",
+          "complexTypes": [],
+          "type": "string"
+        },
+        {
+          "name": "public",
+          "tags": [
+            {
+              "text": "7.5.0",
+              "name": "since"
+            }
+          ],
+          "docs": "Whether this is a public channel",
+          "complexTypes": [],
+          "type": "boolean"
+        },
+        {
+          "name": "allow_self_set",
+          "tags": [
+            {
+              "text": "7.5.0",
+              "name": "since"
+            }
+          ],
+          "docs": "Whether devices can self-assign to this channel",
+          "complexTypes": [],
+          "type": "boolean"
+        }
+      ]
+    },
     {
       "name": "SetCustomIdOptions",
       "slug": "setcustomidoptions",
@@ -1900,6 +2064,38 @@
           "type": "boolean"
         }
       ]
+    },
+    {
+      "name": "SetShakeMenuOptions",
+      "slug": "setshakemenuoptions",
+      "docs": "",
+      "tags": [],
+      "methods": [],
+      "properties": [
+        {
+          "name": "enabled",
+          "tags": [],
+          "docs": "",
+          "complexTypes": [],
+          "type": "boolean"
+        }
+      ]
+    },
+    {
+      "name": "ShakeMenuEnabled",
+      "slug": "shakemenuenabled",
+      "docs": "",
+      "tags": [],
+      "methods": [],
+      "properties": [
+        {
+          "name": "enabled",
+          "tags": [],
+          "docs": "",
+          "complexTypes": [],
+          "type": "boolean"
+        }
+      ]
     }
   ],
   "enums": [],
@@ -2136,7 +2332,7 @@
           "name": "directUpdate",
           "tags": [
             {
-              "text": "undefined",
+              "text": "false",
               "name": "default"
             },
             {
@@ -2144,7 +2340,23 @@
               "name": "since"
             }
           ],
-          "docs": "Make the plugin direct install the update when the app what just updated/installed. Only for autoUpdate mode.\n\nOnly available for Android and iOS.",
+          "docs": "Configure when the plugin should direct install updates. Only for autoUpdate mode.\n- false: Never do direct updates (default behavior)\n- atInstall: Direct update only when app is installed/updated from store, otherwise use normal background update\n- always: Always do direct updates immediately when available\n- true: (deprecated) Same as \"always\" for backward compatibility\n\nOnly available for Android and iOS.",
+          "complexTypes": [],
+          "type": "boolean | 'always' | 'atInstall' | undefined"
+        },
+        {
+          "name": "autoSplashscreen",
+          "tags": [
+            {
+              "text": "false",
+              "name": "default"
+            },
+            {
+              "text": "7.6.0",
+              "name": "since"
+            }
+          ],
+          "docs": "Automatically handle splashscreen hiding when using directUpdate. When enabled, the plugin will automatically hide the splashscreen after updates are applied or when no update is needed.\nThis removes the need to manually listen for appReady events and call SplashScreen.hide().\nOnly works when directUpdate is set to \"atInstall\", \"always\", or true.\nRequires the @capacitor/splash-screen plugin to be installed and configured with launchAutoHide: false.\n\nOnly available for Android and iOS.",
           "complexTypes": [],
           "type": "boolean | undefined"
         },
@@ -2351,6 +2563,22 @@
           "docs": "Disable the JavaScript logging of the plugin. if true, the plugin will not log to the JavaScript console. only the native log will be done",
           "complexTypes": [],
           "type": "boolean | undefined"
+        },
+        {
+          "name": "shakeMenu",
+          "tags": [
+            {
+              "text": "false",
+              "name": "default"
+            },
+            {
+              "text": "7.5.0",
+              "name": "since"
+            }
+          ],
+          "docs": "Enable shake gesture to show update menu for debugging/testing purposes",
+          "complexTypes": [],
+          "type": "boolean | undefined"
         }
       ],
       "docs": "CapacitorUpdater can be configured with these options:"