GeezerVison is showing github.com — stream: use Buffer.from when constructor is a Buffer · nodejs/node@ee4fc7d
File tree
Expand file treeCollapse file tree
Open diff view settings
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboardExpand all lines: lib/internal/webstreams/readablestream.js +7Lines changed: 7 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -130,6 +130,8 @@ const { |
130 | 130 | writableStreamDefaultWriterWrite, |
131 | 131 | } = require('internal/webstreams/writablestream'); |
132 | 132 |
|
| 133 | +const { Buffer } = require('buffer'); |
| 134 | + |
133 | 135 | const assert = require('internal/assert'); |
134 | 136 |
|
135 | 137 | const kCancel = Symbol('kCancel'); |
@@ -1846,6 +1848,11 @@ function readableByteStreamControllerConvertPullIntoDescriptor(desc) { |
1846 | 1848 | throw new ERR_INVALID_STATE.RangeError('The buffer size is invalid'); |
1847 | 1849 | assert(!(bytesFilled % elementSize)); |
1848 | 1850 | const transferredBuffer = transferArrayBuffer(buffer); |
| 1851 | + |
| 1852 | + if (ctor === Buffer) { |
| 1853 | + return Buffer.from(transferredBuffer, byteOffset, bytesFilled / elementSize); |
| 1854 | + } |
| 1855 | + |
1849 | 1856 | return new ctor(transferredBuffer, byteOffset, bytesFilled / elementSize); |
1850 | 1857 | } |
1851 | 1858 |
|
|
Collapse file
Copy file name to clipboard +62Lines changed: 62 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
|
| 1 | +'use strict'; |
| 2 | + |
| 3 | +const common = require('../common'); |
| 4 | + |
| 5 | +const { |
| 6 | + open, |
| 7 | +} = require('fs/promises'); |
| 8 | + |
| 9 | +const { |
| 10 | + Buffer, |
| 11 | +} = require('buffer'); |
| 12 | + |
| 13 | +class Source { |
| 14 | + async start(controller) { |
| 15 | + this.file = await open(__filename); |
| 16 | + this.controller = controller; |
| 17 | + } |
| 18 | + |
| 19 | + async pull(controller) { |
| 20 | + const byobRequest = controller.byobRequest; |
| 21 | + const view = byobRequest.view; |
| 22 | + |
| 23 | + const { |
| 24 | + bytesRead, |
| 25 | + } = await this.file.read({ |
| 26 | + buffer: view, |
| 27 | + offset: view.byteOffset, |
| 28 | + length: view.byteLength |
| 29 | + }); |
| 30 | + |
| 31 | + if (bytesRead === 0) { |
| 32 | + await this.file.close(); |
| 33 | + this.controller.close(); |
| 34 | + } |
| 35 | + |
| 36 | + byobRequest.respond(bytesRead); |
| 37 | + } |
| 38 | + |
| 39 | + get type() { return 'bytes'; } |
| 40 | + |
| 41 | + get autoAllocateChunkSize() { return 1024; } |
| 42 | +} |
| 43 | + |
| 44 | +(async () => { |
| 45 | + const source = new Source(); |
| 46 | + const stream = new ReadableStream(source); |
| 47 | + |
| 48 | + const { emitWarning } = process; |
| 49 | + |
| 50 | + process.emitWarning = common.mustNotCall(); |
| 51 | + |
| 52 | + try { |
| 53 | + const reader = stream.getReader({ mode: 'byob' }); |
| 54 | + |
| 55 | + let result; |
| 56 | + do { |
| 57 | + result = await reader.read(Buffer.alloc(100)); |
| 58 | + } while (!result.done); |
| 59 | + } finally { |
| 60 | + process.emitWarning = emitWarning; |
| 61 | + } |
| 62 | +})().then(common.mustCall()); |