Update to WebAssembly-powered Olm #743
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wasm Olm has a new interface: it now has an init method that needs to be called and the promise it returns waited on before the Olm module is used. Support that, and allow Crypto etc to be imported whether Olm is enabled or not. Change whether olm is enabled to be async since now it will be unavailable if the async module init fails. Don't call getOlmVersion() until the Olm.init() is done.
|
looks plausible to me :) |
By doing `Olm = global.Olm` on script load, we require that Olm is available right from the start, which isn't really necessary. As long as it appears some time before we actually want to use it, this is fine (we can probably assume it's not going to go away again..?) This means Riot doesn't need to faff about making sure olm is loaded before starting anything else.
uhoreg
reviewed
Oct 13, 2018
spec/unit/crypto.spec.js
Outdated
| it("Crypto exposes the correct olm library version", function() { | ||
| console.log(Crypto); |
There was a problem hiding this comment.
debugging line should be taken out
spec/unit/crypto.spec.js
Outdated
| it("Crypto exposes the correct olm library version", function() { | ||
| console.log(Crypto); | ||
| expect(Crypto.getOlmVersion()[0]).toEqual(2); |
There was a problem hiding this comment.
this will need to s/2/3/ since we'll need to bump the major version for olm due to backward incompatible API changes
| @@ -124,6 +128,8 @@ utils.inherits(Crypto, EventEmitter); | |||
| * Returns a promise which resolves once the crypto module is ready for use. | |||
| */ | |||
| Crypto.prototype.init = async function() { | |||
| await global.Olm.init(); | |||
There was a problem hiding this comment.
If we wrapped this in an if (global.Olm.init), would everything still work with older versions of Olm?
There was a problem hiding this comment.
hmm - probably. Not sure whether or not its worth trying.
uhoreg
approved these changes
Oct 24, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Requires https://github.com/matrix-org/olm-backup/pull/57 to be released (after which we can bump the Olm version here)
Mostly this just changes over to use the aync init of olm.