Skip to content
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

Jump to bottom

fixed todo related to properly halting the stream on execute Handler #98

Merged
merged 1 commit into from
Dec 18, 2017
Merged

fixed todo related to properly halting the stream on execute Handler #98

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 4 additions & 23 deletions gremlin-client/src/executeHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,10 @@
import highland from 'highland';
import _ from 'lodash';

function defaultExecuteHandler(messageStream, callback) {
let errored = false;
let objectMode = false;

const defaultExecuteHandler = (messageStream, callback) =>
highland(messageStream)
.stopOnError(err => {
// TODO: this does not seem to halt the stream properly, and make
// the callback being fired twice. We need to get rid of the ugly
// errored variable check.
errored = true;
callback(err);
})
.map(({ result: { data } }) => {
objectMode = !_.isArray(data);

return data;
})
.map(({ result: { data } }) => data)
.sequence()
.toArray(results => {
if (!errored) {
callback(null, objectMode ? results[0] : results);
}
});
}
.collect()
.toCallback(callback);

export default defaultExecuteHandler;