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

package/dist/commands/config/base.d.ts

@@ -1,14 +1,15 @@
 import type { Command } from '@oclif/core';
-import { input, select } from '@inquirer/prompts';
+import { select, text } from '@clack/prompts';
 import type { ConfigFileManager } from '../../managers/config-file-manager.js';
 import { BaseCommand } from '../base.js';
-type InputOptions = Parameters<typeof input>[0];
+type TextOptions = Parameters<typeof text>[0];
 type SelectOptions<T> = Parameters<typeof select<T>>[0];
 export declare abstract class BaseConfigCommand<T extends typeof Command> extends BaseCommand<T> {
+    static baseFlags: {};
     protected configFileManager: ConfigFileManager;
     protected displayCurrentConfig(): void;
     init(): Promise<void>;
-    protected inputPrompt(options: InputOptions): Promise<string>;
+    protected inputPrompt(options: TextOptions): Promise<string>;
     protected selectPrompt<Value>(options: SelectOptions<Value>): Promise<Value>;
 }
 export {};

package/dist/commands/config/base.js

@@ -1,6 +1,8 @@
-import { input, select } from '@inquirer/prompts';
+import { select, text } from '@clack/prompts';
+import { PROVIDER_URL } from '../../constants.js';
 import { BaseCommand } from '../base.js';
 export class BaseConfigCommand extends BaseCommand {
+    static baseFlags = {};
     configFileManager;
     displayCurrentConfig() {
         const current = this.configFileManager.getCurrentConfigFile();
@@ -20,25 +22,19 @@ export class BaseConfigCommand extends BaseCommand {
                     this.log(`  Provider URL: ${configData.providerUrl}`);
                 }
                 else {
-                    this.log('  Provider URL: (using default)');
+                    this.log(`  Provider URL: ${PROVIDER_URL} (using default)`);
                 }
                 if (configData.auth?.accessKey) {
-                    this.log('  Authorization: ✓ Configured');
+                    this.log('  Authorization: [OK] Configured');
                 }
                 else {
-                    this.log('  Authorization: ✗ Not configured');
+                    this.log('  Authorization: [--] Not configured');
                 }
                 if (configData.account?.address) {
-                    this.log(`  Account: ✓ ${configData.account.address}`);
+                    this.log(`  Account: [OK] ${configData.account.address}`);
                 }
                 else {
-                    this.log('  Account: ✗ Not configured');
-                }
-                if (configData.cookies) {
-                    this.log('  Cookies: ✓ Stored');
-                }
-                else {
-                    this.log('  Cookies: ✗ None');
+                    this.log('  Account: [--] Not configured');
                 }
             }
         }
@@ -54,9 +50,11 @@ export class BaseConfigCommand extends BaseCommand {
         this.configFileManager = this.container.configFileManager;
     }
     async inputPrompt(options) {
-        return input(options);
+        const result = await text(options);
+        return this.ensurePromptValue(result);
     }
     async selectPrompt(options) {
-        return select(options);
+        const result = await select(options);
+        return this.ensurePromptValue(result);
     }
 }

package/dist/commands/config/create.js

@@ -33,11 +33,11 @@ export default class ConfigCreate extends BaseConfigCommand {
                 this.log(`Provider URL: ${url}`);
             }
             const shouldSwitch = yes || await this.selectPrompt({
-                choices: [
-                    { name: 'Yes', value: true },
-                    { name: 'No', value: false },
-                ],
                 message: 'Switch to this configuration now?',
+                options: [
+                    { label: 'Yes', value: true },
+                    { label: 'No', value: false },
+                ],
             });
             if (shouldSwitch) {
                 await this.configFileManager.setCurrentConfig(fileName);

package/dist/commands/config/list.js

@@ -23,10 +23,10 @@ export default class ConfigList extends BaseConfigCommand {
                     parts.push(`URL: ${configData.providerUrl}`);
                 }
                 if (configData.auth) {
-                    parts.push('Auth: ✓');
+                    parts.push('Auth: [OK]');
                 }
                 if (configData.account) {
-                    parts.push('Account: ✓');
+                    parts.push(`Account: [OK] ${configData.account.address} `);
                 }
                 if (parts.length > 0) {
                     statusInfo = ` | ${parts.join(', ')}`;

package/dist/commands/config/use.js

@@ -6,17 +6,19 @@ export default class ConfigUse extends BaseConfigCommand {
     ];
     async run() {
         const configs = this.configFileManager.getConfigsWithNames();
+        const currentConfig = this.configFileManager.getCurrentConfigFile();
         if (configs.length === 0) {
             this.log('No configurations found');
             this.log('Create a new configuration with: sp config create --name "Config Name"');
             return;
         }
         const selected = await this.selectPrompt({
-            choices: configs.map(config => ({
-                name: config.name ?? config.file,
+            initialValue: currentConfig,
+            message: 'Select a configuration:',
+            options: configs.map(config => ({
+                label: config.name ?? config.file,
                 value: config.file,
             })),
-            message: 'Select a configuration:',
         });
         await this.configFileManager.setCurrentConfig(selected);
         const selectedConfig = configs.find(c => c.file === selected);

package/dist/commands/storage/base.js

@@ -6,7 +6,7 @@ export class BaseStorageCommand extends BaseCommand {
     async init() {
         await super.init();
         await this.container.initConfigManager().initProviderClient().build();
-        const { configManager, providerClient } = this.container;
-        this.storageService = new StorageService(configManager, providerClient, this.logger);
+        const { providerClient } = this.container;
+        this.storageService = new StorageService(providerClient, this.logger);
     }
 }

package/dist/commands/storage/create.js

@@ -1,4 +1,4 @@
-import { input, password, select } from '@inquirer/prompts';
+import { password, select, text } from '@clack/prompts';
 import { Flags } from '@oclif/core';
 import { StorageType } from '@super-protocol/provider-client';
 import fs from 'node:fs/promises';
@@ -53,36 +53,36 @@ export default class StorageCreate extends BaseStorageCommand {
         }
     }
     async promptS3Credentials() {
-        const region = await input({
+        const region = this.ensurePromptValue(await text({
             message: 'AWS region',
             validate(value) {
-                return value ? true : 'Region is required';
+                return value ? undefined : 'Region is required';
             },
-        }).then(value => value.trim());
-        const readAccessKeyId = await input({
+        })).trim();
+        const readAccessKeyId = this.ensurePromptValue(await text({
             message: 'Read access key ID',
             validate(value) {
-                return value ? true : 'Read access key ID is required';
+                return value ? undefined : 'Read access key ID is required';
             },
-        }).then(value => value.trim());
-        const readSecretAccessKey = await password({
+        })).trim();
+        const readSecretAccessKey = this.ensurePromptValue(await password({
             message: 'Read secret access key',
             validate(value) {
-                return value ? true : 'Read secret access key is required';
+                return value ? undefined : 'Read secret access key is required';
             },
-        }).then(value => value.trim());
-        const writeAccessKeyId = await input({
+        })).trim();
+        const writeAccessKeyId = this.ensurePromptValue(await text({
             message: 'Write access key ID',
             validate(value) {
-                return value ? true : 'Write access key ID is required';
+                return value ? undefined : 'Write access key ID is required';
             },
-        }).then(value => value.trim());
-        const writeSecretAccessKey = await password({
+        })).trim();
+        const writeSecretAccessKey = this.ensurePromptValue(await password({
             message: 'Write secret access key',
             validate(value) {
-                return value ? true : 'Write secret access key is required';
+                return value ? undefined : 'Write secret access key is required';
             },
-        }).then(value => value.trim());
+        })).trim();
         return {
             readAccessKeyId,
             readSecretAccessKey,
@@ -92,26 +92,26 @@ export default class StorageCreate extends BaseStorageCommand {
         };
     }
     async promptStoragePayload() {
-        const storageType = await select({
-            choices: [
-                { name: 'Amazon S3', value: StorageType.S3 },
-                { name: 'StorJ', value: StorageType.StorJ },
-            ],
+        const storageType = this.ensurePromptValue(await select({
             message: 'Select storage type',
-        });
-        const bucket = await input({
+            options: [
+                { label: 'Amazon S3', value: StorageType.S3 },
+                { label: 'StorJ', value: StorageType.StorJ },
+            ],
+        }));
+        const bucket = this.ensurePromptValue(await text({
             message: 'Bucket name',
             validate(value) {
-                return value ? true : 'Bucket is required';
+                return value ? undefined : 'Bucket is required';
             },
-        }).then(value => value.trim());
-        const prefix = await input({
-            default: '/',
+        })).trim();
+        const prefix = this.ensurePromptValue(await text({
+            defaultValue: '/',
             message: 'Prefix',
             validate(value) {
-                return value ? true : 'Prefix is required';
+                return value ? undefined : 'Prefix is required';
             },
-        }).then(value => value.trim());
+        })).trim();
         const storage = {
             bucket,
             prefix,
@@ -126,18 +126,18 @@ export default class StorageCreate extends BaseStorageCommand {
         return storage;
     }
     async promptStorJCredentials() {
-        const readAccessToken = await password({
+        const readAccessToken = this.ensurePromptValue(await password({
             message: 'Read access token',
             validate(value) {
-                return value ? true : 'Read access token is required';
+                return value ? undefined : 'Read access token is required';
             },
-        }).then(value => value.trim());
-        const writeAccessToken = await password({
+        })).trim();
+        const writeAccessToken = this.ensurePromptValue(await password({
             message: 'Write access token',
             validate(value) {
-                return value ? true : 'Write access token is required';
+                return value ? undefined : 'Write access token is required';
             },
-        }).then(value => value.trim());
+        })).trim();
         return {
             readAccessToken,
             writeAccessToken,

package/dist/commands/storage/select.js

@@ -1,4 +1,4 @@
-import { select } from '@inquirer/prompts';
+import { select } from '@clack/prompts';
 import { Flags } from '@oclif/core';
 import { StoragesEmptyError } from '../../services/storage.service.js';
 import { BaseStorageCommand } from './base.js';
@@ -19,14 +19,14 @@ export default class StorageSelect extends BaseStorageCommand {
         try {
             let storageId = flags.id;
             if (!storageId) {
-                const storages = await this.storageService.requestStorage();
-                storageId = await select({
-                    choices: storages.map(storage => ({
-                        name: `${storage.id} (${storage.storageType}) ${storage.bucket}/${storage.prefix} `,
+                const storages = await this.storageService.requestStorages();
+                storageId = this.ensurePromptValue(await select({
+                    message: 'Select storage',
+                    options: storages.map(storage => ({
+                        label: `${storage.id} (${storage.storageType}) ${storage.bucket}/${storage.prefix} `,
                         value: storage.id,
                     })),
-                    message: 'Select storage',
-                });
+                }));
             }
             if (!storageId) {
                 this.error('Storage ID is required');
@@ -38,7 +38,9 @@ export default class StorageSelect extends BaseStorageCommand {
             if (error instanceof StoragesEmptyError) {
                 this.error('No storages available. Run "sp storage create" first.');
             }
-            this.error(error instanceof Error ? error.message : String(error));
+            else {
+                this.error(error instanceof Error ? error.message : String(error));
+            }
         }
     }
 }

package/dist/commands/storage/update.js

@@ -1,4 +1,4 @@
-import { confirm, input, password, select, } from '@inquirer/prompts';
+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';
@@ -25,25 +25,28 @@ export default class StorageUpdate extends BaseStorageCommand {
         const { flags } = await this.parse(StorageUpdate);
         try {
             const shouldRequestStorages = !flags.fromFile || !flags.id;
-            const storages = shouldRequestStorages ? await this.storageService.requestStorage() : undefined;
+            const storages = shouldRequestStorages ? await this.storageService.requestStorages() : undefined;
             let storageId = flags.id;
             if (!storageId) {
-                const choices = (storages || []).filter(cp => !cp.isCentralized).map(storage => ({
-                    name: `${storage.id} (${storage.storageType}) ${storage.bucket}/${storage.prefix} `,
+                const options = (storages || []).filter(cp => !cp.isCentralized).map(storage => ({
+                    label: `${storage.id} (${storage.storageType}) ${storage.bucket}/${storage.prefix} `,
                     value: storage.id,
                 }));
-                if (!choices || choices.length === 0) {
+                if (!options || options.length === 0) {
                     throw new StoragesEmptyError('No storages available to update');
                 }
-                storageId = await select({
-                    choices,
+                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);
@@ -54,7 +57,9 @@ export default class StorageUpdate extends BaseStorageCommand {
             if (error instanceof StoragesEmptyError) {
                 this.error('No storages available. Run "sp storage create" first.');
             }
-            this.error(error instanceof Error ? error.message : String(error));
+            else {
+                this.error(error instanceof Error ? error.message : String(error));
+            }
         }
     }
     ensureNonEmptyString(value, fieldName) {
@@ -126,36 +131,36 @@ export default class StorageUpdate extends BaseStorageCommand {
         }
     }
     async promptS3Credentials() {
-        const region = await input({
+        const region = this.ensurePromptValue(await text({
             message: 'AWS region',
             validate(value) {
-                return value ? true : 'Region is required';
+                return value ? undefined : 'Region is required';
             },
-        }).then(value => value.trim());
-        const readAccessKeyId = await input({
+        })).trim();
+        const readAccessKeyId = this.ensurePromptValue(await text({
             message: 'Read access key ID',
             validate(value) {
-                return value ? true : 'Read access key ID is required';
+                return value ? undefined : 'Read access key ID is required';
             },
-        }).then(value => value.trim());
-        const readSecretAccessKey = await password({
+        })).trim();
+        const readSecretAccessKey = this.ensurePromptValue(await password({
             message: 'Read secret access key',
             validate(value) {
-                return value ? true : 'Read secret access key is required';
+                return value ? undefined : 'Read secret access key is required';
             },
-        }).then(value => value.trim());
-        const writeAccessKeyId = await input({
+        })).trim();
+        const writeAccessKeyId = this.ensurePromptValue(await text({
             message: 'Write access key ID',
             validate(value) {
-                return value ? true : 'Write access key ID is required';
+                return value ? undefined : 'Write access key ID is required';
             },
-        }).then(value => value.trim());
-        const writeSecretAccessKey = await password({
+        })).trim();
+        const writeSecretAccessKey = this.ensurePromptValue(await password({
             message: 'Write secret access key',
             validate(value) {
-                return value ? true : 'Write secret access key is required';
+                return value ? undefined : 'Write secret access key is required';
             },
-        }).then(value => value.trim());
+        })).trim();
         return {
             readAccessKeyId,
             readSecretAccessKey,
@@ -166,44 +171,44 @@ export default class StorageUpdate extends BaseStorageCommand {
     }
     async promptStorageUpdate(existingStorage) {
         const payload = {};
-        const bucket = await input({
-            default: existingStorage?.bucket ?? '',
+        const bucket = this.ensurePromptValue(await text({
+            defaultValue: existingStorage?.bucket ?? '',
             message: 'Bucket name (leave empty to keep current)',
-        }).then(value => value.trim());
+        })).trim();
         if (bucket) {
             payload.bucket = bucket;
         }
-        const prefix = await input({
-            default: existingStorage?.prefix ?? '',
+        const prefix = this.ensurePromptValue(await text({
+            defaultValue: existingStorage?.prefix ?? '',
             message: 'Prefix (leave empty to keep current)',
-        }).then(value => value.trim());
+        })).trim();
         if (prefix) {
             payload.prefix = prefix;
         }
         let newStorageType;
-        const shouldChangeType = await confirm({
-            default: false,
+        const shouldChangeType = this.ensurePromptValue(await confirm({
+            initialValue: false,
             message: existingStorage
                 ? `Change storage type? (current: ${existingStorage.storageType})`
                 : 'Change storage type?',
-        });
+        }));
         if (shouldChangeType) {
-            newStorageType = await select({
-                choices: [
-                    { name: 'Amazon S3', value: StorageType.S3 },
-                    { name: 'StorJ', value: StorageType.StorJ },
-                ],
+            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 || await confirm({
-                default: false,
+            const updateCredentials = credentialsRequired || this.ensurePromptValue(await confirm({
+                initialValue: false,
                 message: `Update ${effectiveType} credentials?`,
-            });
+            }));
             if (updateCredentials) {
                 if (effectiveType === StorageType.S3) {
                     payload.s3Credentials = await this.promptS3Credentials();
@@ -219,18 +224,18 @@ export default class StorageUpdate extends BaseStorageCommand {
         return this.ensureUpdatePayload(payload);
     }
     async promptStorJCredentials() {
-        const readAccessToken = await password({
+        const readAccessToken = this.ensurePromptValue(await password({
             message: 'Read access token',
             validate(value) {
-                return value ? true : 'Read access token is required';
+                return value ? undefined : 'Read access token is required';
             },
-        }).then(value => value.trim());
-        const writeAccessToken = await password({
+        })).trim();
+        const writeAccessToken = this.ensurePromptValue(await password({
             message: 'Write access token',
             validate(value) {
-                return value ? true : 'Write access token is required';
+                return value ? undefined : 'Write access token is required';
             },
-        }).then(value => value.trim());
+        })).trim();
         return {
             readAccessToken,
             writeAccessToken,

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,10 +23,10 @@ export declare class AppContainer {
     get configManager(): ConfigManager;
     static get container(): AppContainer;
     get providerClient(): ProviderClient;
-    build(): Promise<void>;
-    initAccountManager(): this;
-    initConfigFileManager(): this;
-    initConfigManager(): this;
+    build(): Promise<this>;
+    initAccountManager(rebuild?: boolean): this;
+    initConfigFileManager(rebuild?: boolean): this;
+    initConfigManager(rebuild?: boolean): this;
     initProviderClient({ enableAuth, enableCookies, rebuild }?: {
         enableAuth?: boolean;
         enableCookies?: boolean;

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,7 +102,7 @@ export class AppContainer {
             const configManager = new ConfigManager(configFilePath, this.logger);
             await configManager.init();
             this._configManager = configManager;
-        });
+        }, rebuild);
     }
     initProviderClient({ enableAuth = true, enableCookies = true, rebuild = false } = {}) {
         this.initConfigManager();
@@ -111,13 +111,23 @@ export class AppContainer {
                 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,20 +138,11 @@ 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);
     }
@@ -149,7 +150,6 @@ export class AppContainer {
         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