Pull in some changes from pull request jonnyreeves#15.

.eslintrc.json

@@ -8,9 +8,14 @@
   "env": {
     "browser": true
   },
+  "globals": {
+    "Uint8Array": false,
+    "TextEncoder": false,
+    "TextDecoder": false
+  },
   "parserOptions": {
     "ecmaVersion": 6,
     "sourceType": "module"
   },
   "root": true
-}
+}

src/util.js

@@ -34,3 +34,13 @@ export const root = rootCandidate;
 
 export const TextEncoder = (typeof root.TextEncoder !== 'undefined') ? root.TextEncoder : textEncoding.TextEncoder;
 export const TextDecoder = (typeof root.TextDecoder !== 'undefined') ? root.TextDecoder : textEncoding.TextDecoder;
+
+export function uint8ArrayFromString(str) {
+  const encoder = new TextEncoder();
+  return encoder.encode(str);
+}
+
+export function stringFromUint8Array(arr) {
+  const decoder = new TextDecoder();
+  return decoder.decode(arr);
+}

test/integ/chunked-request.spec.js

@@ -1,28 +1,7 @@
 import chunkedRequest from '../../src/index';
 import isEqual from 'lodash/isEqual';
 import isObject from 'lodash/isObject';
-
-// NOTE intentionally using different utf8 implementation here than
-// in the lib in order to lower the chance of getting erroneous
-// results in both.
-import defaults from 'lodash';
-import typedArrayPolyfill from 'typedarray';
-import { getStringFromBytes } from 'utf-8';
-/**
- * Root reference for iframes.
- * Taken from https://github.com/visionmedia/superagent/blob/master/lib/client.js
- */
-let rootCandidate;
-if (typeof window !== 'undefined') { // Browser window
-  rootCandidate = window;
-} else if (typeof self !== 'undefined') { // Web Worker
-  rootCandidate = self;
-} else { // Other environments
-  // TODO should we warn here?
-  //console.warn('Using browser-only version of superagent in non-browser environment');
-  rootCandidate = this;
-}
-defaults(rootCandidate, typedArrayPolyfill);
+import { stringFromUint8Array } from '../../src/util';
 
 // These integration tests run through Karma; check `karma.conf.js` for
 // configuration.  Note that the dev-server which provides the `/chunked-response`
@@ -49,6 +28,21 @@ describe('chunked-request', () => {
     });
   });
 
+  it('should supply a Uint8Array to the chunkParser', done => {
+    let actual = false;
+
+    const onComplete = () => {
+      expect(actual).toBe(true);
+      done();
+    };
+
+    chunkedRequest({
+      url: `/chunked-response?numChunks=1&entriesPerChunk=1&delimitLast=1`,
+      chunkParser: bytes => { actual = (bytes instanceof Uint8Array); },
+      onComplete
+    });
+  });
+
   it('should parse utf8 responses', done => {
     const receivedChunks = [];
 
@@ -154,7 +148,7 @@ describe('chunked-request', () => {
       expect(chunkErrors.length).toBe(1, 'one errors caught');
       expect(chunkErrors[0].message).toBe('expected');
 
-      const rawChunkStr = getStringFromBytes(chunkErrors[0].chunkBytes);
+      const rawChunkStr = stringFromUint8Array(chunkErrors[0].chunkBytes);
       expect(rawChunkStr).toBe(`{ "chunk": "#1", "data": "#0" }\n`);
 
       done();