@internxt/cli 1.0.0 → 1.0.6

package/.env

@@ -8,4 +8,6 @@ APP_CRYPTO_SECRET2=8Q8VMUE3BJZV87GT
 APP_MAGIC_IV=d139cb9a2cd17092e79e1861cf9d7023
 APP_MAGIC_SALT=38dce0391b49efba88dbc8c39ebf868f0267eb110bb0012ab27dc52a528d61b1d1ed9d76f400ff58e3240028442b1eab9bb84e111d9dadd997982dbde9dbd25e
 NETWORK_URL=https://api.internxt.com
-WEBDAV_SERVER_PORT=3005
+WEBDAV_SERVER_PORT=3005
+RUDDERSTACK_WRITE_KEY=2g8ct5UZBpPdG4K1VuH1PoT4gHV
+RUDDERSTACK_DATAPLANE_URL=https://cdp.internxt.com

package/README.md

@@ -10,22 +10,19 @@ A CLI tool to interact with yout Internxt encrypted files
 * [Installation](#installation)
 * [Usage](#usage)
 * [Commands](#commands)
+* [Current Limitations](#current-limitations)
 <!-- tocstop -->
 
 # Installation
 
-Binaries and specific installers are available in the latest release:
-
-[View Internxt CLI latest release here](https://github.com/internxt/cli/releases/latest)
-
-You can install the Internxt CLI in different ways:
-
-### NPM
+You can install the Internxt CLI by using NPM:
 
 Requires Node >= 20.0.0
 
 `npm i -g @internxt/cli`
 
+[View Internxt CLI latest release here](https://www.npmjs.com/package/@internxt/cli)
+
 # Usage
 
 <!-- usage -->
@@ -34,7 +31,7 @@ $ npm install -g @internxt/cli
 $ internxt COMMAND
 running command...
 $ internxt (--version)
-@internxt/cli/1.0.0 darwin-arm64 node-v20.10.0
+@internxt/cli/1.0.6 darwin-arm64 node-v20.10.0
 $ internxt --help [COMMAND]
 USAGE
   $ internxt COMMAND
@@ -46,6 +43,7 @@ USAGE
 
 <!-- commands -->
 * [`internxt config`](#internxt-config)
+* [`internxt create-folder`](#internxt-create-folder)
 * [`internxt download`](#internxt-download)
 * [`internxt list`](#internxt-list)
 * [`internxt login`](#internxt-login)
@@ -84,7 +82,28 @@ EXAMPLES
   $ internxt config
 ```
 
-_See code: [src/commands/config.ts](https://github.com/internxt/cli/blob/v1.0.0/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/internxt/cli/blob/v1.0.6/src/commands/config.ts)_
+
+## `internxt create-folder`
+
+Create a folder in your Internxt Drive
+
+```
+USAGE
+  $ internxt create-folder --name <value> [--id <value>]
+
+FLAGS
+  --id=<value>    The folder id to create the folder in, defaults to your root folder
+  --name=<value>  (required) The new folder name
+
+DESCRIPTION
+  Create a folder in your Internxt Drive
+
+EXAMPLES
+  $ internxt create-folder
+```
+
+_See code: [src/commands/create-folder.ts](https://github.com/internxt/cli/blob/v1.0.6/src/commands/create-folder.ts)_
 
 ## `internxt download`
 
@@ -107,7 +126,7 @@ EXAMPLES
   $ internxt download
 ```
 
-_See code: [src/commands/download.ts](https://github.com/internxt/cli/blob/v1.0.0/src/commands/download.ts)_
+_See code: [src/commands/download.ts](https://github.com/internxt/cli/blob/v1.0.6/src/commands/download.ts)_
 
 ## `internxt list`
 
@@ -141,7 +160,7 @@ EXAMPLES
   $ internxt list
 ```
 
-_See code: [src/commands/list.ts](https://github.com/internxt/cli/blob/v1.0.0/src/commands/list.ts)_
+_See code: [src/commands/list.ts](https://github.com/internxt/cli/blob/v1.0.6/src/commands/list.ts)_
 
 ## `internxt login`
 
@@ -167,7 +186,7 @@ EXAMPLES
   $ internxt login
 ```
 
-_See code: [src/commands/login.ts](https://github.com/internxt/cli/blob/v1.0.0/src/commands/login.ts)_
+_See code: [src/commands/login.ts](https://github.com/internxt/cli/blob/v1.0.6/src/commands/login.ts)_
 
 ## `internxt logout`
 
@@ -184,7 +203,7 @@ EXAMPLES
   $ internxt logout
 ```
 
-_See code: [src/commands/logout.ts](https://github.com/internxt/cli/blob/v1.0.0/src/commands/logout.ts)_
+_See code: [src/commands/logout.ts](https://github.com/internxt/cli/blob/v1.0.6/src/commands/logout.ts)_
 
 ## `internxt logs`
 
@@ -201,7 +220,7 @@ EXAMPLES
   $ internxt logs
 ```
 
-_See code: [src/commands/logs.ts](https://github.com/internxt/cli/blob/v1.0.0/src/commands/logs.ts)_
+_See code: [src/commands/logs.ts](https://github.com/internxt/cli/blob/v1.0.6/src/commands/logs.ts)_
 
 ## `internxt move`
 
@@ -226,7 +245,7 @@ EXAMPLES
   $ internxt move
 ```
 
-_See code: [src/commands/move.ts](https://github.com/internxt/cli/blob/v1.0.0/src/commands/move.ts)_
+_See code: [src/commands/move.ts](https://github.com/internxt/cli/blob/v1.0.6/src/commands/move.ts)_
 
 ## `internxt trash`
 
@@ -250,7 +269,7 @@ EXAMPLES
   $ internxt trash
 ```
 
-_See code: [src/commands/trash.ts](https://github.com/internxt/cli/blob/v1.0.0/src/commands/trash.ts)_
+_See code: [src/commands/trash.ts](https://github.com/internxt/cli/blob/v1.0.6/src/commands/trash.ts)_
 
 ## `internxt upload`
 
@@ -274,7 +293,7 @@ EXAMPLES
   $ internxt upload
 ```
 
-_See code: [src/commands/upload.ts](https://github.com/internxt/cli/blob/v1.0.0/src/commands/upload.ts)_
+_See code: [src/commands/upload.ts](https://github.com/internxt/cli/blob/v1.0.6/src/commands/upload.ts)_
 
 ## `internxt webdav ACTION`
 
@@ -291,7 +310,7 @@ EXAMPLES
   $ internxt webdav
 ```
 
-_See code: [src/commands/webdav.ts](https://github.com/internxt/cli/blob/v1.0.0/src/commands/webdav.ts)_
+_See code: [src/commands/webdav.ts](https://github.com/internxt/cli/blob/v1.0.6/src/commands/webdav.ts)_
 
 ## `internxt whoami`
 
@@ -308,5 +327,9 @@ EXAMPLES
   $ internxt whoami
 ```
 
-_See code: [src/commands/whoami.ts](https://github.com/internxt/cli/blob/v1.0.0/src/commands/whoami.ts)_
+_See code: [src/commands/whoami.ts](https://github.com/internxt/cli/blob/v1.0.6/src/commands/whoami.ts)_
 <!-- commandsstop -->
+
+# Current Limitations
+
+- We currently have a 5GB size upload limitation per file for both, CLI and WebDAV

package/dist/commands/create-folder.d.ts

@@ -0,0 +1,13 @@
+import { Command } from '@oclif/core';
+import { DriveFolderItem } from '../types/drive.types';
+export default class CreateFolder extends Command {
+    static description: string;
+    static examples: string[];
+    static flags: {
+        name: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        id: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+    };
+    catch(error: Error): Promise<void>;
+    getParentFolder(uuid: string): Promise<DriveFolderItem>;
+    run(): Promise<void>;
+}

package/dist/commands/create-folder.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@oclif/core");
+const auth_service_1 = require("../services/auth.service");
+const errors_utils_1 = require("../utils/errors.utils");
+const cli_utils_1 = require("../utils/cli.utils");
+const drive_folder_service_1 = require("../services/drive/drive-folder.service");
+const config_service_1 = require("../services/config.service");
+class CreateFolder extends core_1.Command {
+    static description = 'Create a folder in your Internxt Drive';
+    static examples = ['<%= config.bin %> <%= command.id %>'];
+    static flags = {
+        name: core_1.Flags.string({ description: 'The new folder name', required: true }),
+        id: core_1.Flags.string({
+            description: 'The folder id to create the folder in, defaults to your root folder',
+            required: false,
+        }),
+    };
+    async catch(error) {
+        errors_utils_1.ErrorUtils.report(error, { command: this.id });
+        cli_utils_1.CLIUtils.error(error.message);
+        this.exit(1);
+    }
+    getParentFolder(uuid) {
+        return drive_folder_service_1.DriveFolderService.instance.getFolderMetaByUuid(uuid);
+    }
+    async run() {
+        const { flags } = await this.parse(CreateFolder);
+        const folderName = flags.name;
+        const user = await auth_service_1.AuthService.instance.getUser();
+        let parentFolder;
+        if (flags.id) {
+            parentFolder = await this.getParentFolder(flags.id);
+            if (!parentFolder) {
+                throw new Error(`Folder with id ${flags.id} not found`);
+            }
+        }
+        cli_utils_1.CLIUtils.doing('Creating folder...');
+        const [createNewFolder, requestCanceler] = drive_folder_service_1.DriveFolderService.instance.createFolder({
+            folderName,
+            parentFolderId: parentFolder ? parentFolder.id : user.root_folder_id,
+        });
+        process.on('SIGINT', () => {
+            requestCanceler.cancel('SIGINT received');
+            process.exit(1);
+        });
+        const newFolder = await createNewFolder;
+        cli_utils_1.CLIUtils.done();
+        cli_utils_1.CLIUtils.success(`Folder ${newFolder.plain_name} created successfully, view it at view it at ${config_service_1.ConfigService.instance.get('DRIVE_URL')}/folder/${newFolder.uuid}`);
+    }
+}
+exports.default = CreateFolder;

package/dist/commands/login.js

@@ -10,6 +10,7 @@ const errors_utils_1 = require("../utils/errors.utils");
 const drive_folder_service_1 = require("../services/drive/drive-folder.service");
 const sdk_manager_service_1 = require("../services/sdk-manager.service");
 const drive_database_manager_service_1 = require("../services/database/drive-database-manager.service");
+const analytics_service_1 = require("../services/analytics.service");
 class Login extends core_1.Command {
     static args = {};
     static description = 'Logs into an Internxt account. If the account is two-factor protected, then an extra code will be required.';
@@ -58,6 +59,7 @@ class Login extends core_1.Command {
         await config_service_1.ConfigService.instance.saveUser(Object.assign(loginCredentials, { root_folder_uuid: rootMeta.uuid }));
         await drive_database_manager_service_1.DriveDatabaseManager.init();
         await drive_database_manager_service_1.DriveDatabaseManager.clean();
+        analytics_service_1.AnalyticsService.instance.track('CLILogin', { app: 'internxt-cli' });
         cli_utils_1.CLIUtils.success(`Succesfully logged in to: ${loginCredentials.user.email} `);
     }
     async catch(error) {

package/dist/commands/webdav.js

@@ -4,6 +4,7 @@ const core_1 = require("@oclif/core");
 const pm2_utils_1 = require("../utils/pm2.utils");
 const cli_utils_1 = require("../utils/cli.utils");
 const config_service_1 = require("../services/config.service");
+const analytics_service_1 = require("../services/analytics.service");
 class Webdav extends core_1.Command {
     static description = 'Enable or disable the Internxt CLI WebDav server';
     static examples = ['<%= config.bin %> <%= command.id %>'];
@@ -24,6 +25,7 @@ class Webdav extends core_1.Command {
         if (status === 'online') {
             core_1.ux.log(`\nWebDav server status: ${core_1.ux.colorize('green', 'online')}\n`);
             cli_utils_1.CLIUtils.success(`Internxt WebDav server started successfully on https://${config_service_1.ConfigService.WEBDAV_LOCAL_URL}:${process.env.WEBDAV_SERVER_PORT}`);
+            await analytics_service_1.AnalyticsService.instance.track('WebDAVEnabled', { app: 'internxt-cli' });
         }
         else {
             core_1.ux.log(`WebDav server status: ${core_1.ux.colorize('red', status)}`);

package/dist/hooks/prerun/auth_check.js

@@ -6,11 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const whoami_1 = __importDefault(require("../../commands/whoami"));
 const login_1 = __importDefault(require("../../commands/login"));
 const logout_1 = __importDefault(require("../../commands/logout"));
+const logs_1 = __importDefault(require("../../commands/logs"));
 const cli_utils_1 = require("../../utils/cli.utils");
 const sdk_manager_service_1 = require("../../services/sdk-manager.service");
 const auth_service_1 = require("../../services/auth.service");
 const command_types_1 = require("../../types/command.types");
-const CommandsToSkip = [whoami_1.default, login_1.default, logout_1.default];
+const CommandsToSkip = [whoami_1.default, login_1.default, logout_1.default, logs_1.default];
 const hook = async function (opts) {
     if (!CommandsToSkip.map((command) => command.name).includes(opts.Command.name)) {
         cli_utils_1.CLIUtils.doing('Checking credentials');

package/dist/services/analytics.service.d.ts

@@ -0,0 +1,16 @@
+import { ConfigService } from './config.service';
+export declare const AnalyticsEvents: {
+    CLILogin: string;
+    WebDAVEnabled: string;
+    WebDAVRequest: string;
+};
+export declare class AnalyticsService {
+    private config;
+    static readonly instance: AnalyticsService;
+    constructor(config: ConfigService);
+    private getRudderstack;
+    track(eventKey: keyof typeof AnalyticsEvents, options: {
+        app: 'internxt-cli' | 'internxt-webdav';
+        userId?: string;
+    }, params?: object): Promise<void>;
+}

package/dist/services/analytics.service.js

@@ -0,0 +1,47 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AnalyticsService = exports.AnalyticsEvents = void 0;
+const rudder_sdk_node_1 = __importDefault(require("@rudderstack/rudder-sdk-node"));
+const config_service_1 = require("./config.service");
+const package_json_1 = __importDefault(require("../../package.json"));
+const crypto_1 = require("crypto");
+exports.AnalyticsEvents = {
+    CLILogin: 'CLI Login',
+    WebDAVEnabled: 'WebDAV Enabled',
+    WebDAVRequest: 'WebDAV Request',
+};
+class AnalyticsService {
+    config;
+    static instance = new AnalyticsService(config_service_1.ConfigService.instance);
+    constructor(config) {
+        this.config = config;
+    }
+    getRudderstack() {
+        return new rudder_sdk_node_1.default(this.config.get('RUDDERSTACK_WRITE_KEY'), {
+            dataPlaneUrl: this.config.get('RUDDERSTACK_DATAPLANE_URL'),
+        });
+    }
+    track(eventKey, options, params = {}) {
+        return new Promise((resolve) => {
+            const rudderstack = this.getRudderstack();
+            rudderstack.track({
+                event: exports.AnalyticsEvents[eventKey],
+                userId: options.userId,
+                anonymousId: options.userId ? undefined : (0, crypto_1.randomUUID)(),
+                properties: {
+                    app: {
+                        name: options.app,
+                        version: package_json_1.default.version,
+                    },
+                    ...params,
+                },
+            }, () => {
+                resolve();
+            });
+        });
+    }
+}
+exports.AnalyticsService = AnalyticsService;

package/dist/services/database/drive-database-manager.service.d.ts

@@ -15,4 +15,6 @@ export declare class DriveDatabaseManager {
     createFile: (driveFile: DriveFileItem) => Promise<DriveFile>;
     buildRelativePathForFile: (fileName: string, parentId: number | null) => Promise<string>;
     buildRelativePathForFolder: (folderName: string, parentId: number | null) => Promise<string>;
+    deleteFile: (id: number) => Promise<void>;
+    deleteFolder: (id: number) => Promise<void>;
 }

package/dist/services/database/drive-database-manager.service.js

@@ -73,5 +73,11 @@ class DriveDatabaseManager {
         const parentPath = await this.buildRelativePathForFolder(parentFolder.name, parentFolder.parentId);
         return webdav_utils_1.WebDavUtils.joinURL(parentPath, folderName, '/');
     };
+    deleteFile = (id) => {
+        return this.driveFileRepository.deleteById(id);
+    };
+    deleteFolder = (id) => {
+        return this.driveFolderRepository.deleteById(id);
+    };
 }
 exports.DriveDatabaseManager = DriveDatabaseManager;

package/dist/services/database/drive-file/drive-file.repository.d.ts

@@ -4,7 +4,7 @@ import { DriveFile } from './drive-file.domain';
 export declare class DriveFileRepository {
     findByRelativePath: (relativePath: DriveFile['relativePath']) => Promise<DriveFile | null>;
     findById: (id: DriveFile['id']) => Promise<DriveFile | null>;
-    deleteById: (id: DriveFile['id']) => Promise<number>;
+    deleteById: (id: DriveFile['id']) => Promise<void>;
     createFile: (driveFileItem: DriveFileItem, relativePath: string) => Promise<DriveFile>;
     toDomain: (model: DriveFileModel) => DriveFile;
     static readonly clean: () => Promise<void>;

package/dist/services/database/drive-file/drive-file.repository.js

@@ -16,8 +16,8 @@ class DriveFileRepository {
         const file = await drive_file_model_1.DriveFileModel.findByPk(id);
         return file ? this.toDomain(file) : null;
     };
-    deleteById = (id) => {
-        return drive_file_model_1.DriveFileModel.destroy({ where: { id } });
+    deleteById = async (id) => {
+        await drive_file_model_1.DriveFileModel.destroy({ where: { id } });
     };
     createFile = async (driveFileItem, relativePath) => {
         const driveFile = drive_file_domain_1.DriveFile.build({

package/dist/services/database/drive-folder/drive-folder.attributes.d.ts

@@ -2,6 +2,7 @@ export interface DriveFolderAttributes {
     id: number;
     name: string;
     uuid: string;
+    status: 'EXISTS' | 'TRASHED';
     relativePath: string;
     parentId: number | null;
     createdAt: Date;

package/dist/services/database/drive-folder/drive-folder.domain.d.ts

@@ -7,7 +7,8 @@ export declare class DriveFolder implements DriveFolderAttributes {
     parentId: number | null;
     createdAt: Date;
     updatedAt: Date;
-    constructor({ id, name, uuid, relativePath, parentId, createdAt, updatedAt }: DriveFolderAttributes);
+    status: DriveFolderAttributes['status'];
+    constructor({ id, name, uuid, relativePath, parentId, createdAt, updatedAt, status }: DriveFolderAttributes);
     static build(folder: DriveFolderAttributes): DriveFolder;
     toJSON(): DriveFolderAttributes;
 }

package/dist/services/database/drive-folder/drive-folder.domain.js

@@ -9,7 +9,8 @@ class DriveFolder {
     parentId;
     createdAt;
     updatedAt;
-    constructor({ id, name, uuid, relativePath, parentId, createdAt, updatedAt }) {
+    status;
+    constructor({ id, name, uuid, relativePath, parentId, createdAt, updatedAt, status }) {
         this.id = id;
         this.name = name;
         this.uuid = uuid;
@@ -17,6 +18,7 @@ class DriveFolder {
         this.parentId = parentId;
         this.createdAt = createdAt;
         this.updatedAt = updatedAt;
+        this.status = status;
     }
     static build(folder) {
         return new DriveFolder(folder);
@@ -26,6 +28,7 @@ class DriveFolder {
             id: this.id,
             name: this.name,
             uuid: this.uuid,
+            status: this.status,
             relativePath: this.relativePath,
             parentId: this.parentId,
             createdAt: this.createdAt,

package/dist/services/database/drive-folder/drive-folder.model.d.ts

@@ -3,6 +3,7 @@ import { DriveFolderAttributes } from './drive-folder.attributes';
 export declare class DriveFolderModel extends Model implements DriveFolderAttributes {
     id: number;
     name: string;
+    status: 'EXISTS' | 'TRASHED';
     uuid: string;
     relativePath: string;
     parentId: number | null;

package/dist/services/database/drive-folder/drive-folder.model.js

@@ -25,6 +25,10 @@ __decorate([
     (0, sequelize_typescript_1.Column)(sequelize_typescript_1.DataType.STRING),
     __metadata("design:type", String)
 ], DriveFolderModel.prototype, "name", void 0);
+__decorate([
+    (0, sequelize_typescript_1.Column)(sequelize_typescript_1.DataType.STRING),
+    __metadata("design:type", String)
+], DriveFolderModel.prototype, "status", void 0);
 __decorate([
     sequelize_typescript_1.Unique,
     (0, sequelize_typescript_1.Column)(sequelize_typescript_1.DataType.UUIDV4),

package/dist/services/database/drive-folder/drive-folder.repository.d.ts

@@ -4,7 +4,7 @@ import { DriveFolderModel } from './drive-folder.model';
 export declare class DriveFolderRepository {
     findByRelativePath: (relativePath: DriveFolder['relativePath']) => Promise<DriveFolder | null>;
     findById: (id: DriveFolder['id']) => Promise<DriveFolder | null>;
-    deleteById: (id: DriveFolder['id']) => Promise<number>;
+    deleteById: (id: DriveFolder['id']) => Promise<void>;
     createFolder: (driveFolderItem: DriveFolderItem, relativePath: string) => Promise<DriveFolder>;
     toDomain: (model: DriveFolderModel) => DriveFolder;
     static readonly clean: () => Promise<void>;

package/dist/services/database/drive-folder/drive-folder.repository.js

@@ -16,8 +16,8 @@ class DriveFolderRepository {
         const folder = await drive_folder_model_1.DriveFolderModel.findByPk(id);
         return folder ? this.toDomain(folder) : null;
     };
-    deleteById = (id) => {
-        return drive_folder_model_1.DriveFolderModel.destroy({ where: { id } });
+    deleteById = async (id) => {
+        await drive_folder_model_1.DriveFolderModel.destroy({ where: { id } });
     };
     createFolder = async (driveFolderItem, relativePath) => {
         const driveFolder = drive_folder_domain_1.DriveFolder.build({

package/dist/services/drive/drive-folder.service.d.ts

@@ -1,6 +1,7 @@
 import { FetchPaginatedFile, FetchPaginatedFolder } from '@internxt/sdk/dist/drive/storage/types';
 import { StorageTypes } from '@internxt/sdk/dist/drive';
 import { DriveFolderItem } from '../../types/drive.types';
+import { RequestCanceler } from '@internxt/sdk/dist/shared/http/types';
 export declare class DriveFolderService {
     static readonly instance: DriveFolderService;
     getFolderMetaByUuid: (uuid: string) => Promise<DriveFolderItem>;
@@ -12,4 +13,8 @@ export declare class DriveFolderService {
     private getAllSubfolders;
     private getAllSubfiles;
     moveFolder: (payload: StorageTypes.MoveFolderUuidPayload) => Promise<StorageTypes.FolderMeta>;
+    createFolder(payload: {
+        folderName: string;
+        parentFolderId: number;
+    }): [Promise<StorageTypes.CreateFolderResponse>, RequestCanceler];
 }

package/dist/services/drive/drive-folder.service.js

@@ -45,5 +45,12 @@ class DriveFolderService {
         const storageClient = sdk_manager_service_1.SdkManager.instance.getStorage(true);
         return storageClient.moveFolderByUuid(payload);
     };
+    createFolder(payload) {
+        const storageClient = sdk_manager_service_1.SdkManager.instance.getStorage();
+        return storageClient.createFolder({
+            folderName: payload.folderName,
+            parentFolderId: payload.parentFolderId,
+        });
+    }
 }
 exports.DriveFolderService = DriveFolderService;

package/dist/types/config.types.d.ts

@@ -10,4 +10,6 @@ export interface ConfigKeys {
     readonly APP_MAGIC_SALT: string;
     readonly NETWORK_URL: string;
     readonly WEBDAV_SERVER_PORT: string;
+    readonly RUDDERSTACK_WRITE_KEY: string;
+    readonly RUDDERSTACK_DATAPLANE_URL: string;
 }

package/dist/types/drive.types.d.ts

@@ -11,4 +11,5 @@ export type DriveFolderItem = Pick<DriveFolderData, 'name' | 'bucket' | 'id' | '
     uuid: string;
     createdAt: Date;
     updatedAt: Date;
+    status: 'EXISTS' | 'TRASHED';
 };

package/dist/utils/async.utils.d.ts

@@ -0,0 +1,3 @@
+export declare class AsyncUtils {
+    static sleep(ms: number): Promise<void>;
+}

package/dist/utils/async.utils.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AsyncUtils = void 0;
+class AsyncUtils {
+    static sleep(ms) {
+        return new Promise((resolve) => setTimeout(resolve, ms));
+    }
+}
+exports.AsyncUtils = AsyncUtils;

package/dist/utils/drive.utils.js

@@ -23,6 +23,7 @@ class DriveUtils {
             uuid: folderMeta.uuid,
             id: folderMeta.id,
             bucket: folderMeta.bucket,
+            status: folderMeta.deleted || folderMeta.removed ? 'TRASHED' : 'EXISTS',
             name: folderMeta.plainName ?? folderMeta.name,
             encryptedName: folderMeta.name,
             parentId: folderMeta.parentId,

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

@@ -3,5 +3,6 @@ import { WebDavRequestedResource } from '../types/webdav.types';
 import { DriveDatabaseManager } from '../services/database/drive-database-manager.service';
 export declare class WebDavUtils {
     static joinURL(...pathComponents: string[]): string;
+    static getParentPath(fromPath: string): string;
     static getRequestedResource(req: Request, driveDatabaseManager: DriveDatabaseManager): Promise<WebDavRequestedResource>;
 }

package/dist/utils/webdav.utils.js

@@ -11,6 +11,9 @@ class WebDavUtils {
     static joinURL(...pathComponents) {
         return path_1.default.posix.join(...pathComponents);
     }
+    static getParentPath(fromPath) {
+        return path_1.default.dirname(fromPath);
+    }
     static async getRequestedResource(req, driveDatabaseManager) {
         const decodedUrl = decodeURI(req.url);
         const parsedPath = path_1.default.parse(decodedUrl);

package/dist/webdav/handlers/DELETE.handler.d.ts

@@ -1,4 +1,12 @@
+import { Request, Response } from 'express';
 import { WebDavMethodHandler } from '../../types/webdav.types';
+import { DriveDatabaseManager } from '../../services/database/drive-database-manager.service';
+import { TrashService } from '../../services/drive/trash.service';
 export declare class DELETERequestHandler implements WebDavMethodHandler {
-    handle(): Promise<void>;
+    private dependencies;
+    constructor(dependencies: {
+        driveDatabaseManager: DriveDatabaseManager;
+        trashService: TrashService;
+    });
+    handle: (req: Request, res: Response) => Promise<void>;
 }

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

@@ -2,9 +2,31 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DELETERequestHandler = void 0;
 const errors_utils_1 = require("../../utils/errors.utils");
+const webdav_utils_1 = require("../../utils/webdav.utils");
+const logger_utils_1 = require("../../utils/logger.utils");
 class DELETERequestHandler {
-    async handle() {
-        throw new errors_utils_1.NotImplementedError('DELETE is not implemented yet.');
+    dependencies;
+    constructor(dependencies) {
+        this.dependencies = dependencies;
     }
+    handle = async (req, res) => {
+        logger_utils_1.webdavLogger.info('DELETE request received');
+        const resource = await webdav_utils_1.WebDavUtils.getRequestedResource(req, this.dependencies.driveDatabaseManager);
+        logger_utils_1.webdavLogger.info('Resource found for DELETE request', { resource });
+        const databaseItem = await this.dependencies.driveDatabaseManager.findByRelativePath(resource.url);
+        if (!databaseItem)
+            throw new errors_utils_1.NotFoundError('Resource not found');
+        logger_utils_1.webdavLogger.info(`Trashing ${resource.type} with UUID ${databaseItem.uuid}...`);
+        await this.dependencies.trashService.trashItems({
+            items: [{ type: resource.type, uuid: databaseItem.uuid }],
+        });
+        if (resource.type === 'folder') {
+            await this.dependencies.driveDatabaseManager.deleteFolder(databaseItem.id);
+        }
+        if (resource.type === 'file') {
+            await this.dependencies.driveDatabaseManager.deleteFile(databaseItem.id);
+        }
+        res.status(204).send();
+    };
 }
 exports.DELETERequestHandler = DELETERequestHandler;

package/dist/webdav/handlers/MKCOL.handler.d.ts

@@ -1,4 +1,12 @@
+import { DriveDatabaseManager } from '../../services/database/drive-database-manager.service';
 import { WebDavMethodHandler } from '../../types/webdav.types';
+import { Request, Response } from 'express';
+import { DriveFolderService } from '../../services/drive/drive-folder.service';
 export declare class MKCOLRequestHandler implements WebDavMethodHandler {
-    handle(): Promise<void>;
+    private dependencies;
+    constructor(dependencies: {
+        driveDatabaseManager: DriveDatabaseManager;
+        driveFolderService: DriveFolderService;
+    });
+    handle: (req: Request, res: Response) => Promise<void>;
 }

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

@@ -1,10 +1,48 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 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 path_1 = __importDefault(require("path"));
+const xml_utils_1 = require("../../utils/xml.utils");
+const async_utils_1 = require("../../utils/async.utils");
 class MKCOLRequestHandler {
-    async handle() {
-        throw new errors_utils_1.NotImplementedError('MKCOL is not implemented yet.');
+    dependencies;
+    constructor(dependencies) {
+        this.dependencies = dependencies;
     }
+    handle = async (req, res) => {
+        const { driveDatabaseManager, driveFolderService } = this.dependencies;
+        const resourceParsedPath = path_1.default.parse(decodeURI(req.url));
+        const parentPath = webdav_utils_1.WebDavUtils.getParentPath(req.url);
+        const parentResource = await driveDatabaseManager.findByRelativePath(parentPath);
+        if (!parentResource)
+            throw new errors_utils_1.NotFoundError(`Parent resource not found for parent path ${parentPath}`);
+        logger_utils_1.webdavLogger.info(`MKCOL request received for folder at ${req.url}`);
+        logger_utils_1.webdavLogger.info(`Parent path: ${parentResource.id}`);
+        const [createFolder] = driveFolderService.createFolder({
+            folderName: resourceParsedPath.name,
+            parentFolderId: parentResource.id,
+        });
+        const newFolder = await createFolder;
+        logger_utils_1.webdavLogger.info(`✅ Folder created with UUID ${newFolder.uuid}`);
+        await driveDatabaseManager.createFolder({
+            name: newFolder.plain_name,
+            status: 'EXISTS',
+            encryptedName: newFolder.name,
+            bucket: newFolder.bucket,
+            id: newFolder.id,
+            parentId: newFolder.parentId,
+            uuid: newFolder.uuid,
+            createdAt: new Date(newFolder.createdAt),
+            updatedAt: new Date(newFolder.updatedAt),
+        });
+        await async_utils_1.AsyncUtils.sleep(500);
+        res.status(201).send(xml_utils_1.XMLUtils.toWebDavXML({}, {}));
+    };
 }
 exports.MKCOLRequestHandler = MKCOLRequestHandler;

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

@@ -30,6 +30,7 @@ class PROPFINDRequestHandler {
                     const rootFolder = await this.dependencies.driveFolderService.getFolderMetaById(req.user.rootFolderId);
                     await this.dependencies.driveDatabaseManager.createFolder({
                         name: '',
+                        status: 'EXISTS',
                         encryptedName: rootFolder.name,
                         bucket: rootFolder.bucket,
                         id: rootFolder.id,
@@ -112,6 +113,7 @@ class PROPFINDRequestHandler {
             return this.driveFolderItemToXMLNode({
                 name: folder.plainName,
                 bucket: folder.bucket,
+                status: folder.deleted || folder.removed ? 'TRASHED' : 'EXISTS',
                 createdAt: new Date(folder.createdAt),
                 updatedAt: new Date(folder.updatedAt),
                 id: folder.id,
@@ -125,6 +127,7 @@ class PROPFINDRequestHandler {
                 ...folder,
                 name: folder.plainName,
                 encryptedName: folder.name,
+                status: folder.deleted || folder.removed ? 'TRASHED' : 'EXISTS',
             });
         });
         const filesXML = folderContent.files.map((file) => {

package/dist/webdav/index.js

@@ -16,13 +16,14 @@ const upload_service_1 = require("../services/network/upload.service");
 const download_service_1 = require("../services/network/download.service");
 const auth_service_1 = require("../services/auth.service");
 const crypto_service_1 = require("../services/crypto.service");
+const trash_service_1 = require("../services/drive/trash.service");
 dotenv_1.default.config();
 const init = async () => {
     await config_service_1.ConfigService.instance.ensureInternxtCliDataDirExists();
     await config_service_1.ConfigService.instance.ensureWebdavCertsDirExists();
     await config_service_1.ConfigService.instance.ensureInternxtLogsDirExists();
     await drive_database_manager_service_1.DriveDatabaseManager.init();
-    new webdav_server_1.WebDavServer((0, express_1.default)(), config_service_1.ConfigService.instance, drive_file_service_1.DriveFileService.instance, drive_folder_service_1.DriveFolderService.instance, new drive_database_manager_service_1.DriveDatabaseManager(new drive_file_repository_1.DriveFileRepository(), new drive_folder_repository_1.DriveFolderRepository()), upload_service_1.UploadService.instance, download_service_1.DownloadService.instance, auth_service_1.AuthService.instance, crypto_service_1.CryptoService.instance)
+    new webdav_server_1.WebDavServer((0, express_1.default)(), config_service_1.ConfigService.instance, drive_file_service_1.DriveFileService.instance, drive_folder_service_1.DriveFolderService.instance, new drive_database_manager_service_1.DriveDatabaseManager(new drive_file_repository_1.DriveFileRepository(), new drive_folder_repository_1.DriveFolderRepository()), upload_service_1.UploadService.instance, download_service_1.DownloadService.instance, auth_service_1.AuthService.instance, crypto_service_1.CryptoService.instance, trash_service_1.TrashService.instance)
         .start()
         .then()
         .catch(console.error);

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

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RequestLoggerMiddleware = void 0;
 const logger_utils_1 = require("../../utils/logger.utils");
+const analytics_service_1 = require("../../services/analytics.service");
 const RequestLoggerMiddleware = (config) => {
     return (req, _, next) => {
+        analytics_service_1.AnalyticsService.instance.track('WebDAVRequest', { app: 'internxt-webdav' }, { method: req.method.toUpperCase() });
         if (!config.enable)
             return next();
         if (config.methods && !config.methods.includes(req.method))

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

@@ -7,6 +7,7 @@ import { UploadService } from '../services/network/upload.service';
 import { DownloadService } from '../services/network/download.service';
 import { AuthService } from '../services/auth.service';
 import { CryptoService } from '../services/crypto.service';
+import { TrashService } from '../services/drive/trash.service';
 export declare class WebDavServer {
     private app;
     private configService;
@@ -17,7 +18,8 @@ export declare class WebDavServer {
     private downloadService;
     private authService;
     private cryptoService;
-    constructor(app: Express, configService: ConfigService, driveFileService: DriveFileService, driveFolderService: DriveFolderService, driveDatabaseManager: DriveDatabaseManager, uploadService: UploadService, downloadService: DownloadService, authService: AuthService, cryptoService: CryptoService);
+    private trashService;
+    constructor(app: Express, configService: ConfigService, driveFileService: DriveFileService, driveFolderService: DriveFolderService, driveDatabaseManager: DriveDatabaseManager, uploadService: UploadService, downloadService: DownloadService, authService: AuthService, cryptoService: CryptoService, trashService: TrashService);
     private getNetwork;
     private registerMiddlewares;
     private registerHandlers;

package/dist/webdav/webdav-server.js

@@ -35,7 +35,8 @@ class WebDavServer {
     downloadService;
     authService;
     cryptoService;
-    constructor(app, configService, driveFileService, driveFolderService, driveDatabaseManager, uploadService, downloadService, authService, cryptoService) {
+    trashService;
+    constructor(app, configService, driveFileService, driveFolderService, driveDatabaseManager, uploadService, downloadService, authService, cryptoService, trashService) {
         this.app = app;
         this.configService = configService;
         this.driveFileService = driveFileService;
@@ -45,6 +46,7 @@ class WebDavServer {
         this.downloadService = downloadService;
         this.authService = authService;
         this.cryptoService = cryptoService;
+        this.trashService = trashService;
     }
     async getNetwork() {
         const credentials = await this.configService.readUser();
@@ -89,8 +91,14 @@ class WebDavServer {
             authService: this.authService,
             networkFacade: await this.getNetwork(),
         }).handle));
-        this.app.mkcol('*', (0, express_async_handler_1.default)(new MKCOL_handler_1.MKCOLRequestHandler().handle));
-        this.app.delete('*', (0, express_async_handler_1.default)(new DELETE_handler_1.DELETERequestHandler().handle));
+        this.app.mkcol('*', (0, express_async_handler_1.default)(new MKCOL_handler_1.MKCOLRequestHandler({
+            driveDatabaseManager: this.driveDatabaseManager,
+            driveFolderService: this.driveFolderService,
+        }).handle));
+        this.app.delete('*', (0, express_async_handler_1.default)(new DELETE_handler_1.DELETERequestHandler({
+            driveDatabaseManager: this.driveDatabaseManager,
+            trashService: this.trashService,
+        }).handle));
         this.app.proppatch('*', (0, express_async_handler_1.default)(new PROPPATCH_handler_1.PROPPATCHRequestHandler().handle));
         this.app.move('*', (0, express_async_handler_1.default)(new MOVE_handler_1.MOVERequestHandler().handle));
         this.app.copy('*', (0, express_async_handler_1.default)(new COPY_handler_1.COPYRequestHandler().handle));

package/oclif.manifest.json

@@ -101,6 +101,46 @@
         "config.js"
       ]
     },
+    "create-folder": {
+      "aliases": [],
+      "args": {},
+      "description": "Create a folder in your Internxt Drive",
+      "examples": [
+        "<%= config.bin %> <%= command.id %>"
+      ],
+      "flags": {
+        "name": {
+          "description": "The new folder name",
+          "name": "name",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "id": {
+          "description": "The folder id to create the folder in, defaults to your root folder",
+          "name": "id",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "create-folder",
+      "pluginAlias": "@internxt/cli",
+      "pluginName": "@internxt/cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": false,
+      "relativePath": [
+        "dist",
+        "commands",
+        "create-folder.js"
+      ]
+    },
     "download": {
       "aliases": [],
       "args": {},
@@ -589,5 +629,5 @@
       ]
     }
   },
-  "version": "1.0.0"
+  "version": "1.0.6"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "author": "PixoDev",
-  "version": "1.0.0",
+  "version": "1.0.6",
   "description": "Internxt CLI to manage your encrypted storage",
   "scripts": {
     "build": "tsc",
@@ -12,10 +12,13 @@
     "test:unit": "nyc --reporter=lcov --reporter=text mocha \"test/**/*.test.ts\" --exit",
     "dev:webdav": "nodemon -e ts --exec ts-node src/webdav/index.ts",
     "version": "oclif readme && git add README.md",
+    "pack:win": "oclif pack win",
     "migrate": "sequelize db:migrate",
     "migrate:undo": "sequelize db:migrate:undo",
     "publish:npm": "npm run build && npm publish --scope=@internxt --registry=https://registry.npmjs.org/ --access public",
-    "publish:github": "npm publish"
+    "publish:github": "npm publish",
+    "postuninstall": "pm2 delete 'Internxt CLI WebDav'",
+    "postinstall": "pm2 restart 'Internxt CLI WebDav'"
   },
   "publishConfig": {
     "access": "public",
@@ -37,8 +40,9 @@
   "dependencies": {
     "@internxt/inxt-js": "^2.0.11",
     "@internxt/lib": "^1.2.1",
-    "@internxt/sdk": "^1.4.76",
+    "@internxt/sdk": "^1.4.79",
     "@oclif/core": "^3",
+    "@rudderstack/rudder-sdk-node": "^2.0.7",
     "axios": "^1.6.7",
     "bip39": "^3.1.0",
     "body-parser": "^1.20.2",