Skip to content

Commit e88fe4b

Browse files
wpfleger96Hayt
andcommitted
fix(agents): record a move's own team copy before changing its members
Once a move's change knows the relay team is this device's create, the move journal records that before any member is added or removed, and the change stops if that write fails. A stop after a resumed member write then retries as an Edit of its own copy instead of a conflict. Co-authored-by: Hayt <211b96e6a2b7f45fd4047988976c7bbbeeda0c15f3ae7b32eec20834b5a55118@buzz.block.builderlab.xyz>
1 parent a26b798 commit e88fe4b

4 files changed

Lines changed: 105 additions & 0 deletions

File tree

‎src/features/agents/service.test.ts‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16080,6 +16080,60 @@ describe("synced teams", () => {
1608016080
expect(channels.saveTeam).toHaveBeenCalledTimes(1);
1608116081
});
1608216082

16083+
it("records its own copy before resumed member changes, so a stop after them still finishes the move", async () => {
16084+
// Birch was added here after the first try sent only Alder.
16085+
const t = await local(
16086+
[{ ...mine, members: [alder, birch] }],
16087+
["local-1"],
16088+
);
16089+
const stored: unknown[] = [];
16090+
type Edit = {
16091+
fresh?: boolean;
16092+
saving?: (sent: TeamSent) => Promise<void>;
16093+
owned?: () => Promise<void>;
16094+
};
16095+
const answers = [
16096+
async (edit: Edit) => {
16097+
await edit.saving?.(sent);
16098+
return { ...fail, uncertain: true };
16099+
},
16100+
// The resume takes its own copy, adds Birch, then stops before
16101+
// reporting: the relay now has a member the record doesn't.
16102+
async (edit: Edit) => {
16103+
await edit.owned?.();
16104+
stored.push(new TeamMoves(t.storage).get("local-1"));
16105+
return { ...fail, added: [alder, birch], uncertain: true };
16106+
},
16107+
// Its next try finishes; a fresh one would find a conflict.
16108+
async (edit: Edit) =>
16109+
edit.fresh
16110+
? { ...fail, error: "A different copy", conflict: true }
16111+
: { ok: true, added: [], removed: [], skipped: [] },
16112+
];
16113+
const channels = teamChannels(async (edit) => answers.shift()?.(edit));
16114+
const f = await setup({
16115+
identities: [here(alder), here(birch)],
16116+
storage: t.storage,
16117+
});
16118+
await vi.waitFor(() =>
16119+
expect(f.service.teamSync("local-1")).toEqual({ local: "failed" }),
16120+
);
16121+
t.confirm(channels.stores.get(home));
16122+
f.recover();
16123+
await vi.waitFor(() => expect(stored).toHaveLength(1));
16124+
expect(stored[0]).toMatchObject({ community: home, created: true });
16125+
await vi.waitFor(() =>
16126+
expect(f.service.teamSync("local-1")).toEqual({ local: "failed" }),
16127+
);
16128+
f.recover();
16129+
await vi.waitFor(() =>
16130+
expect(f.storage.get(teamsKey)).not.toContain("Mine"),
16131+
);
16132+
expect(channels.saveTeam.mock.calls[2]?.[0]).not.toHaveProperty("fresh");
16133+
expect(f.service.teamSync("local-1")).not.toEqual({ conflict: home });
16134+
expect(moves(f)).toEqual({});
16135+
});
16136+
1608316137
it("keeps no attempt record after a definitely refused first save, so another copy stays a conflict", async () => {
1608416138
const t = await local([{ ...mine, members: [alder] }], ["local-1"]);
1608516139
const answers = [

‎src/features/agents/service.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5239,6 +5239,10 @@ export class AgentsService extends Service implements Agents {
52395239
throw error;
52405240
}
52415241
},
5242+
owned: async () => {
5243+
own = true;
5244+
await journal(move?.failed);
5245+
},
52425246
}),
52435247
},
52445248
);
@@ -5410,6 +5414,7 @@ export class AgentsService extends Service implements Agents {
54105414
fresh?: boolean;
54115415
resume?: TeamSent;
54125416
saving?: (sent: TeamSent) => Promise<void>;
5417+
owned?: () => Promise<void>;
54135418
}>,
54145419
) {
54155420
const host = hostOf({ relay: home });

‎src/features/agents/team-ops.test.ts‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,43 @@ describe("teamOps.change", () => {
267267
expect(retry.channels.removeMember).not.toHaveBeenCalled();
268268
});
269269

270+
it("a move records its own copy before any member change, and stops if that record fails", async () => {
271+
const order: string[] = [];
272+
const recorded = setup({
273+
members: [],
274+
saved: { status: "conflict", head: head() } as never,
275+
});
276+
recorded.channels.addMember.mockImplementation(async () => {
277+
order.push("add");
278+
return { status: "confirmed" } as never;
279+
});
280+
const move = {
281+
...edit,
282+
members: ["a", "b"],
283+
adopt: true,
284+
fresh: true,
285+
resume: { ...edit, members: ["a"] },
286+
};
287+
await recorded.ops.change({
288+
...move,
289+
owned: async () => void order.push("owned"),
290+
});
291+
expect(order[0]).toBe("owned");
292+
const refused = setup({
293+
members: [],
294+
saved: { status: "conflict", head: head() } as never,
295+
});
296+
expect(
297+
await refused.ops.change({
298+
...move,
299+
owned: async () => {
300+
throw new Error("Storage refused");
301+
},
302+
}),
303+
).toMatchObject({ ok: false, created: true, error: "Storage refused" });
304+
expect(refused.channels.addMember).not.toHaveBeenCalled();
305+
});
306+
270307
it("a definitely refused first save is reported as refused", async () => {
271308
const { ops } = setup({
272309
saved: { status: "refused", refusal: "offline", message: "no" },

‎src/features/agents/team-ops.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ export type TeamEdit = Readonly<{
4242
* so the caller can durably record that this device may be creating the
4343
* team. */
4444
saving?: (sent: TeamSent) => Promise<void>;
45+
/** Awaited once a `fresh` change knows the team there is this device's,
46+
* before any member changes, so the caller can durably record it. */
47+
owned?: () => Promise<void>;
4548
}>;
4649

4750
/** What the change did. `ok` only when the readback shows all of it. */
@@ -248,6 +251,12 @@ export function teamOps(deps: TeamDeps) {
248251
conflict: true,
249252
});
250253
}
254+
if (created && edit.fresh)
255+
try {
256+
await edit.owned?.();
257+
} catch (error) {
258+
return fail(error instanceof Error ? error.message : String(error));
259+
}
251260

252261
const add = edit.members.filter((pubkey) => !present.includes(pubkey));
253262
const remove = base

0 commit comments

Comments
 (0)