@capgo/capacitor-updater 8.51.23 → 8.51.25

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

@@ -146,7 +146,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     static final int APPLICATION_EXIT_REASON_USER_REQUESTED = 10;
     static final int APPLICATION_EXIT_REASON_DEPENDENCY_DIED = 12;
 
-    private final String pluginVersion = "8.51.23";
+    private final String pluginVersion = "8.51.25";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;
@@ -2663,6 +2663,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
                     CapacitorUpdaterPlugin.this.editor,
                     DEFAULT_CHANNEL_PREF_KEY,
                     configDefaultChannel,
+                    CapacitorUpdaterPlugin.this.allowSetDefaultChannel,
                     (res) -> {
                         JSObject jsRes = InternalUtils.mapToJSObject(res);
                         if (jsRes.has("error")) {

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

@@ -2507,8 +2507,18 @@ public class CapgoUpdater {
         final SharedPreferences.Editor editor,
         final String defaultChannelKey,
         final String configDefaultChannel,
+        final boolean allowSetDefaultChannel,
         final Callback callback
     ) {
+        if (!allowSetDefaultChannel) {
+            logger.error("unsetChannel is disabled by allowSetDefaultChannel config");
+            final Map<String, Object> retError = new HashMap<>();
+            retError.put("message", "unsetChannel is disabled by configuration");
+            retError.put("error", "disabled_by_config");
+            callback.callback(retError);
+            return;
+        }
+
         // Clear persisted defaultChannel and revert to config value
         editor.remove(defaultChannelKey);
         editor.apply();

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

@@ -5,15 +5,24 @@ import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.getcapacitor.*;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.CoderResult;
+import java.nio.charset.CodingErrorAction;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.Locale;
 import java.util.Map;
 import org.jetbrains.annotations.Contract;
+import org.json.JSONObject;
 
 public class Logger {
 
+    static final int MAX_WEBVIEW_LOG_PAYLOAD_CHARS = 4096;
+
     private Bridge bridge;
 
     public enum LogLevel {
@@ -250,13 +259,63 @@ public class Logger {
 
         // Send to JavaScript if webView is available
         if (bridge != null && bridge.getWebView() != null) {
-            bridge.eval(
-                "console." + level.name() + "(\"[" + tag.replace("\"", "\\\"") + "] " + formattedMessage.replace("\"", "\\\"") + "\")",
-                null
-            );
+            String script = buildWebViewConsoleScript(level, tag, formattedMessage);
+            if (script != null) {
+                bridge.eval(script, null);
+            }
+        }
+    }
+
+    @Nullable
+    static String consoleMethodForLevel(@NonNull LogLevel level) {
+        switch (level) {
+            case error:
+                return "error";
+            case warn:
+                return "warn";
+            case info:
+                return "info";
+            case debug:
+                return "debug";
+            default:
+                return null;
         }
     }
 
+    @NonNull
+    static String toJsStringLiteral(@NonNull String value) {
+        return JSONObject.quote(value);
+    }
+
+    @NonNull
+    static String capWebViewLogPayload(@NonNull String payload) {
+        CharsetEncoder encoder = StandardCharsets.UTF_8.newEncoder()
+            .onMalformedInput(CodingErrorAction.REPLACE)
+            .onUnmappableCharacter(CodingErrorAction.REPLACE);
+        ByteBuffer bytes = ByteBuffer.allocate(MAX_WEBVIEW_LOG_PAYLOAD_CHARS);
+        CharBuffer chars = CharBuffer.wrap(payload);
+        CoderResult result = encoder.encode(chars, bytes, true);
+        if (result.isUnderflow()) {
+            result = encoder.flush(bytes);
+        }
+        if (result.isUnderflow()) {
+            return payload;
+        }
+
+        return new String(bytes.array(), 0, bytes.position(), StandardCharsets.UTF_8) + "...";
+    }
+
+    @Nullable
+    static String buildWebViewConsoleScript(@NonNull LogLevel level, @NonNull String tag, @NonNull String formattedMessage) {
+        String consoleMethod = consoleMethodForLevel(level);
+        if (consoleMethod == null) {
+            return null;
+        }
+
+        String payload = capWebViewLogPayload("[" + tag + "] " + formattedMessage);
+        return "console." + consoleMethod + "(" + toJsStringLiteral(payload) + ")";
+    }
+
     public void dir(Object value) {
         String message;
 

package/ios/Sources/CapacitorUpdaterPlugin/CapacitorUpdaterPlugin.swift

@@ -96,7 +96,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     deinit {
         implementation.shutdown()
     }
-    private let pluginVersion: String = "8.51.23"
+    private let pluginVersion: String = "8.51.25"
     private let launchStartedAtMs = Int64(Date().timeIntervalSince1970 * 1000)
     static let updateUrlDefault = "https://plugin.capgo.app/updates"
     static let statsUrlDefault = "https://plugin.capgo.app/stats"
@@ -3025,11 +3025,16 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         self.saveCallForAsyncHandling(call)
         DispatchQueue.global(qos: .utility).async {
             let configDefaultChannel = self.getConfig().getString("defaultChannel", "")!
-            let res = self.implementation.unsetChannel(defaultChannelKey: self.defaultChannelDefaultsKey, configDefaultChannel: configDefaultChannel)
+            let res = self.implementation.unsetChannel(
+                defaultChannelKey: self.defaultChannelDefaultsKey,
+                configDefaultChannel: configDefaultChannel,
+                allowSetDefaultChannel: self.allowSetDefaultChannel
+            )
             if res.error != "" {
-                self.rejectCall(call, message: res.error, code: "UNSETCHANNEL_FAILED", data: [
-                    "message": res.error,
-                    "error": res.error.contains("Channel URL") ? "missing_config" : "request_failed"
+                let message = res.message.isEmpty ? res.error : res.message
+                self.rejectCall(call, message: message, code: "UNSETCHANNEL_FAILED", data: [
+                    "message": message,
+                    "error": res.error
                 ])
             } else {
                 guard self.persistDefaultChannelStateFromDefaults() else {
@@ -3077,9 +3082,20 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                         "message": res.error
                     ])
                 }
-                self.rejectCall(call, message: res.error, code: "SETCHANNEL_FAILED", data: [
-                    "message": res.error,
-                    "error": res.error.contains("Channel URL") ? "missing_config" : (res.error.contains("cannot_update_via_private_channel") || res.error.contains("channel_self_set_not_allowed")) ? "channel_private" : "request_failed"
+                let message = res.message.isEmpty ? res.error : res.message
+                let errorCode: String
+                if res.error == "disabled_by_config" {
+                    errorCode = res.error
+                } else if res.error.contains("cannot_update_via_private_channel") || res.error.contains("channel_self_set_not_allowed") {
+                    errorCode = "channel_private"
+                } else if res.error.contains("Channel URL") {
+                    errorCode = "missing_config"
+                } else {
+                    errorCode = "request_failed"
+                }
+                self.rejectCall(call, message: message, code: "SETCHANNEL_FAILED", data: [
+                    "message": message,
+                    "error": errorCode
                 ])
             } else {
                 guard self.persistDefaultChannelStateFromDefaults() else {

package/ios/Sources/CapacitorUpdaterPlugin/CapgoUpdater.swift

@@ -2937,9 +2937,16 @@ import UIKit
         self.setBundleStatus(id: bundle.getId(), status: BundleStatus.ERROR)
     }
 
-    func unsetChannel(defaultChannelKey: String, configDefaultChannel: String) -> SetChannel {
+    func unsetChannel(defaultChannelKey: String, configDefaultChannel: String, allowSetDefaultChannel: Bool) -> SetChannel {
         let setChannel: SetChannel = SetChannel()
 
+        if !allowSetDefaultChannel {
+            logger.error("unsetChannel is disabled by allowSetDefaultChannel config")
+            setChannel.message = "unsetChannel is disabled by configuration"
+            setChannel.error = "disabled_by_config"
+            return setChannel
+        }
+
         // Clear persisted defaultChannel and revert to config value
         UserDefaults.standard.removeObject(forKey: defaultChannelKey)
         UserDefaults.standard.synchronize()

package/ios/Sources/CapacitorUpdaterPlugin/Logger.swift

@@ -4,6 +4,8 @@ import os.log
 import WebKit
 
 public class Logger {
+    static let maxWebViewLogPayloadChars = 4096
+
     public enum LogLevel: Int {
         case silent = 0
         case error
@@ -199,17 +201,85 @@ public class Logger {
         // This will never fail, but we have to keep swift happy
         if let label = _labels[level] {
             log(atLevel: level, label: label, tag: tag, message: message)
-            if let webView = self.webView {
+            if let webView = self.webView, let script = buildWebViewConsoleScript(level: level, label: label, tag: tag, message: message) {
                 DispatchQueue.main.async {
-                    let combined = "\(label) \(self.tag) : \(message)"
-                    let jsArg = self.toJSStringLiteral(combined)
-                    webView.evaluateJavaScript("console.\(level.asString())(\(jsArg))", completionHandler: nil)
+                    webView.evaluateJavaScript(script, completionHandler: nil)
                 }
             }
         }
     }
 
-    private func toJSStringLiteral(_ value: String) -> String {
+    func consoleMethodName(for level: LogLevel) -> String? {
+        switch level {
+        case .error:
+            return "error"
+        case .warn:
+            return "warn"
+        case .info:
+            return "info"
+        case .debug:
+            return "debug"
+        case .silent:
+            return nil
+        }
+    }
+
+    private func utf8SequenceLength(_ lead: UInt8) -> Int {
+        if (lead & 0x80) == 0 {
+            return 1
+        }
+        if (lead & 0xE0) == 0xC0 {
+            return 2
+        }
+        if (lead & 0xF0) == 0xE0 {
+            return 3
+        }
+        if (lead & 0xF8) == 0xF0 {
+            return 4
+        }
+        return 0
+    }
+
+    func capWebViewLogPayload(_ payload: String) -> String {
+        let suffix = "..."
+        let maxPayloadBytes = Logger.maxWebViewLogPayloadChars
+        let payloadBytes = Array(payload.utf8.prefix(maxPayloadBytes + 1))
+        if payloadBytes.count <= maxPayloadBytes {
+            return payload
+        }
+
+        var end = maxPayloadBytes
+        while end > 0 && (payloadBytes[end - 1] & 0xC0) == 0x80 {
+            end -= 1
+        }
+        while end > 0 {
+            let leadIndex = end - 1
+            let lead = payloadBytes[leadIndex]
+            let seqLength = utf8SequenceLength(lead)
+            if seqLength == 0 {
+                end -= 1
+                continue
+            }
+            if leadIndex + seqLength <= maxPayloadBytes {
+                end = leadIndex + seqLength
+                break
+            }
+            end -= 1
+        }
+
+        return String(decoding: payloadBytes[0..<end], as: UTF8.self) + suffix
+    }
+
+    func buildWebViewConsoleScript(level: LogLevel, label: String, tag: String, message: String) -> String? {
+        guard let consoleMethod = consoleMethodName(for: level) else {
+            return nil
+        }
+
+        let payload = capWebViewLogPayload("\(label) \(tag) : \(message)")
+        return "console.\(consoleMethod)(\(toJSStringLiteral(payload)))"
+    }
+
+    func toJSStringLiteral(_ value: String) -> String {
         // Prefer JSON encoding to produce a valid JS string literal
         if let data = try? JSONEncoder().encode(value),
            let encoded = String(data: data, encoding: .utf8) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "8.51.23",
+  "version": "8.51.25",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
   "main": "dist/plugin.cjs.js",