@internxt/cli 1.6.0 → 1.6.2

package/dist/webdav/handlers/GET.handler.js

@@ -5,6 +5,7 @@ const webdav_utils_1 = require("../../utils/webdav.utils");
 const errors_utils_1 = require("../../utils/errors.utils");
 const logger_utils_1 = require("../../utils/logger.utils");
 const network_utils_1 = require("../../utils/network.utils");
+const command_types_1 = require("../../types/command.types");
 class GETRequestHandler {
     dependencies;
     constructor(dependencies) {
@@ -13,8 +14,6 @@ class GETRequestHandler {
     handle = async (req, res) => {
         const { driveFileService, authService, networkFacade } = this.dependencies;
         const resource = await webdav_utils_1.WebDavUtils.getRequestedResource(req.url);
-        if (resource.name.startsWith('._'))
-            throw new errors_utils_1.NotFoundError('File not found');
         logger_utils_1.webdavLogger.info(`[GET] Request received item at ${resource.url}`);
         const driveFile = await webdav_utils_1.WebDavUtils.getDriveFileFromResource({
             url: resource.url,
@@ -26,31 +25,43 @@ class GETRequestHandler {
         logger_utils_1.webdavLogger.info(`[GET] [${driveFile.uuid}] Found Drive File`);
         const { user } = await authService.getAuthDetails();
         logger_utils_1.webdavLogger.info(`[GET] [${driveFile.uuid}] Network ready for download`);
-        const range = req.headers['range'];
-        const rangeOptions = network_utils_1.NetworkUtils.parseRangeHeader({
-            range,
-            totalFileSize: driveFile.size,
-        });
-        let contentLength = driveFile.size;
-        if (rangeOptions) {
-            logger_utils_1.webdavLogger.info(`[GET] [${driveFile.uuid}] Range request received:`, { rangeOptions });
-            contentLength = rangeOptions.rangeSize;
-        }
         res.header('Content-Type', 'application/octet-stream');
-        res.header('Content-length', contentLength.toString());
-        const writable = new WritableStream({
-            write(chunk) {
-                res.write(chunk);
-            },
-            close() {
-                res.end();
-            },
-        });
-        const [executeDownload] = await networkFacade.downloadToStream(driveFile.bucket, user.mnemonic, driveFile.fileId, contentLength, writable, rangeOptions);
-        logger_utils_1.webdavLogger.info(`[GET] [${driveFile.uuid}] Download prepared, executing...`);
-        res.status(200);
-        await executeDownload;
-        logger_utils_1.webdavLogger.info(`[GET] [${driveFile.uuid}] ✅ Download ready, replying to client`);
+        const fileSize = driveFile.size ?? 0;
+        if (fileSize > 0) {
+            const range = req.headers['range'];
+            const rangeOptions = network_utils_1.NetworkUtils.parseRangeHeader({
+                range,
+                totalFileSize: fileSize,
+            });
+            let contentLength = fileSize;
+            if (rangeOptions) {
+                logger_utils_1.webdavLogger.info(`[GET] [${driveFile.uuid}] Range request received:`, { rangeOptions });
+                contentLength = rangeOptions.rangeSize;
+            }
+            res.header('Content-length', contentLength.toString());
+            const writable = new WritableStream({
+                write(chunk) {
+                    res.write(chunk);
+                },
+                close() {
+                    res.end();
+                },
+            });
+            if (!driveFile.fileId) {
+                throw new command_types_1.NotValidFileIdError();
+            }
+            const [executeDownload] = await networkFacade.downloadToStream(driveFile.bucket, user.mnemonic, driveFile.fileId, contentLength, writable, rangeOptions);
+            logger_utils_1.webdavLogger.info(`[GET] [${driveFile.uuid}] Download prepared, executing...`);
+            res.status(200);
+            await executeDownload;
+            logger_utils_1.webdavLogger.info(`[GET] [${driveFile.uuid}] ✅ Download ready, replying to client`);
+        }
+        else {
+            logger_utils_1.webdavLogger.info(`[GET] [${driveFile.uuid}] File is empty, replying to client with no content`);
+            res.header('Content-length', '0');
+            res.status(200);
+            res.end();
+        }
     };
 }
 exports.GETRequestHandler = GETRequestHandler;

package/dist/webdav/handlers/PUT.handler.js

@@ -9,7 +9,6 @@ const types_1 = require("@internxt/sdk/dist/drive/storage/types");
 const cli_utils_1 = require("../../utils/cli.utils");
 const stream_utils_1 = require("../../utils/stream.utils");
 const thumbnail_utils_1 = require("../../utils/thumbnail.utils");
-const thumbnail_service_1 = require("../../services/thumbnail.service");
 const async_utils_1 = require("../../utils/async.utils");
 class PUTRequestHandler {
     dependencies;
@@ -17,9 +16,9 @@ class PUTRequestHandler {
         this.dependencies = dependencies;
     }
     handle = async (req, res) => {
-        const contentLength = Number(req.headers['content-length']);
-        if (!contentLength || isNaN(contentLength) || contentLength <= 0) {
-            throw new errors_utils_1.UnsupportedMediaTypeError('Empty files are not supported');
+        let contentLength = Number(req.headers['content-length']);
+        if (!contentLength || Number.isNaN(contentLength) || contentLength <= 0) {
+            contentLength = 0;
         }
         const resource = await webdav_utils_1.WebDavUtils.getRequestedResource(req.url);
         const driveFileItem = await webdav_utils_1.WebDavUtils.getDriveItemFromResource({
@@ -31,7 +30,12 @@ class PUTRequestHandler {
             throw new errors_utils_1.NotFoundError('Folders cannot be created with PUT. Use MKCOL instead.');
         }
         logger_utils_1.webdavLogger.info(`[PUT] Request received for file at ${resource.url}`);
-        logger_utils_1.webdavLogger.info(`[PUT] Uploading '${resource.name}' to '${resource.parentPath}'`);
+        logger_utils_1.webdavLogger.info(`[PUT] Uploading '${resource.name}' (${cli_utils_1.CLIUtils.formatBytesToString(contentLength)}) to '${resource.parentPath}'`);
+        const timings = {
+            networkUpload: 0,
+            driveUpload: 0,
+            thumbnailUpload: 0,
+        };
         const parentDriveFolderItem = (await this.dependencies.webDavFolderService.getDriveFolderItemFromPath(resource.parentPath)) ??
             (await this.dependencies.webDavFolderService.createParentPathOrThrow(resource.parentPath));
         try {
@@ -46,7 +50,6 @@ class PUTRequestHandler {
         }
         const { user } = await this.dependencies.authService.getAuthDetails();
         const fileType = resource.path.ext.replace('.', '');
-        const timer = cli_utils_1.CLIUtils.timer();
         let bufferStream;
         let fileStream = req;
         const isThumbnailable = (0, thumbnail_utils_1.isFileThumbnailable)(fileType);
@@ -54,30 +57,36 @@ class PUTRequestHandler {
             bufferStream = new stream_utils_1.BufferStream();
             fileStream = req.pipe(bufferStream);
         }
-        let uploaded = false, aborted = false;
-        const progressCallback = (progress) => {
-            if (!uploaded && !aborted) {
-                logger_utils_1.webdavLogger.info(`[PUT] Upload progress for file ${resource.name}: ${(progress * 100).toFixed(2)}%`);
-            }
-        };
-        const fileId = await new Promise((resolve, reject) => {
-            const state = this.dependencies.networkFacade.uploadFile(fileStream, contentLength, user.bucket, (err, res) => {
-                if (err) {
-                    aborted = true;
-                    return reject(err);
-                }
-                resolve(res);
-            }, progressCallback);
-            res.on('close', async () => {
-                aborted = true;
-                if (!uploaded) {
-                    logger_utils_1.webdavLogger.info('[PUT] ❌ HTTP Client has been disconnected, res has been closed.');
-                    state.stop();
+        let fileId;
+        if (contentLength > 0) {
+            let uploaded = false, aborted = false;
+            const progressCallback = (progress) => {
+                if (!uploaded && !aborted) {
+                    logger_utils_1.webdavLogger.info(`[PUT] Upload progress for file ${resource.name}: ${(progress * 100).toFixed(2)}%`);
                 }
+            };
+            const networkUploadTimer = cli_utils_1.CLIUtils.timer();
+            fileId = await new Promise((resolve, reject) => {
+                const state = this.dependencies.networkFacade.uploadFile(fileStream, contentLength, user.bucket, (err, res) => {
+                    if (err) {
+                        aborted = true;
+                        return reject(err);
+                    }
+                    resolve(res);
+                }, progressCallback);
+                res.on('close', async () => {
+                    aborted = true;
+                    if (!uploaded) {
+                        logger_utils_1.webdavLogger.info('[PUT] ❌ HTTP Client has been disconnected, res has been closed.');
+                        state.stop();
+                    }
+                });
             });
-        });
-        uploaded = true;
-        logger_utils_1.webdavLogger.info('[PUT] ✅ File uploaded to network');
+            uploaded = true;
+            timings.networkUpload = networkUploadTimer.stop();
+            logger_utils_1.webdavLogger.info('[PUT] ✅ File uploaded to network');
+        }
+        const driveTimer = cli_utils_1.CLIUtils.timer();
         const file = await drive_file_service_1.DriveFileService.instance.createFile({
             plainName: resource.path.name,
             type: fileType,
@@ -87,21 +96,27 @@ class PUTRequestHandler {
             bucket: user.bucket,
             encryptVersion: types_1.EncryptionVersion.Aes03,
         });
-        try {
-            if (isThumbnailable && bufferStream) {
-                const thumbnailBuffer = bufferStream.getBuffer();
-                if (thumbnailBuffer) {
-                    await thumbnail_service_1.ThumbnailService.instance.uploadThumbnail(thumbnailBuffer, fileType, user.bucket, file.uuid, this.dependencies.networkFacade);
-                }
-            }
-        }
-        catch (error) {
-            logger_utils_1.webdavLogger.info(`[PUT] ❌ File thumbnail upload failed ${error.message}`);
+        timings.driveUpload = driveTimer.stop();
+        const thumbnailTimer = cli_utils_1.CLIUtils.timer();
+        if (contentLength > 0 && isThumbnailable && bufferStream) {
+            void (0, thumbnail_utils_1.tryUploadThumbnail)({
+                bufferStream,
+                fileType,
+                userBucket: user.bucket,
+                fileUuid: file.uuid,
+                networkFacade: this.dependencies.networkFacade,
+            });
         }
-        const uploadTime = timer.stop();
-        logger_utils_1.webdavLogger.info(`[PUT] ✅ File uploaded in ${uploadTime}ms to Internxt Drive`);
+        timings.thumbnailUpload = thumbnailTimer.stop();
+        const totalTime = Object.values(timings).reduce((sum, time) => sum + time, 0);
+        const throughputMBps = cli_utils_1.CLIUtils.calculateThroughputMBps(contentLength, timings.networkUpload);
+        logger_utils_1.webdavLogger.info(`[PUT] ✅ File uploaded in ${cli_utils_1.CLIUtils.formatDuration(totalTime)} to Internxt Drive`);
+        logger_utils_1.webdavLogger.info(`[PUT] Timing breakdown:\n
+      Network upload: ${cli_utils_1.CLIUtils.formatDuration(timings.networkUpload)} (${throughputMBps.toFixed(2)} MB/s)\n
+      Drive upload: ${cli_utils_1.CLIUtils.formatDuration(timings.driveUpload)}\n
+      Thumbnail: ${cli_utils_1.CLIUtils.formatDuration(timings.thumbnailUpload)}\n`);
         await async_utils_1.AsyncUtils.sleep(500);
-        logger_utils_1.webdavLogger.info(`[PUT] [RESPONSE-201] ${resource.url} - Returning 201 Created after ${uploadTime}ms (+ 500ms propagation delay)`);
+        logger_utils_1.webdavLogger.info(`[PUT] [RESPONSE-201] ${resource.url} - Returning 201 Created after ${cli_utils_1.CLIUtils.formatDuration(totalTime)}`);
         res.status(201).send();
     };
 }

package/dist/webdav/middewares/errors.middleware.js

@@ -16,7 +16,7 @@ const ErrorHandlingMiddleware = (err, req, res, _) => {
         [xml_utils_1.XMLUtils.addDefaultNamespace('responsedescription')]: message,
     }, {}, 'error');
     let statusCode = 500;
-    if ('statusCode' in err && !isNaN(err.statusCode)) {
+    if ('statusCode' in err && !Number.isNaN(err.statusCode)) {
         statusCode = err.statusCode;
     }
     res.status(statusCode).send(errorBodyXML);

package/dist/webdav/webdav-server.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebDavServer = void 0;
-const https_1 = __importDefault(require("https"));
-const http_1 = __importDefault(require("http"));
+const node_https_1 = __importDefault(require("node:https"));
+const node_http_1 = __importDefault(require("node:http"));
 const config_service_1 = require("../services/config.service");
 const OPTIONS_handler_1 = require("./handlers/OPTIONS.handler");
 const PROPFIND_handler_1 = require("./handlers/PROPFIND.handler");
@@ -136,11 +136,11 @@ class WebDavServer {
         const plainHttp = configs.protocol === 'http';
         let server;
         if (plainHttp) {
-            server = http_1.default.createServer(this.app);
+            server = node_http_1.default.createServer(this.app);
         }
         else {
             const httpsCerts = await network_utils_1.NetworkUtils.getWebdavSSLCerts(configs);
-            server = https_1.default.createServer(httpsCerts, this.app);
+            server = node_https_1.default.createServer(httpsCerts, this.app);
         }
         server.requestTimeout = configs.timeoutMinutes * 60 * 1000;
         server.listen(Number(configs.port), configs.host, undefined, () => {

package/oclif.manifest.json

@@ -1190,6 +1190,67 @@
         "upload-file.js"
       ]
     },
+    "upload-folder": {
+      "aliases": [
+        "upload:folder"
+      ],
+      "args": {},
+      "description": "Upload a folder to Internxt Drive",
+      "examples": [
+        "<%= config.bin %> <%= command.id %>"
+      ],
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "non-interactive": {
+          "char": "x",
+          "description": "Prevents the CLI from being interactive. When enabled, the CLI will not request input through the console and will throw errors directly.",
+          "env": "INXT_NONINTERACTIVE",
+          "helpGroup": "helper",
+          "name": "non-interactive",
+          "required": false,
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "folder": {
+          "char": "f",
+          "description": "The path to the folder on your system.",
+          "name": "folder",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "destination": {
+          "char": "i",
+          "description": "The folder id where the folder is going to be uploaded to. Leave empty for the root folder.",
+          "name": "destination",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "upload-folder",
+      "pluginAlias": "@internxt/cli",
+      "pluginName": "@internxt/cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "isESM": false,
+      "relativePath": [
+        "dist",
+        "commands",
+        "upload-folder.js"
+      ]
+    },
     "webdav-config": {
       "aliases": [],
       "args": {},
@@ -1355,5 +1416,5 @@
       ]
     }
   },
-  "version": "1.6.0"
+  "version": "1.6.2"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "author": "Internxt <hello@internxt.com>",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "Internxt CLI to manage your encrypted storage",
   "scripts": {
     "build": "yarn clean && tsc",
@@ -36,59 +36,59 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
-    "@inquirer/prompts": "7.10.1",
+    "@inquirer/prompts": "8.2.0",
     "@internxt/inxt-js": "2.2.9",
     "@internxt/lib": "1.4.1",
-    "@internxt/sdk": "1.11.15",
+    "@internxt/sdk": "1.12.0",
     "@oclif/core": "4.8.0",
     "@oclif/plugin-autocomplete": "3.2.39",
     "axios": "1.13.2",
     "bip39": "3.1.0",
-    "body-parser": "2.2.0",
+    "body-parser": "2.2.2",
     "cli-progress": "3.12.0",
     "dayjs": "1.11.19",
     "dotenv": "17.2.3",
-    "express": "5.1.0",
+    "express": "5.2.1",
     "express-async-handler": "1.2.0",
-    "fast-xml-parser": "5.3.2",
-    "mime-types": "3.0.1",
+    "fast-xml-parser": "5.3.3",
+    "mime-types": "3.0.2",
     "open": "11.0.0",
-    "openpgp": "6.2.2",
+    "openpgp": "6.3.0",
     "otpauth": "9.4.1",
-    "pm2": "6.0.13",
+    "pm2": "6.0.14",
     "range-parser": "1.2.1",
-    "selfsigned": "4.0.0",
+    "selfsigned": "5.5.0",
     "tty-table": "5.0.0",
-    "winston": "3.18.3"
+    "winston": "3.19.0"
   },
   "devDependencies": {
     "@internxt/eslint-config-internxt": "2.0.1",
     "@internxt/prettier-config": "internxt/prettier-config#v1.0.2",
-    "@openpgp/web-stream-tools": "0.1.3",
+    "@openpgp/web-stream-tools": "0.3.0",
     "@types/cli-progress": "3.11.6",
-    "@types/express": "5.0.5",
+    "@types/express": "5.0.6",
     "@types/mime-types": "3.0.1",
-    "@types/node": "22.18.12",
+    "@types/node": "25.0.7",
     "@types/range-parser": "1.2.7",
-    "@vitest/coverage-istanbul": "4.0.10",
-    "@vitest/spy": "4.0.10",
-    "eslint": "9.39.1",
+    "@vitest/coverage-istanbul": "4.0.17",
+    "@vitest/spy": "4.0.17",
+    "eslint": "9.39.2",
     "husky": "9.1.7",
-    "lint-staged": "16.2.6",
+    "lint-staged": "16.2.7",
     "nodemon": "3.1.11",
-    "oclif": "4.22.47",
-    "prettier": "3.6.2",
-    "rimraf": "6.1.0",
+    "oclif": "4.22.65",
+    "prettier": "3.7.4",
+    "rimraf": "6.1.2",
     "ts-node": "10.9.2",
     "typescript": "5.9.3",
-    "vitest": "4.0.10",
+    "vitest": "4.0.17",
     "vitest-mock-express": "2.2.0"
   },
   "optionalDependencies": {
-    "sharp": "0.34.4"
+    "sharp": "0.34.5"
   },
   "engines": {
-    "node": ">=22.12.0"
+    "node": ">=22.13.0"
   },
   "bin": {
     "internxt": "./bin/run.js"