[api-minor] Use the NodeCanvasFactory/NodeCMapReaderFactory class…

…es as defaults in Node.js environments (issue 11900) This moves, and slightly simplifies, code that's currently residing in the unit-test utils into the actual library, such that it's bundled with `GENERIC`-builds and used in e.g. the API-code. As an added bonus, this also brings out-of-the-box support for CMaps in e.g. the Node.js examples.
mozilla · Jul 2, 2020 · cb6e745 · cb6e745
1 parent fe3df49
commit cb6e745
Show file tree

Hide file tree

Showing 10 changed files with 167 additions and 129 deletions.
diff --git a/examples/node/pdf2png/pdf2png.js b/examples/node/pdf2png/pdf2png.js
@@ -50,14 +50,21 @@ NodeCanvasFactory.prototype = {
 
 var pdfjsLib = require("pdfjs-dist/es5/build/pdf.js");
 
-// Relative path of the PDF file.
-var pdfURL = "../../../web/compressed.tracemonkey-pldi-09.pdf";
+// Some PDFs need external cmaps.
+var CMAP_URL = "../../../node_modules/pdfjs-dist/cmaps/";
+var CMAP_PACKED = true;
 
-// Read the PDF file into a typed array so PDF.js can load it.
-var rawData = new Uint8Array(fs.readFileSync(pdfURL));
+// Loading file from file system into typed array.
+var pdfPath =
+  process.argv[2] || "../../../web/compressed.tracemonkey-pldi-09.pdf";
+var data = new Uint8Array(fs.readFileSync(pdfPath));
 
 // Load the PDF file.
-var loadingTask = pdfjsLib.getDocument(rawData);
+var loadingTask = pdfjsLib.getDocument({
+  data: data,
+  cMapUrl: CMAP_URL,
+  cMapPacked: CMAP_PACKED,
+});
 loadingTask.promise
   .then(function (pdfDocument) {
     console.log("# PDF document loaded.");

diff --git a/examples/node/pdf2svg.js b/examples/node/pdf2svg.js
@@ -16,6 +16,10 @@ require("./domstubs.js").setStubs(global);
 // Run `gulp dist-install` to generate 'pdfjs-dist' npm package files.
 var pdfjsLib = require("pdfjs-dist/es5/build/pdf.js");
 
+// Some PDFs need external cmaps.
+var CMAP_URL = "../../node_modules/pdfjs-dist/cmaps/";
+var CMAP_PACKED = true;
+
 // Loading file from file system into typed array
 var pdfPath = process.argv[2] || "../../web/compressed.tracemonkey-pldi-09.pdf";
 var data = new Uint8Array(fs.readFileSync(pdfPath));
@@ -86,6 +90,8 @@ function writeSvgToFile(svgElement, filePath) {
 // callback.
 var loadingTask = pdfjsLib.getDocument({
   data: data,
+  cMapUrl: CMAP_URL,
+  cMapPacked: CMAP_PACKED,
   fontExtraProperties: true,
 });
 loadingTask.promise

diff --git a/gulpfile.js b/gulpfile.js
@@ -1617,6 +1617,7 @@ gulp.task(
         bugs: DIST_BUGS_URL,
         license: DIST_LICENSE,
         browser: {
+          canvas: false,
           fs: false,
           http: false,
           https: false,

diff --git a/src/display/api.js b/src/display/api.js
@@ -47,6 +47,7 @@ import {
   StatTimer,
 } from "./display_utils.js";
 import { FontFaceObject, FontLoader } from "./font_loader.js";
+import { NodeCanvasFactory, NodeCMapReaderFactory } from "./node_utils.js";
 import { apiCompatibilityParams } from "./api_compatibility.js";
 import { CanvasGraphics } from "./canvas.js";
 import { GlobalWorkerOptions } from "./worker_options.js";
@@ -59,6 +60,15 @@ import { WebGLContext } from "./webgl.js";
 const DEFAULT_RANGE_CHUNK_SIZE = 65536; // 2^16 = 65536
 const RENDERING_CANCELLED_TIMEOUT = 100; // ms
 
+const DefaultCanvasFactory =
+  (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) && isNodeJS
+    ? NodeCanvasFactory
+    : DOMCanvasFactory;
+const DefaultCMapReaderFactory =
+  (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) && isNodeJS
+    ? NodeCMapReaderFactory
+    : DOMCMapReaderFactory;
+
 /**
  * @typedef {function} IPDFStreamFactory
  * @param {DocumentInitParameters} params - The document initialization
@@ -242,7 +252,8 @@ function getDocument(src) {
   }
 
   params.rangeChunkSize = params.rangeChunkSize || DEFAULT_RANGE_CHUNK_SIZE;
-  params.CMapReaderFactory = params.CMapReaderFactory || DOMCMapReaderFactory;
+  params.CMapReaderFactory =
+    params.CMapReaderFactory || DefaultCMapReaderFactory;
   params.ignoreErrors = params.stopAtErrors !== true;
   params.fontExtraProperties = params.fontExtraProperties === true;
   params.pdfBug = params.pdfBug === true;
@@ -863,9 +874,9 @@ class PDFDocumentProxy {
  *                    just before viewport transform.
  * @property {Object} [imageLayer] - An object that has beginLayout,
  *                    endLayout and appendImage functions.
- * @property {Object} [canvasFactory] - The factory that will be used
+ * @property {Object} [canvasFactory] - The factory instance that will be used
  *                    when creating canvases. The default value is
- *                    {DOMCanvasFactory}.
+ *                    {new DOMCanvasFactory()}.
  * @property {Object} [background] - Background to use for the canvas.
  *                    Can use any valid canvas.fillStyle: A DOMString parsed as
  *                    CSS <color> value, a CanvasGradient object (a linear or
@@ -1015,7 +1026,7 @@ class PDFPageProxy {
       intentState.streamReaderCancelTimeout = null;
     }
 
-    const canvasFactoryInstance = canvasFactory || new DOMCanvasFactory();
+    const canvasFactoryInstance = canvasFactory || new DefaultCanvasFactory();
     const webGLContext = new WebGLContext({
       enable: enableWebGL,
     });

diff --git a/src/display/display_utils.js b/src/display/display_utils.js
@@ -21,26 +21,23 @@ import {
   isString,
   removeNullCharacters,
   stringToBytes,
+  unreachable,
   Util,
   warn,
 } from "../shared/util.js";
 
 const DEFAULT_LINK_REL = "noopener noreferrer nofollow";
 const SVG_NS = "http://www.w3.org/2000/svg";
 
-class DOMCanvasFactory {
-  create(width, height) {
-    if (width <= 0 || height <= 0) {
-      throw new Error("Invalid canvas size");
+class BaseCanvasFactory {
+  constructor() {
+    if (this.constructor === BaseCanvasFactory) {
+      unreachable("Cannot initialize BaseCanvasFactory.");
     }
-    const canvas = document.createElement("canvas");
-    const context = canvas.getContext("2d");
-    canvas.width = width;
-    canvas.height = height;
-    return {
-      canvas,
-      context,
-    };
+  }
+
+  create(width, height) {
+    unreachable("Abstract method `create` called.");
   }
 
   reset(canvasAndContext, width, height) {
@@ -67,8 +64,27 @@ class DOMCanvasFactory {
   }
 }
 
-class DOMCMapReaderFactory {
+class DOMCanvasFactory extends BaseCanvasFactory {
+  create(width, height) {
+    if (width <= 0 || height <= 0) {
+      throw new Error("Invalid canvas size");
+    }
+    const canvas = document.createElement("canvas");
+    const context = canvas.getContext("2d");
+    canvas.width = width;
+    canvas.height = height;
+    return {
+      canvas,
+      context,
+    };
+  }
+}
+
+class BaseCMapReaderFactory {
   constructor({ baseUrl = null, isCompressed = false }) {
+    if (this.constructor === BaseCMapReaderFactory) {
+      unreachable("Cannot initialize BaseCMapReaderFactory.");
+    }
     this.baseUrl = baseUrl;
     this.isCompressed = isCompressed;
   }
@@ -88,29 +104,39 @@ class DOMCMapReaderFactory {
       ? CMapCompressionType.BINARY
       : CMapCompressionType.NONE;
 
+    return this._fetchData(url)
+      .then(cMapData => {
+        return { cMapData, compressionType };
+      })
+      .catch(reason => {
+        throw new Error(
+          `Unable to load ${this.isCompressed ? "binary " : ""}CMap at: ${url}`
+        );
+      });
+  }
+
+  /**
+   * @private
+   */
+  _fetchData(url) {
+    unreachable("Abstract method `_fetchData` called.");
+  }
+}
+
+class DOMCMapReaderFactory extends BaseCMapReaderFactory {
+  _fetchData(url) {
     if (
       (typeof PDFJSDev !== "undefined" && PDFJSDev.test("MOZCENTRAL")) ||
       (isFetchSupported() && isValidFetchUrl(url, document.baseURI))
     ) {
-      return fetch(url)
-        .then(async response => {
-          if (!response.ok) {
-            throw new Error(response.statusText);
-          }
-          let cMapData;
-          if (this.isCompressed) {
-            cMapData = new Uint8Array(await response.arrayBuffer());
-          } else {
-            cMapData = stringToBytes(await response.text());
-          }
-          return { cMapData, compressionType };
-        })
-        .catch(reason => {
-          throw new Error(
-            `Unable to load ${this.isCompressed ? "binary " : ""}` +
-              `CMap at: ${url}`
-          );
-        });
+      return fetch(url).then(async response => {
+        if (!response.ok) {
+          throw new Error(response.statusText);
+        }
+        return this.isCompressed
+          ? new Uint8Array(await response.arrayBuffer())
+          : stringToBytes(await response.text());
+      });
     }
 
     // The Fetch API is not supported.
@@ -126,26 +152,18 @@ class DOMCMapReaderFactory {
           return;
         }
         if (request.status === 200 || request.status === 0) {
-          let cMapData;
           if (this.isCompressed && request.response) {
-            cMapData = new Uint8Array(request.response);
+            resolve(new Uint8Array(request.response));
+            return;
           } else if (!this.isCompressed && request.responseText) {
-            cMapData = stringToBytes(request.responseText);
-          }
-          if (cMapData) {
-            resolve({ cMapData, compressionType });
+            resolve(stringToBytes(request.responseText));
             return;
           }
         }
         reject(new Error(request.statusText));
       };
 
       request.send(null);
-    }).catch(reason => {
-      throw new Error(
-        `Unable to load ${this.isCompressed ? "binary " : ""}` +
-          `CMap at: ${url}`
-      );
     });
   }
 }
@@ -609,7 +627,9 @@ export {
   getFilenameFromUrl,
   LinkTarget,
   DEFAULT_LINK_REL,
+  BaseCanvasFactory,
   DOMCanvasFactory,
+  BaseCMapReaderFactory,
   DOMCMapReaderFactory,
   DOMSVGFactory,
   StatTimer,

diff --git a/src/display/node_utils.js b/src/display/node_utils.js
@@ -0,0 +1,65 @@
+/* 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* globals __non_webpack_require__ */
+/* eslint no-var: error */
+
+import { BaseCanvasFactory, BaseCMapReaderFactory } from "./display_utils.js";
+import { isNodeJS } from "../shared/is_node.js";
+import { unreachable } from "../shared/util.js";
+
+let NodeCanvasFactory = class {
+  constructor() {
+    unreachable("Not implemented: NodeCanvasFactory");
+  }
+};
+
+let NodeCMapReaderFactory = class {
+  constructor() {
+    unreachable("Not implemented: NodeCMapReaderFactory");
+  }
+};
+
+if ((typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) && isNodeJS) {
+  NodeCanvasFactory = class extends BaseCanvasFactory {
+    create(width, height) {
+      if (width <= 0 || height <= 0) {
+        throw new Error("Invalid canvas size");
+      }
+      const Canvas = __non_webpack_require__("canvas");
+      const canvas = Canvas.createCanvas(width, height);
+      return {
+        canvas,
+        context: canvas.getContext("2d"),
+      };
+    }
+  };
+
+  NodeCMapReaderFactory = class extends BaseCMapReaderFactory {
+    _fetchData(url) {
+      return new Promise((resolve, reject) => {
+        const fs = __non_webpack_require__("fs");
+        fs.readFile(url, (error, data) => {
+          if (error || !data) {
+            reject(new Error(error));
+            return;
+          }
+          resolve(new Uint8Array(data));
+        });
+      });
+    }
+  };
+}
+
+export { NodeCanvasFactory, NodeCMapReaderFactory };
diff --git a/test/unit/api_spec.js b/test/unit/api_spec.js
@@ -16,7 +16,6 @@
 import {
   buildGetDocumentParams,
   DOMFileReaderFactory,
-  NodeCanvasFactory,
   NodeFileReaderFactory,
   TEST_PDFS_PATH,
 } from "./test_utils.js";
@@ -49,6 +48,7 @@ import { GlobalImageCache } from "../../src/core/image_utils.js";
 import { GlobalWorkerOptions } from "../../src/display/worker_options.js";
 import { isNodeJS } from "../../src/shared/is_node.js";
 import { Metadata } from "../../src/display/metadata.js";
+import { NodeCanvasFactory } from "../../src/display/node_utils.js";
 
 describe("api", function () {
   const basicApiFileName = "basicapi.pdf";

diff --git a/test/unit/cmap_spec.js b/test/unit/cmap_spec.js
@@ -17,7 +17,7 @@ import { CMap, CMapFactory, IdentityCMap } from "../../src/core/cmap.js";
 import { DOMCMapReaderFactory } from "../../src/display/display_utils.js";
 import { isNodeJS } from "../../src/shared/is_node.js";
 import { Name } from "../../src/core/primitives.js";
-import { NodeCMapReaderFactory } from "./test_utils.js";
+import { NodeCMapReaderFactory } from "../../src/display/node_utils.js";
 import { StringStream } from "../../src/core/stream.js";
 
 var cMapUrl = {

diff --git a/test/unit/custom_spec.js b/test/unit/custom_spec.js
@@ -13,10 +13,11 @@
  * limitations under the License.
  */
 
-import { buildGetDocumentParams, NodeCanvasFactory } from "./test_utils.js";
+import { buildGetDocumentParams } from "./test_utils.js";
 import { DOMCanvasFactory } from "../../src/display/display_utils.js";
 import { getDocument } from "../../src/display/api.js";
 import { isNodeJS } from "../../src/shared/is_node.js";
+import { NodeCanvasFactory } from "../../src/display/node_utils.js";
 
 function getTopLeftPixel(canvasContext) {
   const imgData = canvasContext.getImageData(0, 0, 1, 1);