@super-protocol/sp-cli 0.0.2-beta.1 → 0.0.2-beta.2

package/dist/managers/account-manager.js

@@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { confirm, password } from '@inquirer/prompts';
+import { confirm, isCancel, password } from '@clack/prompts';
 import { ux } from '@oclif/core';
 import { Value } from '@sinclair/typebox/value';
 import { Retryable } from 'typescript-retry-decorator';
@@ -69,6 +69,9 @@ export class AccountManager {
             const ask = await confirm({
                 message: 'Do you want to create new one?',
             });
+            if (isCancel(ask)) {
+                ux.error('Operation cancelled.', { exit: 1 });
+            }
             if (ask) {
                 await this.promptAccount();
             }
@@ -81,8 +84,15 @@ export class AccountManager {
         const askPrivateKey = await confirm({
             message: 'Do you want to input privateKey?',
         });
+        if (isCancel(askPrivateKey)) {
+            ux.error('Operation cancelled.', { exit: 1 });
+        }
         if (askPrivateKey) {
-            const privateKey = await password({ message: 'Please input your privateKey for using in account' });
+            const privateKeyInput = await password({ message: 'Please input your privateKey for using in account' });
+            if (isCancel(privateKeyInput)) {
+                ux.error('Operation cancelled.', { exit: 1 });
+            }
+            const privateKey = privateKeyInput.trim();
             try {
                 const account = await this.createFromKey(privateKey);
                 ux.stdout('Your privateKey will be used in config. Keypair created');

package/dist/managers/config-file-manager.d.ts

@@ -1,4 +1,4 @@
-import { confirm, select } from '@inquirer/prompts';
+import { confirm, select } from '@clack/prompts';
 import { ux } from '@oclif/core';
 import pino from 'pino';
 import { CliConfig } from '../config/config.schema.js';

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

@@ -1,4 +1,4 @@
-import { confirm, select } from '@inquirer/prompts';
+import { confirm, isCancel, select } from '@clack/prompts';
 import { ux } from '@oclif/core';
 import { Value } from '@sinclair/typebox/value';
 import * as fs from 'node:fs';
@@ -78,22 +78,27 @@ export class ConfigFileManager {
             configToDelete = config.file;
         }
         else {
-            configToDelete = await this.selectPrompt({
-                choices: configs.map(config => ({
-                    name: config.name,
+            const selection = await this.selectPrompt({
+                message: 'Select configuration to delete:',
+                options: configs.map(config => ({
+                    label: config.name,
                     value: config.file,
                 })),
-                message: 'Select configuration to delete:',
             });
+            if (isCancel(selection)) {
+                this.ux.stdout('Deletion cancelled');
+                return;
+            }
+            configToDelete = selection;
         }
         const configToDeleteData = configs.find(c => c.file === configToDelete);
         const displayName = configToDeleteData?.name || configToDelete;
         if (!force) {
             const confirmed = await this.confirmPrompt({
-                default: false,
+                initialValue: false,
                 message: `Are you sure you want to delete configuration "${displayName}"?`,
             });
-            if (!confirmed) {
+            if (isCancel(confirmed) || !confirmed) {
                 this.ux.stdout('Deletion cancelled');
                 return;
             }

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

@@ -0,0 +1,24 @@
+import { ProviderClient } from '@super-protocol/provider-client';
+import pino from 'pino';
+import { AccountManager } from '../managers/account-manager.js';
+import { ConfigManager } from '../managers/config-manager.js';
+export declare class AuthError extends Error {
+}
+export declare class AuthService {
+    private readonly accountManager;
+    private readonly configManager;
+    private readonly providerClient;
+    private readonly logger;
+    constructor(accountManager: AccountManager, configManager: ConfigManager, providerClient: ProviderClient, logger: pino.BaseLogger);
+    auth(): Promise<void>;
+    getTokens(nonce: string): Promise<void>;
+    getUserNonce(address: string): Promise<{
+        error: {
+            message: string;
+            statusCode: number;
+        } | undefined;
+        user: {
+            nonce?: string;
+        } | undefined;
+    }>;
+}

package/dist/services/auth.service.js

@@ -0,0 +1,93 @@
+export class AuthError extends Error {
+}
+export class AuthService {
+    accountManager;
+    configManager;
+    providerClient;
+    logger;
+    constructor(accountManager, configManager, providerClient, logger) {
+        this.accountManager = accountManager;
+        this.configManager = configManager;
+        this.providerClient = providerClient;
+        this.logger = logger;
+    }
+    async auth() {
+        const address = this.accountManager.getAddress();
+        const { error: nonceError, user } = await this.getUserNonce(address);
+        if (nonceError && nonceError.statusCode === 404) {
+            this.logger.debug('Nonce error call sign up');
+            const { data: nonceResponse, error: signUpError } = await this.providerClient.POST('/api/auth/sign-up', {
+                body: {
+                    address,
+                },
+            });
+            if (signUpError && signUpError.statusCode === 409) {
+                this.logger.debug({ signUpError }, 'Error signing up');
+                const { error: nonceError, user } = await this.getUserNonce(address);
+                this.logger.debug({ nonceError, user }, 'Requesting nonce again');
+                if (user && user.nonce) {
+                    await this.getTokens(user.nonce);
+                }
+                else {
+                    throw new AuthError('User exists but nonce is unavailable. Please try again or contact support.');
+                }
+            }
+            else if (signUpError) {
+                this.logger.error({ signUpError }, 'Sign-up failed');
+                throw new AuthError('Sign-up failed. Please try again later.');
+            }
+            else {
+                const nonce = nonceResponse?.nonce;
+                if (!nonce) {
+                    this.logger.error({ response: nonceResponse }, 'Unexpected sign-up response');
+                    throw new AuthError('Provider did not return a nonce.');
+                }
+                await this.getTokens(nonce);
+            }
+        }
+        else if (user && user.nonce) {
+            this.logger.debug({ user }, 'Requesting for existed user');
+            await this.getTokens(user.nonce);
+        }
+        else {
+            throw new AuthError('Unable to retrieve authentication nonce. Please try again later or contact support if the issue persists.');
+        }
+    }
+    async getTokens(nonce) {
+        const signature = await this.accountManager.createSign(nonce);
+        const { data: tokenResponse, error, } = await this.providerClient.POST('/api/auth/token', {
+            body: {
+                address: this.accountManager.getAddress(),
+                provider: 'sp-cli',
+                signature,
+            },
+        });
+        if (error) {
+            this.logger.error({ err: error }, 'Token exchange failed');
+            throw new AuthError(error.message);
+        }
+        const { accessToken } = tokenResponse || {};
+        if (!accessToken) {
+            this.logger.error({ response: tokenResponse }, 'Unexpected token response');
+            throw new AuthError('Provider returned an unexpected token response.');
+        }
+        await this.configManager.setCredentials({ accessKey: accessToken });
+    }
+    async getUserNonce(address) {
+        try {
+            const { data, error } = await this.providerClient.GET('/api/users/nonce/{address}', {
+                params: {
+                    path: {
+                        address,
+                    },
+                },
+            });
+            this.logger.debug({ data, error }, 'Getting user nonce');
+            return { error, user: data };
+        }
+        catch (error) {
+            this.logger.error({ err: error }, 'Error request nonce');
+            throw new AuthError('Connection failure, please try again later');
+        }
+    }
+}

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

@@ -1,6 +1,5 @@
 import { AddStorageDto, ProviderClient, StorageResponseDto, UpdateStorageDto } from '@super-protocol/provider-client';
 import pino from 'pino';
-import { IConfigManager } from '../interfaces/config-manager.interface.js';
 export declare class StorageError extends Error {
 }
 export declare class StoragesEmptyError extends StorageError {
@@ -9,12 +8,26 @@ export declare class StorageCreateError extends StorageError {
 }
 export declare class StorageUpdateError extends StorageError {
 }
+export declare class StorageGetError extends StorageError {
+}
 export declare class StorageService {
-    private readonly configManager;
     private readonly providerClient;
     private readonly logger;
-    constructor(configManager: IConfigManager, providerClient: ProviderClient, logger: pino.BaseLogger);
+    constructor(providerClient: ProviderClient, logger: pino.BaseLogger);
     createStorage(storage: AddStorageDto): Promise<StorageResponseDto>;
+    getCentralizedStorage(): Promise<{
+        bucket: string;
+        createdAt: string;
+        id: string;
+        isCentralized: boolean;
+        prefix: string;
+        s3Credentials?: import("@super-protocol/provider-client").components["schemas"]["S3CredentialsResponseDto"];
+        storageType: import("@super-protocol/provider-client").components["schemas"]["StorageType"];
+        storjCredentials?: import("@super-protocol/provider-client").components["schemas"]["StorJCredentialsResponseDto"];
+        updatedAt: string;
+        userId: string;
+    } | undefined>;
+    getCurrentStorage(): Promise<StorageResponseDto>;
     hasStorage(): Promise<boolean>;
     initStorage(): Promise<{
         bucket: string;
@@ -28,7 +41,7 @@ export declare class StorageService {
         updatedAt: string;
         userId: string;
     }>;
-    requestStorage(): Promise<StorageResponseDto[]>;
+    requestStorages(): Promise<StorageResponseDto[]>;
     saveStorage(selectedStorage: string): Promise<void>;
     updateStorage(id: string, storage: UpdateStorageDto): Promise<StorageResponseDto>;
 }

package/dist/services/storage.service.js

@@ -7,12 +7,12 @@ export class StorageCreateError extends StorageError {
 }
 export class StorageUpdateError extends StorageError {
 }
+export class StorageGetError extends StorageError {
+}
 export class StorageService {
-    configManager;
     providerClient;
     logger;
-    constructor(configManager, providerClient, logger) {
-        this.configManager = configManager;
+    constructor(providerClient, logger) {
         this.providerClient = providerClient;
         this.logger = logger;
     }
@@ -39,8 +39,55 @@ export class StorageService {
             throw error_;
         }
     }
+    async getCentralizedStorage() {
+        const storages = await this.requestStorages();
+        return storages.find(storage => storage.isCentralized);
+    }
+    async getCurrentStorage() {
+        try {
+            const { data, error } = await this.providerClient.GET('/api/user-settings');
+            if (error) {
+                throw new StorageGetError('Error getting storage');
+            }
+            const { activeStorageId } = data || {};
+            const storages = await this.requestStorages();
+            const storage = storages.find(storage => storage.id === activeStorageId);
+            if (!storage) {
+                throw new StorageError('Selected storage not found please select storage first');
+            }
+            return storage;
+        }
+        catch (error) {
+            this.logger.error({ err: error }, 'Failed to get current storage');
+            const error_ = error instanceof StorageError ? error : new ProviderClientError('Request failed please try again later');
+            throw error_;
+        }
+    }
     async hasStorage() {
-        return Boolean(await this.configManager.get('selectedStorage'));
+        try {
+            const { data, error } = await this.providerClient.GET('/api/user-settings');
+            if (error && error.statusCode === 404) {
+                const storage = await this.getCentralizedStorage();
+                if (storage) {
+                    await this.saveStorage(storage.id);
+                    return true;
+                }
+                return false;
+            }
+            if (error) {
+                this.logger.error({ err: error }, 'Error checking storage');
+                throw new StorageError(`Error request storage ${error}`);
+            }
+            if (!data) {
+                throw new StorageError('Error request storage');
+            }
+            return Boolean(data.activeStorageId);
+        }
+        catch (error) {
+            this.logger.error({ err: error }, 'Storage initialization failed');
+            const error_ = error instanceof StorageError ? error : new ProviderClientError('Request failed please try again later');
+            throw error_;
+        }
     }
     async initStorage() {
         this.logger.info('Requesting storage initialization');
@@ -50,6 +97,10 @@ export class StorageService {
                 this.logger.error({ err: result.error }, 'Failed to initialize storage');
                 throw new StorageCreateError(result.error.message);
             }
+            if (!result.data) {
+                this.logger.error('Provider returned empty storage initialization response');
+                throw new StorageCreateError('Incorrect response');
+            }
             this.logger.info('Storage initialized successfully');
             return result.data;
         }
@@ -59,7 +110,7 @@ export class StorageService {
             throw error_;
         }
     }
-    async requestStorage() {
+    async requestStorages() {
         let data;
         this.logger.info('Requesting available storages');
         try {
@@ -84,7 +135,22 @@ export class StorageService {
     }
     async saveStorage(selectedStorage) {
         this.logger.info({ selectedStorage }, 'Saving selected storage');
-        await this.configManager.set('selectedStorage', selectedStorage);
+        try {
+            const { data, error } = await this.providerClient.POST('/api/user-settings', {
+                body: {
+                    activeStorageId: selectedStorage,
+                },
+            });
+            if (error) {
+                throw new StorageError(`User settings request error ${error?.message}`);
+            }
+            this.logger.info({ selectedStorage: data?.activeStorageId }, 'Selected storage saved successfully');
+        }
+        catch (error) {
+            this.logger.error({ err: error }, 'Failed to save selected storage');
+            const error_ = error instanceof StorageError ? error : new ProviderClientError('Request failed please try again later');
+            throw error_;
+        }
     }
     async updateStorage(id, storage) {
         this.logger.info({ storageId: id }, 'Updating storage');