@bprotsyk/aso-core 1.2.198 → 1.2.200

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

@@ -15,6 +15,7 @@ declare function createCampaign(campaignData: Partial<IKeitaroCampaign>): Promis
 declare function getCampaignById(id: number): Promise<IKeitaroCampaign>;
 export declare function upsertStreamToCampaign(campaign: IKeitaroCampaign, stream: Partial<IKeitaroStream>): Promise<void>;
 declare function cloneOWCampaign(app: IFlashApp): Promise<IKeitaroCampaign>;
+declare function cloneDCampaign(app: IFlashApp): Promise<IKeitaroCampaign>;
 declare function changeCampaignsGroup(fromId: number, toId: number, exceptForCampaignIds: number[]): Promise<void>;
 declare function getDomains(onlyActive?: boolean): Promise<IKeitaroDomain[]>;
 declare function getProfitForTimeRange(from: number, to: number): Promise<number>;
@@ -36,5 +37,6 @@ export declare const KeitaroService: {
     changeCampaignsGroup: typeof changeCampaignsGroup;
     getProfitForTimeRange: typeof getProfitForTimeRange;
     getProfitForTodayAndYesterday: typeof getProfitForTodayAndYesterday;
+    cloneDCampaign: typeof cloneDCampaign;
 };
 export {};

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

@@ -186,6 +186,30 @@ async function cloneOWCampaign(app) {
     const { data: campaign } = await http_1.default.put(`/campaigns/${clonedCampaign.id}`, payload);
     return campaign;
 }
+async function cloneDCampaign(app) {
+    let name = `D #${app.id} (${app.bundle})`;
+    let allCampaigns = await getAllCampaigns();
+    let matchingCampaign = allCampaigns.filter((c) => c.name.includes(`D #${app.id}`));
+    if (matchingCampaign.length > 0)
+        return matchingCampaign[0];
+    const { data: campaigns } = await http_1.default.post(`/campaigns/2693/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`);
+    }
+    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,
+        group_id: 93,
+    };
+    const { data: campaign } = await http_1.default.put(`/campaigns/${clonedCampaign.id}`, payload);
+    return campaign;
+}
 async function changeCampaignsGroup(fromId, toId, exceptForCampaignIds) {
     let campaigns = await getAllCampaigns();
     const matchingCampaigns = campaigns.filter(campaign => campaign.group_id == fromId && !exceptForCampaignIds.includes(campaign.id));
@@ -222,5 +246,5 @@ async function getProfitForTodayAndYesterday() {
 }
 exports.KeitaroService = {
     getStreamsByCampaignId, updateCampaign, getAllCampaigns, getAllOffers, cloneStreams, addOfferToKeitaro, getOfferByKeitaroId, getDomains, createCampaign, getCampaignById, upsertStreamToCampaign, cloneOWCampaign,
-    updateOffer, changeCampaignsGroup, getProfitForTimeRange, getProfitForTodayAndYesterday
+    updateOffer, changeCampaignsGroup, getProfitForTimeRange, getProfitForTodayAndYesterday, cloneDCampaign
 };

package/lib/utils/general.js

@@ -10,25 +10,22 @@ function convertMillisToDate(millis) {
 }
 exports.convertMillisToDate = convertMillisToDate;
 function getTimestampsForTodayAndYesterday() {
-    const now = new Date();
-    // Today's Start (00:00:00)
+    const offset = 2;
+    const now = new Date(new Date().getTime() + offset * 3600 * 1000);
     const todayStart = new Date(now);
-    todayStart.setHours(0, 0, 0, 0);
-    const todayStartTimestamp = todayStart.getTime();
-    // Today's End (23:59:59.999)
+    todayStart.setUTCHours(0, 0, 0, 0);
+    const todayStartTimestamp = todayStart.getTime() - offset * 3600 * 1000;
     const todayEnd = new Date(now);
-    todayEnd.setHours(23, 59, 59, 999);
-    const todayEndTimestamp = todayEnd.getTime();
-    // Yesterday's Start (00:00:00)
+    todayEnd.setUTCHours(23, 59, 59, 999);
+    const todayEndTimestamp = todayEnd.getTime() - offset * 3600 * 1000;
     const yesterdayStart = new Date(now);
-    yesterdayStart.setDate(now.getDate() - 1);
-    yesterdayStart.setHours(0, 0, 0, 0);
-    const yesterdayStartTimestamp = yesterdayStart.getTime();
-    // Yesterday's End (23:59:59.999)
+    yesterdayStart.setUTCDate(now.getUTCDate() - 1);
+    yesterdayStart.setUTCHours(0, 0, 0, 0);
+    const yesterdayStartTimestamp = yesterdayStart.getTime() - offset * 3600 * 1000;
     const yesterdayEnd = new Date(now);
-    yesterdayEnd.setDate(now.getDate() - 1);
-    yesterdayEnd.setHours(23, 59, 59, 999);
-    const yesterdayEndTimestamp = yesterdayEnd.getTime();
+    yesterdayEnd.setUTCDate(now.getUTCDate() - 1);
+    yesterdayEnd.setUTCHours(23, 59, 59, 999);
+    const yesterdayEndTimestamp = yesterdayEnd.getTime() - offset * 3600 * 1000;
     return {
         today: {
             start: todayStartTimestamp,

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

@@ -11,4 +11,5 @@ export declare function createFlashCampaigns(app: IFlashApp): Promise<{
     tracking: IKeitaroCampaign;
     redirect: IKeitaroCampaign;
 }>;
+export declare function createDirectCampaign(app: IFlashApp): Promise<IKeitaroCampaign>;
 export declare function createOWCampaign(app: IFlashApp): Promise<IKeitaroCampaign>;

package/lib/utils/keitaro-utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createOWCampaign = exports.createFlashCampaigns = exports.createOWStreamPartialPayload = exports.prepareOWCampaignParameters = exports.createOrFindFlashRedirectCampaign = exports.removeGeosFromAllRedirectCampaigns = exports.addGeosToAllRedirectCampaigns = exports.TRAFFIC_SOURCE_ID_FLASH_AI = void 0;
+exports.createOWCampaign = exports.createDirectCampaign = exports.createFlashCampaigns = exports.createOWStreamPartialPayload = exports.prepareOWCampaignParameters = exports.createOrFindFlashRedirectCampaign = exports.removeGeosFromAllRedirectCampaigns = exports.addGeosToAllRedirectCampaigns = exports.TRAFFIC_SOURCE_ID_FLASH_AI = void 0;
 const keitaro_service_1 = require("../network/keitaro/keitaro-service");
 const sleep_promise_1 = __importDefault(require("sleep-promise"));
 const FLASH_REDIRECT_GROUP_ID = 82;
@@ -298,6 +298,18 @@ function createBPStreamPartialPayload(app) {
             }],
     };
 }
+function createDefenceMainStreamPartialPayload(app) {
+    return {
+        name: "ALL",
+        type: "regular",
+        action_type: "http",
+        action_payload: app.sourceUrl,
+        schema: "redirect",
+        filter_or: false,
+        collect_clicks: true,
+        weight: 100,
+    };
+}
 function createOWStreamPartialPayload(app) {
     return {
         name: `OW`,
@@ -320,7 +332,7 @@ async function createFlashCampaigns(app) {
     // Upserting Flash Redirect campaign
     let redirectCampaign = await (0, exports.createOrFindFlashRedirectCampaign)(app);
     console.log(`Redirect campaign name:`);
-    console.log(`${redirectCampaign.domain}${redirectCampaign.alias}?uid=`);
+    console.log(`${redirectCampaign.domain}/${redirectCampaign.alias}?uid=`);
     // Upserting necessary streams
     let botProtectionStream = createBPStreamPartialPayload(app);
     let owStream = createOWStreamPartialPayload(app);
@@ -335,6 +347,13 @@ async function createFlashCampaigns(app) {
     };
 }
 exports.createFlashCampaigns = createFlashCampaigns;
+async function createDirectCampaign(app) {
+    let campaign = await keitaro_service_1.KeitaroService.cloneDCampaign(app);
+    let stream = createDefenceMainStreamPartialPayload(app);
+    await keitaro_service_1.KeitaroService.upsertStreamToCampaign(campaign, stream);
+    return campaign;
+}
+exports.createDirectCampaign = createDirectCampaign;
 async function createOWCampaign(app) {
     let owCampaign = await keitaro_service_1.KeitaroService.cloneOWCampaign(app);
     return owCampaign;

package/package.json

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

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

@@ -224,6 +224,38 @@ async function cloneOWCampaign(app: IFlashApp): Promise<IKeitaroCampaign> {
     return campaign
 }
 
+async function cloneDCampaign(app: IFlashApp): Promise<IKeitaroCampaign> {
+    let name = `D #${app.id} (${app.bundle})`
+
+    let allCampaigns = await getAllCampaigns()
+    let matchingCampaign = allCampaigns.filter((c) => c.name.includes(`D #${app.id}`))
+    if (matchingCampaign.length > 0) return matchingCampaign[0]
+
+    const { data: campaigns } = await keitaroApi.post(`/campaigns/2693/clone`);
+
+    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`)
+    }
+
+    const domain = allDomains[Math.floor(Math.random() * allDomains.length)];
+
+    let payload: Partial<IKeitaroCampaign> = {
+        name: name,
+        traffic_source_id: TRAFFIC_SOURCE_ID_FLASH_AI,
+        domain_id: domain.id,
+        group_id: 93,
+    }
+
+    const { data: campaign } = await keitaroApi.put(`/campaigns/${clonedCampaign.id}`, payload)
+
+    return campaign
+}
+
 async function changeCampaignsGroup(fromId: number, toId: number, exceptForCampaignIds: number[]) {
     let campaigns = await getAllCampaigns()
     const matchingCampaigns = campaigns.filter(campaign => campaign.group_id == fromId && !exceptForCampaignIds.includes(campaign.id))
@@ -268,5 +300,5 @@ async function getProfitForTodayAndYesterday(): Promise<any> {
 
 export const KeitaroService = {
     getStreamsByCampaignId, updateCampaign, getAllCampaigns, getAllOffers, cloneStreams, addOfferToKeitaro, getOfferByKeitaroId, getDomains, createCampaign, getCampaignById, upsertStreamToCampaign, cloneOWCampaign,
-    updateOffer, changeCampaignsGroup, getProfitForTimeRange, getProfitForTodayAndYesterday
+    updateOffer, changeCampaignsGroup, getProfitForTimeRange, getProfitForTodayAndYesterday, cloneDCampaign
 }

package/src/utils/general.ts

@@ -1,35 +1,28 @@
 export function convertMillisToDate(millis: number): string {
-    const date = new Date(millis);
-    const year = date.getFullYear();
-    const month = (date.getMonth() + 1).toString().padStart(2, '0');
-    const day = date.getDate().toString().padStart(2, '0');
-    return `${year}-${month}-${day}`;
+    const date = new Date(millis)
+    const year = date.getFullYear()
+    const month = (date.getMonth() + 1).toString().padStart(2, '0')
+    const day = date.getDate().toString().padStart(2, '0')
+    return `${year}-${month}-${day}`
 }
 
 export function getTimestampsForTodayAndYesterday() {
-    const now = new Date();
-
-    // Today's Start (00:00:00)
-    const todayStart = new Date(now);
-    todayStart.setHours(0, 0, 0, 0);
-    const todayStartTimestamp = todayStart.getTime();
-
-    // Today's End (23:59:59.999)
-    const todayEnd = new Date(now);
-    todayEnd.setHours(23, 59, 59, 999);
-    const todayEndTimestamp = todayEnd.getTime();
-
-    // Yesterday's Start (00:00:00)
-    const yesterdayStart = new Date(now);
-    yesterdayStart.setDate(now.getDate() - 1);
-    yesterdayStart.setHours(0, 0, 0, 0);
-    const yesterdayStartTimestamp = yesterdayStart.getTime();
-
-    // Yesterday's End (23:59:59.999)
-    const yesterdayEnd = new Date(now);
-    yesterdayEnd.setDate(now.getDate() - 1);
-    yesterdayEnd.setHours(23, 59, 59, 999);
-    const yesterdayEndTimestamp = yesterdayEnd.getTime();
+    const offset = 2
+    const now = new Date(new Date().getTime() + offset * 3600 * 1000)
+    const todayStart = new Date(now)
+    todayStart.setUTCHours(0, 0, 0, 0)
+    const todayStartTimestamp = todayStart.getTime() - offset * 3600 * 1000
+    const todayEnd = new Date(now)
+    todayEnd.setUTCHours(23, 59, 59, 999)
+    const todayEndTimestamp = todayEnd.getTime() - offset * 3600 * 1000
+    const yesterdayStart = new Date(now)
+    yesterdayStart.setUTCDate(now.getUTCDate() - 1)
+    yesterdayStart.setUTCHours(0, 0, 0, 0)
+    const yesterdayStartTimestamp = yesterdayStart.getTime() - offset * 3600 * 1000
+    const yesterdayEnd = new Date(now)
+    yesterdayEnd.setUTCDate(now.getUTCDate() - 1)
+    yesterdayEnd.setUTCHours(23, 59, 59, 999)
+    const yesterdayEndTimestamp = yesterdayEnd.getTime() - offset * 3600 * 1000
 
     return {
         today: {
@@ -40,5 +33,5 @@ export function getTimestampsForTodayAndYesterday() {
             start: yesterdayStartTimestamp,
             end: yesterdayEndTimestamp,
         },
-    };
+    }
 }

package/src/utils/keitaro-utils.ts

@@ -324,6 +324,19 @@ function createBPStreamPartialPayload(app: IFlashApp): Partial<IKeitaroStream> {
     }
 }
 
+function createDefenceMainStreamPartialPayload(app: IFlashApp): Partial<IKeitaroStream> {
+    return {
+        name: "ALL",
+        type: "regular",
+        action_type: "http",
+        action_payload: app.sourceUrl,
+        schema: "redirect",
+        filter_or: false,
+        collect_clicks: true,
+        weight: 100,
+    }
+}
+
 export function createOWStreamPartialPayload(app: IFlashApp): Partial<IKeitaroStream> {
     return {
         name: `OW`,
@@ -346,7 +359,7 @@ export async function createFlashCampaigns(app: IFlashApp) {
     // Upserting Flash Redirect campaign
     let redirectCampaign = await createOrFindFlashRedirectCampaign(app)
     console.log(`Redirect campaign name:`)
-    console.log(`${redirectCampaign.domain}${redirectCampaign.alias}?uid=`)
+    console.log(`${redirectCampaign.domain}/${redirectCampaign.alias}?uid=`)
 
     // Upserting necessary streams
     let botProtectionStream = createBPStreamPartialPayload(app)
@@ -365,6 +378,16 @@ export async function createFlashCampaigns(app: IFlashApp) {
     }
 }
 
+export async function createDirectCampaign(app: IFlashApp) {
+    let campaign = await KeitaroService.cloneDCampaign(app)
+
+    let stream = createDefenceMainStreamPartialPayload(app)
+
+    await KeitaroService.upsertStreamToCampaign(campaign, stream)
+
+    return campaign
+}
+
 export async function createOWCampaign(app: IFlashApp) {
     let owCampaign = await KeitaroService.cloneOWCampaign(app)