soluser 1.0.3 → 1.0.6

package/README.md

@@ -7,7 +7,7 @@ npm install -g soluser@latest
 ```shell
 $ soluser new charlie
 $ soluser new  alice --word-length 12
-$ soluser new  bob --word-length 24 --no-bip39-passphrase
+$ soluser new  bob --word-length 24 --without-passphrase
 ```
 
 ## 切换账号
@@ -25,3 +25,23 @@ $ soluser list
 $ soluser remove alice
 ```
 
+## 查看alias对应的地址
+```shell
+$ soluser address alice
+```
+
+## 查看alias对应的余额
+```shell
+$ soluser balance alice
+```
+
+## airdrop 给alias
+```shell
+$ soluser airdrop 5 alice
+Requesting airdrop of 5 SOL
+
+Signature: 4BLUt5uxutbEwVywBTbAoBnG4EKb6QgsHgk3JRfjy6uJCoNjxdyYodbAhsWPXquBBwVzui1WyQxKn9d39JnwS3Pb
+
+500000005 SOL
+```
+

package/bin/index.js

@@ -6,6 +6,45 @@ const switchAccount = require('../src/commands/switch');
 const listAccounts = require('../src/commands/list');
 const removeAccount = require('../src/commands/remove');
 
+// 导入地址查询命令
+const showAddress = require('../src/commands/address');
+// 导入余额查询命令
+const checkBalance = require('../src/commands/balance');
+// Import the airdrop command
+const requestAirdrop = require('../src/commands/airdrop');
+
+
+
+// 定义地址查询命令
+program
+  .command('address')
+  .description('Output the base58 address of a Solana account')
+  .argument('<alias>', 'Alias of the account to get address') // 接收别名作为位置参数
+  .action((alias) => {
+    showAddress(alias);
+  });
+
+
+// Define the airdrop command
+program
+  .command('airdrop')
+  .description('Request an airdrop of SOL to a Solana account')
+  .argument('<amount>', 'Amount of SOL to request')
+  .argument('<alias>', 'Alias of the account to receive the airdrop')
+  .action((amount, alias) => {
+    requestAirdrop(amount, alias);
+  });
+
+// ... existing code ...
+// 定义余额查询命令
+program
+  .command('balance')
+  .description('Check the SOL balance of a Solana account')
+  .argument('<alias>', 'Alias of the account to check balance') // 接收别名作为位置参数
+  .action((alias) => {
+    checkBalance(alias);
+  });
+
 
 // 定义新建账号命令
 // 定义新建账号命令（修改后）

package/package.json

@@ -1,21 +1,23 @@
 {
-  "name": "soluser",  
-  "version": "1.0.3", 
+  "name": "soluser",
+  "version": "1.0.6",
   "description": "A CLI tool to manage Solana accounts (new, switch, list)",
-  "main": "bin/index.js", 
+  "main": "bin/index.js",
   "bin": {
     "soluser": "./bin/index.js"
   },
-  "keywords": ["solana", "cli", "account", "wallet"],
+  "keywords": [
+    "solana",
+    "cli",
+    "account",
+    "wallet"
+  ],
   "author": "guahuzi",
-  "license": "MIT", 
+  "license": "MIT",
   "dependencies": {
-    "commander": "^11.1.0",
-    "cli-table3": "^0.6.3"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/nextuser/soluser.git"
   }
 }
-

package/src/commands/address.js

@@ -0,0 +1,22 @@
+const { existsAccount, getKeyFilePath } = require('../utils/path');
+const { getAddress } = require('../utils/solana');
+
+function showAddress(alias) {
+  // 1. 检查账号是否存在
+  if (!existsAccount(alias)) {
+    console.error(`Error: Account "${alias}" does not exist.`);
+    console.error(`       Use "soluser list" to view all available accounts.`);
+    process.exit(1);
+  }
+
+  // 2. 解析并输出 base58 地址
+  try {
+    const address = getAddress(alias); // 复用之前的 getAddress 函数（基于 solana-keygen）
+    process.stdout.write(address); // 直接输出地址（方便脚本调用）
+  } catch (err) {
+    console.error(`Error: Failed to parse address for "${alias}": ${err.message}`);
+    process.exit(1);
+  }
+}
+
+module.exports = showAddress;

package/src/commands/airdrop.js

@@ -0,0 +1,20 @@
+// src/commands/airdrop.js
+const { execCommand } = require('../utils/solana');
+const { getAddress } = require('../utils/solana');
+function requestAirdrop(amount, alias) {
+  
+  
+  try {
+    const address = getAddress(alias);
+    // Execute the solana airdrop command with the amount and resolved address
+    const cmd = `solana airdrop ${amount} ${address}`;
+    const result = execCommand(cmd);
+    console.log(result);
+  } catch (error) {
+    console.log("eroror in call requestAirdrop ${amount} ${alias}");
+    console.error(`Failed to request airdrop: ${error.message} \n `);
+    process.exit(1);
+  }
+}
+
+module.exports = requestAirdrop;

package/src/commands/balance.js

@@ -0,0 +1,33 @@
+const { existsAccount } = require('../utils/path');
+const { getAddress, execCommand } = require('../utils/solana');
+
+function checkBalance(alias) {
+  // 1. 检查账号是否存在
+  if (!existsAccount(alias)) {
+    console.error(`Error: Account "${alias}" does not exist.`);
+    console.error(`       Use "soluser list" to view all available accounts.`);
+    process.exit(1);
+  }
+
+  // 2. 获取账号对应的公钥（address）
+  let address;
+  try {
+    address = getAddress(alias);
+  } catch (err) {
+    console.error(`Error: Failed to get address for "${alias}": ${err.message}`);
+    process.exit(1);
+  }
+
+  // 3. 调用 solana balance 命令查询余额
+  try {
+    // solana balance 命令会返回类似 "1.2345 SOL" 的结果
+    const balance = execCommand(`solana balance ${address}`);
+    console.log(`${alias}: ${balance}`); // 输出格式：别名 + 余额
+  } catch (err) {
+    console.error(`Error: Failed to check balance for "${alias}": ${err.message}`);
+    console.error(`       Ensure Solana CLI is configured with a valid network (e.g., "solana config set --url https://api.devnet.solana.com")`);
+    process.exit(1);
+  }
+}
+
+module.exports = checkBalance;

package/src/commands/list.js

@@ -26,7 +26,7 @@ function listAccounts() {
   // 3. 构建表格
   const table = new Table({
     head: ['alias', 'address', 'active'],
-    colWidths: [15, 45, 8],
+    colWidths: [15, 50, 8],
   });
 
   // 4. 填充表格数据
@@ -34,7 +34,7 @@ function listAccounts() {
     const alias = path.basename(file, '.json');
     const address = getAddress(alias);
     const isActive = alias === activeAlias ? '*' : '';
-    console.log("alias: ", alias, "address: ", address, "isActive: ", isActive,'activeAlias',activeAlias )
+    //console.log("alias: ", alias, "address: ", address, "isActive: ", isActive,'activeAlias',activeAlias )
     table.push([alias, address, isActive]);
   });
 

package/src/utils/solana.js

@@ -21,7 +21,7 @@ function getActiveKeyPath() {
   const config = execCommand('solana config get keypair');
   // 从输出中提取路径（例如："Keypair Path: /home/user/.config/solana/keys/alice.json"）
   const match = config.match(/Key Path: (.*)/);
-  console.log("config:",config,"config match :",match)
+  //console.log("config:",config,"config match :",match)
   return match ? match[1] : null;
 }