@loaders.gl/compression 4.0.0-alpha.4 → 4.0.0-alpha.5

package/src/lib/brotli-compression.ts

@@ -4,6 +4,7 @@ import {Compression} from './compression';
 import {isBrowser, toArrayBuffer} from '@loaders.gl/loader-utils';
 import type brotliNamespace from 'brotli';
 // import brotli from 'brotli';  // https://bundlephobia.com/package/brotli
+import {BrotliDecode} from '../brotli/decode';
 import zlib from 'zlib';
 import {promisify} from '@loaders.gl/loader-utils';
 
@@ -48,7 +49,8 @@ export class BrotliCompression extends Compression {
   async preload(): Promise<void> {
     brotli = brotli || this.options?.modules?.brotli;
     if (!brotli) {
-      throw new Error(this.name);
+      // eslint-disable-next-line no-console
+      console.warn(`${this.name} library not installed`);
     }
   }
 
@@ -69,8 +71,14 @@ export class BrotliCompression extends Compression {
     }
     const brotliOptions = {...DEFAULT_BROTLI_OPTIONS.brotli, ...this.options?.brotli};
     const inputArray = new Uint8Array(input);
+
+    if (!brotli) {
+      throw new Error('brotli compression: brotli module not installed');
+    }
+
     // @ts-ignore brotli types state that only Buffers are accepted...
-    return brotli.compress(inputArray, brotliOptions);
+    const outputArray = brotli.compress(inputArray, brotliOptions);
+    return outputArray.buffer;
   }
 
   async decompress(input: ArrayBuffer): Promise<ArrayBuffer> {
@@ -88,9 +96,16 @@ export class BrotliCompression extends Compression {
       const buffer = zlib.brotliDecompressSync(input);
       return toArrayBuffer(buffer);
     }
+
     const brotliOptions = {...DEFAULT_BROTLI_OPTIONS.brotli, ...this.options?.brotli};
     const inputArray = new Uint8Array(input);
-    // @ts-ignore brotli types state that only Buffers are accepted...
-    return brotli.decompress(inputArray, brotliOptions);
+
+    if (brotli) {
+      // @ts-ignore brotli types state that only Buffers are accepted...
+      const outputArray = brotli.decompress(inputArray, brotliOptions);
+      return outputArray.buffer;
+    }
+    const outputArray = BrotliDecode(inputArray, undefined);
+    return outputArray.buffer;
   }
 }

package/src/lib/zstd-compression.ts

@@ -26,12 +26,15 @@ export class ZstdCompression extends Compression {
 
     ZstdCodec = this.options?.modules?.['zstd-codec'];
     if (!ZstdCodec) {
-      throw new Error(this.name);
+      // eslint-disable-next-line no-console
+      console.warn(`${this.name} library not installed`);
     }
   }
 
   async preload(): Promise<void> {
-    zstd = zstd || (await new Promise((resolve) => ZstdCodec.run((zstd) => resolve(zstd))));
+    if (!zstd && ZstdCodec) {
+      zstd = await new Promise((resolve) => ZstdCodec.run((zstd) => resolve(zstd)));
+    }
   }
 
   compressSync(input: ArrayBuffer): ArrayBuffer {

package/src/workers/worker.ts

@@ -13,23 +13,23 @@ import {ZstdCompression} from '../lib/zstd-compression';
 // Import big dependencies
 
 // import brotli from 'brotli'; - brotli has problems with decompress in browsers
-import brotliDecompress from 'brotli/decompress';
+// import brotliDecompress from 'brotli/decompress';
 import lz4js from 'lz4js';
 // import lzo from 'lzo';
-import {ZstdCodec} from 'zstd-codec';
+// import {ZstdCodec} from 'zstd-codec';
 
 // Inject large dependencies through Compression constructor options
 const modules = {
   // brotli has problems with decompress in browsers
-  brotli: {
-    decompress: brotliDecompress,
-    compress: () => {
-      throw new Error('brotli compress');
-    }
-  },
-  lz4js,
+  // brotli: {
+  //   decompress: brotliDecompress,
+  //   compress: () => {
+  //     throw new Error('brotli compress');
+  //   }
+  // },
+  lz4js
   // lzo,
-  'zstd-codec': ZstdCodec
+  // 'zstd-codec': ZstdCodec
 };
 
 /** @type {Compression[]} */