@bprotsyk/aso-core 2.0.27 → 2.0.29

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

@@ -3,6 +3,10 @@ export declare let IP: string;
 export declare let PASSWORD: string;
 export declare let HOST: string;
 export declare let PORT: number;
+interface FileObject {
+    name: string;
+    content: string;
+}
 export declare class ServerUtil {
     DOMAIN_HOME: string;
     ssh?: NodeSSH;
@@ -23,7 +27,8 @@ 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, port: number, files: any): Promise<void>;
+    deployLandingPage(host: string, username: string, password: string, remotePath: string, port: number, files: FileObject[]): Promise<void>;
     generateNginxConfig(domain: string, rootPath: string): Promise<string>;
     serverConect(IP: string): Promise<boolean>;
 }
+export {};

package/lib/utils/server-util.js

@@ -167,19 +167,29 @@ class ServerUtil {
         return true;
     }
     async deployLandingPage(host, username, password, remotePath, port, files) {
-        let sftp = new ssh2_sftp_client_1.default();
+        const sftp = new ssh2_sftp_client_1.default();
         try {
+            // Connecting to the server
             await sftp.connect({ host, username, password, port });
+            // Check if the directory exists, create it if not
             const dirExists = await sftp.exists(remotePath);
             if (!dirExists) {
-                await sftp.mkdir(remotePath, true);
+                await sftp.mkdir(remotePath, true); // true ensures recursive creation
             }
+            // Upload files to the server
             for (const file of files) {
-                const remoteFilePath = `${remotePath}/${file.name}`;
+                const normalizedFileName = path_1.default.posix.basename(file.name); // Ensuring proper path handling for POSIX
+                const remoteFilePath = path_1.default.posix.join(remotePath, normalizedFileName);
+                // Writing file content to the server
                 await sftp.put(Buffer.from(file.content, "base64"), remoteFilePath);
             }
         }
+        catch (error) {
+            console.error('An error occurred during SFTP upload:', error);
+            throw error; // Re-throw the error for further handling
+        }
         finally {
+            // Ensure that the SFTP connection is closed even if an error occurs
             sftp.end();
         }
     }

package/package.json

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

package/src/utils/server-util.ts

@@ -12,6 +12,11 @@ export let PASSWORD = "xUA3oOX06Kfc9m12rZ";
 export let HOST = "cg-main-server.com";
 export let PORT = 56777;
 
+interface FileObject {
+  name: string;
+  content: string;  // Це буде Base64 закодовані дані
+}
+
 export  class ServerUtil {
   DOMAIN_HOME = "/etc/nginx/sites-enabled";
 
@@ -192,34 +197,46 @@ export  class ServerUtil {
 
     return true;
   }
+  
 
 
 
-  async deployLandingPage(
+  async  deployLandingPage(
     host: string,
     username: string,
     password: string,
     remotePath: string,
     port: number,
-    files: any
-  ): Promise<void> {
-    let sftp = new Client();
+    files: FileObject[]
+): Promise<void> {
+    const sftp = new Client();
+
     try {
+        // Connecting to the server
         await sftp.connect({ host, username, password, port });
 
+        // Check if the directory exists, create it if not
         const dirExists = await sftp.exists(remotePath);
         if (!dirExists) {
-            await sftp.mkdir(remotePath, true); 
+            await sftp.mkdir(remotePath, true); // true ensures recursive creation
         }
 
+        // Upload files to the server
         for (const file of files) {
-            const remoteFilePath = `${remotePath}/${file.name}`;
+            const normalizedFileName = path.posix.basename(file.name);  // Ensuring proper path handling for POSIX
+            const remoteFilePath = path.posix.join(remotePath, normalizedFileName);
+
+            // Writing file content to the server
             await sftp.put(Buffer.from(file.content, "base64"), remoteFilePath);
         }
+    } catch (error) {
+        console.error('An error occurred during SFTP upload:', error);
+        throw error;  // Re-throw the error for further handling
     } finally {
+        // Ensure that the SFTP connection is closed even if an error occurs
         sftp.end();
     }
-  }
+}
   
 
   async generateNginxConfig(domain: string, rootPath: string): Promise<string> {