@internxt/cli 1.6.0 → 1.6.2

package/dist/commands/trash-file.d.ts

@@ -5,8 +5,8 @@ export default class TrashFile extends Command {
     static readonly aliases: string[];
     static readonly examples: string[];
     static readonly flags: {
-        id: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        id: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'non-interactive': import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static readonly enableJsonFlag = true;
     run: () => Promise<{

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

@@ -5,8 +5,8 @@ export default class TrashFolder extends Command {
     static readonly aliases: string[];
     static readonly examples: string[];
     static readonly flags: {
-        id: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        id: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'non-interactive': import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static readonly enableJsonFlag = true;
     run: () => Promise<{

package/dist/commands/trash-list.d.ts

@@ -5,7 +5,7 @@ export default class TrashList extends Command {
     static readonly aliases: string[];
     static readonly examples: string[];
     static readonly flags: {
-        extended: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        extended: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static readonly enableJsonFlag = true;
     run: () => Promise<{
@@ -35,7 +35,7 @@ export default class TrashList extends Command {
             files: {
                 id: number;
                 uuid: string;
-                fileId: string;
+                fileId: string | null;
                 name: string;
                 type: string;
                 size: string;

package/dist/commands/trash-restore-file.d.ts

@@ -5,9 +5,9 @@ export default class TrashRestoreFile extends Command {
     static readonly aliases: string[];
     static readonly examples: string[];
     static readonly flags: {
-        id: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        destination: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        id: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        destination: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'non-interactive': import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static readonly enableJsonFlag = true;
     run: () => Promise<{
@@ -16,7 +16,7 @@ export default class TrashRestoreFile extends Command {
         file: {
             id: number;
             uuid: string;
-            fileId: string;
+            fileId: string | null;
             name: string;
             type: string;
             size: string;

package/dist/commands/trash-restore-folder.d.ts

@@ -5,9 +5,9 @@ export default class TrashRestoreFolder extends Command {
     static readonly aliases: string[];
     static readonly examples: string[];
     static readonly flags: {
-        id: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        destination: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        id: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        destination: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'non-interactive': import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static readonly enableJsonFlag = true;
     run: () => Promise<{

package/dist/commands/upload-file.d.ts

@@ -5,9 +5,9 @@ export default class UploadFile extends Command {
     static readonly aliases: string[];
     static readonly examples: string[];
     static readonly flags: {
-        file: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        destination: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        file: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        destination: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'non-interactive': import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static readonly enableJsonFlag = true;
     run: () => Promise<{
@@ -16,13 +16,13 @@ export default class UploadFile extends Command {
         file: {
             plainName: string;
             name: string;
+            status: "EXISTS" | "TRASHED" | "DELETED";
             id: number;
             uuid: string;
+            fileId: string | null;
             bucket: string;
-            folderUuid: string;
             folderId: number;
-            status: "EXISTS" | "TRASHED" | "DELETED";
-            fileId: string;
+            folderUuid: string;
             itemType: "file";
             size: number;
             createdAt: Date;
@@ -33,6 +33,5 @@ export default class UploadFile extends Command {
         };
     }>;
     catch: (error: Error) => Promise<never>;
-    private getDestinationFolderUuid;
     private getFilePath;
 }

package/dist/commands/upload-file.js

@@ -6,23 +6,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const promises_1 = require("node:fs/promises");
 const node_fs_1 = require("node:fs");
-const network_facade_service_1 = require("../services/network/network-facade.service");
-const sdk_manager_service_1 = require("../services/sdk-manager.service");
 const auth_service_1 = require("../services/auth.service");
 const cli_utils_1 = require("../utils/cli.utils");
 const config_service_1 = require("../services/config.service");
 const node_path_1 = __importDefault(require("node:path"));
 const drive_file_service_1 = require("../services/drive/drive-file.service");
-const crypto_service_1 = require("../services/crypto.service");
-const download_service_1 = require("../services/network/download.service");
-const errors_utils_1 = require("../utils/errors.utils");
 const command_types_1 = require("../types/command.types");
 const validation_service_1 = require("../services/validation.service");
 const types_1 = require("@internxt/sdk/dist/drive/storage/types");
-const thumbnail_service_1 = require("../services/thumbnail.service");
 const stream_utils_1 = require("../utils/stream.utils");
 const thumbnail_utils_1 = require("../utils/thumbnail.utils");
-const inxt_js_1 = require("@internxt/inxt-js");
 class UploadFile extends core_1.Command {
     static args = {};
     static description = 'Upload a file to Internxt Drive';
@@ -49,62 +42,59 @@ class UploadFile extends core_1.Command {
         const { user } = await auth_service_1.AuthService.instance.getAuthDetails();
         const filePath = await this.getFilePath(flags['file'], nonInteractive);
         const stats = await (0, promises_1.stat)(filePath);
-        if (!stats.size) {
-            throw new Error('The file is empty. Uploading empty files is not allowed.');
-        }
         const fileInfo = node_path_1.default.parse(filePath);
         const fileType = fileInfo.ext.replaceAll('.', '');
-        let destinationFolderUuid = await this.getDestinationFolderUuid(flags['destination'], nonInteractive);
-        if (destinationFolderUuid.trim().length === 0) {
-            destinationFolderUuid = user.rootFolderId;
-        }
-        cli_utils_1.CLIUtils.doing('Preparing Network', flags['json']);
-        const networkModule = sdk_manager_service_1.SdkManager.instance.getNetwork({
-            user: user.bridgeUser,
-            pass: user.userId,
-        });
-        const environment = new inxt_js_1.Environment({
-            bridgeUser: user.bridgeUser,
-            bridgePass: user.userId,
-            bridgeUrl: config_service_1.ConfigService.instance.get('NETWORK_URL'),
-            encryptionKey: user.mnemonic,
-            appDetails: sdk_manager_service_1.SdkManager.getAppDetails(),
-        });
-        const networkFacade = new network_facade_service_1.NetworkFacade(networkModule, environment, download_service_1.DownloadService.instance, crypto_service_1.CryptoService.instance);
-        cli_utils_1.CLIUtils.done(flags['json']);
-        const readStream = (0, node_fs_1.createReadStream)(filePath);
-        const timer = cli_utils_1.CLIUtils.timer();
+        const destinationFolderUuid = (await cli_utils_1.CLIUtils.getDestinationFolderUuid({
+            destinationFolderUuidFlag: flags['destination'],
+            destinationFlagName: UploadFile.flags['destination'].name,
+            nonInteractive,
+            reporter: this.log.bind(this),
+        })) ?? user.rootFolderId;
+        const timings = {
+            networkUpload: 0,
+            driveUpload: 0,
+            thumbnailUpload: 0,
+        };
+        const networkFacade = cli_utils_1.CLIUtils.prepareNetwork({ loginUserDetails: user, jsonFlag: flags['json'] });
+        const networkUploadTimer = cli_utils_1.CLIUtils.timer();
         const progressBar = cli_utils_1.CLIUtils.progress({
             format: 'Uploading file [{bar}] {percentage}%',
             linewrap: true,
         }, flags['json']);
         progressBar?.start(100, 0);
+        let fileId;
         let bufferStream;
-        let fileStream = readStream;
         const isThumbnailable = (0, thumbnail_utils_1.isFileThumbnailable)(fileType);
-        if (isThumbnailable) {
-            bufferStream = new stream_utils_1.BufferStream();
-            fileStream = readStream.pipe(bufferStream);
-        }
-        const progressCallback = (progress) => {
-            progressBar?.update(progress * 100 * 0.99);
-        };
-        const fileId = await new Promise((resolve, reject) => {
-            const state = networkFacade.uploadFile(fileStream, stats.size, user.bucket, (err, res) => {
-                if (err) {
-                    return reject(err);
-                }
-                resolve(res);
-            }, progressCallback);
-            process.on('SIGINT', () => {
-                state.stop();
-                process.exit(1);
+        const fileSize = stats.size ?? 0;
+        if (fileSize > 0) {
+            const readStream = (0, node_fs_1.createReadStream)(filePath);
+            let fileStream = readStream;
+            if (isThumbnailable) {
+                bufferStream = new stream_utils_1.BufferStream();
+                fileStream = readStream.pipe(bufferStream);
+            }
+            const progressCallback = (progress) => {
+                progressBar?.update(progress * 100 * 0.99);
+            };
+            fileId = await new Promise((resolve, reject) => {
+                const state = networkFacade.uploadFile(fileStream, fileSize, user.bucket, (err, res) => {
+                    if (err) {
+                        return reject(err);
+                    }
+                    resolve(res);
+                }, progressCallback);
+                process.on('SIGINT', () => {
+                    state.stop();
+                    process.exit(1);
+                });
             });
-        });
+        }
+        timings.networkUpload = networkUploadTimer.stop();
+        const driveUploadTimer = cli_utils_1.CLIUtils.timer();
         const createdDriveFile = await drive_file_service_1.DriveFileService.instance.createFile({
             plainName: fileInfo.name,
             type: fileType,
-            size: stats.size,
+            size: fileSize,
             folderUuid: destinationFolderUuid,
             fileId: fileId,
             bucket: user.bucket,
@@ -112,29 +102,37 @@ class UploadFile extends core_1.Command {
             creationTime: stats.birthtime?.toISOString(),
             modificationTime: stats.mtime?.toISOString(),
         });
-        try {
-            if (isThumbnailable && bufferStream) {
-                const thumbnailBuffer = bufferStream.getBuffer();
-                if (thumbnailBuffer) {
-                    await thumbnail_service_1.ThumbnailService.instance.uploadThumbnail(thumbnailBuffer, fileType, user.bucket, createdDriveFile.uuid, networkFacade);
-                }
-            }
-        }
-        catch (error) {
-            errors_utils_1.ErrorUtils.report(error, { command: this.id });
+        timings.driveUpload = driveUploadTimer.stop();
+        const thumbnailTimer = cli_utils_1.CLIUtils.timer();
+        if (fileSize > 0 && isThumbnailable && bufferStream) {
+            void (0, thumbnail_utils_1.tryUploadThumbnail)({
+                bufferStream,
+                fileType,
+                userBucket: user.bucket,
+                fileUuid: createdDriveFile.uuid,
+                networkFacade,
+            });
         }
+        timings.thumbnailUpload = thumbnailTimer.stop();
         progressBar?.update(100);
         progressBar?.stop();
-        const uploadTime = timer.stop();
+        const totalTime = Object.values(timings).reduce((sum, time) => sum + time, 0);
+        const throughputMBps = cli_utils_1.CLIUtils.calculateThroughputMBps(stats.size, timings.networkUpload);
+        this.log('\n');
+        this.log(`[PUT] Timing breakdown:\n
+      Network upload: ${cli_utils_1.CLIUtils.formatDuration(timings.networkUpload)} (${throughputMBps.toFixed(2)} MB/s)\n
+      Drive upload: ${cli_utils_1.CLIUtils.formatDuration(timings.driveUpload)}\n
+      Thumbnail: ${cli_utils_1.CLIUtils.formatDuration(timings.thumbnailUpload)}\n`);
         this.log('\n');
-        const message = `File uploaded in ${uploadTime}ms, view it at ${config_service_1.ConfigService.instance.get('DRIVE_WEB_URL')}/file/${createdDriveFile.uuid}`;
+        const message = `File uploaded successfully in ${cli_utils_1.CLIUtils.formatDuration(totalTime)}, view it at ` +
+            `${config_service_1.ConfigService.instance.get('DRIVE_WEB_URL')}/file/${createdDriveFile.uuid}`;
         cli_utils_1.CLIUtils.success(this.log.bind(this), message);
         return {
             success: true,
             message,
             file: {
                 ...createdDriveFile,
-                plainName: fileInfo.name,
+                plainName: createdDriveFile.name,
             },
         };
     };
@@ -148,23 +146,6 @@ class UploadFile extends core_1.Command {
         });
         this.exit(1);
     };
-    getDestinationFolderUuid = async (destinationFolderUuidFlag, nonInteractive) => {
-        const destinationFolderUuid = await cli_utils_1.CLIUtils.getValueFromFlag({
-            value: destinationFolderUuidFlag,
-            name: UploadFile.flags['destination'].name,
-        }, {
-            nonInteractive,
-            prompt: {
-                message: 'What is the destination folder id? (leave empty for the root folder)',
-                options: { type: 'input' },
-            },
-        }, {
-            validate: validation_service_1.ValidationService.instance.validateUUIDv4,
-            error: new command_types_1.NotValidFolderUuidError(),
-            canBeEmpty: true,
-        }, this.log.bind(this));
-        return destinationFolderUuid;
-    };
     getFilePath = async (fileFlag, nonInteractive) => {
         const filePath = await cli_utils_1.CLIUtils.getValueFromFlag({
             value: fileFlag,

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

@@ -0,0 +1,16 @@
+import { Command } from '@oclif/core';
+export default class UploadFolder extends Command {
+    static readonly args: {};
+    static readonly description = "Upload a folder to Internxt Drive";
+    static readonly aliases: string[];
+    static readonly examples: string[];
+    static readonly flags: {
+        folder: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        destination: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'non-interactive': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+    };
+    static readonly enableJsonFlag = true;
+    run: () => Promise<void>;
+    catch: (error: Error) => Promise<never>;
+    private getFolderPath;
+}

package/dist/commands/upload-folder.js

@@ -0,0 +1,87 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@oclif/core");
+const cli_utils_1 = require("../utils/cli.utils");
+const auth_service_1 = require("../services/auth.service");
+const validation_service_1 = require("../services/validation.service");
+const config_service_1 = require("../services/config.service");
+const upload_facade_service_1 = require("../services/network/upload/upload-facade.service");
+const command_types_1 = require("../types/command.types");
+class UploadFolder extends core_1.Command {
+    static args = {};
+    static description = 'Upload a folder to Internxt Drive';
+    static aliases = ['upload:folder'];
+    static examples = ['<%= config.bin %> <%= command.id %>'];
+    static flags = {
+        ...cli_utils_1.CLIUtils.CommonFlags,
+        folder: core_1.Flags.string({
+            char: 'f',
+            description: 'The path to the folder on your system.',
+            required: false,
+        }),
+        destination: core_1.Flags.string({
+            char: 'i',
+            description: 'The folder id where the folder is going to be uploaded to. Leave empty for the root folder.',
+            required: false,
+            parse: cli_utils_1.CLIUtils.parseEmpty,
+        }),
+    };
+    static enableJsonFlag = true;
+    run = async () => {
+        const { user } = await auth_service_1.AuthService.instance.getAuthDetails();
+        const { flags } = await this.parse(UploadFolder);
+        const localPath = await this.getFolderPath(flags['folder'], flags['non-interactive']);
+        const destinationFolderUuid = (await cli_utils_1.CLIUtils.getDestinationFolderUuid({
+            destinationFolderUuidFlag: flags['destination'],
+            destinationFlagName: UploadFolder.flags['destination'].name,
+            nonInteractive: flags['non-interactive'],
+            reporter: this.log.bind(this),
+        })) ?? user.rootFolderId;
+        const progressBar = cli_utils_1.CLIUtils.progress({
+            format: 'Uploading folder [{bar}] {percentage}%',
+            linewrap: true,
+        }, flags['json']);
+        progressBar?.start(100, 0);
+        const data = await upload_facade_service_1.UploadFacade.instance.uploadFolder({
+            localPath,
+            destinationFolderUuid,
+            loginUserDetails: user,
+            jsonFlag: flags['json'],
+            onProgress: (progress) => {
+                progressBar?.update(progress.percentage);
+            },
+        });
+        progressBar?.update(100);
+        progressBar?.stop();
+        const driveUrl = config_service_1.ConfigService.instance.get('DRIVE_WEB_URL');
+        const folderUrl = `${driveUrl}/folder/${data.rootFolderId}`;
+        const message = `Folder uploaded in ${data.uploadTimeMs}ms, view it at ${folderUrl} (${data.totalBytes} bytes)`;
+        cli_utils_1.CLIUtils.success(this.log.bind(this), message);
+    };
+    catch = async (error) => {
+        const { flags } = await this.parse(UploadFolder);
+        cli_utils_1.CLIUtils.catchError({
+            error,
+            command: this.id,
+            logReporter: this.log.bind(this),
+            jsonFlag: flags['json'],
+        });
+        this.exit(1);
+    };
+    getFolderPath = async (folderFlag, nonInteractive) => {
+        return await cli_utils_1.CLIUtils.getValueFromFlag({
+            value: folderFlag,
+            name: UploadFolder.flags['folder'].name,
+        }, {
+            nonInteractive,
+            prompt: {
+                message: 'What is the path to the folder on your computer?',
+                options: { type: 'input' },
+            },
+        }, {
+            validate: validation_service_1.ValidationService.instance.validateDirectoryExists,
+            error: new command_types_1.NotValidDirectoryError(),
+        }, this.log.bind(this));
+    };
+}
+exports.default = UploadFolder;

package/dist/commands/webdav-config.d.ts

@@ -5,12 +5,12 @@ export default class WebDAVConfig extends Command {
     static readonly aliases: never[];
     static readonly examples: string[];
     static readonly flags: {
-        host: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        port: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        https: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        http: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        timeout: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        createFullPath: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        host: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        port: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        https: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        http: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        timeout: import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        createFullPath: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static readonly enableJsonFlag = true;
     run: () => Promise<{

package/dist/commands/webdav.d.ts

@@ -1,7 +1,7 @@
 import { Command } from '@oclif/core';
 export default class Webdav extends Command {
     static readonly args: {
-        action: import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
+        action: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
     };
     static readonly description = "Enable, disable, restart or get the status of the Internxt CLI WebDav server";
     static readonly aliases: never[];

package/dist/constants/configs.d.ts

@@ -0,0 +1,12 @@
+export declare const INTERNXT_CLI_DATA_DIR: string;
+export declare const INTERNXT_CLI_LOGS_DIR: string;
+export declare const INTERNXT_TMP_DIR: string;
+export declare const CREDENTIALS_FILE: string;
+export declare const DRIVE_SQLITE_FILE: string;
+export declare const WEBDAV_SSL_CERTS_DIR: string;
+export declare const WEBDAV_CONFIGS_FILE: string;
+export declare const WEBDAV_DEFAULT_HOST = "127.0.0.1";
+export declare const WEBDAV_DEFAULT_PORT = "3005";
+export declare const WEBDAV_DEFAULT_PROTOCOL = "https";
+export declare const WEBDAV_DEFAULT_TIMEOUT = 0;
+export declare const WEBDAV_DEFAULT_CREATE_FULL_PATH = true;

package/dist/constants/configs.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WEBDAV_DEFAULT_CREATE_FULL_PATH = exports.WEBDAV_DEFAULT_TIMEOUT = exports.WEBDAV_DEFAULT_PROTOCOL = exports.WEBDAV_DEFAULT_PORT = exports.WEBDAV_DEFAULT_HOST = exports.WEBDAV_CONFIGS_FILE = exports.WEBDAV_SSL_CERTS_DIR = exports.DRIVE_SQLITE_FILE = exports.CREDENTIALS_FILE = exports.INTERNXT_TMP_DIR = exports.INTERNXT_CLI_LOGS_DIR = exports.INTERNXT_CLI_DATA_DIR = void 0;
+const node_path_1 = __importDefault(require("node:path"));
+const node_os_1 = __importDefault(require("node:os"));
+exports.INTERNXT_CLI_DATA_DIR = node_path_1.default.join(node_os_1.default.homedir(), '.internxt-cli');
+exports.INTERNXT_CLI_LOGS_DIR = node_path_1.default.join(exports.INTERNXT_CLI_DATA_DIR, 'logs');
+exports.INTERNXT_TMP_DIR = node_os_1.default.tmpdir();
+exports.CREDENTIALS_FILE = node_path_1.default.join(exports.INTERNXT_CLI_DATA_DIR, '.inxtcli');
+exports.DRIVE_SQLITE_FILE = node_path_1.default.join(exports.INTERNXT_CLI_DATA_DIR, 'internxt-cli-drive.sqlite');
+exports.WEBDAV_SSL_CERTS_DIR = node_path_1.default.join(exports.INTERNXT_CLI_DATA_DIR, 'certs');
+exports.WEBDAV_CONFIGS_FILE = node_path_1.default.join(exports.INTERNXT_CLI_DATA_DIR, 'config.webdav.inxt');
+exports.WEBDAV_DEFAULT_HOST = '127.0.0.1';
+exports.WEBDAV_DEFAULT_PORT = '3005';
+exports.WEBDAV_DEFAULT_PROTOCOL = 'https';
+exports.WEBDAV_DEFAULT_TIMEOUT = 0;
+exports.WEBDAV_DEFAULT_CREATE_FULL_PATH = true;

package/dist/services/auth.service.js

@@ -35,7 +35,7 @@ class AuthService {
         return securityDetails.tfaEnabled;
     };
     getAuthDetails = async () => {
-        let loginCreds = await config_service_1.ConfigService.instance.readUser();
+        const loginCreds = await config_service_1.ConfigService.instance.readUser();
         if (!loginCreds?.token || !loginCreds?.user?.mnemonic) {
             throw new command_types_1.MissingCredentialsError();
         }
@@ -47,11 +47,16 @@ class AuthService {
         if (tokenDetails.expiration.expired) {
             throw new command_types_1.ExpiredCredentialsError();
         }
-        const refreshToken = tokenDetails.expiration.refreshRequired;
-        if (refreshToken) {
-            loginCreds = await this.refreshUserToken(loginCreds.token, loginCreds.user.mnemonic);
+        if (!tokenDetails.expiration.refreshRequired) {
+            return loginCreds;
+        }
+        try {
+            return await this.refreshUserToken(loginCreds.token, loginCreds.user.mnemonic);
+        }
+        catch (error) {
+            await config_service_1.ConfigService.instance.clearUser();
+            throw error;
         }
-        return loginCreds;
     };
     refreshUserToken = async (oldToken, mnemonic) => {
         sdk_manager_service_1.SdkManager.init({ token: oldToken });
@@ -75,7 +80,7 @@ class AuthService {
     logout = async () => {
         try {
             const user = await config_service_1.ConfigService.instance.readUser();
-            if (!user || !user.token) {
+            if (!user?.token) {
                 return;
             }
             const authClient = sdk_manager_service_1.SdkManager.instance.getAuth();

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

@@ -1,18 +1,6 @@
 import { ConfigKeys } from '../types/config.types';
 import { LoginCredentials, WebdavConfig } from '../types/command.types';
 export declare class ConfigService {
-    static readonly INTERNXT_CLI_DATA_DIR: string;
-    static readonly INTERNXT_CLI_LOGS_DIR: string;
-    static readonly INTERNXT_TMP_DIR: string;
-    static readonly CREDENTIALS_FILE: string;
-    static readonly DRIVE_SQLITE_FILE: string;
-    static readonly WEBDAV_SSL_CERTS_DIR: string;
-    static readonly WEBDAV_CONFIGS_FILE: string;
-    static readonly WEBDAV_DEFAULT_HOST = "127.0.0.1";
-    static readonly WEBDAV_DEFAULT_PORT = "3005";
-    static readonly WEBDAV_DEFAULT_PROTOCOL = "https";
-    static readonly WEBDAV_DEFAULT_TIMEOUT = 0;
-    static readonly WEBDAV_DEFAULT_CREATE_FULL_PATH = true;
     static readonly instance: ConfigService;
     get: (key: keyof ConfigKeys) => string;
     saveUser: (loginCredentials: LoginCredentials) => Promise<void>;