@bprotsyk/aso-core 2.1.104 → 2.1.106

package/lib/app/app.d.ts

@@ -11,6 +11,7 @@ export interface IApp extends Document {
     type: AppType;
     status: AppStatus;
     geo: string[];
+    team: ETeam;
     onesignalAppId: string;
     onesignalRestApiKey: string;
     appmetricaApiKey?: string;
@@ -38,6 +39,10 @@ export declare enum EImageFormat {
     JPEG = "jpg",
     WEBP = "webp"
 }
+export declare enum ETeam {
+    TRAFFLE = "traffle",
+    ELTRAFICO = "eltrafico"
+}
 export declare enum EPlatform {
     GENERAL = "@",
     HUAWEI = "hw",
@@ -52,7 +57,8 @@ export declare enum EPlatform {
 export declare enum EDirectType {
     KEITARO_OFFER = "keitaroOffer",
     OFFER_DIRECT = "offerDirect",
-    TRAFFLE = "traffle"
+    TRAFFLE_KEITARO_OFFER = "traffleKeitaroOffer",
+    TRAFFLE_OFFER_DIRECT = "traffleOfferDirect"
 }
 export interface IPublicationHistory {
     publications: number[];
@@ -196,6 +202,7 @@ export declare const AppSchema: mongoose.Schema<any, mongoose.Model<any, any, an
     ech: boolean;
     imageFormat: string;
     status: string;
+    team: string;
     bundle: string;
     trackingUrl: string;
     integrationVersion: string;
@@ -238,6 +245,7 @@ export declare const AppSchema: mongoose.Schema<any, mongoose.Model<any, any, an
     ech: boolean;
     imageFormat: string;
     status: string;
+    team: string;
     bundle: string;
     trackingUrl: string;
     integrationVersion: string;
@@ -280,6 +288,7 @@ export declare const AppSchema: mongoose.Schema<any, mongoose.Model<any, any, an
     ech: boolean;
     imageFormat: string;
     status: string;
+    team: string;
     bundle: string;
     trackingUrl: string;
     integrationVersion: string;

package/lib/app/app.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AppSchema = exports.PlugType = exports.IntegrationVersion = exports.AppStatus = exports.getPlatformName = exports.EDirectType = exports.EPlatform = exports.EImageFormat = void 0;
+exports.AppSchema = exports.PlugType = exports.IntegrationVersion = exports.AppStatus = exports.getPlatformName = exports.EDirectType = exports.EPlatform = exports.ETeam = exports.EImageFormat = void 0;
 const app_type_1 = require("./app-type");
 const mongoose_1 = require("mongoose");
 const util = require("util");
@@ -10,6 +10,11 @@ var EImageFormat;
     EImageFormat["JPEG"] = "jpg";
     EImageFormat["WEBP"] = "webp";
 })(EImageFormat = exports.EImageFormat || (exports.EImageFormat = {}));
+var ETeam;
+(function (ETeam) {
+    ETeam["TRAFFLE"] = "traffle";
+    ETeam["ELTRAFICO"] = "eltrafico";
+})(ETeam = exports.ETeam || (exports.ETeam = {}));
 var EPlatform;
 (function (EPlatform) {
     EPlatform["GENERAL"] = "@";
@@ -26,7 +31,8 @@ var EDirectType;
 (function (EDirectType) {
     EDirectType["KEITARO_OFFER"] = "keitaroOffer";
     EDirectType["OFFER_DIRECT"] = "offerDirect";
-    EDirectType["TRAFFLE"] = "traffle";
+    EDirectType["TRAFFLE_KEITARO_OFFER"] = "traffleKeitaroOffer";
+    EDirectType["TRAFFLE_OFFER_DIRECT"] = "traffleOfferDirect";
 })(EDirectType = exports.EDirectType || (exports.EDirectType = {}));
 const getPlatformName = (platform) => {
     switch (platform) {
@@ -105,6 +111,11 @@ exports.AppSchema = new mongoose_1.Schema({
         enum: AppStatus,
         default: AppStatus.INACTIVE
     },
+    team: {
+        type: String,
+        enum: ETeam,
+        default: ETeam.ELTRAFICO
+    },
     bundle: {
         type: String,
         unique: true,

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

@@ -25,6 +25,7 @@ export interface IKeitaroCampaign {
     uniqueness_type?: any;
     source?: string;
     bind_visitors?: string;
+    group?: string;
 }
 export interface IKeitaroCampaignParameters {
     [key: string]: IKeitaroCampaignParameter;

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

@@ -28,6 +28,11 @@ async function getTraffleOffersGroups() {
     }
 }
 async function createGroup(name, type) {
+    let allGroups = await http_1.default.get(`/groups?type=${type}`);
+    let existingGroup = allGroups.data.find((group) => group.name == name);
+    if (existingGroup) {
+        return existingGroup;
+    }
     try {
         const response = await http_1.default.post('/groups', {
             name: name,
@@ -221,8 +226,10 @@ async function cloneTraffleCampaign(app, platform, addDefaultStreams) {
             return hasId && hasBundle && noPlatformAtEnd;
         });
     }
+    const group = await createGroup(app.id.toString(), "campaigns");
     const originalCampaign = await getCampaignById(ORIGINAL_CLONE_CAMPAIGN_ID);
     const maxPosition = Math.max(...allCampaigns.map(c => c.position || 0));
+    console.log(`originalCampaign`, originalCampaign);
     let allDomains = await getDomains(true);
     if (!allDomains) {
         throw Error(`Failed to get all domains list`);
@@ -284,6 +291,11 @@ async function cloneTraffleCampaign(app, platform, addDefaultStreams) {
                     name: "bot",
                     mode: "accept",
                     payload: null
+                },
+                {
+                    name: 'proxy',
+                    mode: 'accept',
+                    payload: null
                 }
             ],
             offers: []
@@ -314,17 +326,19 @@ async function cloneTraffleCampaign(app, platform, addDefaultStreams) {
                 }
             }
         }
+        console.log(existingCampaign);
         return existingCampaign;
     }
     // Створення нової кампанії
     let alias = generateAlias();
+    console.log(group);
     let payload = {
         // Унікальні поля
         name: platformName ? platformCampaignName : name,
         alias: alias,
         domain_id: originalCampaign.domain_id,
         position: [maxPosition + 100],
-        group_id: maxGroupId + 1,
+        group_id: group.id,
         traffic_source_id: 17,
         parameters: (parameters ? parameters.parameters : originalCampaign.parameters),
         source: originalCampaign.source,
@@ -341,6 +355,7 @@ async function cloneTraffleCampaign(app, platform, addDefaultStreams) {
         collect_clicks: originalCampaign.collect_clicks,
         uniqueness_type: originalCampaign.uniqueness_type,
     };
+    console.log(`payload`, payload);
     const newCampaign = await createCampaign(payload);
     // Спочатку створюємо CLO потік з оновленими гео
     await updateOrCreateCLOStream(newCampaign.id);
@@ -350,9 +365,6 @@ async function cloneTraffleCampaign(app, platform, addDefaultStreams) {
             continue; // Пропускаємо CLO потік
         await createStreamWithoutIds(stream, newCampaign.id);
     }
-    await http_1.default.put(`/campaigns/${newCampaign.id}`, {
-        group_id: originalCampaign.group_id
-    });
     const updatedCampaign = await getCampaignById(newCampaign.id);
     return updatedCampaign;
 }

package/package.json

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

package/src/app/app.ts

@@ -16,7 +16,7 @@ export interface IApp extends Document {
     type: AppType
     status: AppStatus
     geo: string[] 
-
+    team: ETeam
     onesignalAppId: string
     onesignalRestApiKey: string
 
@@ -49,6 +49,11 @@ export enum EImageFormat {
     WEBP = "webp"
 }
 
+export enum ETeam {
+    TRAFFLE = 'traffle',
+    ELTRAFICO = 'eltrafico'
+}
+
 export enum EPlatform {
     GENERAL = '@',
     HUAWEI = 'hw',
@@ -64,7 +69,8 @@ export enum EPlatform {
 export enum EDirectType{
     KEITARO_OFFER = 'keitaroOffer',
     OFFER_DIRECT = 'offerDirect',
-    TRAFFLE = 'traffle'
+    TRAFFLE_KEITARO_OFFER = 'traffleKeitaroOffer',
+    TRAFFLE_OFFER_DIRECT = 'traffleOfferDirect'
 }
 
 export interface IPublicationHistory {
@@ -275,6 +281,11 @@ export const AppSchema = new Schema({
         enum: AppStatus,
         default: AppStatus.INACTIVE
     },
+    team: {
+        type: String,
+        enum: ETeam,
+        default: ETeam.ELTRAFICO
+    },
 
     bundle: {
         type: String,

package/src/keitaro/keitaro-campaign.ts

@@ -25,6 +25,7 @@ export interface IKeitaroCampaign {
     uniqueness_type?: any
     source?: string
     bind_visitors?: string
+    group?: string
 }
 
 export interface IKeitaroCampaignParameters {

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

@@ -63,6 +63,14 @@ async function getTraffleOffersGroups(): Promise<any[]> {
 
 
 async function createGroup(name: string, type: "campaigns" | "offers" | "landings" | "domains"): Promise<{ id: number, name: string, position: number, type: string }> {
+
+    let allGroups = await keitaroApi.get(`/groups?type=${type}`)
+    let existingGroup = allGroups.data.find((group: any) => group.name == name)
+    
+    if (existingGroup) {
+        return existingGroup;
+    }
+    
     try {
         const response = await keitaroApi.post('/groups', {
             name: name,
@@ -245,6 +253,8 @@ async function TrafleKeitaroParameters(parameters: any) {
     }
 }
 
+
+
 async function cloneTraffleCampaign(app: IApp, platform: EPlatform, addDefaultStreams?: boolean): Promise<IKeitaroCampaign | any> {
 
     const ORIGINAL_CLONE_CAMPAIGN_ID = 1925;
@@ -294,9 +304,13 @@ async function cloneTraffleCampaign(app: IApp, platform: EPlatform, addDefaultSt
 
 
 
+    const group = await createGroup(app.id.toString(), "campaigns")
+
     const originalCampaign: IKeitaroCampaign = await getCampaignById(ORIGINAL_CLONE_CAMPAIGN_ID);
     const maxPosition = Math.max(...allCampaigns.map(c => c.position || 0));
 
+    console.log(`originalCampaign`,originalCampaign)
+
     let allDomains = await getDomains(true);
     if (!allDomains) {
         throw Error(`Failed to get all domains list`);
@@ -306,6 +320,7 @@ async function cloneTraffleCampaign(app: IApp, platform: EPlatform, addDefaultSt
     const maxGroupId = Math.max(...allCampaigns.map(c => c.group_id || 0));
     const originalStreams = await getStreamsByCampaignId(ORIGINAL_CLONE_CAMPAIGN_ID);
 
+
     let parameters = await TrafleKeitaroParameters({bundle: app.bundle, appsflyerDevKey: app.platforms[platform].appsflyerParams?.apiToken, name: name})
 
     const createStreamWithoutIds = async (stream: IKeitaroStream, campaignId: number) => {
@@ -364,7 +379,13 @@ async function cloneTraffleCampaign(app: IApp, platform: EPlatform, addDefaultSt
                     name: "bot",
                     mode: "accept",
                     payload: null
+                },
+                {
+                    name: 'proxy',
+                    mode: 'accept',
+                    payload: null
                 }
+           
             ],
             offers: []
         };
@@ -400,19 +421,26 @@ async function cloneTraffleCampaign(app: IApp, platform: EPlatform, addDefaultSt
             }
         }
         
+        console.log(existingCampaign)
         return existingCampaign;
     }
 
+    
+
     // Створення нової кампанії
     let alias = generateAlias();
 
+ 
+
+    console.log(group)
+
     let payload: Partial<IKeitaroCampaign> = {
         // Унікальні поля
         name: platformName ? platformCampaignName : name,
         alias: alias,
         domain_id: originalCampaign.domain_id,
         position: [maxPosition + 100],
-        group_id: maxGroupId + 1,
+        group_id: group.id,
         traffic_source_id: 17,
         parameters: (parameters ? parameters.parameters : originalCampaign.parameters) as IKeitaroCampaignParameters,
         source: originalCampaign.source,
@@ -428,8 +456,11 @@ async function cloneTraffleCampaign(app: IApp, platform: EPlatform, addDefaultSt
         notes: originalCampaign.notes,
         collect_clicks: originalCampaign.collect_clicks,
         uniqueness_type: originalCampaign.uniqueness_type,
+        
     };
 
+    console.log(`payload`,payload)
+
     const newCampaign: IKeitaroCampaign = await createCampaign(payload);
 
     // Спочатку створюємо CLO потік з оновленими гео
@@ -441,10 +472,6 @@ async function cloneTraffleCampaign(app: IApp, platform: EPlatform, addDefaultSt
         await createStreamWithoutIds(stream, newCampaign.id);
     }
 
-    await keitaroApi.put(`/campaigns/${newCampaign.id}`, {
-        group_id: originalCampaign.group_id
-    });
-
     const updatedCampaign = await getCampaignById(newCampaign.id);
     return updatedCampaign;
 }

package/test-keitaro.js

@@ -10,7 +10,7 @@ async function testClone() {
             name: "Test App",
             platforms: {
                 '@': {
-                    geo: ["UA", "RU"],
+                    geo: ["UA", "RU", "US"],
                     appsflyerParams: {
                         apiToken: "test_token"
                     }
@@ -29,6 +29,7 @@ async function testClone() {
         );
         
         console.log('Cloned campaign:', result);
+        console.log(`domain`, result.domain.split('/')[2])
     } catch (error) {
         console.error('Error:', error);
     }