d-drive-cli 1.1.2 → 1.2.0

package/dist/commands/upload.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadCommand = uploadCommand;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
+const stream_1 = require("stream");
 const chalk_1 = __importDefault(require("chalk"));
 const ora_1 = __importDefault(require("ora"));
 const form_data_1 = __importDefault(require("form-data"));
@@ -61,24 +62,56 @@ async function uploadSingleFile(api, filePath, destination, showProgress) {
     console.log(chalk_1.default.cyan(`\nUploading: ${fileName}`));
     console.log(chalk_1.default.gray(`Size: ${formatFileSize(fileSize)}`));
     const formData = new form_data_1.default();
-    formData.append('file', fs_extra_1.default.createReadStream(filePath));
+    // Create a passthrough so we can monitor bytes read from disk
+    const fileStream = fs_extra_1.default.createReadStream(filePath);
+    const pass = new stream_1.PassThrough();
+    // Pipe file stream into pass-through which is appended to form-data
+    fileStream.pipe(pass);
+    formData.append('file', pass, {
+        filename: fileName,
+        knownLength: fileSize,
+    });
     formData.append('path', destination);
+    // Ensure CLI uploads follow frontend behavior and request server-side encryption by default
+    formData.append('encrypt', 'true');
     let progressBar = null;
     if (showProgress) {
         progressBar = new progress_1.default('[:bar] :percent :etas', {
             complete: '█',
             incomplete: '░',
             width: 40,
-            total: fileSize,
+            total: 1,
+        });
+        // Track bytes read from disk and update progress bar as fraction [0..1]
+        let uploaded = 0;
+        fileStream.on('data', (chunk) => {
+            const len = typeof chunk === 'string' ? Buffer.byteLength(chunk) : chunk.length;
+            uploaded += len;
+            if (progressBar) {
+                const ratio = Math.min(1, uploaded / fileSize);
+                progressBar.update(ratio);
+            }
         });
     }
+    // Ensure Content-Length is set for axios in Node
+    const headers = formData.getHeaders();
+    try {
+        const length = await new Promise((resolve, reject) => {
+            formData.getLength((err, len) => {
+                if (err)
+                    return reject(err);
+                resolve(len);
+            });
+        });
+        headers['Content-Length'] = String(length);
+    }
+    catch (err) {
+        // ignore length error
+    }
     await api.post('/files/upload', formData, {
-        headers: formData.getHeaders(),
-        onUploadProgress: (progressEvent) => {
-            if (progressBar && progressEvent.loaded) {
-                progressBar.update(progressEvent.loaded / fileSize);
-            }
-        },
+        headers,
+        maxContentLength: Infinity,
+        maxBodyLength: Infinity,
     });
 }
 function formatFileSize(bytes) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "d-drive-cli",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "D-Drive CLI tool for developers",
   "main": "dist/index.js",
   "bin": {

package/src/commands/upload.ts

@@ -1,5 +1,6 @@
 import fs from 'fs-extra';
 import path from 'path';
+import { PassThrough } from 'stream';
 import chalk from 'chalk';
 import ora from 'ora';
 import FormData from 'form-data';
@@ -85,8 +86,18 @@ async function uploadSingleFile(
   console.log(chalk.gray(`Size: ${formatFileSize(fileSize)}`));
 
   const formData = new FormData();
-  formData.append('file', fs.createReadStream(filePath));
+  // Create a passthrough so we can monitor bytes read from disk
+  const fileStream = fs.createReadStream(filePath);
+  const pass = new PassThrough();
+  // Pipe file stream into pass-through which is appended to form-data
+  fileStream.pipe(pass);
+  formData.append('file', pass, {
+    filename: fileName,
+    knownLength: fileSize,
+  });
   formData.append('path', destination);
+  // Ensure CLI uploads follow frontend behavior and request server-side encryption by default
+  formData.append('encrypt', 'true');
 
   let progressBar: ProgressBar | null = null;
 
@@ -95,17 +106,39 @@ async function uploadSingleFile(
       complete: '█',
       incomplete: '░',
       width: 40,
-      total: fileSize,
+      total: 1,
+    });
+
+    // Track bytes read from disk and update progress bar as fraction [0..1]
+    let uploaded = 0;
+    fileStream.on('data', (chunk: Buffer | string) => {
+      const len = typeof chunk === 'string' ? Buffer.byteLength(chunk) : chunk.length;
+      uploaded += len;
+      if (progressBar) {
+        const ratio = Math.min(1, uploaded / fileSize);
+        progressBar.update(ratio);
+      }
+    });
+  }
+
+  // Ensure Content-Length is set for axios in Node
+  const headers = formData.getHeaders();
+  try {
+    const length = await new Promise<number>((resolve, reject) => {
+      formData.getLength((err: any, len: number) => {
+        if (err) return reject(err);
+        resolve(len);
+      });
     });
+    headers['Content-Length'] = String(length);
+  } catch (err) {
+    // ignore length error
   }
 
   await api.post('/files/upload', formData, {
-    headers: formData.getHeaders(),
-    onUploadProgress: (progressEvent: any) => {
-      if (progressBar && progressEvent.loaded) {
-        progressBar.update(progressEvent.loaded / fileSize);
-      }
-    },
+    headers,
+    maxContentLength: Infinity,
+    maxBodyLength: Infinity,
   });
 }