From e3d47e75409199d0e287b6dbb062c03c5b6cc8f5 Mon Sep 17 00:00:00 2001 From: Manuel Vilche Date: Fri, 3 Mar 2023 14:02:57 -0300 Subject: [PATCH] improve stream tests and update dependencies --- lib/getObjectStream.js | 14 +------------- package.json | 8 ++++---- tests/getObjectTestClass.js | 17 ----------------- tests/s3-test.js | 2 +- 4 files changed, 6 insertions(+), 35 deletions(-) diff --git a/lib/getObjectStream.js b/lib/getObjectStream.js index b9361f6..dfb76ed 100644 --- a/lib/getObjectStream.js +++ b/lib/getObjectStream.js @@ -5,16 +5,6 @@ const getObjectWrapper = require('./getObjectWrapper'); module.exports = class S3GetObjectStream { - /** - * Get the parser functions - * - * @readonly - * @memberof S3GetObjectStream - */ - get parsers() { - return []; - } - /** * The buffer size of chunks * @@ -35,9 +25,7 @@ module.exports = class S3GetObjectStream { */ call(params) { - const getObjectStream = !Array.isArray(this.parsers) || !this.parsers.length - ? getObjectWrapper.getObject(params) - : this.parsers.reduce((parsed, [parser, ...parserParams]) => parsed.pipe(parser(...parserParams)), getObjectWrapper.getObject(params)); + const getObjectStream = getObjectWrapper.getObject(params); return Readable.from(this.processChunks(getObjectStream)); } diff --git a/package.json b/package.json index 60e0829..7838ab9 100644 --- a/package.json +++ b/package.json @@ -35,9 +35,9 @@ "test": "tests" }, "dependencies": { - "@aws-sdk/client-s3": "^3.281.0", - "@aws-sdk/lib-storage": "^3.281.0", - "@aws-sdk/s3-presigned-post": "^3.281.0", - "@aws-sdk/s3-request-presigner": "^3.281.0" + "@aws-sdk/client-s3": "^3.282.0", + "@aws-sdk/lib-storage": "^3.282.0", + "@aws-sdk/s3-presigned-post": "^3.282.0", + "@aws-sdk/s3-request-presigner": "^3.282.0" } } diff --git a/tests/getObjectTestClass.js b/tests/getObjectTestClass.js index 8804d44..b231e3c 100644 --- a/tests/getObjectTestClass.js +++ b/tests/getObjectTestClass.js @@ -1,26 +1,9 @@ 'use strict'; -const { Transform } = require('stream'); - const S3GetObjectStream = require('../lib/getObjectStream'); module.exports = class MyGetObjectStream extends S3GetObjectStream { - get parsers() { - return [ - [ - () => { - const parser = new Transform({ objectMode: true }); - // eslint-disable-next-line no-underscore-dangle - parser._transform = function(chunk, encoding, cb) { - cb(null, chunk); - }; - return parser; - } - ] - ]; - } - get bufferSize() { return 1; } diff --git a/tests/s3-test.js b/tests/s3-test.js index a93d0ad..fd139df 100644 --- a/tests/s3-test.js +++ b/tests/s3-test.js @@ -526,7 +526,7 @@ context('GetObjectStream', () => { assert.deepStrictEqual(streamData, streamRows); }); - it.skip('Should process stream chunks with defined parser, process buffer and buffer size', async () => { + it('Should process stream chunks with defined parser, process buffer and buffer size', async () => { const streamRows = ['test-row-1', 'test-row-2']; const testStream = Readable.from(streamRows);