Skip to content

Fix for issue 'unexpected end of input' and updated error handling #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Punie wants to merge 2 commits into
base: master
Choose a base branch
from
+14 −3
Open

Fix for issue 'unexpected end of input' and updated error handling #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e05e9f1
Updated index.js async call for better error handling
Punie Feb 8, 2017
a78d2e1
Updated launch.R to display conditionCall on error as well
Punie Feb 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion R/launch.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ run <- function(dataIn) {

# process and return
if (inherits(captured, "error")) {
call <- conditionCall(captured)
msg <- conditionMessage(captured)
cat("Error in R script", .e$path, "\n", sQuote(msg), file = stderr())
cat("Error in R script", .e$path, "\n", sQuote(call), "\n", sQuote(msg), file = stderr())
return(invisible(F))
}
.e$out$x <- if (is.null(temp)) {
Expand Down
14 changes: 12 additions & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,19 @@ R.prototype.call = function(_opts, _callback) {
var opts = _.isFunction(_opts) ? {} : _opts;
this.options.env.input = JSON.stringify([this.d, this.path, opts]);
var child = child_process.spawn("Rscript", this.args, this.options);
child.stderr.on("data", callback);
var stdout = "";
var stderr = "";
child.stderr.on("data", function(d) {
stderr += d.toString();
});
child.stdout.on("data", function(d) {
callback(null, JSON.parse(d));
stdout += d;
});
child.on("close", function(code) {
callback(
stderr ? stderr : null,
stdout ? JSON.parse(stdout) : {}
);
});
};

Expand Down