spotny-sdk 0.3.9 → 0.4.0

package/ios/SpotnyBeaconScanner.swift

@@ -11,6 +11,7 @@ import Foundation
 import CoreLocation
 import KontaktSDK
 import UserNotifications
+import Security
 
 // MARK: - Public ObjC-visible typealias for the event callback block
 
@@ -69,6 +70,7 @@ public class SpotnyBeaconScanner: NSObject {
   private var lastImpressionEventSent:      [String: Date]         = [:]
   private var lastCampaignFetchAttempt:     [String: Date]         = [:]
   private var fetchInProgress:              [String: Bool]         = [:]
+  private var fetchRetryCount:              [String: Int]          = [:]
   private var proximityEventInProgress:     [String: Bool]         = [:]
   private var impressionEventInProgress:    [String: Bool]         = [:]
 
@@ -227,6 +229,7 @@ public class SpotnyBeaconScanner: NSObject {
   ) {
     lastCampaignFetchAttempt.removeAll()
     fetchInProgress.removeAll()
+    fetchRetryCount.removeAll()
     resolve("Debounce cache cleared")
   }
 
@@ -302,13 +305,51 @@ public class SpotnyBeaconScanner: NSObject {
 
   private func beaconKey(major: Int, minor: Int) -> String { "\(major)_\(minor)" }
 
+  // ── Keychain helpers (device ID survives uninstall/reinstall) ──────────────
+  private let keychainService = "app.spotny.sdk"
+
+  private func keychainRead(key: String) -> String? {
+    let query: [CFString: Any] = [
+      kSecClass:       kSecClassGenericPassword,
+      kSecAttrService: keychainService,
+      kSecAttrAccount: key,
+      kSecReturnData:  true,
+      kSecMatchLimit:  kSecMatchLimitOne
+    ]
+    var result: AnyObject?
+    guard SecItemCopyMatching(query as CFDictionary, &result) == errSecSuccess,
+          let data = result as? Data else { return nil }
+    return String(data: data, encoding: .utf8)
+  }
+
+  private func keychainWrite(key: String, value: String) {
+    guard let data = value.data(using: .utf8) else { return }
+    let query: [CFString: Any] = [
+      kSecClass:       kSecClassGenericPassword,
+      kSecAttrService: keychainService,
+      kSecAttrAccount: key
+    ]
+    if SecItemCopyMatching(query as CFDictionary, nil) == errSecSuccess {
+      SecItemUpdate(query as CFDictionary, [kSecValueData: data] as CFDictionary)
+    } else {
+      var item = query; item[kSecValueData] = data
+      SecItemAdd(item as CFDictionary, nil)
+    }
+  }
+
   private func getDeviceId() -> String {
-    if let stored = UserDefaults.standard.string(forKey: "SpotnySDK_deviceId") {
-      return stored
+    let kcKey = "SpotnySDK_deviceId"
+    // 1. Keychain — survives uninstall
+    if let stored = keychainRead(key: kcKey) { return stored }
+    // 2. Migrate existing UserDefaults value on first run after upgrade
+    if let legacy = UserDefaults.standard.string(forKey: kcKey) {
+      keychainWrite(key: kcKey, value: legacy)
+      UserDefaults.standard.removeObject(forKey: kcKey)
+      return legacy
     }
+    // 3. Generate new ID
     let id = UIDevice.current.identifierForVendor?.uuidString ?? UUID().uuidString
-    UserDefaults.standard.set(id, forKey: "SpotnySDK_deviceId")
-    UserDefaults.standard.synchronize()
+    keychainWrite(key: kcKey, value: id)
     return id
   }
 
@@ -375,13 +416,22 @@ public class SpotnyBeaconScanner: NSObject {
 
   // MARK: - Campaign Fetching
 
+  /// Exponential cooldown: 5 s → 15 s → 45 s. After 3 failures the key is
+  /// considered permanently failed until the beacon region is re-entered.
+  private func fetchCooldown(for key: String) -> TimeInterval {
+    let retries = fetchRetryCount[key] ?? 0
+    return campaignFetchCooldown * pow(3.0, Double(min(retries, 3)))
+  }
+
   private func fetchCampaign(major: Int, minor: Int, deviceId: String) {
     let key = beaconKey(major: major, minor: minor)
     guard activeCampaigns[key] == nil else { return }
     guard fetchInProgress[key] != true else { return }
+    // Give up after 3 consecutive failures (cooldown would be 135 s+)
+    if (fetchRetryCount[key] ?? 0) > 3 { return }
 
     if let last = lastCampaignFetchAttempt[key],
-       Date().timeIntervalSince(last) < campaignFetchCooldown { return }
+       Date().timeIntervalSince(last) < fetchCooldown(for: key) { return }
 
     lastCampaignFetchAttempt[key] = Date()
     fetchInProgress[key] = true
@@ -398,6 +448,8 @@ public class SpotnyBeaconScanner: NSObject {
         if case .success(let (s, _)) = result {
           print("❌ SpotnySDK: Campaign fetch status \(s) for beacon \(key)")
         }
+        // Increment retry count so next attempt uses a longer cooldown
+        self.fetchRetryCount[key] = (self.fetchRetryCount[key] ?? 0) + 1
         return
       }
       do {
@@ -418,6 +470,7 @@ public class SpotnyBeaconScanner: NSObject {
         self.activeCampaigns[key] = CampaignData(
           campaignId: campaignId, screenId: screenId,
           sessionId: nil, inQueue: inQueue, major: major, minor: minor)
+        self.fetchRetryCount.removeValue(forKey: key)  // reset on success
         print("✅ SpotnySDK: Campaign loaded for beacon \(key) — screenId=\(screenId)")
       } catch {
         print("❌ SpotnySDK: JSON parse error for beacon \(key): \(error)")
@@ -517,6 +570,7 @@ public class SpotnyBeaconScanner: NSObject {
     lastImpressionEventSent.removeValue(forKey: key)
     lastCampaignFetchAttempt.removeValue(forKey: key)
     fetchInProgress.removeValue(forKey: key)
+    fetchRetryCount.removeValue(forKey: key)
     proximityEventInProgress.removeValue(forKey: key)
     impressionEventInProgress.removeValue(forKey: key)
     print("🧹 SpotnySDK: Cleaned up state for beacon \(key)")
@@ -630,7 +684,9 @@ extension SpotnyBeaconScanner: KTKBeaconManagerDelegate {
     let parts = region.identifier.components(separatedBy: "_")
     if parts.count == 3, let major = Int(parts[1]), let minor = Int(parts[2]) {
       let key = beaconKey(major: major, minor: minor)
+      // Reset fetch state on re-entry so retry backoff starts fresh
       lastCampaignFetchAttempt.removeValue(forKey: key)
+      fetchRetryCount.removeValue(forKey: key)
       if activeCampaigns[key] == nil {
         fetchCampaign(major: major, minor: minor, deviceId: getDeviceId())
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spotny-sdk",
-  "version": "0.3.9",
+  "version": "0.4.0",
   "description": "Beacon Scanner",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",