@bprotsyk/aso-core 2.1.50 → 2.1.52

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

@@ -193,14 +193,12 @@ async function upsertStreamToCampaign(campaign, stream) {
 exports.upsertStreamToCampaign = upsertStreamToCampaign;
 async function cloneOWCampaign(app) {
     try {
-        let name = `#${app.id} [◈]`;
+        let name = `#${app.id} [◈])`;
         let allCampaigns = await getAllCampaigns();
-        let matchingCampaign = allCampaigns.filter((c) => new RegExp(`#${app.id}.*◈`).test(c.name));
+        let matchingCampaign = allCampaigns.filter((c) => c.name.includes(`#${app.id}`));
         if (matchingCampaign.length > 0)
             return matchingCampaign[0];
-        const { data: campaigns } = await http_1.default.post(`/campaigns/2673/clone`, {
-            name: name,
-        });
+        const { data: campaigns } = await http_1.default.post(`/campaigns/2673/clone`);
         if (campaigns.length == 0)
             throw Error("Campaign cloning falied");
         let clonedCampaign = campaigns[0];
@@ -208,6 +206,10 @@ async function cloneOWCampaign(app) {
         if (!allDomains) {
             throw Error(`Failed to get all domains list`);
         }
+        console.log("clonedCampaign0", campaigns[0]);
+        console.log("clonedCampaign1", campaigns[1]);
+        const sourceCampaign = await getCampaignById(2673);
+        console.log("Campaign to clone:", sourceCampaign);
         const domain = allDomains[Math.floor(Math.random() * allDomains.length)];
         let payload = {
             name: name,
@@ -215,11 +217,7 @@ async function cloneOWCampaign(app) {
             domain_id: domain.id,
             parameters: (0, keitaro_utils_1.prepareOWCampaignParameters)(app)
         };
-        const { data: campaign } = await http_1.default.post(`/campaigns/2673/clone`, {}, {
-            headers: {
-                'Content-Type': 'application/json'
-            }
-        });
+        const { data: campaign } = await http_1.default.put(`/campaigns/${clonedCampaign.id}`, payload);
         return campaign;
     }
     catch (error) {

package/package.json

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

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

@@ -238,16 +238,15 @@ export async function upsertStreamToCampaign(campaign: IKeitaroCampaign, stream:
 }
 
 async function cloneOWCampaign(app: IApp): Promise<IKeitaroCampaign> {
-   try{
-    let name = `#${app.id} [◈]`
+try{
+    let name = `#${app.id} [◈])`
 
     let allCampaigns = await getAllCampaigns()
-    let matchingCampaign = allCampaigns.filter((c) => new RegExp(`#${app.id}.*◈`).test(c.name))
+    let matchingCampaign = allCampaigns.filter((c) => c.name.includes(`#${app.id}`))
     if (matchingCampaign.length > 0) return matchingCampaign[0]
 
-    const { data: campaigns } = await keitaroApi.post(`/campaigns/2673/clone`, {
-        name: name,
-    });
+    const { data: campaigns } = await keitaroApi.post(`/campaigns/2673/clone`);
+
 
     if (campaigns.length == 0) throw Error("Campaign cloning falied")
 
@@ -257,6 +256,13 @@ async function cloneOWCampaign(app: IApp): Promise<IKeitaroCampaign> {
     if (!allDomains) {
         throw Error(`Failed to get all domains list`)
     }
+    console.log("clonedCampaign0", campaigns[0])
+    console.log("clonedCampaign1", campaigns[1])
+    
+    const sourceCampaign = await getCampaignById(2673)
+    console.log("Campaign to clone:", sourceCampaign)
+
+
 
     const domain = allDomains[Math.floor(Math.random() * allDomains.length)];
 
@@ -267,13 +273,12 @@ async function cloneOWCampaign(app: IApp): Promise<IKeitaroCampaign> {
         parameters: prepareOWCampaignParameters(app)
     }
 
-    const { data: campaign } = await keitaroApi.post(`/campaigns/2673/clone`, {}, {
-        headers: {
-            'Content-Type': 'application/json'
-        }
-    });
+    const { data: campaign } = await keitaroApi.put(`/campaigns/${clonedCampaign.id}`, payload)
+
     return campaign
-   } catch (error: any) {
+}
+
+    catch (error: any) {
     console.error('Campaign creation failed. Details:', {
         errorStatus: error.response?.status,
         errorData: error.response?.data,