Merge branch 'adobe-edge/alloy' of github.com:THEOplayer/react-native-connectors into adobe-edge/alloy

Author: wvanhaevre

adobe-edge/README.md

@@ -36,6 +36,7 @@ const config = {
     datastreamId: 'abcde123-abcd-1234-abcd-abcde1234567',
     orgId: 'ADB3LETTERSANDNUMBERS@AdobeOrg',
     edgeBasePath: 'ee',
+    edgeDomain: 'my.domain.com',
     debugEnabled: true,
   },
   mobile: {
@@ -58,7 +59,7 @@ const customIdentityMap = {
 }
 
 const App = () => {
-  const [adobe, initAdobe] = useAdobe(config, customIdentityMap);
+  const [adobe, initAdobe] = useAdobe(config, /* optional */ customIdentityMap);
 
   const onPlayerReady = (player: THEOplayer) => {
     // Initialize Adobe connector
@@ -87,3 +88,39 @@ const onUpdateMetadata = () => {
   adobe.current?.updateMetadata(metadata);
 };
 ```
+
+### Setting an custom identity map
+
+Besides passing a custom identity map during initialization, you can also set or update the identity map at any time:
+
+```typescript
+import {AdobeIdentityMap} from "@theoplayer/react-native-analytics-adobe-edge";
+
+const onUpdateIdentityMap = () => {
+  const identityMap: AdobeIdentityMap = {
+    CUSTOMER_ID: [
+      {
+        id: 'customer-12345',
+        authenticatedState: 'authenticated',
+        primary: true,
+      },
+    ],
+  };
+  adobe.current?.setIdentityMap(identityMap);
+};
+```
+
+### Starting a new session during a live stream
+
+By default, the connector will start a new session when a new asset is loaded. However, during live streams, you might
+want to start a new session
+periodically when a new program starts. You can do this by calling `stopAndStartNewSession` with the new program's
+metadata:
+
+```typescript
+const onNewProgram = () => {
+  adobe.current?.stopAndStartNewSession({
+    'friendlyName': 'Evening News',
+  });
+};
+```

adobe-edge/android/src/main/java/com/theoplayer/reactnative/adobe/edge/AdobeEdgeHandler.kt

@@ -393,20 +393,20 @@ class AdobeEdgeHandler(
     logDebug("onAdBreakBegin")
     isPlayingAd = true
     val currentAdBreakTimeOffset = event.adBreak.timeOffset
-    val index = when {
-      currentAdBreakTimeOffset == 0 -> 0
-      currentAdBreakTimeOffset < 0 -> -1
+    // The pod position should start at 1.
+    val position = when {
+      currentAdBreakTimeOffset <= 0 -> 1
       else -> adBreakPodIndex + 1
     }
     queueOrSendEvent(
       EventType.AD_BREAK_START, Media.createAdBreakObject(
         PROP_NA,
-        index,
+        position,
         currentAdBreakTimeOffset
       )
     )
 
-    if (index > adBreakPodIndex) {
+    if (position > adBreakPodIndex) {
       adBreakPodIndex++
     }
   }

adobe-edge/android/src/main/java/com/theoplayer/reactnative/adobe/edge/Utils.kt

@@ -4,6 +4,7 @@ import com.adobe.marketing.mobile.edge.identity.AuthenticatedState
 import com.adobe.marketing.mobile.edge.identity.IdentityItem
 import com.facebook.react.bridge.ReadableMap
 import com.adobe.marketing.mobile.edge.identity.IdentityMap
+import java.util.Calendar
 
 fun sanitiseContentLength(mediaLength: Double?): Int {
   return if (mediaLength == Double.POSITIVE_INFINITY) { 86400 } else mediaLength?.toInt() ?: 0
@@ -15,8 +16,10 @@ fun sanitisePlayhead(playhead: Double?, mediaLength: Double?): Int {
   }
   if (mediaLength == Double.POSITIVE_INFINITY) {
     // If content is live, the playhead must be the current second of the day.
-    val now = System.currentTimeMillis()
-    return ((now / 1000) % 86400).toInt()
+    val calendar = Calendar.getInstance()
+    return calendar.get(Calendar.SECOND) +
+      60 * (calendar.get(Calendar.MINUTE) +
+      60 * calendar.get(Calendar.HOUR_OF_DAY))
   }
   return playhead.toInt()
 }

adobe-edge/src/internal/web/AdobeEdgeHandler.ts

@@ -326,16 +326,15 @@ class AdobeEdgeHandler {
   private handleAdBreakBegin = (event: AdBreakEvent<'adbreakbegin'>) => {
     this.logDebug('onAdBreakBegin');
     const currentAdBreakTimeOffset = event.adBreak.timeOffset;
-    let index: number;
-    if (currentAdBreakTimeOffset === 0) {
-      index = 0;
-    } else if (currentAdBreakTimeOffset < 0) {
-      index = -1;
+    let position: number;
+    // The pod position should start at 1.
+    if (currentAdBreakTimeOffset <= 0) {
+      position = 1;
     } else {
-      index = this._adBreakPodIndex + 1;
+      position = this._adBreakPodIndex + 1;
     }
-    this.queueOrSendEvent(EventType.adBreakStart, this._media?.createAdBreakObject(PROP_NA, index, currentAdBreakTimeOffset));
-    if (index > this._adBreakPodIndex) {
+    this.queueOrSendEvent(EventType.adBreakStart, this._media?.createAdBreakObject(PROP_NA, position, currentAdBreakTimeOffset));
+    if (position > this._adBreakPodIndex) {
       this._adBreakPodIndex++;
     }
   };