Use dynamic import in lightweight build

Instead of dynamically loading a <script> tag.

This also removes the non-module lightweight build.

.travis.yml

@@ -17,7 +17,7 @@ matrix:
     - node_js: "14"
       env:  OPENPGP_NODE_JS='14' OPENPGPJSTEST='unit' LIGHTWEIGHT=1
     - node_js: "14"
-      env: BROWSER='"firefox_61"' OPENPGPJSTEST='browserstack'
+      env: BROWSER='"firefox_68"' OPENPGPJSTEST='browserstack'
     - node_js: "14"
       env:  BROWSER='"chrome_68"' OPENPGPJSTEST='browserstack' LIGHTWEIGHT=1
     - node_js: "14"

README.md

@@ -125,12 +125,11 @@ Copy `dist/openpgp.min.js` or `dist/compat/openpgp.min.js` (depending on the bro
 
 To offload cryptographic operations off the main thread, you can implement a Web Worker in your application and load OpenPGP.js from there. This can be more performant if you store or fetch keys and messages directly inside the Worker, so that they don't have to be `postMessage`d there. For an example Worker implementation, see `test/worker/worker_example.js`.
 
-If you want to use the lightweight build (which is smaller, and lazily loads non-default curves on demand), copy `dist/lightweight/openpgp.min.js` and `dist/lightweight/elliptic.min.js`, load the former in a script tag, and point `openpgp.config.indutnyEllipticPath` to the latter:
+If you want to use the lightweight build (which is smaller, and lazily loads non-default curves on demand), copy `dist/lightweight/openpgp.min.mjs` and `dist/lightweight/elliptic.min.mjs`, and import the former:
 
 ```html
-<script src="lightweight/openpgp.min.js"></script>
-<script>
-openpgp.config.indutnyEllipticPath = 'lightweight/elliptic.min.js';
+<script type="module">
+import * as openpgp from 'openpgp/dist/lightweight/openpgp.min.mjs';
 </script>
 ```
 

rollup.config.js

@@ -32,6 +32,7 @@ export default [
       { file: 'dist/openpgp.mjs', format: 'es', banner, intro },
       { file: 'dist/openpgp.min.mjs', format: 'es', banner, intro, plugins: [terser(terserOptions)] }
     ],
+    inlineDynamicImports: true,
     plugins: [
       resolve({
         browser: true
@@ -48,6 +49,7 @@ export default [
   },
   {
     input: 'src/index.js',
+    inlineDynamicImports: true,
     external: builtinModules.concat(nodeDependencies),
     output: [
       { file: 'dist/node/openpgp.js', format: 'cjs', name: pkg.name, banner, intro },
@@ -66,42 +68,28 @@ export default [
   {
     input: 'src/index.js',
     output: [
-      { file: 'dist/lightweight/openpgp.js', format: 'iife', name: pkg.name, banner, intro },
-      { file: 'dist/lightweight/openpgp.min.js', format: 'iife', name: pkg.name, banner, intro, plugins: [terser(terserOptions)] },
-      { file: 'dist/lightweight/openpgp.mjs', format: 'es', banner, intro },
-      { file: 'dist/lightweight/openpgp.min.mjs', format: 'es', banner, intro, plugins: [terser(terserOptions)] }
+      { dir: 'dist/lightweight', entryFileNames: 'openpgp.mjs', chunkFileNames: '[name].mjs', format: 'es', banner, intro },
+      { dir: 'dist/lightweight', entryFileNames: 'openpgp.min.mjs', chunkFileNames: '[name].min.mjs', format: 'es', banner, intro, plugins: [terser(terserOptions)] }
     ],
+    preserveEntrySignatures: 'allow-extension',
     plugins: [
       resolve({
         browser: true
       }),
       commonjs({
-        ignore: builtinModules.concat(nodeDependencies).concat('elliptic')
+        ignore: builtinModules.concat(nodeDependencies)
       }),
       replace({
         'OpenPGP.js VERSION': `OpenPGP.js ${pkg.version}`,
-        'externalIndutnyElliptic: false': 'externalIndutnyElliptic: true',
         'require(': 'void(',
         delimiters: ['', '']
       })
     ]
   },
-  {
-    input: 'node_modules/elliptic/dist/elliptic.min.js',
-    output: [
-      { file: 'dist/lightweight/elliptic.min.js', format: 'es' }
-    ],
-    plugins: [
-      replace({
-        'b.elliptic=a()': 'b.openpgp.elliptic=a()',
-        delimiters: ['', '']
-      })
-    ]
-  },
   {
     input: 'test/unittests.js',
     output: [
-      { file: 'test/lib/unittests-bundle.js', format: 'iife' },
+      { file: 'test/lib/unittests-bundle.js', format: 'es' },
     ],
     plugins: [
       resolve({

src/config/config.js

@@ -197,21 +197,6 @@ export default {
    * @property {Boolean} useIndutnyElliptic Whether to use the indutny/elliptic library. When false, certain curves will not be supported.
    */
   useIndutnyElliptic: true,
-  /**
-   * @memberof module:config
-   * @property {Boolean} externalIndutnyElliptic Whether to lazily load the indutny/elliptic library from an external path on demand.
-   */
-  externalIndutnyElliptic: false,
-  /**
-   * @memberof module:config
-   * @property {String} indutnyEllipticPath The path to load the indutny/elliptic library from. Only has an effect if `config.externalIndutnyElliptic` is true.
-   */
-  indutnyEllipticPath: './elliptic.min.js',
-  /**
-   * @memberof module:config
-   * @property {Object} indutnyEllipticFetchOptions Options object to pass to `fetch` when loading the indutny/elliptic library. Only has an effect if `config.externalIndutnyElliptic` is true.
-   */
-  indutnyEllipticFetchOptions: {},
   /**
    * @memberof module:config
    * @property {Set<Integer>} reject_hash_algorithms Reject insecure hash algorithms {@link module:enums.hash}

src/crypto/public_key/elliptic/indutnyKey.js

@@ -22,7 +22,6 @@
  * @module crypto/public_key/elliptic/indutnyKey
  */
 
-import { loadScript, dl } from '../../../lightweight_helper';
 import config from '../../../config';
 
 export function keyFromPrivate(indutnyCurve, priv) {
@@ -38,43 +37,10 @@ export function keyFromPublic(indutnyCurve, pub) {
   return keyPair;
 }
 
-/**
- * Load elliptic on demand to globalThis.openpgp.elliptic
- * @returns {Promise<elliptic>}
- */
-async function loadEllipticPromise() {
-  const path = config.indutnyEllipticPath;
-  const options = config.indutnyEllipticFetchOptions;
-  const ellipticDlPromise = dl(path, options).catch(() => dl(path, options));
-  const ellipticContents = await ellipticDlPromise;
-  const mainUrl = URL.createObjectURL(new Blob([ellipticContents], { type: 'text/javascript' }));
-  await loadScript(mainUrl);
-  URL.revokeObjectURL(mainUrl);
-  if (!globalThis.openpgp.elliptic) {
-    throw new Error('Elliptic library failed to load correctly');
-  }
-  return globalThis.openpgp.elliptic;
-}
-
-let ellipticPromise;
-
-function loadElliptic() {
-  if (!config.externalIndutnyElliptic) {
-    return require('elliptic');
-  }
-  if (!ellipticPromise) {
-    ellipticPromise = loadEllipticPromise().catch(e => {
-      ellipticPromise = undefined;
-      throw e;
-    });
-  }
-  return ellipticPromise;
-}
-
 export async function getIndutnyCurve(name) {
   if (!config.useIndutnyElliptic) {
     throw new Error('This curve is only supported in the full build of OpenPGP.js');
   }
-  const elliptic = await loadElliptic();
+  const { default: elliptic } = await import('elliptic');
   return new elliptic.ec(name);
 }

src/index.js

@@ -136,9 +136,3 @@ export { default as HKP } from './hkp';
  * @name module:openpgp.WKD
  */
 export { default as WKD } from './wkd';
-
-/**
- * @see module:lightweight
- */
-import * as lightweightMod from './lightweight_helper';
-export const lightweight = lightweightMod;

src/lightweight_helper.js

@@ -1,26 +0,0 @@
-/**
- * Load script from path
- * @param {String} path
- */
-export const loadScript = path => {
-  if (typeof importScripts !== 'undefined') {
-    return importScripts(path);
-  }
-  return new Promise((resolve, reject) => {
-    const script = document.createElement('script');
-    script.src = path;
-    script.onload = () => resolve();
-    script.onerror = e => reject(new Error(e.message));
-    document.head.appendChild(script);
-  });
-};
-
-/**
- * Download script from path
- * @param {String} path fetch path
- * @param {Object} options fetch options
- */
-export const dl = async function(path, options) {
-  const response = await fetch(path, options);
-  return response.arrayBuffer();
-};

test/unittests.html

@@ -6,13 +6,6 @@
     <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
 
     <!-- libs -->
-    <script>
-      if (window.location.search.includes('lightweight=')) {
-        document.write('<script src="../dist/lightweight/openpgp.js"><\/script>');
-      } else {
-        document.write('<script src="../dist/openpgp.js"><\/script>');
-      }
-    </script>
     <script src="../node_modules/mocha/mocha.js"></script>
     <script>
       mocha.setup('bdd');
@@ -22,8 +15,16 @@
   <body>
     <div id="mocha"></div>
 
-    <script src="lib/unittests-bundle.js"></script>
-    <script>
+    <script type="module">
+    (async () => {
+      const openpgp = await import(
+        window.location.search.includes('lightweight=') ?
+          '../dist/lightweight/openpgp.mjs' :
+          '../dist/openpgp.mjs'
+      );
+      window.openpgp = openpgp;
+      await import('./lib/unittests-bundle.js');
+
       if (typeof openpgp !== 'undefined') {
         const runner = mocha.run();
         var wasScrolledDown = true;
@@ -43,6 +44,7 @@
         runner.on('suite', afterTestReport);
         runner.on('test end', afterTestReport);
       }
+    })();
     </script>
   </body>
 </html>

test/unittests.js

@@ -26,7 +26,6 @@ describe('Unit Tests', function () {
 
   if (typeof window !== 'undefined') {
     openpgp.config.s2kIterationCountByte = 0;
-    openpgp.config.indutnyEllipticPath = '../dist/lightweight/elliptic.min.js';
 
     window.location.search.substr(1).split('&').forEach(param => {
       const [key, value] = param.split('=');