@loaders.gl/crypto 4.2.0-alpha.6 → 4.2.0-beta.2

package/dist/lib/crypto-hash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"crypto-hash.d.ts","sourceRoot":"","sources":["../../src/lib/crypto-hash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,kBAAe;AAE5B,KAAK,iBAAiB,GAAG;IACvB,OAAO,CAAC,EAAE;QAAC,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,CAAC;IACtC,MAAM,EAAE;QACN,SAAS,EAAE,MAAM,CAAC;QAClB,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE;YAAC,IAAI,EAAE,MAAM,CAAA;SAAC,KAAK,GAAG,CAAC;KACzC,CAAC;CACH,CAAC;AAIF;;;GAGG;AACH,qBAAa,UAAW,SAAQ,IAAI;IAClC,QAAQ,CAAC,IAAI,MAAC;IAEd,OAAO,EAAE,iBAAiB,CAAC;IAC3B,+BAA+B;IAC/B,OAAO,CAAC,UAAU,CAAC;IACnB,yBAAyB;IACzB,OAAO,CAAC,KAAK,CAAC;gBAEF,OAAO,EAAE,iBAAiB;IAUhC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAU9B;;;OAGG;IACG,IAAI,CAAC,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,KAAK,GAAG,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAgBpE,WAAW,CAChB,aAAa,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,EACjE,QAAQ,GAAE,KAAK,GAAG,QAAmB,GACpC,aAAa,CAAC,WAAW,CAAC;CAqB9B"}
+{"version":3,"file":"crypto-hash.d.ts","sourceRoot":"","sources":["../../src/lib/crypto-hash.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,kBAAe;AAE5B,KAAK,iBAAiB,GAAG;IACvB,OAAO,CAAC,EAAE;QAAC,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,CAAC;IACtC,MAAM,EAAE;QACN,SAAS,EAAE,MAAM,CAAC;QAClB,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE;YAAC,IAAI,EAAE,MAAM,CAAA;SAAC,KAAK,GAAG,CAAC;KACzC,CAAC;CACH,CAAC;AAEF;;;GAGG;AACH,qBAAa,UAAW,SAAQ,IAAI;IAClC,QAAQ,CAAC,IAAI,MAAC;IAEd,OAAO,EAAE,iBAAiB,CAAC;IAC3B,+BAA+B;IAC/B,OAAO,CAAC,UAAU,CAAC;IACnB,yBAAyB;IACzB,OAAO,CAAC,KAAK,CAAC;gBAEF,OAAO,EAAE,iBAAiB;IAYhC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAK9B;;;OAGG;IACG,IAAI,CAAC,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,KAAK,GAAG,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBpE,WAAW,CAChB,aAAa,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,EACjE,QAAQ,GAAE,KAAK,GAAG,QAAmB,GACpC,aAAa,CAAC,WAAW,CAAC;CAsB9B"}

package/dist/lib/crypto-hash.js

@@ -1,5 +1,5 @@
+import { getJSModule, registerJSModules } from '@loaders.gl/loader-utils';
 import { Hash } from "./hash.js";
-let CryptoJS;
 /**
  * A transform that calculates Cryptographic Hash using Crypto JS library
  * @deprecated Warning, experimental class
@@ -14,6 +14,7 @@ export class CryptoHash extends Hash {
     constructor(options) {
         super();
         this.options = options;
+        registerJSModules(options?.modules);
         this._algorithm = this.options?.crypto?.algorithm;
         if (!this._algorithm) {
             throw new Error(this.name);
@@ -21,12 +22,7 @@ export class CryptoHash extends Hash {
         this.name = this._algorithm.toLowerCase();
     }
     async preload() {
-        if (!CryptoJS) {
-            CryptoJS = this.options?.modules?.CryptoJS;
-        }
-        if (!CryptoJS) {
-            throw new Error(this.name);
-        }
+        const CryptoJS = getJSModule('CryptoJS', this.name);
         this._algo = CryptoJS.algo[this._algorithm];
     }
     /**
@@ -39,6 +35,7 @@ export class CryptoHash extends Hash {
         if (!hash) {
             throw new Error(this.name);
         }
+        const CryptoJS = getJSModule('CryptoJS', this.name);
         // arrayBuffer is accepted, even though types and docs say no
         // https://stackoverflow.com/questions/25567468/how-to-decrypt-an-arraybuffer
         const typedWordArray = CryptoJS.lib.WordArray.create(input);
@@ -48,6 +45,7 @@ export class CryptoHash extends Hash {
     }
     async *hashBatches(asyncIterator, encoding = 'base64') {
         await this.preload();
+        const CryptoJS = getJSModule('CryptoJS', this.name);
         const hash = this._algo.create();
         if (!hash) {
             throw new Error(this.name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/crypto",
-  "version": "4.2.0-alpha.6",
+  "version": "4.2.0-beta.2",
   "description": "Cryptographic/hashing plugins for loaders.gl",
   "license": "MIT",
   "type": "module",
@@ -46,8 +46,8 @@
     "build-worker-node": "esbuild src/workers/crypto-worker-node.ts --outfile=dist/crypto-worker-node.js --platform=node --target=esnext,node16 --bundle --minify --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/loader-utils": "4.2.0-alpha.6",
-    "@loaders.gl/worker-utils": "4.2.0-alpha.6",
+    "@loaders.gl/loader-utils": "4.2.0-beta.2",
+    "@loaders.gl/worker-utils": "4.2.0-beta.2",
     "@types/crypto-js": "^4.0.2"
   },
   "devDependencies": {
@@ -60,5 +60,5 @@
   "peerDependencies": {
     "@loaders.gl/core": "^4.0.0"
   },
-  "gitHead": "37bd8ca71763529f18727ee4bf29dd176aa914ca"
+  "gitHead": "13c03663fec365a4d24c06377d50035cebd7ba9f"
 }

package/src/lib/crypto-hash.ts

@@ -1,3 +1,4 @@
+import {getJSModule, registerJSModules} from '@loaders.gl/loader-utils';
 import {Hash} from './hash';
 
 type CryptoHashOptions = {
@@ -8,8 +9,6 @@ type CryptoHashOptions = {
   };
 };
 
-let CryptoJS: any;
-
 /**
  * A transform that calculates Cryptographic Hash using Crypto JS library
  * @deprecated Warning, experimental class
@@ -26,6 +25,8 @@ export class CryptoHash extends Hash {
   constructor(options: CryptoHashOptions) {
     super();
     this.options = options;
+    registerJSModules(options?.modules);
+
     this._algorithm = this.options?.crypto?.algorithm;
     if (!this._algorithm) {
       throw new Error(this.name);
@@ -34,12 +35,7 @@ export class CryptoHash extends Hash {
   }
 
   async preload(): Promise<void> {
-    if (!CryptoJS) {
-      CryptoJS = this.options?.modules?.CryptoJS;
-    }
-    if (!CryptoJS) {
-      throw new Error(this.name);
-    }
+    const CryptoJS = getJSModule('CryptoJS', this.name);
     this._algo = CryptoJS.algo[this._algorithm];
   }
 
@@ -55,6 +51,7 @@ export class CryptoHash extends Hash {
       throw new Error(this.name);
     }
 
+    const CryptoJS = getJSModule('CryptoJS', this.name);
     // arrayBuffer is accepted, even though types and docs say no
     // https://stackoverflow.com/questions/25567468/how-to-decrypt-an-arraybuffer
     const typedWordArray = CryptoJS.lib.WordArray.create(input);
@@ -68,6 +65,7 @@ export class CryptoHash extends Hash {
     encoding: 'hex' | 'base64' = 'base64'
   ): AsyncIterable<ArrayBuffer> {
     await this.preload();
+    const CryptoJS = getJSModule('CryptoJS', this.name);
 
     const hash = this._algo.create();
     if (!hash) {