@kontextso/sdk-react-native 0.0.5-rc.8 → 0.0.6

package/dist/index.d.mts

@@ -33,7 +33,9 @@ interface Ad {
     isStreaming?: boolean;
     isError?: boolean;
     viewed?: boolean;
+    clicked?: boolean;
     messageId?: string;
+    rewardContent?: string;
     product?: {
         id: string;
         title: string;
@@ -140,7 +142,6 @@ interface AdsProviderProps {
     logLevel?: any;
     conversationId?: string;
     styles?: AdStyles;
-    throwError?: boolean;
 }
 declare const VISITOR_ID_KEY = "brain-visitor-id";
 declare const AdsProvider: ({ children, messages, publisherToken, isLoading, adserverUrl, isDisabled, character, conversationId, userId, logLevel, onAdView, onAdClick, ...props }: AdsProviderProps) => react_jsx_runtime.JSX.Element;

package/dist/index.d.ts

@@ -33,7 +33,9 @@ interface Ad {
     isStreaming?: boolean;
     isError?: boolean;
     viewed?: boolean;
+    clicked?: boolean;
     messageId?: string;
+    rewardContent?: string;
     product?: {
         id: string;
         title: string;
@@ -140,7 +142,6 @@ interface AdsProviderProps {
     logLevel?: any;
     conversationId?: string;
     styles?: AdStyles;
-    throwError?: boolean;
 }
 declare const VISITOR_ID_KEY = "brain-visitor-id";
 declare const AdsProvider: ({ children, messages, publisherToken, isLoading, adserverUrl, isDisabled, character, conversationId, userId, logLevel, onAdView, onAdClick, ...props }: AdsProviderProps) => react_jsx_runtime.JSX.Element;

package/dist/index.js

@@ -97,7 +97,7 @@ var fetchRetry = async (input, init, maxRetries = 3, retryPeriod = 500) => {
 };
 var fixUrl = (adserverUrl, ad) => {
   if (ad.content) {
-    ad.content = ad.content.replace("/ad/", `${adserverUrl}/ad/`);
+    ad.content = ad.content.replace("/impression/", `${adserverUrl}/impression/`);
   }
   return { ...ad, url: `${adserverUrl}${ad.url}` };
 };
@@ -105,7 +105,8 @@ var mergeAds = ({
   initAds,
   preloadAds,
   streamAds,
-  viewedAds
+  viewedAds,
+  clickedAds
 }) => {
   const ads = [...initAds];
   if (Array.isArray(preloadAds)) {
@@ -132,6 +133,7 @@ var mergeAds = ({
   }
   for (const ad of ads) {
     ad.viewed = viewedAds.includes(ad?.id || "placeholder");
+    ad.clicked = clickedAds.includes(ad?.id || "placeholder");
   }
   return ads;
 };
@@ -201,9 +203,11 @@ var parseMessageText = (text) => {
 var import_loglevel = __toESM(require("loglevel"));
 
 // package.json
-var version = "0.0.5-rc.7";
+var version = "0.0.5-rc.8";
 
 // src/hooks/useInitializeAds.tsx
+var SINGLE_INIT_TIMEOUT_BUDGET_MS = 3e3;
+var SINGLE_INIT_RETRIES = 3;
 async function initialize(adServerUrl, publisherToken, userId, conversationId, legacyVisitorId, character) {
   import_loglevel.default.log("[BRAIN] init ads started");
   const response = await fetchRetry(
@@ -221,8 +225,8 @@ async function initialize(adServerUrl, publisherToken, userId, conversationId, l
         character
       })
     },
-    3,
-    1e3
+    SINGLE_INIT_TIMEOUT_BUDGET_MS,
+    SINGLE_INIT_RETRIES
   );
   const {
     sessionId,
@@ -715,8 +719,8 @@ function useStreamAds({
                 isLoading: false,
                 isStreaming: true,
                 content: content.replace(
-                  new RegExp(`/ad/${adData.product.id}/redirect`, "g"),
-                  `/ad/${adData.id}/redirect`
+                  new RegExp(`/impression/${adData.product.id}/redirect`, "g"),
+                  `/impression/${adData.id}/redirect`
                 )
               });
               return newAd;
@@ -813,6 +817,7 @@ var AdsProviderWithoutBoundary = ({
   ...props
 }) => {
   const [viewedAds, setViewedAds] = (0, import_react5.useState)([]);
+  const [clickedAds, setClickedAds] = (0, import_react5.useState)([]);
   const adServerUrlOrDefault = adserverUrl || "https://server.megabrain.co";
   import_loglevel5.default.setLevel(logLevel || "ERROR");
   const {
@@ -857,13 +862,7 @@ var AdsProviderWithoutBoundary = ({
     enabledPlacements,
     publisherToken
   });
-  const ads = mergeAds({ initAds, preloadAds, streamAds, viewedAds });
-  if (props.throwError && Math.random() < 0.1) {
-    throw new Error("Test error");
-  }
-  if (props.throwError && Math.random() < 0.1) {
-    Promise.reject(new Error("Test async error"));
-  }
+  const ads = mergeAds({ initAds, preloadAds, streamAds, viewedAds, clickedAds });
   const markAdAsViewed = (ad) => {
     import_loglevel5.default.debug("[Brain] Calling onAdView");
     onAdView && onAdView({
@@ -884,6 +883,13 @@ var AdsProviderWithoutBoundary = ({
       messageId: ad.messageId,
       content: ad.content
     });
+    if (!ad.id) {
+      return;
+    }
+    if (clickedAds.includes(ad.id)) {
+      return;
+    }
+    setClickedAds((old) => [...old, ad.id]);
   };
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
     AdsContext.Provider,
@@ -954,8 +960,7 @@ var AdsProvider = ({
           userId,
           logLevel,
           onAdView,
-          onAdClick,
-          throwError: props.throwError
+          onAdClick
         }
       )
     }
@@ -978,7 +983,7 @@ function useAdViewed(ad) {
       serverUrl = context.streamAdServerUrl;
     }
     try {
-      const response = await fetch(`${serverUrl}/ad/${ad.id}/view`, {
+      const response = await fetch(`${serverUrl}/impression/${ad.id}/view`, {
         method: "POST"
       });
       if (!response.ok) {
@@ -1263,6 +1268,10 @@ var InlineAd = ({ code, messageId, wrapper }) => {
       }
     }
   };
+  let adContent = ad.content;
+  if (ad.clicked && ad.rewardContent) {
+    adContent = ad.rewardContent;
+  }
   const content = /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)(import_react_native5.View, { style: styles?.container, children: [
     /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_react_native5.View, { style: styles?.adBadgeContainer, children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_react_native5.Text, { style: styles?.adBadgeText, children: "Ad" }) }),
     ad.imageUrl && ad.mediaPlacement === "top" && !ad.isStreaming && /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(
@@ -1292,7 +1301,7 @@ var InlineAd = ({ code, messageId, wrapper }) => {
       MarkdownText,
       {
         onLinkClick: () => context?.onAdClickInternal(ad),
-        content: ad.content
+        content: adContent
       }
     ) }),
     ad.imageUrl && ad.mediaPlacement === "bottom" && !ad.isStreaming && /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(

package/dist/index.mjs

@@ -71,7 +71,7 @@ var fetchRetry = async (input, init, maxRetries = 3, retryPeriod = 500) => {
 };
 var fixUrl = (adserverUrl, ad) => {
   if (ad.content) {
-    ad.content = ad.content.replace("/ad/", `${adserverUrl}/ad/`);
+    ad.content = ad.content.replace("/impression/", `${adserverUrl}/impression/`);
   }
   return { ...ad, url: `${adserverUrl}${ad.url}` };
 };
@@ -79,7 +79,8 @@ var mergeAds = ({
   initAds,
   preloadAds,
   streamAds,
-  viewedAds
+  viewedAds,
+  clickedAds
 }) => {
   const ads = [...initAds];
   if (Array.isArray(preloadAds)) {
@@ -106,6 +107,7 @@ var mergeAds = ({
   }
   for (const ad of ads) {
     ad.viewed = viewedAds.includes(ad?.id || "placeholder");
+    ad.clicked = clickedAds.includes(ad?.id || "placeholder");
   }
   return ads;
 };
@@ -175,9 +177,11 @@ var parseMessageText = (text) => {
 import log from "loglevel";
 
 // package.json
-var version = "0.0.5-rc.7";
+var version = "0.0.5-rc.8";
 
 // src/hooks/useInitializeAds.tsx
+var SINGLE_INIT_TIMEOUT_BUDGET_MS = 3e3;
+var SINGLE_INIT_RETRIES = 3;
 async function initialize(adServerUrl, publisherToken, userId, conversationId, legacyVisitorId, character) {
   log.log("[BRAIN] init ads started");
   const response = await fetchRetry(
@@ -195,8 +199,8 @@ async function initialize(adServerUrl, publisherToken, userId, conversationId, l
         character
       })
     },
-    3,
-    1e3
+    SINGLE_INIT_TIMEOUT_BUDGET_MS,
+    SINGLE_INIT_RETRIES
   );
   const {
     sessionId,
@@ -689,8 +693,8 @@ function useStreamAds({
                 isLoading: false,
                 isStreaming: true,
                 content: content.replace(
-                  new RegExp(`/ad/${adData.product.id}/redirect`, "g"),
-                  `/ad/${adData.id}/redirect`
+                  new RegExp(`/impression/${adData.product.id}/redirect`, "g"),
+                  `/impression/${adData.id}/redirect`
                 )
               });
               return newAd;
@@ -787,6 +791,7 @@ var AdsProviderWithoutBoundary = ({
   ...props
 }) => {
   const [viewedAds, setViewedAds] = useState4([]);
+  const [clickedAds, setClickedAds] = useState4([]);
   const adServerUrlOrDefault = adserverUrl || "https://server.megabrain.co";
   log5.setLevel(logLevel || "ERROR");
   const {
@@ -831,13 +836,7 @@ var AdsProviderWithoutBoundary = ({
     enabledPlacements,
     publisherToken
   });
-  const ads = mergeAds({ initAds, preloadAds, streamAds, viewedAds });
-  if (props.throwError && Math.random() < 0.1) {
-    throw new Error("Test error");
-  }
-  if (props.throwError && Math.random() < 0.1) {
-    Promise.reject(new Error("Test async error"));
-  }
+  const ads = mergeAds({ initAds, preloadAds, streamAds, viewedAds, clickedAds });
   const markAdAsViewed = (ad) => {
     log5.debug("[Brain] Calling onAdView");
     onAdView && onAdView({
@@ -858,6 +857,13 @@ var AdsProviderWithoutBoundary = ({
       messageId: ad.messageId,
       content: ad.content
     });
+    if (!ad.id) {
+      return;
+    }
+    if (clickedAds.includes(ad.id)) {
+      return;
+    }
+    setClickedAds((old) => [...old, ad.id]);
   };
   return /* @__PURE__ */ jsx(
     AdsContext.Provider,
@@ -928,8 +934,7 @@ var AdsProvider = ({
           userId,
           logLevel,
           onAdView,
-          onAdClick,
-          throwError: props.throwError
+          onAdClick
         }
       )
     }
@@ -952,7 +957,7 @@ function useAdViewed(ad) {
       serverUrl = context.streamAdServerUrl;
     }
     try {
-      const response = await fetch(`${serverUrl}/ad/${ad.id}/view`, {
+      const response = await fetch(`${serverUrl}/impression/${ad.id}/view`, {
         method: "POST"
       });
       if (!response.ok) {
@@ -1240,6 +1245,10 @@ var InlineAd = ({ code, messageId, wrapper }) => {
       }
     }
   };
+  let adContent = ad.content;
+  if (ad.clicked && ad.rewardContent) {
+    adContent = ad.rewardContent;
+  }
   const content = /* @__PURE__ */ jsxs2(View3, { style: styles?.container, children: [
     /* @__PURE__ */ jsx5(View3, { style: styles?.adBadgeContainer, children: /* @__PURE__ */ jsx5(Text3, { style: styles?.adBadgeText, children: "Ad" }) }),
     ad.imageUrl && ad.mediaPlacement === "top" && !ad.isStreaming && /* @__PURE__ */ jsx5(
@@ -1269,7 +1278,7 @@ var InlineAd = ({ code, messageId, wrapper }) => {
       MarkdownText,
       {
         onLinkClick: () => context?.onAdClickInternal(ad),
-        content: ad.content
+        content: adContent
       }
     ) }),
     ad.imageUrl && ad.mediaPlacement === "bottom" && !ad.isStreaming && /* @__PURE__ */ jsx5(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontextso/sdk-react-native",
-  "version": "0.0.5-rc.8",
+  "version": "0.0.6",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
@@ -10,8 +10,8 @@
     "dev": "npm-run-all dev:js",
     "build:js": "tsup",
     "build": "npm run build:js && cross-env NODE_ENV=development npm run test:run",
-    "test": "",
-    "test:run": "",
+    "test": "vitest --run",
+    "test:run": "vitest --run",
     "_test": "vitest",
     "_test:run": "vitest --run",
     "_test:watch": "vitest --watch",