@gryt/core 0.33.0 → 0.33.1

package/dist/pairing/approver.js

@@ -239,7 +239,10 @@ export function createApproverPairing(options) {
         }
         set({ phase: "sending", device, added });
         await sender.send(tail.take(snap, added), false);
-        await clock.sleep(options.lateWindowMs ?? HISTORY_LATE_WINDOW_MS, abort.signal);
+        // Late old-epoch messages can only come from a group N was just added to.
+        if (Object.values(added).some((groups) => groups.length > 0)) {
+            await clock.sleep(options.lateWindowMs ?? HISTORY_LATE_WINDOW_MS, abort.signal);
+        }
         await sender.send(tail.take(snap, added), true);
         // N closes the session once it has every chunk; closing here would delete them.
         set({ phase: "done", device, added });

package/dist/pairing/newDevice.d.ts

@@ -51,6 +51,9 @@ export interface NewDeviceOptions {
     history?: HistorySink;
     /** Opens the server the envelope names for the history. Without it, no history comes across. */
     historyStore?: HistoryStoreOpener;
+    /** This device's archive scope for a server. A's records are refiled under it, since the
+        desktop files by server key and the phone by host. */
+    localScope?: (host: string) => string;
 }
 export interface NewDevicePairing {
     readonly state: NewDeviceState;

package/dist/pairing/newDevice.js

@@ -3,6 +3,18 @@ import { sha256 } from "@noble/hashes/sha2.js";
 import { randomBytes } from "@noble/hashes/utils.js";
 import { mailbox, openJson, PairingEnded, reasonFor, sealJson, systemClock } from "./channel.js";
 import { createHistoryReceiver } from "./historyReceiver.js";
+function refiled(sink, servers, localScope) {
+    if (!localScope)
+        return sink;
+    const hosts = new Map(servers.map((s) => [s.scope, s.host]));
+    // Asked per batch: the desktop's scope needs the server's key, pinned only once it has joined.
+    return {
+        put: (records) => sink.put(records.map((r) => {
+            const host = hosts.get(r.scope);
+            return host === undefined ? r : { ...r, scope: localScope(host) };
+        })),
+    };
+}
 export const PAIRING_APPROVAL_MS = 60_000;
 const PAIRING_OIDC_SCOPE = "openid profile email offline_access";
 /** N: shows the QR and code, checks the emoji, opens the envelope, signs in, then says ready. */
@@ -162,7 +174,7 @@ export function createNewDevicePairing(options) {
             if (held?.host && held.transfer && options.history && options.historyStore) {
                 receiver = createHistoryReceiver({
                     store: options.historyStore(held.host, held.transfer),
-                    key: held.key, sink: options.history, clock, signal: abort.signal, onProgress: setHistory,
+                    key: held.key, sink: refiled(options.history, envelope.servers, options.localScope), clock, signal: abort.signal, onProgress: setHistory,
                 });
                 receiver.listManifest(held.manifest.chunks);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gryt/core",
-  "version": "0.33.0",
+  "version": "0.33.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": {