Rewrite rsign

bin/rsign.js

@@ -1,65 +1,95 @@
-#!/usr/bin/node
+#!/usr/bin/env node
 
 var Transaction = require('../src/js/ripple/transaction').Transaction;
 
-var cursor      = 2;
+var argv = process.argv.slice(2);
+
 var verbose;
 var secret;
 var tx_json;
 
-var usage = function () {
+if (~argv.indexOf('-v')){
+  argv.splice(argv.indexOf('-v'));
+  verbose = true;
+}
+
+secret  = argv.shift();
+tx_json = argv.shift();
+
+if (tx_json === '-') {
+  read_input(ready);
+} else {
+  ready();
+}
+
+function read_input(callback) {
+  tx_json = '';
+  process.stdin.on('data', function(data) { tx_json += data; });
+  process.stdin.on('end', callback);
+  process.stdin.resume();
+}
+
+function ready() {
+  var valid_arguments = secret && tx_json;
+
+  if (!valid_arguments) {
+    console.error('Invalid arguments\n');
+    print_usage();
+  } else {
+    var valid_json = true;
+
+    try {
+      tx_json = JSON.parse(tx_json);
+    } catch(exception) {
+      valid_json = false;
+    }
+
+    if (!valid_json) {
+      console.error('Invalid JSON\n');
+      print_usage();
+    } else {
+      sign_transaction();
+    }
+  }
+}
+
+function print_usage() {
   console.log(
-    "Usage: rsign.js <secret> <json>\n"
-    + "  Example: rsign.js ssq55ueDob4yV3kPVnNQLHB6icwpC '{ \"TransactionType\" : \"Payment\", \"Account\" : \"r3P9vH81KBayazSTrQj6S25jW6kDb779Gi\", \"Destination\" : \"r3kmLJN5D28dHuH8vZNUZpMC43pEHpaocV\", \"Amount\" : \"200000000\", \"Fee\" : \"10\", \"Sequence\" : \"1\" }'"
+    'Usage: rsign.js <secret> <json>\n\n',
+    'Example: rsign.js ssq55ueDob4yV3kPVnNQLHB6icwpC',
+    JSON.stringify({
+      TransactionType: 'Payment',
+      Account: 'r3P9vH81KBayazSTrQj6S25jW6kDb779Gi',
+      Destination: 'r3kmLJN5D28dHuH8vZNUZpMC43pEHpaocV',
+      Amount: '200000000',
+      Fee: '10',
+      Sequence: '1'
+    })
     );
 };
 
-if (process.argv.length > cursor && process.argv[cursor] === "-v")
-{
-  verbose = true;
-  cursor++;
-}
+function sign_transaction() {
+  var tx = new Transaction();
 
-if (process.argv.length > cursor)
-{
-  secret = process.argv[cursor++];
-}
+  tx.tx_json = tx_json;
+  tx._secret = secret;
+  tx.complete();
 
-if (process.argv.length > cursor)
-{
-  tx_json = JSON.parse(process.argv[cursor++]);
-}
+  var unsigned_blob = tx.serialize().to_hex();
+  tx.sign();
 
-if (process.argv.length !== cursor || !secret || !tx_json)
-{
-  usage();
-}
-else
-{
-    var tx = new Transaction();
+  if (verbose) {
+    var sim = { };
 
-    tx.tx_json        = tx_json;
-    tx._secret        = secret;
-    tx.complete();
+    sim.tx_blob         = tx.serialize().to_hex();
+    sim.tx_json         = tx.tx_json;
+    sim.tx_signing_hash = tx.signing_hash().to_hex();
+    sim.tx_unsigned     = unsigned_blob;
 
-    var unsigned      = tx.serialize().to_hex();
-    tx.sign();
-
-    if (verbose)
-    {
-      var sim = {};
-
-      sim.tx_blob         = tx.serialize().to_hex();
-      sim.tx_json         = tx.tx_json;
-      sim.tx_signing_hash = tx.signing_hash().to_hex();
-      sim.tx_unsigned     = unsigned;
-
-      console.log(JSON.stringify(sim, undefined, 2));
-    }
-    else
-    {
-      console.log(tx.serialize().to_hex());
-    }
-}
+    console.log(JSON.stringify(sim, null, 2));
+  } else {
+    console.log(tx.serialize().to_hex());
+  }
+};
 
 // vim:sw=2:sts=2:ts=8:et