@dynamicweb/cli 1.0.14 → 1.0.15

package/bin/commands/files.js

@@ -5,7 +5,7 @@ import FormData from 'form-data';
 import { setupEnv, getAgent } from './env.js';
 import { setupUser } from './login.js';
 import { interactiveConfirm, formatBytes, createThrottledStatusUpdater } from '../utils.js';
-import { downloadWithProgress, getFileNameFromResponse } from '../downloader.js';
+import { downloadWithProgress, tryGetFileNameFromResponse } from '../downloader.js';
 import { extractWithProgress } from '../extractor.js';
 
 export function filesCommand() {
@@ -198,7 +198,7 @@ async function download(env, user, dirPath, outPath, recursive, outname, raw, ia
         agent: getAgent(env.protocol)
     });
 
-    const filename = outname || getFileNameFromResponse(res);
+    const filename = outname || tryGetFileNameFromResponse(res, dirPath);
     if (!filename) return;
 
     let filePath = path.resolve(`${path.resolve(outPath)}/${filename}`)

package/bin/downloader.js

@@ -6,17 +6,35 @@ import fs from 'fs';
  * @param {Response} res - The HTTP response object.
  * @returns {string} The extracted file name.
  */
-export function getFileNameFromResponse(res) {
+export function getFileNameFromResponse(res, dirPath) {
     const header = res.headers.get('content-disposition');
     const parts = header?.split(';');
     
     if (!parts) {
-        throw new Error(`No files found in directory '${dirPath}', if you want to download all folders recursively include the -r flag`);
+        const msg = `No files found in directory '${dirPath}', if you want to download all folders recursively include the -r flag`;
+        throw new Error(msg);
     }
 
     return parts[1].split('=')[1].replace('+', ' ');
 }
 
+/**
+ * Attempts to extract the file name from an HTTP response.
+ * If extraction fails, logs the error message to the console.
+ *
+ * @param {Object} res - The HTTP response object to extract the file name from.
+ * @param {string} dirPath - The directory path to use for file name resolution.
+ * @returns {string|null} The extracted file name, or null if extraction fails.
+ */
+export function tryGetFileNameFromResponse(res, dirPath) {
+    try {
+        return getFileNameFromResponse(res, dirPath);
+    } catch (err) {
+        console.error(err.message);
+        return null;
+    }
+}
+
 /**
  * Downloads a file with progress reporting.
  * @param {Response} res - The response from which to read the stream data.

package/package.json

@@ -2,7 +2,7 @@
   "name": "@dynamicweb/cli",
   "type": "module",
   "description": "Dynamicweb CLI is a commandline tool for interacting with Dynamicweb 10 solutions.",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "main": "bin/index.js",
   "files": [
     "bin/*"