Reviewer comments round 2

src/Error.ts

@@ -128,12 +128,12 @@ class StripeConnectionError extends StripeError {}
  * webhook fails
  */
 class StripeSignatureVerificationError extends StripeError {
-  header: string | Buffer;
-  payload: string | Buffer;
+  header: string | Uint8Array;
+  payload: string | Uint8Array;
 
   constructor(
-    header: string | Buffer,
-    payload: string | Buffer,
+    header: string | Uint8Array,
+    payload: string | Uint8Array,
     raw: StripeRawError = {}
   ) {
     super(raw);

src/Webhooks.ts

@@ -80,7 +80,7 @@ const Webhook: WebhookObject = {
 
     const jsonPayload =
       payload instanceof Uint8Array
-        ? JSON.parse(new TextDecoder().decode(payload))
+        ? JSON.parse(new TextDecoder('utf8').decode(payload))
         : JSON.parse(payload);
     return jsonPayload;
   },
@@ -100,10 +100,9 @@ const Webhook: WebhookObject = {
       cryptoProvider
     );
 
-    // @ts-ignore
     const jsonPayload =
       payload instanceof Uint8Array
-        ? JSON.parse(new TextDecoder().decode(payload))
+        ? JSON.parse(new TextDecoder('utf8').decode(payload))
         : JSON.parse(payload);
     return jsonPayload;
   },

test/Webhook.spec.js

@@ -71,8 +71,8 @@ describe('Webhooks', () => {
 
         const textEncoder = new TextEncoder();
         const event = await constructEventFn(
-          new Uint8Array(textEncoder.encode(EVENT_PAYLOAD_STRING)),
-          new Uint8Array(textEncoder.encode(header)),
+          textEncoder.encode(EVENT_PAYLOAD_STRING),
+          textEncoder.encode(header),
           SECRET
         );
 

test/flows.spec.js

@@ -466,6 +466,27 @@ describe('Flows', function() {
       ).to.eventually.have.nested.property('size', 739);
     });
 
+    it('Allows you to upload a file synchronously as a Uint8Array', () => {
+      const testFilename = path.join(__dirname, 'resources/data/minimal.pdf');
+      const buf = fs.readFileSync(testFilename);
+
+      // Create Uint8Array from Buffer
+      const f = new Uint8Array(buf.buffer, buf.byteOffset, buf.length);
+
+      return expect(
+        stripe.files
+          .create({
+            purpose: 'dispute_evidence',
+            file: {
+              data: f,
+              name: 'minimal.pdf',
+              type: 'application/octet-stream',
+            },
+          })
+          .then(null, (error) => error)
+      ).to.eventually.have.nested.property('size', 739);
+    });
+
     it('Surfaces stream errors correctly', (done) => {
       const mockedStream = new stream.Readable();
       mockedStream._read = () => {};

test/utils.spec.js

@@ -563,6 +563,28 @@ describe('utils', () => {
       // whether that's useful is a race between using jest/sinon for these tests and dropping support for node < 14
     });
   });
+
+  describe('concat', () => {
+    it('should return a joined Uint8Array', () => {
+      const arr1 = new Uint8Array([1, 2, 3]);
+      const arr2 = new Uint8Array([4, 5]);
+      const arrs = [arr1, arr2];
+      expect(utils.concat(arrs)).to.eql(new Uint8Array([1, 2, 3, 4, 5]));
+    });
+
+    it('should return an empty Uint8Array given an empty array', () => {
+      expect(utils.concat([])).to.eql(new Uint8Array(0));
+    });
+
+    it('should work with Buffers', () => {
+      const buf1 = Buffer.from('foo');
+      const buf2 = Buffer.from('bar');
+      const mergedBufToString = new TextDecoder('utf8').decode(
+        utils.concat([buf1, buf2])
+      );
+      expect(mergedBufToString).to.equal('foobar');
+    });
+  });
 });
 
 function handleWarnings(doWithShimmedConsoleWarn, onWarn) {