@gryt/core 0.32.0 → 0.32.1

package/dist/mls/dmDriver.js

@@ -2,6 +2,7 @@ import { addMlsMembers, asIdentityScope, base64UrlDecode, createMlsGroup, decode
 /** Devices per person per server. Must match the server's MLS_MAX_DEVICES, or extra devices are left out quietly. */
 const MLS_MAX_DEVICES_PER_PERSON = 100;
 const COMMIT_ATTEMPTS = 5;
+const OWN_DEVICE_ADDS_AT_ONCE = 4;
 /** socket.io closes the connection on a packet with more than 10 binary parts (GRYT-1522). */
 const MAX_BINARY_PARTS = 10;
 const LOG_PAGE = MAX_BINARY_PARTS;
@@ -1072,21 +1073,29 @@ export function createMlsDmDriver(options) {
         const ids = (await store.listGroups()).map((r) => r.conversationId);
         const first = (options.order ?? []).filter((id) => ids.includes(id));
         const ordered = [...new Set([...first, ...ids])];
-        const results = [];
-        for (const conversationId of ordered) {
-            let result;
-            try {
-                result = await run(conversationId, () => addOwnDeviceTo(conversationId, deviceId, ownPersonKey));
-            }
-            catch (e) {
-                if (e instanceof MlsDriverError && e.code === "not_own_device")
-                    throw e;
-                const groupId = (await store.loadGroup(conversationId))?.groupId ?? "";
-                result = { conversationId, groupId, outcome: "failed", add: null, error: e instanceof MlsDriverError ? e.code : "error" };
+        const results = new Array(ordered.length);
+        let done = 0;
+        let next = 0;
+        // Each group is its own commit, so a few go at once; `order` still decides which start first.
+        const worker = async () => {
+            while (next < ordered.length) {
+                const i = next++;
+                const conversationId = ordered[i];
+                let result;
+                try {
+                    result = await run(conversationId, () => addOwnDeviceTo(conversationId, deviceId, ownPersonKey));
+                }
+                catch (e) {
+                    if (e instanceof MlsDriverError && e.code === "not_own_device")
+                        throw e;
+                    const groupId = (await store.loadGroup(conversationId))?.groupId ?? "";
+                    result = { conversationId, groupId, outcome: "failed", add: null, error: e instanceof MlsDriverError ? e.code : "error" };
+                }
+                results[i] = result;
+                options.onProgress?.({ done: ++done, total: ordered.length, result });
             }
-            results.push(result);
-            options.onProgress?.({ done: results.length, total: ordered.length, result });
-        }
+        };
+        await Promise.all(Array.from({ length: Math.min(OWN_DEVICE_ADDS_AT_ONCE, ordered.length) }, worker));
         return results;
     }
     return {

package/dist/pairing/approver.js

@@ -142,16 +142,30 @@ export function createApproverPairing(options) {
     }
     async function addEverywhere(ready) {
         const added = {};
-        for (const { host, deviceId } of ready) {
+        // Servers go at once, so progress is the sum over them.
+        const counts = new Map();
+        const report = (host) => {
+            let done = 0;
+            let total = 0;
+            for (const c of counts.values()) {
+                done += c.done;
+                total += c.total;
+            }
+            set({ phase: "adding", device: confirmed().device, host, done, total });
+        };
+        await Promise.all(ready.map(async ({ host, deviceId }) => {
             const driver = devices(host);
             if (!driver)
-                continue;
+                return;
             for (let tries = 0;; tries++) {
                 try {
                     added[host] = await driver.addOwnDevice(deviceId, {
-                        onProgress: ({ done, total }) => set({ phase: "adding", device: confirmed().device, host, done, total }),
+                        onProgress: ({ done, total }) => {
+                            counts.set(host, { done, total });
+                            report(host);
+                        },
                     });
-                    break;
+                    return;
                 }
                 catch (e) {
                     // The server lists N's device once its KeyPackages are in, which can trail N's "ready".
@@ -160,7 +174,7 @@ export function createApproverPairing(options) {
                     await clock.sleep(2000, abort.signal);
                 }
             }
-        }
+        }));
         return added;
     }
     /** Each group's cursor on every server in the envelope: the snapshot covers up to there. */

package/dist/pairing/newDevice.js

@@ -234,7 +234,14 @@ export function createNewDevicePairing(options) {
                 throw new Error("Not waiting to join.");
             const { from } = state;
             const body = sealJson(current.session, { t: "ready", devices: devices.map(({ host, deviceId }) => ({ host, deviceId })) });
-            await relay.post(current.id, current.token, { type: "sealed", body });
+            try {
+                await relay.post(current.id, current.token, { type: "sealed", body });
+            }
+            catch (e) {
+                // A closed before N got here: say so, rather than sit on "joining" with nothing listening.
+                await end(reasonFor(e));
+                throw e;
+            }
             set({ phase: "linked", from });
             void linked(from);
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gryt/core",
-  "version": "0.32.0",
+  "version": "0.32.1",
   "description": "Gryt's shared application logic: one implementation of the things the desktop and mobile apps both do.",
   "license": "AGPL-3.0-only",
   "repository": {