Merge pull request #3 from electricbookworks/log-progress

Implement logging, copied from bengler/node-prince #7

Author: arthurattwell

prince-api.js

@@ -126,7 +126,9 @@ var princeOptions = {
     "raster-background":        true,
     "raster-threads":           true,
     "scanfonts":                false,
-    "control":                  false
+    "control":                  false,
+    "structured-log":           false,
+    "debug":                    false
 };
 
 /*  API constructor  */
@@ -149,6 +151,9 @@ function Prince (options) {
         output:    ""
     };
 
+    /* array for holding event handlers */
+    this.eventHandlers = {stdout: [], stderr: []};
+
     /*  override defaults with more reasonable information about environment  */
     var install = [
         { basedir: "prince/lib/prince",                     binary: "bin/prince"      },
@@ -273,6 +278,30 @@ Prince.prototype.option = function (name, value, forced) {
     return this;
 };
 
+/*  register event handlers  */
+Prince.prototype.on = function (eventName, fn) {
+    if (!this.eventHandlers.hasOwnProperty(eventName)) {
+        throw new Error("Unknown event name. Event must be one of '"
+            + Object.keys(this.eventHandlers).join("', '") + "'");
+    }
+    var alreadyAdded = this.eventHandlers[eventName].indexOf(fn) > -1
+    if (!alreadyAdded) {
+        this.eventHandlers[eventName].push(fn);
+    }
+    return this;
+};
+
+/*  unregister event handlers  */
+Prince.prototype.off = function (eventName, fn) {
+    if (!this.eventHandlers.hasOwnProperty(eventName)) {
+        throw new Error("Unknown event name. Event must be one of '"
+            + Object.keys(this.eventHandlers).join("', '") + "'");
+    }
+    var index = this.eventHandlers[eventName].indexOf(fn)
+    this.eventHandlers[eventName].splice(index, 1)
+    return this;
+};
+
 /*  execute the CLI binary  */
 Prince.prototype._execute = function (method, args) {
     /*  determine path to prince(1) binary  */
@@ -302,17 +331,45 @@ Prince.prototype._execute = function (method, args) {
             options.maxBuffer = self.config.maxbuffer;
             options.cwd       = self.config.cwd;
             options.encoding  = "buffer";
-            child_process.execFile(prog, args, options,
-                function (error, stdout, stderr) {
-                    var m;
-                    if (error === null && (m = stderr.toString().match(/prince:\s+error:\s+([^\n]+)/)))
-                        reject({ error: m[1], stdout: stdout, stderr: stderr });
-                    else if (error !== null)
-                        reject({ error: error, stdout: stdout, stderr: stderr });
-                    else
-                        resolve({ stdout: stdout, stderr: stderr });
+            var _stdout = "";
+            var _stderr = "";
+            var princeProcess = child_process.spawn(prog, args, options);
+
+            function callLineByLine(eventName, fn, data) {
+                (""+data).split("\n").map(function(line) {
+                    var stillRegistered = self.eventHandlers[eventName].indexOf(fn) > -1;
+                    if (line && stillRegistered) {
+                        fn(line, self);
+                    }
+                })
+            };
+
+            princeProcess.stdout.on("data", function(data) {
+                self.eventHandlers.stdout.map(function(fn) {
+                    callLineByLine("stdout", fn, data);
+                })
+                _stdout += data;
+            });
+
+            princeProcess.stderr.on("data", function(data) {
+                self.eventHandlers.stderr.map(function(fn) {
+                    callLineByLine("stderr", fn, data);
+                });
+                _stderr += data;
+            });
+
+            princeProcess.on("error", function(err) {
+                reject({ error: err, stdout: _stdout, stderr: _stderr });
+            });
+
+            princeProcess.on("close", function(code) {
+                if (code !== 0) {
+                    var error = new Error("Prince process exited with status code: "+code);
+                    error.code = code;
+                    return reject({ error: error, stdout: _stdout, stderr: _stderr });
                 }
-            );
+                resolve({ stdout: _stdout, stderr: _stderr });
+            });
         }
         catch (exception) {
             reject({ error: exception, stdout: "", stderr: "" });