From f3b16386dca3833c40ae7d5c5be265e195b1b5c4 Mon Sep 17 00:00:00 2001 From: Daniel Huigens Date: Mon, 11 May 2020 23:40:20 +0200 Subject: [PATCH] Use dynamic import in lightweight build Instead of dynamically loading a - ``` diff --git a/rollup.config.js b/rollup.config.js index 9c2c95b1..ec22a8d6 100644 --- a/rollup.config.js +++ b/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({ diff --git a/src/config/config.js b/src/config/config.js index aacb3b76..50ff3de7 100644 --- a/src/config/config.js +++ b/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} reject_hash_algorithms Reject insecure hash algorithms {@link module:enums.hash} diff --git a/src/crypto/public_key/elliptic/indutnyKey.js b/src/crypto/public_key/elliptic/indutnyKey.js index f92790ce..c1022524 100644 --- a/src/crypto/public_key/elliptic/indutnyKey.js +++ b/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} - */ -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); } diff --git a/src/index.js b/src/index.js index 244c6e8e..862da8b9 100644 --- a/src/index.js +++ b/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; diff --git a/src/lightweight_helper.js b/src/lightweight_helper.js deleted file mode 100644 index 076c0c7d..00000000 --- a/src/lightweight_helper.js +++ /dev/null @@ -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(); -}; diff --git a/test/unittests.html b/test/unittests.html index a3cff66b..c1182783 100644 --- a/test/unittests.html +++ b/test/unittests.html @@ -6,13 +6,6 @@ - - diff --git a/test/unittests.js b/test/unittests.js index 3aaa9c16..90ff017c 100644 --- a/test/unittests.js +++ b/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('=');