uglifyjs binary: Make read_whole_file async and don't attempt to read STDIN synchronously.

bin/uglifyjs

@@ -7,6 +7,7 @@ var UglifyJS = require("../tools/node");
 var sys = require("util");
 var optimist = require("optimist");
 var fs = require("fs");
+var async = require("async");
 var acorn;
 var ARGS = optimist
     .usage("$0 input1.js [input2.js ...] [options]\n\
@@ -215,8 +216,12 @@ try {
     }
 }
 
-files.forEach(function(file) {
-    var code = read_whole_file(file);
+async.eachLimit(files, 1, function (file, cb) {
+    read_whole_file(file, function (err, code) {
+        if (err) {
+            sys.error("ERROR: can't read file: " + filename);
+            process.exit(1);
+        }
         if (ARGS.p != null) {
             file = file.replace(/^\/+/, "").split(/\/+/).slice(ARGS.p).join("/");
         }
@@ -241,8 +246,9 @@ files.forEach(function(file) {
                 });
             };
         });
+        cb();
     });
-
+}, function () {
     if (ARGS.acorn || ARGS.spidermonkey) time_it("convert_ast", function(){
         TOPLEVEL = UglifyJS.AST_Node.from_mozilla_ast(TOPLEVEL);
     });
@@ -319,6 +325,7 @@ if (ARGS.stats) {
             }));
         }
     }
+});
 
 /* -----[ functions ]----- */
 
@@ -363,20 +370,18 @@ function getOptions(x, constants) {
     return ret;
 }
 
-function read_whole_file(filename) {
-    try {
+function read_whole_file(filename, cb) {
     if (filename == "-") {
         var chunks = [];
-            do {
-                var chunk = fs.readFileSync("/dev/stdin", "utf8");
+        process.stdin.setEncoding('utf-8');
+        process.stdin.on('data', function (chunk) {
             chunks.push(chunk);
-            } while (chunk.length);
-            return chunks.join("");
-        }
-        return fs.readFileSync(filename, "utf8");
-    } catch(ex) {
-        sys.error("ERROR: can't read file: " + filename);
-        process.exit(1);
+        }).on('end', function () {
+            cb(null, chunks.join(""));
+        });
+        process.openStdin();
+    } else {
+        fs.readFile(filename, "utf-8", cb);
     }
 }
 

package.json

@@ -15,8 +15,9 @@
         "url": "https://github.com/mishoo/UglifyJS2.git"
     }],
     "dependencies": {
+        "async"      : "~0.2.6",
         "source-map" : "~0.1.7",
-        "optimist"   : "~0.3.5"
+        "optimist"   : "~0.3.5",
     },
     "bin": {
         "uglifyjs" : "bin/uglifyjs"