From da25241f7fbb06dffd913958559044d758c54fb8 Mon Sep 17 00:00:00 2001
From: Michel Weststrate <mweststrate@fb.com>
Date: Thu, 7 Nov 2019 08:59:11 -0800
Subject: [PATCH] Fix more Buffer deprecation warnings

Summary: Missed two the previous time

Reviewed By: jknoxville

Differential Revision: D18372147

fbshipit-source-id: 015f1aa93706134a8a1aacffb4812cfb284c5527
---
 patches/adbkit+2.11.1.patch   | 20 +++++++++++++-
 patches/jsonparse+1.3.1.patch | 51 +++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 patches/jsonparse+1.3.1.patch

diff --git a/patches/adbkit+2.11.1.patch b/patches/adbkit+2.11.1.patch
index 822e543cc..6ed26002c 100644
--- a/patches/adbkit+2.11.1.patch
+++ b/patches/adbkit+2.11.1.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/adbkit/lib/adb/parser.js b/node_modules/adbkit/lib/adb/parser.js
-index 1b66bda..295c8f6 100644
+index 1b66bda..c41037d 100644
 --- a/node_modules/adbkit/lib/adb/parser.js
 +++ b/node_modules/adbkit/lib/adb/parser.js
 @@ -52,7 +52,7 @@ Parser = (function() {
@@ -11,6 +11,24 @@ index 1b66bda..295c8f6 100644
      resolver = Promise.defer();
      tryRead = (function(_this) {
        return function() {
+@@ -108,7 +108,7 @@ Parser = (function() {
+             return resolver.reject(new Parser.PrematureEOFError(howMany));
+           }
+         } else {
+-          return resolver.resolve(new Buffer(0));
++          return resolver.resolve(Buffer.alloc(0));
+         }
+       };
+     })(this);
+@@ -196,7 +196,7 @@ Parser = (function() {
+ 
+   Parser.prototype.readUntil = function(code) {
+     var read, skipped;
+-    skipped = new Buffer(0);
++    skipped = Buffer.alloc(0);
+     read = (function(_this) {
+       return function() {
+         return _this.readBytes(1).then(function(chunk) {
 diff --git a/node_modules/adbkit/lib/adb/protocol.js b/node_modules/adbkit/lib/adb/protocol.js
 index d1377d0..2edd7ba 100644
 --- a/node_modules/adbkit/lib/adb/protocol.js
diff --git a/patches/jsonparse+1.3.1.patch b/patches/jsonparse+1.3.1.patch
new file mode 100644
index 000000000..7a1479edb
--- /dev/null
+++ b/patches/jsonparse+1.3.1.patch
@@ -0,0 +1,51 @@
+diff --git a/node_modules/jsonparse/jsonparse.js b/node_modules/jsonparse/jsonparse.js
+index 3991060..83f1458 100644
+--- a/node_modules/jsonparse/jsonparse.js
++++ b/node_modules/jsonparse/jsonparse.js
+@@ -56,7 +56,7 @@ function Parser() {
+   this.value = undefined;
+ 
+   this.string = undefined; // string data
+-  this.stringBuffer = Buffer.alloc ? Buffer.alloc(STRING_BUFFER_SIZE) : new Buffer(STRING_BUFFER_SIZE);
++  this.stringBuffer = Buffer.alloc(STRING_BUFFER_SIZE);
+   this.stringBufferOffset = 0;
+   this.unicode = undefined; // unicode escapes
+   this.highSurrogate = undefined;
+@@ -67,7 +67,7 @@ function Parser() {
+   this.state = VALUE;
+   this.bytes_remaining = 0; // number of bytes remaining in multi byte utf8 char to read after split boundary
+   this.bytes_in_sequence = 0; // bytes in multi byte utf8 char to read
+-  this.temp_buffs = { "2": new Buffer(2), "3": new Buffer(3), "4": new Buffer(4) }; // for rebuilding chars split before boundary is reached
++  this.temp_buffs = { "2": Buffer.alloc(2), "3": Buffer.alloc(3), "4": Buffer.alloc(4) }; // for rebuilding chars split before boundary is reached
+ 
+   // Stream offset
+   this.offset = -1;
+@@ -125,7 +125,7 @@ proto.appendStringBuf = function (buf, start, end) {
+   this.stringBufferOffset += size;
+ };
+ proto.write = function (buffer) {
+-  if (typeof buffer === "string") buffer = new Buffer(buffer);
++  if (typeof buffer === "string") buffer = Buffer.from(buffer);
+   var n;
+   for (var i = 0, l = buffer.length; i < l; i++) {
+     if (this.tState === START){
+@@ -221,16 +221,16 @@ proto.write = function (buffer) {
+           var intVal = parseInt(this.unicode, 16);
+           this.unicode = undefined;
+           if (this.highSurrogate !== undefined && intVal >= 0xDC00 && intVal < (0xDFFF + 1)) { //<56320,57343> - lowSurrogate
+-            this.appendStringBuf(new Buffer(String.fromCharCode(this.highSurrogate, intVal)));
++            this.appendStringBuf(Buffer.from(String.fromCharCode(this.highSurrogate, intVal)));
+             this.highSurrogate = undefined;
+           } else if (this.highSurrogate === undefined && intVal >= 0xD800 && intVal < (0xDBFF + 1)) { //<55296,56319> - highSurrogate
+             this.highSurrogate = intVal;
+           } else {
+             if (this.highSurrogate !== undefined) {
+-              this.appendStringBuf(new Buffer(String.fromCharCode(this.highSurrogate)));
++              this.appendStringBuf(Buffer.from(String.fromCharCode(this.highSurrogate)));
+               this.highSurrogate = undefined;
+             }
+-            this.appendStringBuf(new Buffer(String.fromCharCode(intVal)));
++            this.appendStringBuf(Buffer.from(String.fromCharCode(intVal)));
+           }
+           this.tState = STRING1;
+         }