caldav-adapter 8.3.4 → 8.3.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "caldav-adapter",
   "description": "CalDAV server for Node.js and Koa. Modernized and maintained for Forward Email.",
-  "version": "8.3.4",
+  "version": "8.3.5",
   "author": "Sanders DeNardi and Forward Email LLC",
   "contributors": [
     "Sanders DeNardi <sedenardi@gmail.com> (http://www.sandersdenardi.com/)",

package/routes/calendar/calendar/event-response.js

@@ -12,6 +12,21 @@ module.exports = function (options) {
 
   return async function (ctx, events, calendar, children) {
     const eventActions = _.map(events, async (event) => {
+      //
+      // For deleted events without href, we cannot reliably construct the
+      // correct URL that the client originally used. Returning an incorrect
+      // URL causes Apple Calendar to fail with "Couldn't get a calendar item
+      // to remove" errors because the URL doesn't match its local cache.
+      //
+      // Skip these events in sync-collection responses. The client will
+      // eventually clean them up through other sync mechanisms.
+      //
+      // See: https://www.rfc-editor.org/rfc/rfc6578.html (sync-collection)
+      //
+      if (event.deleted_at && !event.href) {
+        return null;
+      }
+
       const misses = [];
       const propActions = _.map(children, async (child) => {
         return tags.getResponse({
@@ -65,6 +80,7 @@ module.exports = function (options) {
       return resp;
     });
     const responses = await Promise.all(eventActions);
-    return { responses };
+    // Filter out null responses (deleted events without href)
+    return { responses: _.compact(responses) };
   };
 };

package/test/event-response.test.js

@@ -95,15 +95,17 @@ test('event-response uses event.href when available instead of constructing from
   t.is(responseObj['D:href'], '/cal/user/calendar/original@event.ics');
 });
 
-test('event-response returns 404 status for deleted events', async (t) => {
+test('event-response returns 404 status for deleted events with href', async (t) => {
   const options = createMockOptions();
   const eventResponse = eventResponseFactory(options);
   const ctx = createMockCtx('/cal/user/calendar');
   const calendar = createMockCalendar();
 
+  // Deleted event WITH href - should be included in response
   const events = [
     {
       eventId: 'deleted-event',
+      href: '/cal/user/calendar/deleted-event.ics',
       deleted_at: new Date(),
       ical: 'BEGIN:VCALENDAR\nEND:VCALENDAR'
     }
@@ -125,6 +127,30 @@ test('event-response returns 404 status for deleted events', async (t) => {
   t.true(responseObj['D:status'].includes('404'));
 });
 
+test('event-response skips deleted events without href', async (t) => {
+  const options = createMockOptions();
+  const eventResponse = eventResponseFactory(options);
+  const ctx = createMockCtx('/cal/user/calendar');
+  const calendar = createMockCalendar();
+
+  // Deleted event WITHOUT href - should be skipped to prevent Apple sync errors
+  const events = [
+    {
+      eventId: 'deleted-event-no-href',
+      deleted_at: new Date(),
+      ical: 'BEGIN:VCALENDAR\nEND:VCALENDAR'
+    }
+  ];
+
+  const children = [];
+
+  const result = await eventResponse(ctx, events, calendar, children);
+
+  t.truthy(result.responses);
+  // Should be empty - deleted events without href are skipped
+  t.is(result.responses.length, 0);
+});
+
 test('event-response uses href for deleted events when available (critical for sync)', async (t) => {
   const options = createMockOptions();
   const eventResponse = eventResponseFactory(options);
@@ -199,6 +225,7 @@ test('event-response handles multiple events correctly', async (t) => {
     },
     {
       eventId: 'event3',
+      href: '/cal/user/calendar/event3.ics',
       deleted_at: new Date(),
       ical: 'BEGIN:VCALENDAR\nEND:VCALENDAR'
     }
@@ -217,11 +244,55 @@ test('event-response handles multiple events correctly', async (t) => {
   // Event 2: uses href
   t.is(result.responses[1]['D:href'], '/cal/user/calendar/custom-path.ics');
 
-  // Event 3: deleted, uses eventId (no href)
+  // Event 3: deleted with href
   t.is(result.responses[2]['D:href'], '/cal/user/calendar/event3.ics');
   t.true(result.responses[2]['D:status'].includes('404'));
 });
 
+test('event-response handles multiple events with mixed deleted states', async (t) => {
+  const options = createMockOptions();
+  const eventResponse = eventResponseFactory(options);
+  const ctx = createMockCtx('/cal/user/calendar');
+  const calendar = createMockCalendar();
+
+  // Mix of events: active, deleted with href, deleted without href
+  const events = [
+    {
+      eventId: 'active-event',
+      ical: 'BEGIN:VCALENDAR\nEND:VCALENDAR'
+    },
+    {
+      eventId: 'deleted-with-href',
+      href: '/cal/user/calendar/deleted-with-href.ics',
+      deleted_at: new Date(),
+      ical: 'BEGIN:VCALENDAR\nEND:VCALENDAR'
+    },
+    {
+      eventId: 'deleted-no-href',
+      deleted_at: new Date(),
+      ical: 'BEGIN:VCALENDAR\nEND:VCALENDAR'
+    }
+  ];
+
+  const children = [];
+
+  const result = await eventResponse(ctx, events, calendar, children);
+
+  t.truthy(result.responses);
+  // Only 2 responses - deleted without href is skipped
+  t.is(result.responses.length, 2);
+
+  // Active event
+  t.is(result.responses[0]['D:href'], '/cal/user/calendar/active-event.ics');
+
+  // Deleted event with href
+  t.is(
+    result.responses[1]['D:href'],
+    '/cal/user/calendar/deleted-with-href.ics'
+  );
+  t.true(result.responses[1]['D:status'].includes('404'));
+});
+
 test('event-response handles email-like eventId with @ symbol', async (t) => {
   const options = createMockOptions();
   const eventResponse = eventResponseFactory(options);