@internxt/cli 1.3.3 → 1.4.1

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

@@ -1,7 +1,4 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-import { ReadStream, WriteStream } from 'fs';
+import { ReadStream, WriteStream } from 'node:fs';
 import { Transform, TransformCallback } from 'node:stream';
 export declare class StreamUtils {
     static readStreamToReadableStream(readStream: ReadStream): ReadableStream<Uint8Array>;

package/dist/utils/webdav.utils.js

@@ -4,12 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebDavUtils = void 0;
-const path_1 = __importDefault(require("path"));
+const node_path_1 = __importDefault(require("node:path"));
 const errors_utils_1 = require("./errors.utils");
 const logger_utils_1 = require("./logger.utils");
 class WebDavUtils {
     static joinURL(...pathComponents) {
-        return path_1.default.posix.join(...pathComponents);
+        return node_path_1.default.posix.join(...pathComponents);
     }
     static removeHostFromURL(completeURL) {
         if (!completeURL.startsWith('/') && !/^https?:\/\//i.test(completeURL)) {
@@ -30,8 +30,8 @@ class WebDavUtils {
             requestUrl = urlObject.url;
         }
         const decodedUrl = decodeURIComponent(requestUrl).replaceAll('/./', '/');
-        const parsedPath = path_1.default.parse(decodedUrl);
-        let parentPath = path_1.default.dirname(decodedUrl);
+        const parsedPath = node_path_1.default.parse(decodedUrl);
+        let parentPath = node_path_1.default.dirname(decodedUrl);
         if (!parentPath.startsWith('/'))
             parentPath = '/'.concat(parentPath);
         if (!parentPath.endsWith('/'))

package/dist/utils/xml.utils.js

@@ -14,7 +14,10 @@ class XMLUtils {
     }
     static toWebDavXML(object, options) {
         const xmlContent = this.toXML(object, options);
-        return `<?xml version="1.0" encoding="utf-8" ?><${XMLUtils.addDefaultNamespace('multistatus')} xmlns:${XMLUtils.DEFAULT_NAMESPACE_LETTER}="DAV:">${xmlContent}</${XMLUtils.addDefaultNamespace('multistatus')}>`;
+        return ('<?xml version="1.0" encoding="utf-8" ?>' +
+            `<${XMLUtils.addDefaultNamespace('multistatus')} xmlns:${XMLUtils.DEFAULT_NAMESPACE_LETTER}="DAV:">` +
+            `${xmlContent}` +
+            `</${XMLUtils.addDefaultNamespace('multistatus')}>`);
     }
     static addDefaultNamespace(key) {
         return `${XMLUtils.DEFAULT_NAMESPACE_LETTER}:${key}`;

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

@@ -25,7 +25,7 @@ class GETRequestHandler {
         logger_utils_1.webdavLogger.info(`✅ Found Drive File with uuid ${driveFile.uuid}`);
         res.set('Content-Type', 'application/octet-stream');
         res.set('Content-length', driveFile.size.toString());
-        const { mnemonic } = await authService.getAuthDetails();
+        const { user } = await authService.getAuthDetails();
         logger_utils_1.webdavLogger.info('✅ Network ready for download');
         const writable = new WritableStream({
             write(chunk) {
@@ -35,9 +35,14 @@ class GETRequestHandler {
                 res.end();
             },
         });
-        const [executeDownload] = await networkFacade.downloadToStream(driveFile.bucket, mnemonic, driveFile.fileId, writable, {
+        let lastLoggedProgress = 0;
+        const [executeDownload] = await networkFacade.downloadToStream(driveFile.bucket, user.mnemonic, driveFile.fileId, writable, {
             progressCallback: (progress) => {
-                logger_utils_1.webdavLogger.info(`Download progress for file ${resource.name}: ${(100 * progress).toFixed(2)}%`);
+                const percentage = Math.floor(100 * progress);
+                if (percentage >= lastLoggedProgress + 1) {
+                    lastLoggedProgress = percentage;
+                    logger_utils_1.webdavLogger.info(`Download progress for file ${resource.name}: ${percentage}%`);
+                }
             },
         });
         logger_utils_1.webdavLogger.info('✅ Download prepared, executing...');

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MKCOLRequestHandler = void 0;
 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 xml_utils_1 = require("../../utils/xml.utils");
 const async_utils_1 = require("../../utils/async.utils");
@@ -21,12 +20,9 @@ class MKCOLRequestHandler {
             driveDatabaseManager,
             driveFolderService,
         }));
-        if (!parentFolderItem) {
-            throw new errors_utils_1.ConflictError(`Parent resource not found for parent path ${resource.parentPath}`);
-        }
         const [createFolder] = driveFolderService.createFolder({
-            folderName: resource.name,
-            parentFolderId: parentFolderItem.id,
+            plainName: resource.name,
+            parentFolderUuid: parentFolderItem.uuid,
         });
         const newFolder = await createFolder;
         logger_utils_1.webdavLogger.info(`✅ Folder created with UUID ${newFolder.uuid}`);

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

@@ -55,9 +55,6 @@ class MOVERequestHandler {
                 driveDatabaseManager,
                 driveFolderService,
             }));
-            if (!destinationFolderItem) {
-                throw new errors_utils_1.ConflictError(`Destination folder resource not found for path ${destinationResource.parentPath}`);
-            }
             if (resource.type === 'folder') {
                 const folder = originalDriveItem;
                 await driveFolderService.moveFolder({

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROPFINDRequestHandler = void 0;
 const xml_utils_1 = require("../../utils/xml.utils");
 const format_utils_1 = require("../../utils/format.utils");
-const crypto_1 = require("crypto");
+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");
@@ -207,7 +207,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, crypto_1.randomUUID)().replaceAll('-', '') + '"',
+                    [xml_utils_1.XMLUtils.addDefaultNamespace('getetag')]: '"' + (0, node_crypto_1.randomUUID)().replaceAll('-', '') + '"',
                     [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')]: format_utils_1.FormatUtils.formatDateForWebDav(driveFileItem.updatedAt),

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

@@ -5,6 +5,7 @@ const drive_file_service_1 = require("../../services/drive/drive-file.service");
 const errors_utils_1 = require("../../utils/errors.utils");
 const webdav_utils_1 = require("../../utils/webdav.utils");
 const logger_utils_1 = require("../../utils/logger.utils");
+const types_1 = require("@internxt/sdk/dist/drive/storage/types");
 class PUTRequestHandler {
     dependencies;
     constructor(dependencies) {
@@ -24,9 +25,6 @@ class PUTRequestHandler {
             driveDatabaseManager,
             driveFolderService,
         }));
-        if (!parentFolderItem) {
-            throw new errors_utils_1.ConflictError(`Parent resource not found for parent path ${resource.parentPath}`);
-        }
         try {
             const driveFileItem = (await webdav_utils_1.WebDavUtils.getAndSearchItemFromResource({
                 resource: resource,
@@ -43,21 +41,28 @@ class PUTRequestHandler {
         }
         catch {
         }
-        const { user, mnemonic } = await authService.getAuthDetails();
-        const [uploadPromise] = await networkFacade.uploadFromStream(user.bucket, mnemonic, contentLength, req, {
+        const { user } = await authService.getAuthDetails();
+        let lastLoggedProgress = 0;
+        const [uploadPromise] = await networkFacade.uploadFromStream(user.bucket, user.mnemonic, contentLength, req, {
             progressCallback: (progress) => {
-                logger_utils_1.webdavLogger.info(`Upload progress for file ${resource.name}: ${(100 * progress).toFixed(2)}%`);
+                const percentage = Math.floor(100 * progress);
+                if (percentage >= lastLoggedProgress + 1) {
+                    lastLoggedProgress = percentage;
+                    logger_utils_1.webdavLogger.info(`Upload progress for file ${resource.name}: ${percentage}%`);
+                }
             },
         });
         const uploadResult = await uploadPromise;
         logger_utils_1.webdavLogger.info('✅ File uploaded to network');
         const file = await drive_file_service_1.DriveFileService.instance.createFile({
-            name: resource.path.name,
+            plain_name: resource.path.name,
             type: resource.path.ext.replace('.', ''),
             size: contentLength,
-            folderId: parentFolderItem.id,
-            fileId: uploadResult.fileId,
+            folder_id: parentFolderItem.uuid,
+            id: uploadResult.fileId,
             bucket: user.bucket,
+            encrypt_version: types_1.EncryptionVersion.Aes03,
+            name: '',
         });
         logger_utils_1.webdavLogger.info('✅ File uploaded to internxt drive');
         await driveDatabaseManager.createFile(file, resource.path.dir + '/');

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ErrorHandlingMiddleware = void 0;
 const logger_utils_1 = require("../../utils/logger.utils");
-const ErrorHandlingMiddleware = (err, req, res, __) => {
+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({

package/dist/webdav/middewares/request-logger.middleware.d.ts

@@ -1,8 +1,7 @@
 import { RequestHandler } from 'express';
-import { AnalyticsService } from '../../services/analytics.service';
 type RequestLoggerConfig = {
     enable: boolean;
     methods?: string[];
 };
-export declare const RequestLoggerMiddleware: (config: RequestLoggerConfig, analytics: AnalyticsService) => RequestHandler;
+export declare const RequestLoggerMiddleware: (config: RequestLoggerConfig) => RequestHandler;
 export {};

package/dist/webdav/middewares/request-logger.middleware.js

@@ -2,16 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RequestLoggerMiddleware = void 0;
 const logger_utils_1 = require("../../utils/logger.utils");
-const RequestLoggerMiddleware = (config, analytics) => {
+const RequestLoggerMiddleware = (config) => {
     return (req, _, next) => {
-        if (req.user?.uuid) {
-            analytics.track('WebDAVRequest', { app: 'internxt-webdav', userId: req.user.uuid }, { method: req.method.toUpperCase() });
-        }
         if (!config.enable)
             return next();
         if (config.methods && !config.methods.includes(req.method))
             return next();
-        logger_utils_1.webdavLogger.info(`WebDav request received\nMethod: ${req.method}\nURL: ${req.url}\nBody: ${JSON.stringify(req.body)}\nHeaders: ${JSON.stringify(req.headers)}`);
+        logger_utils_1.webdavLogger.info('WebDav request received\n' +
+            `Method: ${req.method}\n` +
+            `URL: ${req.url}\n` +
+            `Body: ${JSON.stringify(req.body)}\n` +
+            `Headers: ${JSON.stringify(req.headers)}`);
         next();
     };
 };

package/dist/webdav/webdav-server.js

@@ -26,7 +26,6 @@ const DELETE_handler_1 = require("./handlers/DELETE.handler");
 const PROPPATCH_handler_1 = require("./handlers/PROPPATCH.handler");
 const MOVE_handler_1 = require("./handlers/MOVE.handler");
 const COPY_handler_1 = require("./handlers/COPY.handler");
-const analytics_service_1 = require("../services/analytics.service");
 class WebDavServer {
     app;
     configService;
@@ -66,7 +65,7 @@ class WebDavServer {
         this.app.use((0, auth_middleware_1.AuthMiddleware)(config_service_1.ConfigService.instance));
         this.app.use((0, request_logger_middleware_1.RequestLoggerMiddleware)({
             enable: true,
-        }, analytics_service_1.AnalyticsService.instance));
+        }));
     };
     registerHandlers = async () => {
         const networkFacade = await this.getNetworkFacade();
@@ -123,7 +122,7 @@ class WebDavServer {
             server = http_1.default.createServer(this.app);
         }
         else {
-            const httpsCerts = network_utils_1.NetworkUtils.getWebdavSSLCerts();
+            const httpsCerts = await network_utils_1.NetworkUtils.getWebdavSSLCerts();
             server = https_1.default.createServer(httpsCerts, this.app);
         }
         server.requestTimeout = 15 * 60 * 1000;