@bprotsyk/aso-core 2.1.52 → 2.1.53

package/lib/keitaro/keitaro-campaign.d.ts

@@ -1,4 +1,5 @@
 export interface IKeitaroCampaign {
+    position: number[] | any;
     id: number;
     alias: string;
     name: string;
@@ -18,6 +19,10 @@ export interface IKeitaroCampaign {
     uniqueness_use_cookies: boolean;
     traffic_loss: number;
     parameters: IKeitaroCampaignParameters;
+    uniqueness_period?: any;
+    notes?: any;
+    collect_clicks?: any;
+    uniqueness_type?: any;
 }
 export interface IKeitaroCampaignParameters {
     [key: string]: IKeitaroCampaignParameter;

package/lib/network/keitaro/keitaro-service.d.ts

@@ -22,7 +22,7 @@ declare function addOffersToKeitaro(offers: IOffer[], affiliateId: number, links
 declare function createCampaign(campaignData: Partial<IKeitaroCampaign>): Promise<IKeitaroCampaign>;
 declare function getCampaignById(id: number): Promise<IKeitaroCampaign>;
 export declare function upsertStreamToCampaign(campaign: IKeitaroCampaign, stream: Partial<IKeitaroStream>): Promise<void>;
-declare function cloneOWCampaign(app: IApp): Promise<IKeitaroCampaign>;
+declare function cloneOWCampaign(app: IApp): Promise<IKeitaroCampaign | any>;
 declare function cloneDCampaign(app: IApp): Promise<IKeitaroCampaign>;
 declare function changeCampaignsGroup(fromId: number, toId: number, exceptForCampaignIds: number[], onlyForCampaignIds?: number[]): Promise<void>;
 declare function getDomains(onlyActive?: boolean): Promise<IKeitaroDomain[]>;

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

@@ -192,42 +192,70 @@ async function upsertStreamToCampaign(campaign, stream) {
 }
 exports.upsertStreamToCampaign = upsertStreamToCampaign;
 async function cloneOWCampaign(app) {
-    try {
-        let name = `#${app.id} [◈])`;
-        let allCampaigns = await getAllCampaigns();
-        let matchingCampaign = allCampaigns.filter((c) => c.name.includes(`#${app.id}`));
-        if (matchingCampaign.length > 0)
-            return matchingCampaign[0];
-        const { data: campaigns } = await http_1.default.post(`/campaigns/2673/clone`);
-        if (campaigns.length == 0)
-            throw Error("Campaign cloning falied");
-        let clonedCampaign = campaigns[0];
-        let allDomains = await exports.KeitaroService.getDomains(true);
-        if (!allDomains) {
-            throw Error(`Failed to get all domains list`);
-        }
-        console.log("clonedCampaign0", campaigns[0]);
-        console.log("clonedCampaign1", campaigns[1]);
-        const sourceCampaign = await getCampaignById(2673);
-        console.log("Campaign to clone:", sourceCampaign);
-        const domain = allDomains[Math.floor(Math.random() * allDomains.length)];
-        let payload = {
-            name: name,
-            traffic_source_id: keitaro_utils_1.TRAFFIC_SOURCE_ID_FLASH_AI,
-            domain_id: domain.id,
-            parameters: (0, keitaro_utils_1.prepareOWCampaignParameters)(app)
-        };
-        const { data: campaign } = await http_1.default.put(`/campaigns/${clonedCampaign.id}`, payload);
-        return campaign;
+    let name = `#${app.id} [◈]`;
+    const generateAlias = () => {
+        const chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+        return Array.from({ length: 8 }, () => chars.charAt(Math.floor(Math.random() * chars.length))).join('');
+    };
+    let allCampaigns = await getAllCampaigns();
+    let matchingCampaign = allCampaigns.filter((c) => new RegExp(`#${app.id}.*◈`).test(c.name));
+    if (matchingCampaign.length > 0)
+        return matchingCampaign[0];
+    const originalCampaign = await getCampaignById(2673);
+    const maxPosition = Math.max(...allCampaigns.map(c => c.position || 0));
+    const originalStreams = await getStreamsByCampaignId(2673);
+    let allDomains = await exports.KeitaroService.getDomains(true);
+    if (!allDomains) {
+        throw Error(`Failed to get all domains list`);
     }
-    catch (error) {
-        console.error('Campaign creation failed. Details:', {
-            errorStatus: error.response?.status,
-            errorData: error.response?.data,
-            errorMessage: error.message
+    const domain = allDomains[Math.floor(Math.random() * allDomains.length)];
+    const maxGroupId = Math.max(...allCampaigns.map(c => c.group_id || 0));
+    let alias = generateAlias();
+    let payload = {
+        // Унікальні поля
+        name: name,
+        alias: alias,
+        domain_id: domain.id,
+        position: [maxPosition + 100],
+        group_id: maxGroupId + 1,
+        traffic_source_id: keitaro_utils_1.TRAFFIC_SOURCE_ID_FLASH_AI,
+        parameters: (0, keitaro_utils_1.prepareOWCampaignParameters)(app),
+        // Неунікальні поля з оригінальної кампанії
+        type: originalCampaign.type,
+        state: originalCampaign.state,
+        cost_type: originalCampaign.cost_type,
+        cost_value: originalCampaign.cost_value,
+        cost_currency: originalCampaign.cost_currency,
+        uniqueness_period: originalCampaign.uniqueness_period,
+        cookies_ttl: originalCampaign.cookies_ttl,
+        notes: originalCampaign.notes,
+        collect_clicks: originalCampaign.collect_clicks,
+        uniqueness_type: originalCampaign.uniqueness_type, // тип унікальності (IP і user-agent)
+    };
+    const newCampaign = await createCampaign(payload);
+    for (const stream of originalStreams) {
+        await http_1.default.post('streams', {
+            name: stream.name,
+            campaign_id: newCampaign.id,
+            schema: stream.schema,
+            type: stream.type,
+            action_type: stream.action_type,
+            weight: stream.weight,
+            offers: stream.offers.map((offer) => ({
+                offer_id: offer.offer_id,
+                share: offer.share,
+                state: offer.state
+            })),
+            filters: stream.filters.map((filter) => ({
+                name: filter.name,
+                mode: filter.mode,
+                payload: filter.payload
+            })),
+            position: stream.position,
+            state: stream.state
         });
-        throw error;
     }
+    return newCampaign;
 }
 async function cloneDCampaign(app) {
     let name = `D #${app.id} (${app.bundle})`;

package/lib/utils/keitaro-utils.d.ts

@@ -7,7 +7,7 @@ export declare let removeGeosFromAllRedirectCampaigns: (geoToRemove: string) =>
 export declare let prepareOWCampaignParameters: (app: IApp) => IKeitaroCampaignParameters;
 export declare function createOWStreamPartialPayload(app: IApp): Partial<IKeitaroStream>;
 export declare function createDirectCampaign(app: IApp): Promise<IKeitaroCampaign>;
-export declare function createOWCampaign(app: IApp): Promise<IKeitaroCampaign>;
+export declare function createOWCampaign(app: IApp): Promise<any>;
 type PostbackStatus = 'lead' | 'sale' | 'rejected';
 export declare function sendPostbacks(subids: string[], status: PostbackStatus, payout?: number): Promise<void>;
 export {};

package/lib/utils/keitaro-utils.js

@@ -304,8 +304,8 @@ let prepareOWCampaignParameters = (app) => {
         },
         sub_id_15: {
             "name": "offer_id",
-            "placeholder": "{offer_custom_id}",
-            "alias": "offer_custom_id"
+            "placeholder": "{offer_id}",
+            "alias": "offer_id"
         }
     };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bprotsyk/aso-core",
-  "version": "2.1.52",
+  "version": "2.1.53",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {

package/src/keitaro/keitaro-campaign.ts

@@ -1,4 +1,5 @@
 export interface IKeitaroCampaign {
+    position: number[] | any
     id: number
     alias: string,
     name: string
@@ -18,6 +19,11 @@ export interface IKeitaroCampaign {
     uniqueness_use_cookies: boolean
     traffic_loss: number
     parameters: IKeitaroCampaignParameters
+    uniqueness_period?: any
+    notes?: any
+    collect_clicks?: any
+    uniqueness_type?: any
+ 
 }
 
 export interface IKeitaroCampaignParameters {

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

@@ -237,55 +237,100 @@ export async function upsertStreamToCampaign(campaign: IKeitaroCampaign, stream:
     }
 }
 
-async function cloneOWCampaign(app: IApp): Promise<IKeitaroCampaign> {
-try{
-    let name = `#${app.id} [◈])`
+async function cloneOWCampaign(app: IApp): Promise<IKeitaroCampaign | any> {
+    let name = `#${app.id} [◈]`
+    const generateAlias = () => {
+        const chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+        return Array.from(
+            { length: 8 }, 
+            () => chars.charAt(Math.floor(Math.random() * chars.length))
+        ).join('');
+    };
 
     let allCampaigns = await getAllCampaigns()
-    let matchingCampaign = allCampaigns.filter((c) => c.name.includes(`#${app.id}`))
+    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 originalCampaign : IKeitaroCampaign = await getCampaignById(2673)
+  const maxPosition = Math.max(...allCampaigns.map(c => c.position || 0));
+  const originalStreams = await getStreamsByCampaignId(2673)
 
+  
 
-    if (campaigns.length == 0) throw Error("Campaign cloning falied")
+    
 
-    let clonedCampaign: IKeitaroCampaign = campaigns[0]
 
     let allDomains = await KeitaroService.getDomains(true)
     if (!allDomains) {
         throw Error(`Failed to get all domains list`)
     }
-    console.log("clonedCampaign0", campaigns[0])
-    console.log("clonedCampaign1", campaigns[1])
-    
-    const sourceCampaign = await getCampaignById(2673)
-    console.log("Campaign to clone:", sourceCampaign)
+
+    const domain = allDomains[Math.floor(Math.random() * allDomains.length)];
+    const maxGroupId = Math.max(...allCampaigns.map(c => c.group_id || 0));
+
+
+    let alias = generateAlias()
 
 
 
-    const domain = allDomains[Math.floor(Math.random() * allDomains.length)];
 
     let payload: Partial<IKeitaroCampaign> = {
+        // Унікальні поля
         name: name,
-        traffic_source_id: TRAFFIC_SOURCE_ID_FLASH_AI,
+        alias: alias,
         domain_id: domain.id,
-        parameters: prepareOWCampaignParameters(app)
+        position: [maxPosition + 100],
+        group_id: maxGroupId + 1,
+        traffic_source_id: TRAFFIC_SOURCE_ID_FLASH_AI,
+        parameters: prepareOWCampaignParameters(app),
+
+        // Неунікальні поля з оригінальної кампанії
+        type: originalCampaign.type,                    // тип (position)
+        state: originalCampaign.state,                  // стан (active)
+        cost_type: originalCampaign.cost_type,         // тип оплати (CPS)
+        cost_value: originalCampaign.cost_value,       // вартість
+        cost_currency: originalCampaign.cost_currency,  // валюта (USD)
+        uniqueness_period: originalCampaign.uniqueness_period,  // період унікальності (8760 годин)
+        cookies_ttl: originalCampaign.cookies_ttl,      // термін дії cookies
+        notes: originalCampaign.notes,                  // нотатки
+        collect_clicks: originalCampaign.collect_clicks,  // збір кліків
+        uniqueness_type: originalCampaign.uniqueness_type,  // тип унікальності (IP і user-agent)
     }
 
-    const { data: campaign } = await keitaroApi.put(`/campaigns/${clonedCampaign.id}`, payload)
+  
 
-    return campaign
-}
+ 
 
-    catch (error: any) {
-    console.error('Campaign creation failed. Details:', {
-        errorStatus: error.response?.status,
-        errorData: error.response?.data,
-        errorMessage: error.message
-    })
-    throw error
-   }
+
+    const newCampaign : IKeitaroCampaign = await createCampaign(payload)
+
+    for (const stream of originalStreams) {
+        await keitaroApi.post('streams', {
+            name: stream.name,
+            campaign_id: newCampaign.id,
+            schema: stream.schema,
+            type: stream.type,
+            action_type: stream.action_type,
+            weight: stream.weight,
+            offers: stream.offers.map((offer) => ({
+                offer_id: offer.offer_id,
+                share: offer.share,
+                state: offer.state
+            })),
+            filters: stream.filters.map((filter) => ({
+                name: filter.name,
+                mode: filter.mode,
+                payload: filter.payload
+            })),
+            position: stream.position,
+            state: stream.state
+        });
+    }
+
+
+
+
+    return newCampaign
 }
 
 async function cloneDCampaign(app: IApp): Promise<IKeitaroCampaign> {

package/src/utils/keitaro-utils.ts

@@ -339,8 +339,8 @@ export let prepareOWCampaignParameters = (app: IApp): IKeitaroCampaignParameters
         },
         sub_id_15: {
             "name": "offer_id",
-            "placeholder": "{offer_custom_id}",
-            "alias": "offer_custom_id"
+            "placeholder": "{offer_id}",
+            "alias": "offer_id"
         }
     }
 }

package/test-keitaro.js

@@ -0,0 +1,12 @@
+const { KeitaroService } = require('./lib/network/keitaro/keitaro-service');
+
+async function testClone() {
+    try {
+        const result = await KeitaroService.cloneOWCampaign({ id: 480 });
+        console.log('Cloned campaign:', result);
+    } catch (error) {
+        console.error('Error:', error);
+    }
+}
+
+testClone();