diff --git a/packages/google-cloud-node/package.json b/packages/google-cloud-node/package.json index a7c8a94f5ee..5a006631337 100644 --- a/packages/google-cloud-node/package.json +++ b/packages/google-cloud-node/package.json @@ -45,8 +45,7 @@ "google-gax": "^1.0.0", "protobufjs": "^6.8.6", "pumpify": "^1.5.1", - "stream-events": "^1.0.4", - "through2": "^3.0.0" + "stream-events": "^1.0.4" }, "devDependencies": { "codecov": "^3.0.2", diff --git a/packages/google-cloud-node/src/helpers.js b/packages/google-cloud-node/src/helpers.js index 1b12c9b7f97..00ec9324b68 100644 --- a/packages/google-cloud-node/src/helpers.js +++ b/packages/google-cloud-node/src/helpers.js @@ -19,7 +19,7 @@ const common = require('@google-cloud/common'); const pumpify = require('pumpify'); const streamEvents = require('stream-events'); -const through = require('through2'); +const {PassThrough} = require('stream'); /*! * Return a dictionary-like object with helpers to augment the Speech @@ -94,22 +94,26 @@ module.exports = () => { // Format the user's input. // This entails that the user sends raw audio; it is wrapped in // the appropriate request structure. - through.obj((audioContent, _, next) => { - if (audioContent !== undefined) { - next(null, {audioContent}); - return; - } - - next(); + new PassThrough({ + objectMode: true, + transform: (audioContent, _, next) => { + if (audioContent !== undefined) { + next(null, {audioContent}); + return; + } + next(); + }, }), requestStream, - through.obj((response, enc, next) => { - if (response.error) { - next(new common.util.ApiError(response.error)); - return; - } - - next(null, response); + new PassThrough({ + objectMode: true, + transform: (response, enc, next) => { + if (response.error) { + next(new common.util.ApiError(response.error)); + return; + } + next(null, response); + }, }), ]); }); diff --git a/packages/google-cloud-node/test/gapic-v1.js b/packages/google-cloud-node/test/gapic-v1.js index d0e19517793..554b69e50ea 100644 --- a/packages/google-cloud-node/test/gapic-v1.js +++ b/packages/google-cloud-node/test/gapic-v1.js @@ -15,7 +15,7 @@ 'use strict'; const assert = require('assert'); -const through2 = require('through2'); +const {PassThrough} = require('stream'); const speechModule = require('../src'); @@ -311,13 +311,16 @@ function mockSimpleGrpcMethod(expectedRequest, response, error) { function mockBidiStreamingGrpcMethod(expectedRequest, response, error) { return () => { - const mockStream = through2.obj((chunk, enc, callback) => { - assert.deepStrictEqual(chunk, expectedRequest); - if (error) { - callback(error); - } else { - callback(null, response); - } + const mockStream = new PassThrough({ + objectMode: true, + transform: (chunk, enc, callback) => { + assert.deepStrictEqual(chunk, expectedRequest); + if (error) { + callback(error); + } else { + callback(null, response); + } + }, }); return mockStream; }; diff --git a/packages/google-cloud-node/test/gapic-v1p1beta1.js b/packages/google-cloud-node/test/gapic-v1p1beta1.js index fbccb29ac14..5ad1eef9842 100644 --- a/packages/google-cloud-node/test/gapic-v1p1beta1.js +++ b/packages/google-cloud-node/test/gapic-v1p1beta1.js @@ -15,7 +15,7 @@ 'use strict'; const assert = require('assert'); -const through2 = require('through2'); +const {PassThrough} = require('stream'); const speechModule = require('../src'); @@ -311,13 +311,16 @@ function mockSimpleGrpcMethod(expectedRequest, response, error) { function mockBidiStreamingGrpcMethod(expectedRequest, response, error) { return () => { - const mockStream = through2.obj((chunk, enc, callback) => { - assert.deepStrictEqual(chunk, expectedRequest); - if (error) { - callback(error); - } else { - callback(null, response); - } + const mockStream = new PassThrough({ + objectMode: true, + transform: (chunk, enc, callback) => { + assert.deepStrictEqual(chunk, expectedRequest); + if (error) { + callback(error); + } else { + callback(null, response); + } + }, }); return mockStream; };