chore(interop/js): adjust to new api

Author: coriolinus

interop/src/clients/corecrypto/web/mls.ts

@@ -8,7 +8,7 @@
 // Note in particular that functions _must not_ use a normal parameters list. Instead they must
 // internally destructure the `arguments` list. This is to conform with the webdriver `.execute` API.
 
-import { Ciphersuite, CoreCrypto, CredentialType, MlsTransport, MlsTransportData } from "./corecrypto.js";
+import { Ciphersuite, CoreCrypto, CredentialType, MlsTransport, } from "./corecrypto.js";
 
 declare global {
     interface Window {
@@ -25,11 +25,11 @@ export async function ccNew() {
     await initWasmModule("autogenerated/wasm-bindgen/");
 
     let [clientConfig] = arguments;
-    const clientId = new ClientId(new TextEncoder().encode(clientConfig.clientId))
+    const clientId = new ClientId(new TextEncoder().encode(clientConfig.clientId).buffer)
     const ciphersuites = clientConfig.ciphersuites.map((n) => ciphersuiteFromU16(n))
 
     const keyBytes = new Uint8Array(32);
-    const key = new DatabaseKey(keyBytes);
+    const key = new DatabaseKey(keyBytes.buffer);
     window.crypto.getRandomValues(keyBytes);
     const database = await openDatabase(clientConfig.databaseName, key);
 
@@ -53,26 +53,28 @@ export async function ccNew() {
             return "success";
         },
         async prepareForTransport(secret) {
-            return new MlsTransportData(secret.data)
+            return secret.data
         }
     };
 
     await window.cc.provideTransport(window.deliveryService);
 }
 
 export async function getKeypackage() {
-    const [kp] = await window.cc.transaction((ctx) =>
-        ctx.clientKeypackages(window.ciphersuite, window.credentialType, 1)
-    );
+    const kp = await window.cc.transaction(async (ctx) => {
+        const credentials = await ctx.findCredentials({ ciphersuite: window.ciphersuite, credentialType: window.credentialType });
+        const credential = credentials[0]
+        return await ctx.generateKeypackage(credential)
+    });
 
-    return new Uint8Array(kp);
+    return new Uint8Array(kp.serialize());
 }
 
 export async function addClient() {
-    const { ConversationId } = await import("./corecrypto.js");
+    const { ConversationId, Keypackage } = await import("./corecrypto.js");
     const [cId, kp] = arguments;
-    const conversationId = new ConversationId(Uint8Array.from(Object.values(cId)));
-    const keyPackage = Uint8Array.from(Object.values(kp));
+    const conversationId = new ConversationId(Uint8Array.from(Object.values(cId)).buffer);
+    const keyPackage = new Keypackage(Uint8Array.from(Object.values(kp)).buffer);
 
     if (!window.cc.conversationExists(conversationId)) {
         await window.cc.transaction((ctx) =>
@@ -86,8 +88,8 @@ export async function addClient() {
 export async function kickClient() {
     const { ConversationId, ClientId } = await import("./corecrypto.js");
     const [cId, clId] = arguments;
-    const conversationId = new ConversationId(Uint8Array.from(Object.values(cId)));
-    const clientId = new ClientId(Uint8Array.from(Object.values(clId)));
+    const conversationId = new ConversationId(Uint8Array.from(Object.values(cId)).buffer);
+    const clientId = new ClientId(Uint8Array.from(Object.values(clId)).buffer);
     await window.cc.transaction((ctx) =>
         ctx.removeClientsFromConversation(conversationId, [clientId]));
 }
@@ -105,8 +107,8 @@ export async function processWelcome() {
 export async function encryptMessage() {
     const { ConversationId } = await import("./corecrypto.js");
     const [cId, cleartext] = arguments;
-    const conversationId = new ConversationId(Uint8Array.from(Object.values(cId)));
-    const message = Uint8Array.from(Object.values(cleartext));
+    const conversationId = new ConversationId(Uint8Array.from(Object.values(cId)).buffer);
+    const message = Uint8Array.from(Object.values(cleartext)).buffer;
 
     return new Uint8Array(await window.cc.transaction((ctx) =>
         ctx.encryptMessage(conversationId, message)));
@@ -115,8 +117,8 @@ export async function encryptMessage() {
 export async function decryptMessage() {
     const { ConversationId } = await import("./corecrypto.js");
     const [cId, encMessage] = arguments;
-    const conversationId = new ConversationId(Uint8Array.from(Object.values(cId)));
-    const encryptedMessage = Uint8Array.from(Object.values(encMessage));
+    const conversationId = new ConversationId(Uint8Array.from(Object.values(cId)).buffer);
+    const encryptedMessage = Uint8Array.from(Object.values(encMessage)).buffer;
 
     const { message } = await window.cc.transaction((ctx) =>
         ctx.decryptMessage(conversationId, encryptedMessage)