@wisdomgarden/capacitor-plugin-beacon 0.0.2 → 0.0.3

package/CHANGE-LOG.md

@@ -3,4 +3,11 @@
 ### Bug Fixes
 - Fix (Android): Resolved broadcast failure `ADVERTISE_FAILED_DATA_TOO_LARGE`.
 - Fix (Android/iOS): Resolved issue where stale/historical messages were received due to system caching.
-- Optimization: Standardized logToJsWithTag output format and logical sequence `[SEQ-XX]` .
+- Optimization: Standardized logToJsWithTag output format and logical sequence `[SEQ-XX]` .
+
+## 0.0.3 (2025-12-23)
+
+### Optimize code
+- Logic Optimization: Aligned cross-platform encoding and improved variable-length payload handling.
+- Code Fixes: Resolved naming conflicts and indexing safety issues.
+- Log Refinement: Simplified logs with concise method tags.

package/android/src/main/java/com/wisdomgarden/mobile/beacon/BeaconUtils.java

@@ -47,10 +47,9 @@ public class BeaconUtils {
      * @return 编码后的字符串
      */
     public static String encode(int num) {
-        if (num == 0) return String.valueOf(CHARS.charAt(0));
+        if (num <= 0) return String.valueOf(CHARS.charAt(0));
         StringBuilder result = new StringBuilder();
-        boolean isNegative = num < 0;
-        int n = Math.abs(num);
+        int n = num;
 
         while (n > 0) {
             int remainder = n % RADIX;
@@ -58,7 +57,7 @@ public class BeaconUtils {
             n /= RADIX;
         }
 
-        return isNegative ? "-" + result.toString() : result.toString();
+        return result.toString();
     }
 
     /**
@@ -87,8 +86,7 @@ public class BeaconUtils {
      * @return 如果是 nonce 字母返回 true，否则返回 false
      */
     public static boolean isNonceLetter(char c) {
-        int code = (int) c;
-        return code >= 84 && code <= 90;
+        return c >= 'T' && c <= 'Z';
     }
 
     /**
@@ -120,17 +118,16 @@ public class BeaconUtils {
         payload.put("rollcallId", 0);
         payload.put("nonce", "");
 
-        if (message == null) {
+        if (message == null || message.isEmpty()) {
             return payload;
         }
 
         for (int i = 0; i < message.length(); i++) {
-            char c = message.charAt(i);
-            if (isNonceLetter(c)) {
+            if (isNonceLetter(message.charAt(i))) {
                 String rollcallIdStr = message.substring(0, i);
                 payload.put("rollcallId", decode(rollcallIdStr));
                 payload.put("nonce", message.substring(i));
-                break;
+                return payload;
             }
         }
 
@@ -171,25 +168,25 @@ public class BeaconUtils {
      */
     public static String extractMessageFromBytes(byte[] data) {
         if (data == null) {
-            Log.w(TAG, "[extractMessageFromBytes] data is null");
+            Log.w(TAG, "[extractBytes] data is null");
             return null;
         }
 
         // Total length must be: length of WG_PREFIX_BYTES + length of message
         int expectedLength = WG_PREFIX_BYTES.length + MESSAGE_MAX_LENGTH;
 
-        if (data.length != expectedLength) {
-            Log.w(TAG, "[extractMessageFromBytes] Byte length mismatch. Expected: " + expectedLength + ", Got: " + data.length);
+        if (data.length < WG_PREFIX_BYTES.length || data.length > expectedLength) {
+            Log.w(TAG, "[extractBytes] Length out of bounds. Max: " + expectedLength + ", Got: " + data.length);
             return null;
         }
         for (int i = 0; i < WG_PREFIX_BYTES.length; i++) {
             if (data[i] != WG_PREFIX_BYTES[i]) {
-                Log.v(TAG, "[extractMessageFromBytes] Prefix mismatch at byte " + i);
                 return null;
             }
         }
-        String extracted = new String(data, WG_PREFIX_BYTES.length, MESSAGE_MAX_LENGTH, StandardCharsets.US_ASCII);
-        Log.i(TAG, "[extractMessageFromBytes] Successfully extracted message from bytes: " + extracted);
+        int payloadLength = data.length - WG_PREFIX_BYTES.length;
+        String extracted = new String(data, WG_PREFIX_BYTES.length, payloadLength, StandardCharsets.US_ASCII);
+        Log.i(TAG, "[extractBytes] Successfully extracted message from bytes: " + extracted);
         return extracted;
     }
 
@@ -199,21 +196,20 @@ public class BeaconUtils {
      * where the message is prefixed with "WG" and advertised as the device's name.
      */
     public static String extractMessageFromDeviceName(String message) {
-        if (message == null) {
-            Log.w(TAG, "[extractMessageFromDeviceName] message is null");
+        if (message == null || message.isEmpty()) {
+            Log.w(TAG, "[extractName] message is null");
             return null;
         }
         if (!message.startsWith(WG_PREFIX)) {
-            Log.w(TAG, "[extractMessageFromDeviceName] message does not start with prefix.message is " + message);
             return null;
         }
-        int fullLength = WG_PREFIX.length() + MESSAGE_MAX_LENGTH;
-        if (message.length() != fullLength) {
-            Log.w(TAG, "[extractMessageFromDeviceName] message length mismatch. Expected: " + fullLength + ", Got: " + message.length());
+        int expectedLength = WG_PREFIX.length() + MESSAGE_MAX_LENGTH;
+        if (message.length() > expectedLength) {
+            Log.w(TAG, "[extractName] Length out of bounds. Max: " + expectedLength + ", Got: " + message.length());
             return null;
         }
-        String extracted= message.substring(WG_PREFIX.length());
-        Log.i(TAG, "[extractMessageFromDeviceName] Successfully extracted message from device name: " + extracted);
+        String extracted = message.substring(WG_PREFIX.length());
+        Log.i(TAG, "[extractName] Successfully. " + extracted);
         return extracted;
     }
 }

package/ios/Plugin/BeaconUtils.swift

@@ -1,7 +1,7 @@
 import Foundation
 
 public struct BeaconUtils {
-   /**
+    /**
      * 16-bit Bluetooth Short UUID (0x5747)
      * Logic & Rationale:
      * 1. Represents the hex characters for 'WG' (W=0x57, G=0x47).
@@ -32,14 +32,13 @@ public struct BeaconUtils {
     public static let message_max_length = 11
 
     private static let chars =
-        "2O9AuFNPDx4gtJwS3ye7l1Mq0dEB5HsaKInikRmLhjpG6b8fzQrCcvo"
+    "2O9AuFNPDx4gtJwS3ye7l1Mq0dEB5HsaKInikRmLhjpG6b8fzQrCcvo"
     private static let radix = chars.count
 
     public static func encode(_ num: Int) -> String {
-        if num == 0 { return String(chars[chars.startIndex]) }
+        if num <= 0 { return String(chars[chars.startIndex]) }
         var result = ""
-        let isNegative = num < 0
-        var n = abs(num)
+        var n = num
 
         while n > 0 {
             let remainder = n % radix
@@ -48,7 +47,7 @@ public struct BeaconUtils {
             n /= radix
         }
 
-        return isNegative ? "-" + result : result
+        return result
     }
 
     public static func decode(_ str: String) -> Int {
@@ -56,8 +55,8 @@ public struct BeaconUtils {
         for char in str {
             if let index = chars.firstIndex(of: char) {
                 num =
-                    num * radix
-                    + chars.distance(from: chars.startIndex, to: index)
+                num * radix
+                + chars.distance(from: chars.startIndex, to: index)
             } else {
                 return 0
             }
@@ -65,46 +64,29 @@ public struct BeaconUtils {
         return num
     }
 
+     // 检查字符是否为 nonce 字母,T-Z
+    func isNonceLetter(_ c: Character) -> Bool {
+        return c >= "T" && c <= "Z"
+    }
+
     public static func parseMessage(_ message: String?) -> [String: Any] {
         var payload: [String: Any] = [
             "rollcallId": 0,
             "nonce": "",
         ]
 
-        guard let message = message else {
+        guard let message = message, !message.isEmpty else {
             return payload
         }
 
-        if message.count < message_max_length {
-            return payload
-        }
-
-        // 检查字符是否为 nonce 字母,T-Z
-        func isNonceLetter(_ c: Character) -> Bool {
-            let code = c.asciiValue ?? 0
-            return code >= 84 && code <= 90
-        }
-
         for (i, char) in message.enumerated() {
             if isNonceLetter(char) {
-                let rollcallIdStr = String(
-                    message[
-                        ..<message.index(
-                            message.startIndex,
-                            offsetBy: i
-                        )
-                    ]
-                )
+                let splitIndex = message.index(message.startIndex, offsetBy: i)
+
+                let rollcallIdStr = String(message[..<splitIndex])
                 payload["rollcallId"] = decode(rollcallIdStr)
 
-                let nonceStr = String(
-                    message[
-                        message.index(
-                            message.startIndex,
-                            offsetBy: i
-                        )...
-                    ]
-                )
+                let nonceStr = String(message[splitIndex...])
                 payload["nonce"] = nonceStr
                 break
             }
@@ -117,17 +99,16 @@ public struct BeaconUtils {
     public static func buildMessage(rollcallId: Int, nonce: String) -> String {
         let rollcallIdStr = encode(rollcallId)
 
-        guard !nonce.isEmpty, let firstChar = nonce.first else {
+        guard !nonce.isEmpty else {
             return rollcallIdStr + "Z"
         }
 
-        let remainingChars = String(nonce.dropFirst())
-
         let message = rollcallIdStr + nonce
         return message.count > message_max_length
-            ? String(message.prefix(message_max_length)) : message
+        ? String(message.prefix(message_max_length)) : message
     }
 
+
     /**
      * Prepends the protocol prefix "WG" to the message string.
      * This is used for iOS advertising, where the identifier is placed in the
@@ -144,27 +125,28 @@ public struct BeaconUtils {
      * length matches the protocol specification before returning the decoded string.
      */
     public static func extractMessageFromBytes(_ data: Data) -> String? {
-        // 2 bytes(CompanyID) + 2 bytes(Magic) + 11 bytes(Msg) = 15
-        let expectedVendorLength = 2 + WG_PREFIX_BYTES.count + message_max_length
-        guard data.count == expectedVendorLength else {
-            print("[extractMessageFromBytes] Extraction failed: Invalid byte length (\(data.count)). Expected \(expectedVendorLength).")
+        // Android Logic: CompanyID(2 bytes) + (Prefix)2 bytes + Msg(11 bytes) = 15
+        let minLength = 2 + WG_PREFIX_BYTES.count // 4 bytes
+        let maxLength = minLength + message_max_length // 15 bytes
+
+        guard data.count >= minLength && data.count <= maxLength else {
+            print("[extractBytes] Length out of bounds: \(data.count)")
             return nil
         }
 
         let bytes = [UInt8](data)
         // Check "WG" magic bytes at index 2 and 3 (after 0xFFFF Company ID)
         guard bytes[2] == WG_PREFIX_BYTES[0], bytes[3] == WG_PREFIX_BYTES[1] else {
-            print("[extractMessageFromBytes] Extraction failed: Magic bytes prefix mismatch.")
             return nil
         }
 
         let messageData = data.subdata(in: 4..<data.count)
         if let extracted = String(data: messageData, encoding: .ascii) {
-            print("[extractMessageFromBytes] Successfully extracted message from bytes: \(extracted)")
+            print("[extractBytes] Successfully: \(extracted)")
             return extracted
         }
 
-        print("[extractMessageFromBytes] Extraction failed: Data is not valid ASCII.")
+        print("[extractBytes] ASCII error")
         return nil
     }
 
@@ -174,17 +156,15 @@ public struct BeaconUtils {
      * where the message is prefixed with "WG" and advertised as the device's name.
      */
     public static func extractMessageFromDeviceName(_ message: String) -> String? {
-        guard deviceName.hasPrefix(WG_PREFIX) else {
-            return nil
-        }
+        guard message.hasPrefix(WG_PREFIX) else { return nil }
 
-        let fullLength = WG_PREFIX.count + message_max_length
-        if deviceName.count == fullLength {
-            let extracted = String(deviceName.dropFirst(WG_PREFIX.count))
-            print("[extractMessageFromDeviceName] Successfully extracted message from Device Name: \(extracted)")
+        let maxFullLength = WG_PREFIX.count + message_max_length
+        if message.count <= maxFullLength {
+            let extracted = String(message.dropFirst(WG_PREFIX.count))
+            print("[extractName] Successfully: \(extracted)")
             return extracted
         } else {
-            print("[extractMessageFromDeviceName] Device Name prefix matched, but length was invalid: \(deviceName.count)")
+            print("[extractName] Too long: \(message.count)")
             return nil
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wisdomgarden/capacitor-plugin-beacon",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Capacitor plugin for Bluetooth beacon broadcasting and monitoring",
   "main": "dist/plugin.js",
   "module": "dist/esm/index.js",