@wireapp/core-crypto 1.0.0-rc.5 → 1.0.0-rc.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wireapp/core-crypto",
-  "version": "1.0.0-rc.5",
+  "version": "1.0.0-rc.7",
   "description": "CoreCrypto bindings for the Web",
   "type": "module",
   "module": "platforms/web/corecrypto.js",

package/platforms/web/corecrypto.d.ts

@@ -262,7 +262,7 @@ export interface RotateBundle {
 	 *
 	 * @readonly
 	 */
-	commits: CommitBundle[];
+	commits: Map<string, CommitBundle>;
 	/**
 	 * Fresh KeyPackages with the new Credential
 	 *
@@ -727,6 +727,10 @@ export declare class CoreCrypto {
 	/**
 	 * Ingest a TLS-serialized MLS welcome message to join an existing MLS group
 	 *
+	 * Important: you have to catch the error with this reason "Although this Welcome seems valid, the local KeyPackage
+	 * it references has already been deleted locally. Join this group with an external commit", ignore it and then try
+	 * to join this group with an external commit.
+	 *
 	 * @param welcomeMessage - TLS-serialized MLS Welcome message
 	 * @param configuration - configuration of the MLS group
 	 * @returns The conversation ID of the newly joined group. You can use the same ID to decrypt/encrypt messages

package/platforms/web/corecrypto.js

@@ -234,12 +234,12 @@ function makeMutClosure(arg0, arg1, dtor, f) {
     return real;
 }
 function __wbg_adapter_52(arg0, arg1, arg2) {
-    wasm$1.wasm_bindgen__convert__closures__invoke1_mut__hb865a4e905934256(arg0, arg1, addHeapObject(arg2));
+    wasm$1.wasm_bindgen__convert__closures__invoke1_mut__h17baf5e1d66e67f4(arg0, arg1, addHeapObject(arg2));
 }
 function __wbg_adapter_55(arg0, arg1, arg2) {
     try {
         const retptr = wasm$1.__wbindgen_add_to_stack_pointer(-16);
-        wasm$1.wasm_bindgen__convert__closures__invoke1_mut__h2720c46d5ff6c929(retptr, arg0, arg1, addHeapObject(arg2));
+        wasm$1.wasm_bindgen__convert__closures__invoke1_mut__h98d6800184b7661d(retptr, arg0, arg1, addHeapObject(arg2));
         var r0 = getInt32Memory0()[retptr / 4 + 0];
         var r1 = getInt32Memory0()[retptr / 4 + 1];
         if (r1) {
@@ -314,7 +314,7 @@ function handleError(f, args) {
     }
 }
 function __wbg_adapter_299(arg0, arg1, arg2, arg3) {
-    wasm$1.wasm_bindgen__convert__closures__invoke2_mut__h22687e7c7a9c3c35(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
+    wasm$1.wasm_bindgen__convert__closures__invoke2_mut__haf4f26fdea6dc8ca(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
 }
 /**
 * see [core_crypto::prelude::MlsWirePolicy]
@@ -2615,7 +2615,7 @@ class RotateBundle {
         wasm$1.__wbg_rotatebundle_free(ptr);
     }
     /**
-    * @returns {Array<any>}
+    * @returns {Map<any, any>}
     */
     get commits() {
         const ret = wasm$1.rotatebundle_commits(this.__wbg_ptr);
@@ -2869,14 +2869,18 @@ function __wbg_get_imports() {
         const ret = getObject(arg0).length;
         return ret;
     };
+    imports.wbg.__wbg_new_8125e318e6245eed = function (arg0) {
+        const ret = new Uint8Array(getObject(arg0));
+        return addHeapObject(ret);
+    };
     imports.wbg.__wbg_call_01734de55d61e11d = function () {
         return handleError(function (arg0, arg1, arg2) {
             const ret = getObject(arg0).call(getObject(arg1), getObject(arg2));
             return addHeapObject(ret);
         }, arguments);
     };
-    imports.wbg.__wbindgen_number_new = function (arg0) {
-        const ret = arg0;
+    imports.wbg.__wbg_new_b51585de1b234aff = function () {
+        const ret = new Object();
         return addHeapObject(ret);
     };
     imports.wbg.__wbg_new_898a68150f225f2e = function () {
@@ -2886,12 +2890,16 @@ function __wbg_get_imports() {
     imports.wbg.__wbg_set_502d29070ea18557 = function (arg0, arg1, arg2) {
         getObject(arg0)[arg1 >>> 0] = takeObject(arg2);
     };
-    imports.wbg.__wbg_new_8125e318e6245eed = function (arg0) {
-        const ret = new Uint8Array(getObject(arg0));
+    imports.wbg.__wbindgen_bigint_from_u64 = function (arg0) {
+        const ret = BigInt.asUintN(64, arg0);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_new_b51585de1b234aff = function () {
-        const ret = new Object();
+    imports.wbg.__wbindgen_number_new = function (arg0) {
+        const ret = arg0;
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbg_ffiwiree2eidentity_new = function (arg0) {
+        const ret = FfiWireE2EIdentity.__wrap(arg0);
         return addHeapObject(ret);
     };
     imports.wbg.__wbg_proteusautoprekeybundle_new = function (arg0) {
@@ -2902,14 +2910,6 @@ function __wbg_get_imports() {
         const ret = getObject(arg0).push(getObject(arg1));
         return ret;
     };
-    imports.wbg.__wbg_ffiwiree2eidentity_new = function (arg0) {
-        const ret = FfiWireE2EIdentity.__wrap(arg0);
-        return addHeapObject(ret);
-    };
-    imports.wbg.__wbindgen_bigint_from_u64 = function (arg0) {
-        const ret = BigInt.asUintN(64, arg0);
-        return addHeapObject(ret);
-    };
     imports.wbg.__wbg_new_56693dbed0c32988 = function () {
         const ret = new Map();
         return addHeapObject(ret);
@@ -2918,9 +2918,6 @@ function __wbg_get_imports() {
         const ret = getObject(arg0).set(getObject(arg1), getObject(arg2));
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_set_841ac57cff3d672b = function (arg0, arg1, arg2) {
-        getObject(arg0)[takeObject(arg1)] = takeObject(arg2);
-    };
     imports.wbg.__wbg_new_d258248ed531ff54 = function (arg0, arg1) {
         const ret = new Error(getStringFromWasm0(arg0, arg1));
         return addHeapObject(ret);
@@ -2993,6 +2990,9 @@ function __wbg_get_imports() {
         const ret = CoreCrypto$1.__wrap(arg0);
         return addHeapObject(ret);
     };
+    imports.wbg.__wbg_set_841ac57cff3d672b = function (arg0, arg1, arg2) {
+        getObject(arg0)[takeObject(arg1)] = takeObject(arg2);
+    };
     imports.wbg.__wbg_instanceof_Promise_0e98a5bf082e090f = function (arg0) {
         let result;
         try {
@@ -3057,6 +3057,10 @@ function __wbg_get_imports() {
             state0.a = state0.b = 0;
         }
     };
+    imports.wbg.__wbindgen_is_string = function (arg0) {
+        const ret = typeof (getObject(arg0)) === 'string';
+        return ret;
+    };
     imports.wbg.__wbg_reject_7bd6ac9617013c02 = function (arg0) {
         const ret = Promise.reject(getObject(arg0));
         return addHeapObject(ret);
@@ -3134,6 +3138,10 @@ function __wbg_get_imports() {
             return addHeapObject(ret);
         }, arguments);
     };
+    imports.wbg.__wbg_now_9c5990bda04c7e53 = function () {
+        const ret = Date.now();
+        return ret;
+    };
     imports.wbg.__wbg_put_fb32824d87feec5c = function () {
         return handleError(function (arg0, arg1, arg2) {
             const ret = getObject(arg0).put(getObject(arg1), getObject(arg2));
@@ -3176,10 +3184,6 @@ function __wbg_get_imports() {
             return addHeapObject(ret);
         }, arguments);
     };
-    imports.wbg.__wbg_now_9c5990bda04c7e53 = function () {
-        const ret = Date.now();
-        return ret;
-    };
     imports.wbg.__wbindgen_memory = function () {
         const ret = wasm$1.memory;
         return addHeapObject(ret);
@@ -3222,10 +3226,6 @@ function __wbg_get_imports() {
         const ret = getObject(arg0).node;
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_is_string = function (arg0) {
-        const ret = typeof (getObject(arg0)) === 'string';
-        return ret;
-    };
     imports.wbg.__wbg_require_8f08ceecec0f4fee = function () {
         return handleError(function () {
             const ret = module.require;
@@ -3493,12 +3493,12 @@ function __wbg_get_imports() {
             return addHeapObject(ret);
         }, arguments);
     };
-    imports.wbg.__wbindgen_closure_wrapper1966 = function (arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 166, __wbg_adapter_52);
+    imports.wbg.__wbindgen_closure_wrapper1999 = function (arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 169, __wbg_adapter_52);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_closure_wrapper4730 = function (arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 166, __wbg_adapter_55);
+    imports.wbg.__wbindgen_closure_wrapper4745 = function (arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 169, __wbg_adapter_55);
         return addHeapObject(ret);
     };
     return imports;
@@ -3567,7 +3567,7 @@ var exports = /*#__PURE__*/Object.freeze({
 var wasm = async (opt = {}) => {
                 let {importHook, serverPath} = opt;
 
-                let path = "assets/core_crypto_ffi-9ad99558.wasm";
+                let path = "assets/core_crypto_ffi-663eb4cf.wasm";
 
                 if (serverPath != null) {
                     path = serverPath + /[^\/\\]*$/.exec(path)[0];
@@ -4065,6 +4065,10 @@ class CoreCrypto {
     /**
      * Ingest a TLS-serialized MLS welcome message to join an existing MLS group
      *
+     * Important: you have to catch the error with this reason "Although this Welcome seems valid, the local KeyPackage
+     * it references has already been deleted locally. Join this group with an external commit", ignore it and then try
+     * to join this group with an external commit.
+     *
      * @param welcomeMessage - TLS-serialized MLS Welcome message
      * @param configuration - configuration of the MLS group
      * @returns The conversation ID of the newly joined group. You can use the same ID to decrypt/encrypt messages
@@ -4657,7 +4661,13 @@ class CoreCrypto {
      * @param newKeyPackageCount - number of KeyPackages with new identity to generate
      */
     async e2eiRotateAll(enrollment, certificateChain, newKeyPackageCount) {
-        return await __classPrivateFieldGet(this, _CoreCrypto_cc, "f").e2ei_rotate_all(enrollment.inner(), certificateChain, newKeyPackageCount);
+        const ffiRet = await __classPrivateFieldGet(this, _CoreCrypto_cc, "f").e2ei_rotate_all(enrollment.inner(), certificateChain, newKeyPackageCount);
+        const ret = {
+            commits: ffiRet.commits,
+            newKeyPackages: ffiRet.new_key_packages,
+            keyPackageRefsToRemove: ffiRet.key_package_refs_to_remove,
+        };
+        return ret;
     }
     /**
      * Allows persisting an active enrollment (for example while redirecting the user during OAuth) in order to resume