pdfjs-dist 2.0.943 → 2.4.456

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 2018 Mozilla Foundation
+ * Copyright 2020 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,44 +19,46 @@
  * @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 _regenerator = require('babel-runtime/regenerator');
+var _util = require("../shared/util.js");
 
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-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 _util = require('../shared/util');
-
-var _network_utils = require('./network_utils');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+var _network_utils = require("./network_utils.js");
 
 function createFetchOptions(headers, withCredentials, abortController) {
   return {
-    method: 'GET',
-    headers: headers,
+    method: "GET",
+    headers,
     signal: abortController && abortController.signal,
-    mode: 'cors',
-    credentials: withCredentials ? 'include' : 'same-origin',
-    redirect: 'follow'
+    mode: "cors",
+    credentials: withCredentials ? "include" : "same-origin",
+    redirect: "follow"
   };
 }
 
-var PDFFetchStream = function () {
-  function PDFFetchStream(source) {
-    _classCallCheck(this, PDFFetchStream);
+function createHeaders(httpHeaders) {
+  const headers = new Headers();
+
+  for (const property in httpHeaders) {
+    const value = httpHeaders[property];
+
+    if (typeof value === "undefined") {
+      continue;
+    }
+
+    headers.append(property, value);
+  }
+
+  return headers;
+}
 
+class PDFFetchStream {
+  constructor(source) {
     this.source = source;
     this.isHttp = /^https?:/i.test(source.url);
     this.httpHeaders = this.isHttp && source.httpHeaders || {};
@@ -64,310 +66,236 @@ var PDFFetchStream = function () {
     this._rangeRequestReaders = [];
   }
 
-  _createClass(PDFFetchStream, [{
-    key: 'getFullReader',
-    value: function getFullReader() {
-      (0, _util.assert)(!this._fullRequestReader);
-      this._fullRequestReader = new PDFFetchStreamReader(this);
-      return this._fullRequestReader;
-    }
-  }, {
-    key: 'getRangeReader',
-    value: function getRangeReader(begin, end) {
-      var reader = new PDFFetchStreamRangeReader(this, begin, end);
-      this._rangeRequestReaders.push(reader);
-      return reader;
+  get _progressiveDataLength() {
+    return this._fullRequestReader ? this._fullRequestReader._loaded : 0;
+  }
+
+  getFullReader() {
+    (0, _util.assert)(!this._fullRequestReader);
+    this._fullRequestReader = new PDFFetchStreamReader(this);
+    return this._fullRequestReader;
+  }
+
+  getRangeReader(begin, end) {
+    if (end <= this._progressiveDataLength) {
+      return null;
     }
-  }, {
-    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);
-      });
+
+    const reader = new PDFFetchStreamRangeReader(this, begin, end);
+
+    this._rangeRequestReaders.push(reader);
+
+    return reader;
+  }
+
+  cancelAllRequests(reason) {
+    if (this._fullRequestReader) {
+      this._fullRequestReader.cancel(reason);
     }
-  }]);
 
-  return PDFFetchStream;
-}();
+    const readers = this._rangeRequestReaders.slice(0);
 
-var PDFFetchStreamReader = function () {
-  function PDFFetchStreamReader(stream) {
-    var _this = this;
+    readers.forEach(function (reader) {
+      reader.cancel(reason);
+    });
+  }
 
-    _classCallCheck(this, PDFFetchStreamReader);
+}
 
+exports.PDFFetchStream = PDFFetchStream;
+
+class PDFFetchStreamReader {
+  constructor(stream) {
     this._stream = stream;
     this._reader = null;
     this._loaded = 0;
     this._filename = null;
-    var source = stream.source;
-    this._withCredentials = source.withCredentials;
+    const source = stream.source;
+    this._withCredentials = source.withCredentials || false;
     this._contentLength = source.length;
     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') {
+
+    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, this._abortController)).then(function (response) {
+    this._headers = createHeaders(this._stream.httpHeaders);
+    const url = source.url;
+    fetch(url, createFetchOptions(this._headers, this._withCredentials, this._abortController)).then(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) {
+
+      this._reader = response.body.getReader();
+
+      this._headersCapability.resolve();
+
+      const getResponseHeader = name => {
         return response.headers.get(name);
       };
 
-      var _validateRangeRequest = (0, _network_utils.validateRangeRequestCapabilities)({
-        getResponseHeader: getResponseHeader,
-        isHttp: _this._stream.isHttp,
-        rangeChunkSize: _this._rangeChunkSize,
-        disableRange: _this._disableRange
-      }),
-          allowRangeRequests = _validateRangeRequest.allowRangeRequests,
-          suggestedLength = _validateRangeRequest.suggestedLength;
-
-      _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'));
+      const {
+        allowRangeRequests,
+        suggestedLength
+      } = (0, _network_utils.validateRangeRequestCapabilities)({
+        getResponseHeader,
+        isHttp: this._stream.isHttp,
+        rangeChunkSize: this._rangeChunkSize,
+        disableRange: this._disableRange
+      });
+      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."));
       }
     }).catch(this._headersCapability.reject);
     this.onProgress = null;
   }
 
-  _createClass(PDFFetchStreamReader, [{
-    key: 'read',
-    value: function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee() {
-        var _ref2, value, done, buffer;
-
-        return _regenerator2.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:
-                _ref2 = _context.sent;
-                value = _ref2.value;
-                done = _ref2.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();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function read() {
-        return _ref.apply(this, arguments);
-      }
+  get headersReady() {
+    return this._headersCapability.promise;
+  }
 
-      return read;
-    }()
-  }, {
-    key: 'cancel',
-    value: function cancel(reason) {
-      if (this._reader) {
-        this._reader.cancel(reason);
-      }
-      if (this._abortController) {
-        this._abortController.abort();
-      }
-    }
-  }, {
-    key: 'headersReady',
-    get: function get() {
-      return this._headersCapability.promise;
-    }
-  }, {
-    key: 'filename',
-    get: function get() {
-      return this._filename;
-    }
-  }, {
-    key: 'contentLength',
-    get: function get() {
-      return this._contentLength;
-    }
-  }, {
-    key: 'isRangeSupported',
-    get: function get() {
-      return this._isRangeSupported;
+  get filename() {
+    return this._filename;
+  }
+
+  get contentLength() {
+    return this._contentLength;
+  }
+
+  get isRangeSupported() {
+    return this._isRangeSupported;
+  }
+
+  get isStreamingSupported() {
+    return this._isStreamingSupported;
+  }
+
+  async read() {
+    await this._headersCapability.promise;
+    const {
+      value,
+      done
+    } = await this._reader.read();
+
+    if (done) {
+      return {
+        value,
+        done
+      };
     }
-  }, {
-    key: 'isStreamingSupported',
-    get: function get() {
-      return this._isStreamingSupported;
+
+    this._loaded += value.byteLength;
+
+    if (this.onProgress) {
+      this.onProgress({
+        loaded: this._loaded,
+        total: this._contentLength
+      });
     }
-  }]);
 
-  return PDFFetchStreamReader;
-}();
+    const buffer = new Uint8Array(value).buffer;
+    return {
+      value: buffer,
+      done: false
+    };
+  }
 
-var PDFFetchStreamRangeReader = function () {
-  function PDFFetchStreamRangeReader(stream, begin, end) {
-    var _this2 = this;
+  cancel(reason) {
+    if (this._reader) {
+      this._reader.cancel(reason);
+    }
 
-    _classCallCheck(this, PDFFetchStreamRangeReader);
+    if (this._abortController) {
+      this._abortController.abort();
+    }
+  }
 
+}
+
+class PDFFetchStreamRangeReader {
+  constructor(stream, begin, end) {
     this._stream = stream;
     this._reader = null;
     this._loaded = 0;
-    var source = stream.source;
-    this._withCredentials = source.withCredentials;
+    const source = stream.source;
+    this._withCredentials = source.withCredentials || false;
     this._readCapability = (0, _util.createPromiseCapability)();
     this._isStreamingSupported = !source.disableStream;
-    if (typeof AbortController !== 'undefined') {
+
+    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, this._abortController)).then(function (response) {
+
+    this._headers = createHeaders(this._stream.httpHeaders);
+
+    this._headers.append("Range", `bytes=${begin}-${end - 1}`);
+
+    const url = source.url;
+    fetch(url, createFetchOptions(this._headers, this._withCredentials, this._abortController)).then(response => {
       if (!(0, _network_utils.validateResponseStatus)(response.status)) {
         throw (0, _network_utils.createResponseStatusError)(response.status, url);
       }
-      _this2._readCapability.resolve();
-      _this2._reader = response.body.getReader();
+
+      this._readCapability.resolve();
+
+      this._reader = response.body.getReader();
     });
     this.onProgress = null;
   }
 
-  _createClass(PDFFetchStreamRangeReader, [{
-    key: 'read',
-    value: function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
-        var _ref4, value, done, buffer;
-
-        return _regenerator2.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:
-                _ref4 = _context2.sent;
-                value = _ref4.value;
-                done = _ref4.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();
-            }
-          }
-        }, _callee2, this);
-      }));
-
-      function read() {
-        return _ref3.apply(this, arguments);
-      }
+  get isStreamingSupported() {
+    return this._isStreamingSupported;
+  }
 
-      return read;
-    }()
-  }, {
-    key: 'cancel',
-    value: function cancel(reason) {
-      if (this._reader) {
-        this._reader.cancel(reason);
-      }
-      if (this._abortController) {
-        this._abortController.abort();
-      }
+  async read() {
+    await this._readCapability.promise;
+    const {
+      value,
+      done
+    } = await this._reader.read();
+
+    if (done) {
+      return {
+        value,
+        done
+      };
+    }
+
+    this._loaded += value.byteLength;
+
+    if (this.onProgress) {
+      this.onProgress({
+        loaded: this._loaded
+      });
     }
-  }, {
-    key: 'isStreamingSupported',
-    get: function get() {
-      return this._isStreamingSupported;
+
+    const buffer = new Uint8Array(value).buffer;
+    return {
+      value: buffer,
+      done: false
+    };
+  }
+
+  cancel(reason) {
+    if (this._reader) {
+      this._reader.cancel(reason);
     }
-  }]);
 
-  return PDFFetchStreamRangeReader;
-}();
+    if (this._abortController) {
+      this._abortController.abort();
+    }
+  }
 
-exports.PDFFetchStream = PDFFetchStream;
+}