Skip to content

Commit 4bd2199

Browse files
authored
Fixed issue where buffer.from was not working on some versions of node. (#90)
1 parent e1ccf91 commit 4bd2199

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

packages/packages/google-gax/lib/longrunning.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ Operation.prototype.startPolling_ = function() {
270270
var maxDelay = this.backoffSettings.maxRetryDelayMillis;
271271
var delay = this.backoffSettings.initialRetryDelayMillis;
272272
var deadline = now.getTime() + this.backoffSettings.totalTimeoutMillis;
273-
var previousMetadataBytes = Buffer.from ? Buffer.from("") : new Buffer("");
273+
var previousMetadataBytes;
274274
if (this.currentOperation.metadata) {
275275
previousMetadataBytes = this.currentOperation.metadata.value;
276276
}
@@ -297,7 +297,8 @@ Operation.prototype.startPolling_ = function() {
297297
}
298298

299299
if (!result) {
300-
if (!rawResponse.metadata.value.equals(previousMetadataBytes)) {
300+
if (rawResponse.metadata && (!previousMetadataBytes ||
301+
!rawResponse.metadata.value.equals(previousMetadataBytes))) {
301302
nextTick(emit, 'progress', metadata, rawResponse);
302303
previousMetadataBytes = rawResponse.metadata.value;
303304
}

packages/packages/google-gax/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "google-gax",
3-
"version": "0.10.4",
3+
"version": "0.10.5",
44
"description": "Google API Extensions",
55
"main": "index.js",
66
"files": [

packages/packages/google-gax/test/api_callable.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -827,10 +827,13 @@ describe('streaming', function() {
827827

828828
describe('longrunning', function() {
829829
function createBuffer(str) {
830-
if (Buffer.from) {
831-
return Buffer.from(str);
830+
var buffer;
831+
try {
832+
buffer = Buffer.from(str);
833+
} catch (_) {
834+
buffer = new Buffer(str);
832835
}
833-
return new Buffer(str);
836+
return buffer;
834837
}
835838

836839
var RESPONSE_VAL = 'response';

0 commit comments

Comments
 (0)