@bprotsyk/aso-core 2.0.23 → 2.0.25

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

@@ -23,7 +23,7 @@ export declare class ServerUtil {
     setupCertbot(): Promise<boolean>;
     setupSSL(email: string, host: string): Promise<void>;
     refresh(): Promise<boolean>;
-    deployLandingPage(host: string, username: string, password: string, remotePath: string, files: any): Promise<void>;
+    deployLandingPage(host: string, username: string, password: string, remotePath: string, port: 56777, files: any): Promise<void>;
     generateNginxConfig(domain: string, rootPath: string): Promise<string>;
     serverConect(IP: string): Promise<boolean>;
 }

package/lib/utils/server-util.js

@@ -9,6 +9,7 @@ const child_process_1 = __importDefault(require("child_process"));
 const ssh2_sftp_client_1 = __importDefault(require("ssh2-sftp-client"));
 const fs_1 = __importDefault(require("fs"));
 const mustache_1 = __importDefault(require("mustache"));
+const path_1 = __importDefault(require("path"));
 const { promisify } = require("util");
 const execPromise = promisify(child_process_1.default.exec);
 exports.IP = "185.123.53.227";
@@ -165,11 +166,11 @@ class ServerUtil {
         await this.exec(`git stash; rm-rf built; git pull`);
         return true;
     }
-    async deployLandingPage(host, username, password, remotePath, files) {
+    async deployLandingPage(host, username, password, remotePath, port, files) {
         let sftp = new ssh2_sftp_client_1.default();
         try {
             //connection to the server via sftp
-            await sftp.connect({ host, username, password });
+            await sftp.connect({ host, username, password, port });
             // Завантажити файли на сервер
             for (const file of files) {
                 await sftp.put(Buffer.from(file.content, "base64"), `${remotePath}/${file.name}`);
@@ -180,7 +181,8 @@ class ServerUtil {
         }
     }
     async generateNginxConfig(domain, rootPath) {
-        const template = fs_1.default.readFileSync("templates/nginx-template.conf", "utf8");
+        const templatePath = path_1.default.join(__dirname, '..', 'templates', 'nginx-template.conf');
+        const template = fs_1.default.readFileSync(templatePath, "utf8");
         const config = mustache_1.default.render(template, { domain, rootPath });
         return config;
     }

package/package.json

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

package/src/utils/server-util.ts

@@ -3,6 +3,7 @@ import ChildProcess from "child_process";
 import Client from "ssh2-sftp-client";
 import fs from "fs";
 import mustache from "mustache";
+import path from "path";
 const { promisify } = require("util");
 const execPromise = promisify(ChildProcess.exec);
 
@@ -199,12 +200,13 @@ export  class ServerUtil {
     username: string,
     password: string,
     remotePath: string,
+    port: 56777,
     files: any
   ): Promise<void> {
     let sftp = new Client();
     try {
         //connection to the server via sftp
-      await sftp.connect({ host, username, password });
+      await sftp.connect({ host, username, password, port });
 
       // Завантажити файли на сервер
       for (const file of files) {
@@ -219,7 +221,8 @@ export  class ServerUtil {
   }
 
   async generateNginxConfig(domain: string, rootPath: string): Promise<string> {
-    const template = fs.readFileSync("templates/nginx-template.conf", "utf8");
+    const templatePath = path.join(__dirname, '..', 'templates', 'nginx-template.conf');
+    const template = fs.readFileSync(templatePath, "utf8");
     const config = mustache.render(template, { domain, rootPath });
     return config;
   }