@bobfrankston/rmfmail 1.2.317 → 1.2.319

package/packages/mailx-service/index.js

@@ -2725,7 +2725,7 @@ export class MailxService {
             const all = await gsync.listCalendars(tp);
             return all
                 .filter(c => c.selected)
-                .map(c => ({ id: c.id, name: c.summary, color: c.backgroundColor || "", primary: c.primary }));
+                .map(c => ({ id: c.id, name: c.summary, color: c.backgroundColor || "", primary: c.primary, accessRole: c.accessRole }));
         }
         catch (e) {
             this.handleGoogleRefreshError("calendar", e);
@@ -2895,10 +2895,13 @@ export class MailxService {
         const acct = this.getPrimaryAccount("calendar");
         if (!acct)
             throw new Error("No primary calendar account");
+        const calendarId = ev.calendarId || "primary";
         const uuid = this.db.upsertCalendarEvent({
-            accountId: acct.id, ...ev, dirty: true,
+            accountId: acct.id, ...ev, calendarId, dirty: true,
         });
-        this.db.enqueueStoreSync("calendar", "create", acct.id, uuid, ev);
+        // The queue payload carries the calendar: the drain must POST to
+        // THAT calendar's events collection, not primary's (2026-09-10).
+        this.db.enqueueStoreSync("calendar", "create", acct.id, uuid, { ...ev, calendarId });
         this.drainStoreSync().catch(() => { });
         return uuid;
     }
@@ -2918,7 +2921,7 @@ export class MailxService {
             location: patch.location ?? existing.location,
             notes: patch.notes ?? existing.notes,
         });
-        this.db.enqueueStoreSync("calendar", "update", existing.accountId, uuid, { providerId: existing.providerId, patch });
+        this.db.enqueueStoreSync("calendar", "update", existing.accountId, uuid, { providerId: existing.providerId, calendarId: existing.calendarId, patch });
         this.drainStoreSync().catch(() => { });
     }
     async deleteCalendarEventLocal(uuid) {
@@ -2927,7 +2930,7 @@ export class MailxService {
             return;
         this.db.deleteCalendarEventLocal(uuid);
         if (ev.providerId) {
-            this.db.enqueueStoreSync("calendar", "delete", ev.accountId, uuid, { providerId: ev.providerId });
+            this.db.enqueueStoreSync("calendar", "delete", ev.accountId, uuid, { providerId: ev.providerId, calendarId: ev.calendarId });
             this.drainStoreSync().catch(() => { });
         }
         else {
@@ -3082,16 +3085,24 @@ export class MailxService {
             try {
                 if (entry.kind === "calendar") {
                     const tp = await this.primaryTokenProvider("calendar");
+                    // Every push goes to the event's OWN calendar. Until
+                    // 2026-09-10 the calendarId was dropped here and all
+                    // three went to "primary": a create landed on the wrong
+                    // calendar, and an update or delete of an event that
+                    // lives on a shared calendar was a 404 that retried
+                    // forever. Rows written before that date carry the id
+                    // the pull recorded, so they are right too.
+                    const calendarId = entry.payload?.calendarId || "primary";
                     if (entry.op === "create") {
-                        const created = await gsync.createCalendarEvent(tp, gsync.localToCalendarEvent(entry.payload));
+                        const created = await gsync.createCalendarEvent(tp, gsync.localToCalendarEvent(entry.payload), calendarId);
                         this.db.markCalendarEventClean(entry.targetUuid, created.id, created.etag || "");
                     }
                     else if (entry.op === "update") {
-                        const updated = await gsync.updateCalendarEvent(tp, entry.payload.providerId, gsync.localToCalendarEvent(entry.payload.patch));
+                        const updated = await gsync.updateCalendarEvent(tp, entry.payload.providerId, gsync.localToCalendarEvent(entry.payload.patch), calendarId);
                         this.db.markCalendarEventClean(entry.targetUuid, updated.id, updated.etag || "");
                     }
                     else if (entry.op === "delete") {
-                        await gsync.deleteCalendarEvent(tp, entry.payload.providerId);
+                        await gsync.deleteCalendarEvent(tp, entry.payload.providerId, calendarId);
                         this.db.purgeCalendarEvent(entry.targetUuid);
                     }
                 }