mirror of https://github.com/keeweb/keeweb.git
fixed argon2
This commit is contained in:
parent
fd0a8287dc
commit
68245629e4
|
@ -30,7 +30,7 @@ const KdbxwebInit = {
|
||||||
const loadTimeout = setTimeout(() => reject('timeout'), 5000);
|
const loadTimeout = setTimeout(() => reject('timeout'), 5000);
|
||||||
try {
|
try {
|
||||||
const ts = logger.ts();
|
const ts = logger.ts();
|
||||||
const argon2LoaderCode = require('argon2');
|
const argon2LoaderCode = require('argon2').default;
|
||||||
const wasmBinaryBase64 = require('argon2-wasm');
|
const wasmBinaryBase64 = require('argon2-wasm');
|
||||||
|
|
||||||
const KB = 1024 * 1024;
|
const KB = 1024 * 1024;
|
||||||
|
@ -52,7 +52,7 @@ const KdbxwebInit = {
|
||||||
'buffer:wasmMemory.buffer,' +
|
'buffer:wasmMemory.buffer,' +
|
||||||
'TOTAL_MEMORY:' + initialMemory * WASM_PAGE_SIZE +
|
'TOTAL_MEMORY:' + initialMemory * WASM_PAGE_SIZE +
|
||||||
'}';
|
'}';
|
||||||
const script = argon2LoaderCode.replace('var Module', memoryDecl + moduleDecl);
|
const script = argon2LoaderCode.replace(/^var Module.*?}/, memoryDecl + moduleDecl);
|
||||||
const blob = new Blob([script], {type: 'application/javascript'});
|
const blob = new Blob([script], {type: 'application/javascript'});
|
||||||
const objectUrl = URL.createObjectURL(blob);
|
const objectUrl = URL.createObjectURL(blob);
|
||||||
const worker = new Worker(objectUrl);
|
const worker = new Worker(objectUrl);
|
||||||
|
@ -99,7 +99,7 @@ const KdbxwebInit = {
|
||||||
}
|
}
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
logger.warn('WebAssembly error', err);
|
logger.warn('WebAssembly error', err);
|
||||||
return this.loadAsmJsFallbackRuntime();
|
throw new Error('WebAssembly error');
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue