fix realtime with db refactor

appwrite · Oct 7, 2021 · a585a90 · a585a90
1 parent 42414e8
commit a585a90
Show file tree

Hide file tree

Showing 12 changed files with 271 additions and 233 deletions.
diff --git a/app/config/collections2.php b/app/config/collections2.php
@@ -2282,7 +2282,56 @@
  'orders' => [Database::ORDER_DESC],
  ],
  ],
- ]
+ ],
+ 'realtime' => [
+ '$collection' => Database::METADATA,
+ '$id' => 'realtime',
+ 'name' => 'Realtime Connections',
+ 'attributes' => [
+ [
+ '$id' => 'container',
+ 'type' => Database::VAR_STRING,
+ 'format' => '',
+ 'size' => Database::LENGTH_KEY,
+ 'signed' => true,
+ 'required' => true,
+ 'default' => null,
+ 'array' => false,
+ 'filters' => [],
+ ],
+ [
+ '$id' => 'timestamp',
+ 'type' => Database::VAR_INTEGER,
+ 'format' => '',
+ 'size' => 0,
+ 'signed' => true,
+ 'required' => false,
+ 'default' => null,
+ 'array' => false,
+ 'filters' => [],
+ ],
+ [
+ '$id' => 'value',
+ 'type' => Database::VAR_STRING,
+ 'format' => '',
+ 'size' => 16384,
+ 'signed' => true,
+ 'required' => true,
+ 'default' => null,
+ 'array' => false,
+ 'filters' => [], //TODO: use json filter
+ ]
+ ],
+ 'indexes' => [
+ [
+ '$id' => '_key_timestamp',
+ 'type' => Database::INDEX_KEY,
+ 'attributes' => ['timestamp'],
+ 'lengths' => [],
+ 'orders' => [Database::ORDER_DESC],
+ ],
+ ]
+ ],
 ];
 
 return $collections;
diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php
@@ -699,10 +699,10 @@
  ]));
 
  Authorization::reset();
- 
+
  $jwt = ''; // initialize
  if (!$user->isEmpty()) { // If userId exists, generate a JWT for function
- 
+
  $sessions = $user->getAttribute('sessions', []);
  $current = new Document();
 

diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php
@@ -1,13 +1,13 @@
 <?php
 
 use Appwrite\Auth\Auth;
-use Appwrite\Database\Document;
 use Appwrite\Database\Validator\Authorization;
 use Appwrite\Messaging\Adapter\Realtime;
 use Utopia\App;
 use Utopia\Exception;
 use Utopia\Abuse\Abuse;
 use Utopia\Abuse\Adapters\TimeLimit;
+use Utopia\Database\Document;
 use Utopia\Storage\Device\Local;
 use Utopia\Storage\Storage;
 
@@ -209,37 +209,37 @@
  $target = Realtime::fromPayload($events->getParam('event'), $payload);
 
  Realtime::send(
- $project->getId(), 
- $response->getPayload(), 
- $events->getParam('event'), 
- $target['channels'], 
- $target['roles'], 
+ $project->getId(),
+ $response->getPayload(),
+ $events->getParam('event'),
+ $target['channels'],
+ $target['roles'],
  [
  'permissionsChanged' => $target['permissionsChanged'], 
  'userId' => $events->getParam('userId')
  ]
  );
  }
  }
- 
+
  if (!empty($audits->getParam('event'))) {
  $audits->trigger();
  }
- 
+
  if (!empty($deletes->getParam('type')) && !empty($deletes->getParam('document'))) {
  $deletes->trigger();
  }
 
  if (!empty($database->getParam('type')) && !empty($database->getParam('document'))) {
  $database->trigger();
  }
- 
+
  $route = $utopia->match($request);
  if (App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled' 
  && $project->getId()
  && $mode !== APP_MODE_ADMIN // TODO: add check to make sure user is admin
  && !empty($route->getLabel('sdk.namespace', null))) { // Don't calculate console usage on admin mode
- 
+
  $usage
  ->setParam('networkRequestSize', $request->getSize() + $usage->getParam('storage'))
  ->setParam('networkResponseSize', $response->getSize())

diff --git a/app/http.php b/app/http.php
@@ -131,7 +131,6 @@
  }
 
  $dbForConsole->createCollection($key, $attributes, $indexes);
-
  }
 
  Console::success('[Setup] - Server database init completed...');

diff --git a/app/init.php b/app/init.php
@@ -28,11 +28,9 @@
 use Appwrite\Network\Validator\Email;
 use Appwrite\Network\Validator\IP;
 use Appwrite\Network\Validator\URL;
-use Appwrite\Event\Realtime;
 use Appwrite\OpenSSL\OpenSSL;
 use Appwrite\Stats\Stats;
 use Utopia\App;
-use Utopia\CLI\Console;
 use Utopia\View;
 use Utopia\Config\Config;
 use Utopia\Locale\Locale;