npm - @bprotsyk/aso-core - Versions diffs - 2.1.54 → 2.1.55 - Mend

@bprotsyk/aso-core 2.1.54 → 2.1.55

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

package/lib/app/app.d.ts +98 -15
package/lib/app/app.js +24 -1
package/lib/general/domain.d.ts +82 -23
package/lib/general/namecheap-domain.d.ts +56 -9
package/lib/network/keitaro/keitaro-service.d.ts +2 -2
package/lib/network/keitaro/keitaro-service.js +12 -3
package/lib/offers/list.d.ts +400 -2
package/lib/offers/offer.d.ts +79 -18
package/lib/offers/section.d.ts +14 -1
package/lib/panel/user.d.ts +16 -3
package/package.json +2 -2
package/src/app/app.ts +24 -0
package/src/network/keitaro/keitaro-service.ts +20 -4
package/test-keitaro.js +1 -1

package/lib/app/app.d.ts CHANGED Viewed

@@ -49,6 +49,7 @@ export declare enum EPlatform {
     TELEGRAM = "tg",
     AMAZON = "am"
 }
+export declare const getPlatformName: (platform: EPlatform | undefined) => string | false;
 export interface IPlatformParams {
     enabled: boolean;
     geo: string[];
@@ -166,7 +167,7 @@ export declare enum PlugType {
     GIST = "GIST",
     OTHER = "OTHER"
 }
-export declare const AppSchema: mongoose.Schema<any, mongoose.Model<any, any, any, any, any>, {}, {}, {}, {}, mongoose.DefaultSchemaOptions, {
+export declare const AppSchema: mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, mongoose.DefaultSchemaOptions, {
     id: number;
     type: string;
     geo: string[];
@@ -177,32 +178,114 @@ export declare const AppSchema: mongoose.Schema<any, mongoose.Model<any, any, an
     trackingUrl: string;
     integrationVersion: string;
     geos: string;
-    name?: string | undefined;
-    pushesEnabled?: boolean | undefined;
+    name?: string | null | undefined;
+    pushesEnabled?: boolean | null | undefined;
     removeDataParams?: any;
     privacyPolicyParams?: any;
     offersStubParams?: any;
     bannerParams?: any;
     directParams?: any;
     platforms?: any;
-    onesignalAppId?: string | undefined;
-    onesignalRestApiKey?: string | undefined;
-    appmetricaApiKey?: string | undefined;
-    appmetricaAppId?: number | undefined;
+    onesignalAppId?: string | null | undefined;
+    onesignalRestApiKey?: string | null | undefined;
+    appmetricaApiKey?: string | null | undefined;
+    appmetricaAppId?: number | null | undefined;
     externalParams?: {
-        schema?: string | undefined;
-        showButton?: boolean | undefined;
-        autoRedirect?: boolean | undefined;
-    } | undefined;
+        schema?: string | null | undefined;
+        showButton?: boolean | null | undefined;
+        autoRedirect?: boolean | null | undefined;
+    } | null | undefined;
     keitaroData?: {
         trackingCampaignId: number;
         trackingCampaignName: string;
         trackingCampaignAlias: string;
         trackingDomainId: number;
         trackingDomainName: string;
-    } | undefined;
+    } | null | undefined;
     domainParams?: {
-        name?: string | undefined;
-        clouflareZone?: string | undefined;
-    } | undefined;
+        name?: string | null | undefined;
+        clouflareZone?: string | null | undefined;
+    } | null | undefined;
+}, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
+    id: number;
+    type: string;
+    geo: string[];
+    enabled: boolean;
+    proxied: boolean;
+    imageFormat: string;
+    bundle: string;
+    trackingUrl: string;
+    integrationVersion: string;
+    geos: string;
+    name?: string | null | undefined;
+    pushesEnabled?: boolean | null | undefined;
+    removeDataParams?: any;
+    privacyPolicyParams?: any;
+    offersStubParams?: any;
+    bannerParams?: any;
+    directParams?: any;
+    platforms?: any;
+    onesignalAppId?: string | null | undefined;
+    onesignalRestApiKey?: string | null | undefined;
+    appmetricaApiKey?: string | null | undefined;
+    appmetricaAppId?: number | null | undefined;
+    externalParams?: {
+        schema?: string | null | undefined;
+        showButton?: boolean | null | undefined;
+        autoRedirect?: boolean | null | undefined;
+    } | null | undefined;
+    keitaroData?: {
+        trackingCampaignId: number;
+        trackingCampaignName: string;
+        trackingCampaignAlias: string;
+        trackingDomainId: number;
+        trackingDomainName: string;
+    } | null | undefined;
+    domainParams?: {
+        name?: string | null | undefined;
+        clouflareZone?: string | null | undefined;
+    } | null | undefined;
+}>> & mongoose.FlatRecord<{
+    id: number;
+    type: string;
+    geo: string[];
+    enabled: boolean;
+    proxied: boolean;
+    imageFormat: string;
+    bundle: string;
+    trackingUrl: string;
+    integrationVersion: string;
+    geos: string;
+    name?: string | null | undefined;
+    pushesEnabled?: boolean | null | undefined;
+    removeDataParams?: any;
+    privacyPolicyParams?: any;
+    offersStubParams?: any;
+    bannerParams?: any;
+    directParams?: any;
+    platforms?: any;
+    onesignalAppId?: string | null | undefined;
+    onesignalRestApiKey?: string | null | undefined;
+    appmetricaApiKey?: string | null | undefined;
+    appmetricaAppId?: number | null | undefined;
+    externalParams?: {
+        schema?: string | null | undefined;
+        showButton?: boolean | null | undefined;
+        autoRedirect?: boolean | null | undefined;
+    } | null | undefined;
+    keitaroData?: {
+        trackingCampaignId: number;
+        trackingCampaignName: string;
+        trackingCampaignAlias: string;
+        trackingDomainId: number;
+        trackingDomainName: string;
+    } | null | undefined;
+    domainParams?: {
+        name?: string | null | undefined;
+        clouflareZone?: string | null | undefined;
+    } | null | undefined;
+}> & {
+    _id: mongoose.Types.ObjectId;
+} & {
+    __v: number;
 }>;

package/lib/app/app.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AppSchema = exports.PlugType = exports.IntegrationVersion = exports.EPlatform = exports.EImageFormat = void 0;
+exports.AppSchema = exports.PlugType = exports.IntegrationVersion = exports.getPlatformName = exports.EPlatform = exports.EImageFormat = void 0;
 const app_type_1 = require("./app-type");
 const mongoose_1 = require("mongoose");
 const util = require("util");
@@ -21,6 +21,29 @@ var EPlatform;
     EPlatform["TELEGRAM"] = "tg";
     EPlatform["AMAZON"] = "am";
 })(EPlatform = exports.EPlatform || (exports.EPlatform = {}));
+const getPlatformName = (platform) => {
+    switch (platform) {
+        case EPlatform.SAMSUNG:
+            return "samsung";
+        case EPlatform.HUAWEI:
+            return "huawei";
+        case EPlatform.ruSTORE:
+            return "ruStore";
+        case EPlatform.XIAOMI:
+            return "xiaomi";
+        case EPlatform.APKPURE:
+            return "apkpure";
+        case EPlatform.TELEGRAM:
+            return "telegram";
+        case EPlatform.AMAZON:
+            return "amazon";
+        case EPlatform.GENERAL:
+            return false;
+        default:
+            return false;
+    }
+};
+exports.getPlatformName = getPlatformName;
 var IntegrationVersion;
 (function (IntegrationVersion) {
     IntegrationVersion["NONE"] = "MVVM";

package/lib/general/domain.d.ts CHANGED Viewed

@@ -22,6 +22,7 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
+/// <reference types="mongoose/types/inferrawdoctype" />
 import { ICloudflareDomainType } from "general/cloudflare-domain";
 import { Document, Model, Schema } from "mongoose";
 export interface IDomain extends Document {
@@ -80,31 +81,89 @@ export declare enum DomainTarget {
     UNKNOWN = "unknown"
 }
 export declare let getDomainTargetByIp: (ip: string) => DomainTarget;
-export declare const DomainSchema: Schema<any, Model<any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
+export declare const DomainSchema: Schema<any, Model<any, any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
     nameServers: string[];
     originalNameServers: string[];
     txtRecords: string[];
     assignedTo: number[];
-    id?: string | undefined;
-    name?: string | undefined;
-    type?: string | undefined;
-    caption?: string | undefined;
-    title?: string | undefined;
-    proxied?: boolean | undefined;
-    ip?: string | undefined;
-    namecheapId?: string | undefined;
-    status?: string | undefined;
-    isUpdating?: boolean | undefined;
-    cloudflareStatus?: string | undefined;
-    paused?: boolean | undefined;
-    originalRegistrar?: string | undefined;
-    originalDNSHost?: string | undefined;
-    createdAt?: number | undefined;
-    expiresAt?: number | undefined;
-    subdomain?: string | undefined;
-    mxRecord?: string | undefined;
-    target?: string | undefined;
-    archived?: boolean | undefined;
-    note?: string | undefined;
-    appid?: number | undefined;
+    id?: string | null | undefined;
+    name?: string | null | undefined;
+    type?: string | null | undefined;
+    caption?: string | null | undefined;
+    title?: string | null | undefined;
+    proxied?: boolean | null | undefined;
+    ip?: string | null | undefined;
+    namecheapId?: string | null | undefined;
+    status?: string | null | undefined;
+    isUpdating?: boolean | null | undefined;
+    cloudflareStatus?: string | null | undefined;
+    paused?: boolean | null | undefined;
+    originalRegistrar?: string | null | undefined;
+    originalDNSHost?: string | null | undefined;
+    createdAt?: number | null | undefined;
+    expiresAt?: number | null | undefined;
+    subdomain?: string | null | undefined;
+    mxRecord?: string | null | undefined;
+    target?: string | null | undefined;
+    archived?: boolean | null | undefined;
+    note?: string | null | undefined;
+    appid?: number | null | undefined;
+}, Document<unknown, {}, import("mongoose").FlatRecord<{
+    nameServers: string[];
+    originalNameServers: string[];
+    txtRecords: string[];
+    assignedTo: number[];
+    id?: string | null | undefined;
+    name?: string | null | undefined;
+    type?: string | null | undefined;
+    caption?: string | null | undefined;
+    title?: string | null | undefined;
+    proxied?: boolean | null | undefined;
+    ip?: string | null | undefined;
+    namecheapId?: string | null | undefined;
+    status?: string | null | undefined;
+    isUpdating?: boolean | null | undefined;
+    cloudflareStatus?: string | null | undefined;
+    paused?: boolean | null | undefined;
+    originalRegistrar?: string | null | undefined;
+    originalDNSHost?: string | null | undefined;
+    createdAt?: number | null | undefined;
+    expiresAt?: number | null | undefined;
+    subdomain?: string | null | undefined;
+    mxRecord?: string | null | undefined;
+    target?: string | null | undefined;
+    archived?: boolean | null | undefined;
+    note?: string | null | undefined;
+    appid?: number | null | undefined;
+}>> & import("mongoose").FlatRecord<{
+    nameServers: string[];
+    originalNameServers: string[];
+    txtRecords: string[];
+    assignedTo: number[];
+    id?: string | null | undefined;
+    name?: string | null | undefined;
+    type?: string | null | undefined;
+    caption?: string | null | undefined;
+    title?: string | null | undefined;
+    proxied?: boolean | null | undefined;
+    ip?: string | null | undefined;
+    namecheapId?: string | null | undefined;
+    status?: string | null | undefined;
+    isUpdating?: boolean | null | undefined;
+    cloudflareStatus?: string | null | undefined;
+    paused?: boolean | null | undefined;
+    originalRegistrar?: string | null | undefined;
+    originalDNSHost?: string | null | undefined;
+    createdAt?: number | null | undefined;
+    expiresAt?: number | null | undefined;
+    subdomain?: string | null | undefined;
+    mxRecord?: string | null | undefined;
+    target?: string | null | undefined;
+    archived?: boolean | null | undefined;
+    note?: string | null | undefined;
+    appid?: number | null | undefined;
+}> & {
+    _id: import("mongoose").Types.ObjectId;
+} & {
+    __v: number;
 }>;

package/lib/general/namecheap-domain.d.ts CHANGED Viewed

@@ -22,6 +22,7 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
+/// <reference types="mongoose/types/inferrawdoctype" />
 import { Schema, Document } from "mongoose";
 export interface INamecheapDomain {
     ID: string;
@@ -73,13 +74,59 @@ export interface INamecheapBuyResult {
     };
     paidTotal: number;
 }
-export declare const NamecheapBuyRequestSchema: Schema<any, import("mongoose").Model<any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
-    domains: {
-        name?: string | undefined;
-        price?: number | undefined;
-        available?: boolean | undefined;
-    }[];
-    id?: string | undefined;
-    ip?: string | undefined;
-    fullfilled?: boolean | undefined;
+export declare const NamecheapBuyRequestSchema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
+    domains: import("mongoose").Types.DocumentArray<{
+        name?: string | null | undefined;
+        price?: number | null | undefined;
+        available?: boolean | null | undefined;
+    }, import("mongoose").Types.Subdocument<import("mongoose").Types.ObjectId, any, {
+        name?: string | null | undefined;
+        price?: number | null | undefined;
+        available?: boolean | null | undefined;
+    }> & {
+        name?: string | null | undefined;
+        price?: number | null | undefined;
+        available?: boolean | null | undefined;
+    }>;
+    id?: string | null | undefined;
+    ip?: string | null | undefined;
+    fullfilled?: boolean | null | undefined;
+}, Document<unknown, {}, import("mongoose").FlatRecord<{
+    domains: import("mongoose").Types.DocumentArray<{
+        name?: string | null | undefined;
+        price?: number | null | undefined;
+        available?: boolean | null | undefined;
+    }, import("mongoose").Types.Subdocument<import("mongoose").Types.ObjectId, any, {
+        name?: string | null | undefined;
+        price?: number | null | undefined;
+        available?: boolean | null | undefined;
+    }> & {
+        name?: string | null | undefined;
+        price?: number | null | undefined;
+        available?: boolean | null | undefined;
+    }>;
+    id?: string | null | undefined;
+    ip?: string | null | undefined;
+    fullfilled?: boolean | null | undefined;
+}>> & import("mongoose").FlatRecord<{
+    domains: import("mongoose").Types.DocumentArray<{
+        name?: string | null | undefined;
+        price?: number | null | undefined;
+        available?: boolean | null | undefined;
+    }, import("mongoose").Types.Subdocument<import("mongoose").Types.ObjectId, any, {
+        name?: string | null | undefined;
+        price?: number | null | undefined;
+        available?: boolean | null | undefined;
+    }> & {
+        name?: string | null | undefined;
+        price?: number | null | undefined;
+        available?: boolean | null | undefined;
+    }>;
+    id?: string | null | undefined;
+    ip?: string | null | undefined;
+    fullfilled?: boolean | null | undefined;
+}> & {
+    _id: import("mongoose").Types.ObjectId;
+} & {
+    __v: number;
 }>;

package/lib/network/keitaro/keitaro-service.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import { IKeitaroStream } from "../../keitaro/keitaro-stream";
 import { IOffer } from "../../offers/offer";
 import { IKeitaroCampaign } from "../../keitaro/keitaro-campaign";
 import { IKeitaroDomain } from "../../keitaro/keitaro-domain";
-import { IApp } from "../../app/app";
+import { EPlatform, IApp } from "../../app/app";
 import { IKeitaroOffer } from "index";
 import { IKeitaroClicksRequest, KeitaroClicksInterval } from "../../keitaro/keitaro-clicks";
 export interface IKeitaroOffersFilter {
@@ -22,7 +22,7 @@ declare function addOffersToKeitaro(offers: IOffer[], affiliateId: number, links
 declare function createCampaign(campaignData: Partial<IKeitaroCampaign>): Promise<IKeitaroCampaign>;
 declare function getCampaignById(id: number): Promise<IKeitaroCampaign>;
 export declare function upsertStreamToCampaign(campaign: IKeitaroCampaign, stream: Partial<IKeitaroStream>): Promise<void>;
-declare function cloneOWCampaign(app: IApp): Promise<IKeitaroCampaign | any>;
+declare function cloneOWCampaign(app: IApp, platform?: EPlatform): Promise<IKeitaroCampaign | any>;
 declare function cloneDCampaign(app: IApp): Promise<IKeitaroCampaign>;
 declare function changeCampaignsGroup(fromId: number, toId: number, exceptForCampaignIds: number[], onlyForCampaignIds?: number[]): Promise<void>;
 declare function getDomains(onlyActive?: boolean): Promise<IKeitaroDomain[]>;

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

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KeitaroService = exports.upsertStreamToCampaign = void 0;
 const http_1 = __importDefault(require("./http"));
+const app_1 = require("../../app/app");
 const keitaro_utils_1 = require("../../utils/keitaro-utils");
 const general_1 = require("../../utils/general");
 async function getStreamsByCampaignId(campaignId) {
@@ -191,14 +192,22 @@ async function upsertStreamToCampaign(campaign, stream) {
     }
 }
 exports.upsertStreamToCampaign = upsertStreamToCampaign;
-async function cloneOWCampaign(app) {
+async function cloneOWCampaign(app, platform) {
     let name = `#${app.id} [◈]`;
+    let platformName = platform ? (0, app_1.getPlatformName)(platform) : null;
+    const platformCampaignName = `#${app.id} [◈] (${platformName})`;
     const generateAlias = () => {
         const chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
         return Array.from({ length: 8 }, () => chars.charAt(Math.floor(Math.random() * chars.length))).join('');
     };
     let allCampaigns = await getAllCampaigns();
-    let matchingCampaign = allCampaigns.filter((c) => new RegExp(`#${app.id}.*◈`).test(c.name));
+    let matchingCampaign = [];
+    if (platform) {
+        matchingCampaign = allCampaigns.filter((c) => c.name === `#${app.id} [◈] (${platformName})`);
+    }
+    else {
+        matchingCampaign = allCampaigns.filter((c) => c.name === `#${app.id} [◈]`);
+    }
     if (matchingCampaign.length > 0)
         return matchingCampaign[0];
     const originalCampaign = await getCampaignById(2673);
@@ -213,7 +222,7 @@ async function cloneOWCampaign(app) {
     let alias = generateAlias();
     let payload = {
         // Унікальні поля
-        name: name,
+        name: platformName ? platformCampaignName : name,
         alias: alias,
         domain_id: domain.id,
         position: [maxPosition + 100],

package/lib/offers/list.d.ts CHANGED Viewed

@@ -22,6 +22,7 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
+/// <reference types="mongoose/types/inferrawdoctype" />
 import { Schema } from "mongoose";
 export interface ISectionsList {
     id: number;
@@ -37,7 +38,404 @@ export interface IAppOffersSection {
         [key: string]: IOfferState[];
     };
 }
-export declare const SectionsListSchema: Schema<any, import("mongoose").Model<any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
+export declare const SectionsListSchema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
     id: number;
-    content: any[];
+    content: import("mongoose").Types.DocumentArray<{
+        prototype?: {
+            constructor: {
+                name?: unknown;
+                [Symbol.hasInstance]?: {} | null | undefined;
+                prototype?: unknown;
+                length?: unknown;
+                caller?: any | null | undefined;
+                arguments?: unknown;
+                toString: {} | null;
+                apply?: {} | null | undefined;
+                call?: {} | null | undefined;
+                bind?: {} | null | undefined;
+            } | null;
+            toString: {} | null;
+            toLocaleString: {} | null;
+            valueOf: {} | null;
+            hasOwnProperty: {} | null;
+            isPrototypeOf: {} | null;
+            propertyIsEnumerable: {} | null;
+        } | null | undefined;
+        getPrototypeOf?: {} | null | undefined;
+        getOwnPropertyDescriptor?: {} | null | undefined;
+        getOwnPropertyNames?: {} | null | undefined;
+        create?: {} | null | undefined;
+        defineProperty?: {} | null | undefined;
+        defineProperties?: {} | null | undefined;
+        seal?: {} | null | undefined;
+        freeze?: {} | null | undefined;
+        preventExtensions?: {} | null | undefined;
+        isSealed?: {} | null | undefined;
+        isFrozen?: {} | null | undefined;
+        isExtensible?: {} | null | undefined;
+        keys?: {} | null | undefined;
+        assign?: {} | null | undefined;
+        getOwnPropertySymbols?: {} | null | undefined;
+        is?: {} | null | undefined;
+        setPrototypeOf?: {} | null | undefined;
+        values?: {} | null | undefined;
+        entries?: {} | null | undefined;
+        getOwnPropertyDescriptors?: {} | null | undefined;
+        fromEntries?: {} | null | undefined;
+        hasOwn?: {} | null | undefined;
+    }, import("mongoose").Types.Subdocument<import("mongoose").Types.ObjectId, any, {
+        prototype?: {
+            constructor: {
+                name?: unknown;
+                [Symbol.hasInstance]?: {} | null | undefined;
+                prototype?: unknown;
+                length?: unknown;
+                caller?: any | null | undefined;
+                arguments?: unknown;
+                toString: {} | null;
+                apply?: {} | null | undefined;
+                call?: {} | null | undefined;
+                bind?: {} | null | undefined;
+            } | null;
+            toString: {} | null;
+            toLocaleString: {} | null;
+            valueOf: {} | null;
+            hasOwnProperty: {} | null;
+            isPrototypeOf: {} | null;
+            propertyIsEnumerable: {} | null;
+        } | null | undefined;
+        getPrototypeOf?: {} | null | undefined;
+        getOwnPropertyDescriptor?: {} | null | undefined;
+        getOwnPropertyNames?: {} | null | undefined;
+        create?: {} | null | undefined;
+        defineProperty?: {} | null | undefined;
+        defineProperties?: {} | null | undefined;
+        seal?: {} | null | undefined;
+        freeze?: {} | null | undefined;
+        preventExtensions?: {} | null | undefined;
+        isSealed?: {} | null | undefined;
+        isFrozen?: {} | null | undefined;
+        isExtensible?: {} | null | undefined;
+        keys?: {} | null | undefined;
+        assign?: {} | null | undefined;
+        getOwnPropertySymbols?: {} | null | undefined;
+        is?: {} | null | undefined;
+        setPrototypeOf?: {} | null | undefined;
+        values?: {} | null | undefined;
+        entries?: {} | null | undefined;
+        getOwnPropertyDescriptors?: {} | null | undefined;
+        fromEntries?: {} | null | undefined;
+        hasOwn?: {} | null | undefined;
+    }> & {
+        prototype?: {
+            constructor: {
+                name?: unknown;
+                [Symbol.hasInstance]?: {} | null | undefined;
+                prototype?: unknown;
+                length?: unknown;
+                caller?: any | null | undefined;
+                arguments?: unknown;
+                toString: {} | null;
+                apply?: {} | null | undefined;
+                call?: {} | null | undefined;
+                bind?: {} | null | undefined;
+            } | null;
+            toString: {} | null;
+            toLocaleString: {} | null;
+            valueOf: {} | null;
+            hasOwnProperty: {} | null;
+            isPrototypeOf: {} | null;
+            propertyIsEnumerable: {} | null;
+        } | null | undefined;
+        getPrototypeOf?: {} | null | undefined;
+        getOwnPropertyDescriptor?: {} | null | undefined;
+        getOwnPropertyNames?: {} | null | undefined;
+        create?: {} | null | undefined;
+        defineProperty?: {} | null | undefined;
+        defineProperties?: {} | null | undefined;
+        seal?: {} | null | undefined;
+        freeze?: {} | null | undefined;
+        preventExtensions?: {} | null | undefined;
+        isSealed?: {} | null | undefined;
+        isFrozen?: {} | null | undefined;
+        isExtensible?: {} | null | undefined;
+        keys?: {} | null | undefined;
+        assign?: {} | null | undefined;
+        getOwnPropertySymbols?: {} | null | undefined;
+        is?: {} | null | undefined;
+        setPrototypeOf?: {} | null | undefined;
+        values?: {} | null | undefined;
+        entries?: {} | null | undefined;
+        getOwnPropertyDescriptors?: {} | null | undefined;
+        fromEntries?: {} | null | undefined;
+        hasOwn?: {} | null | undefined;
+    }>;
+}, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
+    id: number;
+    content: import("mongoose").Types.DocumentArray<{
+        prototype?: {
+            constructor: {
+                name?: unknown;
+                [Symbol.hasInstance]?: {} | null | undefined;
+                prototype?: unknown;
+                length?: unknown;
+                caller?: any | null | undefined;
+                arguments?: unknown;
+                toString: {} | null;
+                apply?: {} | null | undefined;
+                call?: {} | null | undefined;
+                bind?: {} | null | undefined;
+            } | null;
+            toString: {} | null;
+            toLocaleString: {} | null;
+            valueOf: {} | null;
+            hasOwnProperty: {} | null;
+            isPrototypeOf: {} | null;
+            propertyIsEnumerable: {} | null;
+        } | null | undefined;
+        getPrototypeOf?: {} | null | undefined;
+        getOwnPropertyDescriptor?: {} | null | undefined;
+        getOwnPropertyNames?: {} | null | undefined;
+        create?: {} | null | undefined;
+        defineProperty?: {} | null | undefined;
+        defineProperties?: {} | null | undefined;
+        seal?: {} | null | undefined;
+        freeze?: {} | null | undefined;
+        preventExtensions?: {} | null | undefined;
+        isSealed?: {} | null | undefined;
+        isFrozen?: {} | null | undefined;
+        isExtensible?: {} | null | undefined;
+        keys?: {} | null | undefined;
+        assign?: {} | null | undefined;
+        getOwnPropertySymbols?: {} | null | undefined;
+        is?: {} | null | undefined;
+        setPrototypeOf?: {} | null | undefined;
+        values?: {} | null | undefined;
+        entries?: {} | null | undefined;
+        getOwnPropertyDescriptors?: {} | null | undefined;
+        fromEntries?: {} | null | undefined;
+        hasOwn?: {} | null | undefined;
+    }, import("mongoose").Types.Subdocument<import("mongoose").Types.ObjectId, any, {
+        prototype?: {
+            constructor: {
+                name?: unknown;
+                [Symbol.hasInstance]?: {} | null | undefined;
+                prototype?: unknown;
+                length?: unknown;
+                caller?: any | null | undefined;
+                arguments?: unknown;
+                toString: {} | null;
+                apply?: {} | null | undefined;
+                call?: {} | null | undefined;
+                bind?: {} | null | undefined;
+            } | null;
+            toString: {} | null;
+            toLocaleString: {} | null;
+            valueOf: {} | null;
+            hasOwnProperty: {} | null;
+            isPrototypeOf: {} | null;
+            propertyIsEnumerable: {} | null;
+        } | null | undefined;
+        getPrototypeOf?: {} | null | undefined;
+        getOwnPropertyDescriptor?: {} | null | undefined;
+        getOwnPropertyNames?: {} | null | undefined;
+        create?: {} | null | undefined;
+        defineProperty?: {} | null | undefined;
+        defineProperties?: {} | null | undefined;
+        seal?: {} | null | undefined;
+        freeze?: {} | null | undefined;
+        preventExtensions?: {} | null | undefined;
+        isSealed?: {} | null | undefined;
+        isFrozen?: {} | null | undefined;
+        isExtensible?: {} | null | undefined;
+        keys?: {} | null | undefined;
+        assign?: {} | null | undefined;
+        getOwnPropertySymbols?: {} | null | undefined;
+        is?: {} | null | undefined;
+        setPrototypeOf?: {} | null | undefined;
+        values?: {} | null | undefined;
+        entries?: {} | null | undefined;
+        getOwnPropertyDescriptors?: {} | null | undefined;
+        fromEntries?: {} | null | undefined;
+        hasOwn?: {} | null | undefined;
+    }> & {
+        prototype?: {
+            constructor: {
+                name?: unknown;
+                [Symbol.hasInstance]?: {} | null | undefined;
+                prototype?: unknown;
+                length?: unknown;
+                caller?: any | null | undefined;
+                arguments?: unknown;
+                toString: {} | null;
+                apply?: {} | null | undefined;
+                call?: {} | null | undefined;
+                bind?: {} | null | undefined;
+            } | null;
+            toString: {} | null;
+            toLocaleString: {} | null;
+            valueOf: {} | null;
+            hasOwnProperty: {} | null;
+            isPrototypeOf: {} | null;
+            propertyIsEnumerable: {} | null;
+        } | null | undefined;
+        getPrototypeOf?: {} | null | undefined;
+        getOwnPropertyDescriptor?: {} | null | undefined;
+        getOwnPropertyNames?: {} | null | undefined;
+        create?: {} | null | undefined;
+        defineProperty?: {} | null | undefined;
+        defineProperties?: {} | null | undefined;
+        seal?: {} | null | undefined;
+        freeze?: {} | null | undefined;
+        preventExtensions?: {} | null | undefined;
+        isSealed?: {} | null | undefined;
+        isFrozen?: {} | null | undefined;
+        isExtensible?: {} | null | undefined;
+        keys?: {} | null | undefined;
+        assign?: {} | null | undefined;
+        getOwnPropertySymbols?: {} | null | undefined;
+        is?: {} | null | undefined;
+        setPrototypeOf?: {} | null | undefined;
+        values?: {} | null | undefined;
+        entries?: {} | null | undefined;
+        getOwnPropertyDescriptors?: {} | null | undefined;
+        fromEntries?: {} | null | undefined;
+        hasOwn?: {} | null | undefined;
+    }>;
+}>> & import("mongoose").FlatRecord<{
+    id: number;
+    content: import("mongoose").Types.DocumentArray<{
+        prototype?: {
+            constructor: {
+                name?: unknown;
+                [Symbol.hasInstance]?: {} | null | undefined;
+                prototype?: unknown;
+                length?: unknown;
+                caller?: any | null | undefined;
+                arguments?: unknown;
+                toString: {} | null;
+                apply?: {} | null | undefined;
+                call?: {} | null | undefined;
+                bind?: {} | null | undefined;
+            } | null;
+            toString: {} | null;
+            toLocaleString: {} | null;
+            valueOf: {} | null;
+            hasOwnProperty: {} | null;
+            isPrototypeOf: {} | null;
+            propertyIsEnumerable: {} | null;
+        } | null | undefined;
+        getPrototypeOf?: {} | null | undefined;
+        getOwnPropertyDescriptor?: {} | null | undefined;
+        getOwnPropertyNames?: {} | null | undefined;
+        create?: {} | null | undefined;
+        defineProperty?: {} | null | undefined;
+        defineProperties?: {} | null | undefined;
+        seal?: {} | null | undefined;
+        freeze?: {} | null | undefined;
+        preventExtensions?: {} | null | undefined;
+        isSealed?: {} | null | undefined;
+        isFrozen?: {} | null | undefined;
+        isExtensible?: {} | null | undefined;
+        keys?: {} | null | undefined;
+        assign?: {} | null | undefined;
+        getOwnPropertySymbols?: {} | null | undefined;
+        is?: {} | null | undefined;
+        setPrototypeOf?: {} | null | undefined;
+        values?: {} | null | undefined;
+        entries?: {} | null | undefined;
+        getOwnPropertyDescriptors?: {} | null | undefined;
+        fromEntries?: {} | null | undefined;
+        hasOwn?: {} | null | undefined;
+    }, import("mongoose").Types.Subdocument<import("mongoose").Types.ObjectId, any, {
+        prototype?: {
+            constructor: {
+                name?: unknown;
+                [Symbol.hasInstance]?: {} | null | undefined;
+                prototype?: unknown;
+                length?: unknown;
+                caller?: any | null | undefined;
+                arguments?: unknown;
+                toString: {} | null;
+                apply?: {} | null | undefined;
+                call?: {} | null | undefined;
+                bind?: {} | null | undefined;
+            } | null;
+            toString: {} | null;
+            toLocaleString: {} | null;
+            valueOf: {} | null;
+            hasOwnProperty: {} | null;
+            isPrototypeOf: {} | null;
+            propertyIsEnumerable: {} | null;
+        } | null | undefined;
+        getPrototypeOf?: {} | null | undefined;
+        getOwnPropertyDescriptor?: {} | null | undefined;
+        getOwnPropertyNames?: {} | null | undefined;
+        create?: {} | null | undefined;
+        defineProperty?: {} | null | undefined;
+        defineProperties?: {} | null | undefined;
+        seal?: {} | null | undefined;
+        freeze?: {} | null | undefined;
+        preventExtensions?: {} | null | undefined;
+        isSealed?: {} | null | undefined;
+        isFrozen?: {} | null | undefined;
+        isExtensible?: {} | null | undefined;
+        keys?: {} | null | undefined;
+        assign?: {} | null | undefined;
+        getOwnPropertySymbols?: {} | null | undefined;
+        is?: {} | null | undefined;
+        setPrototypeOf?: {} | null | undefined;
+        values?: {} | null | undefined;
+        entries?: {} | null | undefined;
+        getOwnPropertyDescriptors?: {} | null | undefined;
+        fromEntries?: {} | null | undefined;
+        hasOwn?: {} | null | undefined;
+    }> & {
+        prototype?: {
+            constructor: {
+                name?: unknown;
+                [Symbol.hasInstance]?: {} | null | undefined;
+                prototype?: unknown;
+                length?: unknown;
+                caller?: any | null | undefined;
+                arguments?: unknown;
+                toString: {} | null;
+                apply?: {} | null | undefined;
+                call?: {} | null | undefined;
+                bind?: {} | null | undefined;
+            } | null;
+            toString: {} | null;
+            toLocaleString: {} | null;
+            valueOf: {} | null;
+            hasOwnProperty: {} | null;
+            isPrototypeOf: {} | null;
+            propertyIsEnumerable: {} | null;
+        } | null | undefined;
+        getPrototypeOf?: {} | null | undefined;
+        getOwnPropertyDescriptor?: {} | null | undefined;
+        getOwnPropertyNames?: {} | null | undefined;
+        create?: {} | null | undefined;
+        defineProperty?: {} | null | undefined;
+        defineProperties?: {} | null | undefined;
+        seal?: {} | null | undefined;
+        freeze?: {} | null | undefined;
+        preventExtensions?: {} | null | undefined;
+        isSealed?: {} | null | undefined;
+        isFrozen?: {} | null | undefined;
+        isExtensible?: {} | null | undefined;
+        keys?: {} | null | undefined;
+        assign?: {} | null | undefined;
+        getOwnPropertySymbols?: {} | null | undefined;
+        is?: {} | null | undefined;
+        setPrototypeOf?: {} | null | undefined;
+        values?: {} | null | undefined;
+        entries?: {} | null | undefined;
+        getOwnPropertyDescriptors?: {} | null | undefined;
+        fromEntries?: {} | null | undefined;
+        hasOwn?: {} | null | undefined;
+    }>;
+}> & {
+    _id: import("mongoose").Types.ObjectId;
+} & {
+    __v: number;
 }>;

package/lib/offers/offer.d.ts CHANGED Viewed

@@ -22,6 +22,7 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
+/// <reference types="mongoose/types/inferrawdoctype" />
 import { Document, Model, Schema } from "mongoose";
 export interface IOffer extends Document {
     id: number;
@@ -61,31 +62,91 @@ export interface IPartnerSection {
     name: string;
     offers: IOffer[];
 }
-export declare const PartnerSchema: Schema<any, Model<any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
-    partnerId?: number | undefined;
-    shortName?: string | undefined;
-    name?: string | undefined;
+export declare const PartnerSchema: Schema<any, Model<any, any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
+    partnerId?: number | null | undefined;
+    shortName?: string | null | undefined;
+    name?: string | null | undefined;
+}, Document<unknown, {}, import("mongoose").FlatRecord<{
+    partnerId?: number | null | undefined;
+    shortName?: string | null | undefined;
+    name?: string | null | undefined;
+}>> & import("mongoose").FlatRecord<{
+    partnerId?: number | null | undefined;
+    shortName?: string | null | undefined;
+    name?: string | null | undefined;
+}> & {
+    _id: import("mongoose").Types.ObjectId;
+} & {
+    __v: number;
 }>;
-export declare const OfferSchema: Schema<any, Model<any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
+export declare const OfferSchema: Schema<any, Model<any, any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
     type: string;
-    id?: number | undefined;
-    partnerId?: number | undefined;
-    name?: string | undefined;
-    graphicFolder?: string | undefined;
-    geo?: string | undefined;
-    caption?: string | undefined;
-    link?: string | undefined;
-    keitaroId?: string | undefined;
-    hidden?: boolean | undefined;
+    id?: number | null | undefined;
+    partnerId?: number | null | undefined;
+    name?: string | null | undefined;
+    hidden?: boolean | null | undefined;
+    graphicFolder?: string | null | undefined;
+    geo?: string | null | undefined;
+    caption?: string | null | undefined;
+    link?: string | null | undefined;
+    keitaroId?: string | null | undefined;
     graphic?: {
-        logo?: string | undefined;
-        bg?: string | undefined;
-    } | undefined;
+        logo?: string | null | undefined;
+        bg?: string | null | undefined;
+    } | null | undefined;
     history?: {
         name: string[];
         caption: string[];
         link: string[];
         logoNames: string[];
         bgNames: string[];
-    } | undefined;
+    } | null | undefined;
+}, Document<unknown, {}, import("mongoose").FlatRecord<{
+    type: string;
+    id?: number | null | undefined;
+    partnerId?: number | null | undefined;
+    name?: string | null | undefined;
+    hidden?: boolean | null | undefined;
+    graphicFolder?: string | null | undefined;
+    geo?: string | null | undefined;
+    caption?: string | null | undefined;
+    link?: string | null | undefined;
+    keitaroId?: string | null | undefined;
+    graphic?: {
+        logo?: string | null | undefined;
+        bg?: string | null | undefined;
+    } | null | undefined;
+    history?: {
+        name: string[];
+        caption: string[];
+        link: string[];
+        logoNames: string[];
+        bgNames: string[];
+    } | null | undefined;
+}>> & import("mongoose").FlatRecord<{
+    type: string;
+    id?: number | null | undefined;
+    partnerId?: number | null | undefined;
+    name?: string | null | undefined;
+    hidden?: boolean | null | undefined;
+    graphicFolder?: string | null | undefined;
+    geo?: string | null | undefined;
+    caption?: string | null | undefined;
+    link?: string | null | undefined;
+    keitaroId?: string | null | undefined;
+    graphic?: {
+        logo?: string | null | undefined;
+        bg?: string | null | undefined;
+    } | null | undefined;
+    history?: {
+        name: string[];
+        caption: string[];
+        link: string[];
+        logoNames: string[];
+        bgNames: string[];
+    } | null | undefined;
+}> & {
+    _id: import("mongoose").Types.ObjectId;
+} & {
+    __v: number;
 }>;

package/lib/offers/section.d.ts CHANGED Viewed

@@ -22,6 +22,7 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
+/// <reference types="mongoose/types/inferrawdoctype" />
 import { Schema } from "mongoose";
 export interface IOffersSection {
     id: number;
@@ -34,10 +35,22 @@ export interface IOffersSection {
         [key: string]: string;
     };
 }
-export declare const OffersSectionSchema: Schema<any, import("mongoose").Model<any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
+export declare const OffersSectionSchema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
     id: number;
     title?: any;
     button?: any;
+}, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
+    id: number;
+    title?: any;
+    button?: any;
+}>> & import("mongoose").FlatRecord<{
+    id: number;
+    title?: any;
+    button?: any;
+}> & {
+    _id: import("mongoose").Types.ObjectId;
+} & {
+    __v: number;
 }>;
 export declare enum DefaultSectionId {
     GAMBLING_MAIN = 0,

package/lib/panel/user.d.ts CHANGED Viewed

@@ -22,6 +22,7 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
+/// <reference types="mongoose/types/inferrawdoctype" />
 import { Document, Schema } from "mongoose";
 export declare enum PanelUserAccessScope {
     ADMIN = 0,
@@ -39,8 +40,20 @@ export interface IPanelUser extends Document {
     passwordHash: string;
     accessScopes: PanelUserAccessScope[];
 }
-export declare const PanelUserSchema: Schema<any, import("mongoose").Model<any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
+export declare const PanelUserSchema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
     accessScopes: string[];
-    passwordHash?: string | undefined;
-    username?: string | undefined;
+    passwordHash?: string | null | undefined;
+    username?: string | null | undefined;
+}, Document<unknown, {}, import("mongoose").FlatRecord<{
+    accessScopes: string[];
+    passwordHash?: string | null | undefined;
+    username?: string | null | undefined;
+}>> & import("mongoose").FlatRecord<{
+    accessScopes: string[];
+    passwordHash?: string | null | undefined;
+    username?: string | null | undefined;
+}> & {
+    _id: import("mongoose").Types.ObjectId;
+} & {
+    __v: number;
 }>;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@bprotsyk/aso-core",
-  "version": "2.1.54",
+  "version": "2.1.55",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
@@ -30,7 +30,7 @@
     "@types/unzipper": "^0.10.10",
     "axios": "^1.4.0",
     "module-alias": "^2.2.2",
-    "mongoose": "^6.8.3",
+    "mongoose": "^8.10.0",
     "mustache": "^4.2.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

package/src/app/app.ts CHANGED Viewed

@@ -59,6 +59,30 @@ export enum EPlatform {
     AMAZON = 'am'
 }
+export const getPlatformName = (platform: EPlatform | undefined): string | false => {
+    switch (platform) {
+        case EPlatform.SAMSUNG:
+            return "samsung";
+        case EPlatform.HUAWEI:
+            return "huawei";
+        case EPlatform.ruSTORE:
+            return "ruStore";
+        case EPlatform.XIAOMI:
+            return "xiaomi";
+        case EPlatform.APKPURE:
+            return "apkpure";
+        case EPlatform.TELEGRAM:
+            return "telegram";
+        case EPlatform.AMAZON:
+            return "amazon";
+        case EPlatform.GENERAL:
+            return false;
+        default:
+            return false;
+    }
+};
 export interface IPlatformParams {
     enabled: boolean,
     geo: string[],

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

@@ -3,7 +3,7 @@ import { IOffer } from "../../offers/offer"
 import keitaroApi from "./http"
 import { IKeitaroCampaign } from "../../keitaro/keitaro-campaign";
 import { IKeitaroDomain } from "../../keitaro/keitaro-domain";
-import { IApp } from "../../app/app";
+import { EPlatform, getPlatformName, IApp } from "../../app/app";
 import { TRAFFIC_SOURCE_ID_FLASH_AI, prepareOWCampaignParameters } from "../../utils/keitaro-utils";
 import { convertMillisToDate, getTimestampsForTodayAndYesterday } from "../../utils/general";
 import { IKeitaroOffer } from "index";
@@ -237,8 +237,10 @@ export async function upsertStreamToCampaign(campaign: IKeitaroCampaign, stream:
     }
 }
-async function cloneOWCampaign(app: IApp): Promise<IKeitaroCampaign | any> {
+async function cloneOWCampaign(app: IApp, platform?: EPlatform): Promise<IKeitaroCampaign | any> {
     let name = `#${app.id} [◈]`
+    let platformName = platform ? getPlatformName(platform) : null;
+    const platformCampaignName =  `#${app.id} [◈] (${platformName})`
     const generateAlias = () => {
         const chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
         return Array.from(
@@ -248,7 +250,21 @@ async function cloneOWCampaign(app: IApp): Promise<IKeitaroCampaign | any> {
     };
     let allCampaigns = await getAllCampaigns()
-    let matchingCampaign = allCampaigns.filter((c) => new RegExp(`#${app.id}.*◈`).test(c.name))
+    let matchingCampaign: IKeitaroCampaign[] = [];
+    if (platform) {
+        matchingCampaign = allCampaigns.filter((c) =>
+            c.name === `#${app.id} [◈] (${platformName})`
+        )
+    } else {
+        matchingCampaign = allCampaigns.filter((c) =>
+            c.name === `#${app.id} [◈]`
+        )
+    }
     if (matchingCampaign.length > 0) return matchingCampaign[0]
   const originalCampaign : IKeitaroCampaign = await getCampaignById(2673)
@@ -276,7 +292,7 @@ async function cloneOWCampaign(app: IApp): Promise<IKeitaroCampaign | any> {
     let payload: Partial<IKeitaroCampaign> = {
         // Унікальні поля
-        name: name,
+        name: platformName ? platformCampaignName : name,
         alias: alias,
         domain_id: domain.id,
         position: [maxPosition + 100],

package/test-keitaro.js CHANGED Viewed

@@ -2,7 +2,7 @@ const { KeitaroService } = require('./lib/network/keitaro/keitaro-service');
 async function testClone() {
     try {
-        const result = await KeitaroService.cloneOWCampaign({ id: 750 });
+        const result = await KeitaroService.cloneOWCampaign({ id: 999 }, 'sm' );
         console.log('Cloned campaign:', result);
     } catch (error) {
         console.error('Error:', error);