@bprotsyk/aso-core 2.1.44 → 2.1.46

package/lib/network/keitaro/keitaro-service.js

@@ -71,13 +71,23 @@ async function createStreamForMatchingCampaigns(streamPayloads, campaignRegExp,
         // Process each stream payload
         for (const { payload, offerId } of streamPayloads) {
             const identicalStream = streams.find(stream => stream.name.includes(offerId));
-            if (identicalStream) {
-                await http_1.default.delete(`streams/${identicalStream.id}`);
+            try {
+                if (identicalStream) {
+                    await http_1.default.put(`streams/${identicalStream.id}`, {
+                        campaign_id: matchingCampaign.id,
+                        ...payload
+                    });
+                }
+                else {
+                    await http_1.default.post('streams', {
+                        campaign_id: matchingCampaign.id,
+                        ...payload
+                    });
+                }
+            }
+            catch (error) {
+                console.error(`Error updating stream ${offerId} (${payload.name}) in campaign ${matchingCampaign.id} (${matchingCampaign.name}):`, error);
             }
-            await http_1.default.post('streams', {
-                campaign_id: matchingCampaign.id,
-                ...payload
-            });
         }
     }
 }
@@ -187,7 +197,9 @@ async function cloneOWCampaign(app) {
     let matchingCampaign = allCampaigns.filter((c) => new RegExp(`#${app.id}.*◈`).test(c.name));
     if (matchingCampaign.length > 0)
         return matchingCampaign[0];
-    const { data: campaigns } = await http_1.default.post(`/campaigns/2673/clone`);
+    const { data: campaigns } = await http_1.default.post(`/campaigns/2673/clone`, {
+        name: name
+    });
     if (campaigns.length == 0)
         throw Error("Campaign cloning falied");
     let clonedCampaign = campaigns[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bprotsyk/aso-core",
-  "version": "2.1.44",
+  "version": "2.1.46",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
@@ -42,7 +42,7 @@
   "devDependencies": {
     "@types/mustache": "^4.2.5",
     "@types/node": "^20.14.12",
-    "@types/react": "^18.3.12",
+    "@types/react": "^18.3.18",
     "@types/react-dom": "^18.3.0",
     "copyfiles": "^2.4.1",
     "typedoc": "^0.23.28",

package/src/network/keitaro/keitaro-service.ts

@@ -75,8 +75,8 @@ async function updateCampaign(id: number, payload: Partial<IKeitaroCampaign>) {
 async function createStreamForMatchingCampaigns(streamPayloads: { payload: any, offerId: string }[], campaignRegExp: RegExp, avoidGroup?: number) {
     // Get all campaigns once
     const allCampaigns = await getAllCampaigns();
-    const matchingCampaigns = allCampaigns.filter(campaign =>
-        (avoidGroup ? campaign.group_id != avoidGroup : true) &&
+    const matchingCampaigns = allCampaigns.filter(campaign => 
+        (avoidGroup ? campaign.group_id != avoidGroup : true) && 
         campaignRegExp.exec(campaign.name)
     );
 
@@ -94,14 +94,21 @@ async function createStreamForMatchingCampaigns(streamPayloads: { payload: any,
         for (const { payload, offerId } of streamPayloads) {
             const identicalStream = streams.find(stream => stream.name.includes(offerId));
 
-            if (identicalStream) {
-                await keitaroApi.delete(`streams/${identicalStream.id}`);
+            try {
+                if (identicalStream) {
+                    await keitaroApi.put(`streams/${identicalStream.id}`, {
+                        campaign_id: matchingCampaign.id,
+                        ...payload
+                    });
+                } else {
+                    await keitaroApi.post('streams', {
+                        campaign_id: matchingCampaign.id,
+                        ...payload
+                    });
+                }
+            } catch (error) {
+                console.error(`Error updating stream ${offerId} (${payload.name}) in campaign ${matchingCampaign.id} (${matchingCampaign.name}):`, error);
             }
-
-            await keitaroApi.post('streams', {
-                campaign_id: matchingCampaign.id,
-                ...payload
-            });
         }
     }
 }
@@ -157,15 +164,15 @@ function createStreamPartialPayload(keitaroOfferId: number, offerName: string, o
 
 async function addOffersToKeitaro(offers: IOffer[], affiliateId: number, links: string[], avoidGroup?: number, groupId?: number) {
     const allOffers = await getAllOffers();
-
+    
     const streamPayloads = [];
-
+    
     for (let i = 0; i < offers.length; i++) {
         const offer = offers[i];
         const link = links[i];
-
+        
         const identicalOffer = allOffers.find(o => o.name.includes(offer.name));
-
+        
         let keitaroOfferId;
         if (identicalOffer) {
             keitaroOfferId = identicalOffer.id;
@@ -181,11 +188,11 @@ async function addOffersToKeitaro(offers: IOffer[], affiliateId: number, links:
                 payout_auto: true,
                 payout_upsell: true,
             };
-
+            
             const { data: keitaroOffer } = await keitaroApi.post('offers', offerPayload);
             keitaroOfferId = keitaroOffer.id;
         }
-
+        
         streamPayloads.push({
             payload: createStreamPartialPayload(
                 keitaroOfferId,
@@ -196,7 +203,7 @@ async function addOffersToKeitaro(offers: IOffer[], affiliateId: number, links:
             offerId: offer.name
         });
     }
-
+    
     await createStreamForMatchingCampaigns(streamPayloads, /◈/, avoidGroup);
 }
 
@@ -237,7 +244,9 @@ async function cloneOWCampaign(app: IApp): Promise<IKeitaroCampaign> {
     let matchingCampaign = allCampaigns.filter((c) => new RegExp(`#${app.id}.*◈`).test(c.name))
     if (matchingCampaign.length > 0) return matchingCampaign[0]
 
-    const { data: campaigns } = await keitaroApi.post(`/campaigns/2673/clone`);
+    const { data: campaigns } = await keitaroApi.post(`/campaigns/2673/clone`, {
+        name: name
+    });
 
     if (campaigns.length == 0) throw Error("Campaign cloning falied")
 
@@ -366,7 +375,7 @@ async function getClicks(request: IKeitaroClicksRequest | KeitaroClicksInterval)
     } : {
         ...request
     };
-
+    
     const { data } = await keitaroApi.post('/clicks/log', defaultRequest);
     return data.rows;
 }