Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-24 09:28:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: Realtime auth

Browse source
This commit is contained in:
Binyamin Yawitz 2024-06-04 15:23:08 -04:00
parent d1c3e47392
commit c411aa2342
No known key found for this signature in database
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
app/realtime.php
View file

@ -55,7 +55,7 @@ $getProjectDB = new Dependency();
$auth $auth
->setName('auth') ->setName('auth')
->setCallback(fn () => new Authorization()); ->setCallback(fn() => new Authorization());
$getProjectDB $getProjectDB
->setName('getProjectDB') ->setName('getProjectDB')
@ -167,7 +167,7 @@ $server->error($logError);
$server->onStart(function () use ($stats, $container, $containerId, &$statsDocument, $logError) { $server->onStart(function () use ($stats, $container, $containerId, &$statsDocument, $logError) {
sleep(5); // wait for the initial database schema to be ready sleep(5); // wait for the initial database schema to be ready
Console::success('Server started successfully'); Console::success('Server started successfully');
$auth = $container->get('auth');
/** /**
* Create document for this worker to share stats across Containers. * Create document for this worker to share stats across Containers.
*/ */
@ -187,8 +187,8 @@ $server->onStart(function () use ($stats, $container, $containerId, &$statsDocum
'value' => '{}' 'value' => '{}'
]); ]);
$auth = new Authorization(); $auth = $container->get('auth');
$statsDocument = $auth->skip(fn () => $database->createDocument('realtime', $document)); $statsDocument = $auth->skip(fn() => $database->createDocument('realtime', $document));
break; break;
} catch (Throwable) { } catch (Throwable) {
Console::warning("Collection not ready. Retrying connection ({$attempts})..."); Console::warning("Collection not ready. Retrying connection ({$attempts})...");
@ -201,7 +201,7 @@ $server->onStart(function () use ($stats, $container, $containerId, &$statsDocum
/** /**
* Save current connections to the Database every 5 seconds. * Save current connections to the Database every 5 seconds.
*/ */
Timer::tick(5000, function () use ($container, $stats, &$statsDocument, $logError) { Timer::tick(5000, function () use ($container, $stats, &$statsDocument, $logError, $auth) {
$payload = []; $payload = [];
foreach ($stats as $projectId => $value) { foreach ($stats as $projectId => $value) {
$payload[$projectId] = $stats->get($projectId, 'connectionsTotal'); $payload[$projectId] = $stats->get($projectId, 'connectionsTotal');
@ -217,8 +217,7 @@ $server->onStart(function () use ($stats, $container, $containerId, &$statsDocum
->setAttribute('timestamp', DateTime::now()) ->setAttribute('timestamp', DateTime::now())
->setAttribute('value', json_encode($payload)); ->setAttribute('value', json_encode($payload));
$auth = new Authorization(); $auth->skip(fn() => $database->updateDocument('realtime', $statsDocument->getId(), $statsDocument));
$auth->skip(fn () => $database->updateDocument('realtime', $statsDocument->getId(), $statsDocument));
} catch (Throwable $th) { } catch (Throwable $th) {
call_user_func($logError, $th, "updateWorkerDocument"); call_user_func($logError, $th, "updateWorkerDocument");
} finally { } finally {
@ -233,7 +232,7 @@ $server->onWorkerStart(function (int $workerId) use ($server, $container, $stats
$attempts = 0; $attempts = 0;
$start = time(); $start = time();
$auth = new Authorization(); $auth = $container->get('auth');
Timer::tick(5000, function () use ($server, $container, $realtime, $stats, $logError, $auth) { Timer::tick(5000, function () use ($server, $container, $realtime, $stats, $logError, $auth) {
/** /**
@ -244,7 +243,7 @@ $server->onWorkerStart(function (int $workerId) use ($server, $container, $stats
$payload = []; $payload = [];
$list = $auth->skip(fn () => $database->find('realtime', [ $list = $auth->skip(fn() => $database->find('realtime', [
Query::greaterThan('timestamp', DateTime::addSeconds(new \DateTime(), -15)), Query::greaterThan('timestamp', DateTime::addSeconds(new \DateTime(), -15)),
])); ]));
@ -348,8 +347,8 @@ $server->onWorkerStart(function (int $workerId) use ($server, $container, $stats
if ($realtime->hasSubscriber($projectId, 'user:' . $userId)) { if ($realtime->hasSubscriber($projectId, 'user:' . $userId)) {
$connection = array_key_first(reset($realtime->subscriptions[$projectId]['user:' . $userId])); $connection = array_key_first(reset($realtime->subscriptions[$projectId]['user:' . $userId]));
$consoleDatabase = $container->get('dbForConsole'); $consoleDatabase = $container->get('dbForConsole');
$auth = new Authorization();
$project = $auth->skip(fn () => $consoleDatabase->getDocument('projects', $projectId)); $project = $auth->skip(fn() => $consoleDatabase->getDocument('projects', $projectId));
$database = $container->get('getProjectDB')($project); $database = $container->get('getProjectDB')($project);
$user = $database->getDocument('users', $userId); $user = $database->getDocument('users', $userId);
@ -398,7 +397,7 @@ $server->onWorkerStart(function (int $workerId) use ($server, $container, $stats
}); });
$server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $container, $stats, &$realtime, $logError) { $server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $container, $stats, &$realtime, $logError) {
$auth = new Authorization(); $auth = $container->get('auth');
$request = new Request(new UtopiaRequest($request)); $request = new Request(new UtopiaRequest($request));
$response = new Response(new UtopiaResponse(new SwooleResponse())); $response = new Response(new UtopiaResponse(new SwooleResponse()));
@ -406,8 +405,8 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
$requestInjection = new Dependency(); $requestInjection = new Dependency();
$responseInjection = new Dependency(); $responseInjection = new Dependency();
$requestInjection->setName('request')->setCallback(fn () => $request); $requestInjection->setName('request')->setCallback(fn() => $request);
$responseInjection->setName('response')->setCallback(fn () => $response); $responseInjection->setName('response')->setCallback(fn() => $response);
$container->set($requestInjection); $container->set($requestInjection);
$container->set($responseInjection); $container->set($responseInjection);
@ -468,7 +467,7 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
throw new Exception(Exception::REALTIME_POLICY_VIOLATION, $originValidator->getDescription()); throw new Exception(Exception::REALTIME_POLICY_VIOLATION, $originValidator->getDescription());
} }
$auth = new Authorization(); $auth = $container->get('auth');
$roles = Auth::getRoles($user, $auth); $roles = Auth::getRoles($user, $auth);
$channels = Realtime::convertChannels($request->getQuery('channels', []), $user->getId()); $channels = Realtime::convertChannels($request->getQuery('channels', []), $user->getId());
@ -529,8 +528,8 @@ $server->onMessage(function (int $connection, string $message) use ($server, $co
$database = $container->get('dbForConsole'); $database = $container->get('dbForConsole');
if ($projectId !== 'console') { if ($projectId !== 'console') {
$auth = new Authorization(); $auth = $container->get('auth');
$project = $auth->skip(fn () => $database->getDocument('projects', $projectId)); $project = $auth->skip(fn() => $database->getDocument('projects', $projectId));
$database = $container->get('getProjectDB')($project); $database = $container->get('getProjectDB')($project);
} else { } else {
$project = null; $project = null;