@gryt/core 0.16.1 → 0.16.2

package/dist/mls/deliveryService.fake.js

@@ -155,7 +155,8 @@ export class FakeDeliveryService {
                 if (conversationId === undefined) {
                     const devices = this.devicesOf([me]).map((d) => {
                         const at = this.deviceAddedAt.get(d.deviceId);
-                        return at ? { ...d, createdAt: at, lastSeenAt: at } : d;
+                        const lastResort = [...this.keyPackages].reverse().find((k) => k.deviceId === d.deviceId && k.lastResort)?.data ?? null;
+                        return { ...d, ...(at ? { createdAt: at, lastSeenAt: at } : {}), lastResortKeyPackage: lastResort };
                     });
                     return { ok: true, devices };
                 }

package/dist/mls/dmDriver.js

@@ -730,8 +730,10 @@ export function createMlsDmDriver(options) {
             });
         }
     }
-    /** Names from certificates under your own person key: this device's, then your leaves in each group. */
-    async function ownDeviceNames(d, wanted) {
+    /** Names from certificates under your own person key: this device's, your leaves in each group,
+        then the last-resort KeyPackage the server lists with each of your devices. */
+    async function ownDeviceNames(d, listed) {
+        const wanted = new Set(listed.map((x) => x.deviceId));
         const mine = readDeviceCertificate(d.certificate, scope);
         const names = new Map([[mine.deviceId, mine.deviceName]]);
         const unnamed = () => [...wanted].some((id) => !names.has(id));
@@ -751,6 +753,20 @@ export function createMlsDmDriver(options) {
                 }
             }
         }
+        // Checked here, not trusted: a package that doesn't verify, or isn't under your person key, names nothing.
+        for (const x of listed) {
+            if (names.has(x.deviceId) || !x.lastResortKeyPackage)
+                continue;
+            try {
+                const bytes = x.lastResortKeyPackage instanceof Uint8Array ? x.lastResortKeyPackage : new Uint8Array(x.lastResortKeyPackage);
+                const { certificate: c } = await readMlsKeyPackage(bytes, scope);
+                if (c.deviceId === x.deviceId && sameBytes(c.personPublicKey, mine.personPublicKey))
+                    names.set(x.deviceId, c.deviceName);
+            }
+            catch {
+                // Expired or malformed: the device stays unnamed rather than misnamed.
+            }
+        }
         return names;
     }
     async function ownDevices() {
@@ -759,7 +775,7 @@ export function createMlsDmDriver(options) {
             throw refused("Listing devices", r);
         const d = await ownDevice();
         const listed = r.devices.filter((x) => x.serverUserId === self);
-        const names = await ownDeviceNames(d, new Set(listed.map((x) => x.deviceId)));
+        const names = await ownDeviceNames(d, listed);
         return listed.map((x) => ({
             serverUserId: x.serverUserId,
             deviceId: x.deviceId,

package/dist/mls/interfaces.d.ts

@@ -17,6 +17,8 @@ export interface MlsDeviceRef {
 export interface MlsListedDevice extends MlsDeviceRef {
     createdAt?: string;
     lastSeenAt?: string;
+    /** On your own list: the device's last-resort KeyPackage, whose certificate names it (GRYT-1764). */
+    lastResortKeyPackage?: Uint8Array | ArrayBuffer | null;
 }
 /** The server's view of a group. `groupId` is lower-case hex. */
 export interface MlsGroupView {

package/package.json

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