fix: Do not create empty folder before extracting & send actual error

tosuapp · Dec 9, 2024 · 95b0419 · 95b0419
1 parent 9a42746
commit 95b0419
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/packages/common/utils/unzip.ts b/packages/common/utils/unzip.ts
@@ -5,15 +5,12 @@ import { wLogger } from './logger';
 
 export const unzip = (zipPath: string, extractPath: string): Promise<string> =>
     new Promise((resolve, reject) => {
-        if (!fs.existsSync(extractPath)) {
-            fs.mkdirSync(extractPath);
-        }
-
         const zip = new AdmZip(zipPath);
 
         try {
-            // Extract all contents of the zip file to the specified destination
-            zip.extractAllTo(extractPath, /* overwrite */ true);
+            if (!fs.existsSync(extractPath)) fs.mkdirSync(extractPath);
+
+            zip.extractAllTo(extractPath, true);
             resolve(extractPath);
         } catch (error) {
             wLogger.error('[unzip]', (error as any).message);

diff --git a/packages/server/router/index.ts b/packages/server/router/index.ts
@@ -107,6 +107,7 @@ export default function buildBaseApi(server: Server) {
                     })
                     .catch((reason) => {
                         fs.unlinkSync(tempPath);
+
                         wLogger.error(
                             '[overlay-unzip]',
                             folderName,
@@ -115,7 +116,7 @@ export default function buildBaseApi(server: Server) {
                         wLogger.debug('[overlay-unzip]', folderName, reason);
 
                         sendJson(res, {
-                            error: reason
+                            error: (reason as Error).message
                         });
                     });
             };
@@ -131,7 +132,7 @@ export default function buildBaseApi(server: Server) {
                     wLogger.debug(`[overlay-download]`, folderName, reason);
 
                     sendJson(res, {
-                        error: reason
+                        error: (reason as Error).message
                     });
                 });
         }
@@ -241,7 +242,7 @@ export default function buildBaseApi(server: Server) {
                 wLogger.debug(`[overlay-settings]`, folderName, settings);
 
                 return sendJson(res, {
-                    error: settings.name
+                    error: settings.message
                 });
             }
 
@@ -285,7 +286,7 @@ export default function buildBaseApi(server: Server) {
                     );
 
                     return sendJson(res, {
-                        error: result.name
+                        error: result.message
                     });
                 }
 

diff --git a/packages/server/utils/commands.ts b/packages/server/utils/commands.ts
@@ -49,7 +49,7 @@ export function handleSocketCommands(data: string, socket: ModifiedWebsocket) {
                 );
                 if (result instanceof Error) {
                     message = {
-                        error: result.name
+                        error: result.message
                     };
                     break;
                 }