mirror of https://github.com/lukechilds/node.git
Browse Source
We detect for non-string and non-buffer values in onread and turn the stream into an "objectMode" stream. If we are in "objectMode" mode then howMuchToRead will always return 1, state.length will always have 1 appended to it when there is a new item and fromList always takes the first value from the list. This means that for object streams, the n in read(n) is ignored and read() will always return a single value Fixed a bug with unpipe where the pipe would break because the flowing state was not reset to false. Fixed a bug with sync cb(null, null) in _read which would forget to end the readable streamv0.9.8-release
Raynos
12 years ago
committed by
isaacs
isaacs
9 changed files with 757 additions and 42 deletions
@ -0,0 +1,484 @@ |
|||
// Copyright Joyent, Inc. and other Node contributors.
|
|||
//
|
|||
// Permission is hereby granted, free of charge, to any person obtaining a
|
|||
// copy of this software and associated documentation files (the
|
|||
// "Software"), to deal in the Software without restriction, including
|
|||
// without limitation the rights to use, copy, modify, merge, publish,
|
|||
// distribute, sublicense, and/or sell copies of the Software, and to permit
|
|||
// persons to whom the Software is furnished to do so, subject to the
|
|||
// following conditions:
|
|||
//
|
|||
// The above copyright notice and this permission notice shall be included
|
|||
// in all copies or substantial portions of the Software.
|
|||
//
|
|||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|||
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
|
|||
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
|
|||
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
|
|||
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
|||
// USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
|
|||
|
|||
var common = require('../common.js'); |
|||
var Readable = require('_stream_readable'); |
|||
var Writable = require('_stream_writable'); |
|||
var assert = require('assert'); |
|||
|
|||
// tiny node-tap lookalike.
|
|||
var tests = []; |
|||
var count = 0; |
|||
|
|||
function test(name, fn) { |
|||
count++; |
|||
tests.push([name, fn]); |
|||
} |
|||
|
|||
function run() { |
|||
var next = tests.shift(); |
|||
if (!next) |
|||
return console.error('ok'); |
|||
|
|||
var name = next[0]; |
|||
var fn = next[1]; |
|||
console.log('# %s', name); |
|||
fn({ |
|||
same: assert.deepEqual, |
|||
equal: assert.equal, |
|||
end: function() { |
|||
count--; |
|||
run(); |
|||
} |
|||
}); |
|||
} |
|||
|
|||
// ensure all tests have run
|
|||
process.on('exit', function() { |
|||
assert.equal(count, 0); |
|||
}); |
|||
|
|||
process.nextTick(run); |
|||
|
|||
function toArray(callback) { |
|||
var stream = new Writable(); |
|||
var list = []; |
|||
stream.write = function(chunk) { |
|||
list.push(chunk); |
|||
}; |
|||
|
|||
stream.end = function() { |
|||
callback(list); |
|||
}; |
|||
|
|||
return stream; |
|||
} |
|||
|
|||
function fromArray(list) { |
|||
var r = new Readable(); |
|||
list.forEach(function(chunk) { |
|||
r.push(chunk); |
|||
}); |
|||
r.push(null); |
|||
r._read = noop; |
|||
|
|||
return r; |
|||
} |
|||
|
|||
function noop() {} |
|||
|
|||
test('can read objects from stream', function(t) { |
|||
var r = fromArray([{ one: '1'}, { two: '2' }]); |
|||
|
|||
var v1 = r.read(); |
|||
var v2 = r.read(); |
|||
var v3 = r.read(); |
|||
|
|||
assert.deepEqual(v1, { one: '1' }); |
|||
assert.deepEqual(v2, { two: '2' }); |
|||
assert.deepEqual(v3, null); |
|||
|
|||
t.end(); |
|||
}); |
|||
|
|||
test('can pipe objects into stream', function(t) { |
|||
var r = fromArray([{ one: '1'}, { two: '2' }]); |
|||
|
|||
r.pipe(toArray(function(list) { |
|||
assert.deepEqual(list, [ |
|||
{ one: '1' }, |
|||
{ two: '2' } |
|||
]); |
|||
|
|||
t.end(); |
|||
})); |
|||
}); |
|||
|
|||
test('read(n) is ignored', function(t) { |
|||
var r = fromArray([{ one: '1'}, { two: '2' }]); |
|||
|
|||
var value = r.read(2); |
|||
|
|||
assert.deepEqual(value, { one: '1' }); |
|||
|
|||
t.end(); |
|||
}); |
|||
|
|||
test('can read objects from _read (sync)', function(t) { |
|||
var r = new Readable(); |
|||
var list = [{ one: '1'}, { two: '2' }]; |
|||
r._read = function(n, cb) { |
|||
var item = list.shift(); |
|||
cb(null, item || null); |
|||
}; |
|||
|
|||
r.pipe(toArray(function(list) { |
|||
assert.deepEqual(list, [ |
|||
{ one: '1' }, |
|||
{ two: '2' } |
|||
]); |
|||
|
|||
t.end(); |
|||
})); |
|||
}); |
|||
|
|||
test('can read objects from _read (async)', function(t) { |
|||
var r = new Readable(); |
|||
var list = [{ one: '1'}, { two: '2' }]; |
|||
r._read = function(n, cb) { |
|||
var item = list.shift(); |
|||
process.nextTick(function() { |
|||
cb(null, item || null); |
|||
}); |
|||
}; |
|||
|
|||
r.pipe(toArray(function(list) { |
|||
assert.deepEqual(list, [ |
|||
{ one: '1' }, |
|||
{ two: '2' } |
|||
]); |
|||
|
|||
t.end(); |
|||
})); |
|||
}); |
|||
|
|||
test('can read strings as objects', function(t) { |
|||
var r = new Readable({ |
|||
objectMode: true |
|||
}); |
|||
r._read = noop; |
|||
var list = ['one', 'two', 'three']; |
|||
list.forEach(function(str) { |
|||
r.push(str); |
|||
}); |
|||
r.push(null); |
|||
|
|||
r.pipe(toArray(function(array) { |
|||
assert.deepEqual(array, list); |
|||
|
|||
t.end(); |
|||
})); |
|||
}); |
|||
|
|||
test('read(0) for object streams', function(t) { |
|||
var r = new Readable({ |
|||
objectMode: true |
|||
}); |
|||
r._read = noop; |
|||
|
|||
r.push('foobar'); |
|||
r.push(null); |
|||
|
|||
var v = r.read(0); |
|||
|
|||
r.pipe(toArray(function(array) { |
|||
assert.deepEqual(array, ['foobar']); |
|||
|
|||
t.end(); |
|||
})); |
|||
}); |
|||
|
|||
test('falsey values', function(t) { |
|||
var r = new Readable({ |
|||
objectMode: true |
|||
}); |
|||
r._read = noop; |
|||
|
|||
r.push(false); |
|||
r.push(0); |
|||
r.push(''); |
|||
r.push(null); |
|||
|
|||
r.pipe(toArray(function(array) { |
|||
assert.deepEqual(array, [false, 0, '']); |
|||
|
|||
t.end(); |
|||
})); |
|||
}); |
|||
|
|||
test('low watermark _read', function(t) { |
|||
var r = new Readable({ |
|||
lowWaterMark: 2, |
|||
highWaterMark: 6, |
|||
objectMode: true |
|||
}); |
|||
|
|||
var calls = 0; |
|||
|
|||
r._read = function(n, cb) { |
|||
calls++; |
|||
cb(null, 'foo'); |
|||
}; |
|||
|
|||
// touch to cause it
|
|||
r.read(0); |
|||
|
|||
r.push(null); |
|||
|
|||
r.pipe(toArray(function(list) { |
|||
assert.deepEqual(list, ['foo', 'foo', 'foo']); |
|||
|
|||
t.end(); |
|||
})); |
|||
}); |
|||
|
|||
test('high watermark _read', function(t) { |
|||
var r = new Readable({ |
|||
lowWaterMark: 0, |
|||
highWaterMark: 6, |
|||
objectMode: true |
|||
}); |
|||
var calls = 0; |
|||
var list = ['1', '2', '3', '4', '5', '6', '7', '8']; |
|||
|
|||
r._read = function() { |
|||
calls++; |
|||
}; |
|||
|
|||
list.forEach(function(c) { |
|||
r.push(c); |
|||
}); |
|||
|
|||
var v = r.read(); |
|||
|
|||
assert.equal(calls, 0); |
|||
assert.equal(v, '1'); |
|||
|
|||
var v2 = r.read(); |
|||
|
|||
assert.equal(calls, 1); |
|||
assert.equal(v2, '2'); |
|||
|
|||
t.end(); |
|||
}); |
|||
|
|||
test('high watermark push', function(t) { |
|||
var r = new Readable({ |
|||
highWaterMark: 6, |
|||
objectMode: true |
|||
}); |
|||
r._read = function() {}; |
|||
for (var i = 0; i < 6; i++) { |
|||
var bool = r.push(i); |
|||
assert.equal(bool, i === 5 ? false : true); |
|||
} |
|||
|
|||
t.end(); |
|||
}); |
|||
|
|||
test('low watermark push', function(t) { |
|||
var r = new Readable({ |
|||
lowWaterMark: 2, |
|||
highWaterMark: 4, |
|||
objectMode: true |
|||
}); |
|||
var l = console.log; |
|||
|
|||
var called = 0; |
|||
var reading = false; |
|||
|
|||
r._read = function() { |
|||
called++; |
|||
|
|||
if (reading) { |
|||
assert.equal(r.push(42), false); |
|||
} |
|||
} |
|||
|
|||
assert.equal(called, 0); |
|||
assert.equal(r.push(0), true); |
|||
assert.equal(called, 1); |
|||
assert.equal(r.push(1), true); |
|||
assert.equal(called, 2); |
|||
assert.equal(r.push(2), true); |
|||
assert.equal(called, 2); |
|||
assert.equal(r.push(3), false); |
|||
assert.equal(called, 2); |
|||
assert.equal(r.push(4), false); |
|||
assert.equal(called, 2); |
|||
assert.equal(r.push(5), false); |
|||
assert.equal(called, 2); |
|||
assert.deepEqual(r._readableState.buffer, [0, 1, 2, 3, 4, 5]); |
|||
|
|||
reading = true; |
|||
|
|||
assert.equal(r.read(), 0); |
|||
assert.equal(called, 2); |
|||
assert.equal(r.read(), 1); |
|||
assert.equal(called, 3); |
|||
assert.equal(r.read(), 2); |
|||
assert.equal(called, 4); |
|||
assert.equal(r.read(), 3); |
|||
assert.equal(called, 5); |
|||
assert.equal(r.read(), 4); |
|||
assert.equal(called, 6); |
|||
r.push(null); |
|||
|
|||
r.pipe(toArray(function(array) { |
|||
assert.deepEqual(array, [5, 42, 42, 42, 42]); |
|||
|
|||
t.end(); |
|||
})); |
|||
}); |
|||
|
|||
test('stream of buffers converted to object halfway through', function(t) { |
|||
var r = new Readable(); |
|||
r._read = noop; |
|||
|
|||
r.push(new Buffer('fus')); |
|||
r.push(new Buffer('do')); |
|||
r.push(new Buffer('rah')); |
|||
|
|||
var str = r.read(4); |
|||
|
|||
assert.equal(str, 'fusd'); |
|||
|
|||
r.push({ foo: 'bar' }); |
|||
r.push(null); |
|||
|
|||
r.pipe(toArray(function(list) { |
|||
assert.deepEqual(list, [ |
|||
new Buffer('o'), |
|||
new Buffer('rah'), |
|||
{ foo: 'bar'} |
|||
]); |
|||
|
|||
t.end(); |
|||
})); |
|||
}); |
|||
|
|||
test('stream of strings converted to objects halfway through', function(t) { |
|||
var r = new Readable({ |
|||
encoding: 'utf8' |
|||
}); |
|||
r._read = noop; |
|||
|
|||
r.push('fus'); |
|||
r.push('do'); |
|||
r.push('rah'); |
|||
|
|||
var str = r.read(4); |
|||
|
|||
assert.equal(str, 'fusd'); |
|||
|
|||
r.push({ foo: 'bar' }); |
|||
r.push(null); |
|||
|
|||
r.pipe(toArray(function(list) { |
|||
assert.deepEqual(list, [ |
|||
'o', |
|||
'rah', |
|||
{ foo: 'bar'} |
|||
]); |
|||
|
|||
t.end(); |
|||
})); |
|||
}); |
|||
|
|||
test('can write objects to stream', function(t) { |
|||
var w = new Writable(); |
|||
|
|||
w._write = function(chunk, cb) { |
|||
assert.deepEqual(chunk, { foo: 'bar' }); |
|||
cb(); |
|||
}; |
|||
|
|||
w.on('finish', function() { |
|||
t.end(); |
|||
}); |
|||
|
|||
w.write({ foo: 'bar' }); |
|||
w.end(); |
|||
}); |
|||
|
|||
test('can write multiple objects to stream', function(t) { |
|||
var w = new Writable(); |
|||
var list = []; |
|||
|
|||
w._write = function(chunk, cb) { |
|||
list.push(chunk); |
|||
cb(); |
|||
}; |
|||
|
|||
w.on('finish', function() { |
|||
assert.deepEqual(list, [0, 1, 2, 3, 4]); |
|||
|
|||
t.end(); |
|||
}); |
|||
|
|||
w.write(0); |
|||
w.write(1); |
|||
w.write(2); |
|||
w.write(3); |
|||
w.write(4); |
|||
w.end(); |
|||
}); |
|||
|
|||
test('can write strings as objects', function(t) { |
|||
var w = new Writable({ |
|||
objectMode: true |
|||
}); |
|||
var list = []; |
|||
|
|||
w._write = function(chunk, cb) { |
|||
list.push(chunk); |
|||
process.nextTick(cb); |
|||
}; |
|||
|
|||
w.on('finish', function() { |
|||
assert.deepEqual(list, ['0', '1', '2', '3', '4']); |
|||
|
|||
t.end(); |
|||
}); |
|||
|
|||
w.write('0'); |
|||
w.write('1'); |
|||
w.write('2'); |
|||
w.write('3'); |
|||
w.write('4'); |
|||
w.end(); |
|||
}); |
|||
|
|||
test('buffers finish until cb is called', function(t) { |
|||
var w = new Writable({ |
|||
objectMode: true |
|||
}); |
|||
var called = false; |
|||
|
|||
w._write = function(chunk, cb) { |
|||
assert.equal(chunk, 'foo'); |
|||
|
|||
process.nextTick(function() { |
|||
called = true; |
|||
cb(); |
|||
}); |
|||
}; |
|||
|
|||
w.on('finish', function() { |
|||
assert.equal(called, true); |
|||
|
|||
t.end(); |
|||
}); |
|||
|
|||
w.write('foo'); |
|||
w.end(); |
|||
}); |
|||
Loading…
Reference in new issue