soluser 1.0.1 → 1.0.3

package/README.md

@@ -1,27 +1,27 @@
 # soluser
-# 新建账号
+## 安装
 ```shell
+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 charlie
 ```
 
-# 切换账号
+## 切换账号
 ```shell
-$ soluser switch --address alice
+$ soluser switch  bob
 ```
 
-# 列出账号
+## 列出账号
 ```shell
 $ soluser list
 ```
 
-# 删除账号
+## 删除账号
 ```shell
 $ soluser remove alice
 ```
 
-# 本地安装
-```shell
-npm link
-```

package/bin/index.js

@@ -14,27 +14,30 @@ program
   .description('Create a new Solana account')
   .argument('<alias>', 'Alias for the new account (must start with a letter, contain letters, digits, hyphens, or underscores)') // 新增位置参数
   .option('--word-length <number>', 'Number of words in seed phrase (12,15,18,21,24)', 12)
-  .option('--no-bip39-passphrase', 'Do not prompt for BIP39 passphrase')
+  .option('--without-passphrase', 'Do not prompt for BIP39 passphrase',false)
   .action((alias, options) => { // 第一个参数为位置参数 alias，第二个为选项
+    // // 打印选项值验证（调试用）
+    // console.log('without-passphrase:', options.withoutPassphrase); 
+    // console.log("type noPassphrase:", typeof(options.withoutPassphrase), "value:", options.withoutPassphrase)
+
     newAccount(
       alias, // 直接使用位置参数的 alias
       parseInt(options.wordLength, 10), //10进制解析
-      options.noBip39Passphrase
+      options.withoutPassphrase
     );
   });
 
-// 定义切换账号命令
+
+// 定义切换账号命令（修改后）
 program
   .command('switch')
   .description('Switch active Solana account')
-  .option('--address <alias>', 'Alias of the account to switch to', '')
-  .action((options) => {
-    if (!options.address) {
-      throw new Error('Alias is required (use --address <alias>)');
-    }
-    switchAccount(options.address);
+  .argument('<alias>', 'Alias of the account to switch to') // 新增位置参数
+  .action((alias) => { // 直接使用位置参数 alias
+    switchAccount(alias);
   });
 
+
 // 定义列出账号命令
 program
   .command('list')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soluser",  
-  "version": "1.0.1", 
+  "version": "1.0.3", 
   "description": "A CLI tool to manage Solana accounts (new, switch, list)",
   "main": "bin/index.js", 
   "bin": {

package/src/commands/new.js

@@ -1,6 +1,7 @@
 const fs = require('fs');
-const { KEYS_DIR, validateAlias, getKeyFilePath } = require('../utils/path');
+const { KEYS_DIR, validateAlias, getKeyFilePath ,existsAccount} = require('../utils/path');
 const { execCommand } = require('../utils/solana');
+const ThrowErorr = require('../utils/throw_error');
 
 function newAccount(alias, wordLength = 12, noPassphrase = false) {
   // 1. 确保密钥目录存在
@@ -10,21 +11,38 @@ function newAccount(alias, wordLength = 12, noPassphrase = false) {
 
   // 2. 验证参数
   validateAlias(alias);
+
+  // 3. 新增：检查账号是否已存在
+  if (existsAccount(alias)) {
+    console.error(`Error: Account "${alias}" already exists.`);
+    console.error(`       Use "soluser list" to view existing accounts, or choose a different alias.`);
+    process.exit(1);
+  }
+
+
+  // 4. 验证助记词长度（已有逻辑）
   const validWordLengths = [12, 15, 18, 21, 24];
   if (!validWordLengths.includes(wordLength)) {
-    throw new Error(`Word length must be one of: ${validWordLengths.join(', ')}`);
+    ThrowErorr(`Word length must be one of: ${validWordLengths.join(', ')}`);
   }
 
-  // 3. 生成密钥对（调用 solana-keygen）
-  const keyPath = getKeyFilePath(alias);
-  let command = `solana-keygen new --word-count ${wordLength} --outfile ${keyPath}`;
-  if (noPassphrase) {
-    command += ' --no-bip39-passphrase';
-  }
+  
+
 
-  console.log(`Generating key pair for ${alias}...`);
-  execCommand(command);
-  console.log(`Successfully created account: ${alias} (saved to ${keyPath})`);
+  // 5. 生成密钥对（已有逻辑）
+  try {
+    let command = `solana-keygen new --word-count ${wordLength} --outfile ${getKeyFilePath(alias)}`;
+    
+    if (noPassphrase) {
+      command += ' --no-bip39-passphrase';
+    }
+    console.log(`Generating key pair for ${alias}...`);
+    execCommand(command);
+    console.log(`Successfully created account: ${alias} (saved to ${getKeyFilePath(alias)})`);
+  } catch (err) {
+    console.error(`Error: Failed to generate key pair: ${err.message}`);
+    process.exit(1);
+  }
 }
 
 module.exports = newAccount;

package/src/commands/remove.js

@@ -2,7 +2,7 @@ const fs = require('fs');
 const { validateAlias, getKeyFilePath } = require('../utils/path');
 const { getActiveKeyPath } = require('../utils/solana');
 const path = require('path');
-
+const ThrowErorr = require('../utils/throw_error');
 function removeAccount(alias) {
   // 1. 验证别名格式
   validateAlias(alias);
@@ -10,7 +10,7 @@ function removeAccount(alias) {
   // 2. 检查密钥文件是否存在
   const keyPath = getKeyFilePath(alias);
   if (!fs.existsSync(keyPath)) {
-    throw new Error(`Account "${alias}" not found. Use "soluser list" to check existing accounts.`);
+    ThrowErorr(`Account "${alias}" not found. Use "soluser list" to check existing accounts.`);
   }
 
   // 3. 检查是否为当前活跃账号

package/src/commands/switch.js

@@ -1,13 +1,13 @@
 const fs = require('fs');
 const { getKeyFilePath } = require('../utils/path');
 const { execCommand } = require('../utils/solana');
-
+const ThrowErorr = require('../utils/throw_error');
 function switchAccount(alias) {
   const keyPath = getKeyFilePath(alias);
 
   // 验证密钥文件是否存在
   if (!fs.existsSync(keyPath)) {
-    throw new Error(`Account ${alias} not found. Check alias or create it with "soluser new".`);
+    ThrowErorr(`Account ${alias} not found. Check alias or create it with "soluser new".`);
   }
 
   // 执行切换（调用 solana config set）

package/src/develop.md

@@ -0,0 +1,6 @@
+# ai 生成提示符号
+- 使用豆包生成， 再稍微调整
+## 本地安装
+```shell
+npm link
+```

package/src/utils/path.js

@@ -1,6 +1,6 @@
 const path = require('path');
 const os = require('os');
-
+const ThrowErorr = require('../utils/throw_error');
 // 密钥存储目录：~/.config/solana/keys
 const KEYS_DIR = path.join(os.homedir(), '.config', 'solana', 'keys');
 
@@ -8,7 +8,7 @@ const KEYS_DIR = path.join(os.homedir(), '.config', 'solana', 'keys');
 function validateAlias(alias) {
   const regex = /^[a-zA-Z][a-zA-Z0-9_-]*$/;
   if (!regex.test(alias)) {
-    throw new Error('Alias must start with a letter and contain only letters, digits, hyphens, or underscores');
+    ThrowErorr('Alias must start with a letter and contain only letters, digits, hyphens, or underscores');
   }
 }
 
@@ -17,9 +17,19 @@ function getKeyFilePath(alias) {
   return path.join(KEYS_DIR, `${alias}.json`);
 }
 
+// 检查账号是否存在（即密钥文件是否存在）
+function existsAccount(alias) {
+  const keyPath = getKeyFilePath(alias);
+  return fs.existsSync(keyPath); // 返回布尔值：true=存在，false=不存在
+}
+
+// 记得在顶部导入 fs
+const fs = require('fs');
+
 module.exports = {
   KEYS_DIR,
   validateAlias,
   getKeyFilePath,
+  existsAccount,
 };
 

package/src/utils/solana.js

@@ -1,12 +1,12 @@
 const { execSync } = require('child_process');
 const { getKeyFilePath } = require('./path');
-
+const ThrowErorr = require('../utils/throw_error');
 // 执行 shell 命令并返回输出
 function execCommand(command) {
   try {
     return execSync(command, { encoding: 'utf8' }).trim();
   } catch (error) {
-    throw new Error(`Command failed: ${command}\n${error.stderr}`);
+    ThrowErorr(`Command failed: ${command}\n${error.stderr}`);
   }
 }
 

package/src/utils/throw_error.js

@@ -0,0 +1,12 @@
+
+function ThrowError(msg){
+    var isDebug = false;
+    if(isDebug){
+        throw new Error(msg);
+    } else{
+        console.error(msg);
+        process.exit(-1);
+    }
+}
+
+module.exports = ThrowError