soluser 1.0.11 → 1.0.14

package/README.md

@@ -56,8 +56,6 @@ Signature: 4BLUt5uxutbEwVywBTbAoBnG4EKb6QgsHgk3JRfjy6uJCoNjxdyYodbAhsWPXquBBwVzu
 
 500000005 SOL
 ```
-
-
 ## import 助记词
 ```shell
 $ soluser import "mnemonic words" --alias someone

package/bin/index.js

@@ -8,6 +8,7 @@ const removeAccount = require('../src/commands/remove');
 const { showExamples } = require('../src/utils/example');
 const pruneAccount = require('../src/commands/prune');
 const clear = require('../src/commands/clear');
+const restoreAccount = require('../src/commands/restore');
   // 导入 keyfile 命令
 const showKeyfilePath = require('../src/commands/keyfile');
 const importMnemonic = require( '../src/commands/from_mnemonic');
@@ -117,7 +118,10 @@ program
   .command('list')
   .alias('l')
   .description('List all Solana accounts')
-  .action(listAccounts);
+  .action(() =>{
+    listAccounts();
+    //process.exit(0);
+  });
 
   // 定义删除账号命令
 program
@@ -143,6 +147,14 @@ program
   .description('prune a Solana account (prune the private key file)')
   .action((alias) => {
     pruneAccount(alias);
+    
+  });
+      // 定义删除账号命令
+program
+  .command('restore ') // <alias> 为必填参数
+  .description('restore file from backup directory')
+  .action(() => {
+    restoreAccount();
   });
 
 
@@ -151,7 +163,7 @@ program
   program.on('--help', () => {
     console.log("version:" ,version);
     showExamples();
-    process.exit(1);
+    //process.exit(1);
   });
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soluser",
-  "version": "1.0.11",
+  "version": "1.0.14",
   "description": "A CLI tool to manage Solana accounts (new, switch, list)",
   "main": "bin/index.js",
   "bin": {
@@ -9,7 +9,8 @@
   "scripts": {
     "test": "mocha test/**/*.test.js --noparallel",
     "test:watch": "mocha test/**/*.test.js --watch",
-    "test:coverage": "nyc mocha test/**/*.test.js"
+    "test:coverage": "nyc mocha test/**/*.test.js",
+    "clear": "bin/index.js clear"
   },
   "keywords": [
     "solana",
@@ -22,16 +23,16 @@
   "dependencies": {
     "@solana/web3.js": "^1.98.4",
     "bip39": "^3.1.0",
+    "bs58": "^6.0.0",
     "chalk": "4.1.2",
     "cli-table3": "^0.6.5",
     "commander": "^14.0.2",
-    "dotenv": "^17.2.3",
     "ed25519-hd-key": "^1.3.0",
     "readline": "^1.3.0"
   },
   "devDependencies": {
     "chai": "^4.3.7",
-    "mocha": "^10.2.0",
+    "mocha": "^10.8.2",
     "nyc": "^15.1.0"
   },
   "files": [

package/src/commands/clear.js

@@ -1,3 +1,5 @@
+const {KEYS_DIR, getBackupDir, addBackupSuffix } = require('../utils/path');
+const {getAddressByFile} = require('../utils/solana');
 // src/commands/clear.js
 const clear = async () => {
   const fs = require('fs');
@@ -33,11 +35,11 @@ const clear = async () => {
 
   // 获取当前时间戳为 YYMMDDHHMMSS 格式
   const now = new Date();
-  const timestamp = `${now.getFullYear().toString().slice(-2)}${(now.getMonth() + 1).toString().padStart(2, '0')}${now.getDate().toString().padStart(2, '0')}${now.getHours().toString().padStart(2, '0')}${now.getMinutes().toString().padStart(2, '0')}${now.getSeconds().toString().padStart(2, '0')}`;
   
   // 定义密钥目录和备份目录
-  const keysDir = path.join(require('os').homedir(), '.config', 'solana', 'keys');
-  const backupDir = path.join(require('os').homedir(), '.config', 'solana', '.bak');
+  const keysDir = KEYS_DIR;
+  const backupDir = getBackupDir();
+  console.log(`Backup directory: ${backupDir}`);
   
   // 确保备份目录存在
   if (!fs.existsSync(backupDir)) {
@@ -49,33 +51,33 @@ const clear = async () => {
     const files = fs.readdirSync(keysDir);
     
     // 过滤出 .json 文件并移动
-    const jsonFiles = files.filter(file => path.extname(file) === '.json');
+    const jsonFiles = files.filter(file => path.extname(file) === '.json' && file.length > '.json'.length);
     
     if (jsonFiles.length > 0) {
       let successCount = 0;
       jsonFiles.forEach(file => {
         const sourceFile = path.join(keysDir, file);
-        const fileNameWithoutExt = path.basename(file, '.json');
-        const destFile = path.join(backupDir, `${fileNameWithoutExt}_${timestamp}.json`);
+        const address = getAddressByFile(sourceFile);
+        const baseName = path.basename(file, '.json');
+        const destFile = path.join(backupDir, `${addBackupSuffix(baseName,address)}.json`);
         
         try {
           fs.renameSync(sourceFile, destFile);
-          console.log(`Moved ${file} to backup directory as ${fileNameWithoutExt}_${timestamp}.json`);
-          console.log('All accounts have been removed.')
+          console.log(`Moved ${file} to backup directory as ${destFile}`);
           successCount++;
         } catch (error) {
-          console.error(`Failed to move ${file}: ${error.message}`);
+          console.log(`Failed to move ${file}: ${error.message}`);
         }
       });
       
       console.log(`\nSuccessfully moved ${successCount}/${jsonFiles.length} account(s) to backup directory`);
+      console.log('All accounts have been removed.')
     } else {
       
-      console.log('All accounts have been removed.')
       console.log('No account files found to move');
     }
   } else {
-    console.error('Keys directory does not exist');
+    console.log('Keys directory does not exist');
     process.exit(1);
   }
 };

package/src/commands/from_mnemonic.js

@@ -1,7 +1,6 @@
 const  { Keypair } = require( '@solana/web3.js');
 const  bip39 = require( 'bip39');
 const  { Buffer } = require( 'buffer');
-const  dotenv = require( 'dotenv');
 const  bs58 = require( 'bs58');
 const  fs = require( 'fs');
 const  path = require( 'path');
@@ -10,7 +9,6 @@ const {debug} = require('../utils/debug');
 ///const ed25519 = = require('ed25519-hd-keyed25519-hd-key')
 const ed25519 = require( 'ed25519-hd-key');
 const { fileURLToPath } = require('url');
-dotenv.config()
 // BIP44路径
 const BIP44_SOLANA_PATH = "m/44'/501'/0'/0'";
 

package/src/commands/list.js

@@ -11,7 +11,8 @@ function listAccounts() {
     return;
   }
 
-  const files = fs.readdirSync(KEYS_DIR).filter(file => file.endsWith('.json'));
+  const JSON_SUFFIX = '.json';
+  const files = fs.readdirSync(KEYS_DIR).filter(file => file.endsWith(JSON_SUFFIX) && file.length > JSON_SUFFIX.length);
   if (files.length === 0) {
     console.log('No accounts found. Create one with "soluser new  <alias name>".');
     return;
@@ -32,6 +33,9 @@ function listAccounts() {
   // 4. 填充表格数据
   files.forEach(file => {
     const alias = path.basename(file, '.json');
+    if(alias.trim() === ''){
+      return ;
+    }
     const address = getAddress(alias);
     const isActive = alias === activeAlias ? '*' : '';
     //console.log("alias: ", alias, "address: ", address, "isActive: ", isActive,'activeAlias',activeAlias )

package/src/commands/new.js

@@ -14,8 +14,8 @@ function newAccount(alias, wordLength = 12, noPassphrase = false) {
 
   // 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.`);
+    console.log(`Error: Account "${alias}" already exists.`);
+    console.log(`       Use "soluser list" to view existing accounts, or choose a different alias.`);
     process.exit(1);
   }
 
@@ -40,7 +40,7 @@ function newAccount(alias, wordLength = 12, noPassphrase = false) {
     execCommand(command);
     console.log(`Successfully created account: ${alias} (saved to ${getKeyFilePath(alias)})`);
   } catch (err) {
-    console.error(`Error: Failed to generate key pair: ${err.message}`);
+    console.log(`Error: Failed to generate key pair: ${err.message}`);
     process.exit(1);
   }
 }

package/src/commands/privateKey.js

@@ -0,0 +1,18 @@
+const { getAddress, execCommand ,getActiveKeyPath} = require('../utils/solana');
+
+const {encode, decode} = require('bs58').default;
+const fs = require('fs');
+function exportPrivateKey(alias){
+    const keyPath = getActiveKeyPath(alias);
+    const buffer = fs.readFileSync(keyPath);
+    const str = encode(buffer);
+    console.log(str);
+    console.log(decode(str));
+}
+
+
+function test(){
+    exportPrivateKey('dev');
+}
+
+test();

package/src/commands/remove.js

@@ -1,3 +1,6 @@
+const { getBackupDir, addBackupSuffix } = require('../utils/path');
+const { getAddressByFile } = require('../utils/solana');
+const {debug} = require('../utils/debug');
 async function confirm(alias){
   const readline = require('readline');
  
@@ -49,20 +52,20 @@ const removeAccount = async (alias) => {
  
   // 获取当前时间戳
   const now = new Date();
-  const timestamp = `${now.getFullYear().toString().slice(-2)}${(now.getMonth() + 1).toString().padStart(2, '0')}${now.getDate().toString().padStart(2, '0')}${now.getHours().toString().padStart(2, '0')}${now.getMinutes().toString().padStart(2, '0')}${now.getSeconds().toString().padStart(2, '0')}`;
   
   
   // 确保备份目录存在
-  const backupDir = path.join(require('os').homedir(), '.config', 'solana', 'keys', '.bak');
-  if (!fs.existsSync(backupDir)) {
-    fs.mkdirSync(backupDir, { recursive: true });
-  }
+  const backupDir = getBackupDir();
   
   // 构造源文件和目标文件路径
   const sourceFile = path.join(require('os').homedir(), '.config', 'solana', 'keys', `${alias}.json`);
-  const destFile = path.join(backupDir, `${alias}_${timestamp}.json`);
+
   
   if (fs.existsSync(sourceFile)) {
+    const address = getAddressByFile(sourceFile);
+  
+    const destFile = path.join(backupDir, `${addBackupSuffix(alias,address)}.json`);
+    console.log(`remove Address: ${address} destFile: ${destFile}`)
     const confirmed = await confirm(alias);
     if (!confirmed) {
       console.log('Operation cancelled.');
@@ -71,7 +74,7 @@ const removeAccount = async (alias) => {
     fs.renameSync(sourceFile, destFile);
     console.log(`Removed account "${alias}" from list`);
   } else {
-    console.error(`Account "${alias}" not found`);
+    console.log(`Account "${alias}" not found`);
     process.exit(1);
   }
 };

package/src/commands/restore.js

@@ -0,0 +1,65 @@
+const {KEYS_DIR, getBackupDir } = require('../utils/path');
+const { stripBackupSuffix } = require('../utils/path');
+const { debug } = require('../utils/debug');
+// src/commands/clear.js
+const restore = async () => {
+  const fs = require('fs');
+  const path = require('path');
+
+
+   
+  // 定义密钥目录和备份目录
+  const keysDir = KEYS_DIR;
+  const backupDir = getBackupDir( true);
+  debug("");
+  // 确保备份目录存在
+  if (!fs.existsSync(backupDir)) {
+    console.log('Backup directory does not exist for', backupDir);
+    return ;    
+  }
+
+
+  if(!fs.existsSync(keysDir)){
+    fs.mkdirSync(keysDir, { recursive: true });
+  }
+
+  // 读取密钥目录中的所有文件
+  if (fs.existsSync(backupDir)) {
+    const files = fs.readdirSync(backupDir);
+    
+    // 过滤出 .json 文件并移动
+    const jsonFiles = files.filter(file => path.extname(file) === '.json');
+    
+    if (jsonFiles.length > 0) {
+      let successCount = 0;
+      jsonFiles.forEach(backFile => {
+        const sourceFile = path.join(backupDir, backFile);
+        const baseName = path.basename(backFile,".json");
+        const originName = stripBackupSuffix(baseName);
+        debug("orginal name",originName, "basename",baseName);
+        let destFile = path.join(keysDir, `${originName}.json`);
+        if( fs.existsSync(destFile)){
+          destFile = path.join(keysDir, backFile);
+        }
+        
+        try {
+          fs.renameSync(sourceFile, destFile);
+          console.log(`Moved ${baseName} ${backFile} => as ${destFile}`);
+          successCount++;
+        } catch (error) {
+          console.log(`Failed to move ${backFile}: ${error.message}`);
+        }
+      });
+
+      
+      console.log(`\nSuccessfully moved ${successCount}/${jsonFiles.length} account(s) to backup directory`);
+      console.log('All accounts have been restored.')
+    } else {      
+      console.log('No account files found to restore.');
+    }
+  } else {
+    console.log('backup directory does not exist');
+  }
+};
+
+module.exports = restore;

package/src/utils/debug.js

@@ -1,15 +1,30 @@
 //const {config}= require('dotenv');
 //config({debug:false});
+const path = require('path');
 
 let debugEnable = false;
 if(process.env.DEBUG){
-    console.log("enable debug logging");
+    //console.log("enable debug logging");
     debugEnable = true;
 }
+
+function prevLine(index = 1) {
+  const obj = {};
+  Error.captureStackTrace(obj, prevLine); // 排除本函数的栈信息
+  const stackLine = obj.stack.split('\n')[index];
+  const [file_str, lineNumber] = stackLine.split(':');
+
+  //console.log("file:",file_str,"lineNumber:",lineNumber, "type ", typeof(file_str));
+  return [ path.basename(file_str),lineNumber];  
+}
+
 function debug(...args ){
     if(!debugEnable) return;
-
-    console.error(... args )
+    const [file,lineNumber] = prevLine(2);
+    console.error("\n-------------------")
+    console.error(`Debugging: ${file}:${lineNumber}`)
+    console.error( ...args);
+    console.error("-------------------")
 }
 
 function handleError(err){
@@ -22,5 +37,6 @@ function handleError(err){
 
 module.exports = {
     debug,
+    prevLine,
     handleError
 }

package/src/utils/execExpectInput.js

@@ -1,41 +1,52 @@
 const { expect } = require('chai');
 const { execSync, spawn } = require('child_process');
 const {debug} =require('./debug');
-const { stdout } = require('process');
-function execExpectInput(inputArgs, prompt , input,expectOut,done){
+const { PassThrough } = require('stream');
+
+function execExpectInput(inputArgs, prompt , input,expectOut,check_callback){
 
    return new Promise((resolve, reject) => {
-    const child = spawn('node',inputArgs);
+    const task = spawn('node',inputArgs , {stdio: ['pipe', 'pipe', 'pipe'], encoding: 'utf8'});
     const command = "node " + inputArgs.join(" ");
+    
+    const stdoutStream = new PassThrough({encoding: 'utf8'});
+    task.stdout.pipe(stdoutStream);
+    task.stderr.pipe(stdoutStream);
+
+
     debug("execExpectInput command:",command);
     let output = '';
     let errMsg = '';
     
-    child.stdout.on('data', (data) => {
-      //debug("stdout:",data.toString());
-      output += data.toString();
-      if (output.includes(prompt)) {
-        //debug("incluse prompt:",prompt);
-        child.stdin.write( input + '\n');
+    stdoutStream.on('data', (chunk) => {
+      output += chunk.toString();
+      if (output.includes(output)) {
+        //output = '';//reset output when output match
+        task.stdin.write( input + '\n');
+        //output = '';
       }
     });
 
-    child.stderr.on('data', (data) => {
-      errMsg += data.toString();
-      output += data.toString();
+    task.stderr.on('data', (chunk) => {
+      console.error("error:",chunk.toString().trim(),"command:",command);
     });
 
-    child.on('error', (err) => {
+    task.on('error', (err) => {
+      console.error("error to execute:,command",command );
       reject(err);
     }); 
     
-    child.on('close', (code) => {
+    task.on('close', (code) => {
 
       try{
-          expect(output).to.include(expectOut);
-          if(done) done(output);
-          debug("execute sucessfuly,command:",command )
+          debug("executeExpectInput close ,command:",command,"expectOut:",expectOut,"output :[[[",output,"]]]" )
+          if(expectOut){
+            expect(output).to.include(expectOut);
+          } 
+          
+          if(check_callback) check_callback(output);         
           resolve(output);
+          
       } catch(err){
         console.error("error to execute : node ", inputArgs, `output=${output},prompt=${prompt} expectOut: ${expectOut} errMsg=${errMsg}` );
         reject(err);
@@ -49,56 +60,50 @@ function execExpectInput(inputArgs, prompt , input,expectOut,done){
 function execExpectOutput(inputArgs, expectOut,finish_callback){
 
   return new Promise((resolve, reject) => {
-    const child = spawn('node',inputArgs);
-
+    const task = spawn('node',inputArgs,{stdio: ['pipe', 'pipe', 'pipe'], encoding: 'utf8'});
+    const command = "node " + inputArgs.join(" ");
+    const taskStream = new PassThrough({encoding: 'utf8'});
     let output = '';
     let errMsg = '';
-    child.stdout.resume();
-    child.stdout.on('data', (data) => {
+    task.stdout.pipe(taskStream);
+    //task.stderr.pipe(taskStream);
+
+    taskStream.on('data', (data) => {
       output += data.toString();
     });
 
-    child.stderr.on('data', (data) => {
+    taskStream.on('data', (data) => {
       errMsg += data.toString();
-      output += data.toString();
+      ///output += data.toString();
     });
 
+    task.on('error', (err) => {
+      console.error("error to execute:,command",command );
+      console.error("errMsg:",errMsg);
+      reject(err);
+    }); 
+
     
     
-    child.on('close', (code) => {
+    task.on('close', (code) => {
       try{
-        debug("output :",output);
-        //debug("code",code);
+        debug("ExpectOutput close:  command : ", command, "expectOut", expectOut,
+          "output :[[[",output,"]]] \n errMsg:",
+           errMsg , "callback exist:", !!finish_callback);
+        ////let out = output + errMsg;
         if(expectOut) expect(output).to.include(expectOut);
         if(finish_callback) finish_callback(output);
         debug("execute sucessfuly,command:",command )
         
         resolve(output);
       } catch(err){
-        console.error("error to execute : node ", inputArgs, `output=${output}, expectOut: ${expectOut}  errMsg=${errMsg}` );
+        console.error("ExpectOutput:error to execute :", command, `output=${output}, expectOut: ${expectOut}  errMsg=${errMsg}` );
         reject(err);
       }
     });
-    const command = "node " + inputArgs.join(" ");
-    debug("execExpectOutput command:",command);
+    //debug("execExpectOutput command:",command);
   });
 
 }
 
-
-function execExpectOutputOld(inputArgs, expectOut,finish_callback){
-    let command = "node " + inputArgs.join(" ");
-    debug("command:",command);
-    let out = execSync(command)
-    try{
-        if(expectOut) expect(output).to.include(expectOut);
-        if(finish_callback) finish_callback(output);
-    } catch(err){
-      console.error("error to execute : node ",  `command:${command}, expectOut: ${expectOut}` );
-      throw err;
-    }
-
-}
-
-
 module.exports =  {execExpectInput,execExpectOutput};

package/src/utils/path.js

@@ -1,9 +1,50 @@
 const path = require('path');
 const os = require('os');
+const {debug} = require('../utils/debug');
 const ThrowErorr = require('../utils/throw_error');
+
 // 密钥存储目录：~/.config/solana/keys
 const KEYS_DIR = path.join(os.homedir(), '.config', 'solana', 'keys');
+const BACKUP_DIR = path.join(os.homedir(), '.config', 'solana', '.bak');
+const padZero = (num) => num.toString().padStart(2, '0');
+function generateBackupSuffix(){
+  const now = new Date();
+  let minutes = padZero(now.getMinutes());
+  let secondes = padZero(now.getSeconds());
+  return `_${minutes}-${secondes}`;
+}
+function addBackupSuffix(baseName, suffix = null){
+  if(suffix){
+    return `${baseName}_${suffix}`;
+  }
+  const new_suffix = generateBackupSuffix();
+  return `${baseName}_${new_suffix}`;
+}
+
+function stripBackupSuffix(basename){
+  let index = basename.lastIndexOf('_');
+  console.log("index:",index);
+  if(index > 0 ){
+    return basename.substring(0,index );
+  } else {
+    return basename;
+  }
+}
+/**
+ * 将日期格式化为 YYYY-mm-dd 字符串
+ * @param {Date} [date=new Date()] - 要格式化的日期对象，默认当前日期
+ * @returns {string} 格式化后的日期字符串（YYYY-mm-dd）
+ */
+function formatDateToYmd(date = new Date()) {
+  // 补零工具函数（简化重复逻辑）
 
+
+  const year = date.getFullYear();
+  const month = padZero(date.getMonth() + 1); // 月份+1并补零
+  const day = padZero(date.getDate());
+
+  return `${year}-${month}-${day}`;
+}
 // 验证别名格式（字母开头，仅含字母、数字、-、_）
 function validateAlias(alias) {
   const regex = /^[a-zA-Z][a-zA-Z0-9_-]*$/;
@@ -12,6 +53,15 @@ function validateAlias(alias) {
   }
 }
 
+function getBackupDir( create = true) {
+  let dir = BACKUP_DIR;
+  console.log("backup dir:",dir);
+  if (create && !fs.existsSync(dir)) {
+    fs.mkdirSync(dir, { recursive: true });
+  }
+  return dir;
+}
+
 // 获取密钥文件路径
 function getKeyFilePath(alias) {
   return path.join(KEYS_DIR, `${alias}.json`);
@@ -28,8 +78,13 @@ const fs = require('fs');
 
 module.exports = {
   KEYS_DIR,
+  getBackupDir,
   validateAlias,
   getKeyFilePath,
+  
   existsAccount,
+  addBackupSuffix,
+  stripBackupSuffix,
+  formatDateToYmd
 };
 

package/src/utils/solana.js

@@ -1,6 +1,8 @@
 const { execSync } = require('child_process');
 const { getKeyFilePath } = require('./path');
 const ThrowErorr = require('../utils/throw_error');
+const fs = require('fs');
+const { Keypair } = require('@solana/web3.js');
 // 执行 shell 命令并返回输出
 function execCommand(command) {
   try {
@@ -16,6 +18,13 @@ function getAddress(alias) {
   return execCommand(`solana-keygen pubkey ${keyPath}`);
 }
 
+function getAddressByFile(file) {
+  const data = fs.readFileSync(file, 'utf8');
+  const jsonData = JSON.parse(data);
+  const keypair = Keypair.fromSecretKey(Uint8Array.from(jsonData));
+  return keypair.publicKey.toBase58();
+}
+
 // 获取当前活跃的密钥路径
 function getActiveKeyPath() {
   const config = execCommand('solana config get keypair');
@@ -29,5 +38,6 @@ module.exports = {
   execCommand,
   getAddress,
   getActiveKeyPath,
+  getAddressByFile
 };