fix(editors): scope async results and fragment writes to sessions

A completed save or dry run must not close or overwrite a newer editor. Keep fragment state scoped by group, reject writes until the real list is ready, and retain in-flight fragment locks across navigation.
This commit is contained in:
翅膀 committed 2026-10-17 15:48:21 +08:00
1 parent 5dfd0426aa
commit 79c9eba1df
4 files changed
+102 -14

No files matched your search

+14 -2
View File
@@ -410,6 +410,8 @@
</main> </main>
</div> </div>
<!-- One editor for every group (not keyed): its fragment store, scoped
per group, keeps a pending fragment write's lock across navigation. -->
<RouteEditor <RouteEditor
:open="editorOpen" :open="editorOpen"
:route="editing" :route="editing"
@@ -616,6 +618,10 @@ function canWriteRoutes(): boolean {
push(t("toast.routesNotReady"), "bad"); push(t("toast.routesNotReady"), "bad");
return false; return false;
} }
// Bumped whenever an editor opens: a save may only close the editor it was
// made from, never one opened since (on another page, for another route).
let routeEditorSession = 0;
let groupEditorSession = 0;
/** A dropped card is still settling; its new position is not in the draft yet. */ /** A dropped card is still settling; its new position is not in the draft yet. */
const reorderBusy = ref(false); const reorderBusy = ref(false);
const orderChanged = computed( const orderChanged = computed(
@@ -934,11 +940,13 @@ watch(reordering, (on) => {
onBeforeUnmount(() => window.removeEventListener("keydown", onReorderKey)); onBeforeUnmount(() => window.removeEventListener("keydown", onReorderKey));
function openNew(): void { function openNew(): void {
routeEditorSession++;
editing.value = null; editing.value = null;
editorOpen.value = true; editorOpen.value = true;
} }
function openEdit(route: Route): void { function openEdit(route: Route): void {
routeEditorSession++;
editing.value = route; editing.value = route;
editorOpen.value = true; editorOpen.value = true;
} }
@@ -946,6 +954,7 @@ function openEdit(route: Route): void {
async function onSave(route: Route): Promise<void> { async function onSave(route: Route): Promise<void> {
const group = selectedGroup.value; const group = selectedGroup.value;
if (!group || !canWriteRoutes()) return; if (!group || !canWriteRoutes()) return;
const session = routeEditorSession;
saving.value = true; saving.value = true;
try { try {
let next: Route[]; let next: Route[];
@@ -959,7 +968,7 @@ async function onSave(route: Route): Promise<void> {
next = [...groupRoutes.value, route]; next = [...groupRoutes.value, route];
} }
await saveGroupRoutes(group.id, next); await saveGroupRoutes(group.id, next);
editorOpen.value = false; if (session === routeEditorSession) editorOpen.value = false;
push(t("toast.routesSaved")); push(t("toast.routesSaved"));
} catch (err) { } catch (err) {
push(t("toast.saveFailed", { msg: err instanceof Error ? err.message : String(err) }), "bad"); push(t("toast.saveFailed", { msg: err instanceof Error ? err.message : String(err) }), "bad");
@@ -1008,11 +1017,13 @@ async function onDelete(route: Route): Promise<void> {
} }
function openNewGroup(): void { function openNewGroup(): void {
groupEditorSession++;
editingGroup.value = null; editingGroup.value = null;
groupEditorOpen.value = true; groupEditorOpen.value = true;
} }
function openEditGroup(group: Group): void { function openEditGroup(group: Group): void {
groupEditorSession++;
editingGroup.value = group; editingGroup.value = group;
groupEditorOpen.value = true; groupEditorOpen.value = true;
} }
@@ -1032,6 +1043,7 @@ async function onSaveGroupFromPanel(group: Group): Promise<void> {
} }
async function onSaveGroup(group: Group): Promise<void> { async function onSaveGroup(group: Group): Promise<void> {
const session = groupEditorSession;
savingGroup.value = true; savingGroup.value = true;
try { try {
const editing = editingGroup.value; const editing = editingGroup.value;
@@ -1053,7 +1065,7 @@ async function onSaveGroup(group: Group): Promise<void> {
next = [...groups.value, group]; next = [...groups.value, group];
} }
await saveGroups(next); await saveGroups(next);
groupEditorOpen.value = false; if (session === groupEditorSession) groupEditorOpen.value = false;
push(t("toast.groupSaved")); push(t("toast.groupSaved"));
await loadGroups(); await loadGroups();
} catch (err) { } catch (err) {
+42 -9
View File
@@ -75,7 +75,14 @@ provide(
); );
const eventSuggestions = computed(() => eventOptions(locale.value)); const eventSuggestions = computed(() => eventOptions(locale.value));
const { fragments, load: loadFragments, save: saveFragments } = useFragmentsApi(); const {
fragments,
readyFor: fragmentsReadyFor,
load: loadFragments,
save: saveFragments,
} = useFragmentsApi();
/** This group's fragments are loaded and no fragment write is running. */
const fragmentsWritable = computed(() => !!props.groupId && fragmentsReadyFor(props.groupId));
const fragmentName = ref(""); const fragmentName = ref("");
const fragmentError = ref(""); const fragmentError = ref("");
@@ -266,6 +273,13 @@ function onOpenChange(open: boolean): void {
if (!open && !isBackdropClose()) close(); if (!open && !isBackdropClose()) close();
} }
/**
* Bumped whenever the editor opens or closes. The console keeps one editor
* for every group, so an async result (a test run, a fragment write) only
* lands in the session that started it.
*/
let session = 0;
async function runTest(): Promise<void> { async function runTest(): Promise<void> {
testError.value = ""; testError.value = "";
testResult.value = null; testResult.value = null;
@@ -290,19 +304,21 @@ async function runTest(): Promise<void> {
testError.value = t("routeEditor.errAddFilter"); testError.value = t("routeEditor.errAddFilter");
return; return;
} }
const mine = session;
testing.value = true; testing.value = true;
try { try {
testResult.value = await apiFetch<{ matched: boolean; explanation: string }>( const result = await apiFetch<{ matched: boolean; explanation: string }>(
"/admin/api/test-match", "/admin/api/test-match",
{ {
method: "POST", method: "POST",
body: JSON.stringify({ node, event: testEvent.value.trim() || undefined, payload }), body: JSON.stringify({ node, event: testEvent.value.trim() || undefined, payload }),
}, },
); );
if (mine === session) testResult.value = result;
} catch (err) { } catch (err) {
testError.value = err instanceof Error ? err.message : String(err); if (mine === session) testError.value = err instanceof Error ? err.message : String(err);
} finally { } finally {
testing.value = false; if (mine === session) testing.value = false;
} }
} }
@@ -332,6 +348,11 @@ async function saveAsFragment(): Promise<void> {
return; return;
} }
if (!props.groupId) return; if (!props.groupId) return;
// A save replaces the group's whole list: never from one not loaded yet.
if (!fragmentsReadyFor(props.groupId)) {
fragmentError.value = t("routeEditor.fragmentsNotReady");
return;
}
const problem = filterTreeError(); const problem = filterTreeError();
if (problem) { if (problem) {
fragmentError.value = problem; fragmentError.value = problem;
@@ -342,35 +363,44 @@ async function saveAsFragment(): Promise<void> {
fragmentError.value = t("routeEditor.errAddFilter"); fragmentError.value = t("routeEditor.errAddFilter");
return; return;
} }
const groupId = props.groupId;
const id = `frag-${Math.random().toString(36).slice(2, 10)}`; const id = `frag-${Math.random().toString(36).slice(2, 10)}`;
const next: NamedFragment[] = [ const next: NamedFragment[] = [
...fragments.value.filter((f) => f.id !== id), ...fragments.value.filter((f) => f.id !== id),
{ id, groupId: props.groupId, name, node }, { id, groupId, name, node },
]; ];
const mine = session;
try { try {
await saveFragments(props.groupId, next); await saveFragments(groupId, next);
fragmentName.value = ""; if (mine === session) fragmentName.value = "";
} catch (err) { } catch (err) {
fragmentError.value = err instanceof Error ? err.message : String(err); if (mine === session) fragmentError.value = err instanceof Error ? err.message : String(err);
} }
} }
async function deleteFragment(frag: NamedFragment): Promise<void> { async function deleteFragment(frag: NamedFragment): Promise<void> {
const groupId = props.groupId; const groupId = props.groupId;
if (!groupId) return; if (!groupId) return;
const mine = session;
if (!(await confirm({ title: t("confirm.deleteFragment", { name: frag.name }) }))) return; if (!(await confirm({ title: t("confirm.deleteFragment", { name: frag.name }) }))) return;
if (mine !== session) return;
fragmentError.value = ""; fragmentError.value = "";
if (props.groupId !== groupId || !fragmentsReadyFor(groupId)) {
fragmentError.value = t("routeEditor.fragmentsNotReady");
return;
}
const next = fragments.value.filter((f) => f.id !== frag.id); const next = fragments.value.filter((f) => f.id !== frag.id);
try { try {
await saveFragments(groupId, next); await saveFragments(groupId, next);
} catch (err) { } catch (err) {
fragmentError.value = err instanceof Error ? err.message : String(err); if (mine === session) fragmentError.value = err instanceof Error ? err.message : String(err);
} }
} }
watch( watch(
() => props.open, () => props.open,
(open) => { (open) => {
session++;
if (!open) return; if (!open) return;
const r = props.route; const r = props.route;
form.id = r?.id ?? ""; form.id = r?.id ?? "";
@@ -404,6 +434,7 @@ watch(
testEvent.value = ""; testEvent.value = "";
testResult.value = null; testResult.value = null;
testError.value = ""; testError.value = "";
testing.value = false;
fragmentName.value = ""; fragmentName.value = "";
fragmentError.value = ""; fragmentError.value = "";
if (props.groupId) loadFragments(props.groupId); if (props.groupId) loadFragments(props.groupId);
@@ -562,6 +593,7 @@ watch(
color="error" color="error"
size="icon" size="icon"
class="h-8 w-8 text-muted hover:text-bad" class="h-8 w-8 text-muted hover:text-bad"
:disabled="!fragmentsWritable"
:title="t('routeEditor.fragmentsDelete')" :title="t('routeEditor.fragmentsDelete')"
:aria-label="t('routeEditor.fragmentsDelete')" :aria-label="t('routeEditor.fragmentsDelete')"
@click="deleteFragment(frag)" @click="deleteFragment(frag)"
@@ -581,6 +613,7 @@ watch(
type="button" type="button"
variant="ghost" variant="ghost"
class="shrink-0 whitespace-nowrap" class="shrink-0 whitespace-nowrap"
:disabled="!fragmentsWritable"
@click="saveAsFragment" @click="saveAsFragment"
> >
{{ t("routeEditor.fragmentsSave") }} {{ t("routeEditor.fragmentsSave") }}
+44 -3
View File
@@ -4,9 +4,37 @@ export function useFragmentsApi() {
const { needLogin } = useAuthState(); const { needLogin } = useAuthState();
const fragments = ref<NamedFragment[]>([]); const fragments = ref<NamedFragment[]>([]);
const loading = ref(false); const loading = ref(false);
const saving = ref(false);
const error = ref(""); const error = ref("");
/** Group whose fragments are shown; responses for any other group are dropped. */
const shownGroupId = ref<string | null>(null);
/** Group whose fragments were last loaded (or saved) successfully. */
const loadedGroupId = ref<string | null>(null);
// Bumped by every load/save, so only the latest request may land.
let request = 0;
/**
* Whether a write may start for `groupId`: the shown list is that group's
* real fragments and nothing is loading or saving. Saving replaces a group's
* whole fragment list, so each write must build on the previous one.
*/
function readyFor(groupId: string): boolean {
return (
shownGroupId.value === groupId &&
loadedGroupId.value === groupId &&
!error.value &&
!loading.value &&
!saving.value
);
}
async function load(groupId: string): Promise<void> { async function load(groupId: string): Promise<void> {
const mine = ++request;
if (shownGroupId.value !== groupId) {
fragments.value = [];
loadedGroupId.value = null;
}
shownGroupId.value = groupId;
loading.value = true; loading.value = true;
error.value = ""; error.value = "";
needLogin.value = false; needLogin.value = false;
@@ -14,21 +42,34 @@ export function useFragmentsApi() {
const data = await apiFetch<{ fragments?: NamedFragment[] }>( const data = await apiFetch<{ fragments?: NamedFragment[] }>(
`/admin/api/groups/${encodeURIComponent(groupId)}/fragments`, `/admin/api/groups/${encodeURIComponent(groupId)}/fragments`,
); );
if (mine !== request) return;
fragments.value = data.fragments ?? []; fragments.value = data.fragments ?? [];
loadedGroupId.value = groupId;
} catch (err) { } catch (err) {
if (!needLogin.value) error.value = err instanceof Error ? err.message : String(err); if (mine === request && !needLogin.value)
error.value = err instanceof Error ? err.message : String(err);
} finally { } finally {
loading.value = false; if (mine === request) loading.value = false;
} }
} }
async function save(groupId: string, next: NamedFragment[]): Promise<void> { async function save(groupId: string, next: NamedFragment[]): Promise<void> {
saving.value = true;
try {
await apiFetch(`/admin/api/groups/${encodeURIComponent(groupId)}/fragments`, { await apiFetch(`/admin/api/groups/${encodeURIComponent(groupId)}/fragments`, {
method: "PUT", method: "PUT",
body: JSON.stringify({ fragments: next }), body: JSON.stringify({ fragments: next }),
}); });
} finally {
saving.value = false;
}
if (shownGroupId.value !== groupId) return;
request++;
loading.value = false;
error.value = "";
fragments.value = next; fragments.value = next;
loadedGroupId.value = groupId;
} }
return { fragments, loading, needLogin, error, load, save }; return { fragments, loading, needLogin, error, readyFor, load, save };
} }
+2
View File
@@ -294,6 +294,7 @@ const en: Dict = {
"routeEditor.fragmentsSave": "Save as fragment", "routeEditor.fragmentsSave": "Save as fragment",
"routeEditor.fragmentsNamePlaceholder": "Fragment name", "routeEditor.fragmentsNamePlaceholder": "Fragment name",
"routeEditor.fragmentsNameRequired": "Fragment name is required", "routeEditor.fragmentsNameRequired": "Fragment name is required",
"routeEditor.fragmentsNotReady": "The group's fragments are still loading; try again in a moment",
"routeEditor.errPath": "Field filters need a path", "routeEditor.errPath": "Field filters need a path",
"routeEditor.errValues": "Add at least one value", "routeEditor.errValues": "Add at least one value",
"routeEditor.errGroupEmpty": "Group needs at least one condition", "routeEditor.errGroupEmpty": "Group needs at least one condition",
@@ -735,6 +736,7 @@ const zh: Dict = {
"routeEditor.fragmentsSave": "存为片段", "routeEditor.fragmentsSave": "存为片段",
"routeEditor.fragmentsNamePlaceholder": "片段名称", "routeEditor.fragmentsNamePlaceholder": "片段名称",
"routeEditor.fragmentsNameRequired": "请填写片段名称", "routeEditor.fragmentsNameRequired": "请填写片段名称",
"routeEditor.fragmentsNotReady": "分组的片段仍在加载,请稍后再试",
"routeEditor.errPath": "字段过滤需要路径", "routeEditor.errPath": "字段过滤需要路径",
"routeEditor.errValues": "至少需要一个值", "routeEditor.errValues": "至少需要一个值",
"routeEditor.errGroupEmpty": "分组至少需要一个条件", "routeEditor.errGroupEmpty": "分组至少需要一个条件",