Skip to content

Enhance getEvents with logging and error handling #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hismayilov wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Enhance getEvents with logging and error handling #81

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d16349e
Enhance getEvents with logging and error handling
hismayilov Mar 7, 2026
db961ee
Fix CalDAV Zoho event retrieval fallback.
Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 36 additions & 8 deletions Http/Helpers/CalDAV.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,45 @@ public function __construct( $baseUri, $userName, $password ) {
}

public function getEvents( $calendarUrl ) {
$response = $this->client->propFind( $calendarUrl, [
'{DAV:}displayname',
'{urn:ietf:params:xml:ns:caldav}calendar-description',
'{urn:ietf:params:xml:ns:caldav}calendar-data',
], 2 );
\Log::info('CalDAV getEvents called with URL', ['url' => $calendarUrl]);

$xmlBody = '<?xml version="1.0" encoding="UTF-8"?>' . "\n" .
'<C:calendar-query xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:D="DAV:">' . "\n" .
' <D:prop>' . "\n" .
' <D:getetag/>' . "\n" .
' <C:calendar-data/>' . "\n" .
' </D:prop>' . "\n" .
' <C:filter>' . "\n" .
' <C:comp-filter name="VCALENDAR">' . "\n" .
' <C:comp-filter name="VEVENT">' . "\n" .
' </C:comp-filter>' . "\n" .
' </C:comp-filter>' . "\n" .
' </C:filter>' . "\n" .
'</C:calendar-query>';

$response = $this->client->request( 'REPORT', $calendarUrl, $xmlBody, [
Copy link
Copy Markdown
Contributor

@Lars- Lars- Mar 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Client::request() can throw ClientException on network/HTTP errors. Wrap this in a try-catch like getEventByUid does, otherwise a transient failure will crash the cron job instead of returning an empty array.

'Content-Type' => 'application/xml; charset=utf-8',
'Depth' => '1',
] );

\Log::info('CalDAV REPORT response', ['status' => $response['statusCode'] ?? 'no status', 'body_length' => strlen($response['body'] ?? '')]);
Copy link
Copy Markdown
Contributor

@Lars- Lars- Mar 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This and the other \Log::info() calls will fire on every scheduled sync (potentially every minute). Please downgrade to \Log::debug() or remove them. The URL could also contain credentials in some CalDAV setups.


$events = [];
foreach ( $response as $eventData ) {
if ( isset( $eventData['{urn:ietf:params:xml:ns:caldav}calendar-data'] ) ) {
$events[] = $eventData['{urn:ietf:params:xml:ns:caldav}calendar-data'];
if ( isset( $response['statusCode'] ) && $response['statusCode'] >= 200 && $response['statusCode'] < 300 ) {
if ( isset( $response['body'] ) && ! empty( $response['body'] ) ) {
\Log::info('CalDAV response body preview', ['body' => substr($response['body'], 0, 500)]);
// Parse the XML response to extract calendar-data
$matches = [];
preg_match_all( '/<(?:C:)?calendar-data[^>]*>(.*?)<\/(?:C:)?calendar-data>/s', $response['body'], $matches );
Copy link
Copy Markdown
Contributor

@Lars- Lars- Mar 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This regex misses the cal: namespace prefix, which many CalDAV servers use. Your existing getEventByUid method handles cal:, C:, and unqualifie, this should match. Suggested fix: preg_match_all( '/<(?:cal:|C:)?calendar-data[^>]*>(.*?)<\/(?:cal:|C:)?calendar-data>/s', $response['body'], $matches );

if ( isset( $matches[1] ) ) {
foreach ( $matches[1] as $data ) {
$events[] = html_entity_decode( $data, ENT_XML1, 'UTF-8' );
}
}
\Log::info('CalDAV parsed events count', ['count' => count($events)]);
}
} else {
\Log::error('CalDAV REPORT failed', ['status' => $response['statusCode'] ?? 'unknown', 'body' => $response['body'] ?? 'no body']);
}

return $events;
Expand Down