@bprotsyk/aso-core 1.2.69 → 1.2.71

package/lib/index.d.ts

@@ -16,7 +16,7 @@ export { IOfferWallSection } from "./aso/offerwall/offerwall-section";
 export { IOfferWallOffer } from "./aso/offerwall/offerwall-offer";
 export { IOfferWallResponse } from "./aso/offerwall/offerwall-response";
 export { IOfferWallHomeDialogData } from "./aso/offerwall/offerwall-home-dialog-data";
-export { IFlashApp, FlashAppSchema, updateSchemaAndMoveValue, PlugType } from "./flash/flash-app";
+export { IFlashApp, FlashAppSchema, updateSchemaAndMoveValue, PlugType, FlashAppPlugStatus } from "./flash/flash-app";
 export { IFlashAppListItem } from "./flash/flash-app-list-item";
 export { FlashAppType } from "./flash/flash-app-type";
 export * as ASOConfigFetch from "./aso/usage-logs/aso-config-fetch-entry";

package/lib/index.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.KeitaroService = exports.ColoredText = exports.ShapeDiv = exports.PanelUserSchema = exports.PanelUserAccessScope = exports.ASOConfigFetch = exports.FlashAppType = exports.PlugType = exports.updateSchemaAndMoveValue = exports.FlashAppSchema = exports.ASO_v5 = exports.ASO_v4 = exports.ASO_v3 = exports.ASO_v2 = exports.ASO_v1 = exports.ASO_v0 = void 0;
+exports.KeitaroService = exports.ColoredText = exports.ShapeDiv = exports.PanelUserSchema = exports.PanelUserAccessScope = exports.ASOConfigFetch = exports.FlashAppType = exports.FlashAppPlugStatus = exports.PlugType = exports.updateSchemaAndMoveValue = exports.FlashAppSchema = exports.ASO_v5 = exports.ASO_v4 = exports.ASO_v3 = exports.ASO_v2 = exports.ASO_v1 = exports.ASO_v0 = void 0;
 exports.ASO_v0 = __importStar(require("./aso/config/aso-config-v0"));
 exports.ASO_v1 = __importStar(require("./aso/config/aso-config-v1"));
 exports.ASO_v2 = __importStar(require("./aso/config/aso-config-v2"));
@@ -34,6 +34,7 @@ var flash_app_1 = require("./flash/flash-app");
 Object.defineProperty(exports, "FlashAppSchema", { enumerable: true, get: function () { return flash_app_1.FlashAppSchema; } });
 Object.defineProperty(exports, "updateSchemaAndMoveValue", { enumerable: true, get: function () { return flash_app_1.updateSchemaAndMoveValue; } });
 Object.defineProperty(exports, "PlugType", { enumerable: true, get: function () { return flash_app_1.PlugType; } });
+Object.defineProperty(exports, "FlashAppPlugStatus", { enumerable: true, get: function () { return flash_app_1.FlashAppPlugStatus; } });
 var flash_app_type_1 = require("./flash/flash-app-type");
 Object.defineProperty(exports, "FlashAppType", { enumerable: true, get: function () { return flash_app_type_1.FlashAppType; } });
 exports.ASOConfigFetch = __importStar(require("./aso/usage-logs/aso-config-fetch-entry"));

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

@@ -1,12 +1,8 @@
-import { PlugType } from "index";
 export interface IUpsertFlashAppRequest {
     id: number;
     name: string;
     bundle: string;
-    plugUrl: string;
-    plugType: PlugType;
-    reservePlugUrl?: string;
-    reservePlugType?: PlugType;
+    plugContent?: string;
     onesignalAppId: string;
     onesignalRestApiKey: string;
     developerName: string;

package/lib/utils/keitaro-utils.js

@@ -33,6 +33,7 @@ const keitaro_service_1 = require("../network/keitaro/keitaro-service");
 const sleep_promise_1 = __importDefault(require("sleep-promise"));
 const fs = require("fs");
 const util = __importStar(require("util"));
+const axios_1 = __importDefault(require("axios"));
 const readFile = util.promisify(fs.readFile);
 const FLASH_REDIRECT_GROUP_ID = 82;
 exports.TRAFFIC_SOURCE_ID_FLASH_AI = 22;
@@ -379,12 +380,13 @@ let changeSourceForFA = async () => {
     }
 };
 let gatherInfoForFlashApps = async () => {
-    const pasteMap = JSON.parse(await readFile('./map-paste.json', 'utf8'));
-    const trackingMap = JSON.parse(await readFile('./map-tracking.json', 'utf8'));
-    const flashApps = JSON.parse(await readFile('./map-apps.json', 'utf8'));
+    console.log(__dirname);
+    const pasteMap = JSON.parse(await readFile('/Users/bprtsk/Documents/Work/ASO/AI Control Panel /AI Panel Core/src/utils/map-paste.json', 'utf8'));
+    const trackingMap = JSON.parse(await readFile('/Users/bprtsk/Documents/Work/ASO/AI Control Panel /AI Panel Core/src/utils/map-tracking.json', 'utf8'));
+    const flashApps = JSON.parse(await readFile('/Users/bprtsk/Documents/Work/ASO/AI Control Panel /AI Panel Core/src/utils/map-apps.json', 'utf8'));
     let allCampaigns = await keitaro_service_1.KeitaroService.getAllCampaigns();
-    let owCampaigns = allCampaigns.filter(c => new RegExp(`^FA #`).exec(c.name)).reduce((acc, obj) => ({ ...acc, [new RegExp(/#\((.*)\)/g).exec(obj.name)[1]]: obj }), {});
-    let redirectCampaigns = allCampaigns.filter(c => new RegExp(`^F #`).exec(c.name)).reduce((acc, obj) => ({ ...acc, [new RegExp(/#\((.*)\)/g).exec(obj.name)[1]]: obj }), {});
+    let owCampaigns = allCampaigns.filter(c => new RegExp(`^FA #`).exec(c.name)).reduce((acc, obj) => ({ ...acc, [new RegExp(/#(.*) \(/g).exec(obj.name)?.[1] || obj.name]: obj }), {});
+    let redirectCampaigns = allCampaigns.filter(c => new RegExp(`^F #`).exec(c.name)).reduce((acc, obj) => ({ ...acc, [new RegExp(/#(.*) \(/g).exec(obj.name)?.[1] || obj.name]: obj }), {});
     let result = [];
     for (let [id, paste] of Object.entries(pasteMap)) {
         console.log(`- #${id}`);
@@ -392,68 +394,79 @@ let gatherInfoForFlashApps = async () => {
         let redirect = redirectCampaigns[id];
         let tracking = trackingMap[id];
         let app = flashApps[id];
+        if (!app) {
+            console.log(`! No app for ${id}`);
+            continue;
+        }
         if (paste.status == flash_app_1.FlashAppPlugStatus.ENABLED) {
             if (!ow)
                 console.log(`#${id}: no OW`);
-            else if (!paste.content.includes(ow.domain))
-                console.log(`#${id}: OW domain (${ow.domain}) differs from paste domain (${paste.content})`);
-            else if (!paste.content.includes(ow.id.toString()))
-                console.log(`#${id}: OW campaign id (${ow.id}) differs from paste id (${paste.content})`);
             if (!redirect)
                 console.log(`No redirect for #${id}`);
             else if (!paste.content.includes(redirect.domain))
                 console.log(`#${id}: Redirect domain (${redirect.domain}) differs from paste domain (${paste.content})`);
-            else if (!paste.content.includes(redirect.id.toString()))
-                console.log(`#${id}: Redirect campaign id (${redirect.id}) differs from paste id (${paste.content})`);
+            else if (!paste.content.includes(redirect.alias))
+                console.log(`#${id}: Redirect campaign alias (${redirect.alias}) differs from paste id (${paste.content})`);
+        }
+        let appId;
+        for (let parameter of Object.values(redirect?.parameters || {})) {
+            if (parameter.name == "appId") {
+                appId = parameter.placeholder;
+            }
         }
-        let appId = ow?.parameters.sub_id_1.placeholder;
-        if (!appId)
+        if (!appId && ow)
             console.log(`No app id for #${id}`);
-        else if (appId != id)
+        else if (appId != id && ow)
             console.log(`Wrong app id (${appId}) for #${id}`);
-        let owDomain = ow?.domain;
+        let owDomain = ow?.domain?.split("/")[2];
         let owDomainId = ow?.domain_id;
         let owCampaignId = ow?.id;
         let owCampaignName = ow?.name;
-        let redirectDomain = redirect?.domain;
+        let redirectDomain = redirect?.domain?.split("/")[2];
         let redirectDomainId = redirect?.domain_id;
         let redirectCampaignId = redirect?.id;
         let redirectCampaignName = redirect?.name;
-        let clickIdParameterName = redirect?.parameters?.sub_id_8.name;
-        let offerIdParameterName = redirect?.parameters?.sub_id_15.name;
-        if (!clickIdParameterName)
+        let clickIdParameterName = ow?.parameters?.sub_id_8?.name;
+        let offerIdParameterName = ow?.parameters?.sub_id_15?.name;
+        if (!clickIdParameterName && app && ow)
             console.log(`No click id parameter for #${id}`);
-        if (!offerIdParameterName)
+        if (!offerIdParameterName && app && ow)
             console.log(`No offer id parameter for #${id}`);
         let trackingLink = tracking?.trackingUrl;
-        if (app) {
-            app.plugStatus = paste.status;
-            app.plugContent = paste.content;
-            app.plugType = flash_app_1.PlugType.PASTEBIN;
-            app.plugId = paste.paste_id;
-            app.plugAccountId = parseInt(paste.accountId);
-            app.keitaroData.redirectDomainName = redirectDomain || "none";
-            app.keitaroData.redirectDomainId = redirectDomainId || 0;
-            app.keitaroData.redirectCampaignId = redirectCampaignId || 0;
-            app.keitaroData.redirectCampaignName = redirectCampaignName || "none";
-            app.keitaroData.trackingDomainId = owDomainId || 0;
-            app.keitaroData.trackingDomainName = owDomain || "none";
-            app.keitaroData.trackingCampaignId = owCampaignId || 0;
-            app.keitaroData.trackingCampaignName = owCampaignName || "none";
-            if (clickIdParameterName)
-                app.keitaroData.clickIdParameterName = clickIdParameterName;
-            if (offerIdParameterName)
-                app.keitaroData.offerIdParameterName = offerIdParameterName;
-            if (trackingLink)
-                app.trackingUrl = trackingLink;
-            result.push(app);
+        app.plugStatus = paste.status;
+        app.plugContent = paste.content;
+        app.plugType = flash_app_1.PlugType.PASTEBIN;
+        app.plugId = paste.paste_id;
+        app.plugAccountId = parseInt(paste.accountId);
+        app.keitaroData.redirectDomainName = redirectDomain || "none";
+        app.keitaroData.redirectDomainId = redirectDomainId || 0;
+        app.keitaroData.redirectCampaignId = redirectCampaignId || 0;
+        app.keitaroData.redirectCampaignName = redirectCampaignName || "none";
+        app.keitaroData.trackingDomainId = owDomainId || 0;
+        app.keitaroData.trackingDomainName = owDomain || "none";
+        app.keitaroData.trackingCampaignId = owCampaignId || 0;
+        app.keitaroData.trackingCampaignName = owCampaignName || "none";
+        if (clickIdParameterName)
+            app.keitaroData.clickIdParameterName = clickIdParameterName;
+        if (offerIdParameterName)
+            app.keitaroData.offerIdParameterName = offerIdParameterName;
+        if (trackingLink)
+            app.trackingUrl = trackingLink;
+        if (!owCampaignName?.includes(app.bundle) && ow) {
+            console.log(`OW: bundle differs (${app.bundle} in DB and ${owCampaignName})`);
         }
-        else {
-            console.log(`! No app for ${id}`);
+        if (!redirectCampaignName?.includes(app.bundle) && redirect) {
+            console.log(`Redirect: bundle differs (${app.bundle} in DB and ${redirectCampaignName})`);
         }
+        result.push(app);
         console.log("--------------------");
     }
-    console.log(result);
+    await axios_1.default.post(`https://aipanel-secondary.com/flash/batch-update`, result, {
+        headers: {
+            "Authorization": "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6ImFkbWluIiwiaWF0IjoxNjg3Mjc2NjA0LCJleHAiOjE2ODc4ODE0MDR9.XesrnNGmWlK-yBBMs5TeKvTe07A8Sud7B4MyfZAOMag"
+        }
+    });
+    // console.log(result)
 };
 // removeBrokenDomain()
 // createFlashCampaigns(sampleApp)

package/package.json

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

package/src/index.ts

@@ -19,7 +19,7 @@ export { IOfferWallOffer } from "./aso/offerwall/offerwall-offer"
 export { IOfferWallResponse } from "./aso/offerwall/offerwall-response"
 export { IOfferWallHomeDialogData } from "./aso/offerwall/offerwall-home-dialog-data"
 
-export { IFlashApp, FlashAppSchema, updateSchemaAndMoveValue, PlugType  } from "./flash/flash-app"
+export { IFlashApp, FlashAppSchema, updateSchemaAndMoveValue, PlugType, FlashAppPlugStatus  } from "./flash/flash-app"
 export { IFlashAppListItem } from "./flash/flash-app-list-item"
 export { FlashAppType } from "./flash/flash-app-type"
 

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

@@ -4,10 +4,7 @@ export interface IUpsertFlashAppRequest {
     id: number
     name: string
     bundle: string
-    plugUrl: string
-    plugType: PlugType
-    reservePlugUrl?: string
-    reservePlugType?: PlugType
+    plugContent?: string,
 
     onesignalAppId: string
     onesignalRestApiKey: string

package/src/utils/keitaro-utils.ts

@@ -388,13 +388,14 @@ let changeSourceForFA = async () => {
 }
 
 let gatherInfoForFlashApps = async () => {
-    const pasteMap: PasteMap = JSON.parse(await readFile('./map-paste.json', 'utf8'));
-    const trackingMap: TrackingMap = JSON.parse(await readFile('./map-tracking.json', 'utf8'));
-    const flashApps: { [key: string]: IFlashApp | undefined } = JSON.parse(await readFile('./map-apps.json', 'utf8'));
+    console.log(__dirname)
+    const pasteMap: PasteMap = JSON.parse(await readFile('/Users/bprtsk/Documents/Work/ASO/AI Control Panel /AI Panel Core/src/utils/map-paste.json', 'utf8'));
+    const trackingMap: TrackingMap = JSON.parse(await readFile('/Users/bprtsk/Documents/Work/ASO/AI Control Panel /AI Panel Core/src/utils/map-tracking.json', 'utf8'));
+    const flashApps: { [key: string]: IFlashApp | undefined } = JSON.parse(await readFile('/Users/bprtsk/Documents/Work/ASO/AI Control Panel /AI Panel Core/src/utils/map-apps.json', 'utf8'));
 
     let allCampaigns = await KeitaroService.getAllCampaigns()
-    let owCampaigns = allCampaigns.filter(c => new RegExp(`^FA #`).exec(c.name)).reduce((acc, obj) => ({ ...acc, [new RegExp(/#\((.*)\)/g).exec(obj.name)![1]]: obj }), {});
-    let redirectCampaigns = allCampaigns.filter(c => new RegExp(`^F #`).exec(c.name)).reduce((acc, obj) => ({ ...acc, [new RegExp(/#\((.*)\)/g).exec(obj.name)![1]]: obj }), {});
+    let owCampaigns = allCampaigns.filter(c => new RegExp(`^FA #`).exec(c.name)).reduce((acc, obj) => ({ ...acc, [new RegExp(/#(.*) \(/g).exec(obj.name)?.[1] || obj.name]: obj }), {});
+    let redirectCampaigns = allCampaigns.filter(c => new RegExp(`^F #`).exec(c.name)).reduce((acc, obj) => ({ ...acc, [new RegExp(/#(.*) \(/g).exec(obj.name)?.[1] || obj.name]: obj }), {});
 
     let result = []
     for (let [id, paste] of Object.entries(pasteMap)) {
@@ -404,66 +405,84 @@ let gatherInfoForFlashApps = async () => {
         let tracking = trackingMap[id as keyof object]
         let app = flashApps[id as keyof object]
 
+        if (!app) {
+            console.log(`! No app for ${id}`)
+            continue
+        }
+
         if (paste.status == FlashAppPlugStatus.ENABLED) {
             if (!ow) console.log(`#${id}: no OW`)
-            else if (!paste.content.includes(ow.domain)) console.log(`#${id}: OW domain (${ow.domain}) differs from paste domain (${paste.content})`)
-            else if (!paste.content.includes(ow.id.toString())) console.log(`#${id}: OW campaign id (${ow.id}) differs from paste id (${paste.content})`)
 
             if (!redirect) console.log(`No redirect for #${id}`)
             else if (!paste.content.includes(redirect.domain)) console.log(`#${id}: Redirect domain (${redirect.domain}) differs from paste domain (${paste.content})`)
-            else if (!paste.content.includes(redirect.id.toString())) console.log(`#${id}: Redirect campaign id (${redirect.id}) differs from paste id (${paste.content})`)
+            else if (!paste.content.includes(redirect.alias)) console.log(`#${id}: Redirect campaign alias (${redirect.alias}) differs from paste id (${paste.content})`)
         }
 
-        let appId = ow?.parameters.sub_id_1.placeholder
-        if (!appId) console.log(`No app id for #${id}`)
-        else if (appId != id) console.log(`Wrong app id (${appId}) for #${id}`)
+        let appId
+        for (let parameter of Object.values(redirect?.parameters || {})) {
+            if (parameter.name == "appId") {
+                appId = parameter.placeholder
+            }
+        }
+        if (!appId && ow) console.log(`No app id for #${id}`)
+        else if (appId != id && ow) console.log(`Wrong app id (${appId}) for #${id}`)
 
-        let owDomain = ow?.domain
+        let owDomain = ow?.domain?.split("/")[2]
         let owDomainId = ow?.domain_id
         let owCampaignId = ow?.id
         let owCampaignName = ow?.name
-        let redirectDomain = redirect?.domain
+        let redirectDomain = redirect?.domain?.split("/")[2]
         let redirectDomainId = redirect?.domain_id
         let redirectCampaignId = redirect?.id
         let redirectCampaignName = redirect?.name
 
-        let clickIdParameterName = redirect?.parameters?.sub_id_8.name
-        let offerIdParameterName = redirect?.parameters?.sub_id_15.name
-        if (!clickIdParameterName) console.log(`No click id parameter for #${id}`)
-        if (!offerIdParameterName) console.log(`No offer id parameter for #${id}`)
+        let clickIdParameterName = ow?.parameters?.sub_id_8?.name
+        let offerIdParameterName = ow?.parameters?.sub_id_15?.name
+        if (!clickIdParameterName && app && ow) console.log(`No click id parameter for #${id}`)
+        if (!offerIdParameterName && app && ow) console.log(`No offer id parameter for #${id}`)
 
         let trackingLink = tracking?.trackingUrl
 
-        if (app) {
-            app.plugStatus = paste.status
-            app.plugContent = paste.content
-            app.plugType = PlugType.PASTEBIN
-            app.plugId = paste.paste_id
-            app.plugAccountId = parseInt(paste.accountId)
-
-            app.keitaroData.redirectDomainName = redirectDomain || "none"
-            app.keitaroData.redirectDomainId = redirectDomainId || 0
-            app.keitaroData.redirectCampaignId = redirectCampaignId || 0
-            app.keitaroData.redirectCampaignName = redirectCampaignName || "none"
-            app.keitaroData.trackingDomainId = owDomainId || 0
-            app.keitaroData.trackingDomainName = owDomain || "none"
-            app.keitaroData.trackingCampaignId = owCampaignId || 0
-            app.keitaroData.trackingCampaignName = owCampaignName || "none"
-
-            if (clickIdParameterName) app.keitaroData.clickIdParameterName = clickIdParameterName
-            if (offerIdParameterName) app.keitaroData.offerIdParameterName = offerIdParameterName
-
-            if (trackingLink) app.trackingUrl = trackingLink
-
-            result.push(app)
-        } else {
-            console.log(`! No app for ${id}`)
+        app.plugStatus = paste.status
+        app.plugContent = paste.content
+        app.plugType = PlugType.PASTEBIN
+        app.plugId = paste.paste_id
+        app.plugAccountId = parseInt(paste.accountId)
+
+        app.keitaroData.redirectDomainName = redirectDomain || "none"
+        app.keitaroData.redirectDomainId = redirectDomainId || 0
+        app.keitaroData.redirectCampaignId = redirectCampaignId || 0
+        app.keitaroData.redirectCampaignName = redirectCampaignName || "none"
+        app.keitaroData.trackingDomainId = owDomainId || 0
+        app.keitaroData.trackingDomainName = owDomain || "none"
+        app.keitaroData.trackingCampaignId = owCampaignId || 0
+        app.keitaroData.trackingCampaignName = owCampaignName || "none"
+
+        if (clickIdParameterName) app.keitaroData.clickIdParameterName = clickIdParameterName
+        if (offerIdParameterName) app.keitaroData.offerIdParameterName = offerIdParameterName
+
+        if (trackingLink) app.trackingUrl = trackingLink
+
+        if (!owCampaignName?.includes(app.bundle) && ow) {
+            console.log(`OW: bundle differs (${app.bundle} in DB and ${owCampaignName})`)
+        }
+
+        if (!redirectCampaignName?.includes(app.bundle) && redirect) {
+            console.log(`Redirect: bundle differs (${app.bundle} in DB and ${redirectCampaignName})`)
         }
 
+        result.push(app)
+
         console.log("--------------------")
     }
 
-    console.log(result)
+    await axios.post(`https://aipanel-secondary.com/flash/batch-update`, result, {
+        headers: {
+            "Authorization": "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6ImFkbWluIiwiaWF0IjoxNjg3Mjc2NjA0LCJleHAiOjE2ODc4ODE0MDR9.XesrnNGmWlK-yBBMs5TeKvTe07A8Sud7B4MyfZAOMag"
+        }
+    })
+
+    // console.log(result)
 }
 
 // removeBrokenDomain()