@0xobelisk/sui-cli 1.2.0-pre.1 → 1.2.0-pre.100

package/src/commands/faucet.ts

@@ -1,7 +1,8 @@
 import type { CommandModule } from 'yargs';
-import { requestSuiFromFaucetV0, getFaucetHost } from '@mysten/sui/faucet';
+import { requestSuiFromFaucetV2, getFaucetHost } from '@mysten/sui/faucet';
 import { SuiClient, getFullnodeUrl, GetBalanceParams } from '@mysten/sui/client';
 import { initializeDubhe } from '../utils';
+import { handlerExit } from './shell';
 
 type Options = {
   network: any;
@@ -63,26 +64,29 @@ const commandModule: CommandModule<Options, Options> = {
       isInterrupted = true;
       process.stdout.write('\r' + ' '.repeat(50) + '\r');
       console.log('\n  └─ Operation cancelled by user');
-      process.exit(0);
+      handlerExit(1);
     };
     process.on('SIGINT', handleInterrupt);
 
     try {
       while (retryCount < MAX_RETRIES && !success && !isInterrupted) {
         try {
-          await requestSuiFromFaucetV0({
+          await requestSuiFromFaucetV2({
             host: getFaucetHost(network),
             recipient: faucet_address
           });
           success = true;
-        } catch (error) {
+        } catch (_error) {
           if (isInterrupted) break;
 
           retryCount++;
           if (retryCount === MAX_RETRIES) {
             console.log(`  └─ Failed to request funds after ${MAX_RETRIES} attempts.`);
             console.log('  └─ Please check your network connection and try again later.');
-            process.exit(1);
+            console.log(
+              '  └─ You can visit https://faucet.testnet.sui.io/ to request funds manually.'
+            );
+            handlerExit(1);
           }
 
           const elapsedTime = Math.floor((Date.now() - startTime) / 1000);
@@ -98,7 +102,7 @@ const commandModule: CommandModule<Options, Options> = {
     }
 
     if (isInterrupted) {
-      process.exit(0);
+      handlerExit(1);
     }
     process.stdout.write('\r' + ' '.repeat(50) + '\r');
 
@@ -115,7 +119,7 @@ const commandModule: CommandModule<Options, Options> = {
     console.log(`  └─ Balance: ${(Number(balance.totalBalance) / 1_000_000_000).toFixed(4)} SUI`);
 
     console.log('\n✅ Faucet Operation Complete\n');
-    process.exit(0);
+    handlerExit();
   }
 };
 

package/src/commands/generateKey.ts

@@ -1,5 +1,6 @@
 import type { CommandModule } from 'yargs';
 import { generateAccountHandler } from '../utils/generateAccount';
+import { handlerExit } from './shell';
 
 type Options = {
   force?: boolean;
@@ -26,9 +27,9 @@ const commandModule: CommandModule<Options, Options> = {
       await generateAccountHandler(force, useNextPublic);
     } catch (error) {
       console.error('Error generating account:', error);
-      process.exit(1);
+      handlerExit(1);
     }
-    process.exit(0);
+    handlerExit();
   }
 };
 

package/src/commands/index.ts

@@ -4,24 +4,27 @@ import localnode from './localnode';
 import faucet from './faucet';
 import schemagen from './schemagen';
 import publish from './publish';
-import upgrade from './upgrade';
 import test from './test';
 import build from './build';
 import hello from './hello';
 import generateKey from './generateKey';
 import checkBalance from './checkBalance';
 import configStore from './configStore';
-import query from './query';
-import call from './call';
 import watch from './watch';
 import wait from './wait';
+import switchEnv from './switchEnv';
+import info from './info';
+import loadMetadata from './loadMetadata';
+import doctor from './doctor';
+import convertJson from './convertJson';
+import upgrade from './upgrade';
+import shell from './shell';
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Each command has different options
 export const commands: CommandModule<any, any>[] = [
   localnode,
   publish,
-  call,
-  query,
+  // call,
+  // query,
   faucet,
   schemagen,
   upgrade,
@@ -32,5 +35,11 @@ export const commands: CommandModule<any, any>[] = [
   checkBalance,
   configStore,
   watch,
-  wait
+  wait,
+  switchEnv,
+  info,
+  loadMetadata,
+  doctor,
+  convertJson,
+  shell
 ];

package/src/commands/info.ts

@@ -0,0 +1,55 @@
+import { CommandModule } from 'yargs';
+import { logError, initializeDubhe, getDefaultNetwork } from '../utils';
+import dotenv from 'dotenv';
+import chalk from 'chalk';
+import { handlerExit } from './shell';
+dotenv.config();
+
+type Options = {
+  network: any;
+};
+
+const InfoCommand: CommandModule<Options, Options> = {
+  command: 'info',
+  describe: 'Get information about the current Sui node',
+  builder(yargs) {
+    return yargs.options({
+      network: {
+        type: 'string',
+        choices: ['mainnet', 'testnet', 'devnet', 'localnet', 'default'],
+        default: 'default',
+        desc: 'Node network (mainnet/testnet/devnet/localnet)'
+      }
+    });
+  },
+  handler: async ({ network }) => {
+    try {
+      if (network == 'default') {
+        network = await getDefaultNetwork();
+        console.log(chalk.yellow(`Use default network: [${network}]`));
+      }
+      const dubhe = initializeDubhe({ network });
+      const keypair = dubhe.getSigner();
+
+      console.log(chalk.blue('Account Information:'));
+      console.log(`  Network: ${chalk.green(network)}`);
+      console.log(`  Address: ${chalk.green(keypair.toSuiAddress())}`);
+
+      try {
+        const balance = await dubhe.getBalance('0x2::sui::SUI');
+        const suiBalance = (Number(balance.totalBalance) / 10 ** 9).toFixed(4);
+        console.log(`  Balance: ${chalk.green(suiBalance)} SUI`);
+      } catch (_error) {
+        console.log(
+          `  Balance: ${chalk.red('Failed to fetch balance')} ${chalk.gray('(Network error)')}`
+        );
+      }
+      handlerExit();
+    } catch (error) {
+      logError(error);
+      handlerExit(1);
+    }
+  }
+};
+
+export default InfoCommand;

package/src/commands/loadMetadata.ts

@@ -0,0 +1,57 @@
+import type { CommandModule } from 'yargs';
+import { logError } from '../utils/errors';
+import { loadConfig, DubheConfig } from '@0xobelisk/sui-common';
+import { loadMetadataHandler } from '../utils/metadataHandler';
+import { handlerExit } from './shell';
+import { getDefaultNetwork } from '../utils';
+import chalk from 'chalk';
+
+type Options = {
+  network: any;
+  'config-path': string;
+  'package-id'?: string;
+};
+
+const commandModule: CommandModule<Options, Options> = {
+  command: 'load-metadata',
+
+  describe: 'Load metadata for a package',
+
+  builder(yargs) {
+    return yargs.options({
+      network: {
+        type: 'string',
+        choices: ['mainnet', 'testnet', 'devnet', 'localnet', 'default'],
+        default: 'default',
+        desc: 'Node network (mainnet/testnet/devnet/localnet)'
+      },
+      'config-path': {
+        type: 'string',
+        desc: 'Configuration file path',
+        default: 'dubhe.config.ts'
+      },
+      'package-id': {
+        type: 'string',
+        desc: 'Package ID to load metadata for',
+        optional: true
+      }
+    });
+  },
+
+  async handler({ network, 'config-path': configPath, 'package-id': packageId }) {
+    try {
+      if (network == 'default') {
+        network = await getDefaultNetwork();
+        console.log(chalk.yellow(`Use default network: [${network}]`));
+      }
+      const dubheConfig = (await loadConfig(configPath)) as DubheConfig;
+      await loadMetadataHandler(dubheConfig, network, packageId);
+    } catch (error: any) {
+      logError(error);
+      handlerExit(1);
+    }
+    handlerExit();
+  }
+};
+
+export default commandModule;

package/src/commands/localnode.ts

@@ -1,28 +1,38 @@
 import type { CommandModule } from 'yargs';
 import { startLocalNode } from '../utils/startNode';
+import { handlerExit } from './shell';
 
-const commandModule: CommandModule = {
+type Options = {
+  'data-dir': string;
+  force: boolean;
+};
+
+const commandModule: CommandModule<Options, Options> = {
   command: 'node',
 
   describe: 'Manage local Sui node',
 
-  builder(yargs) {
-    return yargs
-      .option('force-regenesis', {
-        alias: 'f',
-        type: 'boolean',
-        description: 'Force regenesis the local node',
-        default: true
-      });
+  builder: {
+    'data-dir': {
+      type: 'string',
+      default: '.chk',
+      desc: 'Path to the data directory'
+    },
+    force: {
+      type: 'boolean',
+      default: false,
+      desc: 'Force restart: stop existing node and remove data directory'
+    }
   },
 
-  async handler(argv) {
+  async handler({ 'data-dir': data_dir, force }) {
     try {
-      await startLocalNode({ forceRegenesis: argv['force-regenesis'] as boolean });
+      await startLocalNode(data_dir, force);
     } catch (error) {
       console.error('Error executing command:', error);
-      process.exit(1);
+      handlerExit(1);
     }
+    handlerExit();
   }
 };
 

package/src/commands/publish.ts

@@ -1,11 +1,15 @@
 import type { CommandModule } from 'yargs';
 import { logError } from '../utils/errors';
-import { publishHandler } from '../utils';
+import { getDefaultNetwork, publishHandler } from '../utils';
 import { loadConfig, DubheConfig } from '@0xobelisk/sui-common';
+import { execSync } from 'child_process';
+import { handlerExit } from './shell';
+import chalk from 'chalk';
 
 type Options = {
   network: any;
   'config-path': string;
+  force: boolean;
   'gas-budget'?: number;
 };
 
@@ -18,8 +22,8 @@ const commandModule: CommandModule<Options, Options> = {
     return yargs.options({
       network: {
         type: 'string',
-        choices: ['mainnet', 'testnet', 'devnet', 'localnet'],
-        default: 'localnet',
+        choices: ['mainnet', 'testnet', 'devnet', 'localnet', 'default'],
+        default: 'default',
         desc: 'Node network (mainnet/testnet/devnet/localnet)'
       },
       'config-path': {
@@ -31,19 +35,29 @@ const commandModule: CommandModule<Options, Options> = {
         type: 'number',
         desc: 'Optional gas budget for the transaction',
         optional: true
+      },
+      force: {
+        type: 'boolean',
+        default: true,
+        desc: 'Force publish: do not update dependencies'
       }
     });
   },
 
-  async handler({ network, 'config-path': configPath, 'gas-budget': gasBudget }) {
+  async handler({ network, 'config-path': configPath, 'gas-budget': gasBudget, force }) {
     try {
+      if (network == 'default') {
+        network = await getDefaultNetwork();
+        console.log(chalk.yellow(`Use default network: [${network}]`));
+      }
       const dubheConfig = (await loadConfig(configPath)) as DubheConfig;
-      await publishHandler(dubheConfig, network, gasBudget);
+      execSync(`pnpm dubhe convert-json --config-path ${configPath}`, { encoding: 'utf-8' });
+      await publishHandler(dubheConfig, network, force, gasBudget);
     } catch (error: any) {
       logError(error);
-      process.exit(1);
+      handlerExit(1);
     }
-    process.exit(0);
+    handlerExit();
   }
 };
 

package/src/commands/query.ts

@@ -1,108 +1,108 @@
-import type { CommandModule } from 'yargs';
-import { logError } from '../utils/errors';
-import { queryStorage } from '../utils';
-import { loadConfig, DubheConfig } from '@0xobelisk/sui-common';
+// import type { CommandModule } from 'yargs';
+// import { logError } from '../utils/errors';
+// import { queryStorage } from '../utils';
+// import { loadConfig, DubheConfig } from '@0xobelisk/sui-common';
 
-type Options = {
-  network: 'mainnet' | 'testnet' | 'devnet' | 'localnet';
-  'config-path'?: string;
-  schema: string;
-  'object-id'?: string;
-  'package-id'?: string;
-  'metadata-path'?: string;
-  params?: any[];
-};
+// type Options = {
+//   network: 'mainnet' | 'testnet' | 'devnet' | 'localnet';
+//   'config-path'?: string;
+//   schema: string;
+//   'object-id'?: string;
+//   'package-id'?: string;
+//   'metadata-path'?: string;
+//   params?: any[];
+// };
 
-/**
- * CLI command module for querying schema struct state
- *
- * Examples:
- *
- * 1. Query StorageValue (no params required):
- * ```bash
- * dubhe query --config-path dubhe.config.ts --network devnet --schema counter --field value
- * ```
- *
- * 2. Query StorageMap (one param required):
- * ```bash
- * dubhe query --config-path dubhe.config.ts --network devnet --schema token --field balances \
- *   --params "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef"
- * ```
- *
- * 3. Query StorageDoubleMap (two params required):
- * ```bash
- * dubhe query --config-path dubhe.config.ts --network devnet --schema game --field player_relations \
- *   --params "0x123...456" "0x789...abc"
- * ```
- */
-const commandModule: CommandModule<Options, Options> = {
-  command: 'query',
+// /**
+//  * CLI command module for querying schema struct state
+//  *
+//  * Examples:
+//  *
+//  * 1. Query StorageValue (no params required):
+//  * ```bash
+//  * dubhe query --config-path dubhe.config.ts --network devnet --schema counter --field value
+//  * ```
+//  *
+//  * 2. Query StorageMap (one param required):
+//  * ```bash
+//  * dubhe query --config-path dubhe.config.ts --network devnet --schema token --field balances \
+//  *   --params "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef"
+//  * ```
+//  *
+//  * 3. Query StorageDoubleMap (two params required):
+//  * ```bash
+//  * dubhe query --config-path dubhe.config.ts --network devnet --schema game --field player_relations \
+//  *   --params "0x123...456" "0x789...abc"
+//  * ```
+//  */
+// const commandModule: CommandModule<Options, Options> = {
+//   command: 'query',
 
-  describe: 'Query dubhe schema struct state',
+//   describe: 'Query dubhe schema struct state',
 
-  builder: {
-    network: {
-      type: 'string',
-      choices: ['mainnet', 'testnet', 'devnet', 'localnet'],
-      default: 'localnet',
-      desc: 'Node network (mainnet/testnet/devnet/localnet)'
-    },
-    'config-path': {
-      type: 'string',
-      default: 'dubhe.config.ts',
-      desc: 'Configuration file path'
-    },
-    schema: {
-      type: 'string',
-      desc: 'Schema name',
-      demandOption: true
-    },
-    'object-id': {
-      type: 'string',
-      desc: 'Object ID (optional)'
-    },
-    'package-id': {
-      type: 'string',
-      desc: 'Package ID (optional)'
-    },
-    'metadata-path': {
-      type: 'string',
-      desc: 'Path to metadata JSON file (optional)'
-    },
-    params: {
-      type: 'array',
-      desc: 'Params for storage type: StorageValue(no params), StorageMap(1 param), StorageDoubleMap(2 params)',
-      string: true
-    }
-  },
+//   builder: {
+//     network: {
+//       type: 'string',
+//       choices: ['mainnet', 'testnet', 'devnet', 'localnet'],
+//       default: 'localnet',
+//       desc: 'Node network (mainnet/testnet/devnet/localnet)'
+//     },
+//     'config-path': {
+//       type: 'string',
+//       default: 'dubhe.config.ts',
+//       desc: 'Configuration file path'
+//     },
+//     schema: {
+//       type: 'string',
+//       desc: 'Schema name',
+//       demandOption: true
+//     },
+//     'object-id': {
+//       type: 'string',
+//       desc: 'Object ID (optional)'
+//     },
+//     'package-id': {
+//       type: 'string',
+//       desc: 'Package ID (optional)'
+//     },
+//     'metadata-path': {
+//       type: 'string',
+//       desc: 'Path to metadata JSON file (optional)'
+//     },
+//     params: {
+//       type: 'array',
+//       desc: 'Params for storage type: StorageValue(no params), StorageMap(1 param), StorageDoubleMap(2 params)',
+//       string: true
+//     }
+//   },
 
-  async handler({
-    network,
-    'config-path': configPath,
-    schema,
-    'object-id': objectId,
-    'package-id': packageId,
-    'metadata-path': metadataPath,
-    params
-  }) {
-    try {
-      const dubheConfig = (await loadConfig(configPath)) as DubheConfig;
+//   async handler({
+//     network,
+//     'config-path': configPath,
+//     schema,
+//     'object-id': objectId,
+//     'package-id': packageId,
+//     'metadata-path': metadataPath,
+//     params
+//   }) {
+//     try {
+//       const dubheConfig = (await loadConfig(configPath)) as DubheConfig;
 
-      await queryStorage({
-        dubheConfig,
-        schema,
-        objectId,
-        network,
-        packageId,
-        metadataFilePath: metadataPath,
-        params
-      });
-    } catch (error: any) {
-      logError(error);
-      process.exit(1);
-    }
-    process.exit(0);
-  }
-};
+//       await queryStorage({
+//         dubheConfig,
+//         schema,
+//         objectId,
+//         network,
+//         packageId,
+//         metadataFilePath: metadataPath,
+//         params
+//       });
+//     } catch (error: any) {
+//       logError(error);
+//       process.exit(1);
+//     }
+//     process.exit(0);
+//   }
+// };
 
-export default commandModule;
+// export default commandModule;

package/src/commands/schemagen.ts

@@ -1,10 +1,13 @@
 import type { CommandModule } from 'yargs';
 import { schemaGen, loadConfig, DubheConfig } from '@0xobelisk/sui-common';
 import chalk from 'chalk';
+import path from 'node:path';
+import { handlerExit } from './shell';
+import { getDefaultNetwork } from '../utils';
 
 type Options = {
   'config-path'?: string;
-  network?: 'mainnet' | 'testnet' | 'devnet' | 'localnet';
+  network?: 'mainnet' | 'testnet' | 'devnet' | 'localnet' | 'default';
 };
 
 const commandModule: CommandModule<Options, Options> = {
@@ -20,19 +23,27 @@ const commandModule: CommandModule<Options, Options> = {
     },
     network: {
       type: 'string',
-      choices: ['mainnet', 'testnet', 'devnet', 'localnet'] as const,
+      choices: ['mainnet', 'testnet', 'devnet', 'localnet', 'default'] as const,
+      default: 'default',
       desc: 'Node network (mainnet/testnet/devnet/localnet)'
     }
   },
 
   async handler({ 'config-path': configPath, network }) {
     try {
+      if (!configPath) throw new Error('Config path is required');
+      if (network == 'default') {
+        network = await getDefaultNetwork();
+        console.log(chalk.yellow(`Use default network: [${network}]`));
+      }
       const dubheConfig = (await loadConfig(configPath)) as DubheConfig;
-      await schemaGen(dubheConfig, undefined, network);
-      process.exit(0);
+      const rootDir = path.dirname(configPath);
+      await schemaGen(rootDir, dubheConfig, network);
+      handlerExit();
     } catch (error: any) {
       console.log(chalk.red('Schemagen failed!'));
       console.error(error.message);
+      handlerExit(1);
     }
   }
 };