@bprotsyk/aso-core 2.0.43 → 2.0.45

package/lib/app/app.d.ts

@@ -29,6 +29,13 @@ export interface IApp extends Document {
     domainParams: IDomainParams;
     developerParams: IDeveloperParams;
     offersListId: number;
+    externalParams?: IExternalParams;
+}
+export interface IExternalParams {
+    showButton: boolean;
+    schema: string;
+    autoRedirect: boolean;
+    repeatAutoRedirect: boolean;
 }
 export interface IRemoteServerParams {
     ip: string;
@@ -150,6 +157,12 @@ export declare const AppSchema: mongoose.Schema<any, mongoose.Model<any, any, an
     onesignalAppId?: string | undefined;
     onesignalRestApiKey?: string | undefined;
     linkPath?: string | undefined;
+    externalParams?: {
+        schema?: string | undefined;
+        showButton?: boolean | undefined;
+        autoRedirect?: boolean | undefined;
+        repeatAutoRedirect?: boolean | undefined;
+    } | undefined;
     generationOptions?: {
         splashName?: string | undefined;
         webViewName?: string | undefined;

package/lib/app/app.js

@@ -70,6 +70,12 @@ exports.AppSchema = new mongoose_1.Schema({
     linkPath: {
         type: String
     },
+    externalParams: {
+        showButton: Boolean,
+        schema: String,
+        autoRedirect: Boolean,
+        repeatAutoRedirect: Boolean
+    },
     integrationVersion: {
         type: String,
         default: IntegrationVersion.OFFER_STUB,

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

@@ -1,4 +1,4 @@
-import { IAppGenerationOptions, IAppKeitaroData, IBannerParams, IDeveloperParams, IDirectParams, IDomainParams, IOffersStubParams, IPrivacyPolicyParams, IRemoteServerParams, IRemoveDataParams, IntegrationVersion } from "app/app";
+import { IAppGenerationOptions, IAppKeitaroData, IBannerParams, IDeveloperParams, IDirectParams, IDomainParams, IExternalParams, IOffersStubParams, IPrivacyPolicyParams, IRemoteServerParams, IRemoveDataParams, IntegrationVersion } from "app/app";
 export interface IUpsertAppRequest {
     id: number;
     name?: string;
@@ -19,9 +19,11 @@ export interface IUpsertAppRequest {
     remoteServerParams?: IRemoteServerParams;
     domainParams: IDomainParams;
     directParams?: IDirectParams;
+    externalParams?: IExternalParams;
 }
 export interface IUpsertAppResponse {
     data: IUpsertAppRequest;
     linkName: string;
     archive: string;
+    externalParams?: IExternalParams;
 }

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

@@ -15,6 +15,7 @@ export declare class ServerUtil {
     sftpConfig: ISFTP;
     constructor(sftpConfig: ISFTP);
     connectSSH(): Promise<void>;
+    ensureConnected(): Promise<void>;
     exec(command: string, options?: any): Promise<string>;
     generateSSHKey(): Promise<string>;
     createDirectories(): Promise<void>;

package/lib/utils/server-util.js

@@ -33,9 +33,15 @@ class ServerUtil {
             password: this.sftpConfig.password,
         });
     }
+    async ensureConnected() {
+        if (!this.ssh.isConnected()) {
+            await this.connectSSH(); // Підключення, якщо ще не підключено
+        }
+    }
     // Выконує команду або по SSH або локально, повертаючи текст незалежно від результату (помилка чи успіх)
     async exec(command, options) {
-        if (this.ssh) {
+        await this.ensureConnected();
+        if (this.ssh.isConnected()) {
             return (await this.ssh.execCommand(command, options)).stdout;
         }
         else {
@@ -164,13 +170,13 @@ class ServerUtil {
         await this.ssh.execCommand(`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.`)) {
+        // Прямий виклик this.ssh.execCommand
+        let certbotResponse = await this.ssh.execCommand(`certbot --non-interactive --agree-tos --nginx -m "${email}" -d "${host}"`);
+        if (certbotResponse.stdout.includes(`Some challenges have failed.`)) {
             throw new Error("Certbot encountered an error");
         }
-        await this.exec(`echo "0 12 * * * /usr/bin/certbot renew --quiet" | crontab -`);
+        await this.ssh.execCommand(`echo "0 12 * * * /usr/bin/certbot renew --quiet" | crontab -`);
     }
     // Git
     async refresh() {

package/package.json

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

package/src/app/app.ts

@@ -37,6 +37,14 @@ export interface IApp extends Document {
     developerParams: IDeveloperParams
 
     offersListId: number
+    externalParams?:IExternalParams
+}
+
+export interface IExternalParams {
+    showButton: boolean;
+    schema: string;
+    autoRedirect: boolean;
+    repeatAutoRedirect:boolean;
 }
 
 export interface IRemoteServerParams {
@@ -206,6 +214,12 @@ export const AppSchema = new Schema({
     linkPath: {
         type: String
     },
+    externalParams : {
+        showButton: Boolean,
+        schema: String,
+        autoRedirect: Boolean,
+        repeatAutoRedirect:Boolean
+    },
 
     integrationVersion: {
         type: String,
@@ -305,6 +319,7 @@ export const AppSchema = new Schema({
             type: String,
         },
     }
+
 })
 
 // TODO app type (casino / fin)

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

@@ -1,4 +1,4 @@
-import { IAppGenerationOptions, IAppKeitaroData, IBannerParams, IDeveloperParams, IDirectParams, IDomainParams, IOffersStubParams, IPrivacyPolicyParams, IRemoteServerParams, IRemoveDataParams, IntegrationVersion } from "app/app"
+import { IAppGenerationOptions, IAppKeitaroData, IBannerParams, IDeveloperParams, IDirectParams, IDomainParams, IExternalParams, IOffersStubParams, IPrivacyPolicyParams, IRemoteServerParams, IRemoveDataParams, IntegrationVersion } from "app/app"
 import { PlugType } from "index"
 
 export interface IUpsertAppRequest {
@@ -27,11 +27,14 @@ export interface IUpsertAppRequest {
     remoteServerParams?: IRemoteServerParams,
     domainParams: IDomainParams,
     directParams?: IDirectParams,
+    externalParams?:IExternalParams,
 }
 
+
 export interface IUpsertAppResponse {
     data: IUpsertAppRequest,
     linkName: string,
-    archive: string
+    archive: string,
+    externalParams?:IExternalParams,
 }
 

package/src/utils/server-util.ts

@@ -46,9 +46,17 @@ export class ServerUtil {
       });
     }
 
+    async ensureConnected(): Promise<void> {
+      if (!this.ssh.isConnected()) {
+        await this.connectSSH(); // Підключення, якщо ще не підключено
+      }
+    }
+    
+
   // Выконує команду або по SSH або локально, повертаючи текст незалежно від результату (помилка чи успіх)
   async exec(command: string, options?: any): Promise<string> {
-    if (this.ssh) {
+    await this.ensureConnected();
+    if (this.ssh.isConnected()) {
       return (await this.ssh.execCommand(command, options)).stdout;
     } else {
       return await new Promise<string>((resolve) => {
@@ -198,18 +206,22 @@ export class ServerUtil {
 
     return true;
   }
-  // creating a SSL certificate
+
   async setupSSL(email: string, host: string): Promise<void> {
-    let certbotResponse = await this.exec(
+    // Прямий виклик this.ssh.execCommand
+    let certbotResponse = await this.ssh.execCommand(
       `certbot --non-interactive --agree-tos --nginx -m "${email}" -d "${host}"`
     );
-    if (certbotResponse.includes(`Some challenges have failed.`)) {
+  
+    if (certbotResponse.stdout.includes(`Some challenges have failed.`)) {
       throw new Error("Certbot encountered an error");
     }
-    await this.exec(
+  
+    await this.ssh.execCommand(
       `echo "0 12 * * * /usr/bin/certbot renew --quiet" | crontab -`
     );
   }
+  
 
   // Git
   async refresh(): Promise<boolean> {