@internxt/cli 1.6.6 → 1.6.8

package/dist/utils/cli.utils.js

@@ -118,7 +118,7 @@ class CLIUtils {
                 options: { type: 'input' },
             },
         }, {
-            validate: validation_service_1.ValidationService.instance.validateUUIDv4,
+            validate: validation_service_1.ValidationService.instance.validateUUID,
             error: new command_types_1.NotValidFolderUuidError(),
             canBeEmpty: true,
         }, reporter);
@@ -255,27 +255,14 @@ class CLIUtils {
         }
     };
     static getNetworkCreds = async (userCredentials) => {
-        const currentWorkspace = await auth_service_1.AuthService.instance.getCurrentWorkspace();
-        if (currentWorkspace) {
-            return {
-                bucket: currentWorkspace.workspaceCredentials.bucket,
-                credentials: {
-                    user: currentWorkspace.workspaceCredentials.credentials.user,
-                    pass: currentWorkspace.workspaceCredentials.credentials.pass,
-                },
-                mnemonic: currentWorkspace.workspaceData.workspaceUser.key,
-            };
-        }
-        else {
-            return {
-                bucket: userCredentials.bucket,
-                credentials: {
-                    user: userCredentials.bridgeUser,
-                    pass: userCredentials.userId,
-                },
-                mnemonic: userCredentials.mnemonic,
-            };
-        }
+        return {
+            bucket: userCredentials.bucket,
+            credentials: {
+                user: userCredentials.bridgeUser,
+                pass: userCredentials.userId,
+            },
+            mnemonic: userCredentials.mnemonic,
+        };
     };
 }
 exports.CLIUtils = CLIUtils;

package/dist/utils/drive.utils.d.ts

@@ -1,6 +1,7 @@
 import { FileMeta, FolderMeta, CreateFolderResponse } from '@internxt/sdk/dist/drive/storage/types';
 import { DriveFileItem, DriveFolderItem } from '../types/drive.types';
 export declare class DriveUtils {
+    static parseFileSize(size: string | number): number;
     static driveFileMetaToItem(fileMeta: FileMeta): DriveFileItem;
     static driveFolderMetaToItem(folderMeta: FolderMeta): DriveFolderItem;
     static createFolderResponseToItem(folderResponse: CreateFolderResponse): DriveFolderItem;

package/dist/utils/drive.utils.js

@@ -3,13 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DriveUtils = void 0;
 const types_1 = require("@internxt/sdk/dist/drive/storage/types");
 class DriveUtils {
+    static parseFileSize(size) {
+        const parsed = Number(size);
+        return Number.isFinite(parsed) ? parsed : 0;
+    }
     static driveFileMetaToItem(fileMeta) {
         return {
             itemType: 'file',
             uuid: fileMeta.uuid ?? '',
             status: fileMeta.status,
             folderUuid: fileMeta.folderUuid,
-            size: Number(fileMeta.size),
+            size: DriveUtils.parseFileSize(fileMeta.size),
             name: fileMeta.plainName ?? fileMeta.name,
             bucket: fileMeta.bucket,
             createdAt: new Date(fileMeta.createdAt),

package/dist/utils/format.utils.js

@@ -15,10 +15,14 @@ class FormatUtils {
         return Number((size / Math.pow(1024, unitIndex)).toFixed(2)) + ' ' + units[unitIndex];
     };
     static formatDate = (date) => {
-        return (0, dayjs_1.default)(date).format('D MMMM, YYYY [at] HH:mm');
+        const d = (0, dayjs_1.default)(date);
+        return d.isValid() ? d.format('D MMMM, YYYY [at] HH:mm') : '-';
     };
     static formatDateForWebDav = (date) => {
-        return dayjs_1.default.utc(date).format('ddd, DD MMM YYYY HH:mm:ss [GMT]');
+        const d = dayjs_1.default.utc(date);
+        return d.isValid()
+            ? d.format('ddd, DD MMM YYYY HH:mm:ss [GMT]')
+            : dayjs_1.default.utc().format('ddd, DD MMM YYYY HH:mm:ss [GMT]');
     };
     static formatLimit = (limit) => {
         let result = '...';

package/dist/utils/logger.utils.js

@@ -4,14 +4,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webdavLogger = exports.logger = void 0;
+const node_os_1 = __importDefault(require("node:os"));
 const winston_1 = __importDefault(require("winston"));
 const configs_1 = require("../constants/configs");
+const package_json_1 = __importDefault(require("../../package.json"));
 const maxLogSize = 40 * 1024 * 1024;
 const maxLogsFiles = 5;
+const environmentMeta = {
+    version: package_json_1.default.version,
+    os: `${node_os_1.default.platform()} ${node_os_1.default.release()} (${node_os_1.default.arch()})`,
+    node: process.version,
+};
 exports.logger = winston_1.default.createLogger({
     level: 'info',
     format: winston_1.default.format.combine(winston_1.default.format.timestamp(), winston_1.default.format.json()),
-    defaultMeta: { service: 'internxt-cli' },
+    defaultMeta: { service: 'internxt-cli', ...environmentMeta },
     transports: [
         new winston_1.default.transports.File({
             filename: 'internxt-cli-error.log',
@@ -33,7 +40,7 @@ exports.logger = winston_1.default.createLogger({
 exports.webdavLogger = winston_1.default.createLogger({
     level: 'info',
     format: winston_1.default.format.combine(winston_1.default.format.timestamp(), winston_1.default.format.json()),
-    defaultMeta: { service: 'internxt-webdav' },
+    defaultMeta: { service: 'internxt-webdav', ...environmentMeta },
     transports: [
         new winston_1.default.transports.File({
             filename: 'internxt-webdav-error.log',

package/dist/utils/network.utils.js

@@ -100,10 +100,10 @@ class NetworkUtils {
             }
         }
         else if (parsed === -1) {
-            throw new Error(`Malformed Range-Request. ${JSON.stringify(rangeOptions)}`);
+            throw new Error(`Unsatisfiable Range-Request. ${JSON.stringify(rangeOptions)}`);
         }
         else if (parsed === -2) {
-            throw new Error(`Unsatisfiable Range-Request. ${JSON.stringify(rangeOptions)}`);
+            throw new Error(`Malformed Range-Request. ${JSON.stringify(rangeOptions)}`);
         }
         else {
             throw new Error(`Unknown error from Range-Request. ${JSON.stringify(rangeOptions)}`);

package/dist/utils/stream.utils.d.ts

@@ -6,10 +6,10 @@ export declare class StreamUtils {
     static joinReadableBinaryStreams(streams: ReadableStream<Uint8Array>[]): ReadableStream<Uint8Array>;
 }
 export declare class BufferStream extends Transform {
-    buffer: Buffer | null;
+    private chunks;
     constructor(opts?: TransformOptions);
     _transform(chunk: Buffer, _: BufferEncoding, callback: TransformCallback): void;
     _flush(callback: TransformCallback): void;
     reset(): void;
-    getBuffer(): Buffer | null;
+    getBuffer(): Buffer | undefined;
 }

package/dist/utils/stream.utils.js

@@ -56,24 +56,25 @@ class StreamUtils {
 }
 exports.StreamUtils = StreamUtils;
 class BufferStream extends node_stream_1.Transform {
-    buffer;
+    chunks;
     constructor(opts) {
         super(opts);
-        this.buffer = null;
+        this.chunks = [];
     }
     _transform(chunk, _, callback) {
-        const currentBuffer = this.buffer ?? Buffer.alloc(0);
-        this.buffer = Buffer.concat([currentBuffer, chunk]);
+        this.chunks.push(chunk);
         callback(null, chunk);
     }
     _flush(callback) {
         callback();
     }
     reset() {
-        this.buffer = null;
+        this.chunks = [];
     }
     getBuffer() {
-        return this.buffer;
+        if (this.chunks.length === 0)
+            return undefined;
+        return Buffer.concat(this.chunks);
     }
 }
 exports.BufferStream = BufferStream;

package/dist/utils/thumbnail.utils.d.ts

@@ -5,8 +5,6 @@ export declare const ThumbnailConfig: {
     readonly Type: "png";
 };
 export declare class ThumbnailUtils {
-    static readonly MAX_IMAGE_THUMBNAILABLE_SIZE_IN_MB: number;
-    static readonly isFileThumbnailable: (fileType: string) => boolean;
-    static readonly isPDFThumbnailable: (fileType: string) => boolean;
+    static readonly MAX_IMAGE_THUMBNAILABLE_SIZE_IN_BYTES: number;
     static readonly isImageThumbnailable: (fileType: string, size: number) => boolean;
 }

package/dist/utils/thumbnail.utils.js

@@ -18,9 +18,6 @@ const imageExtensions = {
     raw: ['raw', 'cr2', 'nef', 'orf', 'sr2'],
     webp: ['webp'],
 };
-const pdfExtensions = {
-    pdf: ['pdf'],
-};
 const thumbnailableImageExtension = new Set([
     ...imageExtensions['jpg'],
     ...imageExtensions['png'],
@@ -28,19 +25,12 @@ const thumbnailableImageExtension = new Set([
     ...imageExtensions['gif'],
     ...imageExtensions['tiff'],
 ]);
-const thumbnailablePdfExtension = new Set(pdfExtensions['pdf']);
-const thumbnailableExtension = new Set(thumbnailableImageExtension);
 class ThumbnailUtils {
-    static MAX_IMAGE_THUMBNAILABLE_SIZE_IN_MB = 500 * 1024 * 1024;
-    static isFileThumbnailable = (fileType) => {
-        return fileType.trim().length > 0 && thumbnailableExtension.has(fileType.trim().toLowerCase());
-    };
-    static isPDFThumbnailable = (fileType) => {
-        return fileType.trim().length > 0 && thumbnailablePdfExtension.has(fileType.trim().toLowerCase());
-    };
+    static MAX_IMAGE_THUMBNAILABLE_SIZE_IN_BYTES = 128 * 1024 * 1024;
     static isImageThumbnailable = (fileType, size) => {
-        if (size > ThumbnailUtils.MAX_IMAGE_THUMBNAILABLE_SIZE_IN_MB)
+        if (size <= 0 || size > ThumbnailUtils.MAX_IMAGE_THUMBNAILABLE_SIZE_IN_BYTES) {
             return false;
+        }
         return fileType.trim().length > 0 && thumbnailableImageExtension.has(fileType.trim().toLowerCase());
     };
 }

package/dist/utils/upload.utils.d.ts

@@ -2,7 +2,7 @@ import { Readable } from 'node:stream';
 import { BufferStream } from './stream.utils';
 export declare class UploadUtils {
     static readonly checkUploadSizeLimits: (size: number) => Promise<void>;
-    static readonly prepareUploadStreams: (readable: Readable, fileType: string) => {
+    static readonly prepareUploadStreams: (readable: Readable, fileType: string, size: number) => {
         fileStream: Readable;
         thumbnailStream: BufferStream | undefined;
         isThumbnailable: boolean;

package/dist/utils/upload.utils.js

@@ -19,8 +19,8 @@ class UploadUtils {
             throw new Error('File is too big (more than 100 GB)');
         }
     };
-    static prepareUploadStreams = (readable, fileType) => {
-        const isThumbnailable = thumbnail_utils_1.ThumbnailUtils.isFileThumbnailable(fileType);
+    static prepareUploadStreams = (readable, fileType, size) => {
+        const isThumbnailable = thumbnail_utils_1.ThumbnailUtils.isImageThumbnailable(fileType, size);
         if (!isThumbnailable) {
             return { fileStream: readable, thumbnailStream: undefined, isThumbnailable };
         }

package/dist/utils/webdav.utils.d.ts

@@ -13,4 +13,6 @@ export declare class WebDavUtils {
         itemType: 'file' | 'folder';
         uuid: string;
     }>(driveItem: T): Promise<void>;
+    static generateETag(parts: Array<string | number | null | undefined>): string;
+    static getItemETag(driveItem: DriveFileItem | DriveFolderItem): string;
 }

package/dist/utils/webdav.utils.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebDavUtils = void 0;
 const node_path_1 = __importDefault(require("node:path"));
+const node_crypto_1 = require("node:crypto");
 const drive_item_service_1 = require("../services/drive/drive-item.service");
 const logger_utils_1 = require("./logger.utils");
 const config_service_1 = require("../services/config.service");
@@ -100,5 +101,20 @@ class WebDavUtils {
         }
         await drive_item_repository_1.DriveItemRepository.instance.delete([driveItem.uuid]);
     }
+    static generateETag(parts) {
+        const normalized = parts.map((part) => part ?? '-');
+        const hash = (0, node_crypto_1.createHash)('sha256').update(normalized.join('|')).digest('hex');
+        return `"${hash}"`;
+    }
+    static getItemETag(driveItem) {
+        return this.generateETag([
+            driveItem.uuid,
+            driveItem.itemType === 'file' ? driveItem.size : undefined,
+            driveItem.createdAt.getTime(),
+            driveItem.updatedAt.getTime(),
+            driveItem.creationTime.getTime(),
+            driveItem.modificationTime.getTime(),
+        ]);
+    }
 }
 exports.WebDavUtils = WebDavUtils;

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

@@ -20,6 +20,8 @@ class GETRequestHandler {
         const { user } = await auth_service_1.AuthService.instance.getAuthDetails();
         logger_utils_1.webdavLogger.info(`[GET] [${driveFile.uuid}] Network ready for download`);
         res.header('Content-Type', 'application/octet-stream');
+        res.header('Accept-Ranges', 'bytes');
+        res.header('ETag', webdav_utils_1.WebDavUtils.getItemETag(driveFile));
         const fileSize = driveFile.size ?? 0;
         if (fileSize > 0) {
             const range = req.headers['range'];
@@ -44,8 +46,8 @@ class GETRequestHandler {
             if (!driveFile.fileId) {
                 throw new command_types_1.NotValidFileIdError();
             }
-            const { networkFacade, bucket, mnemonic } = await cli_utils_1.CLIUtils.prepareNetwork(user);
-            const [executeDownload] = await networkFacade.downloadToStream(bucket, mnemonic, driveFile.fileId, contentLength, writable, rangeOptions);
+            const { networkFacade, mnemonic } = await cli_utils_1.CLIUtils.prepareNetwork(user);
+            const [executeDownload] = await networkFacade.downloadToStream(driveFile.bucket, mnemonic, driveFile.fileId, contentLength, writable, rangeOptions);
             logger_utils_1.webdavLogger.info(`[GET] [${driveFile.uuid}] Download prepared, executing...`);
             res.status(200);
             await executeDownload;

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

@@ -14,6 +14,7 @@ class HEADRequestHandler {
             throw new errors_utils_1.NotFoundError(`Resource not found on Internxt Drive at ${resource.url}`);
         }
         logger_utils_1.webdavLogger.info(`[HEAD] [${driveItem.uuid}] Found Drive item`);
+        res.header('ETag', webdav_utils_1.WebDavUtils.getItemETag(driveItem));
         if (driveItem.itemType === 'file') {
             const range = req.headers['range'];
             const rangeOptions = network_utils_1.NetworkUtils.parseRangeHeader({
@@ -26,6 +27,7 @@ class HEADRequestHandler {
                 contentLength = rangeOptions.rangeSize;
             }
             res.header('Content-Type', 'application/octet-stream');
+            res.header('Accept-Ranges', 'bytes');
             res.header('Content-length', contentLength.toString());
         }
         res.status(200).send();

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

@@ -7,6 +7,7 @@ const logger_utils_1 = require("../../utils/logger.utils");
 const xml_utils_1 = require("../../utils/xml.utils");
 const webdav_folder_service_1 = require("../../services/webdav/webdav-folder.service");
 const async_utils_1 = require("../../utils/async.utils");
+const errors_utils_1 = require("../../utils/errors.utils");
 class MKCOLRequestHandler {
     handle = async (req, res) => {
         const resource = await webdav_utils_1.WebDavUtils.getRequestedResource(req.url);
@@ -16,9 +17,8 @@ class MKCOLRequestHandler {
         const driveFolderItem = await webdav_utils_1.WebDavUtils.getDriveFolderFromResource(resource.url);
         const folderAlreadyExists = !!driveFolderItem;
         if (folderAlreadyExists) {
-            logger_utils_1.webdavLogger.info(`[MKCOL] Folder '${resource.url}' already exists, ignoring the creation request`);
-            res.status(200).send(xml_utils_1.XMLUtils.toWebDavXML({}, {}));
-            return;
+            logger_utils_1.webdavLogger.info(`[MKCOL] Folder '${resource.url}' already exists, throwing 405 error`);
+            throw new errors_utils_1.MethodNotAllowed('Folder already exists');
         }
         const newFolder = await webdav_folder_service_1.WebDavFolderService.instance.createFolder({
             folderName: resource.path.base,

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

@@ -8,8 +8,8 @@ const xml_utils_1 = require("../../utils/xml.utils");
 const drive_item_domain_1 = require("../../services/database/drive-item/drive-item.domain");
 const drive_item_repository_1 = require("../../services/database/drive-item/drive-item.repository");
 const drive_folder_service_1 = require("../../services/drive/drive-folder.service");
+const drive_utils_1 = require("../../utils/drive.utils");
 const format_utils_1 = require("../../utils/format.utils");
-const node_crypto_1 = require("node:crypto");
 const mime_types_1 = __importDefault(require("mime-types"));
 const webdav_utils_1 = require("../../utils/webdav.utils");
 const logger_utils_1 = require("../../utils/logger.utils");
@@ -23,6 +23,7 @@ class PROPFINDRequestHandler {
             res.status(404).send();
             return;
         }
+        res.set('Content-Type', 'application/xml; charset="utf-8"');
         switch (driveItem.itemType) {
             case 'file': {
                 const fileMetaXML = await this.getFileMetaXML(resource, driveItem);
@@ -113,7 +114,7 @@ class PROPFINDRequestHandler {
                 type: file.type,
                 status: file.status,
                 folderUuid: file.folderUuid,
-                size: Number(file.size),
+                size: drive_utils_1.DriveUtils.parseFileSize(file.size),
                 creationTime: new Date(file.creationTime),
                 modificationTime: new Date(file.modificationTime),
                 createdAt: new Date(file.createdAt),
@@ -140,7 +141,8 @@ class PROPFINDRequestHandler {
             [xml_utils_1.XMLUtils.addDefaultNamespace('propstat')]: {
                 [xml_utils_1.XMLUtils.addDefaultNamespace('status')]: 'HTTP/1.1 200 OK',
                 [xml_utils_1.XMLUtils.addDefaultNamespace('prop')]: {
-                    [xml_utils_1.XMLUtils.addDefaultNamespace('getcontenttype')]: 'application/octet-stream',
+                    [xml_utils_1.XMLUtils.addDefaultNamespace('getcontenttype')]: 'httpd/unix-directory',
+                    [xml_utils_1.XMLUtils.addDefaultNamespace('getetag')]: webdav_utils_1.WebDavUtils.getItemETag(driveFolderItem),
                     'x1:lastmodified': {
                         '#text': format_utils_1.FormatUtils.formatDateForWebDav(driveFolderItem.updatedAt),
                         '@_xmlns:x1': 'SAR:',
@@ -173,6 +175,8 @@ class PROPFINDRequestHandler {
                     [xml_utils_1.XMLUtils.addDefaultNamespace('displayname')]: displayName,
                     [xml_utils_1.XMLUtils.addDefaultNamespace('getlastmodified')]: format_utils_1.FormatUtils.formatDateForWebDav(driveFolderItem.updatedAt),
                     [xml_utils_1.XMLUtils.addDefaultNamespace('getcontentlength')]: 0,
+                    [xml_utils_1.XMLUtils.addDefaultNamespace('getcontenttype')]: 'httpd/unix-directory',
+                    [xml_utils_1.XMLUtils.addDefaultNamespace('getetag')]: webdav_utils_1.WebDavUtils.getItemETag(driveFolderItem),
                     [xml_utils_1.XMLUtils.addDefaultNamespace('resourcetype')]: {
                         [xml_utils_1.XMLUtils.addDefaultNamespace('collection')]: '',
                     },
@@ -190,7 +194,7 @@ class PROPFINDRequestHandler {
                 [xml_utils_1.XMLUtils.addDefaultNamespace('status')]: 'HTTP/1.1 200 OK',
                 [xml_utils_1.XMLUtils.addDefaultNamespace('prop')]: {
                     [xml_utils_1.XMLUtils.addDefaultNamespace('resourcetype')]: '',
-                    [xml_utils_1.XMLUtils.addDefaultNamespace('getetag')]: '"' + (0, node_crypto_1.randomUUID)().replaceAll('-', '') + '"',
+                    [xml_utils_1.XMLUtils.addDefaultNamespace('getetag')]: webdav_utils_1.WebDavUtils.getItemETag(driveFileItem),
                     [xml_utils_1.XMLUtils.addDefaultNamespace('displayname')]: displayName,
                     [xml_utils_1.XMLUtils.addDefaultNamespace('getcontenttype')]: mime_types_1.default.lookup(displayName) || 'application/octet-stream',
                     [xml_utils_1.XMLUtils.addDefaultNamespace('getlastmodified')]: lastModified,

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

@@ -39,16 +39,10 @@ class PUTRequestHandler {
             }
             isReplacement = true;
             logger_utils_1.webdavLogger.info(`[PUT] File '${resource.name}' already exists in '${resource.path.dir}', it will be replaced...`);
-            try {
-                await webdav_utils_1.WebDavUtils.deleteOrTrashItem(driveFileItem);
-                await drive_item_repository_1.DriveItemRepository.instance.delete([driveFileItem.uuid]);
-            }
-            catch {
-            }
         }
         const { user } = await auth_service_1.AuthService.instance.getAuthDetails();
         const fileType = resource.path.ext.replace('.', '');
-        const { fileStream, thumbnailStream } = upload_utils_1.UploadUtils.prepareUploadStreams(req, fileType);
+        const { fileStream, thumbnailStream } = upload_utils_1.UploadUtils.prepareUploadStreams(req, fileType, contentLength);
         const { networkFacade, bucket } = await cli_utils_1.CLIUtils.prepareNetwork(user);
         let fileId;
         if (contentLength > 0) {
@@ -79,7 +73,7 @@ class PUTRequestHandler {
             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({
+        const filePayload = {
             plainName: resource.path.name,
             type: fileType,
             size: contentLength,
@@ -87,7 +81,26 @@ class PUTRequestHandler {
             fileId,
             bucket,
             encryptVersion: types_1.EncryptionVersion.Aes03,
-        });
+        };
+        let file;
+        if (driveFileItem?.itemType === 'file' && contentLength > 0) {
+            try {
+                file = await drive_file_service_1.DriveFileService.instance.replaceFile(driveFileItem.uuid, filePayload);
+            }
+            catch (error) {
+                logger_utils_1.webdavLogger.warn(`[PUT] File replace failed for '${resource.url}', falling back to delete and create: ${error instanceof Error ? error.message : String(error)}`);
+                await webdav_utils_1.WebDavUtils.deleteOrTrashItem(driveFileItem);
+                await drive_item_repository_1.DriveItemRepository.instance.delete([driveFileItem.uuid]);
+                file = await drive_file_service_1.DriveFileService.instance.createFile(filePayload);
+            }
+        }
+        else {
+            if (driveFileItem?.itemType === 'file') {
+                await webdav_utils_1.WebDavUtils.deleteOrTrashItem(driveFileItem);
+                await drive_item_repository_1.DriveItemRepository.instance.delete([driveFileItem.uuid]);
+            }
+            file = await drive_file_service_1.DriveFileService.instance.createFile(filePayload);
+        }
         timings.driveUpload = driveTimer.stop();
         await drive_item_repository_1.DriveItemRepository.instance.createOrUpdate([
             {
@@ -101,7 +114,7 @@ class PUTRequestHandler {
         const thumbnailTimer = cli_utils_1.CLIUtils.timer();
         await thumbnail_service_1.ThumbnailService.instance.tryUploadThumbnail({
             fileUuid: file.uuid,
-            bufferStream: thumbnailStream,
+            input: thumbnailStream?.getBuffer(),
             fileType,
             bucket,
             networkFacade,
@@ -115,6 +128,7 @@ class PUTRequestHandler {
         const statusCode = isReplacement ? 204 : 201;
         logger_utils_1.webdavLogger.info(`[PUT] [RESPONSE-${statusCode}] ${resource.url} - Returning ${statusCode} ` +
             `after ${cli_utils_1.CLIUtils.formatDuration(totalTime)}`);
+        res.header('ETag', webdav_utils_1.WebDavUtils.getItemETag(file));
         res.status(statusCode).send();
     };
 }

package/dist/webdav/index.js

@@ -18,8 +18,8 @@ const init = async () => {
     await config_service_1.ConfigService.instance.ensureInternxtLogsDirExists();
     await database_service_1.DatabaseService.instance.initialize();
     await database_service_1.DatabaseService.instance.clear();
-    const { token, workspace } = await auth_service_1.AuthService.instance.getAuthDetails();
-    sdk_manager_service_1.SdkManager.init({ token, workspaceToken: workspace?.workspaceCredentials.token });
+    const { token } = await auth_service_1.AuthService.instance.getAuthDetails();
+    sdk_manager_service_1.SdkManager.init({ token });
     new webdav_server_1.WebDavServer((0, express_1.default)())
         .start()
         .then()

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

@@ -13,7 +13,7 @@ const AuthMiddleware = () => {
             try {
                 const cached = cache_service_1.CacheService.instance.get(cache_service_1.CacheService.AUTH_CACHE_KEY);
                 if (cached) {
-                    sdk_manager_service_1.SdkManager.init({ token: cached.token, workspaceToken: cached.workspace?.workspaceCredentials?.token });
+                    sdk_manager_service_1.SdkManager.init({ token: cached.token });
                     next();
                     return;
                 }
@@ -35,6 +35,7 @@ const AuthMiddleware = () => {
                 const errorBodyXML = xml_utils_1.XMLUtils.toWebDavXML({
                     [xml_utils_1.XMLUtils.addDefaultNamespace('responsedescription')]: message,
                 }, {}, 'error');
+                res.set('WWW-Authenticate', 'Basic realm="Internxt WebDAV"');
                 res.status(401).send(errorBodyXML);
             }
         })();

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

@@ -4,8 +4,35 @@ exports.ErrorHandlingMiddleware = void 0;
 const logger_utils_1 = require("../../utils/logger.utils");
 const xml_utils_1 = require("../../utils/xml.utils");
 const errors_utils_1 = require("../../utils/errors.utils");
+const getErrorDetail = (err) => {
+    if (typeof err !== 'object' || err === null || !('data' in err))
+        return undefined;
+    const data = err.data;
+    if (typeof data !== 'object' || data === null || !('message' in data))
+        return undefined;
+    const message = data.message;
+    if (typeof message === 'string' && message.trim().length > 0)
+        return message;
+    if (Array.isArray(message) && message.length > 0)
+        return message.join(', ');
+    return undefined;
+};
+const getErrorStatusCode = (err) => {
+    if (typeof err !== 'object' || err === null)
+        return undefined;
+    const { statusCode, status } = err;
+    if (typeof statusCode === 'number' && !Number.isNaN(statusCode))
+        return statusCode;
+    if (typeof status === 'number' && !Number.isNaN(status))
+        return status;
+    return undefined;
+};
 const ErrorHandlingMiddleware = (err, req, res, _) => {
-    const message = errors_utils_1.ErrorUtils.isError(err) ? err.message : 'Something went wrong';
+    let message = errors_utils_1.ErrorUtils.isError(err) ? err.message : 'Something went wrong';
+    const detail = getErrorDetail(err);
+    if (detail) {
+        message += ` [${detail}]`;
+    }
     if (errors_utils_1.ErrorUtils.isError(err) && err.stack) {
         logger_utils_1.webdavLogger.error(`[ERROR MIDDLEWARE] [${req.method.toUpperCase()} - ${req.url}] ${message}\nStack: ${err.stack}`);
     }
@@ -15,10 +42,7 @@ const ErrorHandlingMiddleware = (err, req, res, _) => {
     const errorBodyXML = xml_utils_1.XMLUtils.toWebDavXML({
         [xml_utils_1.XMLUtils.addDefaultNamespace('responsedescription')]: message,
     }, {}, 'error');
-    let statusCode = 500;
-    if ('statusCode' in err && !Number.isNaN(err.statusCode)) {
-        statusCode = err.statusCode;
-    }
+    const statusCode = getErrorStatusCode(err) ?? 500;
     res.set('Content-Type', 'application/xml; charset="utf-8"');
     res.status(statusCode).send(errorBodyXML);
     req.destroy();

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

@@ -37,5 +37,6 @@ const sendUnauthorizedError = (res, message) => {
     const errorBodyXML = xml_utils_1.XMLUtils.toWebDavXML({
         [xml_utils_1.XMLUtils.addDefaultNamespace('responsedescription')]: message,
     }, {}, 'error');
+    res.set('WWW-Authenticate', 'Basic realm="Internxt WebDAV"');
     res.status(401).send(errorBodyXML);
 };

package/dist/webdav/webdav-server.js

@@ -35,11 +35,11 @@ class WebDavServer {
         this.app = app;
     }
     registerStartMiddlewares = (configs) => {
-        this.app.use((0, webdav_auth_middleware_1.WebDAVAuthMiddleware)(configs));
-        this.app.use((0, auth_middleware_1.AuthMiddleware)());
         this.app.use((0, request_logger_middleware_1.RequestLoggerMiddleware)({
             enable: true,
         }));
+        this.app.use((0, webdav_auth_middleware_1.WebDAVAuthMiddleware)(configs));
+        this.app.use((0, auth_middleware_1.AuthMiddleware)());
         this.app.use(body_parser_1.default.text({ type: ['application/xml', 'text/xml'] }));
         this.app.use(mkcol_middleware_1.MkcolMiddleware);
     };