spotny-sdk 1.0.3 → 1.0.5

package/README.md

@@ -255,11 +255,11 @@ await setDebounceInterval(10); // emit at most every 10 s
 
 #### `clearDebounceCache()`
 
-Resets internal campaign-fetch cooldown state. Useful during testing.
+Resets internal timing state. Useful during testing.
 
 #### `getDebounceStatus()`
 
-Returns internal per-beacon timing state. Useful for debugging stuck campaigns.
+Returns internal per-beacon timing state. Useful for debugging.
 
 Returns `Promise<Object>`.
 
@@ -267,12 +267,14 @@ Returns `Promise<Object>`.
 
 ## How It Works
 
-1. `initialize()` sends your `token`, `apiKey`, and `userId` to the Spotny backend, which issues a session JWT. The JWT is persisted locally and auto-refreshed when it expires.
+1. `initialize()` sends your `token`, `apiKey`, and `identifierId` to the Spotny backend, which issues a session JWT. The JWT is persisted locally and auto-refreshed when it expires.
 2. `startScanner()` begins monitoring for iBeacons with the Spotny UUID.
-3. When a beacon is detected, the SDK fetches the associated campaign from the Spotny backend.
-4. `NEARBY` events are sent automatically as the user moves closer or further.
-5. `IMPRESSION_HEARTBEAT` events are sent every 10 s when the user is within 2 m of an active campaign.
-6. On exit, `PROXIMITY_EXIT` is sent and all state is cleaned up.
+3. When a beacon is detected, the SDK immediately sends a `NEARBY` proximity event with the `beacon_id`.
+4. The backend resolves the beacon to a `screen_id` and returns campaign data (`campaign_id`, `session_id`).
+5. The SDK stores this campaign data and uses it for subsequent events.
+6. Additional `NEARBY` events are sent automatically as the user moves closer or further (when distance changes > 0.75m).
+7. `IMPRESSION_HEARTBEAT` events are sent every 10 s when the user is within 2 m of a beacon with an active campaign.
+8. On exit, `PROXIMITY_EXIT` is sent and all state is cleaned up.
 
 All events are tied to the authenticated `identifierId` supplied during `initialize()` — no additional identity calls are required.
 
@@ -301,289 +303,3 @@ All events are tied to the authenticated `identifierId` supplied during `initial
 ## License
 
 MIT
-
----
-
-## Installation
-
-```sh
-npm install spotny-sdk
-# or
-yarn add spotny-sdk
-```
-
-### iOS
-
-```sh
-cd ios && pod install
-```
-
-Add the following keys to your `Info.plist`:
-
-```xml
-<key>NSLocationWhenInUseUsageDescription</key>
-<string>We use your location to detect nearby points of interest.</string>
-<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-<string>We use your location in the background to detect nearby points of interest.</string>
-<key>NSBluetoothAlwaysUsageDescription</key>
-<string>We use Bluetooth to detect nearby points of interest.</string>
-```
-
-Enable **Background Modes** in Xcode → your app target → **Signing & Capabilities** → Background Modes:
-
-- ✅ Location updates
-- ✅ Uses Bluetooth LE accessories
-
-### Android
-
-Add to `AndroidManifest.xml`:
-
-```xml
-<uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
-<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
-<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
-```
-
----
-
-## Quick Start
-
-```tsx
-import { useEffect } from 'react';
-import {
-  initialize,
-  startScanner,
-  stopScanner,
-  addBeaconsRangedListener,
-  addBeaconRegionListener,
-} from 'spotny-sdk';
-
-export default function App() {
-  useEffect(() => {
-    // 1. Initialize once before anything else
-    initialize({
-      token: 'YOUR_SDK_TOKEN', // required — from your Spotny dashboard
-      source: 'nike',
-      maxDetectionDistance: 10,
-    });
-
-    // 2. Listen for nearby beacons
-    const beaconSub = addBeaconsRangedListener(({ beacons, region }) => {
-      beacons.forEach((b) =>
-        console.log(
-          `${b.major}/${b.minor} — ${b.distance.toFixed(1)}m (${b.proximity})`
-        )
-      );
-    });
-
-    // 3. Listen for region enter/exit
-    const regionSub = addBeaconRegionListener(({ event, region }) => {
-      console.log(`${event.toUpperCase()}: ${region}`);
-    });
-
-    // 4. Start scanning
-    startScanner();
-
-    return () => {
-      stopScanner();
-      beaconSub.remove();
-      regionSub.remove();
-    };
-  }, []);
-
-  return null;
-}
-```
-
----
-
-## API Reference
-
-### Initialization
-
-#### `initialize(config)`
-
-**Must be called before any other SDK function.** Configures the SDK with your brand settings.
-
-| Option                     | Type     | Default      | Description                                                                                                     |
-| -------------------------- | -------- | ------------ | --------------------------------------------------------------------------------------------------------------- |
-| `token`                    | `string` | **required** | SDK token issued by Spotny for your app. Verified against the backend — rejects with `UNAUTHORIZED` if invalid. |
-| `source`                   | `string` | –            | Your brand or app identifier (e.g. `'nike'`). Sent with every tracking event.                                   |
-| `maxDetectionDistance`     | `number` | `8.0`        | Maximum detection radius in metres. Beacons beyond this are ignored.                                            |
-| `distanceCorrectionFactor` | `number` | `0.5`        | Multiplier applied to raw RSSI distance. Tune for your beacon TX power.                                         |
-
-Returns `Promise<string>`. **Rejects** if the token is missing, invalid, or the network request fails — handle the error before calling `startScanner()`.
-
-```ts
-await initialize({
-  token: 'YOUR_SDK_TOKEN',
-  source: 'nike',
-  maxDetectionDistance: 10,
-  distanceCorrectionFactor: 0.5,
-});
-```
-
----
-
-### Core Scanning
-
-#### `startScanner()`
-
-Starts iBeacon scanning. The SDK manages a fully anonymous `device_id` internally (stored in Keychain on iOS, SharedPreferences on Android — persists across launches).
-
-Returns `Promise<string>`.
-
-```ts
-await startScanner();
-```
-
----
-
-#### `stopScanner()`
-
-Stops scanning and cleans up all per-beacon state (sends `PROXIMITY_EXIT` events for any active beacons).
-
-Returns `Promise<string>`.
-
----
-
-#### `isScanning()`
-
-Returns `Promise<boolean>` — `true` if the scanner is currently active.
-
----
-
-### Permissions
-
-#### `requestNotificationPermissions()` _(iOS only)_
-
-Prompts the user for local notification permission (`alert`, `sound`, `badge`).
-
-Returns `Promise<'granted' | 'denied'>`.
-
----
-
-### Event Listeners
-
-#### `addBeaconsRangedListener(callback)`
-
-Fires when the set of nearby beacons changes, or every `debounceInterval` seconds (default 5 s) if nothing changed. The event is **deduplicated** — it does not fire every ranging cycle if proximity is unchanged.
-
-```ts
-const sub = addBeaconsRangedListener(({ beacons, region }) => {
-  beacons.forEach((b) => {
-    console.log(`Major ${b.major} / Minor ${b.minor}`);
-    console.log(`Distance: ${b.distance.toFixed(2)}m — ${b.proximity}`);
-    console.log(`RSSI: ${b.rssi} dBm`);
-  });
-});
-
-sub.remove(); // call on cleanup
-```
-
-Each beacon in the array:
-
-| Field       | Type     | Description                                                    |
-| ----------- | -------- | -------------------------------------------------------------- |
-| `uuid`      | `string` | Beacon proximity UUID                                          |
-| `major`     | `number` | Beacon major value                                             |
-| `minor`     | `number` | Beacon minor value                                             |
-| `distance`  | `number` | Estimated distance in metres (after correction factor applied) |
-| `rssi`      | `number` | Raw signal strength in dBm                                     |
-| `proximity` | `string` | `'immediate'` \| `'near'` \| `'far'` \| `'unknown'`            |
-
----
-
-#### `addBeaconRegionListener(callback)`
-
-Fires when the user enters or exits a beacon region. Works in foreground, background, and terminated state (iOS).
-
-```ts
-const sub = addBeaconRegionListener(({ event, region, state }) => {
-  if (event === 'enter') console.log('Entered region', region);
-  if (event === 'exit') console.log('Left region', region);
-  if (event === 'determined') console.log('State for', region, '→', state);
-});
-
-sub.remove(); // call on cleanup
-```
-
-| Field    | Type     | Description                                                        |
-| -------- | -------- | ------------------------------------------------------------------ |
-| `event`  | `string` | `'enter'` \| `'exit'` \| `'determined'`                            |
-| `region` | `string` | Region identifier                                                  |
-| `state`  | `string` | `'inside'` \| `'outside'` \| `'unknown'` (`determined` event only) |
-
----
-
-### Debug Helpers
-
-#### `getDebugLogs()`
-
-Returns the on-device debug log file as a string. Includes campaign fetch results and proximity events sent.
-
-Returns `Promise<string>`.
-
-#### `clearDebugLogs()`
-
-Clears the on-device debug log file.
-
-Returns `Promise<string>`.
-
-#### `setDebounceInterval(seconds)`
-
-Sets how often the `onBeaconsRanged` event is force-emitted even if proximity hasn't changed (default: `5`).
-
-```ts
-await setDebounceInterval(10); // emit at most every 10 s
-```
-
-#### `clearDebounceCache()`
-
-Resets internal campaign-fetch cooldown state. Useful during testing.
-
-#### `getDebounceStatus()`
-
-Returns internal per-beacon timing state. Useful for debugging stuck campaigns.
-
-Returns `Promise<Object>`.
-
----
-
-## How It Works
-
-1. `initialize()` sets your brand config.
-2. `startScanner()` begins monitoring for iBeacons with the Spotny UUID.
-3. When a beacon is detected, the SDK fetches the associated campaign from the Spotny backend.
-4. `NEARBY` events are sent automatically as the user moves closer or further.
-5. `IMPRESSION_HEARTBEAT` events are sent every 10 s when the user is within 2 m of an active campaign.
-6. On exit, `PROXIMITY_EXIT` is sent and all state is cleaned up.
-
-The SDK is **fully anonymous** — it generates a persistent `device_id` (Keychain on iOS, SharedPreferences on Android) that survives app reinstalls. No user identity is collected or sent.
-
----
-
-## Platform Support
-
-| Feature                  | iOS | Android |
-| ------------------------ | --- | ------- |
-| iBeacon ranging          | ✅  | ✅      |
-| Region enter/exit        | ✅  | ✅      |
-| Background scanning      | ✅  | ✅      |
-| Terminated-state wakeup  | ✅  | ✅      |
-| Keychain device ID       | ✅  | –       |
-| Notification permissions | ✅  | –       |
-
----
-
-## Contributing
-
-- [Development workflow](CONTRIBUTING.md#development-workflow)
-- [Sending a pull request](CONTRIBUTING.md#sending-a-pull-request)
-- [Code of conduct](CODE_OF_CONDUCT.md)
-
-## License
-
-MIT

package/android/src/main/java/com/spotnysdk/SpotnySdkModule.kt

@@ -58,7 +58,6 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
   private var sdkCredential: String? = null
 
   // ── Timing constants ──────────────────────────────────────────────────────
-  private var campaignFetchCooldown         = 5_000L  // ms
   private var proximityDistanceThreshold    = 0.75
   private var impressionEventInterval       = 10_000L  // ms
   private val impressionDistance            = 2.0
@@ -69,8 +68,6 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
   private val lastProximityEventSent    = mutableMapOf<String, Long>()
   private val lastProximityDistance     = mutableMapOf<String, Double>()
   private val lastImpressionEventSent   = mutableMapOf<String, Long>()
-  private val lastCampaignFetchAttempt  = mutableMapOf<String, Long>()
-  private val fetchInProgress           = mutableMapOf<String, Boolean>()
   private val proximityEventInProgress  = mutableMapOf<String, Boolean>()
   private val impressionEventInProgress = mutableMapOf<String, Boolean>()
 
@@ -224,7 +221,6 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
   }
 
   override fun clearDebounceCache(promise: Promise) {
-    lastCampaignFetchAttempt.clear(); fetchInProgress.clear()
     promise.resolve("Debounce cache cleared")
   }
 
@@ -233,8 +229,6 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
     val map = WritableNativeMap()
     for ((key, _) in activeCampaigns) {
       val entry = WritableNativeMap()
-      lastCampaignFetchAttempt[key]?.let { entry.putDouble("lastFetchAttempt", it.toDouble()) }
-      fetchInProgress[key]?.let          { entry.putBoolean("fetchInProgress", it) }
       lastProximityEventSent[key]?.let   { entry.putDouble("lastProximityEvent", it.toDouble()) }
       lastImpressionEventSent[key]?.let  { entry.putDouble("lastImpressionEvent", it.toDouble()) }
       map.putMap(key, entry)
@@ -299,30 +293,31 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
 
       if (distance <= 0 || distance > maxDetectionDistance) continue
 
-      if (activeCampaigns.containsKey(key)) {
-        val isFirst = !lastProximityEventSent.containsKey(key)
-        if (isFirst) {
+      val isFirst = !lastProximityEventSent.containsKey(key)
+      
+      if (isFirst) {
+        // First detection — send proximity immediately
+        sendProximity("NEARBY", key, distance)
+        lastProximityDistance[key] = distance
+        lastProximityEventSent[key] = now
+      } else if (distance >= 1.0) {
+        val lastDist = lastProximityDistance[key] ?: 0.0
+        if (abs(distance - lastDist) >= proximityDistanceThreshold) {
+          // Distance changed significantly — send proximity update
           sendProximity("NEARBY", key, distance)
           lastProximityDistance[key] = distance
           lastProximityEventSent[key] = now
-        } else if (distance >= 1.0) {
-          val lastDist = lastProximityDistance[key] ?: 0.0
-          if (abs(distance - lastDist) >= proximityDistanceThreshold) {
-            sendProximity("NEARBY", key, distance)
-            lastProximityDistance[key] = distance
-            lastProximityEventSent[key] = now
-          }
         }
-        val campaign = activeCampaigns[key]
-        if (campaign?.campaignId != null && campaign.inQueue == false && distance <= impressionDistance) {
-          val lastImp = lastImpressionEventSent[key]
-          if (lastImp == null || now - lastImp >= impressionEventInterval) {
-            sendImpression(key, distance)
-            lastImpressionEventSent[key] = now
-          }
+      }
+      
+      // Impression heartbeat when user is very close AND campaign exists
+      val campaign = activeCampaigns[key]
+      if (campaign?.campaignId != null && campaign.inQueue == false && distance <= impressionDistance) {
+        val lastImp = lastImpressionEventSent[key]
+        if (lastImp == null || now - lastImp >= impressionEventInterval) {
+          sendImpression(key, distance)
+          lastImpressionEventSent[key] = now
         }
-      } else {
-        fetchCampaign(major, minor)
       }
     }
   }
@@ -409,8 +404,6 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
     lastProximityEventSent.remove(key)
     lastProximityDistance.remove(key)
     lastImpressionEventSent.remove(key)
-    lastCampaignFetchAttempt.remove(key)
-    fetchInProgress.remove(key)
     proximityEventInProgress.remove(key)
     impressionEventInProgress.remove(key)
     Log.d(TAG, "Cleaned up state for beacon $key")
@@ -533,51 +526,6 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
     return sb.toString()
   }
 
-  // ── Campaign fetching ─────────────────────────────────────────────────────
-
-  private fun fetchCampaign(major: Int, minor: Int) {
-    val key = beaconKey(major, minor)
-    if (activeCampaigns.containsKey(key)) return
-    if (fetchInProgress[key] == true) return
-
-    val last = lastCampaignFetchAttempt[key]
-    if (last != null && System.currentTimeMillis() - last < campaignFetchCooldown) return
-
-    lastCampaignFetchAttempt[key] = System.currentTimeMillis()
-    fetchInProgress[key] = true
-
-    val payload = mutableMapOf<String, Any?>("beacon_id" to key)
-
-    post("$apiBasePath/distribute", payload) { status, body ->
-      fetchInProgress[key] = false
-      if (status != 200) {
-        Log.w(TAG, "Campaign fetch status $status for beacon $key")
-        return@post
-      }
-      try {
-        val json    = parseJsonObject(body) ?: return@post
-        val dataObj = json["data"]   as? Map<*, *> ?: return@post
-        val screen  = dataObj["screen"] as? Map<*, *> ?: return@post
-        val screenId = (screen["id"] as? Number)?.toInt() ?: return@post
-
-        var campaignId: Int? = null
-        var inQueue = false
-        val campaignObj = dataObj["campaign"] as? Map<*, *>
-        if (campaignObj != null) {
-          campaignId = (campaignObj["id"] as? Number)?.toInt()
-          inQueue    = campaignObj["inQueue"] as? Boolean ?: false
-        }
-
-        activeCampaigns[key] = CampaignData(
-          campaignId = campaignId, screenId = screenId,
-          sessionId = null, inQueue = inQueue, major = major, minor = minor)
-        Log.d(TAG, "Campaign loaded for beacon $key — screenId=$screenId")
-      } catch (e: Exception) {
-        Log.e(TAG, "Campaign JSON parse error for $key: ${e.message}")
-      }
-    }
-  }
-
   // ── Tracking events ───────────────────────────────────────────────────────
 
   private fun sendTracking(
@@ -593,38 +541,88 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
     if (isImpression) impressionEventInProgress[key] = true
     else              proximityEventInProgress[key]  = true
 
-    val campaign = activeCampaigns[key]
-    if (campaign == null) {
-      if (isImpression) impressionEventInProgress[key] = false
-      else              proximityEventInProgress[key]  = false
-      return
-    }
-    if (isImpression && (campaign.campaignId == null || campaign.inQueue)) {
-      impressionEventInProgress[key] = false; return
-    }
-
+    // Build payload — proximity events use beacon_id, impressions use screen_id
     val payload = mutableMapOf<String, Any?>(
       "event_type" to eventType,
-      "distance"   to distance,
-      "screen_id"  to campaign.screenId
+      "distance"   to distance
     )
-    campaign.campaignId?.let { payload["campaign_id"] = it }
-    campaign.sessionId?.let  { payload["session_id"]  = it }
+
+    if (isImpression) {
+      // Impressions require campaign to exist
+      val campaign = activeCampaigns[key]
+      if (campaign == null || campaign.campaignId == null || campaign.inQueue) {
+        impressionEventInProgress[key] = false
+        return
+      }
+      payload["screen_id"] = campaign.screenId
+      campaign.campaignId?.let { payload["campaign_id"] = it }
+      campaign.sessionId?.let  { payload["session_id"]  = it }
+    } else {
+      // Proximity events send beacon_id — backend resolves screen
+      payload["beacon_id"] = key
+      // Also send screen/campaign/session if we already have them (after first proximity)
+      activeCampaigns[key]?.let { campaign ->
+        payload["screen_id"] = campaign.screenId
+        campaign.campaignId?.let { payload["campaign_id"] = it }
+        campaign.sessionId?.let  { payload["session_id"]  = it }
+      }
+    }
 
     post(endpoint, payload) { status, body ->
       if (status in 200..299) {
         Log.d(TAG, "$eventType sent — distance ${"%.2f".format(distance)}m")
-        if (!isImpression && campaign.sessionId == null) {
+        
+        // Parse screen_id, campaign_id, session_id from proximity response
+        if (!isImpression) {
           try {
             val json = parseJsonObject(body)
-            val sid  = ((json?.get("data") as? Map<*, *>)
-                          ?.get("event") as? Map<*, *>)
-                          ?.get("session_id") as? String
-            if (sid != null) {
-              activeCampaigns[key] = campaign.copy(sessionId = sid)
-              Log.d(TAG, "session_id = $sid")
+            val dataObj = json?.get("data") as? Map<*, *>
+            
+            var screenId: Int? = null
+            var campaignId: Int? = null
+            var sessionId: String? = null
+            var inQueue = false
+            
+            // Extract from event object (contains session_id)
+            val eventObj = dataObj?.get("event") as? Map<*, *>
+            if (eventObj != null) {
+              sessionId = eventObj["session_id"] as? String
+              screenId = (eventObj["screen_id"] as? Number)?.toInt()
             }
-          } catch (_: Exception) {}
+            
+            // Extract from screen object
+            if (screenId == null) {
+              val screenObj = dataObj?.get("screen") as? Map<*, *>
+              screenId = (screenObj?.get("id") as? Number)?.toInt()
+            }
+            
+            // Extract from campaign object
+            val campaignObj = dataObj?.get("campaign") as? Map<*, *>
+            if (campaignObj != null) {
+              campaignId = (campaignObj["id"] as? Number)?.toInt()
+              inQueue = campaignObj["inQueue"] as? Boolean ?: false
+            }
+            
+            // Store campaign data if we got screen_id
+            if (screenId != null) {
+              // Parse major/minor from key
+              val parts = key.split("_")
+              val major = parts.getOrNull(0)?.toIntOrNull() ?: 0
+              val minor = parts.getOrNull(1)?.toIntOrNull() ?: 0
+              
+              activeCampaigns[key] = CampaignData(
+                campaignId = campaignId,
+                screenId = screenId,
+                sessionId = sessionId,
+                inQueue = inQueue,
+                major = major,
+                minor = minor
+              )
+              Log.d(TAG, "Stored campaign — screenId=$screenId, campaignId=$campaignId, sessionId=$sessionId")
+            }
+          } catch (e: Exception) {
+            Log.w(TAG, "Error parsing proximity response: ${e.message}")
+          }
         }
       } else if (status == 429) {
         val penalty = System.currentTimeMillis() + 10_000L

package/ios/SpotnyBeaconScanner.swift

@@ -81,7 +81,6 @@ public class SpotnyBeaconScanner: NSObject {
   private let beaconUUID = UUID(uuidString: "f7826da6-4fa2-4e98-8024-bc5b71e0893e")!
 
   // ── Timing constants ──────────────────────────────────────────────────────
-  private let campaignFetchCooldown: TimeInterval    = 5.0
   private let proximityDistanceThreshold: Double     = 0.75
   private let impressionEventInterval: TimeInterval  = 10.0
   private let impressionDistance: Double             = 2.0
@@ -92,9 +91,6 @@ public class SpotnyBeaconScanner: NSObject {
   private var lastProximityEventSent:       [String: Date]         = [:]
   private var lastProximityDistance:        [String: Double]       = [:]
   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]         = [:]
 
@@ -313,9 +309,6 @@ public class SpotnyBeaconScanner: NSObject {
     withResolve resolve: @escaping (Any?) -> Void,
     reject: @escaping (String?, String?, Error?) -> Void
   ) {
-    lastCampaignFetchAttempt.removeAll()
-    fetchInProgress.removeAll()
-    fetchRetryCount.removeAll()
     resolve("Debounce cache cleared")
   }
 
@@ -329,12 +322,6 @@ public class SpotnyBeaconScanner: NSObject {
     var status: [String: Any] = [:]
     for (key, _) in activeCampaigns {
       var entry: [String: Any] = [:]
-      if let lastFetch = lastCampaignFetchAttempt[key] {
-        entry["lastFetchAttempt"] = lastFetch.timeIntervalSince1970
-      }
-      if let inProg = fetchInProgress[key] {
-        entry["fetchInProgress"] = inProg
-      }
       if let lastProx = lastProximityEventSent[key] {
         entry["lastProximityEvent"] = lastProx.timeIntervalSince1970
       }
@@ -592,70 +579,6 @@ public class SpotnyBeaconScanner: NSObject {
     }.resume()
   }
 
-  // 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) {
-    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) < fetchCooldown(for: key) { return }
-
-    lastCampaignFetchAttempt[key] = Date()
-    fetchInProgress[key] = true
-
-    let payload: [String: Any] = ["beacon_id": key]
-
-    post(endpoint: "\(apiBasePath)/distribute", payload: payload) { [weak self] result in
-      guard let self = self else { return }
-      defer { self.fetchInProgress[key] = false }
-
-      guard case .success(let (status, data)) = result, status == 200 else {
-        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
-        logToFile("❌ Campaign fetch failed for beacon \(key) (retry \(self.fetchRetryCount[key] ?? 0))")
-        return
-      }
-      do {
-        guard let json = try JSONSerialization.jsonObject(with: data) as? [String: Any],
-              let dataObj = json["data"]     as? [String: Any],
-              let screen  = dataObj["screen"] as? [String: Any],
-              let screenId = screen["id"]    as? Int else {
-          print("⚠️ SpotnySDK: Unexpected campaign response format for \(key)")
-          return
-        }
-        var campaignId: Int?
-        var inQueue = false
-        if let campaignObj = dataObj["campaign"] as? [String: Any],
-           let cid = campaignObj["id"] as? Int {
-          campaignId = cid
-          inQueue = campaignObj["inQueue"] as? Bool ?? false
-        }
-        self.activeCampaigns[key] = CampaignData(
-          campaignId: campaignId, screenId: screenId,
-          sessionId: nil, inQueue: inQueue, major: major, minor: minor)
-        self.fetchRetryCount.removeValue(forKey: key)  // reset on success
-        logToFile("✅ Campaign loaded for beacon \(key) — screenId=\(screenId)")
-        print("✅ SpotnySDK: Campaign loaded for beacon \(key) — screenId=\(screenId)")
-      } catch {
-        print("❌ SpotnySDK: JSON parse error for beacon \(key): \(error)")
-      }
-    }
-  }
-
   // MARK: - Tracking
 
   private func sendTracking(
@@ -671,24 +594,33 @@ public class SpotnyBeaconScanner: NSObject {
     if isImpression { impressionEventInProgress[key] = true }
     else            { proximityEventInProgress[key]  = true }
 
-    guard let campaign = activeCampaigns[key] else {
-      if isImpression { impressionEventInProgress[key] = false }
-      else            { proximityEventInProgress[key]  = false }
-      return
-    }
-    if isImpression {
-      guard let _ = campaign.campaignId, !campaign.inQueue else {
-        impressionEventInProgress[key] = false; return
-      }
-    }
-
+    // Build payload — proximity events use beacon_id, impressions use screen_id
     var payload: [String: Any] = [
       "event_type": eventType,
-      "distance":   distance,
-      "screen_id":  campaign.screenId
+      "distance":   distance
     ]
-    if let cid = campaign.campaignId { payload["campaign_id"] = cid }
-    if let sid = campaign.sessionId  { payload["session_id"]  = sid }
+
+    if isImpression {
+      // Impressions require campaign to exist
+      guard let campaign = activeCampaigns[key],
+            let _ = campaign.campaignId,
+            !campaign.inQueue else {
+        impressionEventInProgress[key] = false
+        return
+      }
+      payload["screen_id"] = campaign.screenId
+      if let cid = campaign.campaignId { payload["campaign_id"] = cid }
+      if let sid = campaign.sessionId  { payload["session_id"]  = sid }
+    } else {
+      // Proximity events send beacon_id — backend resolves screen
+      payload["beacon_id"] = key
+      // Also send screen/campaign/session if we already have them (after first proximity)
+      if let campaign = activeCampaigns[key] {
+        payload["screen_id"] = campaign.screenId
+        if let cid = campaign.campaignId { payload["campaign_id"] = cid }
+        if let sid = campaign.sessionId  { payload["session_id"]  = sid }
+      }
+    }
 
     post(endpoint: endpoint, payload: payload) { [weak self] result in
       guard let self = self else { return }
@@ -697,17 +629,52 @@ public class SpotnyBeaconScanner: NSObject {
         if 200...299 ~= status {
           print("✅ SpotnySDK: \(eventType) sent — distance \(String(format: "%.2f", distance))m")
           logToFile("✅ \(eventType) sent — beacon \(key) @ \(String(format: "%.2f", distance))m")
-          if !isImpression, campaign.sessionId == nil,
+          
+          // Parse screen_id, campaign_id, session_id from proximity response
+          if !isImpression,
              let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
-             let dObj = json["data"] as? [String: Any],
-             let ev   = dObj["event"] as? [String: Any],
-             let sid  = ev["session_id"] as? String {
-            let updated = CampaignData(
-              campaignId: campaign.campaignId, screenId: campaign.screenId,
-              sessionId: sid, inQueue: campaign.inQueue,
-              major: campaign.major, minor: campaign.minor)
-            self.activeCampaigns[key] = updated
-            print("✅ SpotnySDK: session_id = \(sid)")
+             let dObj = json["data"] as? [String: Any] {
+            
+            var screenId: Int?
+            var campaignId: Int?
+            var sessionId: String?
+            var inQueue = false
+            
+            // Extract from event object (contains session_id)
+            if let ev = dObj["event"] as? [String: Any] {
+              if let sid = ev["session_id"] as? String { sessionId = sid }
+              if let scId = ev["screen_id"] as? Int { screenId = scId }
+            }
+            
+            // Extract from screen object
+            if screenId == nil, let screen = dObj["screen"] as? [String: Any] {
+              screenId = screen["id"] as? Int
+            }
+            
+            // Extract from campaign object
+            if let campaignObj = dObj["campaign"] as? [String: Any] {
+              campaignId = campaignObj["id"] as? Int
+              inQueue = campaignObj["inQueue"] as? Bool ?? false
+            }
+            
+            // Store campaign data if we got screen_id
+            if let scId = screenId {
+              // Parse major/minor from key
+              let parts = key.components(separatedBy: "_")
+              let major = parts.count > 0 ? Int(parts[0]) ?? 0 : 0
+              let minor = parts.count > 1 ? Int(parts[1]) ?? 0 : 0
+              
+              let updated = CampaignData(
+                campaignId: campaignId,
+                screenId: scId,
+                sessionId: sessionId,
+                inQueue: inQueue,
+                major: major,
+                minor: minor
+              )
+              self.activeCampaigns[key] = updated
+              print("✅ SpotnySDK: Stored campaign — screenId=\(scId), campaignId=\(campaignId ?? 0), sessionId=\(sessionId ?? "nil")")
+            }
           }
         } else if status == 429 {
           let penalty = Date().addingTimeInterval(10)
@@ -743,9 +710,6 @@ public class SpotnyBeaconScanner: NSObject {
     lastProximityEventSent.removeValue(forKey: key)
     lastProximityDistance.removeValue(forKey: key)
     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)")
@@ -835,35 +799,36 @@ extension SpotnyBeaconScanner: KTKBeaconManagerDelegate {
 
       guard distance > 0 && distance <= maxDetectionDistance else { continue }
 
-      if let campaign = activeCampaigns[key] {
-        let isFirst = lastProximityEventSent[key] == nil
-
-        if isFirst {
-          sendProximity(eventType: "NEARBY", key: key, distance: distance)
-          lastProximityDistance[key] = distance
-          lastProximityEventSent[key] = now
-        } else if distance >= 1.0,
-                  let lastDist = lastProximityDistance[key],
-                  abs(distance - lastDist) >= proximityDistanceThreshold {
-          sendProximity(eventType: "NEARBY", key: key, distance: distance)
-          lastProximityDistance[key] = distance
-          lastProximityEventSent[key] = now
-        }
+      let isFirst = lastProximityEventSent[key] == nil
+
+      if isFirst {
+        // First detection — send proximity immediately
+        sendProximity(eventType: "NEARBY", key: key, distance: distance)
+        lastProximityDistance[key] = distance
+        lastProximityEventSent[key] = now
+      } else if distance >= 1.0,
+                let lastDist = lastProximityDistance[key],
+                abs(distance - lastDist) >= proximityDistanceThreshold {
+        // Distance changed significantly — send proximity update
+        sendProximity(eventType: "NEARBY", key: key, distance: distance)
+        lastProximityDistance[key] = distance
+        lastProximityEventSent[key] = now
+      }
 
-        // Impression heartbeat when user is very close
-        if let _ = campaign.campaignId, !campaign.inQueue, distance <= impressionDistance {
-          if let last = lastImpressionEventSent[key] {
-            if now.timeIntervalSince(last) >= impressionEventInterval {
-              sendImpression(key: key, distance: distance)
-              lastImpressionEventSent[key] = now
-            }
-          } else {
+      // Impression heartbeat when user is very close AND campaign exists
+      if let campaign = activeCampaigns[key],
+         let _ = campaign.campaignId,
+         !campaign.inQueue,
+         distance <= impressionDistance {
+        if let last = lastImpressionEventSent[key] {
+          if now.timeIntervalSince(last) >= impressionEventInterval {
             sendImpression(key: key, distance: distance)
             lastImpressionEventSent[key] = now
           }
+        } else {
+          sendImpression(key: key, distance: distance)
+          lastImpressionEventSent[key] = now
         }
-      } else {
-        fetchCampaign(major: major, minor: minor)
       }
     }
   }
@@ -879,18 +844,6 @@ extension SpotnyBeaconScanner: KTKBeaconManagerDelegate {
         if bg != .invalid { UIApplication.shared.endBackgroundTask(bg); bg = .invalid }
       }
     }
-
-    // Parse major/minor from named regions (e.g. "SpotnySDK_52885_35127")
-    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)
-      }
-    }
   }
 
   public func beaconManager(_ manager: KTKBeaconManager, didExitRegion region: KTKBeaconRegion) {

package/package.json

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