@bprotsyk/aso-core 2.0.34 → 2.0.36

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

@@ -30,8 +30,9 @@ export declare class ServerUtil {
     setupSSL(email: string, host: string): Promise<void>;
     refresh(): Promise<boolean>;
     uploadDirectoryToSftp(localDir: string, remoteDir: string, sftpConfig: any): Promise<void>;
+    ensureDirectoryExistence(dirPath: string): void;
     generateNginxConfig(domain: string, rootPath: string): Promise<string>;
-    extractUploadedZip(name: string, file: any): Promise<void>;
+    extractUploadedZip(name: string, file: any, extractToPath: string): Promise<void>;
     ensureDirectoryExistsViaSSH(sshConfig: ISFTP, remoteDir: string): Promise<void>;
 }
 export {};

package/lib/utils/server-util.js

@@ -201,18 +201,23 @@ class ServerUtil {
             await sftp.end();
         }
     }
+    ensureDirectoryExistence(dirPath) {
+        if (!fs_1.default.existsSync(dirPath)) {
+            fs_1.default.mkdirSync(dirPath, { recursive: true });
+        }
+    }
     async generateNginxConfig(domain, rootPath) {
         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;
     }
-    async extractUploadedZip(name, file) {
+    async extractUploadedZip(name, file, extractToPath) {
         const zipFilePath = file.path;
-        const outputDir = path_1.default.join(__dirname, '..', 'uploads', name);
+        const outputDir = path_1.default.join(extractToPath, name);
         console.log('Looking for ZIP file at:', zipFilePath);
         console.log('Extracting to:', outputDir);
-        ensureDirectoryExistence(outputDir);
+        this.ensureDirectoryExistence(outputDir);
         if (!fs_1.default.existsSync(zipFilePath)) {
             console.error('Error: File not found:', zipFilePath);
             return;
@@ -225,10 +230,10 @@ class ServerUtil {
                     // Видаляємо перший сегмент шляху, щоб уникнути кореневої директорії
                     const entryPath = path_1.default.join(outputDir, ...entry.path.split('/').slice(1));
                     if (entry.type === 'Directory') {
-                        ensureDirectoryExistence(entryPath);
+                        this.ensureDirectoryExistence(entryPath);
                     }
                     else {
-                        ensureDirectoryExistence(path_1.default.dirname(entryPath));
+                        this.ensureDirectoryExistence(path_1.default.dirname(entryPath));
                         entry.pipe(fs_1.default.createWriteStream(entryPath));
                     }
                 })
@@ -260,6 +265,3 @@ class ServerUtil {
     }
 }
 exports.ServerUtil = ServerUtil;
-function ensureDirectoryExistence(outputDir) {
-    throw new Error("Function not implemented.");
-}

package/package.json

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

package/src/utils/server-util.ts

@@ -248,6 +248,12 @@ export class ServerUtil {
     }
   }
 
+   ensureDirectoryExistence(dirPath:string) {
+    if (!fs.existsSync(dirPath)) {
+      fs.mkdirSync(dirPath, { recursive: true });
+    }
+  }
+
   async generateNginxConfig(domain: string, rootPath: string): Promise<string> {
     const templatePath = path.join(
       __dirname,
@@ -261,14 +267,14 @@ export class ServerUtil {
   }
 
 
-  async  extractUploadedZip(name:string, file:any) {
+  async  extractUploadedZip(name:string, file:any, extractToPath:string ) {
     const zipFilePath = file.path;
-    const outputDir = path.join(__dirname, '..', 'uploads', name);
+    const outputDir = path.join(extractToPath, name);
   
     console.log('Looking for ZIP file at:', zipFilePath);
     console.log('Extracting to:', outputDir);
   
-    ensureDirectoryExistence(outputDir);
+    this.ensureDirectoryExistence(outputDir);
   
     if (!fs.existsSync(zipFilePath)) {
       console.error('Error: File not found:', zipFilePath);
@@ -287,9 +293,9 @@ export class ServerUtil {
             );
   
             if (entry.type === 'Directory') {
-              ensureDirectoryExistence(entryPath);
+              this.ensureDirectoryExistence(entryPath);
             } else {
-              ensureDirectoryExistence(path.dirname(entryPath));
+              this.ensureDirectoryExistence(path.dirname(entryPath));
               entry.pipe(fs.createWriteStream(entryPath));
             }
           })
@@ -324,7 +330,5 @@ export class ServerUtil {
     }
   }
 }
-function ensureDirectoryExistence(outputDir: string) {
-  throw new Error("Function not implemented.");
-}
+