Merge pull request #364 from THEOplayer/bugfix/adobe-edge/bitrate-change

Bugfix/adobe edge/bitrate change

Author: tvanlaerhoven

.changeset/khaki-maps-film.md

@@ -0,0 +1,5 @@
+---
+'@theoplayer/react-native-analytics-adobe-edge': patch
+---
+
+Fixed an issue on Web where the `bitRate` property would not be passed as an integer value.

.changeset/sixty-beds-worry.md

@@ -0,0 +1,5 @@
+---
+'@theoplayer/react-native-analytics-adobe-edge': patch
+---
+
+Fixed an issue where the metadata set with `updateMetadata` would not be passed when starting a session.

.github/workflows/pr_android.yml

@@ -4,14 +4,23 @@ on:
   pull_request:
     types: [opened, reopened, synchronize]
 
+# Cancel in-progress runs on the same PR to avoid wasting runner minutes.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  NDK_VERSION: 29.0.14033849
+
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         api-level: [ 34 ]
         newArchEnabled: [ true ]
-    name: Build for API Level ${{ matrix.api-level }} using ${{matrix.newArchEnabled  == true && 'New' || 'Old' }} Architecture
+    name: Build for API Level ${{ matrix.api-level }} using ${{matrix.newArchEnabled == true && 'New' || 'Old' }} Architecture
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -21,7 +30,9 @@ jobs:
         with:
           java-version: 17
           distribution: adopt
-          cache: gradle
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Validate Gradle wrapper
         uses: gradle/actions/wrapper-validation@v4
@@ -33,9 +44,7 @@ jobs:
           cache: 'npm'
 
       - name: Run npm install
-        run: |
-          npm i -g corepack
-          npm ci --workspaces --include-workspace-root
+        run: npm ci --workspaces --include-workspace-root
 
       - name: Build workspaces
         run: npm run build
@@ -44,20 +53,15 @@ jobs:
         run: npm test
 
       - name: Install & update e2e app with latest react-native-theoplayer
-        run: |
-          cd apps/e2e
-          npm update react-native-theoplayer
-          npm ci
+        working-directory: apps/e2e
+        run: npm install react-native-theoplayer@latest
 
       - name: Enable KVM
         run: |
           echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
           sudo udevadm control --reload-rules
           sudo udevadm trigger --name-match=kvm
 
-      - name: Gradle cache
-        uses: gradle/actions/setup-gradle@v3
-
       - name: AVD cache
         uses: actions/cache@v4
         id: avd-cache
@@ -68,7 +72,7 @@ jobs:
           key: avd-${{ matrix.api-level }}
 
       - name: Create AVD and generate snapshot for caching
-        if: steps.avd-cache.outputs.cache-hit != 'true' #check previous step output
+        if: steps.avd-cache.outputs.cache-hit != 'true'
         uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: ${{ matrix.api-level }}
@@ -81,18 +85,25 @@ jobs:
           disable-animations: true
           script: echo "Generated AVD snapshot for caching."
 
-      - name: Modify gradle.properties with repository secrets
+      - name: Cache NDK
+        uses: actions/cache@v4
+        id: ndk-cache
+        with:
+          path: /usr/local/lib/android/sdk/ndk/${{ env.NDK_VERSION }}
+          key: ndk-${{ env.NDK_VERSION }}
+
+      - name: Install NDK
+        if: steps.ndk-cache.outputs.cache-hit != 'true'
+        run: echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "ndk;${{ env.NDK_VERSION }}"
+
+      - name: Configure gradle.properties
         working-directory: apps/e2e/android
         run: |
           echo "YOSPACE_USERNAME=${{ secrets.YOSPACE_USERNAME }}" >> ./gradle.properties
           echo "YOSPACE_PASSWORD=${{ secrets.YOSPACE_PASSWORD }}" >> ./gradle.properties
-
-      - name: Modify gradle.properties for newArchEnabled
-        working-directory: apps/e2e/android
-        run: |
-          # Modify or add the newArchEnabled property in gradle.properties
-          echo "newArchEnabled=${{ matrix.newArchEnabled }}" >> ./gradle.properties
-          cat ./gradle.properties
+          echo "newArchEnabled=${{ matrix.newArchEnabled }}"       >> ./gradle.properties
+          # Only build the x86_64 ABI needed by the CI emulator.
+          echo "reactNativeArchitectures=x86_64"                   >> ./gradle.properties
 
       - name: Run e2e tests
         uses: reactivecircus/android-emulator-runner@v2
@@ -102,10 +113,17 @@ jobs:
           arch: x86_64
           cores: 2
           ram-size: 3072M
-          force-avd-creation: true
+          force-avd-creation: false
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
-          script: |
-            npm run test:e2e:android
-            cat cavy_results.md >> $GITHUB_STEP_SUMMARY
+          script: npm run test:e2e:android
           working-directory: apps/e2e
+
+      - name: Summarize results
+        working-directory: apps/e2e
+        if: always()
+        run: |
+          if [ -f cavy_results.md ]; then
+            cat cavy_results.md >> $GITHUB_STEP_SUMMARY
+          fi
+

.github/workflows/pr_ios.yml

@@ -4,10 +4,16 @@ on:
   pull_request:
     types: [opened, reopened, synchronize]
 
+# Cancel in-progress runs on the same PR to avoid wasting runner minutes.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: macos-14
     strategy:
+      fail-fast: false
       matrix:
         xcode_version: [ '16.1.0' ]
         newArchEnabled: [ 1 ]
@@ -41,9 +47,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: apps/e2e/ios/Pods
-          key: pods-${{ runner.os }}-${{ hashFiles('Podfile.lock') }}-${{ matrix.newArchEnabled }}
+          key: pods-${{ runner.os }}-${{ matrix.platform }}-${{ matrix.newArchEnabled }}-${{ hashFiles('apps/e2e/ios/Podfile.lock') }}
           restore-keys: |
-            pods-${{ runner.os }}-
+            pods-${{ runner.os }}-${{ matrix.platform }}-${{ matrix.newArchEnabled }}-
 
       - name: Run npm install
         run: |
@@ -57,19 +63,18 @@ jobs:
         run: npm test
 
       - name: Install & update e2e app with latest react-native-theoplayer
-        run: |
-          cd apps/e2e
-          npm update react-native-theoplayer
-          npm ci
+        working-directory: apps/e2e
+        run: npm install react-native-theoplayer@latest
 
       - name: Install Ruby dependencies
         working-directory: apps/e2e
-        run: bundle install
+        run: |
+          bundle config set path 'vendor/bundle'
+          bundle install
 
       - name: Run pod install & update dependencies
         working-directory: apps/e2e/ios
-        run: |
-          RCT_NEW_ARCH_ENABLED=${{ matrix.newArchEnabled }} bundle exec pod update
+        run: RCT_NEW_ARCH_ENABLED=${{ matrix.newArchEnabled }} bundle exec pod update
 
       - name: Start iOS simulator
         uses: futureware-tech/simulator-action@v4
@@ -85,4 +90,7 @@ jobs:
       - name: Summarize results
         working-directory: apps/e2e
         if: always()
-        run: cat cavy_results.md >> $GITHUB_STEP_SUMMARY
+        run: |
+          if [ -f cavy_results.md ]; then
+            cat cavy_results.md >> $GITHUB_STEP_SUMMARY
+          fi

.github/workflows/pr_web.yml

@@ -1,5 +1,6 @@
 name: Build Web on PRs
 on:
+  workflow_dispatch:
   push:
     branches:
       - main
@@ -9,21 +10,31 @@ on:
     types: [opened, reopened, synchronize]
     paths-ignore:
       - '**.md'
+
+# Cancel in-progress runs on the same PR to avoid wasting runner minutes.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
     name: Test
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
+      - name: Checkout repository
         uses: actions/checkout@v4
-      - name: Setup Node.js 20
+
+      - name: Setup Node
         uses: actions/setup-node@v4
         with:
           node-version: 22
           cache: 'npm'
+
       - name: Install dependencies
         run: npm ci --workspaces --include-workspace-root
+
       - name: Build
         run: npm run build
+
       - name: Test
         run: npm test

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

@@ -374,7 +374,6 @@ class AdobeEdgeHandler(
         chapterCue.endTime.toInt(),
         (chapterCue.endTime - chapterCue.startTime).toInt()
       ),
-      customMetadata
     )
     currentChapter = chapterCue
   }
@@ -428,7 +427,6 @@ class AdobeEdgeHandler(
         adPodPosition,
         (event.ad as? LinearAd)?.duration ?: 0
       ),
-      customMetadata
     )
     adPodPosition++
   }
@@ -504,6 +502,9 @@ class AdobeEdgeHandler(
       customMetadata
     )
 
+    // Clear used custom metadata after starting the session to avoid accidentally reusing it for the next session.
+    customMetadata.clear()
+
     sessionInProgress = true
 
     if (eventQueue.isNotEmpty()) {
@@ -534,7 +535,6 @@ class AdobeEdgeHandler(
     isPlayingAd = false
     sessionInProgress = false
     currentChapter = null
-    customMetadata = mutableMapOf()
   }
 
   fun destroy() {

adobe-edge/ios/Connector/AdobeEdgeHandler.swift

@@ -427,6 +427,10 @@ class AdobeEdgeHandler {
             mediaType: MediaType.Video
         ) {
             self.tracker.trackSessionStart(info: mediaObject, metadata: self.customMetadata)
+
+            // Clear used custom metadata after starting the session to avoid accidentally reusing it for the next session.
+            self.customMetadata.removeAll()
+
             self.sessionInProgress = true
             self.logDebug("maybeStartSession - STARTED")
 
@@ -486,7 +490,6 @@ class AdobeEdgeHandler {
         self.sessionInProgress = false
         self.currentChapter = nil
         self.eventQueue.removeAll()
-        self.customMetadata.removeAll()
     }
 
     func destroy() -> Void {

adobe-edge/jest.config.js

@@ -0,0 +1,10 @@
+/** @type {import('jest').Config} */
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  testMatch: ['**/__tests__/**/*.test.ts'],
+  moduleNameMapper: {
+    '^@theoplayer/react-native-analytics-adobe-edge$': '<rootDir>/src/index',
+  },
+};
+

adobe-edge/package.json

@@ -34,7 +34,8 @@
     "manifest": "node manifest.js > src/manifest.json",
     "prepare": "npm run manifest && npm run build",
     "clean": "rimraf lib android/build example/android/build example/android/app/build example/ios/build",
-    "generate-types": "openapi-typescript src/internal/web/media-edge-0.1.json -o src/internal/web/MediaEdge.d.ts"
+    "generate-types": "openapi-typescript src/internal/web/media-edge-0.1.json -o src/internal/web/MediaEdge.d.ts",
+    "test": "jest"
   },
   "keywords": [
     "react-native",
@@ -88,6 +89,9 @@
     "openapi-fetch": "^0.9.8"
   },
   "devDependencies": {
-    "metro-react-native-babel-preset": "^0.77.0"
+    "@types/jest": "^30.0.0",
+    "jest": "^30.2.0",
+    "metro-react-native-babel-preset": "^0.77.0",
+    "ts-jest": "^29.4.6"
   }
 }

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

@@ -310,7 +310,6 @@ class AdobeEdgeHandler {
         Math.trunc(chapterCue.endTime),
         Math.trunc(chapterCue.endTime - chapterCue.startTime),
       ),
-      this._customMetadata,
     );
     this._currentChapter = chapterCue;
   };
@@ -350,7 +349,6 @@ class AdobeEdgeHandler {
     this.queueOrSendEvent(
       EventType.adStart,
       this._media?.createAdObject(PROP_NA, PROP_NA, this._adPodPosition, event.ad.duration ? Math.trunc(event.ad.duration) : 0),
-      this._customMetadata,
     );
     this._adPodPosition++;
   };
@@ -420,6 +418,9 @@ class AdobeEdgeHandler {
       this._customMetadata,
     );
 
+    // Clear used custom metadata after starting the session to avoid accidentally reusing it for the next session.
+    this._customMetadata = {};
+
     this._sessionInProgress = true;
 
     // Post any queued events now that the session has started.
@@ -466,7 +467,6 @@ class AdobeEdgeHandler {
     this._adPodPosition = 1;
     this._sessionInProgress = false;
     this._currentChapter = undefined;
-    this._customMetadata = {};
   }
 
   destroy() {