@bprotsyk/aso-core 2.1.60 → 2.1.62

package/lib/app/app.d.ts

@@ -1,7 +1,5 @@
-import { AlternativeLayoutType, AlternativeLogicType, AlternativeNavigation, AlternativeNetworkTool, AlternativeOnActivityResult, AlternativeOnBackPressed, AlternativeSourceType, AlternativeStorageType } from "index";
 import { AppType } from "./app-type";
 import mongoose, { Document } from "mongoose";
-import { AlternativeFullscreen } from "app/app-integration";
 export interface IApp extends Document {
     id: number;
     enabled: boolean;
@@ -11,14 +9,12 @@ export interface IApp extends Document {
     pushesEnabled?: boolean;
     policyUrl?: string;
     type: AppType;
-    geos: string;
     geo: string[];
     onesignalAppId: string;
     onesignalRestApiKey: string;
     appmetricaApiKey?: string;
     appmetricaAppId?: number;
     webInterfaceName: string;
-    generationOptions: IAppGenerationOptions;
     keitaroData: IAppKeitaroData | null;
     integrationVersion: IntegrationVersion;
     offersStubParams?: IOffersStubParams;
@@ -53,12 +49,15 @@ export declare const getPlatformName: (platform: EPlatform | undefined) => strin
 export interface IPlatformParams {
     enabled: boolean;
     geo: string[];
-    customCampaignData?: IAppKeitaroData;
     trackingUrl?: string;
     adjustParams?: {
         appId: string;
         eventIds: IAdjustEventIds;
     };
+    direct?: {
+        enabled: boolean;
+        keitaroData: IAppKeitaroData | boolean;
+    };
     metricaParams?: {
         appId: number;
         postApiKey: string;
@@ -129,33 +128,11 @@ export declare enum IntegrationVersion {
     NONE = "MVVM",
     POLICY = "POLICY",
     OFFER_STUB = "OFFER_STUB",
-    DIRECT = "DIRECT",
     WEB = "WEB",
     WEB_DIRECT = "WEB_DIRECT",
     BANNER = "BANNER",
     PWA = "PWA"
 }
-export interface IntegrationAlterations {
-    networkTool: AlternativeNetworkTool;
-    logicType: AlternativeLogicType;
-    navigation: AlternativeNavigation;
-    storageType: AlternativeStorageType;
-    sourceType: AlternativeSourceType;
-    onBackPressed: AlternativeOnBackPressed;
-    onActivityResult: AlternativeOnActivityResult;
-    layoutType: AlternativeLayoutType;
-    fullscreen: AlternativeFullscreen;
-}
-export interface IAppGenerationOptions {
-    splashName: string;
-    webViewName: string;
-    linkName: string;
-}
-export interface IDeveloperParams {
-    name: string;
-    email: string;
-    organization: string;
-}
 export interface IAppKeitaroData {
     trackingCampaignId: number;
     trackingCampaignName: string;
@@ -178,7 +155,6 @@ export declare const AppSchema: mongoose.Schema<any, mongoose.Model<any, any, an
     bundle: string;
     trackingUrl: string;
     integrationVersion: string;
-    geos: string;
     name?: string | null | undefined;
     pushesEnabled?: boolean | null | undefined;
     removeDataParams?: any;
@@ -217,7 +193,6 @@ export declare const AppSchema: mongoose.Schema<any, mongoose.Model<any, any, an
     bundle: string;
     trackingUrl: string;
     integrationVersion: string;
-    geos: string;
     name?: string | null | undefined;
     pushesEnabled?: boolean | null | undefined;
     removeDataParams?: any;
@@ -256,7 +231,6 @@ export declare const AppSchema: mongoose.Schema<any, mongoose.Model<any, any, an
     bundle: string;
     trackingUrl: string;
     integrationVersion: string;
-    geos: string;
     name?: string | null | undefined;
     pushesEnabled?: boolean | null | undefined;
     removeDataParams?: any;

package/lib/app/app.js

@@ -49,7 +49,6 @@ var IntegrationVersion;
     IntegrationVersion["NONE"] = "MVVM";
     IntegrationVersion["POLICY"] = "POLICY";
     IntegrationVersion["OFFER_STUB"] = "OFFER_STUB";
-    IntegrationVersion["DIRECT"] = "DIRECT";
     IntegrationVersion["WEB"] = "WEB";
     IntegrationVersion["WEB_DIRECT"] = "WEB_DIRECT";
     IntegrationVersion["BANNER"] = "BANNER";
@@ -103,10 +102,6 @@ exports.AppSchema = new mongoose_1.Schema({
         enum: app_type_1.AppType,
         default: app_type_1.AppType.GAMBLING
     },
-    geos: {
-        type: String,
-        required: true
-    },
     geo: {
         type: [String]
     },

package/lib/index.d.ts

@@ -2,7 +2,7 @@ export { IPush } from "./general/push";
 export { IOffer, IPartner, IOfferType } from "./offers/offer";
 export { IOffersSection, OffersSectionSchema, DefaultSectionId } from "./offers/section";
 export { IAppOffersSection, ISectionsList, SectionsListSchema, IOfferState } from "./offers/list";
-export { IntegrationAlterations, IAdjustEventIds, IntegrationVersion, IApp, AppSchema, PlugType, IAppKeitaroData, IExternalParams, IPlatformParams, EPlatform } from "./app/app";
+export { IAdjustEventIds, IntegrationVersion, IApp, AppSchema, PlugType, IAppKeitaroData, IExternalParams, IPlatformParams, EPlatform } from "./app/app";
 export { IAppListItem } from "./app/app-list-item";
 export { AppType } from "./app/app-type";
 export { AlternativeLayoutType, AlternativeSourceType, AlternativeLogicType, AlternativeNetworkTool, AlternativeStorageType, AlternativeNavigation, AlternativeOnBackPressed, AlternativeOnActivityResult, IAppIntegration as IFlashIntegration } from "./app/app-integration";

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

@@ -1,11 +1,9 @@
-import { IKeitaroStream } from "../keitaro/keitaro-stream";
 import { EPlatform, IApp } from "../app/app";
 import { IKeitaroCampaign, IKeitaroCampaignParameters } from "../keitaro/keitaro-campaign";
 export declare const TRAFFIC_SOURCE_ID_FLASH_AI = 22;
 export declare let addGeosToAllRedirectCampaigns: (geosToAdd: string) => Promise<void>;
 export declare let removeGeosFromAllRedirectCampaigns: (geoToRemove: string) => Promise<void>;
 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, platform?: EPlatform): Promise<any>;
 type PostbackStatus = 'lead' | 'sale' | 'rejected';

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.sendPostbacks = exports.createOWCampaign = exports.createDirectCampaign = exports.createOWStreamPartialPayload = exports.prepareOWCampaignParameters = exports.removeGeosFromAllRedirectCampaigns = exports.addGeosToAllRedirectCampaigns = exports.TRAFFIC_SOURCE_ID_FLASH_AI = void 0;
+exports.sendPostbacks = exports.createOWCampaign = exports.createDirectCampaign = exports.prepareOWCampaignParameters = exports.removeGeosFromAllRedirectCampaigns = exports.addGeosToAllRedirectCampaigns = exports.TRAFFIC_SOURCE_ID_FLASH_AI = void 0;
 const keitaro_service_1 = require("../network/keitaro/keitaro-service");
 const sleep = require('sleep-promise');
 const axios_1 = __importDefault(require("axios"));
@@ -310,27 +310,27 @@ let prepareOWCampaignParameters = (app) => {
     };
 };
 exports.prepareOWCampaignParameters = prepareOWCampaignParameters;
-function createBPStreamPartialPayload(app) {
-    return {
-        name: `Bot Protection`,
-        type: "forced",
-        action_type: "http",
-        action_payload: "https://tomain.com",
-        schema: "redirect",
-        filter_or: true,
-        collect_clicks: true,
-        weight: 0,
-        filters: [{
-                name: "country",
-                mode: "reject",
-                payload: app.geos.split(" ")
-            }, {
-                name: "bot",
-                mode: "accept",
-                payload: null,
-            }],
-    };
-}
+// function createBPStreamPartialPayload(app: IApp): Partial<IKeitaroStream> {
+//     return {
+//         name: `Bot Protection`,
+//         type: "forced",
+//         action_type: "http",
+//         action_payload: "https://tomain.com",
+//         schema: "redirect",
+//         filter_or: true,
+//         collect_clicks: true,
+//         weight: 0,
+//         filters: [{
+//             name: "country",
+//             mode: "reject",
+//             payload: app.geos.split(" ")
+//         }, {
+//             name: "bot",
+//             mode: "accept",
+//             payload: null,
+//         }],
+//     }
+// }
 function createDefenceMainStreamPartialPayload(app) {
     return {
         name: "ALL",
@@ -343,24 +343,23 @@ function createDefenceMainStreamPartialPayload(app) {
         weight: 100,
     };
 }
-function createOWStreamPartialPayload(app) {
-    return {
-        name: `OW`,
-        type: "regular",
-        action_type: "http",
-        action_payload: "https://bprtsk-controlpanel.com/ow?appId={appId}&clickId={uid}&countryCode={country}",
-        schema: "redirect",
-        filter_or: false,
-        collect_clicks: true,
-        weight: 100,
-        filters: [{
-                name: "country",
-                mode: "accept",
-                payload: app.geos.split(" ")
-            }],
-    };
-}
-exports.createOWStreamPartialPayload = createOWStreamPartialPayload;
+// export function createOWStreamPartialPayload(app: IApp): Partial<IKeitaroStream> {
+//     return {
+//         name: `OW`,
+//         type: "regular",
+//         action_type: "http",
+//         action_payload: "https://bprtsk-controlpanel.com/ow?appId={appId}&clickId={uid}&countryCode={country}",
+//         schema: "redirect",
+//         filter_or: false,
+//         collect_clicks: true,
+//         weight: 100,
+//         filters: [{
+//             name: "country",
+//             mode: "accept",
+//             payload: app.geos.split(" ")
+//         }],
+//     }
+// }
 async function createDirectCampaign(app) {
     let campaign = await keitaro_service_1.KeitaroService.cloneDCampaign(app);
     let stream = createDefenceMainStreamPartialPayload(app);

package/package.json

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

package/src/app/app.ts

@@ -14,8 +14,7 @@ export interface IApp extends Document {
     pushesEnabled?: boolean
     policyUrl?: string
     type: AppType
-    geos: string
-    geo: string[] // new one, actual
+    geo: string[] 
 
     onesignalAppId: string
     onesignalRestApiKey: string
@@ -25,7 +24,6 @@ export interface IApp extends Document {
 
     webInterfaceName: string
 
-    generationOptions: IAppGenerationOptions
     keitaroData: IAppKeitaroData | null
     integrationVersion: IntegrationVersion
 
@@ -86,12 +84,15 @@ export const getPlatformName = (platform: EPlatform | undefined): string | false
 export interface IPlatformParams {
     enabled: boolean,
     geo: string[],
-    customCampaignData?: IAppKeitaroData,
     trackingUrl?: string,
     adjustParams?: {
         appId: string,
         eventIds: IAdjustEventIds,
     },
+    direct?: {
+        enabled: boolean,
+        keitaroData: IAppKeitaroData | boolean
+    },
     metricaParams?: {
         appId: number,
         postApiKey: string,
@@ -176,37 +177,12 @@ export enum IntegrationVersion {
     NONE = "MVVM",
     POLICY = "POLICY",
     OFFER_STUB = "OFFER_STUB",
-    DIRECT = "DIRECT",
     WEB = "WEB",
     WEB_DIRECT = "WEB_DIRECT",
     BANNER = "BANNER",
     PWA = "PWA"
 }
 
-export interface IntegrationAlterations {
-    networkTool: AlternativeNetworkTool, // Network
-    logicType: AlternativeLogicType, // Logic
-    navigation: AlternativeNavigation, // Navigation
-    storageType: AlternativeStorageType, // Storage
-    sourceType: AlternativeSourceType, // Source
-    onBackPressed: AlternativeOnBackPressed,
-    onActivityResult: AlternativeOnActivityResult,
-    layoutType: AlternativeLayoutType,
-    fullscreen: AlternativeFullscreen
-}
-
-export interface IAppGenerationOptions {
-    splashName: string
-    webViewName: string
-    linkName: string,
-}
-
-export interface IDeveloperParams {
-    name: string
-    email: string
-    organization: string
-}
-
 export interface IAppKeitaroData {
     trackingCampaignId: number
     trackingCampaignName: string
@@ -265,10 +241,6 @@ export const AppSchema = new Schema({
         enum: AppType,
         default: AppType.GAMBLING
     },
-    geos: {
-        type: String,
-        required: true
-    },
     geo: {
         type: [String]
     },

package/src/index.ts

@@ -4,7 +4,7 @@ export { IOffer, IPartner, IOfferType } from "./offers/offer"
 export { IOffersSection, OffersSectionSchema, DefaultSectionId } from "./offers/section"
 export { IAppOffersSection, ISectionsList, SectionsListSchema, IOfferState } from "./offers/list"
 
-export { IntegrationAlterations, IAdjustEventIds, IntegrationVersion, IApp, AppSchema, PlugType, IAppKeitaroData, IExternalParams, IPlatformParams, EPlatform } from "./app/app"
+export { IAdjustEventIds, IntegrationVersion, IApp, AppSchema, PlugType, IAppKeitaroData, IExternalParams, IPlatformParams, EPlatform } from "./app/app"
 export { IAppListItem } from "./app/app-list-item"
 export { AppType } from "./app/app-type"
 export { AlternativeLayoutType, AlternativeSourceType, AlternativeLogicType, AlternativeNetworkTool, AlternativeStorageType, AlternativeNavigation, AlternativeOnBackPressed, AlternativeOnActivityResult, IAppIntegration as IFlashIntegration } from "./app/app-integration"

package/src/panel/app/upsert-flash-app-request.ts

@@ -1,4 +1,4 @@
-import { EImageFormat, IAppGenerationOptions, IAppKeitaroData, IBannerParams, IDeveloperParams, IDirectParams, IDomainParams, IExternalParams, IOffersStubParams, IPlatformParams, IPrivacyPolicyParams, IRemoteServerParams, IRemoveDataParams, IntegrationVersion } from "app/app"
+import { EImageFormat, IAppKeitaroData, IBannerParams, IDirectParams, IDomainParams, IExternalParams, IOffersStubParams, IPlatformParams, IPrivacyPolicyParams, IRemoteServerParams, IRemoveDataParams, IntegrationVersion } from "app/app"
 import { PlugType } from "index"
 
 export interface IUpsertAppRequest {

package/src/utils/keitaro-utils.ts

@@ -345,27 +345,27 @@ export let prepareOWCampaignParameters = (app: IApp): IKeitaroCampaignParameters
     }
 }
 
-function createBPStreamPartialPayload(app: IApp): Partial<IKeitaroStream> {
-    return {
-        name: `Bot Protection`,
-        type: "forced",
-        action_type: "http",
-        action_payload: "https://tomain.com",
-        schema: "redirect",
-        filter_or: true,
-        collect_clicks: true,
-        weight: 0,
-        filters: [{
-            name: "country",
-            mode: "reject",
-            payload: app.geos.split(" ")
-        }, {
-            name: "bot",
-            mode: "accept",
-            payload: null,
-        }],
-    }
-}
+// function createBPStreamPartialPayload(app: IApp): Partial<IKeitaroStream> {
+//     return {
+//         name: `Bot Protection`,
+//         type: "forced",
+//         action_type: "http",
+//         action_payload: "https://tomain.com",
+//         schema: "redirect",
+//         filter_or: true,
+//         collect_clicks: true,
+//         weight: 0,
+//         filters: [{
+//             name: "country",
+//             mode: "reject",
+//             payload: app.geos.split(" ")
+//         }, {
+//             name: "bot",
+//             mode: "accept",
+//             payload: null,
+//         }],
+//     }
+// }
 
 function createDefenceMainStreamPartialPayload(app: IApp): Partial<IKeitaroStream> {
     return {
@@ -380,23 +380,23 @@ function createDefenceMainStreamPartialPayload(app: IApp): Partial<IKeitaroStrea
     }
 }
 
-export function createOWStreamPartialPayload(app: IApp): Partial<IKeitaroStream> {
-    return {
-        name: `OW`,
-        type: "regular",
-        action_type: "http",
-        action_payload: "https://bprtsk-controlpanel.com/ow?appId={appId}&clickId={uid}&countryCode={country}",
-        schema: "redirect",
-        filter_or: false,
-        collect_clicks: true,
-        weight: 100,
-        filters: [{
-            name: "country",
-            mode: "accept",
-            payload: app.geos.split(" ")
-        }],
-    }
-}
+// export function createOWStreamPartialPayload(app: IApp): Partial<IKeitaroStream> {
+//     return {
+//         name: `OW`,
+//         type: "regular",
+//         action_type: "http",
+//         action_payload: "https://bprtsk-controlpanel.com/ow?appId={appId}&clickId={uid}&countryCode={country}",
+//         schema: "redirect",
+//         filter_or: false,
+//         collect_clicks: true,
+//         weight: 100,
+//         filters: [{
+//             name: "country",
+//             mode: "accept",
+//             payload: app.geos.split(" ")
+//         }],
+//     }
+// }
 
 export async function createDirectCampaign(app: IApp) {
     let campaign = await KeitaroService.cloneDCampaign(app)