@bprotsyk/aso-core 1.2.237 → 1.2.238

package/lib/app/app.d.ts

@@ -78,13 +78,14 @@ export interface IPrivacyPolicyParams {
     redirect: boolean;
 }
 export declare enum IntegrationVersion {
-    MVVM = "MVVM",
+    NONE = "MVVM",
     POLICY = "POLICY",
     OFFER_STUB = "OFFER_STUB",
     DIRECT = "DIRECT",
     WEB = "WEB",
     WEB_DIRECT = "WEB_DIRECT",
-    BANNER = "BANNER"
+    BANNER = "BANNER",
+    PWA = "PWA"
 }
 export interface IntegrationAlterations {
     networkTool: AlternativeNetworkTool;

package/lib/app/app.js

@@ -6,13 +6,14 @@ const mongoose_1 = require("mongoose");
 const util = require("util");
 var IntegrationVersion;
 (function (IntegrationVersion) {
-    IntegrationVersion["MVVM"] = "MVVM";
+    IntegrationVersion["NONE"] = "MVVM";
     IntegrationVersion["POLICY"] = "POLICY";
     IntegrationVersion["OFFER_STUB"] = "OFFER_STUB";
     IntegrationVersion["DIRECT"] = "DIRECT";
     IntegrationVersion["WEB"] = "WEB";
     IntegrationVersion["WEB_DIRECT"] = "WEB_DIRECT";
     IntegrationVersion["BANNER"] = "BANNER";
+    IntegrationVersion["PWA"] = "PWA";
 })(IntegrationVersion = exports.IntegrationVersion || (exports.IntegrationVersion = {}));
 var PlugType;
 (function (PlugType) {
@@ -162,7 +163,6 @@ exports.AppSchema = new mongoose_1.Schema({
         },
         clouflareZone: {
             type: String,
-            unique: true
         },
     }
 });

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /// <reference types="mongoose/types/aggregate" />
 /// <reference types="mongoose/types/callback" />
 /// <reference types="mongoose/types/collection" />

package/lib/general/queue.d.ts

@@ -1 +1,2 @@
-export {};
+interface IQueueElement {
+}

package/lib/general/queue.js

@@ -1,2 +1 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/lib/general/shape.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ShapeDiv = void 0;
-const styled_components_1 = __importDefault(require("styled-components"));
+const styled_components_1 = require("styled-components");
 exports.ShapeDiv = styled_components_1.default.div `
   background: ${props => typeof props.fill === 'string'
     ? props.fill

package/lib/index.d.ts

@@ -2,7 +2,7 @@ export { IPush } from "./general/push";
 export { IOffer, IPartner, IOfferType } from "./offers/offer";
 export { IOffersSection, OffersSectionSchema, DefaultSectionId } from "./offers/section";
 export { IAppOffersSection, ISectionsList, SectionsListSchema } from "./offers/list";
-export { IntegrationAlterations, IntegrationVersion, IApp, AppSchema, PlugType } from "./app/app";
+export { IntegrationAlterations, IntegrationVersion, IApp, AppSchema, PlugType, IAppKeitaroData } from "./app/app";
 export { IAppListItem } from "./app/app-list-item";
 export { AppType } from "./app/app-type";
 export { AlternativeLayoutType, AlternativeSourceType, AlternativeLogicType, AlternativeNetworkTool, AlternativeStorageType, AlternativeNavigation, AlternativeOnBackPressed, AlternativeOnActivityResult, IAppIntegration as IFlashIntegration } from "./app/app-integration";

package/lib/index.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NamecheapBuyRequestSchema = 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.PlugType = exports.AppSchema = exports.IntegrationVersion = exports.SectionsListSchema = exports.DefaultSectionId = exports.OffersSectionSchema = exports.IOfferType = void 0;
 var offer_1 = require("./offers/offer");
@@ -53,7 +30,7 @@ var shape_1 = require("./general/shape");
 Object.defineProperty(exports, "ShapeDiv", { enumerable: true, get: function () { return shape_1.ShapeDiv; } });
 var keitaro_service_1 = require("./network/keitaro/keitaro-service");
 Object.defineProperty(exports, "KeitaroService", { enumerable: true, get: function () { return keitaro_service_1.KeitaroService; } });
-exports.KeitaroUtils = __importStar(require("./utils/keitaro-utils"));
+exports.KeitaroUtils = require("./utils/keitaro-utils");
 var cloudflare_domain_1 = require("./general/cloudflare-domain");
 Object.defineProperty(exports, "ICloudflareDomainStatus", { enumerable: true, get: function () { return cloudflare_domain_1.ICloudflareDomainStatus; } });
 Object.defineProperty(exports, "ICloudflareDomainType", { enumerable: true, get: function () { return cloudflare_domain_1.ICloudflareDomainType; } });

package/lib/network/keitaro/http.d.ts

@@ -1,3 +1,2 @@
-import axios from "axios";
-declare const _default: axios.AxiosInstance;
+declare const _default: import("axios").AxiosInstance;
 export default _default;

package/lib/network/keitaro/http.js

@@ -1,9 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const axios_1 = __importDefault(require("axios"));
+const axios_1 = require("axios");
 exports.default = axios_1.default.create({
     baseURL: 'https://aibprtsk.com/admin_api/v1/',
     headers: {

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

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KeitaroService = exports.upsertStreamToCampaign = void 0;
-const http_1 = __importDefault(require("./http"));
+const http_1 = require("./http");
 const keitaro_utils_1 = require("../../utils/keitaro-utils");
 const general_1 = require("../../utils/general");
 async function getStreamsByCampaignId(campaignId) {

package/lib/utils/keitaro-utils.js

@@ -1,11 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createOWCampaign = exports.createDirectCampaign = exports.createFlashCampaigns = exports.createOWStreamPartialPayload = exports.prepareOWCampaignParameters = exports.createOrFindFlashRedirectCampaign = exports.removeGeosFromAllRedirectCampaigns = exports.addGeosToAllRedirectCampaigns = exports.TRAFFIC_SOURCE_ID_FLASH_AI = void 0;
 const keitaro_service_1 = require("../network/keitaro/keitaro-service");
-const sleep_promise_1 = __importDefault(require("sleep-promise"));
+const sleep_promise_1 = require("sleep-promise");
 const FLASH_REDIRECT_GROUP_ID = 82;
 exports.TRAFFIC_SOURCE_ID_FLASH_AI = 22;
 const UNIQUENESS_METHOD = "ip_ua";

package/lib/utils/server-util.d.ts

@@ -8,12 +8,6 @@ export declare class ServerUtil {
     ssh?: NodeSSH;
     constructor(ssh?: NodeSSH);
     exec(command: string, options?: any): Promise<string>;
-    generateSSHKey(): Promise<string>;
-    createDirectories(): Promise<void>;
-    installGit(): Promise<void>;
-    addBitbucketToKnownHosts(): Promise<void>;
-    cloneRepository(repoName: string, targetPath: string): Promise<void>;
-    installNginx(): Promise<void>;
     isNginxActive(): Promise<boolean>;
     isMongoActive(): Promise<boolean>;
     mongoInstallCommand: string;
@@ -21,6 +15,5 @@ export declare class ServerUtil {
     domainNginxCertsExist(host: string): Promise<boolean>;
     isCerbotActive(): Promise<boolean>;
     setupCertbot(): Promise<boolean>;
-    setupSSL(email: string, host: string): Promise<void>;
     refresh(): Promise<boolean>;
 }

package/lib/utils/server-util.js

@@ -1,11 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServerUtil = exports.PORT = exports.HOST = exports.PASSWORD = exports.IP = void 0;
-const child_process_1 = __importDefault(require("child_process"));
-const { promisify } = require("util");
+const child_process_1 = require("child_process");
+const { promisify } = require('util');
 const execPromise = promisify(child_process_1.default.exec);
 exports.IP = "185.123.53.227";
 exports.PASSWORD = "xUA3oOX06Kfc9m12rZ";
@@ -30,49 +27,10 @@ class ServerUtil {
             });
         }
     }
-    // SSH
-    async generateSSHKey() {
-        await this.exec(`ssh-keygen -t rsa -N '' -f ~/.ssh/id_rsa <<< n`);
-        let sshFingerprint = await this.exec(`cat ~/.ssh/id_rsa.pub`);
-        return sshFingerprint;
-    }
-    // create Directories in /Var
-    async createDirectories() {
-        await this.exec(`mkdir -p /var/www/ai`);
-    }
-    // install git
-    async installGit() {
-        await this.exec(`apt-get update; apt-get install -y git`);
-    }
-    // add ssh to bitbucket
-    async addBitbucketToKnownHosts() {
-        await this.exec(`ssh-keyscan bitbucket.org >> ~/.ssh/known_hosts`);
-    }
-    // clone bitbucket Repository
-    async cloneRepository(repoName, targetPath) {
-        let gitResponse = await this.exec(`git clone git@bitbucket.org:bprtsk/${repoName}.git`, { cwd: targetPath });
-        if (gitResponse.includes(`Please make sure you have the correct access rights`)) {
-            throw new Error(`No access to the remote repository!`);
-        }
-    }
-    // не знаю чи треба але  додав ?
-    // async checkoutBranch(branch: string, repoPath: string): Promise<void> {
-    //     await this.exec(`git checkout -b ${branch}; git branch --set-upstream-to=origin/${branch} ${branch}; git reset --hard origin/${branch};`, { cwd: repoPath });
-    // }
-    // не знаю чи треба але  додав ?
-    //   async installJava(): Promise<void> {
-    //     await this.exec(`apt-get update; apt-get install -y default-jre default-jdk`);
-    // }
-    // install Nginx
-    async installNginx() {
-        await this.exec(`apt-get update; apt-get install -y nginx`);
-        await this.exec(`systemctl enable nginx`);
-        await this.exec(`systemctl start nginx`);
-    }
     // Nginx
     async isNginxActive() {
         try {
-            let result = await this.exec("systemctl status nginx");
+            let result = await this.exec('systemctl status nginx');
             if (result.includes("Active: active"))
                 return true;
         }
@@ -84,7 +42,7 @@ class ServerUtil {
     // Mongo
     async isMongoActive() {
         try {
-            let result = await this.exec("systemctl status mongod");
+            let result = await this.exec('systemctl status mongod');
             if (result.includes("Active: active"))
                 return true;
         }
@@ -120,20 +78,11 @@ class ServerUtil {
         return true;
     }
     async domainNginxCertsExist(host) {
-        try {
-            let result = await this.exec(`ls /etc/letsencrypt/live/${host}`);
-            if (result.includes("No such file or directory"))
-                return false;
-        }
-        catch (e) {
-            console.error(e);
-        }
-        return true;
     }
     // Certbot CRON
     async isCerbotActive() {
         try {
-            let result = await this.exec("which certbot");
+            let result = await this.exec('which certbot');
             if (result.includes("/usr/bin/certbot"))
                 return true;
         }
@@ -142,23 +91,13 @@ class ServerUtil {
         }
         return false;
     }
-    // install certbot
     async setupCertbot() {
         await this.exec(`apt-get install -y certbot python3-certbot-nginx;`);
         return true;
     }
-    // creating a SSL certificate
-    async setupSSL(email, host) {
-        let certbotResponse = await this.exec(`certbot --non-interactive --agree-tos --nginx -m "${email}" -d "${host}"`);
-        if (certbotResponse.includes(`Some challenges have failed.`)) {
-            throw new Error("Certbot encountered an error");
-        }
-        await this.exec(`echo "0 12 * * * /usr/bin/certbot renew --quiet" | crontab -`);
-    }
-    // Git
+    // Git 
     async refresh() {
-        await this.exec(`git stash; rm-rf built; git pull`);
-        return true;
+        // git stash; rm-rf built; git pull
     }
 }
 exports.ServerUtil = ServerUtil;

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@bprotsyk/aso-core",
-  "version": "1.2.237",
+  "version": "1.2.238",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
-    "prod": "tsc; git add .; git commit -m \"Stub\"; git push origin master; npm version patch; npm publish;",
+    "prod": "tsc -p ./tsconfig.json; git add .; git commit -m \"Stub\"; git push origin master; npm version patch; npm publish;",
     "build": "tsc",
     "test": "echo \"Error: no test specified\" && exit 1",
     "keitaro": "tsc; node lib/utils/keitaro-utils.js",
@@ -26,21 +26,21 @@
     "@types/module-alias": "^2.0.1",
     "@types/mongoose": "^5.11.97",
     "@types/node-ssh": "^7.0.6",
+    "@types/react": "^18.0.0",
+    "@types/react-dom": "^18.0.0",
     "@types/styled-components": "^5.1.26",
     "axios": "^1.4.0",
     "module-alias": "^2.2.2",
     "mongoose": "^6.8.3",
-    "mustache": "^4.2.0",
     "node-ssh": "^13.2.0",
     "react": "^18.2.0",
     "replace-in-file": "^7.0.1",
     "sleep-promise": "^9.1.0",
-    "ssh2-sftp-client": "^10.0.3",
     "styled-components": "^5.3.9"
   },
   "devDependencies": {
-    "@types/mustache": "^4.2.5",
+    "@types/node": "^20.14.12",
     "typedoc": "^0.23.28",
-    "typescript": "^4.8.0-dev.20220623"
+    "typescript": "^4.9.5"
   }
 }

package/src/app/app.ts

@@ -98,13 +98,14 @@ export interface IPrivacyPolicyParams {
 }
 
 export enum IntegrationVersion {
-    MVVM = "MVVM",
+    NONE = "MVVM",
     POLICY = "POLICY",
     OFFER_STUB = "OFFER_STUB",
     DIRECT = "DIRECT",
     WEB = "WEB",
     WEB_DIRECT = "WEB_DIRECT",
-    BANNER = "BANNER"
+    BANNER = "BANNER",
+    PWA = "PWA"
 }
 
 export interface IntegrationAlterations {
@@ -302,7 +303,6 @@ export const AppSchema = new Schema({
         },
         clouflareZone: {
             type: String,
-            unique: true
         },
     }
 })

package/src/general/domain.ts

@@ -20,10 +20,26 @@ export interface IDomain extends Document {
 
     ip: string
     subdomain: string | null
-    txtRecords: string[]
+    txtRecords:  DNSRecords[],
     target: DomainTarget,
     assignedTo: number[]
 }
+type DNSRecords = TXTRecord | MXRecord;
+// Інтерфейс для TXT-записів
+interface TXTRecord extends DNSRecord {
+    type: "TXT";
+  }
+  
+  // Інтерфейс для MX-записів
+  interface MXRecord extends DNSRecord {
+    type: "MX";
+    priority: number;
+  }
+  interface DNSRecord {
+    type: string;
+    value: string;
+  }
+
 
 export interface IDomainsBuyRequestResponse {
     requestId: string,

package/src/index.ts

@@ -4,7 +4,7 @@ export { IOffer, IPartner, IOfferType } from "./offers/offer"
 export { IOffersSection, OffersSectionSchema, DefaultSectionId } from "./offers/section"
 export { IAppOffersSection, ISectionsList, SectionsListSchema } from "./offers/list"
 
-export { IntegrationAlterations, IntegrationVersion, IApp, AppSchema, PlugType } from "./app/app"
+export { IntegrationAlterations, IntegrationVersion, IApp, AppSchema, PlugType, IAppKeitaroData } from "./app/app"
 export { IAppListItem } from "./app/app-list-item"
 export { AppType } from "./app/app-type"
 export { AlternativeLayoutType, AlternativeSourceType, AlternativeLogicType, AlternativeNetworkTool, AlternativeStorageType, AlternativeNavigation, AlternativeOnBackPressed, AlternativeOnActivityResult, IAppIntegration as IFlashIntegration } from "./app/app-integration"
@@ -29,5 +29,4 @@ export { IKeitaroStream } from "./keitaro/keitaro-stream"
 
 export { ICloudflareDomainStatus, ICloudflareDomainType, ICloudflareDomain } from "./general/cloudflare-domain"
 export { IDomain, IDomainSetupResult, DomainStatus, DomainTarget, CONST_CLOUFLARE_STATUS_READY, IDomainsBuyRequestResponse } from "./general/domain"
-export { INamecheapDomain, INamecheapBuyRequest, INamecheapContactInfo, NamecheapBuyRequestSchema } from "./general/namecheap-domain"
-export {ServerUtil} from "./utils/server-util"
+export { INamecheapDomain, INamecheapBuyRequest, INamecheapContactInfo, NamecheapBuyRequestSchema } from "./general/namecheap-domain"