gcs-browser-upload-stream - npm Package Compare versions

Comparing version 2.1.23-beta to 2.1.25-beta

dist/FileProcessor.js

@@ -25,8 +25,8 @@ 'use strict';
 var getData = exports.getData = function () {
-  var _ref4 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee4(blob) {
-    return _regenerator2.default.wrap(function _callee4$(_context4) {
+  var _ref3 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee3(blob) {
+    return _regenerator2.default.wrap(function _callee3$(_context3) {
       while (1) {
-        switch (_context4.prev = _context4.next) {
+        switch (_context3.prev = _context3.next) {
           case 0:
-            return _context4.abrupt('return', new _es6Promise.Promise(function (resolve, reject) {
+            return _context3.abrupt('return', new _es6Promise.Promise(function (resolve, reject) {
               var reader = new window.FileReader();
@@ -42,10 +42,10 @@ reader.onload = function () {
           case 'end':
-            return _context4.stop();
+            return _context3.stop();
         }
       }
-    }, _callee4, this);
+    }, _callee3, this);
   }));
 
-  return function getData(_x7) {
-    return _ref4.apply(this, arguments);
+  return function getData(_x4) {
+    return _ref3.apply(this, arguments);
   };
@@ -67,17 +67,4 @@ }();
 
-var _inlineWorker = require('inline-worker');
-
-var _inlineWorker2 = _interopRequireDefault(_inlineWorker);
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var fileSliceWorker = new _inlineWorker2.default(function (self) {
-  self.onmessage = function (e) {
-    var start = e.data.start;
-    var end = e.data.end;
-    var file = e.data.file;
-    self.postMessage(file.slice(start, end));
-  };
-}, {});
-
 var FileProcessor = function () {
@@ -94,35 +81,5 @@ function FileProcessor(file, chunkSize) {
   (0, _createClass3.default)(FileProcessor, [{
-    key: 'sliceFile',
-    value: function () {
-      var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(file, start, end) {
-        return _regenerator2.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                fileSliceWorker.postMessage({ file: file, start: start, end: end }, [file]);
-                (0, _debug2.default)('awaiting slice');
-                return _context.abrupt('return', new _es6Promise.Promise(function (resolve) {
-                  fileSliceWorker.onmessage = function (e) {
-                    return resolve(e.data);
-                  };
-                }));
-
-              case 3:
-              case 'end':
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function sliceFile(_x, _x2, _x3) {
-        return _ref.apply(this, arguments);
-      }
-
-      return sliceFile;
-    }()
-  }, {
     key: 'run',
     value: function () {
-      var _ref2 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee3(fn) {
+      var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee2(fn) {
         var _this = this;
@@ -133,5 +90,5 @@
         var file, chunkSize, totalChunks, spark, processIndex, waitForUnpause;
-        return _regenerator2.default.wrap(function _callee3$(_context3) {
+        return _regenerator2.default.wrap(function _callee2$(_context2) {
           while (1) {
-            switch (_context3.prev = _context3.next) {
+            switch (_context2.prev = _context2.next) {
               case 0:
@@ -149,10 +106,10 @@ file = this.file, chunkSize = this.chunkSize;
                 processIndex = function () {
-                  var _ref3 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee2(index) {
+                  var _ref2 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(index) {
                     var start, section, chunk, checksum, shouldContinue;
-                    return _regenerator2.default.wrap(function _callee2$(_context2) {
+                    return _regenerator2.default.wrap(function _callee$(_context) {
                       while (1) {
-                        switch (_context2.prev = _context2.next) {
+                        switch (_context.prev = _context.next) {
                           case 0:
                             if (!(index === totalChunks || index === endIndex)) {
-                              _context2.next = 3;
+                              _context.next = 3;
                               break;
@@ -162,11 +119,11 @@ }
                             (0, _debug2.default)('File process complete');
-                            return _context2.abrupt('return');
+                            return _context.abrupt('return');
 
                           case 3:
                             if (!_this.paused) {
-                              _context2.next = 6;
+                              _context.next = 6;
                               break;
                             }
 
-                            _context2.next = 6;
+                            _context.next = 6;
                             return waitForUnpause();
@@ -178,16 +135,12 @@
                             console.time('processIndex:file.slice');
-                            _context2.next = 10;
-                            return _this.sliceFile(file, start, start + chunkSize);
+                            section = file.slice(start, start + chunkSize);
 
-                          case 10:
-                            section = _context2.sent;
-
                             console.timeEnd('processIndex:file.slice');
 
                             console.time('processIndex:getData');
-                            _context2.next = 15;
+                            _context.next = 13;
                             return getData(section);
 
-                          case 15:
-                            chunk = _context2.sent;
+                          case 13:
+                            chunk = _context.sent;
 
@@ -201,26 +154,26 @@ console.timeEnd('processIndex:getData');
 
-                            _context2.next = 22;
+                            _context.next = 20;
                             return fn(checksum, index, chunk);
 
-                          case 22:
-                            shouldContinue = _context2.sent;
+                          case 20:
+                            shouldContinue = _context.sent;
 
                             if (!(shouldContinue !== false)) {
-                              _context2.next = 26;
+                              _context.next = 24;
                               break;
                             }
 
-                            _context2.next = 26;
+                            _context.next = 24;
                             return processIndex(index + 1);
 
-                          case 26:
+                          case 24:
                           case 'end':
-                            return _context2.stop();
+                            return _context.stop();
                         }
                       }
-                    }, _callee2, _this);
+                    }, _callee, _this);
                   }));
 
-                  return function processIndex(_x6) {
-                    return _ref3.apply(this, arguments);
+                  return function processIndex(_x3) {
+                    return _ref2.apply(this, arguments);
                   };
@@ -235,3 +188,3 @@ }();
 
-                _context3.next = 11;
+                _context2.next = 11;
                 return processIndex(startIndex);
@@ -241,10 +194,10 @@
               case 'end':
-                return _context3.stop();
+                return _context2.stop();
             }
           }
-        }, _callee3, this);
+        }, _callee2, this);
       }));
 
-      function run(_x4) {
-        return _ref2.apply(this, arguments);
+      function run(_x) {
+        return _ref.apply(this, arguments);
       }
@@ -251,0 +204,0 @@

dist/http.js

@@ -17,3 +17,5 @@ 'use strict';
 var safePut = exports.safePut = function () {
-  var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(url, chunk, options) {
+  var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee() {
+    var res,
+        _args = arguments;
     return _regenerator2.default.wrap(function _callee$(_context) {
@@ -23,26 +25,29 @@ while (1) {
           case 0:
-            return _context.abrupt('return', new Promise(function (resolve, reject) {
-              requestWorker.addEventListener('message', function (e) {
-                if (res.type === 'success') {
-                  var res = e.data;
-                  (0, _debug2.default)('\'PUT\' request response status: ' + res.status);
-                  (0, _debug2.default)('\'PUT\' request response headers: ' + JSON.stringify(res.headers));
-                  (0, _debug2.default)('\'PUT\' request response body: ' + res.data);
-                  resolve(res);
-                } else {
-                  (0, _debug2.default)('\'PUT\' error response status: ' + res.status);
-                  (0, _debug2.default)('\'PUT\' error response headers: ' + JSON.stringify(res.headers));
-                  (0, _debug2.default)('\'PUT\' error response body: ' + res.data);
-                  reject(res);
-                }
-              }, false);
+            _context.prev = 0;
+            _context.next = 3;
+            return _axios2.default.put.apply(null, _args);
 
-              requestWorker.postMessage(Object.extend({
-                type: 'PUT',
-                url: url,
-                data: chunk
-              }, options));
-            }));
+          case 3:
+            res = _context.sent;
 
-          case 1:
+            (0, _debug2.default)('\'PUT\' request response status: ' + res.status);
+            (0, _debug2.default)('\'PUT\' request response headers: ' + JSON.stringify(res.headers));
+            (0, _debug2.default)('\'PUT\' request response body: ' + res.data);
+            return _context.abrupt('return', res);
+
+          case 10:
+            _context.prev = 10;
+            _context.t0 = _context['catch'](0);
+
+            // if (e instanceof Error) {
+            //   console.log(e.response.status, e.response.statusText, e.response.headers)
+            //   throw e
+            // } else {
+            // console.log(e.response.status, e.response.statusText, e.response.headers)
+            (0, _debug2.default)('\'PUT\' error response status: ' + _context.t0.response.status);
+            (0, _debug2.default)('\'PUT\' error response headers: ' + JSON.stringify(_context.t0.response.headers));
+            (0, _debug2.default)('\'PUT\' error response body: ' + _context.t0.response.data);
+            return _context.abrupt('return', _context.t0.response);
+
+          case 16:
           case 'end':
@@ -52,6 +57,6 @@ return _context.stop();
       }
-    }, _callee, this);
+    }, _callee, this, [[0, 10]]);
   }));
 
-  return function safePut(_x, _x2, _x3) {
+  return function safePut() {
     return _ref.apply(this, arguments);
@@ -61,2 +66,6 @@ };
 
+var _axios = require('axios');
+
+var _axios2 = _interopRequireDefault(_axios);
+
 var _debug = require('./debug');
@@ -68,4 +77,6 @@
 
-var requestWorker = new Worker('/media/scripts/workers/request-worker.js'); /* globals Worker */
+// axios.create({
+//   maxRedirects: 0
+// })
 
-// import axios from 'axios'
+_axios2.default.defaults.maxRedirects = 0;

package.json

 {
   "name": "gcs-browser-upload-stream",
-  "version": "2.1.23-beta",
+  "version": "2.1.25-beta",
   "description": "Resumable, chunked uploads to Google Cloud Storage from the browser",
@@ -53,4 +53,3 @@ "main": "dist/index.js",
     "sinon-chai": "^2.8.0",
-    "standard": "^6.0.8",
-    "webworker": "^0.8.4"
+    "standard": "^6.0.8"
   },
@@ -62,3 +61,2 @@ "dependencies": {
     "es6-promise": "^3.1.2",
-    "inline-worker": "^1.1.0",
     "spark-md5": "^2.0.2",
@@ -65,0 +63,0 @@ "uglify-js": "^3.0.20",

New alerts

Environment variable access

Supply chain risk

Package accesses environment variables, which may be a sign of credential stuffing or data theft.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

313856

increased by12.78%

Dependency count

7

decreased by-12.5%

Dev dependency count

29

decreased by-3.33%

Lines of code

8151

increased by15.83%

Worsened metrics

Number of low supply chain risk alerts

5

increased by25%

Dependency changes

• - Removedinline-worker@^1.1.0

• - Removedinline-worker@1.1.0(transitive)