@internxt/cli 1.5.2 → 1.5.4

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

@@ -16,17 +16,19 @@ class MKCOLRequestHandler {
         const resource = await webdav_utils_1.WebDavUtils.getRequestedResource(req);
         logger_utils_1.webdavLogger.info(`[MKCOL] Request received for ${resource.type} at ${resource.url}`);
         const parentResource = await webdav_utils_1.WebDavUtils.getRequestedResource(resource.parentPath, false);
-        const parentFolderItem = (await webdav_utils_1.WebDavUtils.getAndSearchItemFromResource({
+        const parentDriveItem = await webdav_utils_1.WebDavUtils.getDriveItemFromResource({
             resource: parentResource,
             driveFolderService,
-        }));
-        let folderAlreadyExists = true;
-        try {
-            await driveFolderService.getFolderMetadataByPath(resource.url);
-        }
-        catch {
-            folderAlreadyExists = false;
+        });
+        if (!parentDriveItem) {
+            throw new errors_utils_1.ConflictError(`Parent folders not found on Internxt Drive at ${resource.url}`);
         }
+        const parentFolderItem = parentDriveItem;
+        const driveFolderItem = await webdav_utils_1.WebDavUtils.getDriveItemFromResource({
+            resource,
+            driveFolderService,
+        });
+        const folderAlreadyExists = !!driveFolderItem;
         if (folderAlreadyExists) {
             logger_utils_1.webdavLogger.info(`[MKCOL] ❌ Folder '${resource.url}' already exists`);
             throw new errors_utils_1.MethodNotAllowed('Folder already exists');

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

@@ -20,11 +20,14 @@ class MOVERequestHandler {
         const destinationPath = webdav_utils_1.WebDavUtils.removeHostFromURL(destinationUrl);
         const destinationResource = await webdav_utils_1.WebDavUtils.getRequestedResource(destinationPath);
         logger_utils_1.webdavLogger.info('[MOVE] Destination resource found', { destinationResource });
-        const originalDriveItem = await webdav_utils_1.WebDavUtils.getAndSearchItemFromResource({
+        const originalDriveItem = await webdav_utils_1.WebDavUtils.getDriveItemFromResource({
             resource,
             driveFolderService,
             driveFileService,
         });
+        if (!originalDriveItem) {
+            throw new errors_utils_1.NotFoundError(`Resource not found on Internxt Drive at ${resource.url}`);
+        }
         if (destinationResource.path.dir === resource.path.dir) {
             logger_utils_1.webdavLogger.info(`[MOVE] Renaming ${resource.type} with UUID ${originalDriveItem.uuid} to ${destinationResource.name}`);
             const newName = destinationResource.name;
@@ -47,10 +50,14 @@ class MOVERequestHandler {
         else {
             logger_utils_1.webdavLogger.info(`[MOVE] Moving ${resource.type} with UUID ${originalDriveItem.uuid} to ${destinationPath}`);
             const destinationFolderResource = await webdav_utils_1.WebDavUtils.getRequestedResource(destinationResource.parentPath);
-            const destinationFolderItem = (await webdav_utils_1.WebDavUtils.getAndSearchItemFromResource({
+            const destinationDriveFolderItem = await webdav_utils_1.WebDavUtils.getDriveItemFromResource({
                 resource: destinationFolderResource,
                 driveFolderService,
-            }));
+            });
+            if (!destinationDriveFolderItem) {
+                throw new errors_utils_1.NotFoundError(`Resource not found on Internxt Drive at ${resource.url}`);
+            }
+            const destinationFolderItem = destinationDriveFolderItem;
             if (resource.type === 'folder') {
                 const folder = originalDriveItem;
                 await driveFolderService.moveFolder({

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

@@ -13,23 +13,20 @@ class OPTIONSRequestHandler {
             res.header('Allow', 'DELETE, GET, HEAD, MKCOL, MOVE, OPTIONS, PROPFIND, PUT');
             res.header('DAV', '1, 2, ordered-collections');
             res.status(200).send();
-            return;
         }
-        if (resource.type === 'folder') {
+        else if (resource.type === 'folder') {
             const allowedMethods = 'DELETE, HEAD, MKCOL, MOVE, OPTIONS, PROPFIND';
             logger_utils_1.webdavLogger.info(`[OPTIONS] Returning Allowed Options: ${allowedMethods}`);
             res.header('Allow', allowedMethods);
             res.header('DAV', '1, 2, ordered-collections');
             res.status(200).send();
-            return;
         }
-        if (resource.type === 'file') {
+        else {
             const allowedMethods = 'DELETE, GET, HEAD, MOVE, OPTIONS, PROPFIND, PUT';
             logger_utils_1.webdavLogger.info(`[OPTIONS] Returning Allowed Options: ${allowedMethods}`);
             res.header('Allow', allowedMethods);
             res.header('DAV', '1, 2, ordered-collections');
             res.status(200).send();
-            return;
         }
     };
 }

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

@@ -20,28 +20,38 @@ class PROPFINDRequestHandler {
         const { driveFolderService, driveFileService } = this.dependencies;
         const resource = await webdav_utils_1.WebDavUtils.getRequestedResource(req);
         logger_utils_1.webdavLogger.info(`[PROPFIND] Request received for ${resource.type} at ${resource.url}`);
-        try {
-            const driveItem = await webdav_utils_1.WebDavUtils.getAndSearchItemFromResource({
-                resource,
-                driveFolderService,
-                driveFileService,
-            });
-            switch (resource.type) {
-                case 'file': {
-                    const fileMetaXML = await this.getFileMetaXML(resource, driveItem);
-                    res.status(207).send(fileMetaXML);
-                    break;
-                }
-                case 'folder': {
-                    const depth = req.header('depth') ?? '1';
-                    const folderMetaXML = await this.getFolderContentXML(resource, driveItem, depth);
-                    res.status(207).send(folderMetaXML);
-                    break;
-                }
-            }
+        const driveItem = await webdav_utils_1.WebDavUtils.getDriveItemFromResource({
+            resource,
+            driveFolderService,
+            driveFileService,
+        });
+        if (!driveItem) {
+            res.status(207).send(xml_utils_1.XMLUtils.toWebDavXML({
+                [xml_utils_1.XMLUtils.addDefaultNamespace('response')]: {
+                    [xml_utils_1.XMLUtils.addDefaultNamespace('href')]: xml_utils_1.XMLUtils.encodeWebDavUri(resource.url),
+                    [xml_utils_1.XMLUtils.addDefaultNamespace('propstat')]: {
+                        [xml_utils_1.XMLUtils.addDefaultNamespace('status')]: 'HTTP/1.1 404 Not Found',
+                        [xml_utils_1.XMLUtils.addDefaultNamespace('prop')]: {},
+                    },
+                },
+            }, {
+                ignoreAttributes: false,
+                suppressEmptyNode: true,
+            }));
+            return;
         }
-        catch {
-            res.status(207).send();
+        switch (resource.type) {
+            case 'file': {
+                const fileMetaXML = await this.getFileMetaXML(resource, driveItem);
+                res.status(207).send(fileMetaXML);
+                break;
+            }
+            case 'folder': {
+                const depth = req.header('depth') ?? '1';
+                const folderMetaXML = await this.getFolderContentXML(resource, driveItem, depth);
+                res.status(207).send(folderMetaXML);
+                break;
+            }
         }
     };
     getFileMetaXML = async (resource, driveFileItem) => {

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

@@ -27,12 +27,16 @@ class PUTRequestHandler {
         logger_utils_1.webdavLogger.info(`[PUT] Request received for ${resource.type} at ${resource.url}`);
         logger_utils_1.webdavLogger.info(`[PUT] Uploading '${resource.name}' to '${resource.parentPath}'`);
         const parentResource = await webdav_utils_1.WebDavUtils.getRequestedResource(resource.parentPath, false);
-        const parentFolderItem = (await webdav_utils_1.WebDavUtils.getAndSearchItemFromResource({
+        const parentDriveFolderItem = await webdav_utils_1.WebDavUtils.getDriveItemFromResource({
             resource: parentResource,
             driveFolderService,
-        }));
+        });
+        if (!parentDriveFolderItem) {
+            throw new errors_utils_1.ConflictError(`Parent folders not found on Internxt Drive at ${resource.url}`);
+        }
+        const parentFolderItem = parentDriveFolderItem;
         try {
-            const driveFileItem = (await webdav_utils_1.WebDavUtils.getAndSearchItemFromResource({
+            const driveFileItem = (await webdav_utils_1.WebDavUtils.getDriveItemFromResource({
                 resource: resource,
                 driveFileService,
             }));
@@ -93,7 +97,7 @@ class PUTRequestHandler {
             if (isThumbnailable && bufferStream) {
                 const thumbnailBuffer = bufferStream.getBuffer();
                 if (thumbnailBuffer) {
-                    await thumbnail_service_1.ThumbnailService.instance.uploadThumbnail(thumbnailBuffer, fileType, user.bucket, file.id, networkFacade);
+                    await thumbnail_service_1.ThumbnailService.instance.uploadThumbnail(thumbnailBuffer, fileType, user.bucket, file.uuid, networkFacade);
                 }
             }
         }

package/dist/webdav/index.js

@@ -15,7 +15,7 @@ const crypto_service_1 = require("../services/crypto.service");
 const trash_service_1 = require("../services/drive/trash.service");
 const logger_utils_1 = require("../utils/logger.utils");
 const sdk_manager_service_1 = require("../services/sdk-manager.service");
-dotenv_1.default.config();
+dotenv_1.default.config({ quiet: true });
 const init = async () => {
     await config_service_1.ConfigService.instance.ensureInternxtCliDataDirExists();
     await config_service_1.ConfigService.instance.ensureWebdavCertsDirExists();

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthMiddleware = void 0;
 const sdk_manager_service_1 = require("../../services/sdk-manager.service");
 const logger_utils_1 = require("../../utils/logger.utils");
+const xml_utils_1 = require("../../utils/xml.utils");
 const AuthMiddleware = (authService) => {
     return (req, res, next) => {
         (async () => {
@@ -19,8 +20,15 @@ const AuthMiddleware = (authService) => {
                 next();
             }
             catch (error) {
-                logger_utils_1.webdavLogger.error('Error from AuthMiddleware: ' + error.message);
-                res.status(401).send({ error: error.message });
+                let message = 'Authentication required to access this resource.';
+                if ('message' in error && error.message.trim().length > 0) {
+                    message = error.message;
+                }
+                logger_utils_1.webdavLogger.error('Error from AuthMiddleware: ' + message);
+                const errorBodyXML = xml_utils_1.XMLUtils.toWebDavXML({
+                    [xml_utils_1.XMLUtils.addDefaultNamespace('responsedescription')]: message,
+                }, {}, 'error');
+                res.status(401).send(errorBodyXML);
             }
         })();
     };

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

@@ -2,21 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ErrorHandlingMiddleware = void 0;
 const logger_utils_1 = require("../../utils/logger.utils");
+const xml_utils_1 = require("../../utils/xml.utils");
 const ErrorHandlingMiddleware = (err, req, res, _) => {
     logger_utils_1.webdavLogger.error(`[ERROR MIDDLEWARE] [${req.method.toUpperCase()} - ${req.url}]`, err);
-    if ('statusCode' in err) {
-        res.status(err.statusCode).send({
-            error: {
-                message: err.message,
-            },
-        });
-    }
-    else {
-        res.status(500).send({
-            error: {
-                message: 'message' in err ? err.message : 'Something went wrong',
-            },
-        });
+    const errorBodyXML = xml_utils_1.XMLUtils.toWebDavXML({
+        [xml_utils_1.XMLUtils.addDefaultNamespace('responsedescription')]: 'message' in err ? err.message : 'Something went wrong',
+    }, {}, 'error');
+    let statusCode = 500;
+    if ('statusCode' in err && !isNaN(err.statusCode)) {
+        statusCode = err.statusCode;
     }
+    res.status(statusCode).send(errorBodyXML);
 };
 exports.ErrorHandlingMiddleware = ErrorHandlingMiddleware;

package/dist/webdav/webdav-server.d.ts

@@ -17,7 +17,8 @@ export declare class WebDavServer {
     private readonly trashService;
     constructor(app: Express, configService: ConfigService, driveFileService: DriveFileService, driveFolderService: DriveFolderService, downloadService: DownloadService, authService: AuthService, cryptoService: CryptoService, trashService: TrashService);
     private readonly getNetworkFacade;
-    private readonly registerMiddlewares;
+    private readonly registerStartMiddlewares;
+    private readonly registerEndMiddleWares;
     private readonly registerHandlers;
     start: () => Promise<void>;
 }

package/dist/webdav/webdav-server.js

@@ -67,8 +67,7 @@ class WebDavServer {
         const networkFacade = new network_facade_service_1.NetworkFacade(networkModule, environment, download_service_1.DownloadService.instance, crypto_service_1.CryptoService.instance);
         return networkFacade;
     };
-    registerMiddlewares = async () => {
-        this.app.use(errors_middleware_1.ErrorHandlingMiddleware);
+    registerStartMiddlewares = () => {
         this.app.use((0, auth_middleware_1.AuthMiddleware)(auth_service_1.AuthService.instance));
         this.app.use((0, request_logger_middleware_1.RequestLoggerMiddleware)({
             enable: true,
@@ -76,6 +75,9 @@ class WebDavServer {
         this.app.use(body_parser_1.default.text({ type: ['application/xml', 'text/xml'] }));
         this.app.use(mkcol_middleware_1.MkcolMiddleware);
     };
+    registerEndMiddleWares = () => {
+        this.app.use(errors_middleware_1.ErrorHandlingMiddleware);
+    };
     registerHandlers = async () => {
         const serverListenPath = /(.*)/;
         const networkFacade = await this.getNetworkFacade();
@@ -119,8 +121,9 @@ class WebDavServer {
     start = async () => {
         const configs = await this.configService.readWebdavConfig();
         this.app.disable('x-powered-by');
-        await this.registerMiddlewares();
+        this.registerStartMiddlewares();
         await this.registerHandlers();
+        this.registerEndMiddleWares();
         const plainHttp = configs.protocol === 'http';
         let server;
         if (plainHttp) {

package/oclif.manifest.json

@@ -1266,5 +1266,5 @@
       ]
     }
   },
-  "version": "1.5.2"
+  "version": "1.5.4"
 }

package/package.json

@@ -1,10 +1,10 @@
 {
   "author": "Internxt <hello@internxt.com>",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "description": "Internxt CLI to manage your encrypted storage",
   "scripts": {
     "build": "yarn clean && tsc",
-    "clean": "rimraf dist tsconfig.tsbuildinfo oclif.manifest.json",
+    "clean": "rimraf dist coverage tsconfig.tsbuildinfo oclif.manifest.json",
     "lint": "eslint .",
     "pretty": "prettier --write **/*.{js,jsx,tsx,ts}",
     "postpack": "rimraf oclif.manifest.json",
@@ -17,13 +17,14 @@
     "dev:webdav": "nodemon -e ts --exec ts-node src/webdav/index.ts",
     "pack:win": "oclif pack win",
     "publish:npm": "npm run build && npm publish --scope=@internxt --registry=https://registry.npmjs.org/ --access public",
-    "publish:github": "npm run build && npm publish --scope=@internxt --registry=https://npm.pkg.github.com",
+    "publish:github": "npm run build && npm publish --scope=@internxt --registry=https://npm.pkg.github.com --tag latest",
     "postinstall": "node ./scripts/restart-webdav.js"
   },
   "homepage": "https://github.com/internxt/cli",
   "license": "MIT",
   "main": "",
   "name": "@internxt/cli",
+  "clientName": "internxt-cli",
   "repository": "https://github.com/internxt/cli",
   "bugs": "https://github.com/internxt/cli",
   "types": "dist/index.d.ts",
@@ -35,61 +36,61 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
-    "@inquirer/prompts": "7.5.0",
-    "@internxt/inxt-js": "2.1.0",
-    "@internxt/lib": "1.2.1",
-    "@internxt/sdk": "1.7.0",
-    "@oclif/core": "4.3.0",
-    "@types/validator": "13.15.0",
+    "@inquirer/prompts": "7.6.0",
+    "@internxt/inxt-js": "2.2.2",
+    "@internxt/lib": "1.3.1",
+    "@internxt/sdk": "1.10.5",
+    "@oclif/core": "4.4.1",
+    "@types/validator": "13.15.2",
     "async": "3.2.6",
-    "axios": "1.9.0",
+    "axios": "1.10.0",
     "bip39": "3.1.0",
     "body-parser": "2.2.0",
     "cli-progress": "3.12.0",
     "dayjs": "1.11.13",
-    "dotenv": "16.5.0",
+    "dotenv": "17.0.1",
     "express": "5.1.0",
     "express-async-handler": "1.2.0",
     "express-basic-auth": "1.2.1",
-    "fast-xml-parser": "5.2.1",
+    "fast-xml-parser": "5.2.5",
     "mime-types": "3.0.1",
-    "openpgp": "5.11.2",
-    "pm2": "6.0.5",
+    "openpgp": "5.11.3",
+    "pm2": "6.0.8",
     "range-parser": "1.2.1",
     "reflect-metadata": "0.2.2",
     "selfsigned": "2.4.1",
-    "sharp": "0.34.1",
+    "sharp": "0.34.2",
     "tty-table": "4.2.3",
     "winston": "3.17.0"
   },
   "devDependencies": {
     "@internxt/eslint-config-internxt": "2.0.0",
     "@internxt/prettier-config": "internxt/prettier-config#v1.0.2",
-    "@oclif/test": "4.1.12",
+    "@oclif/test": "4.1.13",
     "@openpgp/web-stream-tools": "0.0.11-patch-1",
     "@types/async": "3.2.24",
     "@types/cli-progress": "3.11.6",
-    "@types/express": "5.0.1",
-    "@types/mime-types": "2.1.4",
-    "@types/node": "22.15.3",
+    "@types/express": "5.0.3",
+    "@types/mime-types": "3.0.1",
+    "@types/node": "22.16.0",
     "@types/range-parser": "1.2.7",
-    "@vitest/coverage-istanbul": "3.1.2",
-    "@vitest/spy": "3.1.2",
-    "eslint": "9.25.1",
+    "@vitest/coverage-istanbul": "3.2.4",
+    "@vitest/spy": "3.2.4",
+    "eslint": "9.30.1",
     "husky": "9.1.7",
-    "lint-staged": "15.5.1",
-    "nock": "14.0.4",
+    "lint-staged": "16.1.2",
+    "nock": "14.0.5",
     "nodemon": "3.1.10",
-    "oclif": "4.17.46",
-    "prettier": "3.5.3",
+    "oclif": "4.20.1",
+    "prettier": "3.6.2",
     "rimraf": "6.0.1",
     "ts-node": "10.9.2",
     "typescript": "5.8.3",
-    "vitest": "3.1.2",
+    "vitest": "3.2.4",
     "vitest-mock-express": "2.2.0"
   },
   "engines": {
-    "node": ">=20.12.1"
+    "node": ">=22.12.0"
   },
   "bin": {
     "internxt": "./bin/run.js"

package/scripts/restart-webdav.js

@@ -5,8 +5,9 @@ async function runCommand() {
     exec('node ./bin/run.js webdav restart', (error, stdout, stderr) => {
       if (error) {
         reject(error);
+      } else {
+        resolve(stdout ?? stderr);
       }
-      resolve(stdout || stderr);
     });
   });
 }