Skip to content

fix for sync writes in older node #188

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.

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

Merged
merged 1 commit into from
Mar 11, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 27 additions & 1 deletion build/files.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,12 @@ const headRegexp = /(^module.exports = \w+;?)/m

, processNextTickImport = [
headRegexp
, '$1\n\n/*<replacement>*/\nvar processNextTick = require(\'process-nextick-args\');\n/*</replacement>*/\n'
, `$1

/*<replacement>*/
var processNextTick = require(\'process-nextick-args\');
/*</replacement>*/
`
]

, processNextTickReplacement = [
Expand All @@ -140,7 +145,26 @@ const headRegexp = /(^module.exports = \w+;?)/m
/^const internalUtil = require\('internal\/util'\);/m
, '\n/*<replacement>*/\nconst internalUtil = {\n deprecate: require(\'util-deprecate\')\n};\n'
+ '/*</replacement>*/\n'
],
isNode10 = [
headRegexp
, `$1

/*<replacement>*/
var asyncWrite = !process.browser && ['v0.10' , 'v0.9.'].indexOf(process.version.slice(0, 5)) > -1 ? setImmediate : processNextTick;
/*</replacement>*/
`
]
, fixSyncWrite = [
/if \(sync\) {\n\s+processNextTick\(afterWrite, stream, state, finished, cb\);\n\s+}/
, `if (sync) {
/*<replacement>*/
asyncWrite(afterWrite, stream, state, finished, cb);
/*</replacement>*/
}

`
]

module.exports['_stream_duplex.js'] = [
requireReplacement
Expand Down Expand Up @@ -208,8 +232,10 @@ module.exports['_stream_writable.js'] = [
, [ /^var assert = require\('assert'\);$/m, '' ]
, requireStreamReplacement
, isBufferReplacement
, isNode10
, processNextTickImport
, processNextTickReplacement
, internalUtilReplacement
, fixSyncWrite

]
12 changes: 9 additions & 3 deletions lib/_stream_writable.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ module.exports = Writable;
var processNextTick = require('process-nextick-args');
/*</replacement>*/

/*<replacement>*/
var asyncWrite = !process.browser && ['v0.10', 'v0.9.'].indexOf(process.version.slice(0, 5)) > -1 ? setImmediate : processNextTick;
/*</replacement>*/

/*<replacement>*/
var Buffer = require('buffer').Buffer;
/*</replacement>*/
Expand Down Expand Up @@ -341,10 +345,12 @@ function onwrite(stream, er) {
}

if (sync) {
processNextTick(afterWrite, stream, state, finished, cb);
/*<replacement>*/
asyncWrite(afterWrite, stream, state, finished, cb);
/*</replacement>*/
} else {
afterWrite(stream, state, finished, cb);
}
afterWrite(stream, state, finished, cb);
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"zuul": "~3.9.0"
},
"scripts": {
"test": "tap test/parallel/*.js",
"test": "tap test/parallel/*.js test/ours/*.js",
"browser": "npm run write-zuul && zuul -- test/browser.js",
"write-zuul": "printf \"ui: tape\nbrowsers:\n - name: $BROWSER_NAME\n version: $BROWSER_VERSION\n\">.zuul.yml"
},
Expand Down
1 change: 1 addition & 0 deletions test/browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ test('streams', function (t) {
require('./browser/test-stream-writable-constructor-set-methods')(t);
require('./browser/test-stream-writable-decoded-encoding')(t);
require('./browser/test-stream-writev')(t);
require('./browser/test-stream-sync-write')(t);
require('./browser/test-stream-pipe-without-listenerCount');
});

Expand Down
39 changes: 39 additions & 0 deletions test/browser/test-stream-sync-write.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
require('../common');
var inherits = require('inherits');
var stream = require('../../');
var WritableStream = stream.Writable;
module.exports = function(t) {
t.test('should bea ble to write sync', function(t) {
var InternalStream = function() {
WritableStream.call(this);
};
inherits(InternalStream, WritableStream);

InternalStream.prototype._write = function(chunk, encoding, callback) {
callback();
};

var internalStream = new InternalStream();



var ExternalStream = function(writable) {
this._writable = writable;
WritableStream.call(this);
};
inherits(ExternalStream, WritableStream);

ExternalStream.prototype._write = function(chunk, encoding, callback) {
this._writable.write(chunk, encoding, callback);
};



var externalStream = new ExternalStream(internalStream);

for (var i = 0; i < 2000; i++) {
externalStream.write(i.toString());
}
t.end();
});
}
36 changes: 36 additions & 0 deletions test/ours/test-stream-sync-write.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
require('../common');
var util = require('util');
var stream = require('../../');
var WritableStream = stream.Writable;


var InternalStream = function() {
WritableStream.call(this);
};
util.inherits(InternalStream, WritableStream);

InternalStream.prototype._write = function(chunk, encoding, callback) {
callback();
};

var internalStream = new InternalStream();



var ExternalStream = function(writable) {
this._writable = writable;
WritableStream.call(this);
};
util.inherits(ExternalStream, WritableStream);

ExternalStream.prototype._write = function(chunk, encoding, callback) {
this._writable.write(chunk, encoding, callback);
};



var externalStream = new ExternalStream(internalStream);

for (var i = 0; i < 2000; i++) {
externalStream.write(i.toString());
}