ts-mls 1.0.2

package/dist/test/scenario/externalAddProposal.test.js

@@ -0,0 +1,69 @@
+import { createGroup, joinGroup } from "../../src/clientState";
+import { createGroupInfoWithExternalPub } from "../../src/createCommit";
+import { createCommit } from "../../src/createCommit";
+import { processPrivateMessage, processPublicMessage } from "../../src/processMessages";
+import { emptyPskIndex } from "../../src/pskIndex";
+import { getCiphersuiteImpl, getCiphersuiteFromName, ciphersuites } from "../../src/crypto/ciphersuite";
+import { generateKeyPackage } from "../../src/keyPackage";
+import { checkHpkeKeysMatch } from "../crypto/keyMatch";
+import { testEveryoneCanMessageEveryone } from "./common";
+import { defaultLifetime } from "../../src/lifetime";
+import { defaultCapabilities } from "../../src/defaultCapabilities";
+import { encodeExternalSender } from "../../src/externalSender";
+import { proposeAddExternal } from "../../src/externalProposal";
+for (const cs of Object.keys(ciphersuites)) {
+    test(`External Add Proposal ${cs}`, async () => {
+        await externalAddProposalTest(cs);
+    });
+}
+async function externalAddProposalTest(cipherSuite) {
+    const impl = await getCiphersuiteImpl(getCiphersuiteFromName(cipherSuite));
+    const aliceCredential = { credentialType: "basic", identity: new TextEncoder().encode("alice") };
+    const alice = await generateKeyPackage(aliceCredential, defaultCapabilities(), defaultLifetime, [], impl);
+    const bobCredential = { credentialType: "basic", identity: new TextEncoder().encode("bob") };
+    const bob = await generateKeyPackage(bobCredential, defaultCapabilities(), defaultLifetime, [], impl);
+    const charlieCredential = { credentialType: "basic", identity: new TextEncoder().encode("charlie") };
+    const charlie = await generateKeyPackage(charlieCredential, defaultCapabilities(), defaultLifetime, [], impl);
+    const groupId = new TextEncoder().encode("group1");
+    const externalSender = {
+        credential: charlieCredential,
+        signaturePublicKey: charlie.publicPackage.leafNode.signaturePublicKey,
+    };
+    const extension = {
+        extensionType: "external_senders",
+        extensionData: encodeExternalSender(externalSender),
+    };
+    let aliceGroup = await createGroup(groupId, alice.publicPackage, alice.privatePackage, [extension], impl);
+    const addBobProposal = {
+        proposalType: "add",
+        add: {
+            keyPackage: bob.publicPackage,
+        },
+    };
+    const addBobCommitResult = await createCommit(aliceGroup, emptyPskIndex, false, [addBobProposal], impl);
+    aliceGroup = addBobCommitResult.newState;
+    let bobGroup = await joinGroup(addBobCommitResult.welcome, bob.publicPackage, bob.privatePackage, emptyPskIndex, impl, aliceGroup.ratchetTree);
+    // external pub not really necessary here
+    const groupInfo = await createGroupInfoWithExternalPub(aliceGroup, impl);
+    const addCharlieProposal = await proposeAddExternal(groupInfo, charlie.publicPackage, charlie.privatePackage, impl);
+    if (addCharlieProposal.wireformat !== "mls_public_message")
+        throw new Error("Expected public message");
+    const aliceProcessCharlieProposalResult = await processPublicMessage(aliceGroup, addCharlieProposal.publicMessage, emptyPskIndex, impl);
+    aliceGroup = aliceProcessCharlieProposalResult.newState;
+    const bobProcessCharlieProposalResult = await processPublicMessage(bobGroup, addCharlieProposal.publicMessage, emptyPskIndex, impl);
+    bobGroup = bobProcessCharlieProposalResult.newState;
+    const addCharlieCommitResult = await createCommit(aliceGroup, emptyPskIndex, false, [], impl);
+    aliceGroup = addCharlieCommitResult.newState;
+    if (addCharlieCommitResult.commit.wireformat !== "mls_private_message")
+        throw new Error("Expected private message");
+    const processAddCharlieResult = await processPrivateMessage(bobGroup, addCharlieCommitResult.commit.privateMessage, emptyPskIndex, impl);
+    bobGroup = processAddCharlieResult.newState;
+    expect(bobGroup.keySchedule.epochAuthenticator).toStrictEqual(aliceGroup.keySchedule.epochAuthenticator);
+    let charlieGroup = await joinGroup(addCharlieCommitResult.welcome, charlie.publicPackage, charlie.privatePackage, emptyPskIndex, impl, aliceGroup.ratchetTree);
+    expect(charlieGroup.keySchedule.epochAuthenticator).toStrictEqual(aliceGroup.keySchedule.epochAuthenticator);
+    await checkHpkeKeysMatch(aliceGroup, impl);
+    await checkHpkeKeysMatch(bobGroup, impl);
+    await checkHpkeKeysMatch(charlieGroup, impl);
+    await testEveryoneCanMessageEveryone([aliceGroup, bobGroup, charlieGroup], impl);
+}
+//# sourceMappingURL=externalAddProposal.test.js.map

package/dist/test/scenario/externalAddProposal.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"externalAddProposal.test.js","sourceRoot":"","sources":["../../../test/scenario/externalAddProposal.test.ts"],"names":[],"mappings":"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"}

package/dist/test/scenario/externalJoin.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test/scenario/externalJoin.test.js

@@ -0,0 +1,51 @@
+import { createGroup, joinGroup, makePskIndex } from "../../src/clientState";
+import { createGroupInfoWithExternalPubAndRatchetTree, joinGroupExternal } from "../../src/createCommit";
+import { createCommit } from "../../src/createCommit";
+import { processPublicMessage } from "../../src/processMessages";
+import { emptyPskIndex } from "../../src/pskIndex";
+import { getCiphersuiteImpl, getCiphersuiteFromName, ciphersuites } from "../../src/crypto/ciphersuite";
+import { generateKeyPackage } from "../../src/keyPackage";
+import { checkHpkeKeysMatch } from "../crypto/keyMatch";
+import { testEveryoneCanMessageEveryone } from "./common";
+import { defaultLifetime } from "../../src/lifetime";
+import { defaultCapabilities } from "../../src/defaultCapabilities";
+for (const cs of Object.keys(ciphersuites)) {
+    test(`External join ${cs}`, async () => {
+        await externalJoin(cs);
+    });
+}
+async function externalJoin(cipherSuite) {
+    const impl = await getCiphersuiteImpl(getCiphersuiteFromName(cipherSuite));
+    const aliceCredential = { credentialType: "basic", identity: new TextEncoder().encode("alice") };
+    const alice = await generateKeyPackage(aliceCredential, defaultCapabilities(), defaultLifetime, [], impl);
+    const groupId = new TextEncoder().encode("group1");
+    let aliceGroup = await createGroup(groupId, alice.publicPackage, alice.privatePackage, [], impl);
+    const bobCredential = { credentialType: "basic", identity: new TextEncoder().encode("bob") };
+    const bob = await generateKeyPackage(bobCredential, defaultCapabilities(), defaultLifetime, [], impl);
+    const charlieCredential = { credentialType: "basic", identity: new TextEncoder().encode("charlie") };
+    const charlie = await generateKeyPackage(charlieCredential, defaultCapabilities(), defaultLifetime, [], impl);
+    const addBobProposal = {
+        proposalType: "add",
+        add: {
+            keyPackage: bob.publicPackage,
+        },
+    };
+    const addBobCommitResult = await createCommit(aliceGroup, emptyPskIndex, false, [addBobProposal], impl);
+    aliceGroup = addBobCommitResult.newState;
+    let bobGroup = await joinGroup(addBobCommitResult.welcome, bob.publicPackage, bob.privatePackage, emptyPskIndex, impl, aliceGroup.ratchetTree);
+    expect(bobGroup.keySchedule.epochAuthenticator).toStrictEqual(aliceGroup.keySchedule.epochAuthenticator);
+    const groupInfo = await createGroupInfoWithExternalPubAndRatchetTree(aliceGroup, impl);
+    const charlieJoinGroupCommitResult = await joinGroupExternal(groupInfo, charlie.publicPackage, charlie.privatePackage, false, impl);
+    let charlieGroup = charlieJoinGroupCommitResult.newState;
+    const aliceProcessCharlieJoinResult = await processPublicMessage(aliceGroup, charlieJoinGroupCommitResult.publicMessage, makePskIndex(aliceGroup, {}), impl);
+    aliceGroup = aliceProcessCharlieJoinResult.newState;
+    const bobProcessCharlieJoinResult = await processPublicMessage(bobGroup, charlieJoinGroupCommitResult.publicMessage, makePskIndex(bobGroup, {}), impl);
+    bobGroup = bobProcessCharlieJoinResult.newState;
+    expect(charlieGroup.keySchedule.epochAuthenticator).toStrictEqual(aliceGroup.keySchedule.epochAuthenticator);
+    expect(charlieGroup.keySchedule.epochAuthenticator).toStrictEqual(bobGroup.keySchedule.epochAuthenticator);
+    await checkHpkeKeysMatch(aliceGroup, impl);
+    await checkHpkeKeysMatch(bobGroup, impl);
+    await checkHpkeKeysMatch(charlieGroup, impl);
+    await testEveryoneCanMessageEveryone([aliceGroup, bobGroup, charlieGroup], impl);
+}
+//# sourceMappingURL=externalJoin.test.js.map

package/dist/test/scenario/externalJoin.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"externalJoin.test.js","sourceRoot":"","sources":["../../../test/scenario/externalJoin.test.ts"],"names":[],"mappings":"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"}

package/dist/test/scenario/externalJoinResync.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test/scenario/externalJoinResync.test.js

@@ -0,0 +1,59 @@
+import { createGroup, joinGroup, makePskIndex } from "../../src/clientState";
+import { createGroupInfoWithExternalPubAndRatchetTree, joinGroupExternal } from "../../src/createCommit";
+import { createCommit } from "../../src/createCommit";
+import { processPublicMessage } from "../../src/processMessages";
+import { emptyPskIndex } from "../../src/pskIndex";
+import { getCiphersuiteImpl, getCiphersuiteFromName, ciphersuites } from "../../src/crypto/ciphersuite";
+import { generateKeyPackage } from "../../src/keyPackage";
+import { checkHpkeKeysMatch } from "../crypto/keyMatch";
+import { testEveryoneCanMessageEveryone } from "./common";
+import { defaultLifetime } from "../../src/lifetime";
+import { defaultCapabilities } from "../../src/defaultCapabilities";
+for (const cs of Object.keys(ciphersuites)) {
+    test(`External join Resync ${cs}`, async () => {
+        await externalJoinResyncTest(cs);
+    });
+}
+async function externalJoinResyncTest(cipherSuite) {
+    const impl = await getCiphersuiteImpl(getCiphersuiteFromName(cipherSuite));
+    const aliceCredential = { credentialType: "basic", identity: new TextEncoder().encode("alice") };
+    const alice = await generateKeyPackage(aliceCredential, defaultCapabilities(), defaultLifetime, [], impl);
+    const groupId = new TextEncoder().encode("group1");
+    let aliceGroup = await createGroup(groupId, alice.publicPackage, alice.privatePackage, [], impl);
+    const bobCredential = { credentialType: "basic", identity: new TextEncoder().encode("bob") };
+    const bob = await generateKeyPackage(bobCredential, defaultCapabilities(), defaultLifetime, [], impl);
+    const charlieCredential = { credentialType: "basic", identity: new TextEncoder().encode("charlie") };
+    const charlie = await generateKeyPackage(charlieCredential, defaultCapabilities(), defaultLifetime, [], impl);
+    const addBobProposal = {
+        proposalType: "add",
+        add: {
+            keyPackage: bob.publicPackage,
+        },
+    };
+    const addCharlieProposal = {
+        proposalType: "add",
+        add: {
+            keyPackage: charlie.publicPackage,
+        },
+    };
+    const addBobAndCharlieCommitResult = await createCommit(aliceGroup, emptyPskIndex, false, [addBobProposal, addCharlieProposal], impl, true);
+    aliceGroup = addBobAndCharlieCommitResult.newState;
+    let bobGroup = await joinGroup(addBobAndCharlieCommitResult.welcome, bob.publicPackage, bob.privatePackage, emptyPskIndex, impl);
+    expect(bobGroup.keySchedule.epochAuthenticator).toStrictEqual(aliceGroup.keySchedule.epochAuthenticator);
+    let charlieGroup = await joinGroup(addBobAndCharlieCommitResult.welcome, charlie.publicPackage, charlie.privatePackage, emptyPskIndex, impl);
+    expect(charlieGroup.keySchedule.epochAuthenticator).toStrictEqual(aliceGroup.keySchedule.epochAuthenticator);
+    const groupInfo = await createGroupInfoWithExternalPubAndRatchetTree(charlieGroup, impl);
+    const charlieResyncCommitResult = await joinGroupExternal(groupInfo, charlie.publicPackage, charlie.privatePackage, true, impl);
+    charlieGroup = charlieResyncCommitResult.newState;
+    const aliceProcessCharlieResyncResult = await processPublicMessage(aliceGroup, charlieResyncCommitResult.publicMessage, makePskIndex(aliceGroup, {}), impl);
+    aliceGroup = aliceProcessCharlieResyncResult.newState;
+    const bobProcessCharlieResyncResult = await processPublicMessage(bobGroup, charlieResyncCommitResult.publicMessage, makePskIndex(bobGroup, {}), impl);
+    bobGroup = bobProcessCharlieResyncResult.newState;
+    expect(charlieGroup.keySchedule.epochAuthenticator).toStrictEqual(aliceGroup.keySchedule.epochAuthenticator);
+    expect(charlieGroup.keySchedule.epochAuthenticator).toStrictEqual(bobGroup.keySchedule.epochAuthenticator);
+    await checkHpkeKeysMatch(aliceGroup, impl);
+    await checkHpkeKeysMatch(bobGroup, impl);
+    await checkHpkeKeysMatch(charlieGroup, impl);
+    await testEveryoneCanMessageEveryone([aliceGroup, bobGroup, charlieGroup], impl);
+}
+//# sourceMappingURL=externalJoinResync.test.js.map

package/dist/test/scenario/externalJoinResync.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"externalJoinResync.test.js","sourceRoot":"","sources":["../../../test/scenario/externalJoinResync.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAC5E,OAAO,EAAE,4CAA4C,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AACxG,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAElD,OAAO,EAAmB,kBAAkB,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AACxH,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAA;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAA;AAEnE,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;IAC3C,IAAI,CAAC,wBAAwB,EAAE,EAAE,EAAE,KAAK,IAAI,EAAE;QAC5C,MAAM,sBAAsB,CAAC,EAAqB,CAAC,CAAA;IACrD,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,KAAK,UAAU,sBAAsB,CAAC,WAA4B;IAChE,MAAM,IAAI,GAAG,MAAM,kBAAkB,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC,CAAA;IAE1E,MAAM,eAAe,GAAe,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAA;IAC5G,MAAM,KAAK,GAAG,MAAM,kBAAkB,CAAC,eAAe,EAAE,mBAAmB,EAAE,EAAE,eAAe,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;IAEzG,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IAElD,IAAI,UAAU,GAAG,MAAM,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,aAAa,EAAE,KAAK,CAAC,cAAc,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;IAEhG,MAAM,aAAa,GAAe,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAA;IACxG,MAAM,GAAG,GAAG,MAAM,kBAAkB,CAAC,aAAa,EAAE,mBAAmB,EAAE,EAAE,eAAe,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;IAErG,MAAM,iBAAiB,GAAe,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAA;IAChH,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,iBAAiB,EAAE,mBAAmB,EAAE,EAAE,eAAe,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;IAE7G,MAAM,cAAc,GAAgB;QAClC,YAAY,EAAE,KAAK;QACnB,GAAG,EAAE;YACH,UAAU,EAAE,GAAG,CAAC,aAAa;SAC9B;KACF,CAAA;IAED,MAAM,kBAAkB,GAAgB;QACtC,YAAY,EAAE,KAAK;QACnB,GAAG,EAAE;YACH,UAAU,EAAE,OAAO,CAAC,aAAa;SAClC;KACF,CAAA;IAED,MAAM,4BAA4B,GAAG,MAAM,YAAY,CACrD,UAAU,EACV,aAAa,EACb,KAAK,EACL,CAAC,cAAc,EAAE,kBAAkB,CAAC,EACpC,IAAI,EACJ,IAAI,CACL,CAAA;IAED,UAAU,GAAG,4BAA4B,CAAC,QAAQ,CAAA;IAElD,IAAI,QAAQ,GAAG,MAAM,SAAS,CAC5B,4BAA4B,CAAC,OAAQ,EACrC,GAAG,CAAC,aAAa,EACjB,GAAG,CAAC,cAAc,EAClB,aAAa,EACb,IAAI,CACL,CAAA;IAED,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAA;IAExG,IAAI,YAAY,GAAG,MAAM,SAAS,CAChC,4BAA4B,CAAC,OAAQ,EACrC,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,cAAc,EACtB,aAAa,EACb,IAAI,CACL,CAAA;IAED,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAA;IAE5G,MAAM,SAAS,GAAG,MAAM,4CAA4C,CAAC,YAAY,EAAE,IAAI,CAAC,CAAA;IAExF,MAAM,yBAAyB,GAAG,MAAM,iBAAiB,CACvD,SAAS,EACT,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,cAAc,EACtB,IAAI,EACJ,IAAI,CACL,CAAA;IAED,YAAY,GAAG,yBAAyB,CAAC,QAAQ,CAAA;IAEjD,MAAM,+BAA+B,GAAG,MAAM,oBAAoB,CAChE,UAAU,EACV,yBAAyB,CAAC,aAAa,EACvC,YAAY,CAAC,UAAU,EAAE,EAAE,CAAC,EAC5B,IAAI,CACL,CAAA;IAED,UAAU,GAAG,+BAA+B,CAAC,QAAQ,CAAA;IAErD,MAAM,6BAA6B,GAAG,MAAM,oBAAoB,CAC9D,QAAQ,EACR,yBAAyB,CAAC,aAAa,EACvC,YAAY,CAAC,QAAQ,EAAE,EAAE,CAAC,EAC1B,IAAI,CACL,CAAA;IAED,QAAQ,GAAG,6BAA6B,CAAC,QAAQ,CAAA;IAEjD,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAA;IAC5G,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAA;IAE1G,MAAM,kBAAkB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;IAC1C,MAAM,kBAAkB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IACxC,MAAM,kBAAkB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAA;IAC5C,MAAM,8BAA8B,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAE,IAAI,CAAC,CAAA;AAClF,CAAC"}

package/dist/test/scenario/externalProposal.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test/scenario/externalProposal.test.js

@@ -0,0 +1,69 @@
+import { createGroup, joinGroup } from "../../src/clientState";
+import { createGroupInfoWithExternalPub } from "../../src/createCommit";
+import { createCommit } from "../../src/createCommit";
+import { processPrivateMessage, processPublicMessage } from "../../src/processMessages";
+import { emptyPskIndex } from "../../src/pskIndex";
+import { getCiphersuiteImpl, getCiphersuiteFromName, ciphersuites } from "../../src/crypto/ciphersuite";
+import { generateKeyPackage } from "../../src/keyPackage";
+import { checkHpkeKeysMatch } from "../crypto/keyMatch";
+import { defaultLifetime } from "../../src/lifetime";
+import { defaultCapabilities } from "../../src/defaultCapabilities";
+import { encodeExternalSender } from "../../src/externalSender";
+import { proposeExternal } from "../../src/externalProposal";
+for (const cs of Object.keys(ciphersuites)) {
+    test(`External Proposal ${cs}`, async () => {
+        await externalProposalTest(cs);
+    });
+}
+async function externalProposalTest(cipherSuite) {
+    const impl = await getCiphersuiteImpl(getCiphersuiteFromName(cipherSuite));
+    const aliceCredential = { credentialType: "basic", identity: new TextEncoder().encode("alice") };
+    const alice = await generateKeyPackage(aliceCredential, defaultCapabilities(), defaultLifetime, [], impl);
+    const bobCredential = { credentialType: "basic", identity: new TextEncoder().encode("bob") };
+    const bob = await generateKeyPackage(bobCredential, defaultCapabilities(), defaultLifetime, [], impl);
+    const charlieCredential = { credentialType: "basic", identity: new TextEncoder().encode("charlie") };
+    const charlie = await generateKeyPackage(charlieCredential, defaultCapabilities(), defaultLifetime, [], impl);
+    const groupId = new TextEncoder().encode("group1");
+    const externalSender = {
+        credential: charlieCredential,
+        signaturePublicKey: charlie.publicPackage.leafNode.signaturePublicKey,
+    };
+    const extension = {
+        extensionType: "external_senders",
+        extensionData: encodeExternalSender(externalSender),
+    };
+    let aliceGroup = await createGroup(groupId, alice.publicPackage, alice.privatePackage, [extension], impl);
+    const addBobProposal = {
+        proposalType: "add",
+        add: {
+            keyPackage: bob.publicPackage,
+        },
+    };
+    const addBobCommitResult = await createCommit(aliceGroup, emptyPskIndex, false, [addBobProposal], impl);
+    aliceGroup = addBobCommitResult.newState;
+    let bobGroup = await joinGroup(addBobCommitResult.welcome, bob.publicPackage, bob.privatePackage, emptyPskIndex, impl, aliceGroup.ratchetTree);
+    // external pub not really necessary here
+    const groupInfo = await createGroupInfoWithExternalPub(aliceGroup, impl);
+    const removeBobProposal = {
+        proposalType: "remove",
+        remove: {
+            removed: 1,
+        },
+    };
+    const addCharlieProposal = await proposeExternal(groupInfo, removeBobProposal, charlie.publicPackage.leafNode.signaturePublicKey, charlie.privatePackage.signaturePrivateKey, impl);
+    if (addCharlieProposal.wireformat !== "mls_public_message")
+        throw new Error("Expected public message");
+    const aliceProcessCharlieProposalResult = await processPublicMessage(aliceGroup, addCharlieProposal.publicMessage, emptyPskIndex, impl);
+    aliceGroup = aliceProcessCharlieProposalResult.newState;
+    const bobProcessCharlieProposalResult = await processPublicMessage(bobGroup, addCharlieProposal.publicMessage, emptyPskIndex, impl);
+    bobGroup = bobProcessCharlieProposalResult.newState;
+    const removeBobCommitResult = await createCommit(aliceGroup, emptyPskIndex, false, [], impl);
+    aliceGroup = removeBobCommitResult.newState;
+    if (removeBobCommitResult.commit.wireformat !== "mls_private_message")
+        throw new Error("Expected private message");
+    const processRemoveBobResult = await processPrivateMessage(bobGroup, removeBobCommitResult.commit.privateMessage, emptyPskIndex, impl);
+    bobGroup = processRemoveBobResult.newState;
+    expect(bobGroup.groupActiveState.kind).toBe("removedFromGroup");
+    await checkHpkeKeysMatch(aliceGroup, impl);
+}
+//# sourceMappingURL=externalProposal.test.js.map

package/dist/test/scenario/externalProposal.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"externalProposal.test.js","sourceRoot":"","sources":["../../../test/scenario/externalProposal.test.ts"],"names":[],"mappings":"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"}

package/dist/test/scenario/externalPsk.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test/scenario/externalPsk.test.js

@@ -0,0 +1,73 @@
+import { createGroup, joinGroup, makePskIndex } from "../../src/clientState";
+import { createCommit } from "../../src/createCommit";
+import { processPrivateMessage } from "../../src/processMessages";
+import { emptyPskIndex } from "../../src/pskIndex";
+import { ciphersuites, getCiphersuiteFromName, getCiphersuiteImpl } from "../../src/crypto/ciphersuite";
+import { generateKeyPackage } from "../../src/keyPackage";
+import { bytesToBase64 } from "../../src/util/byteArray";
+import { checkHpkeKeysMatch } from "../crypto/keyMatch";
+import { testEveryoneCanMessageEveryone } from "./common";
+import { defaultLifetime } from "../../src/lifetime";
+import { defaultCapabilities } from "../../src/defaultCapabilities";
+for (const cs of Object.keys(ciphersuites)) {
+    test(`External PSK ${cs}`, async () => {
+        await externalPsk(cs);
+    });
+}
+async function externalPsk(cipherSuite) {
+    const impl = await getCiphersuiteImpl(getCiphersuiteFromName(cipherSuite));
+    const aliceCredential = { credentialType: "basic", identity: new TextEncoder().encode("alice") };
+    const alice = await generateKeyPackage(aliceCredential, defaultCapabilities(), defaultLifetime, [], impl);
+    const groupId = new TextEncoder().encode("group1");
+    let aliceGroup = await createGroup(groupId, alice.publicPackage, alice.privatePackage, [], impl);
+    const bobCredential = { credentialType: "basic", identity: new TextEncoder().encode("bob") };
+    const bob = await generateKeyPackage(bobCredential, defaultCapabilities(), defaultLifetime, [], impl);
+    const addBobProposal = {
+        proposalType: "add",
+        add: {
+            keyPackage: bob.publicPackage,
+        },
+    };
+    const commitResult = await createCommit(aliceGroup, emptyPskIndex, false, [addBobProposal], impl);
+    aliceGroup = commitResult.newState;
+    let bobGroup = await joinGroup(commitResult.welcome, bob.publicPackage, bob.privatePackage, emptyPskIndex, impl, aliceGroup.ratchetTree);
+    const pskSecret1 = impl.rng.randomBytes(impl.kdf.size);
+    const pskSecret2 = impl.rng.randomBytes(impl.kdf.size);
+    const pskNonce1 = impl.rng.randomBytes(impl.kdf.size);
+    const pskNonce2 = impl.rng.randomBytes(impl.kdf.size);
+    const pskId1 = new TextEncoder().encode("psk-1");
+    const pskId2 = new TextEncoder().encode("psk-1");
+    const pskProposal1 = {
+        proposalType: "psk",
+        psk: {
+            preSharedKeyId: {
+                psktype: "external",
+                pskId: pskId1,
+                pskNonce: pskNonce1,
+            },
+        },
+    };
+    const pskProposal2 = {
+        proposalType: "psk",
+        psk: {
+            preSharedKeyId: {
+                psktype: "external",
+                pskId: pskId2,
+                pskNonce: pskNonce2,
+            },
+        },
+    };
+    const base64PskId1 = bytesToBase64(pskId1);
+    const base64PskId2 = bytesToBase64(pskId2);
+    const sharedPsks = { [base64PskId1]: pskSecret1, [base64PskId2]: pskSecret2 };
+    const pskCommitResult = await createCommit(aliceGroup, makePskIndex(aliceGroup, sharedPsks), false, [pskProposal1, pskProposal2], impl);
+    aliceGroup = pskCommitResult.newState;
+    if (pskCommitResult.commit.wireformat !== "mls_private_message")
+        throw new Error("Expected private message");
+    const processPskResult = await processPrivateMessage(bobGroup, pskCommitResult.commit.privateMessage, makePskIndex(bobGroup, sharedPsks), impl);
+    bobGroup = processPskResult.newState;
+    await testEveryoneCanMessageEveryone([aliceGroup, bobGroup], impl);
+    await checkHpkeKeysMatch(aliceGroup, impl);
+    await checkHpkeKeysMatch(bobGroup, impl);
+}
+//# sourceMappingURL=externalPsk.test.js.map

package/dist/test/scenario/externalPsk.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"externalPsk.test.js","sourceRoot":"","sources":["../../../test/scenario/externalPsk.test.ts"],"names":[],"mappings":"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"}

package/dist/test/scenario/externalPskJoin.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test/scenario/externalPskJoin.test.js

@@ -0,0 +1,51 @@
+import { createGroup, joinGroup, makePskIndex } from "../../src/clientState";
+import { createCommit } from "../../src/createCommit";
+import { ciphersuites, getCiphersuiteFromName, getCiphersuiteImpl } from "../../src/crypto/ciphersuite";
+import { generateKeyPackage } from "../../src/keyPackage";
+import { bytesToBase64 } from "../../src/util/byteArray";
+import { checkHpkeKeysMatch } from "../crypto/keyMatch";
+import { testEveryoneCanMessageEveryone } from "./common";
+import { defaultLifetime } from "../../src/lifetime";
+import { defaultCapabilities } from "../../src/defaultCapabilities";
+for (const cs of Object.keys(ciphersuites)) {
+    test(`External PSK Join ${cs}`, async () => {
+        await externalPskJoin(cs);
+    });
+}
+async function externalPskJoin(cipherSuite) {
+    const impl = await getCiphersuiteImpl(getCiphersuiteFromName(cipherSuite));
+    const aliceCredential = { credentialType: "basic", identity: new TextEncoder().encode("alice") };
+    const alice = await generateKeyPackage(aliceCredential, defaultCapabilities(), defaultLifetime, [], impl);
+    const groupId = new TextEncoder().encode("group1");
+    let aliceGroup = await createGroup(groupId, alice.publicPackage, alice.privatePackage, [], impl);
+    const bobCredential = { credentialType: "basic", identity: new TextEncoder().encode("bob") };
+    const bob = await generateKeyPackage(bobCredential, defaultCapabilities(), defaultLifetime, [], impl);
+    const addBobProposal = {
+        proposalType: "add",
+        add: {
+            keyPackage: bob.publicPackage,
+        },
+    };
+    const pskSecret = impl.rng.randomBytes(impl.kdf.size);
+    const pskNonce = impl.rng.randomBytes(impl.kdf.size);
+    const pskId = new TextEncoder().encode("psk-1");
+    const pskProposal = {
+        proposalType: "psk",
+        psk: {
+            preSharedKeyId: {
+                psktype: "external",
+                pskId,
+                pskNonce,
+            },
+        },
+    };
+    const base64PskId = bytesToBase64(pskId);
+    const sharedPsks = { [base64PskId]: pskSecret };
+    const commitResult = await createCommit(aliceGroup, makePskIndex(aliceGroup, sharedPsks), false, [addBobProposal, pskProposal], impl);
+    aliceGroup = commitResult.newState;
+    let bobGroup = await joinGroup(commitResult.welcome, bob.publicPackage, bob.privatePackage, makePskIndex(undefined, sharedPsks), impl, aliceGroup.ratchetTree);
+    await testEveryoneCanMessageEveryone([aliceGroup, bobGroup], impl);
+    await checkHpkeKeysMatch(aliceGroup, impl);
+    await checkHpkeKeysMatch(bobGroup, impl);
+}
+//# sourceMappingURL=externalPskJoin.test.js.map

package/dist/test/scenario/externalPskJoin.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"externalPskJoin.test.js","sourceRoot":"","sources":["../../../test/scenario/externalPskJoin.test.ts"],"names":[],"mappings":"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"}

package/dist/test/scenario/generationOutOfOrder.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test/scenario/generationOutOfOrder.test.js

@@ -0,0 +1,111 @@
+import { createGroup, joinGroup, makePskIndex } from "../../src/clientState";
+import { createCommit } from "../../src/createCommit";
+import { createApplicationMessage } from "../../src/createMessage";
+import { processPrivateMessage } from "../../src/processMessages";
+import { emptyPskIndex } from "../../src/pskIndex";
+import { ciphersuites, getCiphersuiteFromName, getCiphersuiteImpl, } from "../../src/crypto/ciphersuite";
+import { generateKeyPackage } from "../../src/keyPackage";
+import { shuffledIndices, testEveryoneCanMessageEveryone } from "./common";
+import { defaultLifetime } from "../../src/lifetime";
+import { defaultCapabilities } from "../../src/defaultCapabilities";
+import { defaultKeyRetentionConfig } from "../../src/keyRetentionConfig";
+import { ValidationError } from "../../src/mlsError";
+import { defaultClientConfig } from "../../src/clientConfig";
+describe("Out of order message processing by generation", () => {
+    for (const cs of Object.keys(ciphersuites)) {
+        test(`Out of order generation ${cs}`, async () => {
+            await generationOutOfOrder(cs);
+        });
+    }
+    for (const cs of Object.keys(ciphersuites)) {
+        test(`Out of order generation random ${cs}`, async () => {
+            await generationOutOfOrderRandom(cs, defaultKeyRetentionConfig.retainKeysForGenerations);
+        });
+    }
+    for (const cs of Object.keys(ciphersuites)) {
+        test(`Out of order generation limit reached fails ${cs}`, async () => {
+            await generationOutOfOrderLimitFails(cs, 10);
+        });
+    }
+});
+async function setupTestParticipants(cipherSuite, retainConfig) {
+    const impl = await getCiphersuiteImpl(getCiphersuiteFromName(cipherSuite));
+    const aliceCredential = { credentialType: "basic", identity: new TextEncoder().encode("alice") };
+    const alice = await generateKeyPackage(aliceCredential, defaultCapabilities(), defaultLifetime, [], impl);
+    const groupId = new TextEncoder().encode("group1");
+    let aliceGroup = await createGroup(groupId, alice.publicPackage, alice.privatePackage, [], impl);
+    const bobCredential = { credentialType: "basic", identity: new TextEncoder().encode("bob") };
+    const bob = await generateKeyPackage(bobCredential, defaultCapabilities(), defaultLifetime, [], impl);
+    const addBobProposal = {
+        proposalType: "add",
+        add: {
+            keyPackage: bob.publicPackage,
+        },
+    };
+    const addBobCommitResult = await createCommit(aliceGroup, emptyPskIndex, false, [addBobProposal], impl, true);
+    aliceGroup = addBobCommitResult.newState;
+    const bobGroup = await joinGroup(addBobCommitResult.welcome, bob.publicPackage, bob.privatePackage, emptyPskIndex, impl, undefined, undefined, { ...defaultClientConfig, keyRetentionConfig: retainConfig ?? defaultClientConfig.keyRetentionConfig });
+    return { aliceGroup, bobGroup, impl };
+}
+async function generationOutOfOrder(cipherSuite) {
+    const { aliceGroup: initialAliceGroup, bobGroup: initialBobGroup, impl } = await setupTestParticipants(cipherSuite);
+    let aliceGroup = initialAliceGroup;
+    let bobGroup = initialBobGroup;
+    const firstMessage = new TextEncoder().encode("Hello bob!");
+    const secondMessage = new TextEncoder().encode("How are ya?");
+    const thirdMessage = new TextEncoder().encode("Have you heard the news?");
+    // alice sends the first message
+    const aliceCreateFirstMessageResult = await createApplicationMessage(aliceGroup, firstMessage, impl);
+    aliceGroup = aliceCreateFirstMessageResult.newState;
+    const aliceCreateSecondMessageResult = await createApplicationMessage(aliceGroup, secondMessage, impl);
+    aliceGroup = aliceCreateSecondMessageResult.newState;
+    const aliceCreateThirdMessageResult = await createApplicationMessage(aliceGroup, thirdMessage, impl);
+    aliceGroup = aliceCreateThirdMessageResult.newState;
+    // bob receives 3rd message first
+    const bobProcessThirdMessageResult = await processPrivateMessage(bobGroup, aliceCreateThirdMessageResult.privateMessage, makePskIndex(bobGroup, {}), impl);
+    bobGroup = bobProcessThirdMessageResult.newState;
+    // then bob receives the first message
+    const bobProcessFirstMessageResult = await processPrivateMessage(bobGroup, aliceCreateFirstMessageResult.privateMessage, makePskIndex(bobGroup, {}), impl);
+    bobGroup = bobProcessFirstMessageResult.newState;
+    // bob receives 2nd message last
+    const bobProcessSecondMessageResult = await processPrivateMessage(bobGroup, aliceCreateSecondMessageResult.privateMessage, makePskIndex(bobGroup, {}), impl);
+    bobGroup = bobProcessSecondMessageResult.newState;
+    await testEveryoneCanMessageEveryone([aliceGroup, bobGroup], impl);
+}
+async function generationOutOfOrderRandom(cipherSuite, totalMessages) {
+    const { aliceGroup: initialAliceGroup, bobGroup: initialBobGroup, impl } = await setupTestParticipants(cipherSuite);
+    let aliceGroup = initialAliceGroup;
+    let bobGroup = initialBobGroup;
+    const message = new TextEncoder().encode("Hi!");
+    let messages = [];
+    for (let i = 0; i < totalMessages; i++) {
+        const createMessageResult = await createApplicationMessage(aliceGroup, message, impl);
+        aliceGroup = createMessageResult.newState;
+        messages.push(createMessageResult.privateMessage);
+    }
+    const shuffledMessages = shuffledIndices(messages).map((i) => messages[i]);
+    for (const msg of shuffledMessages) {
+        const bobProcessMessageResult = await processPrivateMessage(bobGroup, msg, makePskIndex(bobGroup, {}), impl);
+        bobGroup = bobProcessMessageResult.newState;
+    }
+    await testEveryoneCanMessageEveryone([aliceGroup, bobGroup], impl);
+}
+async function generationOutOfOrderLimitFails(cipherSuite, totalMessages) {
+    const retainConfig = { ...defaultKeyRetentionConfig, retainKeysForGenerations: totalMessages - 1 };
+    const { aliceGroup: initialAliceGroup, bobGroup: initialBobGroup, impl, } = await setupTestParticipants(cipherSuite, retainConfig);
+    let aliceGroup = initialAliceGroup;
+    let bobGroup = initialBobGroup;
+    const message = new TextEncoder().encode("Hi!");
+    let messages = [];
+    for (let i = 0; i < totalMessages + 1; i++) {
+        const createMessageResult = await createApplicationMessage(aliceGroup, message, impl);
+        aliceGroup = createMessageResult.newState;
+        messages.push(createMessageResult.privateMessage);
+    }
+    // read the last message first
+    const processResult = await processPrivateMessage(bobGroup, messages.at(-1), emptyPskIndex, impl);
+    bobGroup = processResult.newState;
+    // should fail reading the first message
+    await expect(processPrivateMessage(bobGroup, messages.at(0), emptyPskIndex, impl)).rejects.toThrow(ValidationError);
+}
+//# sourceMappingURL=generationOutOfOrder.test.js.map

package/dist/test/scenario/generationOutOfOrder.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generationOutOfOrder.test.js","sourceRoot":"","sources":["../../../test/scenario/generationOutOfOrder.test.ts"],"names":[],"mappings":"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"}

package/dist/test/scenario/grease.test.d.ts

@@ -0,0 +1 @@
+export {};