@thealteroffice/react-native-adgeist 0.0.29-beta → 0.0.31-beta

package/android/build.gradle

@@ -113,7 +113,7 @@ def kotlin_version = getExtOrDefault("kotlinVersion")
 
 dependencies {
   implementation "com.facebook.react:react-android"
-  implementation "ai.adgeist:adgeistkit:1.1.20-beta"
+  implementation "ai.adgeist:adgeistkit:1.1.22-beta"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
   /*

package/android/src/main/java/com/adgeist/modules/AdgeistImpl.kt

@@ -5,6 +5,7 @@ import android.util.Log
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.adgeistkit.AdgeistCore
+import com.adgeistkit.data.models.AdData
 import com.adgeistkit.data.models.CPMAdResponse
 import com.adgeistkit.data.models.Event
 import com.adgeistkit.data.models.FixedAdResponse
@@ -41,16 +42,20 @@ class AdgeistImpl internal constructor(private val context: ReactApplicationCont
   fun fetchCreative(adSpaceId: String, buyType: String, isTestEnvironment: Boolean, promise: Promise) {
     getAd?.fetchCreative(adSpaceId, buyType, isTestEnvironment) { adData ->
       if (adData != null) {
-        when (adData) {
-          is CPMAdResponse -> {
-            promise.resolve(adData.toWritableMap())
-          }
-          is FixedAdResponse -> {
-            promise.resolve(adData.toWritableMap())
-          }
-          else -> {
-            promise.resolve(null)
+        if (adData.isSuccess && adData.data != null) {
+          when (val response = adData.data) {
+            is CPMAdResponse -> {
+              promise.resolve(response.toWritableMap())
+            }
+            is FixedAdResponse -> {
+              promise.resolve(response.toWritableMap())
+            }
+            else -> {
+              promise.reject("UNKNOWN_RESPONSE", "Unknown ad response type")
+            }
           }
+        } else {
+          promise.reject("AD_ERROR", adData.errorMessage)
         }
       } else {
         promise.reject("NO_AD", "Ad data not available")

package/android/src/main/java/com/adgeist/utils/CreativeExtensions.kt

@@ -79,40 +79,6 @@ fun FixedAdResponse.toWritableMap(): WritableMap {
     map.putMap("campaignValidity", cvMap)
   }
 
-  val creativesArr = Arguments.createArray()
-  creatives.forEach { creative ->
-    val cMap = Arguments.createMap()
-    cMap.putString("ctaUrl", creative.ctaUrl)
-    cMap.putString("description", creative.description)
-    cMap.putString("fileName", creative.fileName)
-    cMap.putInt("fileSize", creative.fileSize ?: 0)
-    cMap.putString("fileUrl", creative.fileUrl)
-    cMap.putString("thumbnailUrl", creative.thumbnailUrl)
-    cMap.putString("title", creative.title)
-    cMap.putString("type", creative.type)
-
-    creative.contentModerationResult?.let {
-      val cm = Arguments.createMap()
-      cm.putString("\$oid", it.`$oid`)
-      cMap.putMap("contentModerationResult", cm)
-    }
-
-    creative.createdAt?.let {
-      val cm = Arguments.createMap()
-      cm.putDouble("\$date", it.`$date`?.toDouble() ?: 0.0)
-      cMap.putMap("createdAt", cm)
-    }
-
-    creative.updatedAt?.let {
-      val cm = Arguments.createMap()
-      cm.putDouble("\$date", it.`$date`?.toDouble() ?: 0.0)
-      cMap.putMap("updatedAt", cm)
-    }
-
-    creativesArr.pushMap(cMap)
-  }
-  map.putArray("creatives", creativesArr)
-
   val creativesV1Arr = Arguments.createArray()
   creativesV1.forEach { creativeV1 ->
     val cv1Map = Arguments.createMap()

package/ios/AdgeistImpl.swift

@@ -52,18 +52,24 @@ import React
             adUnitID: adSpaceId,
             buyType: buyType,
             isTestEnvironment: isTestEnvironment
-        ) { creativeData in
-            var result: [String: Any] = [:]
-            
-            // Use Mirror to reflect the object's properties
-            let mirror = Mirror(reflecting: creativeData)
-            for child in mirror.children {
-                if let label = child.label {
-                    result[label] = child.value
+        ) { adData in
+            // Check if the request was successful
+            if adData.isSuccess, let creativeData = adData.data {
+                var result: [String: Any] = [:]
+                
+                // Use Mirror to reflect the object's properties
+                let mirror = Mirror(reflecting: creativeData)
+                for child in mirror.children {
+                    if let label = child.label {
+                        result[label] = child.value
+                    }
                 }
+                
+                resolver(result)
+            } else {
+                // Return error from AdData
+                rejecter("AD_ERROR", adData.errorMessage, nil)
             }
-            
-            resolver(result)
         }
     }
 

package/lib/module/constants.js

@@ -1,12 +1,8 @@
 "use strict";
 
 export const PACKAGE_VERSION_TAG = 'RN';
-export const PACKAGE_VERSION = '0.0.29-beta';
+export const PACKAGE_VERSION = '0.0.31-beta';
 export const AdSizes = {
-  custom: (width, height) => ({
-    width,
-    height
-  }),
   Responsive: {
     width: -1,
     height: -1

package/lib/module/constants.js.map

@@ -1 +1 @@
-{"version":3,"names":["PACKAGE_VERSION_TAG","PACKAGE_VERSION","AdSizes","custom","width","height","Responsive","HTML_5_AD_NATIVE_COMPONENT_NAME"],"sourceRoot":"../../src","sources":["constants.ts"],"mappings":";;AAEA,OAAO,MAAMA,mBAAmB,GAAG,IAAI;AACvC,OAAO,MAAMC,eAAe,GAAG,aAAa;AAE5C,OAAO,MAAMC,OAAO,GAAG;EACrBC,MAAM,EAAEA,CAACC,KAAa,EAAEC,MAAc,MAAc;IAAED,KAAK;IAAEC;EAAO,CAAC,CAAC;EACtEC,UAAU,EAAE;IAAEF,KAAK,EAAE,CAAC,CAAC;IAAEC,MAAM,EAAE,CAAC;EAAE;AACtC,CAAC;AAED,OAAO,MAAME,+BAA+B,GAAG,wBAAwB","ignoreList":[]}
+{"version":3,"names":["PACKAGE_VERSION_TAG","PACKAGE_VERSION","AdSizes","Responsive","width","height","HTML_5_AD_NATIVE_COMPONENT_NAME"],"sourceRoot":"../../src","sources":["constants.ts"],"mappings":";;AAAA,OAAO,MAAMA,mBAAmB,GAAG,IAAI;AACvC,OAAO,MAAMC,eAAe,GAAG,aAAa;AAE5C,OAAO,MAAMC,OAAO,GAAG;EACrBC,UAAU,EAAE;IAAEC,KAAK,EAAE,CAAC,CAAC;IAAEC,MAAM,EAAE,CAAC;EAAE;AACtC,CAAC;AAED,OAAO,MAAMC,+BAA+B,GAAG,wBAAwB","ignoreList":[]}

package/lib/typescript/src/constants.d.ts

@@ -1,8 +1,6 @@
-import type { AdSize } from './types/AdSize';
 export declare const PACKAGE_VERSION_TAG = "RN";
-export declare const PACKAGE_VERSION = "0.0.29-beta";
+export declare const PACKAGE_VERSION = "0.0.31-beta";
 export declare const AdSizes: {
-    custom: (width: number, height: number) => AdSize;
     Responsive: {
         width: number;
         height: number;

package/lib/typescript/src/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAE7C,eAAO,MAAM,mBAAmB,OAAO,CAAC;AACxC,eAAO,MAAM,eAAe,gBAAgB,CAAC;AAE7C,eAAO,MAAM,OAAO;oBACF,MAAM,UAAU,MAAM,KAAG,MAAM;;;;;CAEhD,CAAC;AAEF,eAAO,MAAM,+BAA+B,2BAA2B,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,OAAO,CAAC;AACxC,eAAO,MAAM,eAAe,gBAAgB,CAAC;AAE7C,eAAO,MAAM,OAAO;;;;;CAEnB,CAAC;AAEF,eAAO,MAAM,+BAA+B,2BAA2B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thealteroffice/react-native-adgeist",
-  "version": "0.0.29-beta",
+  "version": "0.0.31-beta",
   "description": "Publishers can integrate our SDK to connect their ad spaces to the AdGeist marketplace.",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",

package/src/constants.ts

@@ -1,10 +1,7 @@
-import type { AdSize } from './types/AdSize';
-
 export const PACKAGE_VERSION_TAG = 'RN';
-export const PACKAGE_VERSION = '0.0.29-beta';
+export const PACKAGE_VERSION = '0.0.31-beta';
 
 export const AdSizes = {
-  custom: (width: number, height: number): AdSize => ({ width, height }),
   Responsive: { width: -1, height: -1 },
 };