@super-protocol/sp-cli 0.0.2-beta.15 → 0.0.2-beta.17

package/README.md

@@ -21,7 +21,7 @@ $ npm install -g @super-protocol/sp-cli
 $ sp COMMAND
 running command...
 $ sp (--version)
-@super-protocol/sp-cli/0.0.2-beta.15 linux-x64 node-v22.21.1
+@super-protocol/sp-cli/0.0.2-beta.17 linux-x64 node-v22.21.1
 $ sp --help [COMMAND]
 USAGE
   $ sp COMMAND
@@ -65,7 +65,7 @@ DESCRIPTION
   Information about current authorized user
 ```
 
-_See code: [src/commands/account/info.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.15/src/commands/account/info.ts)_
+_See code: [src/commands/account/info.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.17/src/commands/account/info.ts)_
 
 ## `sp auth login`
 
@@ -89,7 +89,7 @@ EXAMPLES
   $ sp auth login
 ```
 
-_See code: [src/commands/auth/login.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.15/src/commands/auth/login.ts)_
+_See code: [src/commands/auth/login.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.17/src/commands/auth/login.ts)_
 
 ## `sp auth me`
 
@@ -102,7 +102,7 @@ GLOBAL FLAGS
   --json            Format output as json.
 ```
 
-_See code: [src/commands/auth/me.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.15/src/commands/auth/me.ts)_
+_See code: [src/commands/auth/me.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.17/src/commands/auth/me.ts)_
 
 ## `sp autocomplete [SHELL]`
 
@@ -163,7 +163,7 @@ EXAMPLES
   $ sp config delete - Delete a configuration
 ```
 
-_See code: [src/commands/config/index.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.15/src/commands/config/index.ts)_
+_See code: [src/commands/config/index.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.17/src/commands/config/index.ts)_
 
 ## `sp config add [FILE]`
 
@@ -202,7 +202,7 @@ EXAMPLES
     }
 ```
 
-_See code: [src/commands/config/add.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.15/src/commands/config/add.ts)_
+_See code: [src/commands/config/add.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.17/src/commands/config/add.ts)_
 
 ## `sp config create`
 
@@ -229,7 +229,7 @@ EXAMPLES
   $ sp config create --name "Production" --url "https://api.dp.superprotocol.com"
 ```
 
-_See code: [src/commands/config/create.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.15/src/commands/config/create.ts)_
+_See code: [src/commands/config/create.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.17/src/commands/config/create.ts)_
 
 ## `sp config delete`
 
@@ -257,7 +257,7 @@ EXAMPLES
   $ sp config delete --name "My Config" --force
 ```
 
-_See code: [src/commands/config/delete.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.15/src/commands/config/delete.ts)_
+_See code: [src/commands/config/delete.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.17/src/commands/config/delete.ts)_
 
 ## `sp config list`
 
@@ -277,7 +277,7 @@ EXAMPLES
   $ sp config list
 ```
 
-_See code: [src/commands/config/list.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.15/src/commands/config/list.ts)_
+_See code: [src/commands/config/list.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.17/src/commands/config/list.ts)_
 
 ## `sp config show`
 
@@ -297,7 +297,7 @@ EXAMPLES
   $ sp config show
 ```
 
-_See code: [src/commands/config/show.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.15/src/commands/config/show.ts)_
+_See code: [src/commands/config/show.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.17/src/commands/config/show.ts)_
 
 ## `sp config use`
 
@@ -317,11 +317,11 @@ EXAMPLES
   $ sp config use
 ```
 
-_See code: [src/commands/config/use.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.15/src/commands/config/use.ts)_
+_See code: [src/commands/config/use.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.17/src/commands/config/use.ts)_
 
 ## `sp files download RESOURCEFILE LOCALDIRECTORY`
 
-Download file or directory described in resource frole
+Download file or directory described in resource file
 
 ```
 USAGE
@@ -332,24 +332,24 @@ ARGUMENTS
   LOCALDIRECTORY  Path to save downloaded file
 
 FLAGS
-  --maximum-concurrent=<value>  [default: 1] Maximum concurrent pieces to upload at once per transfer
+  --maximum-concurrent=<value>  [default: 1] Maximum concurrent pieces to download at once per transfer
 
 GLOBAL FLAGS
   --config=<value>  Specify config file.
   --json            Format output as json.
 
 DESCRIPTION
-  Download file or directory described in resource frole
+  Download file or directory described in resource file
 
 EXAMPLES
   $ sp files download ./resource.json ./pathToDownload
 ```
 
-_See code: [src/commands/files/download.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.15/src/commands/files/download.ts)_
+_See code: [src/commands/files/download.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.17/src/commands/files/download.ts)_
 
 ## `sp files upload PATH`
 
-Upload files of directory to remote storage
+Upload file or directory to remote storage
 
 ```
 USAGE
@@ -373,13 +373,13 @@ GLOBAL FLAGS
   --json            Format output as json.
 
 DESCRIPTION
-  Upload files of directory to remote storage
+  Upload file or directory to remote storage
 
 EXAMPLES
   $ sp files upload ./file.txt
 ```
 
-_See code: [src/commands/files/upload.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.15/src/commands/files/upload.ts)_
+_See code: [src/commands/files/upload.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.17/src/commands/files/upload.ts)_
 
 ## `sp help [COMMAND]`
 
@@ -450,7 +450,7 @@ EXAMPLES
   $ sp storage create --not-default
 ```
 
-_See code: [src/commands/storage/create.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.15/src/commands/storage/create.ts)_
+_See code: [src/commands/storage/create.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.17/src/commands/storage/create.ts)_
 
 ## `sp storage select`
 
@@ -476,7 +476,7 @@ EXAMPLES
   $ sp storage select --id=2de3e3a4-0000-1111-2222-333344445555
 ```
 
-_See code: [src/commands/storage/select.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.15/src/commands/storage/select.ts)_
+_See code: [src/commands/storage/select.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.17/src/commands/storage/select.ts)_
 
 ## `sp storage update`
 
@@ -503,5 +503,5 @@ EXAMPLES
   $ sp storage update --id=2de3e3a4-0000-1111-2222-333344445555
 ```
 
-_See code: [src/commands/storage/update.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.15/src/commands/storage/update.ts)_
+_See code: [src/commands/storage/update.ts](https://github.com/Super-Protocol/sp-cli/blob/v0.0.2-beta.17/src/commands/storage/update.ts)_
 <!-- commandsstop -->

package/dist/commands/auth/login.js

@@ -44,7 +44,7 @@ export default class SpLogin extends BaseCommand {
             this.warn('Storage initialization failed. You can set up storage later using "sp storage create" or "sp storage select".');
         }
         const account = accountManager.getAddress();
-        this.log(`Logined in with account ${account}`);
+        this.log(`Logged in with account ${account}`);
         return { account, success: true };
     }
 }

package/dist/commands/files/download.js

@@ -8,13 +8,13 @@ export default class FilesDownload extends BaseCommand {
         // eslint-disable-next-line perfectionist/sort-objects
         localDirectory: Args.string({ description: 'Path to save downloaded file', required: true }),
     };
-    static description = 'Download file or directory described in resource frole';
+    static description = 'Download file or directory described in resource file';
     static examples = [
         '<%= config.bin %> <%= command.id %> ./resource.json ./pathToDownload ',
     ];
     static flags = {
         'maximum-concurrent': Flags.integer({
-            default: 1, description: 'Maximum concurrent pieces to upload at once per transfer', max: 1000, min: 1,
+            default: 1, description: 'Maximum concurrent pieces to download at once per transfer', max: 1000, min: 1,
         }),
     };
     static help = 'Download and decrypt a file from the remote storage to <localPath> using resource file <resourcePath>';
@@ -25,20 +25,19 @@ export default class FilesDownload extends BaseCommand {
     async run() {
         const { args, flags } = await this.parse(FilesDownload);
         const { providerClient } = this.container;
-        const storageSerivce = new StorageService(providerClient, this.logger);
+        const storageService = new StorageService(providerClient, this.logger);
         const progress = createProgressPrinter({
             action: 'Download',
             start: 'Downloading: ',
         });
         try {
-            await storageSerivce.download({
+            await storageService.download({
                 downloadPath: args.localDirectory,
                 maximumConcurrent: flags['maximum-concurrent'],
                 resourcePath: args.resourceFile,
             }, ({ current, key, total }) => {
                 progress.advance(key, current / total * 100, `Downloading: ${key} [${current}/${total}]`);
             });
-            progress.finish();
         }
         catch (error) {
             let reason = '';
@@ -48,6 +47,9 @@ export default class FilesDownload extends BaseCommand {
             }
             this.error(`Download aborted. Reason: ${reason}`);
         }
-        this.log('Download successful completed');
+        finally {
+            progress.finish();
+        }
+        this.log('Download successfully completed');
     }
 }

package/dist/commands/files/upload.js

@@ -6,7 +6,7 @@ export default class FilesUpload extends BaseCommand {
     static args = {
         path: Args.string({ description: 'file or directory to upload', required: true }),
     };
-    static description = 'Upload files of directory to remote storage';
+    static description = 'Upload file or directory to remote storage';
     static examples = [
         '<%= config.bin %> <%= command.id %> ./file.txt',
     ];
@@ -45,24 +45,23 @@ export default class FilesUpload extends BaseCommand {
     async run() {
         const { args, flags } = await this.parse(FilesUpload);
         const { providerClient } = this.container;
-        const storageSerivce = new StorageService(providerClient, this.logger);
+        const storageService = new StorageService(providerClient, this.logger);
         const progress = createProgressPrinter({
             action: 'Upload',
             start: 'Uploading: ',
         });
         try {
-            await storageSerivce.upload({
+            await storageService.upload({
                 localPath: args.path,
                 maximumConcurrent: flags['maximum-concurrent'],
                 metadataPath: flags.metadata,
                 outputPath: flags.output,
                 remotePath: flags.filename,
                 sync: flags.sync,
-                withEncryption: flags['skip-encryption'],
+                withEncryption: !flags['skip-encryption'],
             }, ({ current, key, total }) => {
                 progress.advance(key, current / total * 100, `Uploading: ${key} [${current}/${total}]`);
             });
-            progress.finish();
         }
         catch (error) {
             let reason = '';
@@ -72,6 +71,9 @@ export default class FilesUpload extends BaseCommand {
             }
             this.error(`Upload aborted. Reason: ${reason}`);
         }
-        this.log('Upload successful completed');
+        finally {
+            progress.finish();
+        }
+        this.log('Upload successfully completed');
     }
 }

package/dist/managers/account-manager.js

@@ -65,7 +65,7 @@ export class AccountManager {
         }
         catch (error) {
             this.logger.warn({ err: error }, 'Incorrect config file');
-            ux.warn("Account doesn't exists in current configuration");
+            ux.warn("Account doesn't exist in current configuration");
             const ask = await confirm({
                 message: 'Do you want to create new account?',
             });

package/dist/managers/config-file-manager.js

@@ -170,10 +170,21 @@ export class ConfigFileManager {
             return this.runtimeConfigFile;
         }
         if (!this.configs.currentConfig) {
-            await this.createConfig(DEFAULT_USER_CONFIG_FILE, DEFAULT_USER_CONFIG_NAME);
-            await this.setCurrentConfig(DEFAULT_USER_CONFIG_FILE);
+            try {
+                await this.createConfig(DEFAULT_USER_CONFIG_FILE, DEFAULT_USER_CONFIG_NAME);
+            }
+            catch {
+                //
+            }
+            try {
+                await this.setCurrentConfig(DEFAULT_USER_CONFIG_FILE);
+            }
+            catch (error) {
+                this.logger.error({ err: error }, 'Failed to set default config');
+                throw error;
+            }
         }
-        return path.join(this.configsDir, this.configs.currentConfig);
+        return path.join(this.configsDir, this.configs.currentConfig || DEFAULT_USER_CONFIG_FILE);
     }
     async importConfig(sourcePath, targetName) {
         if (!fs.existsSync(sourcePath)) {

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

@@ -67,5 +67,6 @@ export declare class StorageService {
     } | undefined>;
     updateStorage(id: string, storage: UpdateStorageDto): Promise<StorageResponseDto>;
     upload(params: IUploadParams, progressCb: ProgressCb): Promise<void>;
+    private getStorageCredentials;
 }
 export {};

package/dist/services/storage.service.js

@@ -67,13 +67,22 @@ export class StorageService {
         }
         let localPath = preparePath(params.downloadPath);
         if (resource.filepath) {
-            localPath = joinPaths(localPath, resource.filepath);
+            const sanitizedFilepath = resource.filepath.replaceAll('..', '').replace(/^\/+/, '');
+            localPath = joinPaths(localPath, sanitizedFilepath);
+        }
+        try {
+            this.logger.info('Starting download');
+            const downloadResult = await download(resource, localPath, {
+                encryption: resourceFile.encryption,
+                progressCallback: progressCb,
+                threads: params.maximumConcurrent,
+            });
+            this.logger.info(downloadResult, 'Downloaded');
+        }
+        catch (error) {
+            this.logger.error({ err: error }, 'Download failed with error');
+            throw error;
         }
-        await download(resource, localPath, {
-            encryption: resourceFile.encryption,
-            progressCallback: progressCb,
-            threads: params.maximumConcurrent,
-        });
     }
     async getCentralizedStorage() {
         try {
@@ -234,7 +243,7 @@ export class StorageService {
     }
     async upload(params, progressCb) {
         const storage = await this.getCurrentStorage();
-        const remotePath = `${params.remotePath || generateExternalId()}`;
+        const remotePath = params.remotePath ? params.remotePath.replaceAll('..', '').replace(/^\/+/, '') : generateExternalId();
         const resourceFilePath = preparePath(params.outputPath || '');
         try {
             await fs.stat(resourceFilePath);
@@ -249,32 +258,7 @@ export class StorageService {
         if (params.metadataPath) {
             metadata = await readJsonFile({ path: preparePath(params.metadataPath) });
         }
-        const writeCredentials = storage.storageType === StorageType.StorJ
-            ? {
-                bucket: storage.bucket,
-                prefix: joinPaths(storage.prefix, remotePath),
-                token: storage.storjCredentials.writeAccessToken,
-            }
-            : {
-                accessKeyId: storage.s3Credentials.writeAccessKeyId,
-                bucket: storage.bucket,
-                endpoint: S3_ENDPOINT,
-                prefix: joinPaths(storage.prefix, remotePath),
-                secretKey: storage.s3Credentials.writeSecretAccessKey,
-            };
-        const readCredentials = storage.storageType === StorageType.StorJ
-            ? {
-                bucket: storage.bucket,
-                prefix: joinPaths(storage.prefix, remotePath),
-                token: storage.storjCredentials.readAccessToken,
-            }
-            : {
-                accessKeyId: storage.s3Credentials.readAccessKeyId,
-                bucket: storage.bucket,
-                endpoint: S3_ENDPOINT,
-                prefix: joinPaths(storage.prefix, remotePath),
-                secretKey: storage.s3Credentials.readSecretAccessKey,
-            };
+        const { readCredentials, writeCredentials } = this.getStorageCredentials(storage, remotePath);
         const info = await fs.stat(params.localPath);
         let { localPath } = params;
         let sourcePath;
@@ -283,6 +267,7 @@ export class StorageService {
             localPath = dirname(localPath);
         }
         try {
+            this.logger.info('Starting upload');
             const uploadResult = await upload(localPath, {
                 credentials: writeCredentials,
                 filepath: '',
@@ -301,15 +286,54 @@ export class StorageService {
                 ...metadata,
                 ...uploadResult,
             };
-            await fs.writeFile(resourceFilePath, JSON.stringify(result, null, 2));
+            await fs.writeFile(resourceFilePath, JSON.stringify(result, null, 2), { flag: 'wx' });
             this.logger.info(`Resource file was created in ${resourceFilePath}`);
         }
         catch (error) {
-            this.logger.error({ err: error }, 'Somethong went wrong with upload');
-            console.log(error);
-            const error_ = error instanceof StorageError ? error : new ProviderClientError('Request failed please try again later');
-            throw error_;
+            this.logger.error({ err: error }, 'Something went wrong with upload');
+            throw error;
+        }
+    }
+    getStorageCredentials(storage, remotePath) {
+        if (storage.storageType === StorageType.StorJ) {
+            const { readAccessToken, writeAccessToken } = storage.storjCredentials || {};
+            if (!writeAccessToken || !readAccessToken) {
+                throw new StorageError('StorJ credentials are missing or incomplete');
+            }
+            return {
+                readCredentials: {
+                    bucket: storage.bucket,
+                    prefix: joinPaths(storage.prefix, remotePath),
+                    token: readAccessToken,
+                }, writeCredentials: {
+                    bucket: storage.bucket,
+                    prefix: joinPaths(storage.prefix, remotePath),
+                    token: writeAccessToken,
+                },
+            };
+        }
+        if (storage.storageType === StorageType.S3) {
+            const { readAccessKeyId, readSecretAccessKey, writeAccessKeyId, writeSecretAccessKey } = storage.s3Credentials || {};
+            if (!writeAccessKeyId || !writeSecretAccessKey || !readAccessKeyId || !readSecretAccessKey) {
+                throw new StorageError('S3 credentials are missing or incomplete');
+            }
+            return {
+                readCredentials: {
+                    accessKeyId: readAccessKeyId,
+                    bucket: storage.bucket,
+                    endpoint: S3_ENDPOINT,
+                    prefix: joinPaths(storage.prefix, remotePath),
+                    secretKey: readSecretAccessKey,
+                }, writeCredentials: {
+                    accessKeyId: writeAccessKeyId,
+                    bucket: storage.bucket,
+                    endpoint: S3_ENDPOINT,
+                    prefix: joinPaths(storage.prefix, remotePath),
+                    secretKey: writeSecretAccessKey,
+                },
+            };
         }
+        throw new StorageError(`Unknown storage type: ${storage.storageType}`);
     }
 }
 __decorate([

package/dist/utils/progress.js

@@ -2,6 +2,7 @@ import * as p from '@clack/prompts';
 export const createProgressPrinter = ({ action, done = 'completed', start, }) => {
     const progressBars = {};
     let lastKey = '';
+    let lastProgress = 0;
     const getProgress = (key) => {
         if (key in progressBars) {
             lastKey = key;
@@ -9,6 +10,7 @@ export const createProgressPrinter = ({ action, done = 'completed', start, }) =>
         }
         if (lastKey in progressBars) {
             const progressBar = progressBars[lastKey];
+            lastProgress = 0;
             progressBar.stop(`${action} ${lastKey} ${done}`);
         }
         const progressBar = p.progress({ size: 100, style: 'block' });
@@ -16,11 +18,17 @@ export const createProgressPrinter = ({ action, done = 'completed', start, }) =>
         progressBars[key] = progressBar;
         return progressBar;
     };
-    const finish = () => progressBars[lastKey].stop(`${action} ${lastKey} ${done}`);
+    const finish = () => {
+        if (lastKey && progressBars[lastKey]) {
+            lastProgress = 0;
+            progressBars[lastKey].stop(`${action} ${lastKey} ${done}`);
+        }
+    };
     return {
         advance(key, num, message) {
             const progress = getProgress(key);
-            progress.advance(num, message);
+            progress.advance(num - lastProgress, message);
+            lastProgress = num;
         },
         finish,
     };

package/oclif.manifest.json

@@ -426,7 +426,7 @@
           "required": true
         }
       },
-      "description": "Download file or directory described in resource frole",
+      "description": "Download file or directory described in resource file",
       "examples": [
         "<%= config.bin %> <%= command.id %> ./resource.json ./pathToDownload "
       ],
@@ -448,7 +448,7 @@
           "type": "option"
         },
         "maximum-concurrent": {
-          "description": "Maximum concurrent pieces to upload at once per transfer",
+          "description": "Maximum concurrent pieces to download at once per transfer",
           "name": "maximum-concurrent",
           "default": 1,
           "hasDynamicHelp": false,
@@ -482,7 +482,7 @@
           "required": true
         }
       },
-      "description": "Upload files of directory to remote storage",
+      "description": "Upload file or directory to remote storage",
       "examples": [
         "<%= config.bin %> <%= command.id %> ./file.txt"
       ],
@@ -733,5 +733,5 @@
       ]
     }
   },
-  "version": "0.0.2-beta.15"
+  "version": "0.0.2-beta.17"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@super-protocol/sp-cli",
   "description": "SuperProtocol Command line interface",
-  "version": "0.0.2-beta.15",
+  "version": "0.0.2-beta.17",
   "author": "SuperProtocol",
   "publishConfig": {
     "access": "public",