@bprotsyk/aso-core 2.1.192 → 2.1.195

package/lib/app/app.d.ts

@@ -13,7 +13,7 @@ export interface IApp extends Document {
     name: string;
     bundle: string;
     status: AppStatus;
-    team: ETeam;
+    geos?: string[];
     onesignalAppId: string;
     onesignalRestApiKey: string;
     appmetricaApiKey?: string;
@@ -31,10 +31,6 @@ export interface IApp extends Document {
     policyPath: string;
     postbacks?: IAppsflyerPostback[];
 }
-export declare enum ETeam {
-    TRAFFLE = "traffle",
-    ELTRAFICO = "eltrafico"
-}
 export declare enum EPlatform {
     GENERAL = "@",
     HUAWEI = "hw",
@@ -48,9 +44,7 @@ export declare enum EPlatform {
 }
 export declare enum EDirectType {
     KEITARO_OFFER = "keitaroOffer",
-    OFFER_DIRECT = "offerDirect",
-    TRAFFLE_KEITARO_OFFER = "traffleKeitaroOffer",
-    TRAFFLE_OFFER_DIRECT = "traffleOfferDirect"
+    OFFER_DIRECT = "offerDirect"
 }
 export declare const getPlatformName: (platform: EPlatform | undefined) => string | false;
 export interface IPlatformParams {
@@ -148,6 +142,7 @@ export declare enum IntegrationVersion {
     OFFERWALL = "OFFERWALL"
 }
 export interface IKeitaroDirectTrackingParams {
+    naming: string;
     firebase_app_instance_id: string;
     firebase_user_id: string;
     firebase_device_language_code: string;
@@ -176,8 +171,8 @@ export declare const AppSchema: mongoose.Schema<any, mongoose.Model<any, any, an
     enabled: boolean;
     ech: boolean;
     status: AppStatus;
-    team: ETeam;
     bundle: string;
+    geos: string[];
     removeInfo: any;
     policyPath: string;
     postbacks: mongoose.Types.DocumentArray<{
@@ -230,8 +225,8 @@ export declare const AppSchema: mongoose.Schema<any, mongoose.Model<any, any, an
     enabled: boolean;
     ech: boolean;
     status: AppStatus;
-    team: ETeam;
     bundle: string;
+    geos: string[];
     removeInfo: any;
     policyPath: string;
     postbacks: mongoose.Types.DocumentArray<{
@@ -284,8 +279,8 @@ export declare const AppSchema: mongoose.Schema<any, mongoose.Model<any, any, an
     enabled: boolean;
     ech: boolean;
     status: AppStatus;
-    team: ETeam;
     bundle: string;
+    geos: string[];
     removeInfo: any;
     policyPath: string;
     postbacks: mongoose.Types.DocumentArray<{

package/lib/app/app.js

@@ -1,13 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AppSchema = exports.PlugType = exports.IntegrationVersion = exports.AppStatus = exports.getPlatformName = exports.EDirectType = exports.EPlatform = exports.ETeam = void 0;
+exports.AppSchema = exports.PlugType = exports.IntegrationVersion = exports.AppStatus = exports.getPlatformName = exports.EDirectType = exports.EPlatform = void 0;
 const mongoose_1 = require("mongoose");
 const util = require("util");
-var ETeam;
-(function (ETeam) {
-    ETeam["TRAFFLE"] = "traffle";
-    ETeam["ELTRAFICO"] = "eltrafico";
-})(ETeam = exports.ETeam || (exports.ETeam = {}));
 var EPlatform;
 (function (EPlatform) {
     EPlatform["GENERAL"] = "@";
@@ -24,8 +19,6 @@ var EDirectType;
 (function (EDirectType) {
     EDirectType["KEITARO_OFFER"] = "keitaroOffer";
     EDirectType["OFFER_DIRECT"] = "offerDirect";
-    EDirectType["TRAFFLE_KEITARO_OFFER"] = "traffleKeitaroOffer";
-    EDirectType["TRAFFLE_OFFER_DIRECT"] = "traffleOfferDirect";
 })(EDirectType = exports.EDirectType || (exports.EDirectType = {}));
 // Removed IPublicationHistory interface
 const getPlatformName = (platform) => {
@@ -94,17 +87,13 @@ exports.AppSchema = new mongoose_1.Schema({
         enum: AppStatus,
         default: AppStatus.IN_DEVELOPMENT
     },
-    team: {
-        type: String,
-        enum: ETeam,
-        default: ETeam.ELTRAFICO
-    },
     bundle: {
         type: String,
         unique: true,
         required: true
     },
     name: String,
+    geos: [String],
     onesignalAppId: {
         type: String,
         required: false

package/lib/general/domain.js

@@ -20,7 +20,7 @@ var DomainTarget;
 })(DomainTarget = exports.DomainTarget || (exports.DomainTarget = {}));
 let getDomainTargetByIp = (ip) => {
     switch (ip) {
-        case "185.123.53.227":
+        case "194.61.120.94":
             return DomainTarget.MAIN;
         case "46.246.96.114":
             return DomainTarget.KEITARO;

package/lib/index.d.ts

@@ -26,4 +26,3 @@ export { INamecheapDomain, INamecheapBuyRequest, INamecheapContactInfo, Namechea
 export { NginxTemplate } from "./templates/nginx-template";
 export { TraffleKeitaroService } from "./network/keitaro/traffle/traffle-keitaro-service";
 export { KeitaroCLOGeosService } from "./keitaro/keitaro-clo-geos";
-export { ETeam } from "./app/app";

package/lib/index.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ETeam = exports.KeitaroCLOGeosService = exports.TraffleKeitaroService = exports.NginxTemplate = exports.NamecheapBuyRequestSchema = exports.getDomainTargetByIp = exports.CONST_CLOUFLARE_STATUS_READY = exports.DomainTarget = exports.DomainStatus = exports.ICloudflareDomainType = exports.ICloudflareDomainStatus = exports.KeitaroUtils = exports.KeitaroService = exports.ShapeDiv = exports.PanelUserSchema = exports.PanelUserAccessScope = exports.AlternativeOnActivityResult = exports.AlternativeOnBackPressed = exports.AlternativeNavigation = exports.AlternativeStorageType = exports.AlternativeNetworkTool = exports.AlternativeLogicType = exports.AlternativeSourceType = exports.AlternativeLayoutType = exports.AppType = exports.EDirectType = exports.AppStatus = exports.EPlatform = exports.PlugType = exports.AppSchema = exports.IntegrationVersion = exports.SectionsListSchema = exports.DefaultSectionId = exports.OffersSectionSchema = exports.IOfferType = void 0;
+exports.KeitaroCLOGeosService = exports.TraffleKeitaroService = exports.NginxTemplate = exports.NamecheapBuyRequestSchema = exports.getDomainTargetByIp = exports.CONST_CLOUFLARE_STATUS_READY = exports.DomainTarget = exports.DomainStatus = exports.ICloudflareDomainType = exports.ICloudflareDomainStatus = exports.KeitaroUtils = exports.KeitaroService = exports.ShapeDiv = exports.PanelUserSchema = exports.PanelUserAccessScope = exports.AlternativeOnActivityResult = exports.AlternativeOnBackPressed = exports.AlternativeNavigation = exports.AlternativeStorageType = exports.AlternativeNetworkTool = exports.AlternativeLogicType = exports.AlternativeSourceType = exports.AlternativeLayoutType = exports.AppType = exports.EDirectType = exports.AppStatus = exports.EPlatform = exports.PlugType = exports.AppSchema = exports.IntegrationVersion = exports.SectionsListSchema = exports.DefaultSectionId = exports.OffersSectionSchema = exports.IOfferType = void 0;
 var offer_1 = require("./offers/offer");
 Object.defineProperty(exports, "IOfferType", { enumerable: true, get: function () { return offer_1.IOfferType; } });
 var section_1 = require("./offers/section");
@@ -73,5 +73,3 @@ var traffle_keitaro_service_1 = require("./network/keitaro/traffle/traffle-keita
 Object.defineProperty(exports, "TraffleKeitaroService", { enumerable: true, get: function () { return traffle_keitaro_service_1.TraffleKeitaroService; } });
 var keitaro_clo_geos_1 = require("./keitaro/keitaro-clo-geos");
 Object.defineProperty(exports, "KeitaroCLOGeosService", { enumerable: true, get: function () { return keitaro_clo_geos_1.KeitaroCLOGeosService; } });
-var app_2 = require("./app/app");
-Object.defineProperty(exports, "ETeam", { enumerable: true, get: function () { return app_2.ETeam; } });

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

@@ -434,6 +434,7 @@ async function updateAppTrackingParams(app, platform, newParameters) {
         const platformData = app.platforms[platform];
         if (platformData?.direct?.keitaroData && typeof platformData.direct.keitaroData !== 'boolean' && platformData.direct.keitaroData.trackingParams) {
             platformData.direct.keitaroData.trackingParams = {
+                naming: newParameters.sub_id_15?.name || "naming",
                 firebase_app_instance_id: newParameters.sub_id_11?.name || "firebase_app_instance_id",
                 firebase_user_id: newParameters.sub_id_12?.name || "firebase_user_id",
                 firebase_device_language_code: newParameters.sub_id_13?.name || "firebase_device_language_code",
@@ -557,6 +558,7 @@ async function updateAppWithCampaignParams(existingCampaign, app, platform) {
         }
         // Оновлюємо app з параметрами з Keitaro (нова структура)
         platformData.direct.keitaroData.trackingParams = {
+            naming: campaignParams.sub_id_15?.name || "naming",
             firebase_app_instance_id: campaignParams.sub_id_11?.name || "firebase_app_instance_id",
             firebase_user_id: campaignParams.sub_id_12?.name || "firebase_user_id",
             firebase_device_language_code: campaignParams.sub_id_13?.name || "firebase_device_language_code",
@@ -566,7 +568,7 @@ async function updateAppWithCampaignParams(existingCampaign, app, platform) {
             campaign: campaignParams.sub_id_20?.name || "campaign",
             bundle_id: campaignParams.sub_id_16?.placeholder || ""
         };
-        console.log(`Updated app with campaign parameters (new structure): campaign=${platformData.direct.keitaroData.trackingParams.campaign}, advertising_id=${platformData.direct.keitaroData.trackingParams.advertising_id}, appsflyer_device_id=${platformData.direct.keitaroData.trackingParams.appsflyer_device_id}`);
+        console.log(`Updated app with campaign parameters (new structure): campaign=${platformData.direct.keitaroData.trackingParams?.campaign}, advertising_id=${platformData.direct.keitaroData.trackingParams?.advertising_id}, appsflyer_device_id=${platformData.direct.keitaroData.trackingParams?.appsflyer_device_id}`);
         return true;
     }
     catch (error) {
@@ -939,10 +941,10 @@ async function updateStreamsForApp(app, platform) {
             console.log(`Skipping stream update for platform ${platform}: test platform is ignored`);
             return false;
         }
-        // Перевіряємо чи є directType і чи він трафлєвський
+        // Перевіряємо чи є directType
         const directType = platformData.direct?.directType;
-        if (!directType || (directType !== app_1.EDirectType.TRAFFLE_KEITARO_OFFER && directType !== app_1.EDirectType.TRAFFLE_OFFER_DIRECT)) {
-            console.log(`Skipping stream update for platform ${platform}: directType is not traffle (${directType})`);
+        if (!directType) {
+            console.log(`Skipping stream update for platform ${platform}: no directType set`);
             return false;
         }
         const campaign = await findCampaignForAppPlatform(app, platform);

package/lib/panel/app/upsert-flash-app-request.d.ts

@@ -1,15 +1,18 @@
-import { AppStatus, ETeam, IAppKeitaroData, IBannerParams, IDomainParams, IOffersStubParams, IPlatformParams } from "app/app";
+import { AppStatus, IAppKeitaroData, IBannerParams, IDomainParams, IOffersStubParams, IOfferwallParams, IntegrationVersion, IPlatformParams } from "app/app";
 export interface IUpsertAppRequest {
     id: number;
     name?: string;
     bundle?: string;
     sourceUrl?: string;
     enabled?: boolean;
+    geos?: string[];
+    integrationVersion?: IntegrationVersion;
     appmetricaApiKey?: string;
     appmetricaAppId?: number;
     keitaroData?: Partial<IAppKeitaroData>;
     bannerParams?: IBannerParams;
     offersStubParams?: IOffersStubParams;
+    offerwallParams?: IOfferwallParams;
     domainParams: IDomainParams;
     platforms: {
         [key: string]: IPlatformParams;
@@ -18,7 +21,6 @@ export interface IUpsertAppRequest {
     file?: any;
     status?: AppStatus;
     policyPath?: string;
-    team?: ETeam;
 }
 export interface IUpsertAppResponse {
     data: IUpsertAppRequest;

package/package.json

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

package/src/app/app.ts

@@ -19,7 +19,7 @@ export interface IApp extends Document {
     name: string
     bundle: string
     status: AppStatus
-    team: ETeam
+    geos?: string[]
     onesignalAppId: string
     onesignalRestApiKey: string
 
@@ -40,11 +40,6 @@ export interface IApp extends Document {
     postbacks?: IAppsflyerPostback[]
 }
 
-export enum ETeam {
-    TRAFFLE = 'traffle',
-    ELTRAFICO = 'eltrafico'
-}
-
 export enum EPlatform {
     GENERAL = '@',
     HUAWEI = 'hw',
@@ -59,9 +54,7 @@ export enum EPlatform {
 
 export enum EDirectType{
     KEITARO_OFFER = 'keitaroOffer',
-    OFFER_DIRECT = 'offerDirect',
-    TRAFFLE_KEITARO_OFFER = 'traffleKeitaroOffer',
-    TRAFFLE_OFFER_DIRECT = 'traffleOfferDirect'
+    OFFER_DIRECT = 'offerDirect'
 }
 
 // Removed IPublicationHistory interface
@@ -199,6 +192,7 @@ export enum IntegrationVersion {
 }
 
 export interface IKeitaroDirectTrackingParams {
+    naming: string,
     firebase_app_instance_id: string,
     firebase_user_id: string,
     firebase_device_language_code: string,
@@ -245,11 +239,6 @@ export const AppSchema = new Schema({
         enum: AppStatus,
         default: AppStatus.IN_DEVELOPMENT
     },
-    team: {
-        type: String,
-        enum: ETeam,
-        default: ETeam.ELTRAFICO
-    },
 
     bundle: {
         type: String,
@@ -257,6 +246,7 @@ export const AppSchema = new Schema({
         required: true
     },
     name: String,
+    geos: [String],
     onesignalAppId: {
         type: String,
         required: false

package/src/general/domain.ts

@@ -65,7 +65,7 @@ export enum DomainTarget {
 
 export let getDomainTargetByIp = (ip: string): DomainTarget => {
     switch (ip) {
-        case "185.123.53.227":
+        case "194.61.120.94":
             return DomainTarget.MAIN
         case "46.246.96.114":
             return DomainTarget.KEITARO

package/src/index.ts

@@ -33,5 +33,4 @@ export { INamecheapDomain, INamecheapBuyRequest, INamecheapContactInfo, Namechea
 export { NginxTemplate } from "./templates/nginx-template";
 
 export { TraffleKeitaroService } from "./network/keitaro/traffle/traffle-keitaro-service"
-export { KeitaroCLOGeosService } from "./keitaro/keitaro-clo-geos"
-export { ETeam} from "./app/app";
+export { KeitaroCLOGeosService } from "./keitaro/keitaro-clo-geos"

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

@@ -509,6 +509,7 @@ async function updateAppTrackingParams(app: IApp, platform: EPlatform, newParame
         const platformData = app.platforms[platform];
         if (platformData?.direct?.keitaroData && typeof platformData.direct.keitaroData !== 'boolean' && platformData.direct.keitaroData.trackingParams) {
             platformData.direct.keitaroData.trackingParams = {
+                naming: newParameters.sub_id_15?.name || "naming",
                 firebase_app_instance_id: newParameters.sub_id_11?.name || "firebase_app_instance_id",
                 firebase_user_id: newParameters.sub_id_12?.name || "firebase_user_id",
                 firebase_device_language_code: newParameters.sub_id_13?.name || "firebase_device_language_code",
@@ -641,6 +642,7 @@ async function updateAppWithCampaignParams(existingCampaign: IKeitaroCampaign, a
         
         // Оновлюємо app з параметрами з Keitaro (нова структура)
         platformData.direct.keitaroData.trackingParams = {
+            naming: campaignParams.sub_id_15?.name || "naming",
             firebase_app_instance_id: campaignParams.sub_id_11?.name || "firebase_app_instance_id",
             firebase_user_id: campaignParams.sub_id_12?.name || "firebase_user_id",
             firebase_device_language_code: campaignParams.sub_id_13?.name || "firebase_device_language_code",
@@ -651,7 +653,7 @@ async function updateAppWithCampaignParams(existingCampaign: IKeitaroCampaign, a
             bundle_id: campaignParams.sub_id_16?.placeholder || ""
         };
         
-        console.log(`Updated app with campaign parameters (new structure): campaign=${platformData.direct.keitaroData.trackingParams.campaign}, advertising_id=${platformData.direct.keitaroData.trackingParams.advertising_id}, appsflyer_device_id=${platformData.direct.keitaroData.trackingParams.appsflyer_device_id}`);
+        console.log(`Updated app with campaign parameters (new structure): campaign=${platformData.direct.keitaroData.trackingParams?.campaign}, advertising_id=${platformData.direct.keitaroData.trackingParams?.advertising_id}, appsflyer_device_id=${platformData.direct.keitaroData.trackingParams?.appsflyer_device_id}`);
         
         return true;
     } catch (error) {
@@ -1079,10 +1081,10 @@ export async function updateStreamsForApp(app: IApp, platform: EPlatform): Promi
 			return false;
 		}
 
-		// Перевіряємо чи є directType і чи він трафлєвський
+		// Перевіряємо чи є directType
 		const directType = platformData.direct?.directType;
-		if (!directType || (directType !== EDirectType.TRAFFLE_KEITARO_OFFER && directType !== EDirectType.TRAFFLE_OFFER_DIRECT)) {
-			console.log(`Skipping stream update for platform ${platform}: directType is not traffle (${directType})`);
+		if (!directType) {
+			console.log(`Skipping stream update for platform ${platform}: no directType set`);
 			return false;
 		}
 

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

@@ -1,4 +1,4 @@
-import { AppStatus, ETeam, IAppKeitaroData, IBannerParams, IDomainParams, IOffersStubParams, IPlatformParams, IPrivacyPolicyParams, IRemoveDataParams } from "app/app"
+import { AppStatus, IAppKeitaroData, IBannerParams, IDomainParams, IOffersStubParams, IOfferwallParams, IntegrationVersion, IPlatformParams, IPrivacyPolicyParams, IRemoveDataParams } from "app/app"
 import { PlugType } from "index"
 
 export interface IUpsertAppRequest {
@@ -7,6 +7,8 @@ export interface IUpsertAppRequest {
     bundle?: string
     sourceUrl?: string, // –
     enabled?: boolean,
+    geos?: string[],
+    integrationVersion?: IntegrationVersion,
 
     // onesignalAppId: string
     // onesignalRestApiKey: string
@@ -17,13 +19,13 @@ export interface IUpsertAppRequest {
     keitaroData?: Partial<IAppKeitaroData>,
     bannerParams?: IBannerParams,
     offersStubParams?: IOffersStubParams,
+    offerwallParams?: IOfferwallParams,
     domainParams: IDomainParams,
     platforms: { [key: string]: IPlatformParams },
     ech?: boolean,
     file?: any
     status?: AppStatus
     policyPath?: string
-    team?: ETeam
 }
 
 export interface IUpsertAppResponse {