one CRUD, three callers — the browser and the agent stop writing iCalendar
the skill told an agent how to hand-write a .ics: escape the commas, fold at 75 octets, CRLF, DTSTAMP is required, and DTEND is the day after. all true, all silent when wrong, and the browser had learned the same lesson separately in its own copy of the code. this makes the sidecar the only thing that knows the format, and gives everyone else fields. WHAT WAS MISSING BEFORE THE SKILL COULD CHANGE. reading was already JSON, and create-event landed this morning. this adds PATCH /_officer/item — change some fields of an event or a card — and POST /_officer/contact. delete already worked. with those the skill has no reason left to mention iCalendar, so it does not. PATCH IS READ-PATCH-PUT, SERVER SIDE. it reads the stored text, replaces only the lines it owns, and puts the whole thing back, so alarms, attendees, RRULEs and every X- property a phone invented survive an edit made from a form that cannot show them. that logic came out of the browser, where it had needed a duplicate of the escaping and folding rules to live; the agent would have been a third copy in bash. the web bundle now contains no iCalendar literals at all. AND LIVE TESTING FOUND THE BUG THAT MATTERS. an event with a TZID is stored with a VTIMEZONE block beside it, and that block has DTSTART lines of its own — the rule for when summer time starts. taking the first DTSTART in the file rewrote the TIMEZONE DEFINITION, left the event where it was, and answered ok. the calendar showed the old time and the file was quietly corrupt. every write is now confined to the first VEVENT or VCARD, and the file that caught it is a test. three more traps handled rather than documented: a patch that reuses an all-day event's stored DTEND must subtract the exclusive day first or the holiday drifts every time the title is edited; moving a timed event must DROP a stale TZID rather than preserve it, because a TZID and a Z together are a contradiction clients resolve by moving the event; and a move bumps SEQUENCE, which is how a phone tells an update from a duplicate. contacts got the create form the calendar had, so both screens now do all four. editing a card sends the other emails and phones back untouched — the form shows the first of each, and sending only that would delete the rest. 47 tests across the writer and the patcher. verified live against a real event carrying an alarm, an attendee, an RRULE and an X- property: all four intact after a rename, a relocation and a move to a different day. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Officer-Session: 656f5c85-e49a-4f1f-b9f3-042a04b4d043
This commit is contained in:
Claude Opus 5
+51
-119
@@ -3,86 +3,18 @@ import { useQueryClient } from '@tanstack/react-query';
|
||||
import { useClient } from 'hooks/useClient';
|
||||
|
||||
/**
|
||||
* Editing and deleting one DAV object, without losing what this app does not understand.
|
||||
* Creating, changing and deleting one DAV object, in FIELDS.
|
||||
*
|
||||
* ── Read, patch, put — never rebuild ──
|
||||
* Nothing here knows what an .ics looks like, and that is the point. This used to read the object's
|
||||
* text, patch it in the browser and put it back, which meant the browser carried its own copy of the
|
||||
* iCalendar escaping and 75-octet folding rules — a second place to be subtly wrong about a format
|
||||
* neither screen displays. That work moved to the sidecar (see sidecar/patch.ts), which held the only
|
||||
* other copy, and the agent skill now calls the same routes instead of writing a third one in bash.
|
||||
*
|
||||
* An event or a card is a file with far more in it than these screens show: alarms, attendees,
|
||||
* recurrence rules, categories, every `X-` property the client that wrote it invented. Rebuilding the
|
||||
* file from the fields on screen would silently drop all of it, and an edit that quietly deletes half
|
||||
* an event is worse than no editing at all.
|
||||
*
|
||||
* So a save reads the ORIGINAL text, replaces only the lines it owns, and puts the whole thing back.
|
||||
* Verified on a real event: 22 lines before, 22 after, one changed.
|
||||
*
|
||||
* ── The href is the address, and it comes from the listing ──
|
||||
*
|
||||
* Not `<uid>.ics`. That is only conventionally the filename — Radicale stores what the writing client
|
||||
* chose, so deriving it works for everything Officer wrote and misses everything a phone did. The
|
||||
* listing returns the real href; this hands it straight back.
|
||||
* The guarantee it makes is unchanged: a patch replaces only the lines it owns, so alarms, attendees,
|
||||
* recurrence rules and every unknown `X-` property survive an edit made from a form that cannot show them.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Replace a property's line, or append it when the file has none. Handles `PROP:` and `PROP;PARAM:`.
|
||||
*
|
||||
* A property is not always ONE line. RFC 5545 folds anything over 75 octets onto continuation lines that
|
||||
* start with a space, so a long description is one property spread over several. Replacing only the first
|
||||
* line leaves the rest behind, and they then fold onto whatever was written in its place — the new value
|
||||
* silently grows the tail of the old one. So the whole run goes, and the whole run is rewritten.
|
||||
*/
|
||||
export function setProperty(raw: string, prop: string, value: string | null): string {
|
||||
const lines = raw.split(/\r?\n/);
|
||||
const at = lines.findIndex((l) => l === prop || l.startsWith(`${prop}:`) || l.startsWith(`${prop};`));
|
||||
|
||||
// Everything folded onto the property belongs to it.
|
||||
let after = at + 1;
|
||||
while (at !== -1 && after < lines.length && /^[ \t]/.test(lines[after]!)) after++;
|
||||
|
||||
if (value === null) return at === -1 ? raw : [...lines.slice(0, at), ...lines.slice(after)].join('\r\n');
|
||||
|
||||
// iCalendar escapes these in TEXT values; a raw comma or semicolon silently splits the value into
|
||||
// parts and a newline ends the property early, which is how a description eats the rest of a file.
|
||||
const escaped = value.replace(/\\/g, '\\\\').replace(/\n/g, '\\n').replace(/([,;])/g, '\\$1');
|
||||
if (at !== -1) {
|
||||
// Keep any parameters the line already carried — `DTSTART;TZID=…` must not become `DTSTART:`.
|
||||
const params = /^[A-Z-]+(;[^:]*)?:/.exec(lines[at]!)?.[1] ?? '';
|
||||
return [...lines.slice(0, at), fold(`${prop}${params}:${escaped}`), ...lines.slice(after)].join('\r\n');
|
||||
}
|
||||
|
||||
// Appended inside the component, immediately after UID, so it lands in the right block of a file that
|
||||
// holds more than one.
|
||||
const uidAt = lines.findIndex((l) => l.startsWith('UID:'));
|
||||
const insertAt = uidAt === -1 ? Math.max(0, lines.length - 2) : uidAt + 1;
|
||||
return [...lines.slice(0, insertAt), fold(`${prop}:${escaped}`), ...lines.slice(insertAt)].join('\r\n');
|
||||
}
|
||||
|
||||
/**
|
||||
* Fold a content line at 75 OCTETS, per RFC 5545 §3.1.
|
||||
*
|
||||
* Octets rather than characters, and broken between code points, so an accent in a pasted title is not
|
||||
* cut in half. Deliberately a second copy of the sidecar's `fold` rather than an import: this package is
|
||||
* a browser bundle and the sidecar is a server process, and the existing rule in this plugin is that the
|
||||
* two MIRROR each other's shapes instead of sharing code across that boundary.
|
||||
*/
|
||||
function fold(line: string): string {
|
||||
const encoder = new TextEncoder();
|
||||
const out: string[] = [];
|
||||
let current = '';
|
||||
let bytes = 0;
|
||||
for (const ch of line) {
|
||||
const size = encoder.encode(ch).length;
|
||||
if (bytes + size > 75) {
|
||||
out.push(current);
|
||||
current = ' ';
|
||||
bytes = 1;
|
||||
}
|
||||
current += ch;
|
||||
bytes += size;
|
||||
}
|
||||
out.push(current);
|
||||
return out.join('\r\n');
|
||||
}
|
||||
|
||||
export type NewEvent = {
|
||||
summary: string;
|
||||
location?: string;
|
||||
@@ -92,6 +24,29 @@ export type NewEvent = {
|
||||
allDay: boolean;
|
||||
};
|
||||
|
||||
export type NewContact = {
|
||||
fullName: string;
|
||||
emails?: string[];
|
||||
phones?: string[];
|
||||
org?: string;
|
||||
title?: string;
|
||||
};
|
||||
|
||||
/** What a patch may set. Absent leaves a field alone; `null` removes it. */
|
||||
export type ItemPatch = {
|
||||
summary?: string;
|
||||
location?: string | null;
|
||||
description?: string | null;
|
||||
start?: string;
|
||||
end?: string;
|
||||
allDay?: boolean;
|
||||
fullName?: string;
|
||||
emails?: string[];
|
||||
phones?: string[];
|
||||
org?: string | null;
|
||||
title?: string | null;
|
||||
};
|
||||
|
||||
/** `busy` holds the href being written; a create has no href yet, so it gets a sentinel of its own. */
|
||||
export const CREATING = 'creating';
|
||||
|
||||
@@ -103,58 +58,35 @@ export function useDavEdit(invalidateKey: unknown[]) {
|
||||
|
||||
const refresh = () => qc.invalidateQueries({ queryKey: invalidateKey });
|
||||
|
||||
/** The object's original text, so a caller can patch rather than rebuild. */
|
||||
const readRaw = async (href: string): Promise<string> => {
|
||||
const res = await client.get<{ data: string }>(`/caldav/_officer/item?href=${encodeURIComponent(href)}`);
|
||||
return res.data;
|
||||
};
|
||||
|
||||
const save = async (href: string, patch: (raw: string) => string) => {
|
||||
setBusy(href);
|
||||
/** Every verb has the same shape: mark busy, do it, refresh, and report rather than throw. */
|
||||
const run = async (key: string, fallback: string, work: () => Promise<unknown>) => {
|
||||
setBusy(key);
|
||||
setError(null);
|
||||
try {
|
||||
const raw = await readRaw(href);
|
||||
await client.put('/caldav/_officer/item', { href, data: patch(raw) });
|
||||
await refresh();
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : 'Could not save.');
|
||||
} finally {
|
||||
setBusy(null);
|
||||
}
|
||||
};
|
||||
|
||||
const remove = async (href: string) => {
|
||||
setBusy(href);
|
||||
setError(null);
|
||||
try {
|
||||
await client.delete('/caldav/_officer/item', { href });
|
||||
await refresh();
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : 'Could not delete.');
|
||||
} finally {
|
||||
setBusy(null);
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* A new event. The BODY is built by the sidecar, not here — a browser has no business generating a
|
||||
* UID, a DTSTAMP and a VTIMEZONE-free UTC timestamp, and there is exactly one correct answer for each,
|
||||
* which belongs next to the parser that has to read them back.
|
||||
*/
|
||||
const create = async (collection: string, event: NewEvent) => {
|
||||
setBusy(CREATING);
|
||||
setError(null);
|
||||
try {
|
||||
await client.post('/caldav/_officer/event', { collection, ...event });
|
||||
await work();
|
||||
await refresh();
|
||||
return true;
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : 'Could not create.');
|
||||
setError(err instanceof Error ? err.message : fallback);
|
||||
return false;
|
||||
} finally {
|
||||
setBusy(null);
|
||||
}
|
||||
};
|
||||
|
||||
return { save, remove, create, readRaw, busy, error };
|
||||
return {
|
||||
busy,
|
||||
error,
|
||||
|
||||
save: (href: string, patch: ItemPatch) =>
|
||||
run(href, 'Could not save.', () => client.patch('/caldav/_officer/item', { href, ...patch })),
|
||||
|
||||
remove: (href: string) => run(href, 'Could not delete.', () => client.delete('/caldav/_officer/item', { href })),
|
||||
|
||||
createEvent: (collection: string, event: NewEvent) =>
|
||||
run(CREATING, 'Could not create.', () => client.post('/caldav/_officer/event', { collection, ...event })),
|
||||
|
||||
createContact: (collection: string, contact: NewContact) =>
|
||||
run(CREATING, 'Could not create.', () => client.post('/caldav/_officer/contact', { collection, ...contact })),
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user