Skip to content

refactor: improve channel handling for Realtime events and update tes… #11430

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

Merged
abnegate merged 3 commits into from
Mar 2, 2026
Merged

refactor: improve channel handling for Realtime events and update tes… #11430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d4f37c
refactor: improve channel handling for Realtime events and update tes…
ArnabChatterjee20k Mar 2, 2026
82a5d13
refactor: enhance event handling by ensuring unique events and improv…
ArnabChatterjee20k Mar 2, 2026
05a2f56
updated tests
ArnabChatterjee20k Mar 2, 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
4 changes: 3 additions & 1 deletion src/Appwrite/Event/Event.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,9 @@ private static function mirrorCollectionEvents(string $pattern, string $firstEve
$events = $pairedEvents;
}
// mirrored events can have duplicates in case of smaller events
return array_unique($events);
// array unique can turns list to hasmap in case duplicates present
// so forcing array value will turn this to array list always
return array_values(array_unique($events));
}

/**
Expand Down
25 changes: 7 additions & 18 deletions src/Appwrite/Messaging/Adapter/Realtime.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,25 +510,13 @@ public static function fromPayload(string $event, Document $payload, ?Document $
$collectionId = $payload->getAttribute('$collectionId', '');
$resourceId = $tableId ?: $collectionId;
$channels = [];
// backward compat(tablesdb will have databases channels + tablesdb prefixed channels)
if ($parts[0] === 'databases' || $parts[0] === 'tablesdb') {
$prefix = 'databases';

$channels = self::getDatabaseChannels('legacy', $database->getId(), $resourceId, $payload->getId(), $prefix);

$channels = array_unique([
...$channels,
...self::getDatabaseChannels('tablesdb', $database->getId(), $resourceId, $payload->getId(), $prefix)
]);
}

// prefixed channels -> tablesdb
if ($parts[0] !== 'databases') {
$channels = array_unique([
...$channels,
...self::getDatabaseChannels($parts[0], $database->getId(), $resourceId, $payload->getId()),
]);
}
// sending legacy + tablesdb events to both legacy and tablesdb
$channels = array_values(array_unique(array_merge(
self::getDatabaseChannels('legacy', $database->getId(), $resourceId, $payload->getId(), 'databases'),
self::getDatabaseChannels('tablesdb', $database->getId(), $resourceId, $payload->getId(), 'databases'),
self::getDatabaseChannels('tablesdb', $database->getId(), $resourceId, $payload->getId())
)));

$roles = $collection->getAttribute('documentSecurity', false)
? \array_merge($collection->getRead(), $payload->getRead())
Expand Down Expand Up @@ -620,6 +608,7 @@ private static function getDatabaseChannels(
$channels[] = "{$basePrefix}.{$databaseId}.collections.{$resourceId}.documents";
$channels[] = "{$basePrefix}.{$databaseId}.collections.{$resourceId}.documents.{$payloadId}";
break;

case 'tablesdb':
$channels[] = 'rows';
$channels[] = "{$basePrefix}.{$databaseId}.tables.{$resourceId}.rows";
Expand Down
Loading
Loading