@bprotsyk/aso-core 2.1.45 → 2.1.47

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

@@ -193,27 +193,33 @@ async function upsertStreamToCampaign(campaign, stream) {
 exports.upsertStreamToCampaign = upsertStreamToCampaign;
 async function cloneOWCampaign(app) {
     let name = `#${app.id} [◈]`;
+    // Спочатку перевіряємо існуючі кампанії
     let allCampaigns = await getAllCampaigns();
     let matchingCampaign = allCampaigns.filter((c) => new RegExp(`#${app.id}.*◈`).test(c.name));
     if (matchingCampaign.length > 0)
         return matchingCampaign[0];
-    const { data: campaigns } = await http_1.default.post(`/campaigns/2673/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`);
+    if (!allDomains || allDomains.length === 0) {
+        throw Error(`Failed to get active domains`);
     }
     const domain = allDomains[Math.floor(Math.random() * allDomains.length)];
-    let payload = {
+    // Створюємо базові параметри для нової кампанії
+    let campaignPayload = {
         name: name,
         traffic_source_id: keitaro_utils_1.TRAFFIC_SOURCE_ID_FLASH_AI,
         domain_id: domain.id,
         parameters: (0, keitaro_utils_1.prepareOWCampaignParameters)(app)
     };
-    const { data: campaign } = await http_1.default.put(`/campaigns/${clonedCampaign.id}`, payload);
-    return campaign;
+    // Спробуємо створити нову кампанію замість клонування
+    try {
+        const campaign = await createCampaign(campaignPayload);
+        return campaign;
+    }
+    catch (error) {
+        console.error('Failed to create campaign:', error);
+        throw new Error(`Failed to create campaign: ${error.message}`);
+    }
 }
 async function cloneDCampaign(app) {
     let name = `D #${app.id} (${app.bundle})`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bprotsyk/aso-core",
-  "version": "2.1.45",
+  "version": "2.1.47",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
@@ -42,7 +42,7 @@
   "devDependencies": {
     "@types/mustache": "^4.2.5",
     "@types/node": "^20.14.12",
-    "@types/react": "^18.3.12",
+    "@types/react": "^18.3.18",
     "@types/react-dom": "^18.3.0",
     "copyfiles": "^2.4.1",
     "typedoc": "^0.23.28",

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

@@ -240,33 +240,34 @@ export async function upsertStreamToCampaign(campaign: IKeitaroCampaign, stream:
 async function cloneOWCampaign(app: IApp): Promise<IKeitaroCampaign> {
     let name = `#${app.id} [◈]`
 
+    // Спочатку перевіряємо існуючі кампанії
     let allCampaigns = await getAllCampaigns()
     let matchingCampaign = allCampaigns.filter((c) => new RegExp(`#${app.id}.*◈`).test(c.name))
     if (matchingCampaign.length > 0) return matchingCampaign[0]
 
-    const { data: campaigns } = await keitaroApi.post(`/campaigns/2673/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`)
+    if (!allDomains || allDomains.length === 0) {
+        throw Error(`Failed to get active domains`)
     }
-
     const domain = allDomains[Math.floor(Math.random() * allDomains.length)];
 
-    let payload: Partial<IKeitaroCampaign> = {
+    // Створюємо базові параметри для нової кампанії
+    let campaignPayload: Partial<IKeitaroCampaign> = {
         name: name,
         traffic_source_id: TRAFFIC_SOURCE_ID_FLASH_AI,
         domain_id: domain.id,
         parameters: prepareOWCampaignParameters(app)
     }
 
-    const { data: campaign } = await keitaroApi.put(`/campaigns/${clonedCampaign.id}`, payload)
-
-    return campaign
+    // Спробуємо створити нову кампанію замість клонування
+    try {
+        const campaign = await createCampaign(campaignPayload)
+        return campaign
+    } catch (error: any) {
+        console.error('Failed to create campaign:', error)
+        throw new Error(`Failed to create campaign: ${error.message}`)
+    }
 }
 
 async function cloneDCampaign(app: IApp): Promise<IKeitaroCampaign> {