pdfjs-dist 2.0.487 → 2.1.266

package/lib/display/fetch_stream.js

@@ -2,7 +2,7 @@
  * @licstart The following is the entire license notice for the
  * Javascript code in this page
  *
- * Copyright 2017 Mozilla Foundation
+ * Copyright 2018 Mozilla Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,32 +19,45 @@
  * @licend The above is the entire license notice for the
  * Javascript code in this page
  */
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.PDFFetchStream = undefined;
+exports.PDFFetchStream = void 0;
 
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
-var _util = require('../shared/util');
+var _util = require("../shared/util");
 
-var _network_utils = require('./network_utils');
+var _network_utils = require("./network_utils");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-function createFetchOptions(headers, withCredentials) {
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+function createFetchOptions(headers, withCredentials, abortController) {
   return {
     method: 'GET',
     headers: headers,
+    signal: abortController && abortController.signal,
     mode: 'cors',
     credentials: withCredentials ? 'include' : 'same-origin',
     redirect: 'follow'
   };
 }
 
-var PDFFetchStream = function () {
+var PDFFetchStream =
+/*#__PURE__*/
+function () {
   function PDFFetchStream(source) {
     _classCallCheck(this, PDFFetchStream);
 
@@ -56,26 +69,30 @@ var PDFFetchStream = function () {
   }
 
   _createClass(PDFFetchStream, [{
-    key: 'getFullReader',
+    key: "getFullReader",
     value: function getFullReader() {
       (0, _util.assert)(!this._fullRequestReader);
       this._fullRequestReader = new PDFFetchStreamReader(this);
       return this._fullRequestReader;
     }
   }, {
-    key: 'getRangeReader',
+    key: "getRangeReader",
     value: function getRangeReader(begin, end) {
       var reader = new PDFFetchStreamRangeReader(this, begin, end);
+
       this._rangeRequestReaders.push(reader);
+
       return reader;
     }
   }, {
-    key: 'cancelAllRequests',
+    key: "cancelAllRequests",
     value: function cancelAllRequests(reason) {
       if (this._fullRequestReader) {
         this._fullRequestReader.cancel(reason);
       }
+
       var readers = this._rangeRequestReaders.slice(0);
+
       readers.forEach(function (reader) {
         reader.cancel(reason);
       });
@@ -85,7 +102,11 @@ var PDFFetchStream = function () {
   return PDFFetchStream;
 }();
 
-var PDFFetchStreamReader = function () {
+exports.PDFFetchStream = PDFFetchStream;
+
+var PDFFetchStreamReader =
+/*#__PURE__*/
+function () {
   function PDFFetchStreamReader(stream) {
     var _this = this;
 
@@ -101,26 +122,39 @@ var PDFFetchStreamReader = function () {
     this._headersCapability = (0, _util.createPromiseCapability)();
     this._disableRange = source.disableRange || false;
     this._rangeChunkSize = source.rangeChunkSize;
+
     if (!this._rangeChunkSize && !this._disableRange) {
       this._disableRange = true;
     }
+
+    if (typeof AbortController !== 'undefined') {
+      this._abortController = new AbortController();
+    }
+
     this._isStreamingSupported = !source.disableStream;
     this._isRangeSupported = !source.disableRange;
     this._headers = new Headers();
+
     for (var property in this._stream.httpHeaders) {
       var value = this._stream.httpHeaders[property];
+
       if (typeof value === 'undefined') {
         continue;
       }
+
       this._headers.append(property, value);
     }
+
     var url = source.url;
-    fetch(url, createFetchOptions(this._headers, this._withCredentials)).then(function (response) {
+    fetch(url, createFetchOptions(this._headers, this._withCredentials, this._abortController)).then(function (response) {
       if (!(0, _network_utils.validateResponseStatus)(response.status)) {
         throw (0, _network_utils.createResponseStatusError)(response.status, url);
       }
+
       _this._reader = response.body.getReader();
+
       _this._headersCapability.resolve();
+
       var getResponseHeader = function getResponseHeader(name) {
         return response.headers.get(name);
       };
@@ -137,6 +171,7 @@ var PDFFetchStreamReader = function () {
       _this._isRangeSupported = allowRangeRequests;
       _this._contentLength = suggestedLength || _this._contentLength;
       _this._filename = (0, _network_utils.extractFilenameFromHeader)(getResponseHeader);
+
       if (!_this._isStreamingSupported && _this._isRangeSupported) {
         _this.cancel(new _util.AbortException('streaming is disabled'));
       }
@@ -145,65 +180,102 @@ var PDFFetchStreamReader = function () {
   }
 
   _createClass(PDFFetchStreamReader, [{
-    key: 'read',
-    value: function read() {
-      var _this2 = this;
-
-      return this._headersCapability.promise.then(function () {
-        return _this2._reader.read().then(function (_ref) {
-          var value = _ref.value,
-              done = _ref.done;
-
-          if (done) {
-            return Promise.resolve({
-              value: value,
-              done: done
-            });
-          }
-          _this2._loaded += value.byteLength;
-          if (_this2.onProgress) {
-            _this2.onProgress({
-              loaded: _this2._loaded,
-              total: _this2._contentLength
-            });
+    key: "read",
+    value: function () {
+      var _read = _asyncToGenerator(
+      /*#__PURE__*/
+      _regenerator.default.mark(function _callee() {
+        var _ref, value, done, buffer;
+
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return this._headersCapability.promise;
+
+              case 2:
+                _context.next = 4;
+                return this._reader.read();
+
+              case 4:
+                _ref = _context.sent;
+                value = _ref.value;
+                done = _ref.done;
+
+                if (!done) {
+                  _context.next = 9;
+                  break;
+                }
+
+                return _context.abrupt("return", {
+                  value: value,
+                  done: done
+                });
+
+              case 9:
+                this._loaded += value.byteLength;
+
+                if (this.onProgress) {
+                  this.onProgress({
+                    loaded: this._loaded,
+                    total: this._contentLength
+                  });
+                }
+
+                buffer = new Uint8Array(value).buffer;
+                return _context.abrupt("return", {
+                  value: buffer,
+                  done: false
+                });
+
+              case 13:
+              case "end":
+                return _context.stop();
+            }
           }
-          var buffer = new Uint8Array(value).buffer;
-          return Promise.resolve({
-            value: buffer,
-            done: false
-          });
-        });
-      });
-    }
+        }, _callee, this);
+      }));
+
+      function read() {
+        return _read.apply(this, arguments);
+      }
+
+      return read;
+    }()
   }, {
-    key: 'cancel',
+    key: "cancel",
     value: function cancel(reason) {
       if (this._reader) {
         this._reader.cancel(reason);
       }
+
+      if (this._abortController) {
+        this._abortController.abort();
+      }
     }
   }, {
-    key: 'headersReady',
+    key: "headersReady",
     get: function get() {
       return this._headersCapability.promise;
     }
   }, {
-    key: 'filename',
+    key: "filename",
     get: function get() {
       return this._filename;
     }
   }, {
-    key: 'contentLength',
+    key: "contentLength",
     get: function get() {
       return this._contentLength;
     }
   }, {
-    key: 'isRangeSupported',
+    key: "isRangeSupported",
     get: function get() {
       return this._isRangeSupported;
     }
   }, {
-    key: 'isStreamingSupported',
+    key: "isStreamingSupported",
     get: function get() {
       return this._isStreamingSupported;
     }
@@ -212,9 +284,11 @@ var PDFFetchStreamReader = function () {
   return PDFFetchStreamReader;
 }();
 
-var PDFFetchStreamRangeReader = function () {
+var PDFFetchStreamRangeReader =
+/*#__PURE__*/
+function () {
   function PDFFetchStreamRangeReader(stream, begin, end) {
-    var _this3 = this;
+    var _this2 = this;
 
     _classCallCheck(this, PDFFetchStreamRangeReader);
 
@@ -225,70 +299,120 @@ var PDFFetchStreamRangeReader = function () {
     this._withCredentials = source.withCredentials;
     this._readCapability = (0, _util.createPromiseCapability)();
     this._isStreamingSupported = !source.disableStream;
+
+    if (typeof AbortController !== 'undefined') {
+      this._abortController = new AbortController();
+    }
+
     this._headers = new Headers();
+
     for (var property in this._stream.httpHeaders) {
       var value = this._stream.httpHeaders[property];
+
       if (typeof value === 'undefined') {
         continue;
       }
+
       this._headers.append(property, value);
     }
+
     var rangeStr = begin + '-' + (end - 1);
+
     this._headers.append('Range', 'bytes=' + rangeStr);
+
     var url = source.url;
-    fetch(url, createFetchOptions(this._headers, this._withCredentials)).then(function (response) {
+    fetch(url, createFetchOptions(this._headers, this._withCredentials, this._abortController)).then(function (response) {
       if (!(0, _network_utils.validateResponseStatus)(response.status)) {
         throw (0, _network_utils.createResponseStatusError)(response.status, url);
       }
-      _this3._readCapability.resolve();
-      _this3._reader = response.body.getReader();
+
+      _this2._readCapability.resolve();
+
+      _this2._reader = response.body.getReader();
     });
     this.onProgress = null;
   }
 
   _createClass(PDFFetchStreamRangeReader, [{
-    key: 'read',
-    value: function read() {
-      var _this4 = this;
-
-      return this._readCapability.promise.then(function () {
-        return _this4._reader.read().then(function (_ref2) {
-          var value = _ref2.value,
-              done = _ref2.done;
-
-          if (done) {
-            return Promise.resolve({
-              value: value,
-              done: done
-            });
-          }
-          _this4._loaded += value.byteLength;
-          if (_this4.onProgress) {
-            _this4.onProgress({ loaded: _this4._loaded });
+    key: "read",
+    value: function () {
+      var _read2 = _asyncToGenerator(
+      /*#__PURE__*/
+      _regenerator.default.mark(function _callee2() {
+        var _ref2, value, done, buffer;
+
+        return _regenerator.default.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _context2.next = 2;
+                return this._readCapability.promise;
+
+              case 2:
+                _context2.next = 4;
+                return this._reader.read();
+
+              case 4:
+                _ref2 = _context2.sent;
+                value = _ref2.value;
+                done = _ref2.done;
+
+                if (!done) {
+                  _context2.next = 9;
+                  break;
+                }
+
+                return _context2.abrupt("return", {
+                  value: value,
+                  done: done
+                });
+
+              case 9:
+                this._loaded += value.byteLength;
+
+                if (this.onProgress) {
+                  this.onProgress({
+                    loaded: this._loaded
+                  });
+                }
+
+                buffer = new Uint8Array(value).buffer;
+                return _context2.abrupt("return", {
+                  value: buffer,
+                  done: false
+                });
+
+              case 13:
+              case "end":
+                return _context2.stop();
+            }
           }
-          var buffer = new Uint8Array(value).buffer;
-          return Promise.resolve({
-            value: buffer,
-            done: false
-          });
-        });
-      });
-    }
+        }, _callee2, this);
+      }));
+
+      function read() {
+        return _read2.apply(this, arguments);
+      }
+
+      return read;
+    }()
   }, {
-    key: 'cancel',
+    key: "cancel",
     value: function cancel(reason) {
       if (this._reader) {
         this._reader.cancel(reason);
       }
+
+      if (this._abortController) {
+        this._abortController.abort();
+      }
     }
   }, {
-    key: 'isStreamingSupported',
+    key: "isStreamingSupported",
     get: function get() {
       return this._isStreamingSupported;
     }
   }]);
 
   return PDFFetchStreamRangeReader;
-}();
-
-exports.PDFFetchStream = PDFFetchStream;
+}();