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

package/dist/commands/storage/update.js

@@ -0,0 +1,244 @@
+import { confirm, password, select, text, } from '@clack/prompts';
+import { Flags } from '@oclif/core';
+import { StorageType } from '@super-protocol/provider-client';
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import { StoragesEmptyError } from '../../services/storage.service.js';
+import { BaseStorageCommand } from './base.js';
+export default class StorageUpdate extends BaseStorageCommand {
+    static description = 'Update the configuration of an existing storage.';
+    static examples = [
+        '<%= config.bin %> storage update --id=2de3e3a4-0000-1111-2222-333344445555 --fromFile ./storage-update.json',
+        '<%= config.bin %> storage update --id=2de3e3a4-0000-1111-2222-333344445555',
+    ];
+    static flags = {
+        fromFile: Flags.string({
+            char: 'f',
+            description: 'Path to a JSON file that contains UpdateStorageDto payload.',
+        }),
+        id: Flags.string({
+            char: 'i',
+            description: 'Storage ID to update',
+        }),
+    };
+    async run() {
+        const { flags } = await this.parse(StorageUpdate);
+        try {
+            const shouldRequestStorages = !flags.fromFile || !flags.id;
+            const storages = shouldRequestStorages ? await this.storageService.requestStorages() : undefined;
+            let storageId = flags.id;
+            if (!storageId) {
+                const options = (storages || []).filter(cp => !cp.isCentralized).map(storage => ({
+                    label: `${storage.id} (${storage.storageType}) ${storage.bucket}/${storage.prefix} `,
+                    value: storage.id,
+                }));
+                if (!options || options.length === 0) {
+                    throw new StoragesEmptyError('No storages available to update');
+                }
+                storageId = this.ensurePromptValue(await select({
+                    message: 'Select storage to update',
+                    options,
+                }));
+            }
+            if (!storageId) {
+                this.error('Storage ID is required');
+            }
+            const storageToUpdate = storages?.find(storage => storage.id === storageId);
+            if (flags.id && storages && !storageToUpdate) {
+                this.error(`Storage with ID ${storageId} not found`);
+            }
+            const updatePayload = flags.fromFile
+                ? await this.loadStorageFromFile(flags.fromFile)
+                : await this.promptStorageUpdate(storageToUpdate);
+            await this.storageService.updateStorage(storageId, updatePayload);
+            this.log(`Storage updated: ${storageId}`);
+        }
+        catch (error) {
+            if (error instanceof StoragesEmptyError) {
+                this.error('No storages available. Run "sp storage create" first.');
+            }
+            else {
+                this.error(error instanceof Error ? error.message : String(error));
+            }
+        }
+    }
+    ensureNonEmptyString(value, fieldName) {
+        if (typeof value !== 'string' || !value.trim()) {
+            this.error(`${fieldName} must be a non-empty string`);
+        }
+        return value.trim();
+    }
+    ensureUpdatePayload(payload) {
+        if (!payload || typeof payload !== 'object') {
+            this.error('Storage update definition must be an object');
+        }
+        const updateFields = ['bucket', 'prefix', 'storageType', 's3Credentials', 'storjCredentials'];
+        const hasUpdates = updateFields.some(key => payload[key] !== undefined);
+        if (!hasUpdates) {
+            this.error('Update payload must include at least one property');
+        }
+        if (payload.storageType && !Object.values(StorageType).includes(payload.storageType)) {
+            this.error(`Unsupported storage type: ${payload.storageType}`);
+        }
+        if (payload.s3Credentials) {
+            const { readAccessKeyId, readSecretAccessKey, region, writeAccessKeyId, writeSecretAccessKey, } = payload.s3Credentials;
+            if (!readAccessKeyId || !readSecretAccessKey || !region || !writeAccessKeyId || !writeSecretAccessKey) {
+                this.error('S3 credentials must include readAccessKeyId, readSecretAccessKey, region, writeAccessKeyId and writeSecretAccessKey');
+            }
+        }
+        if (payload.storjCredentials) {
+            const { readAccessToken, writeAccessToken } = payload.storjCredentials;
+            if (!readAccessToken || !writeAccessToken) {
+                this.error('StorJ credentials must include readAccessToken and writeAccessToken');
+            }
+        }
+        const sanitized = {};
+        if (payload.bucket !== undefined) {
+            sanitized.bucket = this.ensureNonEmptyString(payload.bucket, 'Bucket');
+        }
+        if (payload.prefix !== undefined) {
+            sanitized.prefix = this.ensureNonEmptyString(payload.prefix, 'Prefix');
+        }
+        if (payload.storageType) {
+            sanitized.storageType = payload.storageType;
+        }
+        if (payload.s3Credentials) {
+            sanitized.s3Credentials = {
+                readAccessKeyId: this.ensureNonEmptyString(payload.s3Credentials.readAccessKeyId, 'S3 credential "readAccessKeyId"'),
+                readSecretAccessKey: this.ensureNonEmptyString(payload.s3Credentials.readSecretAccessKey, 'S3 credential "readSecretAccessKey"'),
+                region: this.ensureNonEmptyString(payload.s3Credentials.region, 'S3 credential "region"'),
+                writeAccessKeyId: this.ensureNonEmptyString(payload.s3Credentials.writeAccessKeyId, 'S3 credential "writeAccessKeyId"'),
+                writeSecretAccessKey: this.ensureNonEmptyString(payload.s3Credentials.writeSecretAccessKey, 'S3 credential "writeSecretAccessKey"'),
+            };
+        }
+        if (payload.storjCredentials) {
+            sanitized.storjCredentials = {
+                readAccessToken: this.ensureNonEmptyString(payload.storjCredentials.readAccessToken, 'StorJ credential "readAccessToken"'),
+                writeAccessToken: this.ensureNonEmptyString(payload.storjCredentials.writeAccessToken, 'StorJ credential "writeAccessToken"'),
+            };
+        }
+        return sanitized;
+    }
+    async loadStorageFromFile(filePath) {
+        const absolutePath = path.isAbsolute(filePath) ? filePath : path.join(this.currentDir, filePath);
+        try {
+            const fileContent = await fs.readFile(absolutePath, 'utf8');
+            const parsed = JSON.parse(fileContent);
+            return this.ensureUpdatePayload(parsed);
+        }
+        catch (error) {
+            this.error(`Failed to load storage update definition: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
+    async promptS3Credentials() {
+        const region = this.ensurePromptValue(await text({
+            message: 'AWS region',
+            validate(value) {
+                return value ? undefined : 'Region is required';
+            },
+        })).trim();
+        const readAccessKeyId = this.ensurePromptValue(await text({
+            message: 'Read access key ID',
+            validate(value) {
+                return value ? undefined : 'Read access key ID is required';
+            },
+        })).trim();
+        const readSecretAccessKey = this.ensurePromptValue(await password({
+            message: 'Read secret access key',
+            validate(value) {
+                return value ? undefined : 'Read secret access key is required';
+            },
+        })).trim();
+        const writeAccessKeyId = this.ensurePromptValue(await text({
+            message: 'Write access key ID',
+            validate(value) {
+                return value ? undefined : 'Write access key ID is required';
+            },
+        })).trim();
+        const writeSecretAccessKey = this.ensurePromptValue(await password({
+            message: 'Write secret access key',
+            validate(value) {
+                return value ? undefined : 'Write secret access key is required';
+            },
+        })).trim();
+        return {
+            readAccessKeyId,
+            readSecretAccessKey,
+            region,
+            writeAccessKeyId,
+            writeSecretAccessKey,
+        };
+    }
+    async promptStorageUpdate(existingStorage) {
+        const payload = {};
+        const bucket = this.ensurePromptValue(await text({
+            defaultValue: existingStorage?.bucket ?? '',
+            message: 'Bucket name (leave empty to keep current)',
+        })).trim();
+        if (bucket) {
+            payload.bucket = bucket;
+        }
+        const prefix = this.ensurePromptValue(await text({
+            defaultValue: existingStorage?.prefix ?? '',
+            message: 'Prefix (leave empty to keep current)',
+        })).trim();
+        if (prefix) {
+            payload.prefix = prefix;
+        }
+        let newStorageType;
+        const shouldChangeType = this.ensurePromptValue(await confirm({
+            initialValue: false,
+            message: existingStorage
+                ? `Change storage type? (current: ${existingStorage.storageType})`
+                : 'Change storage type?',
+        }));
+        if (shouldChangeType) {
+            newStorageType = this.ensurePromptValue(await select({
+                message: 'Select new storage type',
+                options: [
+                    { label: 'Amazon S3', value: StorageType.S3 },
+                    { label: 'StorJ', value: StorageType.StorJ },
+                ],
+            }));
+            payload.storageType = newStorageType;
+        }
+        const effectiveType = newStorageType ?? existingStorage?.storageType;
+        const credentialsRequired = Boolean(newStorageType);
+        if (effectiveType) {
+            const updateCredentials = credentialsRequired || this.ensurePromptValue(await confirm({
+                initialValue: false,
+                message: `Update ${effectiveType} credentials?`,
+            }));
+            if (updateCredentials) {
+                if (effectiveType === StorageType.S3) {
+                    payload.s3Credentials = await this.promptS3Credentials();
+                }
+                else {
+                    payload.storjCredentials = await this.promptStorJCredentials();
+                }
+            }
+        }
+        if (Object.keys(payload).length === 0) {
+            this.error('No changes provided');
+        }
+        return this.ensureUpdatePayload(payload);
+    }
+    async promptStorJCredentials() {
+        const readAccessToken = this.ensurePromptValue(await password({
+            message: 'Read access token',
+            validate(value) {
+                return value ? undefined : 'Read access token is required';
+            },
+        })).trim();
+        const writeAccessToken = this.ensurePromptValue(await password({
+            message: 'Write access token',
+            validate(value) {
+                return value ? undefined : 'Write access token is required';
+            },
+        })).trim();
+        return {
+            readAccessToken,
+            writeAccessToken,
+        };
+    }
+}

package/dist/config/config.schema.d.ts

@@ -17,6 +17,7 @@ export declare const cliConfigSchema: import("@sinclair/typebox").TObject<{
     cookies: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnknown>;
     name: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     providerUrl: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    selectedStorage: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
 }>;
 export type CliConfig = Static<typeof cliConfigSchema>;
 export type Account = Static<typeof accountSchema>;

package/dist/config/config.schema.js

@@ -21,4 +21,5 @@ export const cliConfigSchema = Type.Object({
     cookies: Type.Optional(Type.Unknown()),
     name: Type.Optional(Type.String()),
     providerUrl: Type.Optional(Type.String({ format: 'url' })),
+    selectedStorage: Type.Optional(Type.String({ maxLength: 36, minLength: 36 })),
 });

package/dist/constants.d.ts

@@ -1,3 +1,4 @@
 export declare const FILE_ACCESS_PERMS = 384;
 export declare const DIR_ACCESS_PERMS = 448;
 export declare const PROVIDER_URL = "https://api.dp.superprotocol.com";
+export declare const REFRESH_TOKEN_URI = "/api/auth/refresh-access";

package/dist/constants.js

@@ -3,3 +3,4 @@ export const FILE_ACCESS_PERMS = 0o600;
 //  Directory permissions.     'drwx------'
 export const DIR_ACCESS_PERMS = 0o700;
 export const PROVIDER_URL = 'https://api.dp.superprotocol.com';
+export const REFRESH_TOKEN_URI = '/api/auth/refresh-access';

package/dist/errors.d.ts

@@ -6,3 +6,5 @@ export declare class InvalidPrivateKeyError extends Error {
 }
 export declare class AuthorizationRequiredError extends Error {
 }
+export declare class ProviderClientError extends Error {
+}

package/dist/errors.js

@@ -6,3 +6,5 @@ export class InvalidPrivateKeyError extends Error {
 }
 export class AuthorizationRequiredError extends Error {
 }
+export class ProviderClientError extends Error {
+}

package/dist/lib/container.d.ts

@@ -3,7 +3,6 @@ import { ProviderClient } from '@super-protocol/provider-client';
 import { AccountManager, ConfigFileManager, ConfigManager } from '../managers/index.js';
 interface RuntimeConfig {
     configFile?: string;
-    url?: string;
 }
 export declare class AppContainer {
     readonly cwdDir: string;
@@ -17,7 +16,6 @@ export declare class AppContainer {
     private readonly initQueue;
     private logger;
     private runtimeConfigFile?;
-    private runtimeProviderUrl?;
     private constructor();
     static initialize(currentDir: string, config: Config): AppContainer;
     get accountManager(): AccountManager;
@@ -25,13 +23,14 @@ export declare class AppContainer {
     get configManager(): ConfigManager;
     static get container(): AppContainer;
     get providerClient(): ProviderClient;
-    build(): Promise<void>;
-    initAccountManager(): this;
-    initConfigFileManager(): this;
-    initConfigManager(): this;
-    initProviderClient({ enableAuth, enableCookies }?: {
+    build(): Promise<this>;
+    initAccountManager(rebuild?: boolean): this;
+    initConfigFileManager(rebuild?: boolean): this;
+    initConfigManager(rebuild?: boolean): this;
+    initProviderClient({ enableAuth, enableCookies, rebuild }?: {
         enableAuth?: boolean;
         enableCookies?: boolean;
+        rebuild?: boolean;
     }): this;
     setupRuntimeConfig(config: RuntimeConfig): this;
     private queueInit;

package/dist/lib/container.js

@@ -17,7 +17,6 @@ export class AppContainer {
     initQueue = new Map();
     logger;
     runtimeConfigFile;
-    runtimeProviderUrl;
     constructor(cwdDir, oclifConfig) {
         this.cwdDir = cwdDir;
         this.oclifConfig = oclifConfig;
@@ -61,9 +60,10 @@ export class AppContainer {
     }
     async build() {
         await Promise.all(this.initPromises);
+        return this;
     }
-    initAccountManager() {
-        this.initConfigManager();
+    initAccountManager(rebuild = true) {
+        this.initConfigManager(rebuild);
         return this.queueInit('accountManager', async () => {
             await this.waitFor('configManager');
             if (this._accountManager) {
@@ -73,9 +73,9 @@ export class AppContainer {
             const accountManager = new AccountManager(this.configManager, this.logger);
             await accountManager.init();
             this._accountManager = accountManager;
-        });
+        }, rebuild);
     }
-    initConfigFileManager() {
+    initConfigFileManager(rebuild = false) {
         return this.queueInit('configFileManager', async () => {
             if (this._configFileManager) {
                 return;
@@ -85,10 +85,10 @@ export class AppContainer {
             });
             await configFileManager.init();
             this._configFileManager = configFileManager;
-        });
+        }, rebuild);
     }
-    initConfigManager() {
-        this.initConfigFileManager();
+    initConfigManager(rebuild = false) {
+        this.initConfigFileManager(rebuild);
         return this.queueInit('configManager', async () => {
             await this.waitFor('configFileManager');
             if (this._configManager) {
@@ -102,22 +102,32 @@ export class AppContainer {
             const configManager = new ConfigManager(configFilePath, this.logger);
             await configManager.init();
             this._configManager = configManager;
-        });
+        }, rebuild);
     }
-    initProviderClient({ enableAuth = true, enableCookies = true } = {}) {
+    initProviderClient({ enableAuth = true, enableCookies = true, rebuild = false } = {}) {
         this.initConfigManager();
         return this.queueInit('providerClient', async () => {
-            if (this._providerClient) {
+            if (this._providerClient && !rebuild) {
                 return;
             }
             await this.waitFor('configManager');
-            const providerUrl = this.runtimeProviderUrl || await this.configManager.get('providerUrl') || PROVIDER_URL;
+            const providerUrl = await this.configManager.get('providerUrl') || PROVIDER_URL;
             this.logger.info('Initializing provider client');
             const providerClient = createProviderClient({
                 baseUrl: providerUrl,
                 logger: this.logger,
                 middlewares: [requestIdMiddleware, loggerMiddleware],
             });
+            if (enableCookies) {
+                this.logger.info('Initializing cookie middleware');
+                const cookiesMiddleware = await createCookieMiddleware(this.configManager, this.logger, providerUrl);
+                providerClient.use(cookiesMiddleware);
+            }
+            if (enableAuth) {
+                this.logger.info('Initializing auth middleware');
+                const authMiddleware = await createAuthMiddleware(this.configManager, providerClient, this.logger);
+                providerClient.use(authMiddleware);
+            }
             providerClient.use({
                 onRequest: async ({ request }) => {
                     const req = request.clone();
@@ -128,28 +138,18 @@ export class AppContainer {
                     }
                     this.logger.debug({
                         body,
+                        token: req.headers.get('Authorization'),
                         url: req.url,
                     }, 'Requesting');
                 },
             });
-            if (enableCookies) {
-                this.logger.info('Initializing cookie middleware');
-                const cookiesMiddleware = await createCookieMiddleware(this.configManager, this.logger, providerUrl);
-                providerClient.use(cookiesMiddleware);
-            }
-            if (enableAuth) {
-                this.logger.info('Initializing auth middleware');
-                const authMiddleware = await createAuthMiddleware(this.configManager, providerClient, this.logger);
-                providerClient.use(authMiddleware);
-            }
             this._providerClient = providerClient;
-        });
+        }, rebuild);
     }
     setupRuntimeConfig(config) {
         if (this.initQueue.size > 0) {
             throw new Error('Cannot change runtime config after initialization has started');
         }
-        this.runtimeProviderUrl = config.url;
         if (config.configFile) {
             this.runtimeConfigFile = path.isAbsolute(config.configFile)
                 ? config.configFile
@@ -160,8 +160,8 @@ export class AppContainer {
         }
         return this;
     }
-    queueInit(name, task) {
-        if (!this.initQueue.has(name)) {
+    queueInit(name, task, force = false) {
+        if (!this.initQueue.has(name) || force) {
             const promise = task();
             this.initQueue.set(name, promise);
             this.initPromises.push(promise);

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/middlewares/auth-middleware.js

@@ -1,4 +1,5 @@
 import { decode } from 'jsonwebtoken';
+import { REFRESH_TOKEN_URI } from '../constants.js';
 import { AuthorizationRequiredError } from '../errors.js';
 function isAccessKeyExpired(accessKey) {
     try {
@@ -23,7 +24,7 @@ export async function createAuthMiddleware(configManager, providerClient, logger
         logger.info('Performed refresh token');
         let refreshResult;
         try {
-            refreshResult = await providerClient.POST('/api/auth/refresh-access');
+            refreshResult = await providerClient.POST(REFRESH_TOKEN_URI);
         }
         catch (error) {
             logger.error({ err: error }, 'failure refresh token');
@@ -76,6 +77,9 @@ export async function createAuthMiddleware(configManager, providerClient, logger
     }
     const middleware = {
         async onRequest({ request }) {
+            if (request.url.endsWith(REFRESH_TOKEN_URI)) {
+                return request;
+            }
             const accessToken = await ensureAccessKey();
             if (accessToken) {
                 request.headers.set('Authorization', `Bearer ${accessToken}`);

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;
+    }>;
+}