Skip to content

Commit

Permalink
Remove an unnecessary dependency (#458)
Browse files Browse the repository at this point in the history
  • Loading branch information
jimmywarting committed May 28, 2021
1 parent 1e4e8df commit 3df0ed1
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 14 deletions.
23 changes: 11 additions & 12 deletions browser.js
@@ -1,6 +1,5 @@
'use strict';
const {ReadableWebToNodeStream} = require('readable-web-to-node-stream');
const toBuffer = require('typedarray-to-buffer');
const core = require('./core');

async function fromStream(stream) {
Expand All @@ -11,25 +10,25 @@ async function fromStream(stream) {
}

async function fromBlob(blob) {
const buffer = await convertBlobToBuffer(blob);
return core.fromBuffer(buffer);
const buffer = await blobToArrayBuffer(blob);
return core.fromBuffer(Buffer.from(buffer));
}

/**
Convert Web API File to Node Buffer.
Convert Blobs to ArrayBuffer.
@param {Blob} blob - Web API Blob.
@returns {Promise<Buffer>}
@returns {Promise<ArrayBuffer>}
*/
function convertBlobToBuffer(blob) {
function blobToArrayBuffer(blob) {
if (blob.arrayBuffer) {
return blob.arrayBuffer();
}

// TODO: Remove when stop supporting older environments
return new Promise((resolve, reject) => {
const fileReader = new FileReader();
fileReader.addEventListener('loadend', event => {
let data = event.target.result;
if (data instanceof ArrayBuffer) {
data = toBuffer(new Uint8Array(event.target.result));
}

resolve(data);
resolve(event.target.result);
});

fileReader.addEventListener('error', event => {
Expand Down
3 changes: 1 addition & 2 deletions package.json
Expand Up @@ -197,8 +197,7 @@
"dependencies": {
"readable-web-to-node-stream": "^3.0.0",
"strtok3": "^6.0.3",
"token-types": "^2.0.0",
"typedarray-to-buffer": "^3.1.5"
"token-types": "^2.0.0"
},
"xo": {
"envs": [
Expand Down

0 comments on commit 3df0ed1

Please sign in to comment.