Browse Source

PDF.js version 2.0.133 - See mozilla/pdf.js@edaf4b3173607cf19664ab764e5be0742b51c5a4

master v2.0.133
pdfjsbot 8 years ago
parent
commit
19b58186f0
  1. 2
      bower.json
  2. 89
      build/pdf.combined.js
  3. 2
      build/pdf.combined.js.map
  4. 87
      build/pdf.js
  5. 2
      build/pdf.js.map
  6. 2
      build/pdf.min.js
  7. 6
      build/pdf.worker.js
  8. 2
      build/pdf.worker.js.map
  9. 2
      build/pdf.worker.min.js
  10. 2
      lib/core/worker.js
  11. 13
      lib/display/api.js
  12. 31
      lib/display/fetch_stream.js
  13. 4
      lib/display/global.js
  14. 12
      lib/display/network.js
  15. 23
      lib/display/node_stream.js
  16. 4
      lib/pdf.js
  17. 4
      lib/pdf.worker.js
  18. 12
      lib/test/unit/network_spec.js
  19. 16
      lib/test/unit/node_stream_spec.js
  20. 2
      package.json

2
bower.json

@ -1,6 +1,6 @@
{ {
"name": "pdfjs-dist", "name": "pdfjs-dist",
"version": "2.0.131", "version": "2.0.133",
"main": [ "main": [
"build/pdf.js", "build/pdf.js",
"build/pdf.worker.js" "build/pdf.worker.js"

89
build/pdf.combined.js

@ -11590,10 +11590,7 @@ function getDocument(src) {
if (rangeTransport) { if (rangeTransport) {
networkStream = new _transport_stream.PDFDataTransportStream(params, rangeTransport); networkStream = new _transport_stream.PDFDataTransportStream(params, rangeTransport);
} else if (!params.data) { } else if (!params.data) {
networkStream = new PDFNetworkStream({ networkStream = new PDFNetworkStream(params);
source: params,
disableRange: (0, _dom_utils.getDefaultSetting)('disableRange')
});
} }
var messageHandler = new _util.MessageHandler(docId, workerId, worker.port); var messageHandler = new _util.MessageHandler(docId, workerId, worker.port);
messageHandler.postMessageTransfers = worker.postMessageTransfers; messageHandler.postMessageTransfers = worker.postMessageTransfers;
@ -11608,10 +11605,10 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
if (worker.destroyed) { if (worker.destroyed) {
return Promise.reject(new Error('Worker was destroyed')); return Promise.reject(new Error('Worker was destroyed'));
} }
var apiVersion = '2.0.131'; var apiVersion = '2.0.133';
source.disableRange = (0, _dom_utils.getDefaultSetting)('disableRange');
source.disableAutoFetch = (0, _dom_utils.getDefaultSetting)('disableAutoFetch'); source.disableAutoFetch = (0, _dom_utils.getDefaultSetting)('disableAutoFetch');
source.disableStream = (0, _dom_utils.getDefaultSetting)('disableStream'); source.disableStream = (0, _dom_utils.getDefaultSetting)('disableStream');
source.chunkedViewerLoading = !!pdfDataRangeTransport;
if (pdfDataRangeTransport) { if (pdfDataRangeTransport) {
source.length = pdfDataRangeTransport.length; source.length = pdfDataRangeTransport.length;
source.initialData = pdfDataRangeTransport.initialData; source.initialData = pdfDataRangeTransport.initialData;
@ -12884,8 +12881,8 @@ var InternalRenderTask = function InternalRenderTaskClosure() {
}(); }();
var version, build; var version, build;
{ {
exports.version = version = '2.0.131'; exports.version = version = '2.0.133';
exports.build = build = 'f5fb87f0'; exports.build = build = 'edaf4b31';
} }
exports.getDocument = getDocument; exports.getDocument = getDocument;
exports.LoopbackPort = LoopbackPort; exports.LoopbackPort = LoopbackPort;
@ -26885,8 +26882,8 @@ exports.SVGGraphics = SVGGraphics;
"use strict"; "use strict";
var pdfjsVersion = '2.0.131'; var pdfjsVersion = '2.0.133';
var pdfjsBuild = 'f5fb87f0'; var pdfjsBuild = 'edaf4b31';
var pdfjsSharedUtil = __w_pdfjs_require__(0); var pdfjsSharedUtil = __w_pdfjs_require__(0);
var pdfjsDisplayGlobal = __w_pdfjs_require__(130); var pdfjsDisplayGlobal = __w_pdfjs_require__(130);
var pdfjsDisplayAPI = __w_pdfjs_require__(65); var pdfjsDisplayAPI = __w_pdfjs_require__(65);
@ -32461,8 +32458,8 @@ if (!_global_scope2.default.PDFJS) {
} }
var PDFJS = _global_scope2.default.PDFJS; var PDFJS = _global_scope2.default.PDFJS;
{ {
PDFJS.version = '2.0.131'; PDFJS.version = '2.0.133';
PDFJS.build = 'f5fb87f0'; PDFJS.build = 'edaf4b31';
} }
PDFJS.pdfBug = false; PDFJS.pdfBug = false;
if (PDFJS.verbosity !== undefined) { if (PDFJS.verbosity !== undefined) {
@ -35391,7 +35388,7 @@ var WorkerMessageHandler = {
var cancelXHRs = null; var cancelXHRs = null;
var WorkerTasks = []; var WorkerTasks = [];
var apiVersion = docParams.apiVersion; var apiVersion = docParams.apiVersion;
var workerVersion = '2.0.131'; var workerVersion = '2.0.133';
if (apiVersion !== null && apiVersion !== workerVersion) { if (apiVersion !== null && apiVersion !== workerVersion) {
throw new Error('The API version "' + apiVersion + '" does not match ' + ('the Worker version "' + workerVersion + '".')); throw new Error('The API version "' + apiVersion + '" does not match ' + ('the Worker version "' + workerVersion + '".'));
} }
@ -52480,15 +52477,14 @@ var https = require('https');
var url = require('url'); var url = require('url');
var PDFNodeStream = function () { var PDFNodeStream = function () {
function PDFNodeStream(options) { function PDFNodeStream(source) {
_classCallCheck(this, PDFNodeStream); _classCallCheck(this, PDFNodeStream);
this.options = options; this.source = source;
this.source = options.source; this.url = url.parse(source.url);
this.url = url.parse(this.source.url);
this.isHttp = this.url.protocol === 'http:' || this.url.protocol === 'https:'; this.isHttp = this.url.protocol === 'http:' || this.url.protocol === 'https:';
this.isFsUrl = this.url.protocol === 'file:' || !this.url.host; this.isFsUrl = this.url.protocol === 'file:' || !this.url.host;
this.httpHeaders = this.isHttp && this.source.httpHeaders || {}; this.httpHeaders = this.isHttp && source.httpHeaders || {};
this._fullRequest = null; this._fullRequest = null;
this._rangeRequestReaders = []; this._rangeRequestReaders = [];
} }
@ -52532,15 +52528,16 @@ var BaseFullReader = function () {
this._errored = false; this._errored = false;
this._reason = null; this._reason = null;
this.onProgress = null; this.onProgress = null;
this._contentLength = stream.source.length; var source = stream.source;
this._contentLength = source.length;
this._loaded = 0; this._loaded = 0;
this._disableRange = stream.options.disableRange || false; this._disableRange = source.disableRange || false;
this._rangeChunkSize = stream.source.rangeChunkSize; this._rangeChunkSize = source.rangeChunkSize;
if (!this._rangeChunkSize && !this._disableRange) { if (!this._rangeChunkSize && !this._disableRange) {
this._disableRange = true; this._disableRange = true;
} }
this._isStreamingSupported = !stream.source.disableStream; this._isStreamingSupported = !source.disableStream;
this._isRangeSupported = !stream.options.disableRange; this._isRangeSupported = !source.disableRange;
this._readableStream = null; this._readableStream = null;
this._readCapability = (0, _util.createPromiseCapability)(); this._readCapability = (0, _util.createPromiseCapability)();
this._headersCapability = (0, _util.createPromiseCapability)(); this._headersCapability = (0, _util.createPromiseCapability)();
@ -52657,7 +52654,8 @@ var BaseRangeReader = function () {
this._loaded = 0; this._loaded = 0;
this._readableStream = null; this._readableStream = null;
this._readCapability = (0, _util.createPromiseCapability)(); this._readCapability = (0, _util.createPromiseCapability)();
this._isStreamingSupported = !stream.source.disableStream; var source = stream.source;
this._isStreamingSupported = !source.disableStream;
} }
_createClass(BaseRangeReader, [{ _createClass(BaseRangeReader, [{
@ -52911,13 +52909,12 @@ function createFetchOptions(headers, withCredentials) {
} }
var PDFFetchStream = function () { var PDFFetchStream = function () {
function PDFFetchStream(options) { function PDFFetchStream(source) {
_classCallCheck(this, PDFFetchStream); _classCallCheck(this, PDFFetchStream);
this.options = options; this.source = source;
this.source = options.source; this.isHttp = /^https?:/i.test(source.url);
this.isHttp = /^https?:/i.test(this.source.url); this.httpHeaders = this.isHttp && source.httpHeaders || {};
this.httpHeaders = this.isHttp && this.source.httpHeaders || {};
this._fullRequestReader = null; this._fullRequestReader = null;
this._rangeRequestReaders = []; this._rangeRequestReaders = [];
} }
@ -52961,16 +52958,17 @@ var PDFFetchStreamReader = function () {
this._stream = stream; this._stream = stream;
this._reader = null; this._reader = null;
this._loaded = 0; this._loaded = 0;
this._withCredentials = stream.source.withCredentials; var source = stream.source;
this._contentLength = this._stream.source.length; this._withCredentials = source.withCredentials;
this._contentLength = source.length;
this._headersCapability = (0, _util.createPromiseCapability)(); this._headersCapability = (0, _util.createPromiseCapability)();
this._disableRange = this._stream.options.disableRange; this._disableRange = source.disableRange;
this._rangeChunkSize = this._stream.source.rangeChunkSize; this._rangeChunkSize = source.rangeChunkSize;
if (!this._rangeChunkSize && !this._disableRange) { if (!this._rangeChunkSize && !this._disableRange) {
this._disableRange = true; this._disableRange = true;
} }
this._isRangeSupported = !this._stream.options.disableRange; this._isRangeSupported = !source.disableRange;
this._isStreamingSupported = !this._stream.source.disableStream; this._isStreamingSupported = !source.disableStream;
this._headers = new Headers(); this._headers = new Headers();
for (var property in this._stream.httpHeaders) { for (var property in this._stream.httpHeaders) {
var value = this._stream.httpHeaders[property]; var value = this._stream.httpHeaders[property];
@ -52979,7 +52977,7 @@ var PDFFetchStreamReader = function () {
} }
this._headers.append(property, value); this._headers.append(property, value);
} }
var url = this._stream.source.url; var url = source.url;
fetch(url, createFetchOptions(this._headers, this._withCredentials)).then(function (response) { fetch(url, createFetchOptions(this._headers, this._withCredentials)).then(function (response) {
if (!(0, _network_utils.validateResponseStatus)(response.status)) { if (!(0, _network_utils.validateResponseStatus)(response.status)) {
throw (0, _network_utils.createResponseStatusError)(response.status, url); throw (0, _network_utils.createResponseStatusError)(response.status, url);
@ -53079,9 +53077,10 @@ var PDFFetchStreamRangeReader = function () {
this._stream = stream; this._stream = stream;
this._reader = null; this._reader = null;
this._loaded = 0; this._loaded = 0;
this._withCredentials = stream.source.withCredentials; var source = stream.source;
this._withCredentials = source.withCredentials;
this._readCapability = (0, _util.createPromiseCapability)(); this._readCapability = (0, _util.createPromiseCapability)();
this._isStreamingSupported = !stream.source.disableStream; this._isStreamingSupported = !source.disableStream;
this._headers = new Headers(); this._headers = new Headers();
for (var property in this._stream.httpHeaders) { for (var property in this._stream.httpHeaders) {
var value = this._stream.httpHeaders[property]; var value = this._stream.httpHeaders[property];
@ -53092,7 +53091,7 @@ var PDFFetchStreamRangeReader = function () {
} }
var rangeStr = begin + '-' + (end - 1); var rangeStr = begin + '-' + (end - 1);
this._headers.append('Range', 'bytes=' + rangeStr); this._headers.append('Range', 'bytes=' + rangeStr);
var url = this._stream.source.url; var url = source.url;
fetch(url, createFetchOptions(this._headers, this._withCredentials)).then(function (response) { fetch(url, createFetchOptions(this._headers, this._withCredentials)).then(function (response) {
if (!(0, _network_utils.validateResponseStatus)(response.status)) { if (!(0, _network_utils.validateResponseStatus)(response.status)) {
throw (0, _network_utils.createResponseStatusError)(response.status, url); throw (0, _network_utils.createResponseStatusError)(response.status, url);
@ -53357,9 +53356,8 @@ NetworkManager.prototype = {
xhr.abort(); xhr.abort();
} }
}; };
function PDFNetworkStream(options) { function PDFNetworkStream(source) {
this._options = options; this._source = source;
var source = options.source;
this._manager = new NetworkManager(source.url, { this._manager = new NetworkManager(source.url, {
httpHeaders: source.httpHeaders, httpHeaders: source.httpHeaders,
withCredentials: source.withCredentials withCredentials: source.withCredentials
@ -53377,7 +53375,7 @@ PDFNetworkStream.prototype = {
}, },
getFullReader: function PDFNetworkStream_getFullReader() { getFullReader: function PDFNetworkStream_getFullReader() {
(0, _util.assert)(!this._fullRequestReader); (0, _util.assert)(!this._fullRequestReader);
this._fullRequestReader = new PDFNetworkStreamFullRequestReader(this._manager, this._options); this._fullRequestReader = new PDFNetworkStreamFullRequestReader(this._manager, this._source);
return this._fullRequestReader; return this._fullRequestReader;
}, },
getRangeReader: function PDFNetworkStream_getRangeReader(begin, end) { getRangeReader: function PDFNetworkStream_getRangeReader(begin, end) {
@ -53396,9 +53394,8 @@ PDFNetworkStream.prototype = {
}); });
} }
}; };
function PDFNetworkStreamFullRequestReader(manager, options) { function PDFNetworkStreamFullRequestReader(manager, source) {
this._manager = manager; this._manager = manager;
var source = options.source;
var args = { var args = {
onHeadersReceived: this._onHeadersReceived.bind(this), onHeadersReceived: this._onHeadersReceived.bind(this),
onProgressiveData: source.disableStream ? null : this._onProgressiveData.bind(this), onProgressiveData: source.disableStream ? null : this._onProgressiveData.bind(this),
@ -53409,7 +53406,7 @@ function PDFNetworkStreamFullRequestReader(manager, options) {
this._url = source.url; this._url = source.url;
this._fullRequestId = manager.requestFull(args); this._fullRequestId = manager.requestFull(args);
this._headersReceivedCapability = (0, _util.createPromiseCapability)(); this._headersReceivedCapability = (0, _util.createPromiseCapability)();
this._disableRange = options.disableRange || false; this._disableRange = source.disableRange || false;
this._contentLength = source.length; this._contentLength = source.length;
this._rangeChunkSize = source.rangeChunkSize; this._rangeChunkSize = source.rangeChunkSize;
if (!this._rangeChunkSize && !this._disableRange) { if (!this._rangeChunkSize && !this._disableRange) {

2
build/pdf.combined.js.map

File diff suppressed because one or more lines are too long

87
build/pdf.js

@ -3273,10 +3273,7 @@ function getDocument(src) {
if (rangeTransport) { if (rangeTransport) {
networkStream = new _transport_stream.PDFDataTransportStream(params, rangeTransport); networkStream = new _transport_stream.PDFDataTransportStream(params, rangeTransport);
} else if (!params.data) { } else if (!params.data) {
networkStream = new PDFNetworkStream({ networkStream = new PDFNetworkStream(params);
source: params,
disableRange: (0, _dom_utils.getDefaultSetting)('disableRange')
});
} }
var messageHandler = new _util.MessageHandler(docId, workerId, worker.port); var messageHandler = new _util.MessageHandler(docId, workerId, worker.port);
messageHandler.postMessageTransfers = worker.postMessageTransfers; messageHandler.postMessageTransfers = worker.postMessageTransfers;
@ -3291,10 +3288,10 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
if (worker.destroyed) { if (worker.destroyed) {
return Promise.reject(new Error('Worker was destroyed')); return Promise.reject(new Error('Worker was destroyed'));
} }
var apiVersion = '2.0.131'; var apiVersion = '2.0.133';
source.disableRange = (0, _dom_utils.getDefaultSetting)('disableRange');
source.disableAutoFetch = (0, _dom_utils.getDefaultSetting)('disableAutoFetch'); source.disableAutoFetch = (0, _dom_utils.getDefaultSetting)('disableAutoFetch');
source.disableStream = (0, _dom_utils.getDefaultSetting)('disableStream'); source.disableStream = (0, _dom_utils.getDefaultSetting)('disableStream');
source.chunkedViewerLoading = !!pdfDataRangeTransport;
if (pdfDataRangeTransport) { if (pdfDataRangeTransport) {
source.length = pdfDataRangeTransport.length; source.length = pdfDataRangeTransport.length;
source.initialData = pdfDataRangeTransport.initialData; source.initialData = pdfDataRangeTransport.initialData;
@ -4654,8 +4651,8 @@ var InternalRenderTask = function InternalRenderTaskClosure() {
}(); }();
var version, build; var version, build;
{ {
exports.version = version = '2.0.131'; exports.version = version = '2.0.133';
exports.build = build = 'f5fb87f0'; exports.build = build = 'edaf4b31';
} }
exports.getDocument = getDocument; exports.getDocument = getDocument;
exports.LoopbackPort = LoopbackPort; exports.LoopbackPort = LoopbackPort;
@ -7730,8 +7727,8 @@ exports.SVGGraphics = SVGGraphics;
"use strict"; "use strict";
var pdfjsVersion = '2.0.131'; var pdfjsVersion = '2.0.133';
var pdfjsBuild = 'f5fb87f0'; var pdfjsBuild = 'edaf4b31';
var pdfjsSharedUtil = __w_pdfjs_require__(0); var pdfjsSharedUtil = __w_pdfjs_require__(0);
var pdfjsDisplayGlobal = __w_pdfjs_require__(113); var pdfjsDisplayGlobal = __w_pdfjs_require__(113);
var pdfjsDisplayAPI = __w_pdfjs_require__(57); var pdfjsDisplayAPI = __w_pdfjs_require__(57);
@ -13306,8 +13303,8 @@ if (!_global_scope2.default.PDFJS) {
} }
var PDFJS = _global_scope2.default.PDFJS; var PDFJS = _global_scope2.default.PDFJS;
{ {
PDFJS.version = '2.0.131'; PDFJS.version = '2.0.133';
PDFJS.build = 'f5fb87f0'; PDFJS.build = 'edaf4b31';
} }
PDFJS.pdfBug = false; PDFJS.pdfBug = false;
if (PDFJS.verbosity !== undefined) { if (PDFJS.verbosity !== undefined) {
@ -16065,15 +16062,14 @@ var https = require('https');
var url = require('url'); var url = require('url');
var PDFNodeStream = function () { var PDFNodeStream = function () {
function PDFNodeStream(options) { function PDFNodeStream(source) {
_classCallCheck(this, PDFNodeStream); _classCallCheck(this, PDFNodeStream);
this.options = options; this.source = source;
this.source = options.source; this.url = url.parse(source.url);
this.url = url.parse(this.source.url);
this.isHttp = this.url.protocol === 'http:' || this.url.protocol === 'https:'; this.isHttp = this.url.protocol === 'http:' || this.url.protocol === 'https:';
this.isFsUrl = this.url.protocol === 'file:' || !this.url.host; this.isFsUrl = this.url.protocol === 'file:' || !this.url.host;
this.httpHeaders = this.isHttp && this.source.httpHeaders || {}; this.httpHeaders = this.isHttp && source.httpHeaders || {};
this._fullRequest = null; this._fullRequest = null;
this._rangeRequestReaders = []; this._rangeRequestReaders = [];
} }
@ -16117,15 +16113,16 @@ var BaseFullReader = function () {
this._errored = false; this._errored = false;
this._reason = null; this._reason = null;
this.onProgress = null; this.onProgress = null;
this._contentLength = stream.source.length; var source = stream.source;
this._contentLength = source.length;
this._loaded = 0; this._loaded = 0;
this._disableRange = stream.options.disableRange || false; this._disableRange = source.disableRange || false;
this._rangeChunkSize = stream.source.rangeChunkSize; this._rangeChunkSize = source.rangeChunkSize;
if (!this._rangeChunkSize && !this._disableRange) { if (!this._rangeChunkSize && !this._disableRange) {
this._disableRange = true; this._disableRange = true;
} }
this._isStreamingSupported = !stream.source.disableStream; this._isStreamingSupported = !source.disableStream;
this._isRangeSupported = !stream.options.disableRange; this._isRangeSupported = !source.disableRange;
this._readableStream = null; this._readableStream = null;
this._readCapability = (0, _util.createPromiseCapability)(); this._readCapability = (0, _util.createPromiseCapability)();
this._headersCapability = (0, _util.createPromiseCapability)(); this._headersCapability = (0, _util.createPromiseCapability)();
@ -16242,7 +16239,8 @@ var BaseRangeReader = function () {
this._loaded = 0; this._loaded = 0;
this._readableStream = null; this._readableStream = null;
this._readCapability = (0, _util.createPromiseCapability)(); this._readCapability = (0, _util.createPromiseCapability)();
this._isStreamingSupported = !stream.source.disableStream; var source = stream.source;
this._isStreamingSupported = !source.disableStream;
} }
_createClass(BaseRangeReader, [{ _createClass(BaseRangeReader, [{
@ -16496,13 +16494,12 @@ function createFetchOptions(headers, withCredentials) {
} }
var PDFFetchStream = function () { var PDFFetchStream = function () {
function PDFFetchStream(options) { function PDFFetchStream(source) {
_classCallCheck(this, PDFFetchStream); _classCallCheck(this, PDFFetchStream);
this.options = options; this.source = source;
this.source = options.source; this.isHttp = /^https?:/i.test(source.url);
this.isHttp = /^https?:/i.test(this.source.url); this.httpHeaders = this.isHttp && source.httpHeaders || {};
this.httpHeaders = this.isHttp && this.source.httpHeaders || {};
this._fullRequestReader = null; this._fullRequestReader = null;
this._rangeRequestReaders = []; this._rangeRequestReaders = [];
} }
@ -16546,16 +16543,17 @@ var PDFFetchStreamReader = function () {
this._stream = stream; this._stream = stream;
this._reader = null; this._reader = null;
this._loaded = 0; this._loaded = 0;
this._withCredentials = stream.source.withCredentials; var source = stream.source;
this._contentLength = this._stream.source.length; this._withCredentials = source.withCredentials;
this._contentLength = source.length;
this._headersCapability = (0, _util.createPromiseCapability)(); this._headersCapability = (0, _util.createPromiseCapability)();
this._disableRange = this._stream.options.disableRange; this._disableRange = source.disableRange;
this._rangeChunkSize = this._stream.source.rangeChunkSize; this._rangeChunkSize = source.rangeChunkSize;
if (!this._rangeChunkSize && !this._disableRange) { if (!this._rangeChunkSize && !this._disableRange) {
this._disableRange = true; this._disableRange = true;
} }
this._isRangeSupported = !this._stream.options.disableRange; this._isRangeSupported = !source.disableRange;
this._isStreamingSupported = !this._stream.source.disableStream; this._isStreamingSupported = !source.disableStream;
this._headers = new Headers(); this._headers = new Headers();
for (var property in this._stream.httpHeaders) { for (var property in this._stream.httpHeaders) {
var value = this._stream.httpHeaders[property]; var value = this._stream.httpHeaders[property];
@ -16564,7 +16562,7 @@ var PDFFetchStreamReader = function () {
} }
this._headers.append(property, value); this._headers.append(property, value);
} }
var url = this._stream.source.url; var url = source.url;
fetch(url, createFetchOptions(this._headers, this._withCredentials)).then(function (response) { fetch(url, createFetchOptions(this._headers, this._withCredentials)).then(function (response) {
if (!(0, _network_utils.validateResponseStatus)(response.status)) { if (!(0, _network_utils.validateResponseStatus)(response.status)) {
throw (0, _network_utils.createResponseStatusError)(response.status, url); throw (0, _network_utils.createResponseStatusError)(response.status, url);
@ -16664,9 +16662,10 @@ var PDFFetchStreamRangeReader = function () {
this._stream = stream; this._stream = stream;
this._reader = null; this._reader = null;
this._loaded = 0; this._loaded = 0;
this._withCredentials = stream.source.withCredentials; var source = stream.source;
this._withCredentials = source.withCredentials;
this._readCapability = (0, _util.createPromiseCapability)(); this._readCapability = (0, _util.createPromiseCapability)();
this._isStreamingSupported = !stream.source.disableStream; this._isStreamingSupported = !source.disableStream;
this._headers = new Headers(); this._headers = new Headers();
for (var property in this._stream.httpHeaders) { for (var property in this._stream.httpHeaders) {
var value = this._stream.httpHeaders[property]; var value = this._stream.httpHeaders[property];
@ -16677,7 +16676,7 @@ var PDFFetchStreamRangeReader = function () {
} }
var rangeStr = begin + '-' + (end - 1); var rangeStr = begin + '-' + (end - 1);
this._headers.append('Range', 'bytes=' + rangeStr); this._headers.append('Range', 'bytes=' + rangeStr);
var url = this._stream.source.url; var url = source.url;
fetch(url, createFetchOptions(this._headers, this._withCredentials)).then(function (response) { fetch(url, createFetchOptions(this._headers, this._withCredentials)).then(function (response) {
if (!(0, _network_utils.validateResponseStatus)(response.status)) { if (!(0, _network_utils.validateResponseStatus)(response.status)) {
throw (0, _network_utils.createResponseStatusError)(response.status, url); throw (0, _network_utils.createResponseStatusError)(response.status, url);
@ -16942,9 +16941,8 @@ NetworkManager.prototype = {
xhr.abort(); xhr.abort();
} }
}; };
function PDFNetworkStream(options) { function PDFNetworkStream(source) {
this._options = options; this._source = source;
var source = options.source;
this._manager = new NetworkManager(source.url, { this._manager = new NetworkManager(source.url, {
httpHeaders: source.httpHeaders, httpHeaders: source.httpHeaders,
withCredentials: source.withCredentials withCredentials: source.withCredentials
@ -16962,7 +16960,7 @@ PDFNetworkStream.prototype = {
}, },
getFullReader: function PDFNetworkStream_getFullReader() { getFullReader: function PDFNetworkStream_getFullReader() {
(0, _util.assert)(!this._fullRequestReader); (0, _util.assert)(!this._fullRequestReader);
this._fullRequestReader = new PDFNetworkStreamFullRequestReader(this._manager, this._options); this._fullRequestReader = new PDFNetworkStreamFullRequestReader(this._manager, this._source);
return this._fullRequestReader; return this._fullRequestReader;
}, },
getRangeReader: function PDFNetworkStream_getRangeReader(begin, end) { getRangeReader: function PDFNetworkStream_getRangeReader(begin, end) {
@ -16981,9 +16979,8 @@ PDFNetworkStream.prototype = {
}); });
} }
}; };
function PDFNetworkStreamFullRequestReader(manager, options) { function PDFNetworkStreamFullRequestReader(manager, source) {
this._manager = manager; this._manager = manager;
var source = options.source;
var args = { var args = {
onHeadersReceived: this._onHeadersReceived.bind(this), onHeadersReceived: this._onHeadersReceived.bind(this),
onProgressiveData: source.disableStream ? null : this._onProgressiveData.bind(this), onProgressiveData: source.disableStream ? null : this._onProgressiveData.bind(this),
@ -16994,7 +16991,7 @@ function PDFNetworkStreamFullRequestReader(manager, options) {
this._url = source.url; this._url = source.url;
this._fullRequestId = manager.requestFull(args); this._fullRequestId = manager.requestFull(args);
this._headersReceivedCapability = (0, _util.createPromiseCapability)(); this._headersReceivedCapability = (0, _util.createPromiseCapability)();
this._disableRange = options.disableRange || false; this._disableRange = source.disableRange || false;
this._contentLength = source.length; this._contentLength = source.length;
this._rangeChunkSize = source.rangeChunkSize; this._rangeChunkSize = source.rangeChunkSize;
if (!this._rangeChunkSize && !this._disableRange) { if (!this._rangeChunkSize && !this._disableRange) {

2
build/pdf.js.map

File diff suppressed because one or more lines are too long

2
build/pdf.min.js vendored

File diff suppressed because one or more lines are too long

6
build/pdf.worker.js vendored

@ -21883,8 +21883,8 @@ exports.PostScriptCompiler = PostScriptCompiler;
"use strict"; "use strict";
var pdfjsVersion = '2.0.131'; var pdfjsVersion = '2.0.133';
var pdfjsBuild = 'f5fb87f0'; var pdfjsBuild = 'edaf4b31';
var pdfjsCoreWorker = __w_pdfjs_require__(72); var pdfjsCoreWorker = __w_pdfjs_require__(72);
exports.WorkerMessageHandler = pdfjsCoreWorker.WorkerMessageHandler; exports.WorkerMessageHandler = pdfjsCoreWorker.WorkerMessageHandler;
@ -22089,7 +22089,7 @@ var WorkerMessageHandler = {
var cancelXHRs = null; var cancelXHRs = null;
var WorkerTasks = []; var WorkerTasks = [];
var apiVersion = docParams.apiVersion; var apiVersion = docParams.apiVersion;
var workerVersion = '2.0.131'; var workerVersion = '2.0.133';
if (apiVersion !== null && apiVersion !== workerVersion) { if (apiVersion !== null && apiVersion !== workerVersion) {
throw new Error('The API version "' + apiVersion + '" does not match ' + ('the Worker version "' + workerVersion + '".')); throw new Error('The API version "' + apiVersion + '" does not match ' + ('the Worker version "' + workerVersion + '".'));
} }

2
build/pdf.worker.js.map vendored

File diff suppressed because one or more lines are too long

2
build/pdf.worker.min.js vendored

File diff suppressed because one or more lines are too long

2
lib/core/worker.js

@ -208,7 +208,7 @@ var WorkerMessageHandler = {
var cancelXHRs = null; var cancelXHRs = null;
var WorkerTasks = []; var WorkerTasks = [];
var apiVersion = docParams.apiVersion; var apiVersion = docParams.apiVersion;
var workerVersion = '2.0.131'; var workerVersion = '2.0.133';
if (apiVersion !== null && apiVersion !== workerVersion) { if (apiVersion !== null && apiVersion !== workerVersion) {
throw new Error('The API version "' + apiVersion + '" does not match ' + ('the Worker version "' + workerVersion + '".')); throw new Error('The API version "' + apiVersion + '" does not match ' + ('the Worker version "' + workerVersion + '".'));
} }

13
lib/display/api.js

@ -154,10 +154,7 @@ function getDocument(src) {
if (rangeTransport) { if (rangeTransport) {
networkStream = new _transport_stream.PDFDataTransportStream(params, rangeTransport); networkStream = new _transport_stream.PDFDataTransportStream(params, rangeTransport);
} else if (!params.data) { } else if (!params.data) {
networkStream = new PDFNetworkStream({ networkStream = new PDFNetworkStream(params);
source: params,
disableRange: (0, _dom_utils.getDefaultSetting)('disableRange')
});
} }
var messageHandler = new _util.MessageHandler(docId, workerId, worker.port); var messageHandler = new _util.MessageHandler(docId, workerId, worker.port);
messageHandler.postMessageTransfers = worker.postMessageTransfers; messageHandler.postMessageTransfers = worker.postMessageTransfers;
@ -172,10 +169,10 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
if (worker.destroyed) { if (worker.destroyed) {
return Promise.reject(new Error('Worker was destroyed')); return Promise.reject(new Error('Worker was destroyed'));
} }
var apiVersion = '2.0.131'; var apiVersion = '2.0.133';
source.disableRange = (0, _dom_utils.getDefaultSetting)('disableRange');
source.disableAutoFetch = (0, _dom_utils.getDefaultSetting)('disableAutoFetch'); source.disableAutoFetch = (0, _dom_utils.getDefaultSetting)('disableAutoFetch');
source.disableStream = (0, _dom_utils.getDefaultSetting)('disableStream'); source.disableStream = (0, _dom_utils.getDefaultSetting)('disableStream');
source.chunkedViewerLoading = !!pdfDataRangeTransport;
if (pdfDataRangeTransport) { if (pdfDataRangeTransport) {
source.length = pdfDataRangeTransport.length; source.length = pdfDataRangeTransport.length;
source.initialData = pdfDataRangeTransport.initialData; source.initialData = pdfDataRangeTransport.initialData;
@ -1535,8 +1532,8 @@ var InternalRenderTask = function InternalRenderTaskClosure() {
}(); }();
var version, build; var version, build;
{ {
exports.version = version = '2.0.131'; exports.version = version = '2.0.133';
exports.build = build = 'f5fb87f0'; exports.build = build = 'edaf4b31';
} }
exports.getDocument = getDocument; exports.getDocument = getDocument;
exports.LoopbackPort = LoopbackPort; exports.LoopbackPort = LoopbackPort;

31
lib/display/fetch_stream.js

@ -38,13 +38,12 @@ function createFetchOptions(headers, withCredentials) {
} }
var PDFFetchStream = function () { var PDFFetchStream = function () {
function PDFFetchStream(options) { function PDFFetchStream(source) {
_classCallCheck(this, PDFFetchStream); _classCallCheck(this, PDFFetchStream);
this.options = options; this.source = source;
this.source = options.source; this.isHttp = /^https?:/i.test(source.url);
this.isHttp = /^https?:/i.test(this.source.url); this.httpHeaders = this.isHttp && source.httpHeaders || {};
this.httpHeaders = this.isHttp && this.source.httpHeaders || {};
this._fullRequestReader = null; this._fullRequestReader = null;
this._rangeRequestReaders = []; this._rangeRequestReaders = [];
} }
@ -88,16 +87,17 @@ var PDFFetchStreamReader = function () {
this._stream = stream; this._stream = stream;
this._reader = null; this._reader = null;
this._loaded = 0; this._loaded = 0;
this._withCredentials = stream.source.withCredentials; var source = stream.source;
this._contentLength = this._stream.source.length; this._withCredentials = source.withCredentials;
this._contentLength = source.length;
this._headersCapability = (0, _util.createPromiseCapability)(); this._headersCapability = (0, _util.createPromiseCapability)();
this._disableRange = this._stream.options.disableRange; this._disableRange = source.disableRange;
this._rangeChunkSize = this._stream.source.rangeChunkSize; this._rangeChunkSize = source.rangeChunkSize;
if (!this._rangeChunkSize && !this._disableRange) { if (!this._rangeChunkSize && !this._disableRange) {
this._disableRange = true; this._disableRange = true;
} }
this._isRangeSupported = !this._stream.options.disableRange; this._isRangeSupported = !source.disableRange;
this._isStreamingSupported = !this._stream.source.disableStream; this._isStreamingSupported = !source.disableStream;
this._headers = new Headers(); this._headers = new Headers();
for (var property in this._stream.httpHeaders) { for (var property in this._stream.httpHeaders) {
var value = this._stream.httpHeaders[property]; var value = this._stream.httpHeaders[property];
@ -106,7 +106,7 @@ var PDFFetchStreamReader = function () {
} }
this._headers.append(property, value); this._headers.append(property, value);
} }
var url = this._stream.source.url; var url = source.url;
fetch(url, createFetchOptions(this._headers, this._withCredentials)).then(function (response) { fetch(url, createFetchOptions(this._headers, this._withCredentials)).then(function (response) {
if (!(0, _network_utils.validateResponseStatus)(response.status)) { if (!(0, _network_utils.validateResponseStatus)(response.status)) {
throw (0, _network_utils.createResponseStatusError)(response.status, url); throw (0, _network_utils.createResponseStatusError)(response.status, url);
@ -206,9 +206,10 @@ var PDFFetchStreamRangeReader = function () {
this._stream = stream; this._stream = stream;
this._reader = null; this._reader = null;
this._loaded = 0; this._loaded = 0;
this._withCredentials = stream.source.withCredentials; var source = stream.source;
this._withCredentials = source.withCredentials;
this._readCapability = (0, _util.createPromiseCapability)(); this._readCapability = (0, _util.createPromiseCapability)();
this._isStreamingSupported = !stream.source.disableStream; this._isStreamingSupported = !source.disableStream;
this._headers = new Headers(); this._headers = new Headers();
for (var property in this._stream.httpHeaders) { for (var property in this._stream.httpHeaders) {
var value = this._stream.httpHeaders[property]; var value = this._stream.httpHeaders[property];
@ -219,7 +220,7 @@ var PDFFetchStreamRangeReader = function () {
} }
var rangeStr = begin + '-' + (end - 1); var rangeStr = begin + '-' + (end - 1);
this._headers.append('Range', 'bytes=' + rangeStr); this._headers.append('Range', 'bytes=' + rangeStr);
var url = this._stream.source.url; var url = source.url;
fetch(url, createFetchOptions(this._headers, this._withCredentials)).then(function (response) { fetch(url, createFetchOptions(this._headers, this._withCredentials)).then(function (response) {
if (!(0, _network_utils.validateResponseStatus)(response.status)) { if (!(0, _network_utils.validateResponseStatus)(response.status)) {
throw (0, _network_utils.createResponseStatusError)(response.status, url); throw (0, _network_utils.createResponseStatusError)(response.status, url);

4
lib/display/global.js

@ -44,8 +44,8 @@ if (!_global_scope2.default.PDFJS) {
} }
var PDFJS = _global_scope2.default.PDFJS; var PDFJS = _global_scope2.default.PDFJS;
{ {
PDFJS.version = '2.0.131'; PDFJS.version = '2.0.133';
PDFJS.build = 'f5fb87f0'; PDFJS.build = 'edaf4b31';
} }
PDFJS.pdfBug = false; PDFJS.pdfBug = false;
if (PDFJS.verbosity !== undefined) { if (PDFJS.verbosity !== undefined) {

12
lib/display/network.js

@ -214,9 +214,8 @@ NetworkManager.prototype = {
xhr.abort(); xhr.abort();
} }
}; };
function PDFNetworkStream(options) { function PDFNetworkStream(source) {
this._options = options; this._source = source;
var source = options.source;
this._manager = new NetworkManager(source.url, { this._manager = new NetworkManager(source.url, {
httpHeaders: source.httpHeaders, httpHeaders: source.httpHeaders,
withCredentials: source.withCredentials withCredentials: source.withCredentials
@ -234,7 +233,7 @@ PDFNetworkStream.prototype = {
}, },
getFullReader: function PDFNetworkStream_getFullReader() { getFullReader: function PDFNetworkStream_getFullReader() {
(0, _util.assert)(!this._fullRequestReader); (0, _util.assert)(!this._fullRequestReader);
this._fullRequestReader = new PDFNetworkStreamFullRequestReader(this._manager, this._options); this._fullRequestReader = new PDFNetworkStreamFullRequestReader(this._manager, this._source);
return this._fullRequestReader; return this._fullRequestReader;
}, },
getRangeReader: function PDFNetworkStream_getRangeReader(begin, end) { getRangeReader: function PDFNetworkStream_getRangeReader(begin, end) {
@ -253,9 +252,8 @@ PDFNetworkStream.prototype = {
}); });
} }
}; };
function PDFNetworkStreamFullRequestReader(manager, options) { function PDFNetworkStreamFullRequestReader(manager, source) {
this._manager = manager; this._manager = manager;
var source = options.source;
var args = { var args = {
onHeadersReceived: this._onHeadersReceived.bind(this), onHeadersReceived: this._onHeadersReceived.bind(this),
onProgressiveData: source.disableStream ? null : this._onProgressiveData.bind(this), onProgressiveData: source.disableStream ? null : this._onProgressiveData.bind(this),
@ -266,7 +264,7 @@ function PDFNetworkStreamFullRequestReader(manager, options) {
this._url = source.url; this._url = source.url;
this._fullRequestId = manager.requestFull(args); this._fullRequestId = manager.requestFull(args);
this._headersReceivedCapability = (0, _util.createPromiseCapability)(); this._headersReceivedCapability = (0, _util.createPromiseCapability)();
this._disableRange = options.disableRange || false; this._disableRange = source.disableRange || false;
this._contentLength = source.length; this._contentLength = source.length;
this._rangeChunkSize = source.rangeChunkSize; this._rangeChunkSize = source.rangeChunkSize;
if (!this._rangeChunkSize && !this._disableRange) { if (!this._rangeChunkSize && !this._disableRange) {

23
lib/display/node_stream.js

@ -37,15 +37,14 @@ var https = require('https');
var url = require('url'); var url = require('url');
var PDFNodeStream = function () { var PDFNodeStream = function () {
function PDFNodeStream(options) { function PDFNodeStream(source) {
_classCallCheck(this, PDFNodeStream); _classCallCheck(this, PDFNodeStream);
this.options = options; this.source = source;
this.source = options.source; this.url = url.parse(source.url);
this.url = url.parse(this.source.url);
this.isHttp = this.url.protocol === 'http:' || this.url.protocol === 'https:'; this.isHttp = this.url.protocol === 'http:' || this.url.protocol === 'https:';
this.isFsUrl = this.url.protocol === 'file:' || !this.url.host; this.isFsUrl = this.url.protocol === 'file:' || !this.url.host;
this.httpHeaders = this.isHttp && this.source.httpHeaders || {}; this.httpHeaders = this.isHttp && source.httpHeaders || {};
this._fullRequest = null; this._fullRequest = null;
this._rangeRequestReaders = []; this._rangeRequestReaders = [];
} }
@ -89,15 +88,16 @@ var BaseFullReader = function () {
this._errored = false; this._errored = false;
this._reason = null; this._reason = null;
this.onProgress = null; this.onProgress = null;
this._contentLength = stream.source.length; var source = stream.source;
this._contentLength = source.length;
this._loaded = 0; this._loaded = 0;
this._disableRange = stream.options.disableRange || false; this._disableRange = source.disableRange || false;
this._rangeChunkSize = stream.source.rangeChunkSize; this._rangeChunkSize = source.rangeChunkSize;
if (!this._rangeChunkSize && !this._disableRange) { if (!this._rangeChunkSize && !this._disableRange) {
this._disableRange = true; this._disableRange = true;
} }
this._isStreamingSupported = !stream.source.disableStream; this._isStreamingSupported = !source.disableStream;
this._isRangeSupported = !stream.options.disableRange; this._isRangeSupported = !source.disableRange;
this._readableStream = null; this._readableStream = null;
this._readCapability = (0, _util.createPromiseCapability)(); this._readCapability = (0, _util.createPromiseCapability)();
this._headersCapability = (0, _util.createPromiseCapability)(); this._headersCapability = (0, _util.createPromiseCapability)();
@ -214,7 +214,8 @@ var BaseRangeReader = function () {
this._loaded = 0; this._loaded = 0;
this._readableStream = null; this._readableStream = null;
this._readCapability = (0, _util.createPromiseCapability)(); this._readCapability = (0, _util.createPromiseCapability)();
this._isStreamingSupported = !stream.source.disableStream; var source = stream.source;
this._isStreamingSupported = !source.disableStream;
} }
_createClass(BaseRangeReader, [{ _createClass(BaseRangeReader, [{

4
lib/pdf.js

@ -14,8 +14,8 @@
*/ */
'use strict'; 'use strict';
var pdfjsVersion = '2.0.131'; var pdfjsVersion = '2.0.133';
var pdfjsBuild = 'f5fb87f0'; var pdfjsBuild = 'edaf4b31';
var pdfjsSharedUtil = require('./shared/util.js'); var pdfjsSharedUtil = require('./shared/util.js');
var pdfjsDisplayGlobal = require('./display/global.js'); var pdfjsDisplayGlobal = require('./display/global.js');
var pdfjsDisplayAPI = require('./display/api.js'); var pdfjsDisplayAPI = require('./display/api.js');

4
lib/pdf.worker.js vendored

@ -14,7 +14,7 @@
*/ */
'use strict'; 'use strict';
var pdfjsVersion = '2.0.131'; var pdfjsVersion = '2.0.133';
var pdfjsBuild = 'f5fb87f0'; var pdfjsBuild = 'edaf4b31';
var pdfjsCoreWorker = require('./core/worker.js'); var pdfjsCoreWorker = require('./core/worker.js');
exports.WorkerMessageHandler = pdfjsCoreWorker.WorkerMessageHandler; exports.WorkerMessageHandler = pdfjsCoreWorker.WorkerMessageHandler;

12
lib/test/unit/network_spec.js

@ -23,11 +23,9 @@ describe('network', function () {
var pdf2Length = 32472771; var pdf2Length = 32472771;
it('read without stream and range', function (done) { it('read without stream and range', function (done) {
var stream = new _network.PDFNetworkStream({ var stream = new _network.PDFNetworkStream({
source: {
url: pdf1, url: pdf1,
rangeChunkSize: 65536, rangeChunkSize: 65536,
disableStream: true disableStream: true,
},
disableRange: true disableRange: true
}); });
var fullReader = stream.getFullReader(); var fullReader = stream.getFullReader();
@ -68,11 +66,9 @@ describe('network', function () {
return; return;
} }
var stream = new _network.PDFNetworkStream({ var stream = new _network.PDFNetworkStream({
source: {
url: pdf2, url: pdf2,
rangeChunkSize: 65536, rangeChunkSize: 65536,
disableStream: false disableStream: false,
},
disableRange: false disableRange: false
}); });
var fullReader = stream.getFullReader(); var fullReader = stream.getFullReader();
@ -107,12 +103,10 @@ describe('network', function () {
it('read custom ranges', function (done) { it('read custom ranges', function (done) {
var rangeSize = 32768; var rangeSize = 32768;
var stream = new _network.PDFNetworkStream({ var stream = new _network.PDFNetworkStream({
source: {
url: pdf1, url: pdf1,
length: pdf1Length, length: pdf1Length,
rangeChunkSize: rangeSize, rangeChunkSize: rangeSize,
disableStream: true disableStream: true,
},
disableRange: false disableRange: false
}); });
var fullReader = stream.getFullReader(); var fullReader = stream.getFullReader();

16
lib/test/unit/node_stream_spec.js

@ -74,19 +74,15 @@ describe('node_stream', function () {
}); });
it('read both http(s) and filesystem pdf files', function (done) { it('read both http(s) and filesystem pdf files', function (done) {
var stream1 = new _node_stream.PDFNodeStream({ var stream1 = new _node_stream.PDFNodeStream({
source: {
url: 'http://127.0.0.1:' + port + '/tracemonkey.pdf', url: 'http://127.0.0.1:' + port + '/tracemonkey.pdf',
rangeChunkSize: 65536, rangeChunkSize: 65536,
disableStream: true disableStream: true,
},
disableRange: true disableRange: true
}); });
var stream2 = new _node_stream.PDFNodeStream({ var stream2 = new _node_stream.PDFNodeStream({
source: {
url: pdf, url: pdf,
rangeChunkSize: 65536, rangeChunkSize: 65536,
disableStream: true disableStream: true,
},
disableRange: true disableRange: true
}); });
var fullReader1 = stream1.getFullReader(); var fullReader1 = stream1.getFullReader();
@ -139,21 +135,17 @@ describe('node_stream', function () {
it('read custom ranges for both http(s) and filesystem urls', function (done) { it('read custom ranges for both http(s) and filesystem urls', function (done) {
var rangeSize = 32768; var rangeSize = 32768;
var stream1 = new _node_stream.PDFNodeStream({ var stream1 = new _node_stream.PDFNodeStream({
source: {
url: 'http://127.0.0.1:' + port + '/tracemonkey.pdf', url: 'http://127.0.0.1:' + port + '/tracemonkey.pdf',
length: pdfLength, length: pdfLength,
rangeChunkSize: rangeSize, rangeChunkSize: rangeSize,
disableStream: true disableStream: true,
},
disableRange: false disableRange: false
}); });
var stream2 = new _node_stream.PDFNodeStream({ var stream2 = new _node_stream.PDFNodeStream({
source: {
url: pdf, url: pdf,
length: pdfLength, length: pdfLength,
rangeChunkSize: rangeSize, rangeChunkSize: rangeSize,
disableStream: true disableStream: true,
},
disableRange: false disableRange: false
}); });
var fullReader1 = stream1.getFullReader(); var fullReader1 = stream1.getFullReader();

2
package.json

@ -1,6 +1,6 @@
{ {
"name": "pdfjs-dist", "name": "pdfjs-dist",
"version": "2.0.131", "version": "2.0.133",
"main": "build/pdf.js", "main": "build/pdf.js",
"description": "Generic build of Mozilla's PDF.js library.", "description": "Generic build of Mozilla's PDF.js library.",
"keywords": [ "keywords": [

Loading…
Cancel
Save