Merge branch 'master' of github.com:constantinius/geotiff.js

Author: constantinius

package-lock.json

@@ -47,11 +47,12 @@
     "npm-run-all": "^4.1.5",
     "parcel-bundler": "^1.12.4",
     "parcel-plugin-bundle-visualiser": "^1.2.0",
+    "rimraf": "^3.0.2",
     "serve-static": "^1.14.1"
   },
   "scripts": {
     "build": "npm run build:clean; run-p build:browser build:node;",
-    "build:clean": "rm -rf dist-node/ dist-browser/",
+    "build:clean": "rimraf dist-node/ dist-browser/",
     "build:node": "parcel build src/geotiff.js --target node --out-dir dist-node/",
     "build:browser": "parcel build src/geotiff.js --target browser --out-dir dist-browser/ --global GeoTIFF --public-url .",
     "watch:browser": "parcel watch src/geotiff.js --target browser --out-dir dist-browser/ --global GeoTIFF --public-url .",

package.json

@@ -1,8 +1,8 @@
 import { applyPredictor } from '../predictor';
 
 export default class BaseDecoder {
-  decode(fileDirectory, buffer) {
-    const decoded = this.decodeBlock(buffer);
+  async decode(fileDirectory, buffer) {
+    const decoded = await this.decodeBlock(buffer);
     const predictor = fileDirectory.Predictor || 1;
     if (predictor !== 1) {
       const isTiled = !fileDirectory.StripOffsets;

src/compression/basedecoder.js

@@ -1,9 +1,10 @@
 import { expose, Transfer } from 'threads/worker';
 import { getDecoder } from './compression';
 
-function decode(fileDirectory, buffer) {
+async function decode(fileDirectory, buffer) {
   const decoder = getDecoder(fileDirectory);
-  return Transfer(decoder.decode(fileDirectory, buffer));
+  const decoded = await decoder.decode(fileDirectory, buffer);
+  return Transfer(decoded);
 }
 
 expose(decode);

src/decoder.worker.js

@@ -15,9 +15,11 @@ class Pool {
    * @param {Number} size The size of the pool. Defaults to the number of CPUs
    *                      available. When this parameter is `null` or 0, then the
    *                      decoding will be done in the main thread.
+   * @param {Worker} worker The decoder worker, loaded and initialised. Enables
+   *                        loading the worker using worker-loader(or others) externally
+   *                        when using this library as a webpack dependency.
    */
-  constructor(size = defaultPoolSize) {
-    const worker = new Worker('./decoder.worker.js');
+  constructor(size = defaultPoolSize, worker = new Worker('./decoder.worker.js')) {
     this.pool = tPool(() => spawn(worker), size);
   }