Merge remote-tracking branch 'origin/feat-git-integration-update-migration' into revert-some-migrations

# Conflicts:
#	src/Appwrite/Migration/Version/V19.php

.env

@@ -38,6 +38,10 @@ _APP_CONNECTIONS_STORAGE=local://localhost
 _APP_STORAGE_ANTIVIRUS=disabled
 _APP_STORAGE_ANTIVIRUS_HOST=clamav
 _APP_STORAGE_ANTIVIRUS_PORT=3310
+_APP_INFLUXDB_HOST=influxdb
+_APP_INFLUXDB_PORT=8086
+_APP_STATSD_HOST=telegraf
+_APP_STATSD_PORT=8125
 _APP_SMTP_HOST=maildev
 _APP_SMTP_PORT=1025
 _APP_SMTP_SECURE=

.github/workflows/tests.yml

@@ -46,7 +46,7 @@ jobs:
     - name: Start Appwrite
       run:  |
         docker compose up -d
-        sleep 60
+        sleep 30
 
     - name: Doctor
       run:  |

CHANGES.md

@@ -121,41 +121,6 @@
 - Get default region from environment on project create [#4780](https://github.com/appwrite/appwrite/pull/4780)
 - Fix french translation [#4782](https://github.com/appwrite/appwrite/pull/4782)
 - Fix max mimetype size [#4814](https://github.com/appwrite/appwrite/pull/4814)
-- New usage metrics collection flow [#4770](https://github.com/appwrite/appwrite/pull/4770)
-  - Deprecated influxdb, telegraf containers and removed all of their occurrences from the code.
-  - Removed _APP_INFLUXDB_HOST, _APP_INFLUXDB_PORT, _APP_STATSD_HOST, _APP_STATSD_PORT env variables.
-  - Removed usage labels dependency.
-  - Dropped type attribute from stats collection.
-  - Usage metrics are processed via new usage worker.
-  - Metrics changes: 
-    - Storage
-      - deprecated
-        - filesCreate, filesRead, filesUpdate, filesDelete, bucketsCreate, bucketsRead, bucketsUpdate, bucketsDelete.
-      - renamed
-        - filesCount to filesTotal, storage to filesStorage, bucketsCount to bucketsTotal.
-    - Auth 
-        - deprecated
-          - usersCreate, usersRead, usersUpdate, usersDelete, sessionsCreate sessionsProviderCreate, sessionsDelete.
-        - renamed
-          - usersCount to usersTotal.
-        - added
-          - sessionsTotal.
-    - Databases
-      - deprecated
-        - databasesCreate, databasesRead, databasesDelete, documentsCreate, documentsRead, documentsUpdate, documentsDelete, collectionsCreate, collectionsRead, collectionsUpdate, collectionsDelete.
-      - renamed
-        - databasesCount to databasesTotal, collectionsCount to collectionsTotal, documentsCount to documentsTotal.
-    - Functions
-      - deprecated 
-        - executionsFailure, executionsSuccess, buildsFailure, buildsSuccess, executionsFailure, executionsSuccess.
-      - renamed
-        - executionsTime to executionsCompute, buildsTime to buildsCompute, documentsCount to documentsTotal.
-      - added
-        - functionsTotal, buildsStorage, deploymentsTotal, deploymentsStorage.
-    - Project
-      - renamed
-        - executions to executionsTotal, builds to buildsTotal, requests to requestsTotal, storage to filesStorage, buckets to bucketsTotal, users to usersTotal, documents to documentsTotal, collections to collectionsTotal, databases to databasesTotal.
-
 ## Bugs
 - Fix invited account verified status [#4776](https://github.com/appwrite/appwrite/pull/4776)
 

CONTRIBUTING.md

@@ -238,6 +238,8 @@ Appwrite stack is a combination of a variety of open-source technologies and too
 
 - Redis - for managing cache and in-memory data (currently, we do not use Redis for persistent data).
 - MariaDB - for database storage and queries.
+- InfluxDB - for managing stats and time-series based data
+- Statsd - for sending data over UDP protocol (using Telegraf)
 - ClamAV - for validating and scanning storage files.
 - Imagemagick - for manipulating and managing image media files.
 - Webp - for better compression of images on supporting clients.

Dockerfile

@@ -92,6 +92,10 @@ ENV _APP_SERVER=swoole \
     _APP_DB_USER=root \
     _APP_DB_PASS=password \
     _APP_DB_SCHEMA=appwrite \
+    _APP_INFLUXDB_HOST=influxdb \
+    _APP_INFLUXDB_PORT=8086 \
+    _APP_STATSD_HOST=telegraf \
+    _APP_STATSD_PORT=8125 \
     _APP_FUNCTIONS_SIZE_LIMIT=30000000 \
     _APP_FUNCTIONS_TIMEOUT=900 \
     _APP_FUNCTIONS_CONTAINERS=10 \
@@ -161,6 +165,7 @@ RUN chmod +x /usr/local/bin/doctor && \
     chmod +x /usr/local/bin/patch-delete-project-collections && \
     chmod +x /usr/local/bin/maintenance &&  \
     chmod +x /usr/local/bin/volume-sync && \
+    chmod +x /usr/local/bin/usage && \
     chmod +x /usr/local/bin/install && \
     chmod +x /usr/local/bin/migrate && \
     chmod +x /usr/local/bin/realtime && \
@@ -180,8 +185,7 @@ RUN chmod +x /usr/local/bin/doctor && \
     chmod +x /usr/local/bin/worker-mails && \
     chmod +x /usr/local/bin/worker-messaging && \
     chmod +x /usr/local/bin/worker-webhooks && \
-    chmod +x /usr/local/bin/worker-migrations && \
-    chmod +x /usr/local/bin/worker-usage
+    chmod +x /usr/local/bin/worker-migrations
 
 # Letsencrypt Permissions
 RUN mkdir -p /etc/letsencrypt/live/ && chmod -Rf 755 /etc/letsencrypt/live/

SECURITY.md

@@ -9,6 +9,7 @@
 | 1.1.x     | :white_check_mark: |
 | 1.2.x     | :white_check_mark: |
 | 1.3.x     | :white_check_mark: |
+| 1.4.x     | :white_check_mark: |
 
 ## Reporting a Vulnerability
 

app/cli.php

@@ -74,7 +74,7 @@ CLI::setResource('dbForConsole', function ($pools, $cache) {
             $pools->get('console')->reclaim();
             sleep($sleep);
         }
-    } while ($attempts < $maxAttempts);
+    } while ($attempts < $maxAttempts && !$ready);
 
     if (!$ready) {
         throw new Exception("Console is not ready yet. Please try again later.");
@@ -116,6 +116,29 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
     return $getProjectDB;
 }, ['pools', 'dbForConsole', 'cache']);
 
+CLI::setResource('influxdb', function (Registry $register) {
+    $client = $register->get('influxdb'); /** @var InfluxDB\Client $client */
+    $attempts = 0;
+    $max = 10;
+    $sleep = 1;
+
+    do { // check if telegraf database is ready
+        try {
+            $attempts++;
+            $database = $client->selectDB('telegraf');
+            if (in_array('telegraf', $client->listDatabases())) {
+                break; // leave the do-while if successful
+            }
+        } catch (\Throwable $th) {
+            Console::warning("InfluxDB not ready. Retrying connection ({$attempts})...");
+            if ($attempts >= $max) {
+                throw new \Exception('InfluxDB database not ready yet');
+            }
+            sleep($sleep);
+        }
+    } while ($attempts < $max);
+    return $database;
+}, ['register']);
 
 CLI::setResource('queueForFunctions', function (Group $pools) {
     return new Func($pools->get('queue')->pop()->getResource());

app/config/avatars/browsers.php

@@ -2,20 +2,21 @@
 
 return [
     // Codes based on: https://github.com/matomo-org/device-detector/blob/master/Parser/Client/Browser.php
-    'aa' => __DIR__ . '/browsers/avant.png',
-    'an' => __DIR__ . '/browsers/android-webview-beta.png',
-    'ch' => __DIR__ . '/browsers/chrome.png',
-    'ci' => __DIR__ . '/browsers/chrome.png', //Chrome Mobile iOS
-    'cm' => __DIR__ . '/browsers/chrome.png', //Chrome Mobile
-    'cr' => __DIR__ . '/browsers/chromium.png',
-    'ff' => __DIR__ . '/browsers/firefox.png',
-    'sf' => __DIR__ . '/browsers/safari.png',
-    'mf' => __DIR__ . '/browsers/safari.png',
-    'ps' => __DIR__ . '/browsers/edge.png',
-    'oi' => __DIR__ . '/browsers/edge.png',
-    'om' => __DIR__ . '/browsers/opera-mini.png',
-    'op' => __DIR__ . '/browsers/opera.png',
-    'on' => __DIR__ . '/browsers/opera.png',
+    'aa' => ['name' => 'Avant Browser', 'path' => __DIR__ . '/browsers/avant.png'],
+    'an' => ['name' => 'Android WebView Beta', 'path' => __DIR__ . '/browsers/android-webview-beta.png'],
+    'ch' => ['name' => 'Google Chrome', 'path' => __DIR__ . '/browsers/chrome.png'],
+    'ci' => ['name' => 'Google Chrome (iOS)', 'path' => __DIR__ . '/browsers/chrome.png'],
+    'cm' => ['name' => 'Google Chrome (Mobile)', 'path' => __DIR__ . '/browsers/chrome.png'],
+    'cr' => ['name' => 'Chromium', 'path' => __DIR__ . '/browsers/chromium.png'],
+    'ff' => ['name' => 'Mozilla Firefox', 'path' => __DIR__ . '/browsers/firefox.png'],
+    'sf' => ['name' => 'Safari', 'path' => __DIR__ . '/browsers/safari.png'],
+    'mf' => ['name' => 'Mobile Safari', 'path' => __DIR__ . '/browsers/safari.png'],
+    'ps' => ['name' => 'Microsoft Edge', 'path' => __DIR__ . '/browsers/edge.png'],
+    'oi' => ['name' => 'Microsoft Edge (iOS)', 'path' => __DIR__ . '/browsers/edge.png'],
+    'om' => ['name' => 'Opera Mini', 'path' => __DIR__ . '/browsers/opera-mini.png'],
+    'op' => ['name' => 'Opera', 'path' => __DIR__ . '/browsers/opera.png'],
+    'on' => ['name' => 'Opera (Next)', 'path' => __DIR__ . '/browsers/opera.png'],
+
 
     /*
     '36' => '360 Phone Browser',

app/config/avatars/credit-cards.php

@@ -1,20 +1,20 @@
 <?php
 
 return [
-    'amex' => __DIR__ . '/credit-cards/amex.png',
-    'argencard' => __DIR__ . '/credit-cards/argencard.png',
-    'cabal' => __DIR__ . '/credit-cards/cabal.png',
-    'censosud' => __DIR__ . '/credit-cards/consosud.png',
-    'diners' => __DIR__ . '/credit-cards/diners.png',
-    'discover' => __DIR__ . '/credit-cards/discover.png',
-    'elo' => __DIR__ . '/credit-cards/elo.png',
-    'hipercard' => __DIR__ . '/credit-cards/hipercard.png',
-    'jcb' => __DIR__ . '/credit-cards/jcb.png',
-    'mastercard' => __DIR__ . '/credit-cards/mastercard.png',
-    'naranja' => __DIR__ . '/credit-cards/naranja.png',
-    'targeta-shopping' => __DIR__ . '/credit-cards/tarjeta-shopping.png',
-    'union-china-pay' => __DIR__ . '/credit-cards/union-china-pay.png',
-    'visa' => __DIR__ . '/credit-cards/visa.png',
-    'mir' => __DIR__ . '/credit-cards/mir.png',
-    'maestro' => __DIR__ . '/credit-cards/maestro.png',
-];
+    'amex' => ['name' => 'American Express', 'path' => __DIR__ . '/credit-cards/amex.png'],
+    'argencard' => ['name' => 'Argencard', 'path' => __DIR__ . '/credit-cards/argencard.png'],
+    'cabal' => ['name' => 'Cabal', 'path' => __DIR__ . '/credit-cards/cabal.png'],
+    'censosud' => ['name' => 'Consosud', 'path' => __DIR__ . '/credit-cards/consosud.png'],
+    'diners' => ['name' => 'Diners Club', 'path' => __DIR__ . '/credit-cards/diners.png'],
+    'discover' => ['name' => 'Discover', 'path' => __DIR__ . '/credit-cards/discover.png'],
+    'elo' => ['name' => 'Elo', 'path' => __DIR__ . '/credit-cards/elo.png'],
+    'hipercard' => ['name' => 'Hipercard', 'path' => __DIR__ . '/credit-cards/hipercard.png'],
+    'jcb' => ['name' => 'JCB', 'path' => __DIR__ . '/credit-cards/jcb.png'],
+    'mastercard' => ['name' => 'Mastercard', 'path' => __DIR__ . '/credit-cards/mastercard.png'],
+    'naranja' => ['name' => 'Naranja', 'path' => __DIR__ . '/credit-cards/naranja.png'],
+    'targeta-shopping' => ['name' => 'Tarjeta Shopping', 'path' => __DIR__ . '/credit-cards/tarjeta-shopping.png'],
+    'union-china-pay' => ['name' => 'Union China Pay', 'path' => __DIR__ . '/credit-cards/union-china-pay.png'],
+    'visa' => ['name' => 'Visa', 'path' => __DIR__ . '/credit-cards/visa.png'],
+    'mir' => ['name' => 'MIR', 'path' => __DIR__ . '/credit-cards/mir.png'],
+    'maestro' => ['name' => 'Maestro', 'path' => __DIR__ . '/credit-cards/maestro.png']
+    ];

app/config/avatars/flags.php

@@ -1,198 +1,198 @@
 <?php
 
 return [
-    'af' => __DIR__ . '/flags/af.png',
-    'ao' => __DIR__ . '/flags/ao.png',
-    'al' => __DIR__ . '/flags/al.png',
-    'ad' => __DIR__ . '/flags/ad.png',
-    'ae' => __DIR__ . '/flags/ae.png',
-    'ar' => __DIR__ . '/flags/ar.png',
-    'am' => __DIR__ . '/flags/am.png',
-    'ag' => __DIR__ . '/flags/ag.png',
-    'au' => __DIR__ . '/flags/au.png',
-    'at' => __DIR__ . '/flags/at.png',
-    'az' => __DIR__ . '/flags/az.png',
-    'bi' => __DIR__ . '/flags/bi.png',
-    'be' => __DIR__ . '/flags/be.png',
-    'bj' => __DIR__ . '/flags/bj.png',
-    'bf' => __DIR__ . '/flags/bf.png',
-    'bd' => __DIR__ . '/flags/bd.png',
-    'bg' => __DIR__ . '/flags/bg.png',
-    'bh' => __DIR__ . '/flags/bh.png',
-    'bs' => __DIR__ . '/flags/bs.png',
-    'ba' => __DIR__ . '/flags/ba.png',
-    'by' => __DIR__ . '/flags/by.png',
-    'bz' => __DIR__ . '/flags/bz.png',
-    'bo' => __DIR__ . '/flags/bo.png',
-    'br' => __DIR__ . '/flags/br.png',
-    'bb' => __DIR__ . '/flags/bb.png',
-    'bn' => __DIR__ . '/flags/bn.png',
-    'bt' => __DIR__ . '/flags/bt.png',
-    'bw' => __DIR__ . '/flags/bw.png',
-    'cf' => __DIR__ . '/flags/cf.png',
-    'ca' => __DIR__ . '/flags/ca.png',
-    'ch' => __DIR__ . '/flags/ch.png',
-    'cl' => __DIR__ . '/flags/cl.png',
-    'cn' => __DIR__ . '/flags/cn.png',
-    'ci' => __DIR__ . '/flags/ci.png',
-    'cm' => __DIR__ . '/flags/cm.png',
-    'cd' => __DIR__ . '/flags/cd.png',
-    'cg' => __DIR__ . '/flags/cg.png',
-    'co' => __DIR__ . '/flags/co.png',
-    'km' => __DIR__ . '/flags/km.png',
-    'cv' => __DIR__ . '/flags/cv.png',
-    'cr' => __DIR__ . '/flags/cr.png',
-    'cu' => __DIR__ . '/flags/cu.png',
-    'cy' => __DIR__ . '/flags/cy.png',
-    'cz' => __DIR__ . '/flags/cz.png',
-    'de' => __DIR__ . '/flags/de.png',
-    'dj' => __DIR__ . '/flags/dj.png',
-    'dm' => __DIR__ . '/flags/dm.png',
-    'dk' => __DIR__ . '/flags/dk.png',
-    'do' => __DIR__ . '/flags/do.png',
-    'dz' => __DIR__ . '/flags/dz.png',
-    'ec' => __DIR__ . '/flags/ec.png',
-    'eg' => __DIR__ . '/flags/eg.png',
-    'er' => __DIR__ . '/flags/er.png',
-    'es' => __DIR__ . '/flags/es.png',
-    'ee' => __DIR__ . '/flags/ee.png',
-    'et' => __DIR__ . '/flags/et.png',
-    'fi' => __DIR__ . '/flags/fi.png',
-    'fj' => __DIR__ . '/flags/fj.png',
-    'fr' => __DIR__ . '/flags/fr.png',
-    'fm' => __DIR__ . '/flags/fm.png',
-    'ga' => __DIR__ . '/flags/ga.png',
-    'gb' => __DIR__ . '/flags/gb.png',
-    'ge' => __DIR__ . '/flags/ge.png',
-    'gh' => __DIR__ . '/flags/gh.png',
-    'gn' => __DIR__ . '/flags/gn.png',
-    'gm' => __DIR__ . '/flags/gm.png',
-    'gw' => __DIR__ . '/flags/gw.png',
-    'gq' => __DIR__ . '/flags/gq.png',
-    'gr' => __DIR__ . '/flags/gr.png',
-    'gd' => __DIR__ . '/flags/gd.png',
-    'gt' => __DIR__ . '/flags/gt.png',
-    'gy' => __DIR__ . '/flags/gy.png',
-    'hn' => __DIR__ . '/flags/hn.png',
-    'hr' => __DIR__ . '/flags/hr.png',
-    'ht' => __DIR__ . '/flags/ht.png',
-    'hu' => __DIR__ . '/flags/hu.png',
-    'id' => __DIR__ . '/flags/id.png',
-    'in' => __DIR__ . '/flags/in.png',
-    'ie' => __DIR__ . '/flags/ie.png',
-    'ir' => __DIR__ . '/flags/ir.png',
-    'iq' => __DIR__ . '/flags/iq.png',
-    'is' => __DIR__ . '/flags/is.png',
-    'il' => __DIR__ . '/flags/il.png',
-    'it' => __DIR__ . '/flags/it.png',
-    'jm' => __DIR__ . '/flags/jm.png',
-    'jo' => __DIR__ . '/flags/jo.png',
-    'jp' => __DIR__ . '/flags/jp.png',
-    'kz' => __DIR__ . '/flags/kz.png',
-    'ke' => __DIR__ . '/flags/ke.png',
-    'kg' => __DIR__ . '/flags/kg.png',
-    'kh' => __DIR__ . '/flags/kh.png',
-    'ki' => __DIR__ . '/flags/ki.png',
-    'kn' => __DIR__ . '/flags/kn.png',
-    'kr' => __DIR__ . '/flags/kr.png',
-    'kw' => __DIR__ . '/flags/kw.png',
-    'la' => __DIR__ . '/flags/la.png',
-    'lb' => __DIR__ . '/flags/lb.png',
-    'lr' => __DIR__ . '/flags/lr.png',
-    'ly' => __DIR__ . '/flags/ly.png',
-    'lc' => __DIR__ . '/flags/lc.png',
-    'li' => __DIR__ . '/flags/li.png',
-    'lk' => __DIR__ . '/flags/lk.png',
-    'ls' => __DIR__ . '/flags/ls.png',
-    'lt' => __DIR__ . '/flags/ls.png',
-    'lu' => __DIR__ . '/flags/lu.png',
-    'lv' => __DIR__ . '/flags/lv.png',
-    'ma' => __DIR__ . '/flags/ma.png',
-    'mc' => __DIR__ . '/flags/mc.png',
-    'md' => __DIR__ . '/flags/md.png',
-    'mg' => __DIR__ . '/flags/mg.png',
-    'mv' => __DIR__ . '/flags/mv.png',
-    'mx' => __DIR__ . '/flags/mx.png',
-    'mh' => __DIR__ . '/flags/mh.png',
-    'mk' => __DIR__ . '/flags/mk.png',
-    'ml' => __DIR__ . '/flags/ml.png',
-    'mt' => __DIR__ . '/flags/mt.png',
-    'mm' => __DIR__ . '/flags/mm.png',
-    'me' => __DIR__ . '/flags/me.png',
-    'mn' => __DIR__ . '/flags/mn.png',
-    'mz' => __DIR__ . '/flags/mz.png',
-    'mr' => __DIR__ . '/flags/mr.png',
-    'mu' => __DIR__ . '/flags/mu.png',
-    'mw' => __DIR__ . '/flags/mw.png',
-    'my' => __DIR__ . '/flags/my.png',
-    'na' => __DIR__ . '/flags/na.png',
-    'ne' => __DIR__ . '/flags/ne.png',
-    'ng' => __DIR__ . '/flags/ng.png',
-    'ni' => __DIR__ . '/flags/ni.png',
-    'nl' => __DIR__ . '/flags/nl.png',
-    'no' => __DIR__ . '/flags/no.png',
-    'np' => __DIR__ . '/flags/np.png',
-    'nr' => __DIR__ . '/flags/nr.png',
-    'nz' => __DIR__ . '/flags/nz.png',
-    'om' => __DIR__ . '/flags/om.png',
-    'pk' => __DIR__ . '/flags/pk.png',
-    'pa' => __DIR__ . '/flags/pa.png',
-    'pe' => __DIR__ . '/flags/pe.png',
-    'ph' => __DIR__ . '/flags/ph.png',
-    'pw' => __DIR__ . '/flags/pw.png',
-    'pg' => __DIR__ . '/flags/pg.png',
-    'pl' => __DIR__ . '/flags/pl.png',
-    'kp' => __DIR__ . '/flags/kp.png',
-    'pt' => __DIR__ . '/flags/pt.png',
-    'py' => __DIR__ . '/flags/py.png',
-    'qa' => __DIR__ . '/flags/qa.png',
-    'ro' => __DIR__ . '/flags/ro.png',
-    'ru' => __DIR__ . '/flags/ru.png',
-    'rw' => __DIR__ . '/flags/rw.png',
-    'sa' => __DIR__ . '/flags/sa.png',
-    'sd' => __DIR__ . '/flags/sd.png',
-    'sn' => __DIR__ . '/flags/sn.png',
-    'sg' => __DIR__ . '/flags/sg.png',
-    'sb' => __DIR__ . '/flags/sb.png',
-    'sl' => __DIR__ . '/flags/sl.png',
-    'sv' => __DIR__ . '/flags/sv.png',
-    'sm' => __DIR__ . '/flags/sm.png',
-    'so' => __DIR__ . '/flags/so.png',
-    'rs' => __DIR__ . '/flags/rs.png',
-    'ss' => __DIR__ . '/flags/ss.png',
-    'st' => __DIR__ . '/flags/st.png',
-    'sr' => __DIR__ . '/flags/sr.png',
-    'sk' => __DIR__ . '/flags/sk.png',
-    'si' => __DIR__ . '/flags/si.png',
-    'se' => __DIR__ . '/flags/se.png',
-    'sz' => __DIR__ . '/flags/sz.png',
-    'sc' => __DIR__ . '/flags/sc.png',
-    'sy' => __DIR__ . '/flags/sy.png',
-    'td' => __DIR__ . '/flags/td.png',
-    'tg' => __DIR__ . '/flags/tg.png',
-    'th' => __DIR__ . '/flags/th.png',
-    'tj' => __DIR__ . '/flags/tj.png',
-    'tm' => __DIR__ . '/flags/tm.png',
-    'tl' => __DIR__ . '/flags/tl.png',
-    'to' => __DIR__ . '/flags/to.png',
-    'tt' => __DIR__ . '/flags/tt.png',
-    'tn' => __DIR__ . '/flags/tn.png',
-    'tr' => __DIR__ . '/flags/tr.png',
-    'tv' => __DIR__ . '/flags/tv.png',
-    'tz' => __DIR__ . '/flags/tz.png',
-    'ug' => __DIR__ . '/flags/ug.png',
-    'ua' => __DIR__ . '/flags/ua.png',
-    'uy' => __DIR__ . '/flags/uy.png',
-    'us' => __DIR__ . '/flags/us.png',
-    'uz' => __DIR__ . '/flags/uz.png',
-    'va' => __DIR__ . '/flags/va.png',
-    'vc' => __DIR__ . '/flags/vc.png',
-    've' => __DIR__ . '/flags/ve.png',
-    'vn' => __DIR__ . '/flags/vn.png',
-    'vu' => __DIR__ . '/flags/vu.png',
-    'ws' => __DIR__ . '/flags/ws.png',
-    'ye' => __DIR__ . '/flags/ye.png',
-    'za' => __DIR__ . '/flags/za.png',
-    'zm' => __DIR__ . '/flags/zm.png',
-    'zw' => __DIR__ . '/flags/zw.png',
+    'af' => ['name' => 'Afghanistan', 'path' => __DIR__ . '/flags/af.png'],
+    'ao' => ['name' => 'Angola', 'path' => __DIR__ . '/flags/ao.png'],
+    'al' => ['name' => 'Albania', 'path' => __DIR__ . '/flags/al.png'],
+    'ad' => ['name' => 'Andorra', 'path' => __DIR__ . '/flags/ad.png'],
+    'ae' => ['name' => 'United Arab Emirates', 'path' => __DIR__ . '/flags/ae.png'],
+    'ar' => ['name' => 'Argentina', 'path' => __DIR__ . '/flags/ar.png'],
+    'am' => ['name' => 'Armenia', 'path' => __DIR__ . '/flags/am.png'],
+    'ag' => ['name' => 'Antigua and Barbuda', 'path' => __DIR__ . '/flags/ag.png'],
+    'au' => ['name' => 'Australia', 'path' => __DIR__ . '/flags/au.png'],
+    'at' => ['name' => 'Austria', 'path' => __DIR__ . '/flags/at.png'],
+    'az' => ['name' => 'Azerbaijan', 'path' => __DIR__ . '/flags/az.png'],
+    'bi' => ['name' => 'Burundi', 'path' => __DIR__ . '/flags/bi.png'],
+    'be' => ['name' => 'Belgium', 'path' => __DIR__ . '/flags/be.png'],
+    'bj' => ['name' => 'Benin', 'path' => __DIR__ . '/flags/bj.png'],
+    'bf' => ['name' => 'Burkina Faso', 'path' => __DIR__ . '/flags/bf.png'],
+    'bd' => ['name' => 'Bangladesh', 'path' => __DIR__ . '/flags/bd.png'],
+    'bg' => ['name' => 'Bulgaria', 'path' => __DIR__ . '/flags/bg.png'],
+    'bh' => ['name' => 'Bahrain', 'path' => __DIR__ . '/flags/bh.png'],
+    'bs' => ['name' => 'Bahamas', 'path' => __DIR__ . '/flags/bs.png'],
+    'ba' => ['name' => 'Bosnia and Herzegovina', 'path' => __DIR__ . '/flags/ba.png'],
+    'by' => ['name' => 'Belarus', 'path' => __DIR__ . '/flags/by.png'],
+    'bz' => ['name' => 'Belize', 'path' => __DIR__ . '/flags/bz.png'],
+    'bo' => ['name' => 'Bolivia', 'path' => __DIR__ . '/flags/bo.png'],
+    'br' => ['name' => 'Brazil', 'path' => __DIR__ . '/flags/br.png'],
+    'bb' => ['name' => 'Barbados', 'path' => __DIR__ . '/flags/bb.png'],
+    'bn' => ['name' => 'Brunei Darussalam', 'path' => __DIR__ . '/flags/bn.png'],
+    'bt' => ['name' => 'Bhutan', 'path' => __DIR__ . '/flags/bt.png'],
+    'bw' => ['name' => 'Botswana', 'path' => __DIR__ . '/flags/bw.png'],
+    'cf' => ['name' => 'Central African Republic', 'path' => __DIR__ . '/flags/cf.png'],
+    'ca' => ['name' => 'Canada', 'path' => __DIR__ . '/flags/ca.png'],
+    'ch' => ['name' => 'Switzerland', 'path' => __DIR__ . '/flags/ch.png'],
+    'cl' => ['name' => 'Chile', 'path' => __DIR__ . '/flags/cl.png'],
+    'cn' => ['name' => 'China', 'path' => __DIR__ . '/flags/cn.png'],
+    'ci' => ['name' => 'Côte d\'Ivoire', 'path' => __DIR__ . '/flags/ci.png'],
+    'cm' => ['name' => 'Cameroon', 'path' => __DIR__ . '/flags/cm.png'],
+    'cd' => ['name' => 'Democratic Republic of the Congo', 'path' => __DIR__ . '/flags/cd.png'],
+    'cg' => ['name' => 'Republic of the Congo', 'path' => __DIR__ . '/flags/cg.png'],
+    'co' => ['name' => 'Colombia', 'path' => __DIR__ . '/flags/co.png'],
+    'km' => ['name' => 'Comoros', 'path' => __DIR__ . '/flags/km.png'],
+    'cv' => ['name' => 'Cape Verde', 'path' => __DIR__ . '/flags/cv.png'],
+    'cr' => ['name' => 'Costa Rica', 'path' => __DIR__ . '/flags/cr.png'],
+    'cu' => ['name' => 'Cuba', 'path' => __DIR__ . '/flags/cu.png'],
+    'cy' => ['name' => 'Cyprus', 'path' => __DIR__ . '/flags/cy.png'],
+    'cz' => ['name' => 'Czech Republic', 'path' => __DIR__ . '/flags/cz.png'],
+    'de' => ['name' => 'Germany', 'path' => __DIR__ . '/flags/de.png'],
+    'dj' => ['name' => 'Djibouti', 'path' => __DIR__ . '/flags/dj.png'],
+    'dm' => ['name' => 'Dominica', 'path' => __DIR__ . '/flags/dm.png'],
+    'dk' => ['name' => 'Denmark', 'path' => __DIR__ . '/flags/dk.png'],
+    'do' => ['name' => 'Dominican Republic', 'path' => __DIR__ . '/flags/do.png'],
+    'dz' => ['name' => 'Algeria', 'path' => __DIR__ . '/flags/dz.png'],
+    'ec' => ['name' => 'Ecuador', 'path' => __DIR__ . '/flags/ec.png'],
+    'eg' => ['name' => 'Egypt', 'path' => __DIR__ . '/flags/eg.png'],
+    'er' => ['name' => 'Eritrea', 'path' => __DIR__ . '/flags/er.png'],
+    'es' => ['name' => 'Spain', 'path' => __DIR__ . '/flags/es.png'],
+    'ee' => ['name' => 'Estonia', 'path' => __DIR__ . '/flags/ee.png'],
+    'et' => ['name' => 'Ethiopia', 'path' => __DIR__ . '/flags/et.png'],
+    'fi' => ['name' => 'Finland', 'path' => __DIR__ . '/flags/fi.png'],
+    'fj' => ['name' => 'Fiji', 'path' => __DIR__ . '/flags/fj.png'],
+    'fr' => ['name' => 'France', 'path' => __DIR__ . '/flags/fr.png'],
+    'fm' => ['name' => 'Micronesia (Federated States of)', 'path' => __DIR__ . '/flags/fm.png'],
+    'ga' => ['name' => 'Gabon', 'path' => __DIR__ . '/flags/ga.png'],
+    'gb' => ['name' => 'United Kingdom', 'path' => __DIR__ . '/flags/gb.png'],
+    'ge' => ['name' => 'Georgia', 'path' => __DIR__ . '/flags/ge.png'],
+    'gh' => ['name' => 'Ghana', 'path' => __DIR__ . '/flags/gh.png'],
+    'gn' => ['name' => 'Guinea', 'path' => __DIR__ . '/flags/gn.png'],
+    'gm' => ['name' => 'Gambia', 'path' => __DIR__ . '/flags/gm.png'],
+    'gw' => ['name' => 'Guinea-Bissau', 'path' => __DIR__ . '/flags/gw.png'],
+    'gq' => ['name' => 'Equatorial Guinea', 'path' => __DIR__ . '/flags/gq.png'],
+    'gr' => ['name' => 'Greece', 'path' => __DIR__ . '/flags/gr.png'],
+    'gd' => ['name' => 'Grenada', 'path' => __DIR__ . '/flags/gd.png'],
+    'gt' => ['name' => 'Guatemala', 'path' => __DIR__ . '/flags/gt.png'],
+    'gy' => ['name' => 'Guyana', 'path' => __DIR__ . '/flags/gy.png'],
+    'hn' => ['name' => 'Honduras', 'path' => __DIR__ . '/flags/hn.png'],
+    'hr' => ['name' => 'Croatia', 'path' => __DIR__ . '/flags/hr.png'],
+    'ht' => ['name' => 'Haiti', 'path' => __DIR__ . '/flags/ht.png'],
+    'hu' => ['name' => 'Hungary', 'path' => __DIR__ . '/flags/hu.png'],
+    'id' => ['name' => 'Indonesia', 'path' => __DIR__ . '/flags/id.png'],
+    'in' => ['name' => 'India', 'path' => __DIR__ . '/flags/in.png'],
+    'ie' => ['name' => 'Ireland', 'path' => __DIR__ . '/flags/ie.png'],
+    'ir' => ['name' => 'Iran (Islamic Republic of)', 'path' => __DIR__ . '/flags/ir.png'],
+    'iq' => ['name' => 'Iraq', 'path' => __DIR__ . '/flags/iq.png'],
+    'is' => ['name' => 'Iceland', 'path' => __DIR__ . '/flags/is.png'],
+    'il' => ['name' => 'Israel', 'path' => __DIR__ . '/flags/il.png'],
+    'it' => ['name' => 'Italy', 'path' => __DIR__ . '/flags/it.png'],
+    'jm' => ['name' => 'Jamaica', 'path' => __DIR__ . '/flags/jm.png'],
+    'jo' => ['name' => 'Jordan', 'path' => __DIR__ . '/flags/jo.png'],
+    'jp' => ['name' => 'Japan', 'path' => __DIR__ . '/flags/jp.png'],
+    'kz' => ['name' => 'Kazakhstan', 'path' => __DIR__ . '/flags/kz.png'],
+    'ke' => ['name' => 'Kenya', 'path' => __DIR__ . '/flags/ke.png'],
+    'kg' => ['name' => 'Kyrgyzstan', 'path' => __DIR__ . '/flags/kg.png'],
+    'kh' => ['name' => 'Cambodia', 'path' => __DIR__ . '/flags/kh.png'],
+    'ki' => ['name' => 'Kiribati', 'path' => __DIR__ . '/flags/ki.png'],
+    'kn' => ['name' => 'Saint Kitts and Nevis', 'path' => __DIR__ . '/flags/kn.png'],
+    'kr' => ['name' => 'South Korea', 'path' => __DIR__ . '/flags/kr.png'],
+    'kw' => ['name' => 'Kuwait', 'path' => __DIR__ . '/flags/kw.png'],
+    'la' => ['name' => 'Lao People\'s Democratic Republic', 'path' => __DIR__ . '/flags/la.png'],
+    'lb' => ['name' => 'Lebanon', 'path' => __DIR__ . '/flags/lb.png'],
+    'lr' => ['name' => 'Liberia', 'path' => __DIR__ . '/flags/lr.png'],
+    'ly' => ['name' => 'Libya', 'path' => __DIR__ . '/flags/ly.png'],
+    'lc' => ['name' => 'Saint Lucia', 'path' => __DIR__ . '/flags/lc.png'],
+    'li' => ['name' => 'Liechtenstein', 'path' => __DIR__ . '/flags/li.png'],
+    'lk' => ['name' => 'Sri Lanka', 'path' => __DIR__ . '/flags/lk.png'],
+    'ls' => ['name' => 'Lesotho', 'path' => __DIR__ . '/flags/ls.png'],
+    'lt' => ['name' => 'Lithuania', 'path' => __DIR__ . '/flags/lt.png'],
+    'lu' => ['name' => 'Luxembourg', 'path' => __DIR__ . '/flags/lu.png'],
+    'lv' => ['name' => 'Latvia', 'path' => __DIR__ . '/flags/lv.png'],
+    'ma' => ['name' => 'Morocco', 'path' => __DIR__ . '/flags/ma.png'],
+    'mc' => ['name' => 'Monaco', 'path' => __DIR__ . '/flags/mc.png'],
+    'md' => ['name' => 'Moldova', 'path' => __DIR__ . '/flags/md.png'],
+    'mg' => ['name' => 'Madagascar', 'path' => __DIR__ . '/flags/mg.png'],
+    'mv' => ['name' => 'Maldives', 'path' => __DIR__ . '/flags/mv.png'],
+    'mx' => ['name' => 'Mexico', 'path' => __DIR__ . '/flags/mx.png'],
+    'mh' => ['name' => 'Marshall Islands', 'path' => __DIR__ . '/flags/mh.png'],
+    'mk' => ['name' => 'North Macedonia', 'path' => __DIR__ . '/flags/mk.png'],
+    'ml' => ['name' => 'Mali', 'path' => __DIR__ . '/flags/ml.png'],
+    'mt' => ['name' => 'Malta', 'path' => __DIR__ . '/flags/mt.png'],
+    'mm' => ['name' => 'Myanmar', 'path' => __DIR__ . '/flags/mm.png'],
+    'me' => ['name' => 'Montenegro', 'path' => __DIR__ . '/flags/me.png'],
+    'mn' => ['name' => 'Mongolia', 'path' => __DIR__ . '/flags/mn.png'],
+    'mz' => ['name' => 'Mozambique', 'path' => __DIR__ . '/flags/mz.png'],
+    'mr' => ['name' => 'Mauritania', 'path' => __DIR__ . '/flags/mr.png'],
+    'mu' => ['name' => 'Mauritius', 'path' => __DIR__ . '/flags/mu.png'],
+    'mw' => ['name' => 'Malawi', 'path' => __DIR__ . '/flags/mw.png'],
+    'my' => ['name' => 'Malaysia', 'path' => __DIR__ . '/flags/my.png'],
+    'na' => ['name' => 'Namibia', 'path' => __DIR__ . '/flags/na.png'],
+    'ne' => ['name' => 'Niger', 'path' => __DIR__ . '/flags/ne.png'],
+    'ng' => ['name' => 'Nigeria', 'path' => __DIR__ . '/flags/ng.png'],
+    'ni' => ['name' => 'Nicaragua', 'path' => __DIR__ . '/flags/ni.png'],
+    'nl' => ['name' => 'Netherlands', 'path' => __DIR__ . '/flags/nl.png'],
+    'no' => ['name' => 'Norway', 'path' => __DIR__ . '/flags/no.png'],
+    'np' => ['name' => 'Nepal', 'path' => __DIR__ . '/flags/np.png'],
+    'nr' => ['name' => 'Nauru', 'path' => __DIR__ . '/flags/nr.png'],
+    'nz' => ['name' => 'New Zealand', 'path' => __DIR__ . '/flags/nz.png'],
+    'om' => ['name' => 'Oman', 'path' => __DIR__ . '/flags/om.png'],
+    'pk' => ['name' => 'Pakistan', 'path' => __DIR__ . '/flags/pk.png'],
+    'pa' => ['name' => 'Panama', 'path' => __DIR__ . '/flags/pa.png'],
+    'pe' => ['name' => 'Peru', 'path' => __DIR__ . '/flags/pe.png'],
+    'ph' => ['name' => 'Philippines', 'path' => __DIR__ . '/flags/ph.png'],
+    'pw' => ['name' => 'Palau', 'path' => __DIR__ . '/flags/pw.png'],
+    'pg' => ['name' => 'Papua New Guinea', 'path' => __DIR__ . '/flags/pg.png'],
+    'pl' => ['name' => 'Poland', 'path' => __DIR__ . '/flags/pl.png'],
+    'kp' => ['name' => 'North Korea', 'path' => __DIR__ . '/flags/kp.png'],
+    'pt' => ['name' => 'Portugal', 'path' => __DIR__ . '/flags/pt.png'],
+    'py' => ['name' => 'Paraguay', 'path' => __DIR__ . '/flags/py.png'],
+    'qa' => ['name' => 'Qatar', 'path' => __DIR__ . '/flags/qa.png'],
+    'ro' => ['name' => 'Romania', 'path' => __DIR__ . '/flags/ro.png'],
+    'ru' => ['name' => 'Russia', 'path' => __DIR__ . '/flags/ru.png'],
+    'rw' => ['name' => 'Rwanda', 'path' => __DIR__ . '/flags/rw.png'],
+    'sa' => ['name' => 'Saudi Arabia', 'path' => __DIR__ . '/flags/sa.png'],
+    'sd' => ['name' => 'Sudan', 'path' => __DIR__ . '/flags/sd.png'],
+    'sn' => ['name' => 'Senegal', 'path' => __DIR__ . '/flags/sn.png'],
+    'sg' => ['name' => 'Singapore', 'path' => __DIR__ . '/flags/sg.png'],
+    'sb' => ['name' => 'Solomon Islands', 'path' => __DIR__ . '/flags/sb.png'],
+    'sl' => ['name' => 'Sierra Leone', 'path' => __DIR__ . '/flags/sl.png'],
+    'sv' => ['name' => 'El Salvador', 'path' => __DIR__ . '/flags/sv.png'],
+    'sm' => ['name' => 'San Marino', 'path' => __DIR__ . '/flags/sm.png'],
+    'so' => ['name' => 'Somalia', 'path' => __DIR__ . '/flags/so.png'],
+    'rs' => ['name' => 'Serbia', 'path' => __DIR__ . '/flags/rs.png'],
+    'ss' => ['name' => 'South Sudan', 'path' => __DIR__ . '/flags/ss.png'],
+    'st' => ['name' => 'Sao Tome and Principe', 'path' => __DIR__ . '/flags/st.png'],
+    'sr' => ['name' => 'Suriname', 'path' => __DIR__ . '/flags/sr.png'],
+    'sk' => ['name' => 'Slovakia', 'path' => __DIR__ . '/flags/sk.png'],
+    'si' => ['name' => 'Slovenia', 'path' => __DIR__ . '/flags/si.png'],
+    'se' => ['name' => 'Sweden', 'path' => __DIR__ . '/flags/se.png'],
+    'sz' => ['name' => 'Eswatini', 'path' => __DIR__ . '/flags/sz.png'],
+    'sc' => ['name' => 'Seychelles', 'path' => __DIR__ . '/flags/sc.png'],
+    'sy' => ['name' => 'Syria', 'path' => __DIR__ . '/flags/sy.png'],
+    'td' => ['name' => 'Chad', 'path' => __DIR__ . '/flags/td.png'],
+    'tg' => ['name' => 'Togo', 'path' => __DIR__ . '/flags/tg.png'],
+    'th' => ['name' => 'Thailand', 'path' => __DIR__ . '/flags/th.png'],
+    'tj' => ['name' => 'Tajikistan', 'path' => __DIR__ . '/flags/tj.png'],
+    'tm' => ['name' => 'Turkmenistan', 'path' => __DIR__ . '/flags/tm.png'],
+    'tl' => ['name' => 'Timor-Leste', 'path' => __DIR__ . '/flags/tl.png'],
+    'to' => ['name' => 'Tonga', 'path' => __DIR__ . '/flags/to.png'],
+    'tt' => ['name' => 'Trinidad and Tobago', 'path' => __DIR__ . '/flags/tt.png'],
+    'tn' => ['name' => 'Tunisia', 'path' => __DIR__ . '/flags/tn.png'],
+    'tr' => ['name' => 'Turkey', 'path' => __DIR__ . '/flags/tr.png'],
+    'tv' => ['name' => 'Tuvalu', 'path' => __DIR__ . '/flags/tv.png'],
+    'tz' => ['name' => 'Tanzania', 'path' => __DIR__ . '/flags/tz.png'],
+    'ug' => ['name' => 'Uganda', 'path' => __DIR__ . '/flags/ug.png'],
+    'ua' => ['name' => 'Ukraine', 'path' => __DIR__ . '/flags/ua.png'],
+    'uy' => ['name' => 'Uruguay', 'path' => __DIR__ . '/flags/uy.png'],
+    'us' => ['name' => 'United States', 'path' => __DIR__ . '/flags/us.png'],
+    'uz' => ['name' => 'Uzbekistan', 'path' => __DIR__ . '/flags/uz.png'],
+    'va' => ['name' => 'Vatican City', 'path' => __DIR__ . '/flags/va.png'],
+    'vc' => ['name' => 'Saint Vincent and the Grenadines', 'path' => __DIR__ . '/flags/vc.png'],
+    've' => ['name' => 'Venezuela', 'path' => __DIR__ . '/flags/ve.png'],
+    'vn' => ['name' => 'Vietnam', 'path' => __DIR__ . '/flags/vn.png'],
+    'vu' => ['name' => 'Vanuatu', 'path' => __DIR__ . '/flags/vu.png'],
+    'ws' => ['name' => 'Samoa', 'path' => __DIR__ . '/flags/ws.png'],
+    'ye' => ['name' => 'Yemen', 'path' => __DIR__ . '/flags/ye.png'],
+    'za' => ['name' => 'South Africa', 'path' => __DIR__ . '/flags/za.png'],
+    'zm' => ['name' => 'Zambia', 'path' => __DIR__ . '/flags/zm.png'],
+    'zw' => ['name' => 'Zimbabwe', 'path' => __DIR__ . '/flags/zw.png'],
 ];

app/config/collections.php

@@ -1216,14 +1216,14 @@ $commonCollections = [
                 'type' => Database::INDEX_FULLTEXT,
                 'attributes' => ['name'],
                 'lengths' => [],
-                'orders' => [Database::ORDER_ASC],
+                'orders' => [],
             ],
             [
                 '$id' => ID::custom('_key_search'),
                 'type' => Database::INDEX_FULLTEXT,
                 'attributes' => ['search'],
                 'lengths' => [],
-                'orders' => [Database::ORDER_ASC],
+                'orders' => [],
             ],
             [
                 '$id' => ID::custom('_key_enabled'),
@@ -1302,7 +1302,7 @@ $commonCollections = [
                 'type' => Database::VAR_INTEGER,
                 'format' => '',
                 'size' => 8,
-                'signed' => true,
+                'signed' => false,
                 'required' => true,
                 'default' => null,
                 'array' => false,
@@ -1330,6 +1330,17 @@ $commonCollections = [
                 'array' => false,
                 'filters' => [],
             ],
+            [
+                '$id' => ID::custom('type'),
+                'type' => Database::VAR_INTEGER,
+                'format' => '',
+                'size' => 1,
+                'signed' => false,
+                'required' => true,
+                'default' => 0, // 0 -> count, 1 -> sum
+                'array' => false,
+                'filters' => [],
+            ],
         ],
         'indexes' => [
             [
@@ -1348,53 +1359,14 @@ $commonCollections = [
             ],
             [
                 '$id' => ID::custom('_key_metric_period_time'),
-                'type' => Database::INDEX_UNIQUE,
+                'type' => Database::INDEX_KEY,
                 'attributes' => ['metric', 'period', 'time'],
                 'lengths' => [],
                 'orders' => [Database::ORDER_DESC],
             ],
         ],
     ],
-
-    'statsLogger' => [
-        '$collection' => ID::custom(Database::METADATA),
-        '$id' => ID::custom('statsLogger'),
-        'name' => 'StatsLogger',
-        'attributes' => [
-            [
-                '$id' => ID::custom('time'),
-                'type' => Database::VAR_DATETIME,
-                'format' => '',
-                'size' => 0,
-                'signed' => false,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => ['datetime'],
-            ],
-            [
-                '$id' => ID::custom('metrics'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 5012,
-                'signed' => true,
-                'required' => false,
-                'default' => [],
-                'array' => false,
-                'filters' => ['json'],
-            ],
-        ],
-        'indexes' => [
-            [
-                '$id' => ID::custom('_key_time'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['time'],
-                'lengths' => [],
-                'orders' => [Database::ORDER_DESC],
-            ],
-        ],
-    ],
-];
+ ];
 
 $projectCollections = array_merge([
     'databases' => [
@@ -2078,7 +2050,7 @@ $projectCollections = array_merge([
                 'type' => Database::INDEX_FULLTEXT,
                 'attributes' => ['search'],
                 'lengths' => [],
-                'orders' => [Database::ORDER_ASC],
+                'orders' => [],
             ],
             [
                 '$id' => ID::custom('_key_name'),
@@ -2938,7 +2910,7 @@ $projectCollections = array_merge([
                 'array' => false,
                 'filters' => [],
             ],
-         ],
+        ],
         'indexes' => [
             [
                 '$id' => '_key_accessedAt',
@@ -3035,22 +3007,22 @@ $projectCollections = array_merge([
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['resourceInternalId'],
                 'lengths' => [Database::LENGTH_KEY],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => '_key_resourceId',
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['resourceId'],
-                'lengths' => [Database::LENGTH_KEY],
-                'orders' => [Database::ORDER_ASC],
+                'orders' => [],
             ],
             [
                 '$id' => '_key_resourceType',
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['resourceType'],
-                'lengths' => [100],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
+            [
+                '$id' => '_key_resourceId_resourceType',
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['resourceId', 'resourceType'],
+                'lengths' => [Database::LENGTH_KEY, 100],
+                'orders' => [Database::ORDER_ASC, Database::ORDER_ASC],
+            ],
             [
                 '$id' => '_key_uniqueKey',
                 'type' => Database::INDEX_UNIQUE,
@@ -3607,7 +3579,7 @@ $consoleCollections = array_merge([
             [
                 '$id' => ID::custom('_key_region_resourceType_resourceUpdatedAt'),
                 'type' => Database::INDEX_KEY,
-                'attributes' => ['region', 'resourceType','resourceUpdatedAt'],
+                'attributes' => ['region', 'resourceType', 'resourceUpdatedAt'],
                 'lengths' => [],
                 'orders' => [],
             ],
@@ -4213,7 +4185,7 @@ $consoleCollections = array_merge([
                 '$id' => '_key_resourceType',
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['resourceType'],
-                'lengths' => [100],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
         ],
@@ -4849,7 +4821,7 @@ $bucketCollections = [
                 'type' => Database::INDEX_FULLTEXT,
                 'attributes' => ['search'],
                 'lengths' => [],
-                'orders' => [Database::ORDER_ASC],
+                'orders' => [],
             ],
             [
                 '$id' => ID::custom('_key_bucket'),

app/config/errors.php

@@ -631,6 +631,11 @@ return [
         'description' => 'Host is not trusted. Add a custom domain to your project first.',
         'code' => 404,
     ],
+    Exception::ROUTER_DOMAIN_NOT_CONFIGURED => [
+        'name' => Exception::ROUTER_DOMAIN_NOT_CONFIGURED,
+        'description' => 'Please configure domain environment variables before using Appwrite outside of localhost.',
+        'code' => 500,
+    ],
     Exception::RULE_RESOURCE_NOT_FOUND => [
         'name' => Exception::RULE_RESOURCE_NOT_FOUND,
         'description' => 'Resource could not be found. Check resourceId and resourceType.',

app/config/locale/codes.php

@@ -362,10 +362,6 @@ return [
         "code" => "ko",
         "name" => "Korean",
     ],
-    [
-        "code" => "ko",
-        "name" => "Korean (Johab)",
-    ],
     [
         "code" => "ku",
         "name" => "Kurdish",

app/config/roles.php

@@ -61,7 +61,6 @@ return [
     Auth::USER_ROLE_GUESTS => [
         'label' => 'Guests',
         'scopes' => [
-            'none',
             'public',
             'home',
             'console',
@@ -77,22 +76,22 @@ return [
     ],
     Auth::USER_ROLE_USERS => [
         'label' => 'Users',
-        'scopes' => \array_merge($member, [ 'none' ]),
+        'scopes' => \array_merge($member),
     ],
     Auth::USER_ROLE_ADMIN => [
         'label' => 'Admin',
-        'scopes' => \array_merge($admins, [ 'none' ]),
+        'scopes' => \array_merge($admins),
     ],
     Auth::USER_ROLE_DEVELOPER => [
         'label' => 'Developer',
-        'scopes' => \array_merge($admins, [ 'none' ]),
+        'scopes' => \array_merge($admins),
     ],
     Auth::USER_ROLE_OWNER => [
         'label' => 'Owner',
-        'scopes' => \array_merge($member, $admins, [ 'none' ]),
+        'scopes' => \array_merge($member, $admins),
     ],
     Auth::USER_ROLE_APPS => [
         'label' => 'Applications',
-        'scopes' => ['health.read', 'graphql', 'none'],
+        'scopes' => ['health.read', 'graphql'],
     ],
 ];

app/console

@@ -1 +1 @@
-Subproject commit c4331ea10dce0cbf403cae9aec8273f2d003ba2e
+Subproject commit e23424ed6af1d96a169e87337f32d1d84d5e19f4

app/controllers/api/account.php

@@ -58,6 +58,7 @@ App::post('/v1/account/invite')
     ->label('audits.event', 'user.create')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('audits.userId', '{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.create')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'createWithInviteCode')
@@ -153,6 +154,7 @@ App::post('/v1/account')
     ->label('audits.event', 'user.create')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('audits.userId', '{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.create')
     ->label('sdk.auth', [])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'create')
@@ -266,6 +268,8 @@ App::post('/v1/account/sessions/email')
     ->label('audits.event', 'session.create')
     ->label('audits.resource', 'user/{response.userId}')
     ->label('audits.userId', '{response.userId}')
+    ->label('usage.metric', 'sessions.{scope}.requests.create')
+    ->label('usage.params', ['provider:email'])
     ->label('sdk.auth', [])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'createEmailSession')
@@ -518,6 +522,8 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
     ->label('abuse-limit', 50)
     ->label('abuse-key', 'ip:{ip}')
     ->label('docs', false)
+    ->label('usage.metric', 'sessions.{scope}.requests.create')
+    ->label('usage.params', ['provider:{request.provider}'])
     ->param('provider', '', new WhiteList(\array_keys(Config::getParam('providers')), true), 'OAuth2 provider.')
     ->param('code', '', new Text(2048, 0), 'OAuth2 code.', true)
     ->param('state', '', new Text(2048), 'OAuth2 state params.', true)
@@ -940,7 +946,7 @@ App::delete('/v1/account/identities/:identityId')
     ->label('sdk.description', '/docs/references/account/delete-identity.md')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
     ->label('sdk.response.model', Response::MODEL_NONE)
-    ->param('identityId', [], new UID(), 'Identity ID.')
+    ->param('identityId', '', new UID(), 'Identity ID.')
     ->inject('response')
     ->inject('dbForProject')
     ->action(function (string $identityId, Response $response, Database $dbForProject) {
@@ -1138,6 +1144,8 @@ App::put('/v1/account/sessions/magic-url')
     ->label('audits.event', 'session.update')
     ->label('audits.resource', 'user/{response.userId}')
     ->label('audits.userId', '{response.userId}')
+    ->label('usage.metric', 'sessions.{scope}.requests.create')
+    ->label('usage.params', ['provider:magic-url'])
     ->label('sdk.auth', [])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'updateMagicURLSession')
@@ -1512,6 +1520,8 @@ App::post('/v1/account/sessions/anonymous')
     ->label('audits.event', 'session.create')
     ->label('audits.resource', 'user/{response.userId}')
     ->label('audits.userId', '{response.userId}')
+    ->label('usage.metric', 'sessions.{scope}.requests.create')
+    ->label('usage.params', ['provider:anonymous'])
     ->label('sdk.auth', [])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'createAnonymousSession')
@@ -1687,6 +1697,7 @@ App::get('/v1/account')
     ->desc('Get Account')
     ->groups(['api', 'account'])
     ->label('scope', 'account')
+    ->label('usage.metric', 'users.{scope}.requests.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'get')
@@ -1707,6 +1718,7 @@ App::get('/v1/account/prefs')
     ->desc('Get Account Preferences')
     ->groups(['api', 'account'])
     ->label('scope', 'account')
+    ->label('usage.metric', 'users.{scope}.requests.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'getPrefs')
@@ -1729,6 +1741,7 @@ App::get('/v1/account/sessions')
     ->desc('List Sessions')
     ->groups(['api', 'account'])
     ->label('scope', 'account')
+    ->label('usage.metric', 'users.{scope}.requests.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'listSessions')
@@ -1767,6 +1780,7 @@ App::get('/v1/account/logs')
     ->desc('List Logs')
     ->groups(['api', 'account'])
     ->label('scope', 'account')
+    ->label('usage.metric', 'users.{scope}.requests.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'listLogs')
@@ -1827,6 +1841,7 @@ App::get('/v1/account/sessions/:sessionId')
     ->desc('Get Session')
     ->groups(['api', 'account'])
     ->label('scope', 'account')
+    ->label('usage.metric', 'users.{scope}.requests.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'getSession')
@@ -1874,6 +1889,7 @@ App::patch('/v1/account/name')
     ->label('scope', 'account')
     ->label('audits.event', 'user.update')
     ->label('audits.resource', 'user/{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'updateName')
@@ -1908,6 +1924,7 @@ App::patch('/v1/account/password')
     ->label('audits.event', 'user.update')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('audits.userId', '{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'updatePassword')
@@ -1973,6 +1990,7 @@ App::patch('/v1/account/email')
     ->label('scope', 'account')
     ->label('audits.event', 'user.update')
     ->label('audits.resource', 'user/{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'updateEmail')
@@ -2042,6 +2060,7 @@ App::patch('/v1/account/phone')
     ->label('scope', 'account')
     ->label('audits.event', 'user.update')
     ->label('audits.resource', 'user/{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'updatePhone')
@@ -2100,6 +2119,7 @@ App::patch('/v1/account/prefs')
     ->label('scope', 'account')
     ->label('audits.event', 'user.update')
     ->label('audits.resource', 'user/{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'updatePrefs')
@@ -2133,6 +2153,7 @@ App::patch('/v1/account/status')
     ->label('scope', 'account')
     ->label('audits.event', 'user.update')
     ->label('audits.resource', 'user/{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.delete')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'updateStatus')
@@ -2176,6 +2197,7 @@ App::delete('/v1/account/sessions/:sessionId')
     ->label('event', 'users.[userId].sessions.[sessionId].delete')
     ->label('audits.event', 'session.delete')
     ->label('audits.resource', 'user/{user.$id}')
+    ->label('usage.metric', 'sessions.{scope}.requests.delete')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'deleteSession')
@@ -2252,6 +2274,7 @@ App::patch('/v1/account/sessions/:sessionId')
     ->label('audits.event', 'session.update')
     ->label('audits.resource', 'user/{response.userId}')
     ->label('audits.userId', '{response.userId}')
+    ->label('usage.metric', 'sessions.{scope}.requests.update')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'updateSession')
@@ -2336,6 +2359,7 @@ App::delete('/v1/account/sessions')
     ->label('event', 'users.[userId].sessions.[sessionId].delete')
     ->label('audits.event', 'session.delete')
     ->label('audits.resource', 'user/{user.$id}')
+    ->label('usage.metric', 'sessions.{scope}.requests.delete')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'deleteSessions')
@@ -2397,6 +2421,7 @@ App::post('/v1/account/recovery')
     ->label('audits.event', 'recovery.create')
     ->label('audits.resource', 'user/{response.userId}')
     ->label('audits.userId', '{response.userId}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'createRecovery')
@@ -2537,6 +2562,7 @@ App::put('/v1/account/recovery')
     ->label('audits.event', 'recovery.update')
     ->label('audits.resource', 'user/{response.userId}')
     ->label('audits.userId', '{response.userId}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'updateRecovery')
@@ -2623,6 +2649,7 @@ App::post('/v1/account/verification')
     ->label('event', 'users.[userId].verification.[tokenId].create')
     ->label('audits.event', 'verification.create')
     ->label('audits.resource', 'user/{response.userId}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'createVerification')
@@ -2742,6 +2769,7 @@ App::put('/v1/account/verification')
     ->label('event', 'users.[userId].verification.[tokenId].update')
     ->label('audits.event', 'verification.update')
     ->label('audits.resource', 'user/{response.userId}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'updateVerification')
@@ -2802,6 +2830,7 @@ App::post('/v1/account/verification/phone')
     ->label('event', 'users.[userId].verification.[tokenId].create')
     ->label('audits.event', 'verification.create')
     ->label('audits.resource', 'user/{response.userId}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'createPhoneVerification')
@@ -2897,6 +2926,7 @@ App::put('/v1/account/verification/phone')
     ->label('event', 'users.[userId].verification.[tokenId].update')
     ->label('audits.event', 'verification.update')
     ->label('audits.resource', 'user/{response.userId}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'updatePhoneVerification')

app/controllers/api/avatars.php

@@ -42,7 +42,7 @@ $avatarCallback = function (string $type, string $code, int $width, int $height,
     }
 
     $output = 'png';
-    $path = $set[$code];
+    $path = $set[$code]['path'];
     $type = 'png';
 
     if (!\is_readable($path)) {

app/controllers/api/console.php

@@ -30,11 +30,17 @@ App::get('/v1/console/variables')
     ->inject('response')
     ->action(function (Response $response) {
 
+        $isVcsEnabled = !empty(App::getEnv('_APP_VCS_GITHUB_APP_NAME', '')) && !empty(App::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY', '')) && !empty(App::getEnv('_APP_VCS_GITHUB_APP_ID', '')) && !empty(App::getEnv('_APP_VCS_GITHUB_CLIENT_ID', '')) && !empty(App::getEnv('_APP_VCS_GITHUB_CLIENT_SECRET', ''));
+
+        $isAssistantEnabled = !empty(App::getEnv('_APP_ASSISTANT_OPENAI_API_KEY', ''));
+
         $variables = new Document([
             '_APP_DOMAIN_TARGET' => App::getEnv('_APP_DOMAIN_TARGET'),
             '_APP_STORAGE_LIMIT' => +App::getEnv('_APP_STORAGE_LIMIT'),
             '_APP_FUNCTIONS_SIZE_LIMIT' => +App::getEnv('_APP_FUNCTIONS_SIZE_LIMIT'),
             '_APP_USAGE_STATS' => App::getEnv('_APP_USAGE_STATS'),
+            '_APP_VCS_ENABLED' => $isVcsEnabled,
+            '_APP_ASSISTANT_ENABLED' => $isAssistantEnabled
         ]);
 
         $response->dynamic($variables, Response::MODEL_CONSOLE_VARIABLES);

app/controllers/api/functions.php

@@ -142,7 +142,7 @@ App::post('/v1/functions')
     ->param('enabled', true, new Boolean(), 'Is function enabled?', true)
     ->param('logging', true, new Boolean(), 'Do executions get logged?', true)
     ->param('entrypoint', '', new Text(1028), 'Entrypoint File.')
-    ->param('commands', '', new Text(1028, 0), 'Build Commands.', true)
+    ->param('commands', '', new Text(8192, 0), 'Build Commands.', true)
     ->param('installationId', '', new Text(128, 0), 'Appwrite Installation ID for vcs deployment.', true)
     ->param('providerRepositoryId', '', new Text(128, 0), 'Repository ID of the repo linked to the function', true)
     ->param('providerBranch', '', new Text(128, 0), 'Production branch for the repo linked to the function', true)
@@ -165,7 +165,12 @@ App::post('/v1/functions')
 
         // build from template
         $template = new Document([]);
-        if (!empty($templateRepository) && !empty($templateOwner) && !empty($templateRootDirectory) && !empty($templateBranch)) {
+        if (
+            !empty($templateRepository)
+            && !empty($templateOwner)
+            && !empty($templateRootDirectory)
+            && !empty($templateBranch)
+        ) {
             $template->setAttribute('repositoryName', $templateRepository)
                 ->setAttribute('ownerName', $templateOwner)
                 ->setAttribute('rootDirectory', $templateRootDirectory)
@@ -195,6 +200,7 @@ App::post('/v1/functions')
             'events' => $events,
             'schedule' => $schedule,
             'scheduleInternalId' => '',
+            'scheduleId' => '',
             'timeout' => $timeout,
             'entrypoint' => $entrypoint,
             'commands' => $commands,
@@ -210,6 +216,22 @@ App::post('/v1/functions')
             'providerSilentMode' => $providerSilentMode,
         ]));
 
+        $schedule = Authorization::skip(
+            fn () => $dbForConsole->createDocument('schedules', new Document([
+                'region' => App::getEnv('_APP_REGION', 'default'), // Todo replace with projects region
+                'resourceType' => 'function',
+                'resourceId' => $function->getId(),
+                'resourceInternalId' => $function->getInternalId(),
+                'resourceUpdatedAt' => DateTime::now(),
+                'projectId' => $project->getId(),
+                'schedule'  => $function->getAttribute('schedule'),
+                'active' => false,
+            ]))
+        );
+
+        $function->setAttribute('scheduleId', $schedule->getId());
+        $function->setAttribute('scheduleInternalId', $schedule->getInternalId());
+
         // Git connect logic
         if (!empty($providerRepositoryId)) {
             $repository = $dbForConsole->createDocument('repositories', new Document([
@@ -230,23 +252,11 @@ App::post('/v1/functions')
                 'providerPullRequestIds' => []
             ]));
 
-            $function = $dbForProject->updateDocument('functions', $function->getId(), $function
-                ->setAttribute('repositoryId', $repository->getId())
-                ->setAttribute('repositoryInternalId', $repository->getInternalId()));
+            $function->setAttribute('repositoryId', $repository->getId());
+            $function->setAttribute('repositoryInternalId', $repository->getInternalId());
         }
 
-        $schedule = Authorization::skip(
-            fn () => $dbForConsole->createDocument('schedules', new Document([
-                'region' => App::getEnv('_APP_REGION', 'default'), // Todo replace with projects region
-                'resourceType' => 'function',
-                'resourceId' => $function->getId(),
-                'resourceInternalId' => $function->getInternalId(),
-                'resourceUpdatedAt' => DateTime::now(),
-                'projectId' => $project->getId(),
-                'schedule'  => $function->getAttribute('schedule'),
-                'active' => false,
-            ]))
-        );
+        $function = $dbForProject->updateDocument('functions', $function->getId(), $function);
 
         // Redeploy vcs logic
         if (!empty($providerRepositoryId)) {
@@ -315,10 +325,6 @@ App::post('/v1/functions')
             );
         }
 
-        $function->setAttribute('scheduleId', $schedule->getId());
-        $function->setAttribute('scheduleInternalId', $schedule->getInternalId());
-        $dbForProject->updateDocument('functions', $function->getId(), $function);
-
         $eventsInstance->setParam('functionId', $function->getId());
 
         $response
@@ -445,66 +451,92 @@ App::get('/v1/functions/:functionId/usage')
             throw new Exception(Exception::FUNCTION_NOT_FOUND);
         }
 
-        $periods = Config::getParam('usage', []);
-        $stats = $usage = [];
-        $days = $periods[$range];
-        $metrics = [
-            str_replace(['{resourceType}', '{resourceInternalId}'], ['functions', $function->getInternalId()], METRIC_FUNCTION_ID_DEPLOYMENTS),
-            str_replace(['{resourceType}', '{resourceInternalId}'], ['functions', $function->getInternalId()], METRIC_FUNCTION_ID_DEPLOYMENTS_STORAGE),
-            str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS),
-            str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS_STORAGE),
-            str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS_COMPUTE),
-            str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS),
-            str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_COMPUTE),
-        ];
-
-        Authorization::skip(function () use ($dbForProject, $days, $metrics, &$stats) {
-            foreach ($metrics as $metric) {
-                $limit = $days['limit'];
-                $period = $days['period'];
-                $results = $dbForProject->find('stats', [
-                    Query::equal('period', [$period]),
-                    Query::equal('metric', [$metric]),
-                    Query::limit($limit),
-                    Query::orderDesc('time'),
-                ]);
-                $stats[$metric] = [];
-                foreach ($results as $result) {
-                    $stats[$metric][$result->getAttribute('time')] = [
-                        'value' => $result->getAttribute('value'),
-                    ];
-                }
-            }
-        });
-
-        $format = match ($days['period']) {
-            '1h' => 'Y-m-d\TH:00:00.000P',
-            '1d' => 'Y-m-d\T00:00:00.000P',
-        };
-
-    foreach ($metrics as $metric) {
-        $usage[$metric] = [];
-        $leap = time() - ($days['limit'] * $days['factor']);
-        while ($leap < time()) {
-            $leap += $days['factor'];
-            $formatDate = date($format, $leap);
-            $usage[$metric][] = [
-                'value' => $stats[$metric][$formatDate]['value'] ?? 0,
-                'date' => $formatDate,
+        $usage = [];
+        if (App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
+            $periods = [
+                '24h' => [
+                    'period' => '1h',
+                    'limit' => 24,
+                ],
+                '7d' => [
+                    'period' => '1d',
+                    'limit' => 7,
+                ],
+                '30d' => [
+                    'period' => '1d',
+                    'limit' => 30,
+                ],
+                '90d' => [
+                    'period' => '1d',
+                    'limit' => 90,
+                ],
             ];
-        }
-    }
 
-        $response->dynamic(new Document([
-            'range' => $range,
-            'deploymentsTotal' => $usage[$metrics[0]],
-            'deploymentsStorage' => $usage[$metrics[1]],
-            'buildsTotal' => $usage[$metrics[2]],
-            'buildsStorage' => $usage[$metrics[3]],
-            'buildsTime' => $usage[$metrics[4]],
-            'executionsTotal' => $usage[$metrics[5]],
-            'executionsTime' => $usage[$metrics[6]],
-        ]), Response::MODEL_USAGE_FUNCTION);
+            $metrics = [
+                "executions.$functionId.compute.total",
+                "executions.$functionId.compute.success",
+                "executions.$functionId.compute.failure",
+                "executions.$functionId.compute.time",
+                "builds.$functionId.compute.total",
+                "builds.$functionId.compute.success",
+                "builds.$functionId.compute.failure",
+                "builds.$functionId.compute.time",
+            ];
+
+            $stats = [];
+
+            Authorization::skip(function () use ($dbForProject, $periods, $range, $metrics, &$stats) {
+                foreach ($metrics as $metric) {
+                    $limit = $periods[$range]['limit'];
+                    $period = $periods[$range]['period'];
+
+                    $requestDocs = $dbForProject->find('stats', [
+                        Query::equal('period', [$period]),
+                        Query::equal('metric', [$metric]),
+                        Query::limit($limit),
+                        Query::orderDesc('time'),
+                    ]);
+
+                    $stats[$metric] = [];
+                    foreach ($requestDocs as $requestDoc) {
+                        $stats[$metric][] = [
+                            'value' => $requestDoc->getAttribute('value'),
+                            'date' => $requestDoc->getAttribute('time'),
+                        ];
+                    }
+
+                    // backfill metrics with empty values for graphs
+                    $backfill = $limit - \count($requestDocs);
+                    while ($backfill > 0) {
+                        $last = $limit - $backfill - 1; // array index of last added metric
+                        $diff = match ($period) { // convert period to seconds for unix timestamp math
+                            '1h' => 3600,
+                            '1d' => 86400,
+                        };
+                        $stats[$metric][] = [
+                            'value' => 0,
+                            'date' => DateTime::formatTz(DateTime::addSeconds(new \DateTime($stats[$metric][$last]['date'] ?? null), -1 * $diff)),
+                        ];
+                        $backfill--;
+                    }
+                    $stats[$metric] = array_reverse($stats[$metric]);
+                }
+            });
+
+            $usage = new Document([
+                'range' => $range,
+                'executionsTotal' => $stats["executions.$functionId.compute.total"] ?? [],
+                'executionsFailure' => $stats["executions.$functionId.compute.failure"] ?? [],
+                'executionsSuccesse' => $stats["executions.$functionId.compute.success"] ?? [],
+                'executionsTime' => $stats["executions.$functionId.compute.time"] ?? [],
+                'buildsTotal' => $stats["builds.$functionId.compute.total"] ?? [],
+                'buildsFailure' => $stats["builds.$functionId.compute.failure"] ?? [],
+                'buildsSuccess' => $stats["builds.$functionId.compute.success"] ?? [],
+                'buildsTime' => $stats["builds.$functionId.compute.time" ?? []]
+            ]);
+        }
+
+        $response->dynamic($usage, Response::MODEL_USAGE_FUNCTION);
     });
 
 App::get('/v1/functions/usage')
@@ -522,67 +554,92 @@ App::get('/v1/functions/usage')
     ->inject('dbForProject')
     ->action(function (string $range, Response $response, Database $dbForProject) {
 
-        $periods = Config::getParam('usage', []);
-        $stats = $usage = [];
-        $days = $periods[$range];
-        $metrics = [
-            METRIC_FUNCTIONS,
-            METRIC_DEPLOYMENTS,
-            METRIC_DEPLOYMENTS_STORAGE,
-            METRIC_BUILDS,
-            METRIC_BUILDS_STORAGE,
-            METRIC_BUILDS_COMPUTE,
-            METRIC_EXECUTIONS,
-            METRIC_EXECUTIONS_COMPUTE,
-        ];
-
-        Authorization::skip(function () use ($dbForProject, $days, $metrics, &$stats) {
-            foreach ($metrics as $metric) {
-                $limit = $days['limit'];
-                $period = $days['period'];
-                $results = $dbForProject->find('stats', [
-                    Query::equal('period', [$period]),
-                    Query::equal('metric', [$metric]),
-                    Query::limit($limit),
-                    Query::orderDesc('time'),
-                ]);
-                $stats[$metric] = [];
-                foreach ($results as $result) {
-                    $stats[$metric][$result->getAttribute('time')] = [
-                        'value' => $result->getAttribute('value'),
-                    ];
-                }
-            }
-        });
-
-        $format = match ($days['period']) {
-            '1h' => 'Y-m-d\TH:00:00.000P',
-            '1d' => 'Y-m-d\T00:00:00.000P',
-        };
-
-    foreach ($metrics as $metric) {
-        $usage[$metric] = [];
-        $leap = time() - ($days['limit'] * $days['factor']);
-        while ($leap < time()) {
-            $leap += $days['factor'];
-            $formatDate = date($format, $leap);
-            $usage[$metric][] = [
-                'value' => $stats[$metric][$formatDate]['value'] ?? 0,
-                'date' => $formatDate,
+        $usage = [];
+        if (App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
+            $periods = [
+                '24h' => [
+                    'period' => '1h',
+                    'limit' => 24,
+                ],
+                '7d' => [
+                    'period' => '1d',
+                    'limit' => 7,
+                ],
+                '30d' => [
+                    'period' => '1d',
+                    'limit' => 30,
+                ],
+                '90d' => [
+                    'period' => '1d',
+                    'limit' => 90,
+                ],
             ];
+
+            $metrics = [
+                'executions.$all.compute.total',
+                'executions.$all.compute.failure',
+                'executions.$all.compute.success',
+                'executions.$all.compute.time',
+                'builds.$all.compute.total',
+                'builds.$all.compute.failure',
+                'builds.$all.compute.success',
+                'builds.$all.compute.time',
+            ];
+
+            $stats = [];
+
+            Authorization::skip(function () use ($dbForProject, $periods, $range, $metrics, &$stats) {
+                foreach ($metrics as $metric) {
+                    $limit = $periods[$range]['limit'];
+                    $period = $periods[$range]['period'];
+
+                    $requestDocs = $dbForProject->find('stats', [
+                        Query::equal('period', [$period]),
+                        Query::equal('metric', [$metric]),
+                        Query::limit($limit),
+                        Query::orderDesc('time'),
+                    ]);
+
+                    $stats[$metric] = [];
+                    foreach ($requestDocs as $requestDoc) {
+                        $stats[$metric][] = [
+                            'value' => $requestDoc->getAttribute('value'),
+                            'date' => $requestDoc->getAttribute('time'),
+                        ];
+                    }
+
+                    // backfill metrics with empty values for graphs
+                    $backfill = $limit - \count($requestDocs);
+                    while ($backfill > 0) {
+                        $last = $limit - $backfill - 1; // array index of last added metric
+                        $diff = match ($period) { // convert period to seconds for unix timestamp math
+                            '1h' => 3600,
+                            '1d' => 86400,
+                        };
+                        $stats[$metric][] = [
+                            'value' => 0,
+                            'date' => DateTime::formatTz(DateTime::addSeconds(new \DateTime($stats[$metric][$last]['date'] ?? null), -1 * $diff)),
+                        ];
+                        $backfill--;
+                    }
+                    $stats[$metric] = array_reverse($stats[$metric]);
+                }
+            });
+
+            $usage = new Document([
+                'range' => $range,
+                'executionsTotal' => $stats[$metrics[0]] ?? [],
+                'executionsFailure' => $stats[$metrics[1]] ?? [],
+                'executionsSuccess' => $stats[$metrics[2]] ?? [],
+                'executionsTime' => $stats[$metrics[3]] ?? [],
+                'buildsTotal' => $stats[$metrics[4]] ?? [],
+                'buildsFailure' => $stats[$metrics[5]] ?? [],
+                'buildsSuccess' => $stats[$metrics[6]] ?? [],
+                'buildsTime' => $stats[$metrics[7]] ?? [],
+            ]);
         }
-    }
-        $response->dynamic(new Document([
-            'range' => $range,
-            'functionsTotal' => $usage[$metrics[0]],
-            'deploymentsTotal' => $usage[$metrics[1]],
-            'deploymentsStorage' => $usage[$metrics[2]],
-            'buildsTotal' => $usage[$metrics[3]],
-            'buildsStorage' => $usage[$metrics[4]],
-            'buildsTime' => $usage[$metrics[5]],
-            'executionsTotal' => $usage[$metrics[6]],
-            'executionsTime' => $usage[$metrics[7]],
-        ]), Response::MODEL_USAGE_FUNCTIONS);
+
+        $response->dynamic($usage, Response::MODEL_USAGE_FUNCTIONS);
     });
 
 App::put('/v1/functions/:functionId')
@@ -609,7 +666,7 @@ App::put('/v1/functions/:functionId')
     ->param('enabled', true, new Boolean(), 'Is function enabled?', true)
     ->param('logging', true, new Boolean(), 'Do executions get logged?', true)
     ->param('entrypoint', '', new Text(1028), 'Entrypoint File.')
-    ->param('commands', '', new Text(1028, 0), 'Build Commands.', true)
+    ->param('commands', '', new Text(8192, 0), 'Build Commands.', true)
     ->param('installationId', '', new Text(128, 0), 'Appwrite Installation ID for vcs deployment.', true)
     ->param('providerRepositoryId', '', new Text(128, 0), 'Repository ID of the repo linked to the function', true)
     ->param('providerBranch', '', new Text(128, 0), 'Production branch for the repo linked to the function', true)
@@ -705,6 +762,7 @@ App::put('/v1/functions/:functionId')
         $live = true;
 
         if (
+            $function->getAttribute('name') !== $name ||
             $function->getAttribute('entrypoint') !== $entrypoint ||
             $function->getAttribute('commands') !== $commands ||
             $function->getAttribute('providerRootDirectory') !== $providerRootDirectory ||
@@ -754,6 +812,93 @@ App::put('/v1/functions/:functionId')
         $response->dynamic($function, Response::MODEL_FUNCTION);
     });
 
+App::get('/v1/functions/:functionId/deployments/:deploymentId/download')
+    ->groups(['api', 'functions'])
+    ->desc('Download Deployment')
+    ->label('scope', 'functions.read')
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'functions')
+    ->label('sdk.method', 'downloadDeployment')
+    ->label('sdk.description', '/docs/references/functions/download-deployment.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', '*/*')
+    ->label('sdk.methodType', 'location')
+    ->param('functionId', '', new UID(), 'Function ID.')
+    ->param('deploymentId', '', new UID(), 'Deployment ID.')
+    ->inject('response')
+    ->inject('request')
+    ->inject('dbForProject')
+    ->inject('deviceFunctions')
+    ->action(function (string $functionId, string $deploymentId, Response $response, Request $request, Database $dbForProject, Device $deviceFunctions) {
+
+        $function = $dbForProject->getDocument('functions', $functionId);
+        if ($function->isEmpty()) {
+            throw new Exception(Exception::FUNCTION_NOT_FOUND);
+        }
+
+        $deployment = $dbForProject->getDocument('deployments', $deploymentId);
+        if ($deployment->isEmpty()) {
+            throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
+        }
+
+        if ($deployment->getAttribute('resourceId') !== $function->getId()) {
+            throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
+        }
+
+        $path = $deployment->getAttribute('path', '');
+        if (!$deviceFunctions->exists($path)) {
+            throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
+        }
+
+        $response
+            ->setContentType('application/gzip')
+            ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + (60 * 60 * 24 * 45)) . ' GMT') // 45 days cache
+            ->addHeader('X-Peak', \memory_get_peak_usage())
+            ->addHeader('Content-Disposition', 'attachment; filename="' . $deploymentId . '.tar.gz"')
+        ;
+
+        $size = $deviceFunctions->getFileSize($path);
+        $rangeHeader = $request->getHeader('range');
+
+        if (!empty($rangeHeader)) {
+            $start = $request->getRangeStart();
+            $end = $request->getRangeEnd();
+            $unit = $request->getRangeUnit();
+
+            if ($end === null) {
+                $end = min(($start + MAX_OUTPUT_CHUNK_SIZE - 1), ($size - 1));
+            }
+
+            if ($unit !== 'bytes' || $start >= $end || $end >= $size) {
+                throw new Exception(Exception::STORAGE_INVALID_RANGE);
+            }
+
+            $response
+                ->addHeader('Accept-Ranges', 'bytes')
+                ->addHeader('Content-Range', 'bytes ' . $start . '-' . $end . '/' . $size)
+                ->addHeader('Content-Length', $end - $start + 1)
+                ->setStatusCode(Response::STATUS_CODE_PARTIALCONTENT);
+
+            $response->send($deviceFunctions->read($path, $start, ($end - $start + 1)));
+        }
+
+        if ($size > APP_STORAGE_READ_BUFFER) {
+            $response->addHeader('Content-Length', $deviceFunctions->getFileSize($path));
+            for ($i = 0; $i < ceil($size / MAX_OUTPUT_CHUNK_SIZE); $i++) {
+                $response->chunk(
+                    $deviceFunctions->read(
+                        $path,
+                        ($i * MAX_OUTPUT_CHUNK_SIZE),
+                        min(MAX_OUTPUT_CHUNK_SIZE, $size - ($i * MAX_OUTPUT_CHUNK_SIZE))
+                    ),
+                    (($i + 1) * MAX_OUTPUT_CHUNK_SIZE) >= $size
+                );
+            }
+        } else {
+            $response->send($deviceFunctions->read($path));
+        }
+    });
+
 App::patch('/v1/functions/:functionId/deployments/:deploymentId')
     ->groups(['api', 'functions'])
     ->desc('Update Function Deployment')
@@ -1277,12 +1422,13 @@ App::post('/v1/functions/:functionId/deployments/:deploymentId/builds/:buildId')
     ->action(function (string $functionId, string $deploymentId, string $buildId, Request $request, Response $response, Database $dbForProject, Database $dbForConsole, Document $project, GitHub $github, Event $events) use ($redeployVcs) {
 
         $function = $dbForProject->getDocument('functions', $functionId);
-        $deployment = $dbForProject->getDocument('deployments', $deploymentId);
 
         if ($function->isEmpty()) {
             throw new Exception(Exception::FUNCTION_NOT_FOUND);
         }
 
+        $deployment = $dbForProject->getDocument('deployments', $deploymentId);
+
         if ($deployment->isEmpty()) {
             throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
         }
@@ -1293,11 +1439,25 @@ App::post('/v1/functions/:functionId/deployments/:deploymentId/builds/:buildId')
             throw new Exception(Exception::BUILD_NOT_FOUND);
         }
 
-        // TODO: Somehow set commit SHA & ownerName & repoName for git deployments, and file path for manual. Redeploy should use exact same source code
+        $deploymentId = ID::unique();
 
-        $installation = $dbForConsole->getDocument('installations', $deployment->getAttribute('installationId', ''));
+        $deployment = $dbForProject->createDocument('deployments', $deployment->setAttributes([
+            '$id' => $deploymentId,
+            'buildId' => '',
+            'buildInternalId' => '',
+            'entrypoint' => $function->getAttribute('entrypoint'),
+            'commands' => $function->getAttribute('commands', ''),
+            'search' => implode(' ', [$deploymentId, $function->getAttribute('entrypoint')]),
+        ]));
 
-        $redeployVcs($request, $function, $project, $installation, $dbForProject, new Document([]), $github);
+        $buildEvent = new Build();
+
+        $buildEvent
+            ->setType(BUILD_TYPE_DEPLOYMENT)
+            ->setResource($function)
+            ->setDeployment($deployment)
+            ->setProject($project)
+            ->trigger();
 
         $events
             ->setParam('functionId', $function->getId())
@@ -1323,17 +1483,17 @@ App::post('/v1/functions/:functionId/executions')
     ->param('async', false, new Boolean(), 'Execute code in the background. Default value is false.', true)
     ->param('path', '/', new Text(2048), 'HTTP path of execution. Path can include query params. Default value is /', true)
     ->param('method', 'POST', new Whitelist(['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'], true), 'HTTP method of execution. Default value is GET.', true)
-    ->param('headers', [], new Assoc(), 'HTP headers of execution. Defaults to empty.', true)
+    ->param('headers', [], new Assoc(), 'HTTP headers of execution. Defaults to empty.', true)
     ->inject('response')
     ->inject('project')
     ->inject('dbForProject')
     ->inject('user')
     ->inject('events')
+    ->inject('usage')
     ->inject('mode')
     ->inject('queueForFunctions')
     ->inject('geodb')
-    ->inject('queueForUsage')
-    ->action(function (string $functionId, string $body, bool $async, string $path, string $method, array $headers, Response $response, Document $project, Database $dbForProject, Document $user, Event $events, string $mode, Func $queueForFunctions, Reader $geodb, Usage $queueForUsage) {
+    ->action(function (string $functionId, string $body, bool $async, string $path, string $method, array $headers, Response $response, Document $project, Database $dbForProject, Document $user, Event $events, Stats $usage, string $mode, Func $queueForFunctions, Reader $geodb) {
 
         $function = Authorization::skip(fn () => $dbForProject->getDocument('functions', $functionId));
 
@@ -1481,11 +1641,9 @@ App::post('/v1/functions/:functionId/executions')
         $vars = [];
 
         // Shared vars
-        $varsShared = $project->getAttribute('variables', []);
-        $vars = \array_merge($vars, \array_reduce($varsShared, function (array $carry, Document $var) {
-            $carry[$var->getAttribute('key')] = $var->getAttribute('value') ?? '';
-            return $carry;
-        }, []));
+        foreach ($project->getAttribute('variables', []) as $var) {
+            $vars[$var->getAttribute('key')] = $var->getAttribute('value', '');
+        }
 
         // Function vars
         $vars = \array_merge($vars, array_reduce($function->getAttribute('vars', []), function (array $carry, Document $var) {
@@ -1510,13 +1668,13 @@ App::post('/v1/functions/:functionId/executions')
             $executionResponse = $executor->createExecution(
                 projectId: $project->getId(),
                 deploymentId: $deployment->getId(),
-                version: $function->getAttribute('version'),
                 body: \strlen($body) > 0 ? $body : null,
                 variables: $vars,
                 timeout: $function->getAttribute('timeout', 0),
                 image: $runtime['image'],
                 source: $build->getAttribute('path', ''),
                 entrypoint: $deployment->getAttribute('entrypoint', ''),
+                version: $function->getAttribute('version'),
                 path: $path,
                 method: $method,
                 headers: $headers,
@@ -1538,13 +1696,6 @@ App::post('/v1/functions/:functionId/executions')
             $execution->setAttribute('logs', $executionResponse['logs']);
             $execution->setAttribute('errors', $executionResponse['errors']);
             $execution->setAttribute('duration', $executionResponse['duration']);
-            /**
-             * Sync execution compute usage from
-             */
-            $queueForUsage
-                ->addMetric(METRIC_EXECUTIONS_COMPUTE, (int)($executionResponse['duration'] * 1000)) // per project
-                ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_COMPUTE), (int)($executionResponse['duration'] * 1000)) // per function
-            ;
         } catch (\Throwable $th) {
             $durationEnd = \microtime(true);
 
@@ -1561,6 +1712,14 @@ App::post('/v1/functions/:functionId/executions')
             $execution = Authorization::skip(fn () => $dbForProject->createDocument('executions', $execution));
         }
 
+        // TODO revise this later using route label
+        $usage
+            ->setParam('functionId', $function->getId())
+            ->setParam('executions.{scope}.compute', 1)
+            ->setParam('executionStatus', $execution->getAttribute('status', ''))
+            ->setParam('executionTime', $execution->getAttribute('duration')); // ms
+
+
         $roles = Authorization::getRoles();
         $isPrivilegedUser = Auth::isPrivilegedUser($roles);
         $isAppUser = Auth::isAppUser($roles);
@@ -1768,13 +1927,6 @@ App::post('/v1/functions/:functionId/variables')
 
         $dbForProject->deleteCachedDocument('functions', $function->getId());
 
-        $schedule = $dbForConsole->getDocument('schedules', $function->getAttribute('scheduleId'));
-        $schedule
-            ->setAttribute('resourceUpdatedAt', DateTime::now())
-            ->setAttribute('schedule', $function->getAttribute('schedule'))
-            ->setAttribute('active', !empty($function->getAttribute('schedule')) && !empty($function->getAttribute('deployment')));
-        Authorization::skip(fn () => $dbForConsole->updateDocument('schedules', $schedule->getId(), $schedule));
-
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
             ->dynamic($variable, Response::MODEL_VARIABLE);
@@ -1830,7 +1982,12 @@ App::get('/v1/functions/:functionId/variables/:variableId')
         }
 
         $variable = $dbForProject->getDocument('variables', $variableId);
-        if ($variable === false || $variable->isEmpty() || $variable->getAttribute('resourceInternalId') !== $function->getInternalId() || $variable->getAttribute('resourceType') !== 'function') {
+        if (
+            $variable === false ||
+            $variable->isEmpty() ||
+            $variable->getAttribute('resourceInternalId') !== $function->getInternalId() ||
+            $variable->getAttribute('resourceType') !== 'function'
+        ) {
             throw new Exception(Exception::VARIABLE_NOT_FOUND);
         }
 
@@ -1903,13 +2060,6 @@ App::put('/v1/functions/:functionId/variables/:variableId')
 
         $dbForProject->deleteCachedDocument('functions', $function->getId());
 
-        $schedule = $dbForConsole->getDocument('schedules', $function->getAttribute('scheduleId'));
-        $schedule
-            ->setAttribute('resourceUpdatedAt', DateTime::now())
-            ->setAttribute('schedule', $function->getAttribute('schedule'))
-            ->setAttribute('active', !empty($function->getAttribute('schedule')) && !empty($function->getAttribute('deployment')));
-        Authorization::skip(fn () => $dbForConsole->updateDocument('schedules', $schedule->getId(), $schedule));
-
         $response->dynamic($variable, Response::MODEL_VARIABLE);
     });
 
@@ -1961,12 +2111,5 @@ App::delete('/v1/functions/:functionId/variables/:variableId')
 
         $dbForProject->deleteCachedDocument('functions', $function->getId());
 
-        $schedule = $dbForConsole->getDocument('schedules', $function->getAttribute('scheduleId'));
-        $schedule
-            ->setAttribute('resourceUpdatedAt', DateTime::now())
-            ->setAttribute('schedule', $function->getAttribute('schedule'))
-            ->setAttribute('active', !empty($function->getAttribute('schedule')) && !empty($function->getAttribute('deployment')));
-        Authorization::skip(fn () => $dbForConsole->updateDocument('schedules', $schedule->getId(), $schedule));
-
         $response->noContent();
     });

app/controllers/api/migrations.php

@@ -34,7 +34,7 @@ App::post('/v1/migrations/appwrite')
     ->groups(['api', 'migrations'])
     ->desc('Migrate Appwrite Data')
     ->label('scope', 'migrations.write')
-    ->label('event', 'migrations.create')
+    ->label('event', 'migrations.[migrationId].create')
     ->label('audits.event', 'migration.create')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'migrations')
@@ -88,7 +88,7 @@ App::post('/v1/migrations/firebase/oauth')
     ->groups(['api', 'migrations'])
     ->desc('Migrate Firebase Data (OAuth)')
     ->label('scope', 'migrations.write')
-    ->label('event', 'migrations.create')
+    ->label('event', 'migrations.[migrationId].create')
     ->label('audits.event', 'migration.create')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'migrations')
@@ -146,12 +146,13 @@ App::post('/v1/migrations/firebase/oauth')
             $dbForConsole->updateDocument('identities', $identity->getId(), $identity);
         }
 
-        if ($identity->getAttribute('secret')) {
-            $serviceAccount = $identity->getAttribute('secret');
+        if ($identity->getAttribute('secrets')) {
+            $serviceAccount = $identity->getAttribute('secrets');
         } else {
+            $firebase->cleanupServiceAccounts($accessToken, $projectId);
             $serviceAccount = $firebase->createServiceAccount($accessToken, $projectId);
             $identity = $identity
-                ->setAttribute('secret', $serviceAccount);
+                ->setAttribute('secrets', json_encode($serviceAccount));
 
             $dbForConsole->updateDocument('identities', $identity->getId(), $identity);
         }
@@ -189,7 +190,7 @@ App::post('/v1/migrations/firebase')
     ->groups(['api', 'migrations'])
     ->desc('Migrate Firebase Data (Service Account)')
     ->label('scope', 'migrations.write')
-    ->label('event', 'migrations.create')
+    ->label('event', 'migrations.[migrationId].create')
     ->label('audits.event', 'migration.create')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'migrations')
@@ -239,7 +240,7 @@ App::post('/v1/migrations/supabase')
     ->groups(['api', 'migrations'])
     ->desc('Migrate Supabase Data')
     ->label('scope', 'migrations.write')
-    ->label('event', 'migrations.create')
+    ->label('event', 'migrations.[migrationId].create')
     ->label('audits.event', 'migration.create')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'migrations')
@@ -299,7 +300,7 @@ App::post('/v1/migrations/nhost')
     ->groups(['api', 'migrations'])
     ->desc('Migrate NHost Data')
     ->label('scope', 'migrations.write')
-    ->label('event', 'migrations.create')
+    ->label('event', 'migrations.[migrationId].create')
     ->label('audits.event', 'migration.create')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'migrations')
@@ -309,7 +310,7 @@ App::post('/v1/migrations/nhost')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_MIGRATION)
     ->param('resources', [], new ArrayList(new WhiteList(NHost::getSupportedResources())), 'List of resources to migrate')
-    ->param('subdomain', '', new URL(), 'Source\'s Subdomain')
+    ->param('subdomain', '', new Text(512), 'Source\'s Subdomain')
     ->param('region', '', new Text(512), 'Source\'s Region')
     ->param('adminSecret', '', new Text(512), 'Source\'s Admin Secret')
     ->param('database', '', new Text(512), 'Source\'s Database Name')
@@ -452,8 +453,8 @@ App::get('/v1/migrations/appwrite/report')
             $response
                 ->setStatusCode(Response::STATUS_CODE_OK)
                 ->dynamic(new Document($appwrite->report($resources)), Response::MODEL_MIGRATION_REPORT);
-        } catch (\Exception $e) {
-            throw new Exception(Exception::GENERAL_SERVER_ERROR, $e->getMessage());
+        } catch (\Throwable $e) {
+            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Source Error: ' . $e->getMessage());
         }
     });
 
@@ -479,7 +480,7 @@ App::get('/v1/migrations/firebase/report')
                 ->setStatusCode(Response::STATUS_CODE_OK)
                 ->dynamic(new Document($firebase->report($resources)), Response::MODEL_MIGRATION_REPORT);
         } catch (\Exception $e) {
-            throw new Exception(Exception::GENERAL_SERVER_ERROR, $e->getMessage());
+            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Source Error: ' . $e->getMessage());
         }
     });
 
@@ -501,67 +502,77 @@ App::get('/v1/migrations/firebase/report/oauth')
     ->inject('user')
     ->inject('dbForConsole')
     ->action(function (array $resources, string $projectId, Response $response, Request $request, Document $user, Database $dbForConsole) {
-        try {
-            $firebase = new OAuth2Firebase(
-                App::getEnv('_APP_MIGRATIONS_FIREBASE_CLIENT_ID', ''),
-                App::getEnv('_APP_MIGRATIONS_FIREBASE_CLIENT_SECRET', ''),
-                $request->getProtocol() . '://' . $request->getHostname() . '/v1/migrations/firebase/redirect'
-            );
+        $firebase = new OAuth2Firebase(
+            App::getEnv('_APP_MIGRATIONS_FIREBASE_CLIENT_ID', ''),
+            App::getEnv('_APP_MIGRATIONS_FIREBASE_CLIENT_SECRET', ''),
+            $request->getProtocol() . '://' . $request->getHostname() . '/v1/migrations/firebase/redirect'
+        );
 
-            $identity = $dbForConsole->findOne('identities', [
-                Query::equal('provider', ['firebase']),
-                Query::equal('userInternalId', [$user->getInternalId()]),
-            ]);
-            if ($identity === false || $identity->isEmpty()) {
-                throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
-            }
+        $identity = $dbForConsole->findOne('identities', [
+            Query::equal('provider', ['firebase']),
+            Query::equal('userInternalId', [$user->getInternalId()]),
+        ]);
 
-            $accessToken = $identity->getAttribute('providerAccessToken');
-            $refreshToken = $identity->getAttribute('providerRefreshToken');
-            $accessTokenExpiry = $identity->getAttribute('providerAccessTokenExpiry');
-
-            $isExpired = new \DateTime($accessTokenExpiry) < new \DateTime('now');
-            if ($isExpired) {
-                $firebase->refreshTokens($refreshToken);
-
-                $accessToken = $firebase->getAccessToken('');
-                $refreshToken = $firebase->getRefreshToken('');
-
-                $verificationId = $firebase->getUserID($accessToken);
-
-                if (empty($verificationId)) {
-                    throw new Exception(Exception::GENERAL_RATE_LIMIT_EXCEEDED, 'Another request is currently refreshing OAuth token. Please try again.');
-                }
-
-                $identity = $identity
-                    ->setAttribute('providerAccessToken', $accessToken)
-                    ->setAttribute('providerRefreshToken', $refreshToken)
-                    ->setAttribute('providerAccessTokenExpiry', DateTime::addSeconds(new \DateTime(), (int)$firebase->getAccessTokenExpiry('')));
-
-                $dbForConsole->updateDocument('identities', $identity->getId(), $identity);
-            }
-
-            // Get Service Account
-            if ($identity->getAttribute('secret')) {
-                $serviceAccount = $identity->getAttribute('secret');
-            } else {
-                $serviceAccount = $firebase->createServiceAccount($accessToken, $projectId);
-                $identity = $identity
-                    ->setAttribute('secret', $serviceAccount);
-
-                $dbForConsole->updateDocument('identities', $identity->getId(), $identity);
-            }
-
-            $firebase = new Firebase(array_merge($serviceAccount, ['project_id' => $projectId]));
-
-            $report = $firebase->report($resources);
-
-            $response
-                ->setStatusCode(Response::STATUS_CODE_OK)
-                ->dynamic(new Document($report), Response::MODEL_MIGRATION_REPORT);
-        } catch (\Exception $e) {
-            throw new Exception(Exception::GENERAL_SERVER_ERROR, $e->getMessage());
+        if ($identity === false || $identity->isEmpty()) {
+            throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
         }
+
+        $accessToken = $identity->getAttribute('providerAccessToken');
+        $refreshToken = $identity->getAttribute('providerRefreshToken');
+        $accessTokenExpiry = $identity->getAttribute('providerAccessTokenExpiry');
+
+        if (empty($accessToken) || empty($refreshToken) || empty($accessTokenExpiry)) {
+            throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
+        }
+
+        if (App::getEnv('_APP_MIGRATIONS_FIREBASE_CLIENT_ID', '') === '' || App::getEnv('_APP_MIGRATIONS_FIREBASE_CLIENT_SECRET', '') === '') {
+            throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
+        }
+
+        $isExpired = new \DateTime($accessTokenExpiry) < new \DateTime('now');
+        if ($isExpired) {
+            $firebase->refreshTokens($refreshToken);
+
+            $accessToken = $firebase->getAccessToken('');
+            $refreshToken = $firebase->getRefreshToken('');
+
+            $verificationId = $firebase->getUserID($accessToken);
+
+            if (empty($verificationId)) {
+                throw new Exception(Exception::GENERAL_RATE_LIMIT_EXCEEDED, 'Another request is currently refreshing OAuth token. Please try again.');
+            }
+
+            $identity = $identity
+                ->setAttribute('providerAccessToken', $accessToken)
+                ->setAttribute('providerRefreshToken', $refreshToken)
+                ->setAttribute('providerAccessTokenExpiry', DateTime::addSeconds(new \DateTime(), (int)$firebase->getAccessTokenExpiry('')));
+
+            $dbForConsole->updateDocument('identities', $identity->getId(), $identity);
+        }
+
+        // Get Service Account
+        if ($identity->getAttribute('secrets')) {
+            $serviceAccount = $identity->getAttribute('secrets');
+        } else {
+            $firebase->cleanupServiceAccounts($accessToken, $projectId);
+            $serviceAccount = $firebase->createServiceAccount($accessToken, $projectId);
+            $identity = $identity
+                ->setAttribute('secrets', json_encode($serviceAccount));
+
+            $dbForConsole->updateDocument('identities', $identity->getId(), $identity);
+        }
+
+        $firebase = new Firebase($serviceAccount);
+
+        try {
+            $report = $firebase->report($resources);
+        } catch (\Exception $e) {
+            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Source Error: ' . $e->getMessage());
+        }
+
+        $response
+            ->setStatusCode(Response::STATUS_CODE_OK)
+            ->dynamic(new Document($report), Response::MODEL_MIGRATION_REPORT);
     });
 
 App::get('/v1/migrations/firebase/connect')
@@ -745,6 +756,7 @@ App::get('/v1/migrations/firebase/projects')
             Query::equal('provider', ['firebase']),
             Query::equal('userInternalId', [$user->getInternalId()]),
         ]);
+
         if ($identity === false || $identity->isEmpty()) {
             throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
         }
@@ -754,46 +766,50 @@ App::get('/v1/migrations/firebase/projects')
         $accessTokenExpiry = $identity->getAttribute('providerAccessTokenExpiry');
 
         if (empty($accessToken) || empty($refreshToken) || empty($accessTokenExpiry)) {
-            throw new Exception(Exception::GENERAL_ACCESS_FORBIDDEN, 'Not authenticated with Firebase');
+            throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
         }
 
         if (App::getEnv('_APP_MIGRATIONS_FIREBASE_CLIENT_ID', '') === '' || App::getEnv('_APP_MIGRATIONS_FIREBASE_CLIENT_SECRET', '') === '') {
-            throw new Exception(Exception::GENERAL_ACCESS_FORBIDDEN, 'Missing Google OAuth credentials');
+            throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
         }
 
-        $isExpired = new \DateTime($accessTokenExpiry) < new \DateTime('now');
-        if ($isExpired) {
-            try {
-                $firebase->refreshTokens($refreshToken);
-            } catch (\Exception $e) {
-                throw new Exception(Exception::GENERAL_ACCESS_FORBIDDEN, 'Failed to refresh Firebase access token');
+        try {
+            $isExpired = new \DateTime($accessTokenExpiry) < new \DateTime('now');
+            if ($isExpired) {
+                try {
+                    $firebase->refreshTokens($refreshToken);
+                } catch (\Exception $e) {
+                    throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
+                }
+
+                $accessToken = $firebase->getAccessToken('');
+                $refreshToken = $firebase->getRefreshToken('');
+
+                $verificationId = $firebase->getUserID($accessToken);
+
+                if (empty($verificationId)) {
+                    throw new Exception(Exception::GENERAL_RATE_LIMIT_EXCEEDED, 'Another request is currently refreshing OAuth token. Please try again.');
+                }
+
+                $identity = $identity
+                    ->setAttribute('providerAccessToken', $accessToken)
+                    ->setAttribute('providerRefreshToken', $refreshToken)
+                    ->setAttribute('providerAccessTokenExpiry', DateTime::addSeconds(new \DateTime(), (int)$firebase->getAccessTokenExpiry('')));
+
+                $dbForConsole->updateDocument('identities', $identity->getId(), $identity);
             }
 
-            $accessToken = $firebase->getAccessToken('');
-            $refreshToken = $firebase->getRefreshToken('');
+            $projects = $firebase->getProjects($accessToken);
 
-            $verificationId = $firebase->getUserID($accessToken);
-
-            if (empty($verificationId)) {
-                throw new Exception(Exception::GENERAL_RATE_LIMIT_EXCEEDED, 'Another request is currently refreshing OAuth token. Please try again.');
+            $output = [];
+            foreach ($projects as $project) {
+                $output[] = [
+                    'displayName' => $project['displayName'],
+                    'projectId' => $project['projectId'],
+                ];
             }
-
-            $identity = $identity
-                ->setAttribute('providerAccessToken', $accessToken)
-                ->setAttribute('providerRefreshToken', $refreshToken)
-                ->setAttribute('providerAccessTokenExpiry', DateTime::addSeconds(new \DateTime(), (int)$firebase->getAccessTokenExpiry('')));
-
-            $dbForConsole->updateDocument('identities', $identity->getId(), $identity);
-        }
-
-        $projects = $firebase->getProjects($accessToken);
-
-        $output = [];
-        foreach ($projects as $project) {
-            $output[] = [
-                'displayName' => $project['displayName'],
-                'projectId' => $project['projectId'],
-            ];
+        } catch (\Exception $e) {
+            throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
         }
 
         $response->dynamic(new Document([
@@ -857,7 +873,7 @@ App::get('/v1/migrations/supabase/report')
                 ->setStatusCode(Response::STATUS_CODE_OK)
                 ->dynamic(new Document($supabase->report($resources)), Response::MODEL_MIGRATION_REPORT);
         } catch (\Exception $e) {
-            throw new Exception(Exception::GENERAL_SERVER_ERROR, $e->getMessage());
+            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Source Error: ' . $e->getMessage());
         }
     });
 
@@ -873,7 +889,7 @@ App::get('/v1/migrations/nhost/report')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_MIGRATION_REPORT)
     ->param('resources', [], new ArrayList(new WhiteList(NHost::getSupportedResources())), 'List of resources to migrate')
-    ->param('subdomain', '', new URL(), 'Source\'s Subdomain')
+    ->param('subdomain', '', new Text(512), 'Source\'s Subdomain')
     ->param('region', '', new Text(512), 'Source\'s Region')
     ->param('adminSecret', '', new Text(512), 'Source\'s Admin Secret')
     ->param('database', '', new Text(512), 'Source\'s Database Name')
@@ -889,7 +905,7 @@ App::get('/v1/migrations/nhost/report')
                 ->setStatusCode(Response::STATUS_CODE_OK)
                 ->dynamic(new Document($nhost->report($resources)), Response::MODEL_MIGRATION_REPORT);
         } catch (\Exception $e) {
-            throw new Exception(Exception::GENERAL_SERVER_ERROR, $e->getMessage());
+            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Source Error: ' . $e->getMessage());
         }
     });
 
@@ -955,9 +971,8 @@ App::delete('/v1/migrations/:migrationId')
     ->param('migrationId', '', new UID(), 'Migration ID.')
     ->inject('response')
     ->inject('dbForProject')
-    ->inject('deletes')
     ->inject('events')
-    ->action(function (string $migrationId, Response $response, Database $dbForProject, Delete $deletes, Event $events) {
+    ->action(function (string $migrationId, Response $response, Database $dbForProject, Event $events) {
         $migration = $dbForProject->getDocument('migrations', $migrationId);
 
         if ($migration->isEmpty()) {
@@ -965,7 +980,7 @@ App::delete('/v1/migrations/:migrationId')
         }
 
         if (!$dbForProject->deleteDocument('migrations', $migration->getId())) {
-            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove migration from DB', 500);
+            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove migration from DB');
         }
 
         $events->setParam('migrationId', $migration->getId());

app/controllers/api/project.php

@@ -3,7 +3,6 @@
 use Appwrite\Extend\Exception;
 use Appwrite\Utopia\Response;
 use Utopia\App;
-use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate as DuplicateException;
@@ -15,10 +14,11 @@ use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\UID;
 use Utopia\Validator\Text;
 use Utopia\Validator\WhiteList;
+use Utopia\Database\DateTime;
 
 App::get('/v1/project/usage')
     ->desc('Get usage stats for a project')
-    ->groups(['api', 'usage'])
+    ->groups(['api'])
     ->label('scope', 'projects.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
     ->label('sdk.namespace', 'project')
@@ -30,76 +30,94 @@ App::get('/v1/project/usage')
     ->inject('response')
     ->inject('dbForProject')
     ->action(function (string $range, Response $response, Database $dbForProject) {
-
-        $periods = Config::getParam('usage', []);
-        $stats = $usage = [];
-        $days = $periods[$range];
-        $metrics = [
-            METRIC_NETWORK_REQUESTS,
-            METRIC_NETWORK_INBOUND,
-            METRIC_NETWORK_OUTBOUND,
-            METRIC_EXECUTIONS,
-            METRIC_DOCUMENTS,
-            METRIC_DATABASES,
-            METRIC_USERS,
-            METRIC_BUCKETS,
-            METRIC_FILES_STORAGE
-        ];
-
-        Authorization::skip(function () use ($dbForProject, $days, $metrics, &$stats) {
-            foreach ($metrics as $metric) {
-                $limit = $days['limit'];
-                $period = $days['period'];
-                $results = $dbForProject->find('stats', [
-                    Query::equal('period', [$period]),
-                    Query::equal('metric', [$metric]),
-                    Query::limit($limit),
-                    Query::orderDesc('time'),
-                ]);
-
-                $stats[$metric] = [];
-                foreach ($results as $result) {
-                    $stats[$metric][$result->getAttribute('time')] = [
-                        'value' => $result->getAttribute('value'),
-                    ];
-                }
-            }
-        });
-
-
-        $format = match ($days['period']) {
-            '1h' => 'Y-m-d\TH:00:00.000P',
-            '1d' => 'Y-m-d\T00:00:00.000P',
-        };
-
-    foreach ($metrics as $metric) {
-        $usage[$metric] = [];
-        $leap = time() - ($days['limit'] * $days['factor']);
-        while ($leap < time()) {
-            $leap += $days['factor'];
-            $formatDate = date($format, $leap);
-            $usage[$metric][] = [
-                'value' => $stats[$metric][$formatDate]['value'] ?? 0,
-                'date' => $formatDate,
+        $usage = [];
+        if (App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
+            $periods = [
+                '24h' => [
+                    'period' => '1h',
+                    'limit' => 24,
+                ],
+                '7d' => [
+                    'period' => '1d',
+                    'limit' => 7,
+                ],
+                '30d' => [
+                    'period' => '1d',
+                    'limit' => 30,
+                ],
+                '90d' => [
+                    'period' => '1d',
+                    'limit' => 90,
+                ],
             ];
+
+            $metrics = [
+                'project.$all.network.requests',
+                'project.$all.network.bandwidth',
+                'project.$all.storage.size',
+                'users.$all.count.total',
+                'databases.$all.count.total',
+                'documents.$all.count.total',
+                'executions.$all.compute.total',
+                'buckets.$all.count.total'
+            ];
+
+            $stats = [];
+
+            Authorization::skip(function () use ($dbForProject, $periods, $range, $metrics, &$stats) {
+                foreach ($metrics as $metric) {
+                    $limit = $periods[$range]['limit'];
+                    $period = $periods[$range]['period'];
+
+                    $requestDocs = $dbForProject->find('stats', [
+                        Query::equal('period', [$period]),
+                        Query::equal('metric', [$metric]),
+                        Query::limit($limit),
+                        Query::orderDesc('time'),
+                    ]);
+
+                    $stats[$metric] = [];
+                    foreach ($requestDocs as $requestDoc) {
+                        $stats[$metric][] = [
+                            'value' => $requestDoc->getAttribute('value'),
+                            'date' => $requestDoc->getAttribute('time'),
+                        ];
+                    }
+
+                    // backfill metrics with empty values for graphs
+                    $backfill = $limit - \count($requestDocs);
+                    while ($backfill > 0) {
+                        $last = $limit - $backfill - 1; // array index of last added metric
+                        $diff = match ($period) { // convert period to seconds for unix timestamp math
+                            '1h' => 3600,
+                            '1d' => 86400,
+                        };
+                        $stats[$metric][] = [
+                            'value' => 0,
+                            'date' => DateTime::formatTz(DateTime::addSeconds(new \DateTime($stats[$metric][$last]['date'] ?? null), -1 * $diff)),
+                        ];
+                        $backfill--;
+                    }
+                    $stats[$metric] = array_reverse($stats[$metric]);
+                }
+            });
+
+            $usage = new Document([
+                'range' => $range,
+                'requests' => $stats[$metrics[0]] ?? [],
+                'network' => $stats[$metrics[1]] ?? [],
+                'storage' => $stats[$metrics[2]] ?? [],
+                'users' => $stats[$metrics[3]] ?? [],
+                'databases' => $stats[$metrics[4]] ?? [],
+                'documents' => $stats[$metrics[5]] ?? [],
+                'executions' => $stats[$metrics[6]] ?? [],
+                'buckets' => $stats[$metrics[7]] ?? [],
+            ]);
         }
-    }
 
-
-        $response->dynamic(new Document([
-            'range' => $range,
-            'requestsTotal' => ($usage[$metrics[0]]),
-            'network' => ($usage[$metrics[1]] + $usage[$metrics[2]]),
-            'executionsTotal' => $usage[$metrics[3]],
-            'documentsTotal' => $usage[$metrics[4]],
-            'databasesTotal' => $usage[$metrics[5]],
-            'usersTotal' => $usage[$metrics[6]],
-            'bucketsTotal' => $usage[$metrics[7]],
-            'filesStorage' => $usage[$metrics[8]],
-        ]), Response::MODEL_USAGE_PROJECT);
+        $response->dynamic($usage, Response::MODEL_USAGE_PROJECT);
     });
 
-
 // Variables
 
 App::post('/v1/project/variables')

app/controllers/api/projects.php

@@ -95,6 +95,7 @@ App::post('/v1/projects')
         $backups['database_db_fra1_03'] = ['from' => '10:30', 'to' => '11:15'];
         $backups['database_db_fra1_04'] = ['from' => '13:30', 'to' => '14:15'];
         $backups['database_db_fra1_05'] = ['from' => '4:30', 'to' => '5:15'];
+        $backups['database_db_fra1_06'] = ['from' => '16:30', 'to' => '17:15'];
 
         $databases = Config::getParam('pools-database', []);
 
@@ -118,7 +119,7 @@ App::post('/v1/projects')
             }
         }
 
-        if ($index = array_search('database_db_fra1_05', $databases)) {
+        if ($index = array_search('database_db_fra1_06', $databases)) {
             $database = $databases[$index];
         } else {
             $database = $databases[array_rand($databases)];
@@ -286,6 +287,120 @@ App::get('/v1/projects/:projectId')
         $response->dynamic($project, Response::MODEL_PROJECT);
     });
 
+App::get('/v1/projects/:projectId/usage')
+    ->desc('Get usage stats for a project')
+    ->groups(['api', 'projects', 'usage'])
+    ->label('scope', 'projects.read')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'projects')
+    ->label('sdk.method', 'getUsage')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_USAGE_PROJECT)
+    ->param('projectId', '', new UID(), 'Project unique ID.')
+    ->param('range', '30d', new WhiteList(['24h', '7d', '30d', '90d'], true), 'Date range.', true)
+    ->inject('response')
+    ->inject('dbForConsole')
+    ->inject('dbForProject')
+    ->inject('register')
+    ->action(function (string $projectId, string $range, Response $response, Database $dbForConsole, Database $dbForProject, Registry $register) {
+
+        $project = $dbForConsole->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception(Exception::PROJECT_NOT_FOUND);
+        }
+
+        $usage = [];
+        if (App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
+            $periods = [
+                '24h' => [
+                    'period' => '1h',
+                    'limit' => 24,
+                ],
+                '7d' => [
+                    'period' => '1d',
+                    'limit' => 7,
+                ],
+                '30d' => [
+                    'period' => '1d',
+                    'limit' => 30,
+                ],
+                '90d' => [
+                    'period' => '1d',
+                    'limit' => 90,
+                ],
+            ];
+
+            $dbForProject->setNamespace("_{$project->getInternalId()}");
+
+            $metrics = [
+                'project.$all.network.requests',
+                'project.$all.network.bandwidth',
+                'project.$all.storage.size',
+                'users.$all.count.total',
+                'databases.$all.count.total',
+                'documents.$all.count.total',
+                'executions.$all.compute.total',
+                'buckets.$all.count.total'
+            ];
+
+            $stats = [];
+
+            Authorization::skip(function () use ($dbForProject, $periods, $range, $metrics, &$stats) {
+                foreach ($metrics as $metric) {
+                    $limit = $periods[$range]['limit'];
+                    $period = $periods[$range]['period'];
+
+                    $requestDocs = $dbForProject->find('stats', [
+                        Query::equal('period', [$period]),
+                        Query::equal('metric', [$metric]),
+                        Query::limit($limit),
+                        Query::orderDesc('time'),
+                    ]);
+
+                    $stats[$metric] = [];
+                    foreach ($requestDocs as $requestDoc) {
+                        $stats[$metric][] = [
+                            'value' => $requestDoc->getAttribute('value'),
+                            'date' => $requestDoc->getAttribute('time'),
+                        ];
+                    }
+
+                    // backfill metrics with empty values for graphs
+                    $backfill = $limit - \count($requestDocs);
+                    while ($backfill > 0) {
+                        $last = $limit - $backfill - 1; // array index of last added metric
+                        $diff = match ($period) { // convert period to seconds for unix timestamp math
+                            '1h' => 3600,
+                            '1d' => 86400,
+                        };
+                        $stats[$metric][] = [
+                            'value' => 0,
+                            'date' => DateTime::formatTz(DateTime::addSeconds(new \DateTime($stats[$metric][$last]['date'] ?? null), -1 * $diff)),
+                        ];
+                        $backfill--;
+                    }
+                    $stats[$metric] = array_reverse($stats[$metric]);
+                }
+            });
+
+            $usage = new Document([
+                'range' => $range,
+                'requests' => $stats[$metrics[0]] ?? [],
+                'network' => $stats[$metrics[1]] ?? [],
+                'storage' => $stats[$metrics[2]] ?? [],
+                'users' => $stats[$metrics[3]] ?? [],
+                'databases' => $stats[$metrics[4]] ?? [],
+                'documents' => $stats[$metrics[5]] ?? [],
+                'executions' => $stats[$metrics[6]] ?? [],
+                'buckets' => $stats[$metrics[7]] ?? [],
+            ]);
+        }
+
+        $response->dynamic($usage, Response::MODEL_USAGE_PROJECT);
+    });
+
 App::patch('/v1/projects/:projectId')
     ->desc('Update Project')
     ->groups(['api', 'projects'])

app/controllers/api/proxy.php

@@ -33,14 +33,19 @@ App::post('/v1/proxy/rules')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_PROXY_RULE)
     ->param('domain', null, new ValidatorDomain(), 'Domain name.')
-    ->param('resourceType', null, new WhiteList(['api', 'function']), 'Action definition for the rule. Possible values are "api", "function", or "redirect"')
-    ->param('resourceId', '', new UID(), 'ID of resource for the action type. If resourceType is "api" or "url", leave empty. If resourceType is "function", provide ID of the function.', true)
+    ->param('resourceType', null, new WhiteList(['api', 'function']), 'Action definition for the rule. Possible values are "api", "function"')
+    ->param('resourceId', '', new UID(), 'ID of resource for the action type. If resourceType is "api", leave empty. If resourceType is "function", provide ID of the function.', true)
     ->inject('response')
     ->inject('project')
     ->inject('events')
     ->inject('dbForConsole')
     ->inject('dbForProject')
     ->action(function (string $domain, string $resourceType, string $resourceId, Response $response, Document $project, Event $events, Database $dbForConsole, Database $dbForProject) {
+        $mainDomain = App::getEnv('_APP_DOMAIN', '');
+        if ($domain === $mainDomain || $domain === 'localhost' || $domain === APP_HOSTNAME_INTERNAL) {
+            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'This domain name is not allowed for security reasons.');
+        }
+
         $document = $dbForConsole->findOne('rules', [
             Query::equal('domain', [$domain]),
         ]);
@@ -56,7 +61,7 @@ App::post('/v1/proxy/rules')
 
                 $message .= '.';
             } else {
-                $message = "Domain already assigned to different project.";
+                $message = 'Domain already assigned to different project.';
             }
 
             throw new Exception(Exception::RULE_ALREADY_EXISTS, $message);

app/controllers/api/storage.php

@@ -51,6 +51,7 @@ App::post('/v1/storage/buckets')
     ->label('event', 'buckets.[bucketId].create')
     ->label('audits.event', 'bucket.create')
     ->label('audits.resource', 'bucket/{response.$id}')
+    ->label('usage.metric', 'buckets.{scope}.requests.create')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'storage')
     ->label('sdk.method', 'createBucket')
@@ -146,6 +147,7 @@ App::get('/v1/storage/buckets')
     ->desc('List buckets')
     ->groups(['api', 'storage'])
     ->label('scope', 'buckets.read')
+    ->label('usage.metric', 'buckets.{scope}.requests.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'storage')
     ->label('sdk.method', 'listBuckets')
@@ -192,6 +194,7 @@ App::get('/v1/storage/buckets/:bucketId')
     ->desc('Get Bucket')
     ->groups(['api', 'storage'])
     ->label('scope', 'buckets.read')
+    ->label('usage.metric', 'buckets.{scope}.requests.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'storage')
     ->label('sdk.method', 'getBucket')
@@ -220,6 +223,7 @@ App::put('/v1/storage/buckets/:bucketId')
     ->label('event', 'buckets.[bucketId].update')
     ->label('audits.event', 'bucket.update')
     ->label('audits.resource', 'bucket/{response.$id}')
+    ->label('usage.metric', 'buckets.{scope}.requests.update')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'storage')
     ->label('sdk.method', 'updateBucket')
@@ -287,6 +291,7 @@ App::delete('/v1/storage/buckets/:bucketId')
     ->label('audits.event', 'bucket.delete')
     ->label('event', 'buckets.[bucketId].delete')
     ->label('audits.resource', 'bucket/{request.bucketId}')
+    ->label('usage.metric', 'buckets.{scope}.requests.delete')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'storage')
     ->label('sdk.method', 'deleteBucket')
@@ -329,6 +334,8 @@ App::post('/v1/storage/buckets/:bucketId/files')
     ->label('audits.event', 'file.create')
     ->label('event', 'buckets.[bucketId].files.[fileId].create')
     ->label('audits.resource', 'file/{response.$id}')
+    ->label('usage.metric', 'files.{scope}.requests.create')
+    ->label('usage.params', ['bucketId:{request.bucketId}'])
     ->label('abuse-key', 'ip:{ip},method:{method},url:{url},userId:{userId}')
     ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT)
     ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
@@ -669,6 +676,8 @@ App::get('/v1/storage/buckets/:bucketId/files')
     ->groups(['api', 'storage'])
     ->label('scope', 'files.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('usage.metric', 'files.{scope}.requests.read')
+    ->label('usage.params', ['bucketId:{request.bucketId}'])
     ->label('sdk.namespace', 'storage')
     ->label('sdk.method', 'listFiles')
     ->label('sdk.description', '/docs/references/storage/list-files.md')
@@ -744,6 +753,8 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId')
     ->groups(['api', 'storage'])
     ->label('scope', 'files.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('usage.metric', 'files.{scope}.requests.read')
+    ->label('usage.params', ['bucketId:{request.bucketId}'])
     ->label('sdk.namespace', 'storage')
     ->label('sdk.method', 'getFile')
     ->label('sdk.description', '/docs/references/storage/get-file.md')
@@ -791,6 +802,8 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
     ->label('cache', true)
     ->label('cache.resourceType', 'bucket/{request.bucketId}')
     ->label('cache.resource', 'file/{request.fileId}')
+    ->label('usage.metric', 'files.{scope}.requests.read')
+    ->label('usage.params', ['bucketId:{request.bucketId}'])
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'storage')
     ->label('sdk.method', 'getFilePreview')
@@ -952,6 +965,8 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
     ->desc('Get File for Download')
     ->groups(['api', 'storage'])
     ->label('scope', 'files.read')
+    ->label('usage.metric', 'files.{scope}.requests.read')
+    ->label('usage.params', ['bucketId:{request.bucketId}'])
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'storage')
     ->label('sdk.method', 'getFileDownload')
@@ -1090,6 +1105,8 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
     ->desc('Get File for View')
     ->groups(['api', 'storage'])
     ->label('scope', 'files.read')
+    ->label('usage.metric', 'files.{scope}.requests.read')
+    ->label('usage.params', ['bucketId:{request.bucketId}'])
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'storage')
     ->label('sdk.method', 'getFileView')
@@ -1242,6 +1259,8 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
     ->label('event', 'buckets.[bucketId].files.[fileId].update')
     ->label('audits.event', 'file.update')
     ->label('audits.resource', 'file/{response.$id}')
+    ->label('usage.metric', 'files.{scope}.requests.update')
+    ->label('usage.params', ['bucketId:{request.bucketId}'])
     ->label('abuse-key', 'ip:{ip},method:{method},url:{url},userId:{userId}')
     ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT)
     ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
@@ -1348,6 +1367,8 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
     ->label('event', 'buckets.[bucketId].files.[fileId].delete')
     ->label('audits.event', 'file.delete')
     ->label('audits.resource', 'file/{request.fileId}')
+    ->label('usage.metric', 'files.{scope}.requests.delete')
+    ->label('usage.params', ['bucketId:{request.bucketId}'])
     ->label('abuse-key', 'ip:{ip},method:{method},url:{url},userId:{userId}')
     ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT)
     ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
@@ -1449,62 +1470,103 @@ App::get('/v1/storage/usage')
     ->inject('dbForProject')
     ->action(function (string $range, Response $response, Database $dbForProject) {
 
-        $periods = Config::getParam('usage', []);
-        $stats = $usage = [];
-        $days = $periods[$range];
-        $metrics = [
-            METRIC_BUCKETS,
-            METRIC_FILES,
-            METRIC_FILES_STORAGE,
-        ];
+        $usage = [];
+        if (App::getEnv('_APP_USAGE_STATS', 'enabled') === 'enabled') {
+            $periods = [
+                '24h' => [
+                    'period' => '1h',
+                    'limit' => 24,
+                ],
+                '7d' => [
+                    'period' => '1d',
+                    'limit' => 7,
+                ],
+                '30d' => [
+                    'period' => '1d',
+                    'limit' => 30,
+                ],
+                '90d' => [
+                    'period' => '1d',
+                    'limit' => 90,
+                ],
+            ];
 
-        Authorization::skip(function () use ($dbForProject, $days, $metrics, &$stats) {
-            foreach ($metrics as $metric) {
-                $limit = $days['limit'];
-                $period = $days['period'];
-                $results = $dbForProject->find('stats', [
-                    Query::equal('period', [$period]),
-                    Query::equal('metric', [$metric]),
-                    Query::limit($limit),
-                    Query::orderDesc('time'),
-                ]);
-                $stats[$metric] = [];
-                foreach ($results as $result) {
-                    $stats[$metric][$result->getAttribute('time')] = [
-                        'value' => $result->getAttribute('value'),
-                    ];
+            $metrics = [
+                'project.$all.storage.size',
+                'buckets.$all.count.total',
+                'buckets.$all.requests.create',
+                'buckets.$all.requests.read',
+                'buckets.$all.requests.update',
+                'buckets.$all.requests.delete',
+                'files.$all.storage.size',
+                'files.$all.count.total',
+                'files.$all.requests.create',
+                'files.$all.requests.read',
+                'files.$all.requests.update',
+                'files.$all.requests.delete',
+            ];
+
+            $stats = [];
+
+            Authorization::skip(function () use ($dbForProject, $periods, $range, $metrics, &$stats) {
+                foreach ($metrics as $metric) {
+                    $limit = $periods[$range]['limit'];
+                    $period = $periods[$range]['period'];
+
+                    $requestDocs = $dbForProject->find('stats', [
+                        Query::equal('period', [$period]),
+                        Query::equal('metric', [$metric]),
+                        Query::limit($limit),
+                        Query::orderDesc('time'),
+                    ]);
+
+                    $stats[$metric] = [];
+                    foreach ($requestDocs as $requestDoc) {
+                        $stats[$metric][] = [
+                            'value' => $requestDoc->getAttribute('value'),
+                            'date' => $requestDoc->getAttribute('time'),
+                        ];
+                    }
+
+                    // backfill metrics with empty values for graphs
+                    $backfill = $limit - \count($requestDocs);
+                    while ($backfill > 0) {
+                        $last = $limit - $backfill - 1; // array index of last added metric
+                        $diff = match ($period) { // convert period to seconds for unix timestamp math
+                            '1h' => 3600,
+                            '1d' => 86400,
+                        };
+                        $stats[$metric][] = [
+                            'value' => 0,
+                            'date' => DateTime::formatTz(DateTime::addSeconds(new \DateTime($stats[$metric][$last]['date'] ?? null), -1 * $diff)),
+                        ];
+                        $backfill--;
+                    }
+                    $stats[$metric] = array_reverse($stats[$metric]);
                 }
-            }
-        });
+            });
 
-        $format = (match ($days['period']) {
-            '1h' => 'Y-m-d\TH:00:00.000P',
-            '1d' => 'Y-m-d\T00:00:00.000P',
-        });
-
-        foreach ($metrics as $metric) {
-            $usage[$metric] = [];
-            $leap = time() - ($days['limit'] * $days['factor']);
-            while ($leap < time()) {
-                $leap += $days['factor'];
-                $formatDate = date($format, $leap);
-                $usage[$metric][] = [
-                    'value' => $stats[$metric][$formatDate]['value'] ?? 0,
-                    'date' => $formatDate,
-                ];
-            }
+            $usage = new Document([
+                'range' => $range,
+                'bucketsCount' => $stats['buckets.$all.count.total'],
+                'bucketsCreate' => $stats['buckets.$all.requests.create'],
+                'bucketsRead' => $stats['buckets.$all.requests.read'],
+                'bucketsUpdate' => $stats['buckets.$all.requests.update'],
+                'bucketsDelete' => $stats['buckets.$all.requests.delete'],
+                'storage' => $stats['project.$all.storage.size'],
+                'filesCount' => $stats['files.$all.count.total'],
+                'filesCreate' => $stats['files.$all.requests.create'],
+                'filesRead' => $stats['files.$all.requests.read'],
+                'filesUpdate' => $stats['files.$all.requests.update'],
+                'filesDelete' => $stats['files.$all.requests.delete'],
+            ]);
         }
 
-        $response->dynamic(new Document([
-            'range' => $range,
-            'bucketsTotal' => $usage[$metrics[0]],
-            'filesTotal' => $usage[$metrics[1]],
-            'filesStorage' => $usage[$metrics[2]],
-        ]), Response::MODEL_USAGE_STORAGE);
+        $response->dynamic($usage, Response::MODEL_USAGE_STORAGE);
     });
 
 App::get('/v1/storage/:bucketId/usage')
-    ->desc('Get usage stats for storage bucket')
+    ->desc('Get usage stats for a storage bucket')
     ->groups(['api', 'storage', 'usage'])
     ->label('scope', 'files.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -1525,55 +1587,86 @@ App::get('/v1/storage/:bucketId/usage')
             throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
         }
 
-        $periods = Config::getParam('usage', []);
-        $stats = $usage = [];
-        $days = $periods[$range];
-        $metrics = [
-            str_replace('{bucketInternalId}', $bucket->getInternalId(), METRIC_BUCKET_ID_FILES),
-            str_replace('{bucketInternalId}', $bucket->getInternalId(), METRIC_BUCKET_ID_FILES_STORAGE),
-        ];
+        $usage = [];
+        if (App::getEnv('_APP_USAGE_STATS', 'enabled') === 'enabled') {
+            $periods = [
+                '24h' => [
+                    'period' => '1h',
+                    'limit' => 24,
+                ],
+                '7d' => [
+                    'period' => '1d',
+                    'limit' => 7,
+                ],
+                '30d' => [
+                    'period' => '1d',
+                    'limit' => 30,
+                ],
+                '90d' => [
+                    'period' => '1d',
+                    'limit' => 90,
+                ],
+            ];
 
-        Authorization::skip(function () use ($dbForProject, $days, $metrics, &$stats) {
-            foreach ($metrics as $metric) {
-                $limit = $days['limit'];
-                $period = $days['period'];
-                $results = $dbForProject->find('stats', [
-                    Query::equal('period', [$period]),
-                    Query::equal('metric', [$metric]),
-                    Query::limit($limit),
-                    Query::orderDesc('time'),
-                ]);
-                $stats[$metric] = [];
-                foreach ($results as $result) {
-                    $stats[$metric][$result->getAttribute('time')] = [
-                        'value' => $result->getAttribute('value'),
-                    ];
+            $metrics = [
+                "files.{$bucketId}.count.total",
+                "files.{$bucketId}.storage.size",
+                "files.{$bucketId}.requests.create",
+                "files.{$bucketId}.requests.read",
+                "files.{$bucketId}.requests.update",
+                "files.{$bucketId}.requests.delete",
+            ];
+
+            $stats = [];
+
+            Authorization::skip(function () use ($dbForProject, $periods, $range, $metrics, &$stats) {
+                foreach ($metrics as $metric) {
+                    $limit = $periods[$range]['limit'];
+                    $period = $periods[$range]['period'];
+
+                    $requestDocs = $dbForProject->find('stats', [
+                        Query::equal('period', [$period]),
+                        Query::equal('metric', [$metric]),
+                        Query::limit($limit),
+                        Query::orderDesc('time'),
+                    ]);
+
+                    $stats[$metric] = [];
+                    foreach ($requestDocs as $requestDoc) {
+                        $stats[$metric][] = [
+                            'value' => $requestDoc->getAttribute('value'),
+                            'date' => $requestDoc->getAttribute('time'),
+                        ];
+                    }
+
+                    // backfill metrics with empty values for graphs
+                    $backfill = $limit - \count($requestDocs);
+                    while ($backfill > 0) {
+                        $last = $limit - $backfill - 1; // array index of last added metric
+                        $diff = match ($period) { // convert period to seconds for unix timestamp math
+                            '1h' => 3600,
+                            '1d' => 86400,
+                        };
+                        $stats[$metric][] = [
+                            'value' => 0,
+                            'date' => DateTime::formatTz(DateTime::addSeconds(new \DateTime($stats[$metric][$last]['date'] ?? null), -1 * $diff)),
+                        ];
+                        $backfill--;
+                    }
+                    $stats[$metric] = array_reverse($stats[$metric]);
                 }
-            }
-        });
+            });
 
-        $format = (match ($days['period']) {
-            '1h' => 'Y-m-d\TH:00:00.000P',
-            '1d' => 'Y-m-d\T00:00:00.000P',
-        });
-
-        foreach ($metrics as $metric) {
-            $usage[$metric] = [];
-            $leap = time() - ($days['limit'] * $days['factor']);
-
-            while ($leap < time()) {
-                $leap += $days['factor'];
-                $formatDate = date($format, $leap);
-                $usage[$metric][] = [
-                    'value' => $stats[$metric][$formatDate]['value'] ?? 0,
-                    'date' => $formatDate,
-                ];
-            }
+            $usage = new Document([
+                'range' => $range,
+                'filesCount' => $stats[$metrics[0]],
+                'filesStorage' => $stats[$metrics[1]],
+                'filesCreate' => $stats[$metrics[2]],
+                'filesRead' => $stats[$metrics[3]],
+                'filesUpdate' => $stats[$metrics[4]],
+                'filesDelete' => $stats[$metrics[5]],
+            ]);
         }
 
-        $response->dynamic(new Document([
-            'range' => $range,
-            'filesTotal' => $usage[$metrics[0]],
-            'filesStorage' => $usage[$metrics[1]],
-        ]), Response::MODEL_USAGE_BUCKETS);
+        $response->dynamic($usage, Response::MODEL_USAGE_BUCKETS);
     });

app/controllers/api/teams.php

@@ -739,7 +739,7 @@ App::get('/v1/teams/:teamId/memberships/:membershipId')
     });
 
 App::patch('/v1/teams/:teamId/memberships/:membershipId')
-    ->desc('Update Membership Roles')
+    ->desc('Update Membership')
     ->groups(['api', 'teams'])
     ->label('event', 'teams.[teamId].memberships.[membershipId].update')
     ->label('scope', 'teams.write')
@@ -747,8 +747,8 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
     ->label('audits.resource', 'team/{request.teamId}')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'teams')
-    ->label('sdk.method', 'updateMembershipRoles')
-    ->label('sdk.description', '/docs/references/teams/update-team-membership-roles.md')
+    ->label('sdk.method', 'updateMembership')
+    ->label('sdk.description', '/docs/references/teams/update-team-membership.md')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_MEMBERSHIP)

app/controllers/api/users.php

@@ -114,6 +114,7 @@ App::post('/v1/users')
     ->label('scope', 'users.write')
     ->label('audits.event', 'user.create')
     ->label('audits.resource', 'user/{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.create')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'create')
@@ -146,6 +147,7 @@ App::post('/v1/users/bcrypt')
     ->label('scope', 'users.write')
     ->label('audits.event', 'user.create')
     ->label('audits.resource', 'user/{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.create')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'createBcryptUser')
@@ -176,6 +178,7 @@ App::post('/v1/users/md5')
     ->label('scope', 'users.write')
     ->label('audits.event', 'user.create')
     ->label('audits.resource', 'user/{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.create')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'createMD5User')
@@ -206,6 +209,7 @@ App::post('/v1/users/argon2')
     ->label('scope', 'users.write')
     ->label('audits.event', 'user.create')
     ->label('audits.resource', 'user/{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.create')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'createArgon2User')
@@ -236,6 +240,7 @@ App::post('/v1/users/sha')
     ->label('scope', 'users.write')
     ->label('audits.event', 'user.create')
     ->label('audits.resource', 'user/{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.create')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'createSHAUser')
@@ -273,6 +278,7 @@ App::post('/v1/users/phpass')
     ->label('scope', 'users.write')
     ->label('audits.event', 'user.create')
     ->label('audits.resource', 'user/{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.create')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'createPHPassUser')
@@ -303,6 +309,7 @@ App::post('/v1/users/scrypt')
     ->label('scope', 'users.write')
     ->label('audits.event', 'user.create')
     ->label('audits.resource', 'user/{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.create')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'createScryptUser')
@@ -346,6 +353,7 @@ App::post('/v1/users/scrypt-modified')
     ->label('scope', 'users.write')
     ->label('audits.event', 'user.create')
     ->label('audits.resource', 'user/{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.create')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'createScryptModifiedUser')
@@ -376,6 +384,7 @@ App::get('/v1/users')
     ->desc('List Users')
     ->groups(['api', 'users'])
     ->label('scope', 'users.read')
+    ->label('usage.metric', 'users.{scope}.requests.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'list')
@@ -422,6 +431,7 @@ App::get('/v1/users/:userId')
     ->desc('Get User')
     ->groups(['api', 'users'])
     ->label('scope', 'users.read')
+    ->label('usage.metric', 'users.{scope}.requests.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'get')
@@ -447,6 +457,7 @@ App::get('/v1/users/:userId/prefs')
     ->desc('Get User Preferences')
     ->groups(['api', 'users'])
     ->label('scope', 'users.read')
+    ->label('usage.metric', 'users.{scope}.requests.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'getPrefs')
@@ -474,6 +485,7 @@ App::get('/v1/users/:userId/sessions')
     ->desc('List User Sessions')
     ->groups(['api', 'users'])
     ->label('scope', 'users.read')
+    ->label('usage.metric', 'users.{scope}.requests.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'listSessions')
@@ -515,6 +527,7 @@ App::get('/v1/users/:userId/memberships')
     ->desc('List User Memberships')
     ->groups(['api', 'users'])
     ->label('scope', 'users.read')
+    ->label('usage.metric', 'users.{scope}.requests.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'listMemberships')
@@ -554,6 +567,7 @@ App::get('/v1/users/:userId/logs')
     ->desc('List User Logs')
     ->groups(['api', 'users'])
     ->label('scope', 'users.read')
+    ->label('usage.metric', 'users.{scope}.requests.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'listLogs')
@@ -686,6 +700,7 @@ App::patch('/v1/users/:userId/status')
     ->label('audits.event', 'user.update')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('audits.userId', '{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'updateStatus')
@@ -721,7 +736,6 @@ App::put('/v1/users/:userId/labels')
     ->label('scope', 'users.write')
     ->label('audits.event', 'user.update')
     ->label('audits.resource', 'user/{response.$id}')
-    ->label('audits.userId', '{response.$id}')
     ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
@@ -760,6 +774,7 @@ App::patch('/v1/users/:userId/verification/phone')
     ->label('scope', 'users.write')
     ->label('audits.event', 'verification.update')
     ->label('audits.resource', 'user/{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'updatePhoneVerification')
@@ -796,6 +811,7 @@ App::patch('/v1/users/:userId/name')
     ->label('audits.event', 'user.update')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('audits.userId', '{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'updateName')
@@ -833,6 +849,7 @@ App::patch('/v1/users/:userId/password')
     ->label('audits.event', 'user.update')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('audits.userId', '{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'updatePassword')
@@ -897,6 +914,7 @@ App::patch('/v1/users/:userId/email')
     ->label('audits.event', 'user.update')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('audits.userId', '{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'updateEmail')
@@ -952,6 +970,7 @@ App::patch('/v1/users/:userId/phone')
     ->label('scope', 'users.write')
     ->label('audits.event', 'user.update')
     ->label('audits.resource', 'user/{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'updatePhone')
@@ -996,6 +1015,7 @@ App::patch('/v1/users/:userId/verification')
     ->label('audits.event', 'verification.update')
     ->label('audits.resource', 'user/{request.userId}')
     ->label('audits.userId', '{request.userId}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'updateEmailVerification')
@@ -1028,6 +1048,7 @@ App::patch('/v1/users/:userId/prefs')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].update.prefs')
     ->label('scope', 'users.write')
+    ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'updatePrefs')
@@ -1063,6 +1084,7 @@ App::delete('/v1/users/:userId/sessions/:sessionId')
     ->label('scope', 'users.write')
     ->label('audits.event', 'session.delete')
     ->label('audits.resource', 'user/{request.userId}')
+    ->label('usage.metric', 'sessions.{scope}.requests.delete')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'deleteSession')
@@ -1106,6 +1128,7 @@ App::delete('/v1/users/:userId/sessions')
     ->label('scope', 'users.write')
     ->label('audits.event', 'session.delete')
     ->label('audits.resource', 'user/{user.$id}')
+    ->label('usage.metric', 'sessions.{scope}.requests.delete')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'deleteSessions')
@@ -1148,6 +1171,7 @@ App::delete('/v1/users/:userId')
     ->label('scope', 'users.write')
     ->label('audits.event', 'user.delete')
     ->label('audits.resource', 'user/{request.userId}')
+    ->label('usage.metric', 'users.{scope}.requests.delete')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'delete')
@@ -1226,59 +1250,96 @@ App::get('/v1/users/usage')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_USAGE_USERS)
     ->param('range', '30d', new WhiteList(['24h', '7d', '30d', '90d'], true), 'Date range.', true)
+    ->param('provider', '', new WhiteList(\array_merge(['email', 'anonymous'], \array_map(fn ($value) => "oauth-" . $value, \array_keys(Config::getParam('providers', [])))), true), 'Provider Name.', true)
     ->inject('response')
     ->inject('dbForProject')
     ->inject('register')
-    ->action(function (string $range, Response $response, Database $dbForProject) {
+    ->action(function (string $range, string $provider, Response $response, Database $dbForProject) {
 
-        $periods = Config::getParam('usage', []);
-        $stats = $usage = [];
-        $days = $periods[$range];
-        $metrics = [
-            METRIC_USERS,
-            METRIC_SESSIONS,
-        ];
-
-        Authorization::skip(function () use ($dbForProject, $days, $metrics, &$stats) {
-            foreach ($metrics as $metric) {
-                $limit = $days['limit'];
-                $period = $days['period'];
-                $results = $dbForProject->find('stats', [
-                    Query::equal('period', [$period]),
-                    Query::equal('metric', [$metric]),
-                    Query::limit($limit),
-                    Query::orderDesc('time'),
-                ]);
-                $stats[$metric] = [];
-                foreach ($results as $result) {
-                    $stats[$metric][$result->getAttribute('time')] = [
-                        'value' => $result->getAttribute('value'),
-                    ];
-                }
-            }
-        });
-
-        $format = match ($days['period']) {
-            '1h' => 'Y-m-d\TH:00:00.000P',
-            '1d' => 'Y-m-d\T00:00:00.000P',
-        };
-
-    foreach ($metrics as $metric) {
-        $usage[$metric] = [];
-        $leap = time() - ($days['limit'] * $days['factor']);
-        while ($leap < time()) {
-            $leap += $days['factor'];
-            $formatDate = date($format, $leap);
-            $usage[$metric][] = [
-                'value' => $stats[$metric][$formatDate]['value'] ?? 0,
-                'date' => $formatDate,
+        $usage = [];
+        if (App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
+            $periods = [
+                '24h' => [
+                    'period' => '1h',
+                    'limit' => 24,
+                ],
+                '7d' => [
+                    'period' => '1d',
+                    'limit' => 7,
+                ],
+                '30d' => [
+                    'period' => '1d',
+                    'limit' => 30,
+                ],
+                '90d' => [
+                    'period' => '1d',
+                    'limit' => 90,
+                ],
             ];
-        }
-    }
 
-        $response->dynamic(new Document([
-            'range' => $range,
-            'usersTotal'   => $usage[$metrics[0]],
-            'sessionsTotal' => $usage[$metrics[1]],
-        ]), Response::MODEL_USAGE_USERS);
+            $metrics = [
+                'users.$all.count.total',
+                'users.$all.requests.create',
+                'users.$all.requests.read',
+                'users.$all.requests.update',
+                'users.$all.requests.delete',
+                'sessions.$all.requests.create',
+                'sessions.$all.requests.delete',
+                "sessions.$provider.requests.create",
+            ];
+
+            $stats = [];
+
+            Authorization::skip(function () use ($dbForProject, $periods, $range, $metrics, &$stats) {
+                foreach ($metrics as $metric) {
+                    $limit = $periods[$range]['limit'];
+                    $period = $periods[$range]['period'];
+
+                    $requestDocs = $dbForProject->find('stats', [
+                        Query::equal('period', [$period]),
+                        Query::equal('metric', [$metric]),
+                        Query::limit($limit),
+                        Query::orderDesc('time'),
+                    ]);
+
+                    $stats[$metric] = [];
+                    foreach ($requestDocs as $requestDoc) {
+                        $stats[$metric][] = [
+                            'value' => $requestDoc->getAttribute('value'),
+                            'date' => $requestDoc->getAttribute('time'),
+                        ];
+                    }
+
+                    // backfill metrics with empty values for graphs
+                    $backfill = $limit - \count($requestDocs);
+                    while ($backfill > 0) {
+                        $last = $limit - $backfill - 1; // array index of last added metric
+                        $diff = match ($period) { // convert period to seconds for unix timestamp math
+                            '1h' => 3600,
+                            '1d' => 86400,
+                        };
+                        $stats[$metric][] = [
+                            'value' => 0,
+                            'date' => DateTime::formatTz(DateTime::addSeconds(new \DateTime($stats[$metric][$last]['date'] ?? null), -1 * $diff)),
+                        ];
+                        $backfill--;
+                    }
+                    $stats[$metric] = array_reverse($stats[$metric]);
+                }
+            });
+
+            $usage = new Document([
+                'range' => $range,
+                'usersCount' => $stats['users.$all.count.total'] ?? [],
+                'usersCreate' => $stats['users.$all.requests.create'] ?? [],
+                'usersRead' => $stats['users.$all.requests.read'] ?? [],
+                'usersUpdate' => $stats['users.$all.requests.update'] ?? [],
+                'usersDelete' => $stats['users.$all.requests.delete'] ?? [],
+                'sessionsCreate' => $stats['sessions.$all.requests.create'] ?? [],
+                'sessionsProviderCreate' => $stats["sessions.$provider.requests.create"] ?? [],
+                'sessionsDelete' => $stats['sessions.$all.requests.delete' ?? []]
+            ]);
+        }
+
+        $response->dynamic($usage, Response::MODEL_USAGE_USERS);
     });

app/controllers/api/vcs.php

@@ -64,34 +64,6 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                 $activate = true;
             }
 
-            $latestCommentId = '';
-
-            if (!empty($providerPullRequestId)) {
-                $latestComment = Authorization::skip(fn () => $dbForConsole->findOne('vcsComments', [
-                    Query::equal('installationInternalId', [$installationInternalId]),
-                    Query::equal('projectInternalId', [$project->getInternalId()]),
-                    Query::equal('providerRepositoryId', [$providerRepositoryId]),
-                    Query::equal('providerPullRequestId', [$providerPullRequestId]),
-                    Query::orderDesc('$createdAt'),
-                ]));
-
-                if ($latestComment !== false && !$latestComment->isEmpty()) {
-                    $latestCommentId = $latestComment->getAttribute('commentId', '');
-                }
-            } elseif (!empty($providerBranch)) {
-                $latestComment = Authorization::skip(fn () => $dbForConsole->findOne('vcsComments', [
-                    Query::equal('installationInternalId', [$installationInternalId]),
-                    Query::equal('projectInternalId', [$project->getInternalId()]),
-                    Query::equal('providerRepositoryId', [$providerRepositoryId]),
-                    Query::equal('providerBranch', [$providerBranch]),
-                    Query::orderDesc('$createdAt'),
-                ]));
-
-                if ($latestComment !== false && !$latestComment->isEmpty()) {
-                    $latestCommentId = $latestComment->getAttribute('commentId', '');
-                }
-            }
-
             $owner = $github->getOwnerName($providerInstallationId) ?? '';
             $repositoryName = $github->getRepositoryName($providerRepositoryId) ?? '';
 
@@ -113,48 +85,65 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
 
             $action = $isAuthorized ? ['type' => 'logs'] : ['type' => 'authorize', 'url' => $authorizeUrl];
 
-            if (empty($latestCommentId)) {
-                $comment = new Comment();
-                $comment->addBuild($project, $function, $commentStatus, $deploymentId, $action);
+            $latestCommentId = '';
 
-                if (!empty($providerPullRequestId)) {
+            if (!empty($providerPullRequestId)) {
+                $latestComment = Authorization::skip(fn () => $dbForConsole->findOne('vcsComments', [
+                    Query::equal('providerRepositoryId', [$providerRepositoryId]),
+                    Query::equal('providerPullRequestId', [$providerPullRequestId]),
+                    Query::orderDesc('$createdAt'),
+                ]));
+
+                if ($latestComment !== false && !$latestComment->isEmpty()) {
+                    $latestCommentId = $latestComment->getAttribute('providerCommentId', '');
+                    $comment = new Comment();
+                    $comment->parseComment($github->getComment($owner, $repositoryName, $latestCommentId));
+                    $comment->addBuild($project, $function, $commentStatus, $deploymentId, $action);
+
+                    $latestCommentId = \strval($github->updateComment($owner, $repositoryName, $latestCommentId, $comment->generateComment()));
+                } else {
+                    $comment = new Comment();
+                    $comment->addBuild($project, $function, $commentStatus, $deploymentId, $action);
                     $latestCommentId = \strval($github->createComment($owner, $repositoryName, $providerPullRequestId, $comment->generateComment()));
-                } elseif (!empty($providerBranch)) {
-                    $gitPullRequest = $github->getPullRequestFromBranch($owner, $repositoryName, $providerBranch);
-                    $providerPullRequestId = \strval($gitPullRequest['number'] ?? '');
-                    if (!empty($providerPullRequestId)) {
-                        $latestCommentId = \strval($github->createComment($owner, $repositoryName, $providerPullRequestId, $comment->generateComment()));
+
+                    if (!empty($latestCommentId)) {
+                        $teamId = $project->getAttribute('teamId', '');
+
+                        $latestComment = Authorization::skip(fn () => $dbForConsole->createDocument('vcsComments', new Document([
+                            '$id' => ID::unique(),
+                            '$permissions' => [
+                                Permission::read(Role::team(ID::custom($teamId))),
+                                Permission::update(Role::team(ID::custom($teamId), 'owner')),
+                                Permission::update(Role::team(ID::custom($teamId), 'developer')),
+                                Permission::delete(Role::team(ID::custom($teamId), 'owner')),
+                                Permission::delete(Role::team(ID::custom($teamId), 'developer')),
+                            ],
+                            'installationInternalId' => $installationInternalId,
+                            'installationId' => $installationId,
+                            'projectInternalId' => $project->getInternalId(),
+                            'projectId' => $project->getId(),
+                            'providerRepositoryId' => $providerRepositoryId,
+                            'providerBranch' => $providerBranch,
+                            'providerPullRequestId' => $providerPullRequestId,
+                            'providerCommentId' => $latestCommentId
+                        ])));
                     }
                 }
+            } elseif (!empty($providerBranch)) {
+                $latestComments = Authorization::skip(fn () => $dbForConsole->find('vcsComments', [
+                    Query::equal('providerRepositoryId', [$providerRepositoryId]),
+                    Query::equal('providerBranch', [$providerBranch]),
+                    Query::orderDesc('$createdAt'),
+                ]));
 
-                if (!empty($latestCommentId)) {
-                    $teamId = $project->getAttribute('teamId', '');
+                foreach ($latestComments as $comment) {
+                    $latestCommentId = $comment->getAttribute('providerCommentId', '');
+                    $comment = new Comment();
+                    $comment->parseComment($github->getComment($owner, $repositoryName, $latestCommentId));
+                    $comment->addBuild($project, $function, $commentStatus, $deploymentId, $action);
 
-                    $latestComment = Authorization::skip(fn () => $dbForConsole->createDocument('vcsComments', new Document([
-                        '$id' => ID::unique(),
-                        '$permissions' => [
-                            Permission::read(Role::team(ID::custom($teamId))),
-                            Permission::update(Role::team(ID::custom($teamId), 'owner')),
-                            Permission::update(Role::team(ID::custom($teamId), 'developer')),
-                            Permission::delete(Role::team(ID::custom($teamId), 'owner')),
-                            Permission::delete(Role::team(ID::custom($teamId), 'developer')),
-                        ],
-                        'installationInternalId' => $installationInternalId,
-                        'installationId' => $installationId,
-                        'projectInternalId' => $project->getInternalId(),
-                        'projectId' => $project->getId(),
-                        'providerRepositoryId' => $providerRepositoryId,
-                        'providerBranch' => $providerBranch,
-                        'providerPullRequestId' => $providerPullRequestId,
-                        'providerCommentId' => $latestCommentId
-                    ])));
+                    $latestCommentId = \strval($github->updateComment($owner, $repositoryName, $latestCommentId, $comment->generateComment()));
                 }
-            } else {
-                $comment = new Comment();
-                $comment->parseComment($github->getComment($owner, $repositoryName, $latestCommentId));
-                $comment->addBuild($project, $function, $commentStatus, $deploymentId, $action);
-
-                $latestCommentId = \strval($github->updateComment($owner, $repositoryName, $latestCommentId, $comment->generateComment()));
             }
 
             if (!$isAuthorized) {
@@ -288,6 +277,11 @@ App::get('/v1/vcs/github/callback')
     ->inject('response')
     ->inject('dbForConsole')
     ->action(function (string $providerInstallationId, string $setupAction, string $state, string $code, GitHub $github, Document $user, Document $project, Request $request, Response $response, Database $dbForConsole) {
+        if (empty($state)) {
+            $error = 'Installation requests from organisation members for the Appwrite GitHub App are currently unsupported. To proceed with the installation, login to the Appwrite Console and install the GitHub App.';
+            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, $error);
+        }
+
         $state = \json_decode($state, true);
         $projectId = $state['projectId'] ?? '';
 
@@ -296,25 +290,11 @@ App::get('/v1/vcs/github/callback')
             'failure' => $request->getProtocol() . '://' . $request->getHostname() . "/console/project-$projectId/settings/git-installations",
         ];
 
-        $state = \array_merge($defaultState, $state);
+        $state = \array_merge($defaultState, $state ?? []);
 
         $redirectSuccess = $state['success'] ?? '';
         $redirectFailure = $state['failure'] ?? '';
 
-        if (empty($state)) {
-            $error = 'Installation requests from organisation members for the Appwrite GitHub App are currently unsupported. To proceed with the installation, login to the Appwrite Console and install the GitHub App.';
-
-            if (!empty($redirectFailure)) {
-                $separator = \str_contains($redirectFailure, '?') ? '&' : ':';
-                return $response
-                    ->addHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
-                    ->addHeader('Pragma', 'no-cache')
-                    ->redirect($redirectFailure . $separator . \http_build_query(['error' => $error]));
-            }
-
-            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, $error);
-        }
-
         $project = $dbForConsole->getDocument('projects', $projectId);
 
         if ($project->isEmpty()) {
@@ -722,10 +702,6 @@ App::post('/v1/vcs/github/installations/:installationId/providerRepositories')
             }
         }
 
-        if (isset($repository['message'])) {
-            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Provider Error: ' . $repository['message']);
-        }
-
         if (isset($repository['errors'])) {
             $message = $repository['message'] ?? 'Unknown error.';
             if (isset($repository['errors'][0])) {
@@ -734,6 +710,10 @@ App::post('/v1/vcs/github/installations/:installationId/providerRepositories')
             throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Provider Error: ' . $message);
         }
 
+        if (isset($repository['message'])) {
+            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Provider Error: ' . $repository['message']);
+        }
+
         $repository['id'] = \strval($repository['id']) ?? '';
         $repository['pushedAt'] = $repository['pushed_at'] ?? '';
         $repository['organization'] = $installation->getAttribute('organization', '');
@@ -859,7 +839,7 @@ App::post('/v1/vcs/github/events')
             $parsedPayload = $github->getEvent($event, $payload);
 
             if ($event == $github::EVENT_PUSH) {
-                $providerBranchCreated = $parsedPayload["created"] ?? false;
+                $providerBranchCreated = $parsedPayload["branchCreated"] ?? false;
                 $providerBranch = $parsedPayload["branch"] ?? '';
                 $providerBranchUrl = $parsedPayload["branchUrl"] ?? '';
                 $providerRepositoryId = $parsedPayload["repositoryId"] ?? '';

app/controllers/general.php

@@ -60,7 +60,7 @@ function router(App $utopia, Database $dbForConsole, SwooleRequest $swooleReques
         $mainDomain = App::getEnv('_APP_DOMAIN', '');
 
         if ($mainDomain === 'localhost') {
-            throw new AppwriteException(AppwriteException::GENERAL_SERVER_ERROR, 'Please configure domain environment variables before using Appwrite outside of localhost.');
+            throw new AppwriteException(AppwriteException::ROUTER_DOMAIN_NOT_CONFIGURED);
         } else {
             throw new AppwriteException(AppwriteException::ROUTER_HOST_NOT_FOUND);
         }
@@ -191,7 +191,7 @@ App::init()
         $host = $request->getHostname() ?? '';
         $mainDomain = App::getEnv('_APP_DOMAIN', '');
         // Only run Router when external domain
-        if ($host !== $mainDomain && $host !== 'localhost' && $host !== 'appwrite') {
+        if ($host !== $mainDomain && $host !== 'localhost' && $host !== APP_HOSTNAME_INTERNAL) {
             if (router($utopia, $dbForConsole, $swooleRequest, $request, $response)) {
                 return;
             }
@@ -204,7 +204,7 @@ App::init()
         Request::setRoute($route);
 
         if ($route === null) {
-            return $response->setStatusCode(404)->send("Not Found");
+            return $response->setStatusCode(404)->send('Not Found');
         }
 
         $requestFormat = $request->getHeader('x-appwrite-response-format', App::getEnv('_APP_SYSTEM_RESPONSE_FORMAT', ''));
@@ -319,7 +319,7 @@ App::init()
         * @see https://www.owasp.org/index.php/List_of_useful_HTTP_headers
         */
         if (App::getEnv('_APP_OPTIONS_FORCE_HTTPS', 'disabled') === 'enabled') { // Force HTTPS
-            if ($request->getProtocol() !== 'https' && ($swooleRequest->header['host'] ?? '') !== 'localhost') { // Localhost allowed for proxy
+            if ($request->getProtocol() !== 'https' && ($swooleRequest->header['host'] ?? '') !== 'localhost' && ($swooleRequest->header['host'] ?? '') !== APP_HOSTNAME_INTERNAL) { // Localhost allowed for proxy, APP_HOSTNAME_INTERNAL allowed for migrations
                 if ($request->getMethod() !== Request::METHOD_GET) {
                     throw new AppwriteException(AppwriteException::GENERAL_PROTOCOL_UNSUPPORTED, 'Method unsupported over HTTP.');
                 }
@@ -489,7 +489,7 @@ App::options()
         $host = $request->getHostname() ?? '';
         $mainDomain = App::getEnv('_APP_DOMAIN', '');
         // Only run Router when external domain
-        if ($host !== $mainDomain && $host !== 'localhost' && $host !== 'appwrite') {
+        if ($host !== $mainDomain && $host !== 'localhost' && $host !== APP_HOSTNAME_INTERNAL) {
             if (router($utopia, $dbForConsole, $swooleRequest, $request, $response)) {
                 return;
             }

app/controllers/shared/api.php

@@ -8,8 +8,8 @@ use Appwrite\Event\Event;
 use Appwrite\Event\Func;
 use Appwrite\Event\Mail;
 use Appwrite\Extend\Exception;
-use Appwrite\Event\Usage;
 use Appwrite\Messaging\Adapter\Realtime;
+use Appwrite\Usage\Stats;
 use Appwrite\Utopia\Response;
 use Appwrite\Utopia\Request;
 use Utopia\App;
@@ -48,99 +48,43 @@ $parseLabel = function (string $label, array $responsePayload, array $requestPar
     return $label;
 };
 
-$databaseListener = function (string $event, Document $document, Document $project, Usage $queueForUsage, Database $dbForProject) {
-
-    $value = 1;
+$databaseListener = function (string $event, Document $document, Stats $usage) {
+    $multiplier = 1;
     if ($event === Database::EVENT_DOCUMENT_DELETE) {
-        $value = -1;
+        $multiplier = -1;
     }
 
-    switch (true) {
-        case $document->getCollection() === 'teams':
-            $queueForUsage
-                ->addMetric(METRIC_TEAMS, $value); // per project
+    $collection = $document->getCollection();
+    switch ($collection) {
+        case 'users':
+            $usage->setParam('users.{scope}.count.total', 1 * $multiplier);
             break;
-        case $document->getCollection() === 'users':
-            $queueForUsage
-                ->addMetric(METRIC_USERS, $value); // per project
-            if ($event === Database::EVENT_DOCUMENT_DELETE) {
-                $queueForUsage
-                    ->addReduce($document);
-            }
+        case 'databases':
+            $usage->setParam('databases.{scope}.count.total', 1 * $multiplier);
             break;
-        case $document->getCollection() === 'sessions': // sessions
-            $queueForUsage
-                ->addMetric(METRIC_SESSIONS, $value); //per project
+        case 'buckets':
+            $usage->setParam('buckets.{scope}.count.total', 1 * $multiplier);
             break;
-        case $document->getCollection() === 'databases': // databases
-            $queueForUsage
-                ->addMetric(METRIC_DATABASES, $value); // per project
-
-            if ($event === Database::EVENT_DOCUMENT_DELETE) {
-                $queueForUsage
-                    ->addReduce($document);
-            }
-            break;
-        case str_starts_with($document->getCollection(), 'database_') && !str_contains($document->getCollection(), 'collection'): //collections
-            $parts = explode('_', $document->getCollection());
-            $databaseInternalId = $parts[1] ?? 0;
-            $queueForUsage
-                ->addMetric(METRIC_COLLECTIONS, $value) // per project
-                ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, METRIC_DATABASE_ID_COLLECTIONS), $value) // per database
-            ;
-
-            if ($event === Database::EVENT_DOCUMENT_DELETE) {
-                $queueForUsage
-                    ->addReduce($document);
-            }
-            break;
-        case str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_'): //documents
-            $parts = explode('_', $document->getCollection());
-            $databaseInternalId   = $parts[1] ?? 0;
-            $collectionInternalId = $parts[3] ?? 0;
-            $queueForUsage
-                ->addMetric(METRIC_DOCUMENTS, $value)  // per project
-                ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, METRIC_DATABASE_ID_DOCUMENTS), $value) // per database
-                ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId, $collectionInternalId], METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS), $value);  // per collection
-            break;
-        case $document->getCollection() === 'buckets': //buckets
-            $queueForUsage
-                ->addMetric(METRIC_BUCKETS, $value); // per project
-            if ($event === Database::EVENT_DOCUMENT_DELETE) {
-                $queueForUsage
-                    ->addReduce($document);
-            }
-            break;
-        case str_starts_with($document->getCollection(), 'bucket_'): // files
-            $queueForUsage
-                ->addMetric(METRIC_FILES, $value) // per project
-                ->addMetric(METRIC_FILES_STORAGE, $document->getAttribute('sizeOriginal') * $value) // per project
-                ->addMetric(str_replace('{bucketInternalId}', $document->getAttribute('bucketInternalId'), METRIC_BUCKET_ID_FILES), $value) // per bucket
-                ->addMetric(str_replace('{bucketInternalId}', $document->getAttribute('bucketInternalId'), METRIC_BUCKET_ID_FILES_STORAGE), $document->getAttribute('sizeOriginal') * $value); // per bucket
-            break;
-        case $document->getCollection() === 'functions':
-            $queueForUsage
-                ->addMetric(METRIC_FUNCTIONS, $value); // per project
-
-            if ($event === Database::EVENT_DOCUMENT_DELETE) {
-                $queueForUsage
-                    ->addReduce($document);
-            }
-            break;
-        case $document->getCollection() === 'deployments':
-            $queueForUsage
-                ->addMetric(METRIC_DEPLOYMENTS, $value) // per project
-                ->addMetric(METRIC_DEPLOYMENTS_STORAGE, $document->getAttribute('size') * $value) // per project
-                ->addMetric(str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getAttribute('resourceType'), $document->getAttribute('resourceInternalId')], METRIC_FUNCTION_ID_DEPLOYMENTS), $value)// per function
-                ->addMetric(str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getAttribute('resourceType'), $document->getAttribute('resourceInternalId')], METRIC_FUNCTION_ID_DEPLOYMENTS_STORAGE), $document->getAttribute('size') * $value);// per function
-
-            break;
-        case $document->getCollection() === 'executions':
-            $queueForUsage
-                ->addMetric(METRIC_EXECUTIONS, $value) // per project
-                ->addMetric(str_replace('{functionInternalId}', $document->getAttribute('functionInternalId'), METRIC_FUNCTION_ID_EXECUTIONS), $value);// per function
+        case 'deployments':
+            $usage->setParam('deployments.{scope}.storage.size', $document->getAttribute('size') * $multiplier);
             break;
         default:
+            if (strpos($collection, 'bucket_') === 0) {
+                $usage
+                    ->setParam('bucketId', $document->getAttribute('bucketId'))
+                    ->setParam('files.{scope}.storage.size', $document->getAttribute('sizeOriginal') * $multiplier)
+                    ->setParam('files.{scope}.count.total', 1 * $multiplier);
+            } elseif (strpos($collection, 'database_') === 0) {
+                $usage
+                    ->setParam('databaseId', $document->getAttribute('databaseId'));
+                if (strpos($collection, '_collection_') !== false) {
+                    $usage
+                        ->setParam('collectionId', $document->getAttribute('$collectionId'))
+                        ->setParam('documents.{scope}.count.total', 1 * $multiplier);
+                } else {
+                    $usage->setParam('collections.{scope}.count.total', 1 * $multiplier);
+                }
+            }
             break;
     }
 };
@@ -157,10 +101,10 @@ App::init()
     ->inject('deletes')
     ->inject('database')
     ->inject('dbForProject')
-    ->inject('queueForUsage')
     ->inject('mode')
     ->inject('mails')
-    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Event $events, Audit $audits, Delete $deletes, EventDatabase $database, Database $dbForProject, Usage $queueForUsage, string $mode, Mail $mails) use ($databaseListener) {
+    ->inject('usage')
+    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Event $events, Audit $audits, Delete $deletes, EventDatabase $database, Database $dbForProject, string $mode, Mail $mails, Stats $usage) use ($databaseListener) {
 
         $route = $utopia->getRoute();
 
@@ -242,24 +186,19 @@ App::init()
             ->setProject($project)
             ->setUser($user);
 
-        $smtp = $project->getAttribute('smtp', []);
-        if (!empty($smtp) && ($smtp['enabled'] ?? false)) {
-            $mails
-                ->setSmtpHost($smtp['host'] ?? '')
-                ->setSmtpPort($smtp['port'] ?? 25)
-                ->setSmtpUsername($smtp['username'] ?? '')
-                ->setSmtpPassword($smtp['password'] ?? '')
-                ->setSmtpSenderEmail($smtp['sender'] ?? '')
-                ->setSmtpReplyTo($smtp['replyTo'] ?? '');
-        }
+        $usage
+            ->setParam('projectInternalId', $project->getInternalId())
+            ->setParam('projectId', $project->getId())
+            ->setParam('project.{scope}.network.requests', 1)
+            ->setParam('httpMethod', $request->getMethod())
+            ->setParam('project.{scope}.network.inbound', 0)
+            ->setParam('project.{scope}.network.outbound', 0);
 
         $deletes->setProject($project);
         $database->setProject($project);
 
-        $dbForProject
-            ->on(Database::EVENT_DOCUMENT_CREATE, fn ($event, $document) => $databaseListener($event, $document, $project, $queueForUsage, $dbForProject))
-            ->on(Database::EVENT_DOCUMENT_DELETE, fn ($event, $document) => $databaseListener($event, $document, $project, $queueForUsage, $dbForProject))
-        ;
+        $dbForProject->on(Database::EVENT_DOCUMENT_CREATE, 'calculate-usage', fn ($event, Document $document) => $databaseListener($event, $document, $usage));
+        $dbForProject->on(Database::EVENT_DOCUMENT_DELETE, 'calculate-usage', fn ($event, Document $document) => $databaseListener($event, $document, $usage));
 
         $useCache = $route->getLabel('cache', false);
 
@@ -422,14 +361,14 @@ App::shutdown()
     ->inject('user')
     ->inject('events')
     ->inject('audits')
+    ->inject('usage')
     ->inject('deletes')
     ->inject('database')
     ->inject('dbForProject')
     ->inject('queueForFunctions')
-    ->inject('queueForUsage')
     ->inject('mode')
     ->inject('dbForConsole')
-    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Event $events, Audit $audits, Delete $deletes, EventDatabase $database, Database $dbForProject, Func $queueForFunctions, Usage $queueForUsage, string $mode, Database $dbForConsole) use ($parseLabel) {
+    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Event $events, Audit $audits, Stats $usage, Delete $deletes, EventDatabase $database, Database $dbForProject, Func $queueForFunctions, string $mode, Database $dbForConsole) use ($parseLabel) {
 
         $responsePayload = $response->getPayload();
 
@@ -582,46 +521,35 @@ App::shutdown()
             }
         }
 
-        if ($project->getId() !== 'console') {
-            if ($mode !== APP_MODE_ADMIN) {
-                $fileSize = 0;
-                $file = $request->getFiles('file');
-                if (!empty($file)) {
-                    $fileSize = (\is_array($file['size']) && isset($file['size'][0])) ? $file['size'][0] : $file['size'];
-                }
+        if (
+            App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled'
+            && $project->getId()
+            && !empty($route->getLabel('sdk.namespace', null))
+        ) { // Don't calculate console usage on admin mode
+            $metric = $route->getLabel('usage.metric', '');
+            $usageParams = $route->getLabel('usage.params', []);
 
-                $queueForUsage
-                    ->addMetric(METRIC_NETWORK_REQUESTS, 1)
-                    ->addMetric(METRIC_NETWORK_INBOUND, $request->getSize() + $fileSize)
-                    ->addMetric(METRIC_NETWORK_OUTBOUND, $response->getSize());
-            }
-
-            $queueForUsage
-                ->setProject($project)
-                ->trigger();
-        }
-
-        /**
-         * Update user last activity
-         */
-        if (!$user->isEmpty()) {
-            $accessedAt = $user->getAttribute('accessedAt', '');
-            if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_USER_ACCCESS)) > $accessedAt) {
-                $user->setAttribute('accessedAt', DateTime::now());
-
-                if (APP_MODE_ADMIN !== $mode) {
-                    $dbForProject->updateDocument('users', $user->getId(), $user);
-                } else {
-                    $dbForConsole->updateDocument('users', $user->getId(), $user);
+            if (!empty($metric)) {
+                $usage->setParam($metric, 1);
+                foreach ($usageParams as $param) {
+                    $param = $parseLabel($param, $responsePayload, $requestParams, $user);
+                    $parts = explode(':', $param);
+                    if (count($parts) != 2) {
+                        throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Usage params not properly set');
+                    }
+                    $usage->setParam($parts[0], $parts[1]);
                 }
             }
-        }
-    });
 
-App::init()
-    ->groups(['usage'])
-    ->action(function () {
-        if (App::getEnv('_APP_USAGE_STATS', 'enabled') !== 'enabled') {
-            throw new Exception(Exception::GENERAL_USAGE_DISABLED);
+            $fileSize = 0;
+            $file = $request->getFiles('file');
+            if (!empty($file)) {
+                $fileSize = (\is_array($file['size']) && isset($file['size'][0])) ? $file['size'][0] : $file['size'];
+            }
+
+            $usage
+                ->setParam('project.{scope}.network.inbound', $request->getSize() + $fileSize)
+                ->setParam('project.{scope}.network.outbound', $response->getSize())
+                ->submit();
         }
     });

app/controllers/web/console.php

@@ -34,7 +34,7 @@ App::get('/console/*')
         // Serve static files (console) only for main domain
         $host = $request->getHostname() ?? '';
         $mainDomain = App::getEnv('_APP_DOMAIN', '');
-        if ($host !== $mainDomain && $host !== 'localhost' && $host !== 'appwrite') {
+        if ($host !== $mainDomain && $host !== 'localhost' && $host !== APP_HOSTNAME_INTERNAL) {
             throw new Exception(Exception::GENERAL_ROUTE_NOT_FOUND);
         }
 

app/http.php

@@ -20,13 +20,12 @@ use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Swoole\Files;
 use Appwrite\Utopia\Request;
-// use Swoole\Runtime;
+use Swoole\Runtime;
 use Utopia\Logger\Log;
 use Utopia\Logger\Log\User;
 use Utopia\Pools\Group;
 
-// TODO: Needed for VCS:
-// Runtime::enableCoroutine(SWOOLE_HOOK_ALL);
+Runtime::enableCoroutine(SWOOLE_HOOK_NATIVE_CURL);
 
 $http = new Server("0.0.0.0", App::getEnv('PORT', 80));
 

app/init.php

@@ -32,6 +32,7 @@ use Appwrite\Network\Validator\Email;
 use Appwrite\Network\Validator\Origin;
 use Appwrite\OpenSSL\OpenSSL;
 use Appwrite\URL\URL as AppwriteURL;
+use Appwrite\Usage\Stats;
 use Utopia\App;
 use Utopia\Logger\Logger;
 use Utopia\Cache\Adapter\Redis as RedisCache;
@@ -135,6 +136,7 @@ const APP_SOCIAL_DISCORD_CHANNEL = '564160730845151244';
 const APP_SOCIAL_DEV = 'https://dev.to/appwrite';
 const APP_SOCIAL_STACKSHARE = 'https://stackshare.io/appwrite';
 const APP_SOCIAL_YOUTUBE = 'https://www.youtube.com/c/appwrite?sub_confirmation=1';
+const APP_HOSTNAME_INTERNAL = 'appwrite';
 // Database Reconnect
 const DATABASE_RECONNECT_SLEEP = 2;
 const DATABASE_RECONNECT_MAX_ATTEMPTS = 10;
@@ -185,7 +187,7 @@ const APP_AUTH_TYPE_ADMIN = 'Admin';
 // Response related
 const MAX_OUTPUT_CHUNK_SIZE = 2 * 1024 * 1024; // 2MB
 // Function headers
-const FUNCTION_ALLOWLIST_HEADERS_REQUEST = ['content-type', 'agent', 'content-length'];
+const FUNCTION_ALLOWLIST_HEADERS_REQUEST = ['content-type', 'agent', 'content-length', 'host'];
 const FUNCTION_ALLOWLIST_HEADERS_RESPONSE = ['content-type', 'content-length'];
 // Usage metrics
 const METRIC_TEAMS = 'teams';
@@ -235,7 +237,6 @@ Config::load('providers', __DIR__ . '/config/providers.php');
 Config::load('platforms', __DIR__ . '/config/platforms.php');
 Config::load('collections', __DIR__ . '/config/collections.php');
 Config::load('runtimes', __DIR__ . '/config/runtimes.php');
-Config::load('usage', __DIR__ . '/config/usage.php');
 Config::load('roles', __DIR__ . '/config/roles.php');  // User roles and scopes
 Config::load('scopes', __DIR__ . '/config/scopes.php');  // User roles and scopes
 Config::load('services', __DIR__ . '/config/services.php');  // List of services
@@ -769,6 +770,31 @@ $register->set('pools', function () {
     return $group;
 });
 
+$register->set('influxdb', function () {
+
+ // Register DB connection
+    $host = App::getEnv('_APP_INFLUXDB_HOST', '');
+    $port = App::getEnv('_APP_INFLUXDB_PORT', '');
+
+    if (empty($host) || empty($port)) {
+        return;
+    }
+    $driver = new InfluxDB\Driver\Curl("http://{$host}:{$port}");
+    $client = new InfluxDB\Client($host, $port, '', '', false, false, 5);
+    $client->setDriver($driver);
+
+    return $client;
+});
+$register->set('statsd', function () {
+    // Register DB connection
+    $host = App::getEnv('_APP_STATSD_HOST', 'telegraf');
+    $port = App::getEnv('_APP_STATSD_PORT', 8125);
+
+    $connection = new \Domnikl\Statsd\Connection\UdpSocket($host, $port);
+    $statsd = new \Domnikl\Statsd\Client($connection);
+
+    return $statsd;
+});
 $register->set('smtp', function () {
     $mail = new PHPMailer(true);
 
@@ -872,9 +898,9 @@ App::setResource('queue', function (Group $pools) {
 App::setResource('queueForFunctions', function (Connection $queue) {
     return new Func($queue);
 }, ['queue']);
-App::setResource('queueForUsage', function (Connection $queue) {
-    return new Usage($queue);
-}, ['queue']);
+App::setResource('usage', function ($register) {
+    return new Stats($register->get('statsd'));
+}, ['register']);
 App::setResource('clients', function ($request, $console, $project) {
     $console->setAttribute('platforms', [ // Always allow current host
         '$collection' => ID::custom('platforms'),
@@ -955,7 +981,7 @@ App::setResource('user', function ($mode, $project, $console, $request, $respons
 
     if (APP_MODE_ADMIN !== $mode) {
         if ($project->isEmpty()) {
-            $user = new Document(['$id' => ID::custom(''), '$collection' => 'users']);
+            $user = new Document([]);
         } else {
             if ($project->getId() === 'console') {
                 $user = $dbForConsole->getDocument('users', Auth::$unique);
@@ -971,14 +997,14 @@ App::setResource('user', function ($mode, $project, $console, $request, $respons
         $user->isEmpty() // Check a document has been found in the DB
         || !Auth::sessionVerify($user->getAttribute('sessions', []), Auth::$secret, $authDuration)
     ) { // Validate user has valid login token
-        $user = new Document(['$id' => ID::custom(''), '$collection' => 'users']);
+        $user = new Document([]);
     }
 
     if (APP_MODE_ADMIN === $mode) {
         if ($user->find('teamId', $project->getAttribute('teamId'), 'memberships')) {
             Authorization::setDefaultStatus(false);  // Cancel security segmentation for admin users.
         } else {
-            $user = new Document(['$id' => ID::custom(''), '$collection' => 'users']);
+            $user = new Document([]);
         }
     }
 
@@ -1001,7 +1027,7 @@ App::setResource('user', function ($mode, $project, $console, $request, $respons
         }
 
         if (empty($user->find('$id', $jwtSessionId, 'sessions'))) { // Match JWT to active token
-            $user = new Document(['$id' => ID::custom(''), '$collection' => 'users']);
+            $user = new Document([]);
         }
     }
 

app/views/install/compose.phtml

@@ -80,6 +80,7 @@ services:
       - mariadb
       - redis
 #      - clamav
+      - influxdb
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -115,6 +116,8 @@ services:
       - _APP_SMTP_USERNAME
       - _APP_SMTP_PASSWORD
       - _APP_USAGE_STATS
+      - _APP_INFLUXDB_HOST
+      - _APP_INFLUXDB_PORT
       - _APP_STORAGE_LIMIT
       - _APP_STORAGE_PREVIEW_LIMIT
       - _APP_STORAGE_ANTIVIRUS
@@ -131,6 +134,8 @@ services:
       - _APP_EXECUTOR_HOST
       - _APP_LOGGING_PROVIDER
       - _APP_LOGGING_CONFIG
+      - _APP_STATSD_HOST
+      - _APP_STATSD_PORT
       - _APP_MAINTENANCE_INTERVAL
       - _APP_MAINTENANCE_RETENTION_EXECUTION
       - _APP_MAINTENANCE_RETENTION_CACHE
@@ -468,6 +473,35 @@ services:
       - _APP_MAINTENANCE_RETENTION_AUDIT
       - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
 
+  appwrite-usage:
+    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
+    entrypoint: usage
+    container_name: appwrite-usage
+    <<: *x-logging
+    restart: unless-stopped
+    networks:
+      - appwrite
+    depends_on:
+      - influxdb
+      - mariadb
+    environment:
+      - _APP_ENV
+      - _APP_OPENSSL_KEY_V1
+      - _APP_DB_HOST
+      - _APP_DB_PORT
+      - _APP_DB_SCHEMA
+      - _APP_DB_USER
+      - _APP_DB_PASS
+      - _APP_USAGE_AGGREGATION_INTERVAL
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_INFLUXDB_HOST
+      - _APP_INFLUXDB_PORT
+      - _APP_LOGGING_PROVIDER
+      - _APP_LOGGING_CONFIG
+
   appwrite-schedule:
     image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
     entrypoint: schedule
@@ -552,41 +586,26 @@ services:
   #   volumes:
   #     - appwrite-uploads:/storage/uploads
 
-  appwrite-worker-usage:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
-    entrypoint: worker-usage
+  influxdb:
+    image: appwrite/influxdb:1.5.0
+    container_name: appwrite-influxdb
     <<: *x-logging
-    container_name: appwrite-worker-usage
+    restart: unless-stopped
     networks:
       - appwrite
     volumes:
-      - ./app:/usr/src/code/app
-      - ./src:/usr/src/code/src
-    depends_on:
-      - redis
-      - mariadb
+      - appwrite-influxdb:/var/lib/influxdb:rw
+
+  telegraf:
+    image: appwrite/telegraf:1.4.0
+    container_name: appwrite-telegraf
+    <<: *x-logging
+    restart: unless-stopped
+    networks:
+      - appwrite
     environment:
-      - _APP_ENV
-      - _APP_WORKER_PER_CORE
-      - _APP_CONNECTIONS_MAX
-      - _APP_POOL_CLIENTS
-      - _APP_OPENSSL_KEY_V1
-      - _APP_DB_HOST
-      - _APP_DB_PORT
-      - _APP_DB_SCHEMA
-      - _APP_DB_USER
-      - _APP_DB_PASS
-      - _APP_REDIS_HOST
-      - _APP_REDIS_PORT
-      - _APP_REDIS_USER
-      - _APP_REDIS_PASS
-      - _APP_CONNECTIONS_DB_CONSOLE
-      - _APP_CONNECTIONS_DB_PROJECT
-      - _APP_CONNECTIONS_CACHE
-      - _APP_CONNECTIONS_QUEUE
-      - _APP_USAGE_STATS
-      - _APP_LOGGING_PROVIDER
-      - _APP_LOGGING_CONFIG
+      - _APP_INFLUXDB_HOST
+      - _APP_INFLUXDB_PORT
 
 networks:
   gateway:
@@ -602,6 +621,7 @@ volumes:
   appwrite-cache:
   appwrite-uploads:
   appwrite-certificates:
+  appwrite-influxdb:
   appwrite-config:
   appwrite-functions:
   appwrite-builds:

app/worker.php

@@ -4,10 +4,12 @@ require_once __DIR__ . '/init.php';
 
 use Appwrite\Event\Func;
 use Appwrite\Event\Usage;
+use Appwrite\Usage\Stats;
 use Swoole\Runtime;
 use Utopia\App;
 use Utopia\Cache\Adapter\Sharding;
 use Utopia\Cache\Cache;
+use Utopia\CLI\CLI;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
@@ -86,22 +88,16 @@ Server::setResource('queueForFunctions', function (Registry $register) {
     );
 }, ['register']);
 
-Server::setResource('queueForUsage', function (Registry $register) {
-    $pools = $register->get('pools');
-    return new Usage(
-        $pools
-            ->get('queue')
-            ->pop()
-            ->getResource()
-    );
-}, ['register']);
-
 Server::setResource('log', fn() => new Log());
 
 Server::setResource('logger', function ($register) {
     return $register->get('logger');
 }, ['register']);
 
+Server::setResource('statsd', function ($register) {
+    return $register->get('statsd');
+}, ['register']);
+
 Server::setResource('pools', function ($register) {
     return $register->get('pools');
 }, ['register']);

app/workers/builds.php

@@ -113,11 +113,10 @@ class BuildsV1 extends Worker
         $durationStart = \microtime(true);
 
         $buildId = $deployment->getAttribute('buildId', '');
-        $build = null;
 
         $isNewBuild = empty($buildId);
 
-        if (empty($buildId)) {
+        if ($isNewBuild) {
             $buildId = ID::unique();
             $build = $dbForProject->createDocument('builds', new Document([
                 '$id' => $buildId,
@@ -150,135 +149,132 @@ class BuildsV1 extends Worker
         $isVcsEnabled = $providerRepositoryId ? true : false;
         $owner = '';
         $repositoryName = '';
-        $branchName = '';
+
+        if ($isVcsEnabled) {
+            $installation = $dbForConsole->getDocument('installations', $installationId);
+            $providerInstallationId = $installation->getAttribute('providerInstallationId');
+            $privateKey = App::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY');
+            $githubAppId = App::getEnv('_APP_VCS_GITHUB_APP_ID');
+
+            $github->initializeVariables($providerInstallationId, $privateKey, $githubAppId);
+        }
 
         try {
-            if ($isNewBuild) {
-                if ($isVcsEnabled) {
-                    $installation = $dbForConsole->getDocument('installations', $installationId);
-                    $providerInstallationId = $installation->getAttribute('providerInstallationId');
+            if ($isNewBuild && $isVcsEnabled) {
+                $tmpDirectory = '/tmp/builds/' . $buildId . '/code';
+                $rootDirectory = $function->getAttribute('providerRootDirectory', '');
+                $rootDirectory = \rtrim($rootDirectory, '/');
+                $rootDirectory = \ltrim($rootDirectory, '.');
+                $rootDirectory = \ltrim($rootDirectory, '/');
 
-                    $privateKey = App::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY');
-                    $githubAppId = App::getEnv('_APP_VCS_GITHUB_APP_ID');
+                $owner = $github->getOwnerName($providerInstallationId);
+                $repositoryName = $github->getRepositoryName($providerRepositoryId);
 
-                    $tmpDirectory = '/tmp/builds/' . $buildId . '/code';
-                    $rootDirectory = $function->getAttribute('providerRootDirectory', '');
-                    $rootDirectory = \rtrim($rootDirectory, '/');
-                    $rootDirectory = \ltrim($rootDirectory, '.');
-                    $rootDirectory = \ltrim($rootDirectory, '/');
+                $cloneOwner = $deployment->getAttribute('providerRepositoryOwner', $owner);
+                $cloneRepository = $deployment->getAttribute('providerRepositoryName', $repositoryName);
 
-                    $github->initializeVariables($providerInstallationId, $privateKey, $githubAppId);
+                $branchName = $deployment->getAttribute('providerBranch');
+                $commitHash = $deployment->getAttribute('providerCommitHash', '');
+                $gitCloneCommand = $github->generateCloneCommand($cloneOwner, $cloneRepository, $branchName, $tmpDirectory, $rootDirectory, $commitHash);
+                $stdout = '';
+                $stderr = '';
+                Console::execute('mkdir -p /tmp/builds/' . \escapeshellcmd($buildId), '', $stdout, $stderr);
+                $exit = Console::execute($gitCloneCommand, '', $stdout, $stderr);
 
-                    $owner = $github->getOwnerName($providerInstallationId);
-                    $repositoryName = $github->getRepositoryName($providerRepositoryId);
+                if ($exit !== 0) {
+                    throw new \Exception('Unable to clone code repository: ' . $stderr);
+                }
 
-                    $cloneOwner = $deployment->getAttribute('providerRepositoryOwner', $owner);
-                    $cloneRepository = $deployment->getAttribute('providerRepositoryName', $repositoryName);
+                // Build from template
+                $templateRepositoryName = $template->getAttribute('repositoryName', '');
+                $templateOwnerName = $template->getAttribute('ownerName', '');
+                $templateBranch = $template->getAttribute('branch', '');
 
-                    $branchName = $deployment->getAttribute('providerBranch');
-                    $gitCloneCommand = $github->generateCloneCommand($cloneOwner, $cloneRepository, $branchName, $tmpDirectory, $rootDirectory);
-                    $stdout = '';
-                    $stderr = '';
-                    Console::execute('mkdir -p /tmp/builds/' . $buildId, '', $stdout, $stderr);
-                    $exit = Console::execute($gitCloneCommand, '', $stdout, $stderr);
+                $templateRootDirectory =  $template->getAttribute('rootDirectory', '');
+                $templateRootDirectory = \rtrim($templateRootDirectory, '/');
+                $templateRootDirectory = \ltrim($templateRootDirectory, '.');
+                $templateRootDirectory = \ltrim($templateRootDirectory, '/');
+
+                if (!empty($templateRepositoryName) && !empty($templateOwnerName) && !empty($templateBranch)) {
+                    // Clone template repo
+                    $tmpTemplateDirectory = '/tmp/builds/' . \escapeshellcmd($buildId) . '/template';
+                    $gitCloneCommandForTemplate = $github->generateCloneCommand($templateOwnerName, $templateRepositoryName, $templateBranch, $tmpTemplateDirectory, $templateRootDirectory);
+                    $exit = Console::execute($gitCloneCommandForTemplate, '', $stdout, $stderr);
 
                     if ($exit !== 0) {
                         throw new \Exception('Unable to clone code repository: ' . $stderr);
                     }
 
-                    // Build from template
-                    $templateRepositoryName = $template->getAttribute('repositoryName', '');
-                    $templateOwnerName = $template->getAttribute('ownerName', '');
-                    $templateBranch = $template->getAttribute('branch', '');
+                    // Ensure directories
+                    Console::execute('mkdir -p ' . $tmpTemplateDirectory . '/' . $templateRootDirectory, '', $stdout, $stderr);
+                    Console::execute('mkdir -p ' . $tmpDirectory . '/' . $rootDirectory, '', $stdout, $stderr);
 
-                    $templateRootDirectory =  $template->getAttribute('rootDirectory', '');
-                    $templateRootDirectory = \rtrim($templateRootDirectory, '/');
-                    $templateRootDirectory = \ltrim($templateRootDirectory, '.');
-                    $templateRootDirectory = \ltrim($templateRootDirectory, '/');
+                    // Merge template into user repo
+                    Console::execute('cp -rfn ' . $tmpTemplateDirectory . '/' . $templateRootDirectory . '/* ' . $tmpDirectory . '/' . $rootDirectory, '', $stdout, $stderr);
 
-                    if (!empty($templateRepositoryName) && !empty($templateOwnerName) && !empty($templateBranch)) {
-                        // Clone template repo
-                        $tmpTemplateDirectory = '/tmp/builds/' . $buildId . '/template';
-                        $gitCloneCommandForTemplate = $github->generateCloneCommand($templateOwnerName, $templateRepositoryName, $templateBranch, $tmpTemplateDirectory, $templateRootDirectory);
-                        $exit = Console::execute($gitCloneCommandForTemplate, '', $stdout, $stderr);
+                    // Commit and push
+                    $exit = Console::execute('git config --global user.email "security@appwrite.io" && git config --global user.name "Appwrite" && cd ' . $tmpDirectory . ' && git add . && git commit -m "Create \'' . \escapeshellcmd($function->getAttribute('name', '')) .  '\' function" && git push origin ' . \escapeshellcmd($branchName), '', $stdout, $stderr);
 
-                        if ($exit !== 0) {
-                            throw new \Exception('Unable to clone template repository: ' . $stderr);
-                        }
-
-                        // Ensure directories
-                        Console::execute('mkdir -p ' . $tmpTemplateDirectory . '/' . $templateRootDirectory, '', $stdout, $stderr);
-                        Console::execute('mkdir -p ' . $tmpDirectory . '/' . $rootDirectory, '', $stdout, $stderr);
-
-                        // Merge template into user repo
-                        Console::execute('cp -rfn ' . $tmpTemplateDirectory . '/' . $templateRootDirectory . '/* ' . $tmpDirectory . '/' . $rootDirectory, '', $stdout, $stderr);
-
-                        // Commit and push
-                        $exit = Console::execute('git config --global user.email "security@appwrite.io" && git config --global user.name "Appwrite" && cd ' . $tmpDirectory . ' && git add . && git commit -m "Create \'' . $function->getAttribute('name', '') .  '\' function" && git push origin ' . $branchName, '', $stdout, $stderr);
-
-                        if ($exit !== 0) {
-                            throw new \Exception('Unable to push code repository: ' . $stderr);
-                        }
-
-                        $exit = Console::execute('cd ' . $tmpDirectory . ' && git rev-parse HEAD', '', $stdout, $stderr);
-
-                        if ($exit !== 0) {
-                            throw new \Exception('Unable to get vcs commit SHA: ' . $stderr);
-                        }
-
-                        $providerCommitHash = \trim($stdout);
-                        $authorUrl = "https://github.com/$cloneOwner";
-
-                        $deployment->setAttribute('providerCommitHash', $providerCommitHash ?? '');
-                        $deployment->setAttribute('providerCommitAuthorUrl', $authorUrl);
-                        $deployment->setAttribute('providerCommitAuthor', 'Appwrite');
-                        $deployment->setAttribute('providerCommitMessage', "Create '" .  $function->getAttribute('name', '') . "' function");
-                        $deployment->setAttribute('providerCommitUrl', "https://github.com/$cloneOwner/$cloneRepository/commit/$providerCommitHash");
-                        $deployment = $dbForProject->updateDocument('deployments', $deployment->getId(), $deployment);
-
-                        /**
-                         * Send realtime Event
-                         */
-                        $target = Realtime::fromPayload(
-                            // Pass first, most verbose event pattern
-                            event: $allEvents[0],
-                            payload: $build,
-                            project: $project
-                        );
-                        Realtime::send(
-                            projectId: 'console',
-                            payload: $build->getArrayCopy(),
-                            events: $allEvents,
-                            channels: $target['channels'],
-                            roles: $target['roles']
-                        );
+                    if ($exit !== 0) {
+                        throw new \Exception('Unable to push code repository: ' . $stderr);
                     }
 
-                    Console::execute('tar --exclude code.tar.gz -czf /tmp/builds/' . $buildId . '/code.tar.gz -C /tmp/builds/' . $buildId . '/code' . (empty($rootDirectory) ? '' : '/' . $rootDirectory) . ' .', '', $stdout, $stderr);
+                    $exit = Console::execute('cd ' . $tmpDirectory . ' && git rev-parse HEAD', '', $stdout, $stderr);
 
-                    $deviceFunctions = $this->getFunctionsDevice($project->getId());
-
-                    $fileName = 'code.tar.gz';
-                    $fileTmpName = '/tmp/builds/' . $buildId . '/code.tar.gz';
-
-                    $path = $deviceFunctions->getPath($deployment->getId() . '.' . \pathinfo($fileName, PATHINFO_EXTENSION));
-
-                    $result = $deviceFunctions->move($fileTmpName, $path);
-
-                    if (!$result) {
-                        throw new \Exception("Unable to move file");
+                    if ($exit !== 0) {
+                        throw new \Exception('Unable to get vcs commit SHA: ' . $stderr);
                     }
 
-                    Console::execute('rm -rf /tmp/builds/' . $buildId, '', $stdout, $stderr);
+                    $providerCommitHash = \trim($stdout);
+                    $authorUrl = "https://github.com/$cloneOwner";
 
-                    $source = $path;
+                    $deployment->setAttribute('providerCommitHash', $providerCommitHash ?? '');
+                    $deployment->setAttribute('providerCommitAuthorUrl', $authorUrl);
+                    $deployment->setAttribute('providerCommitAuthor', 'Appwrite');
+                    $deployment->setAttribute('providerCommitMessage', "Create '" .  $function->getAttribute('name', '') . "' function");
+                    $deployment->setAttribute('providerCommitUrl', "https://github.com/$cloneOwner/$cloneRepository/commit/$providerCommitHash");
+                    $deployment = $dbForProject->updateDocument('deployments', $deployment->getId(), $deployment);
 
-                    $build = $dbForProject->updateDocument('builds', $build->getId(), $build->setAttribute('source', $source));
-
-                    if ($isVcsEnabled) {
-                        $this->runGitAction('processing', $github, $providerCommitHash, $owner, $repositoryName, $project, $function, $deployment->getId(), $dbForProject, $dbForConsole);
-                    }
+                    /**
+                     * Send realtime Event
+                     */
+                    $target = Realtime::fromPayload(
+                        // Pass first, most verbose event pattern
+                        event: $allEvents[0],
+                        payload: $build,
+                        project: $project
+                    );
+                    Realtime::send(
+                        projectId: 'console',
+                        payload: $build->getArrayCopy(),
+                        events: $allEvents,
+                        channels: $target['channels'],
+                        roles: $target['roles']
+                    );
                 }
+
+                Console::execute('tar --exclude code.tar.gz -czf /tmp/builds/' . \escapeshellcmd($buildId) . '/code.tar.gz -C /tmp/builds/' . \escapeshellcmd($buildId) . '/code' . (empty($rootDirectory) ? '' : '/' . $rootDirectory) . ' .', '', $stdout, $stderr);
+
+                $deviceFunctions = $this->getFunctionsDevice($project->getId());
+
+                $fileName = 'code.tar.gz';
+                $fileTmpName = '/tmp/builds/' . $buildId . '/code.tar.gz';
+
+                $path = $deviceFunctions->getPath($deployment->getId() . '.' . \pathinfo($fileName, PATHINFO_EXTENSION));
+
+                $result = $deviceFunctions->move($fileTmpName, $path);
+
+                if (!$result) {
+                    throw new \Exception("Unable to move file");
+                }
+
+                Console::execute('rm -rf /tmp/builds/' . \escapeshellcmd($buildId), '', $stdout, $stderr);
+
+                $source = $path;
+
+                $build = $dbForProject->updateDocument('builds', $build->getId(), $build->setAttribute('source', $source));
+
+                $this->runGitAction('processing', $github, $providerCommitHash, $owner, $repositoryName, $project, $function, $deployment->getId(), $dbForProject, $dbForConsole);
             }
 
             /** Request the executor to build the code... */
@@ -330,14 +326,15 @@ class BuildsV1 extends Worker
 
             $vars = [];
 
-            // global vars
-            $vars = \array_merge($vars, \array_reduce($dbForProject->find('variables', [
+            // Global vars
+            $varsFromProject = $dbForProject->find('variables', [
                 Query::equal('resourceType', ['project']),
                 Query::limit(APP_LIMIT_SUBQUERY)
-            ]), function (array $carry, Document $var) {
-                $carry[$var->getAttribute('key')] = $var->getAttribute('value') ?? '';
-                return $carry;
-            }, []));
+            ]);
+
+            foreach ($varsFromProject as $var) {
+                $vars[$var->getAttribute('key')] = $var->getAttribute('value') ?? '';
+            }
 
             // Function vars
             $vars = \array_merge($vars, array_reduce($function->getAttribute('vars', []), function (array $carry, Document $var) {
@@ -368,11 +365,11 @@ class BuildsV1 extends Worker
                     Co\go(function () use (&$response, $project, $deployment, $source, $function, $runtime, $vars, $command, &$err) {
                         try {
                             $response = $this->executor->createRuntime(
-                                projectId: $project->getId(),
                                 deploymentId: $deployment->getId(),
+                                projectId: $project->getId(),
                                 source: $source,
-                                version: $function->getAttribute('version'),
                                 image: $runtime['image'],
+                                version: $function->getAttribute('version'),
                                 remove: true,
                                 entrypoint: $deployment->getAttribute('entrypoint'),
                                 destination: APP_STORAGE_BUILDS . "/app-{$project->getId()}",
@@ -386,8 +383,8 @@ class BuildsV1 extends Worker
                     Co\go(function () use ($project, $deployment, &$response, &$build, $dbForProject, $allEvents, &$err) {
                         try {
                             $this->executor->getLogs(
-                                projectId: $project->getId(),
                                 deploymentId: $deployment->getId(),
+                                projectId: $project->getId(),
                                 callback: function ($logs) use (&$response, &$build, $dbForProject, $allEvents, $project) {
                                     if ($response === null) {
                                         $build = $build->setAttribute('logs', $build->getAttribute('logs', '') . $logs);
@@ -454,15 +451,12 @@ class BuildsV1 extends Worker
             /** Update function schedule */
             $dbForConsole = $this->getConsoleDB();
             // Inform scheduler if function is still active
-            $scheduleId = $function->getAttribute('scheduleId', '');
-            if (!empty($scheduleId)) {
-                $schedule = $dbForConsole->getDocument('schedules', $scheduleId);
-                $schedule
-                    ->setAttribute('resourceUpdatedAt', DateTime::now())
-                    ->setAttribute('schedule', $function->getAttribute('schedule'))
-                    ->setAttribute('active', !empty($function->getAttribute('schedule')) && !empty($function->getAttribute('deployment')));
-                Authorization::skip(fn () => $dbForConsole->updateDocument('schedules', $schedule->getId(), $schedule));
-            }
+            $schedule = $dbForConsole->getDocument('schedules', $function->getAttribute('scheduleId'));
+            $schedule
+                ->setAttribute('resourceUpdatedAt', DateTime::now())
+                ->setAttribute('schedule', $function->getAttribute('schedule'))
+                ->setAttribute('active', !empty($function->getAttribute('schedule')) && !empty($function->getAttribute('deployment')));
+            Authorization::skip(fn () => $dbForConsole->updateDocument('schedules', $schedule->getId(), $schedule));
         } catch (\Throwable $th) {
             $endTime = DateTime::now();
             $durationEnd = \microtime(true);
@@ -471,6 +465,8 @@ class BuildsV1 extends Worker
             $build->setAttribute('status', 'failed');
             $build->setAttribute('logs', $th->getMessage());
             Console::error($th->getMessage());
+            Console::error($th->getFile() . ':' . $th->getLine());
+            Console::error($th->getTraceAsString());
 
             if ($isVcsEnabled) {
                 $this->runGitAction('failed', $github, $providerCommitHash, $owner, $repositoryName, $project, $function, $deployment->getId(), $dbForProject, $dbForConsole);
@@ -482,7 +478,7 @@ class BuildsV1 extends Worker
              * Send realtime Event
              */
             $target = Realtime::fromPayload(
-                // Pass first, most verbose event pattern
+            // Pass first, most verbose event pattern
                 event: $allEvents[0],
                 payload: $build,
                 project: $project
@@ -494,22 +490,26 @@ class BuildsV1 extends Worker
                 channels: $target['channels'],
                 roles: $target['roles']
             );
-        }
 
-        /** Trigger usage queue */
-        $this
-            ->getUsageQueue()
-            ->setProject($project)
-            ->addMetric(METRIC_BUILDS, 1) // per project
-            ->addMetric(METRIC_BUILDS_STORAGE, $build->getAttribute('size', 0))
-            ->addMetric(METRIC_BUILDS_COMPUTE, (int)$build->getAttribute('duration', 0) * 1000)
-            ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS), 1) // per function
-            ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS_STORAGE), $build->getAttribute('size', 0))
-            ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS_COMPUTE), (int)$build->getAttribute('duration', 0) * 1000)
-            ->trigger();
+            /** Update usage stats */
+            if (App::getEnv('_APP_USAGE_STATS', 'enabled') === 'enabled') {
+                $statsd = $register->get('statsd');
+                $usage = new Stats($statsd);
+                $usage
+                    ->setParam('projectInternalId', $project->getInternalId())
+                    ->setParam('projectId', $project->getId())
+                    ->setParam('functionId', $function->getId())
+                    ->setParam('builds.{scope}.compute', 1)
+                    ->setParam('buildStatus', $build->getAttribute('status', ''))
+                    ->setParam('buildTime', $build->getAttribute('duration'))
+                    ->setParam('networkRequestSize', 0)
+                    ->setParam('networkResponseSize', 0)
+                    ->submit();
+            }
+        }
     }
 
-    protected function runGitAction(string $status, GitHub $github, string $providerCommitHash, string $owner, string $repositoryName, Document $project, Document $function, string $deploymentId, Database $dbForProject, Database $dbForConsole)
+    protected function runGitAction(string $status, GitHub $github, string $providerCommitHash, string $owner, string $repositoryName, Document $project, Document $function, string $deploymentId, Database $dbForProject, Database $dbForConsole): void
     {
         if ($function->getAttribute('providerSilentMode', false) === true) {
             return;
@@ -550,7 +550,7 @@ class BuildsV1 extends Worker
         if (!empty($commentId)) {
             $retries = 0;
 
-            while ($retries < 10) {
+            while (true) {
                 $retries++;
 
                 try {
@@ -562,27 +562,20 @@ class BuildsV1 extends Worker
                     if ($retries >= 9) {
                         throw $err;
                     }
-                }
 
-                \sleep(1);
+                    \sleep(1);
+                }
             }
 
-            // Wrap in try/catch to ensure lock file gets deleted
-            $error = null;
+            // Wrap in try/finally to ensure lock file gets deleted
             try {
                 $comment = new Comment();
                 $comment->parseComment($github->getComment($owner, $repositoryName, $commentId));
                 $comment->addBuild($project, $function, $status, $deployment->getId(), ['type' => 'logs']);
                 $github->updateComment($owner, $repositoryName, $commentId, $comment->generateComment());
-            } catch (\Exception $e) {
-                $error = $e;
             } finally {
                 $dbForConsole->deleteDocument('vcsCommentLocks', $commentId);
             }
-
-            if (!empty($error)) {
-                throw $error;
-            }
         }
     }
 

app/workers/functions.php

@@ -2,18 +2,18 @@
 
 require_once __DIR__ . '/../worker.php';
 
-use Appwrite\Event\Usage;
+use Domnikl\Statsd\Client;
 use Utopia\Queue\Message;
 use Appwrite\Event\Event;
 use Appwrite\Event\Func;
 use Appwrite\Messaging\Adapter\Realtime;
+use Appwrite\Usage\Stats;
 use Appwrite\Utopia\Response\Model\Execution;
 use Executor\Executor;
 use Utopia\App;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
-use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -31,7 +31,7 @@ Server::setResource('execute', function () {
         Log $log,
         Func $queueForFunctions,
         Database $dbForProject,
-        Usage $queueForUsage,
+        Client $statsd,
         Document $project,
         Document $function,
         string $trigger,
@@ -47,7 +47,6 @@ Server::setResource('execute', function () {
     ) {
         $user ??= new Document();
         $functionId = $function->getId();
-        $functionInternalId = $function->getInternalId();
         $deploymentId = $function->getAttribute('deployment', '');
 
         $log->addTag('functionId', $functionId);
@@ -55,7 +54,6 @@ Server::setResource('execute', function () {
 
         /** Check if deployment exists */
         $deployment = $dbForProject->getDocument('deployments', $deploymentId);
-        $deploymentInternalId = $deployment->getInternalId();
 
         if ($deployment->getAttribute('resourceId') !== $functionId) {
             throw new Exception('Deployment not found. Create deployment before trying to execute a function');
@@ -129,14 +127,6 @@ Server::setResource('execute', function () {
             if ($execution->isEmpty()) {
                 throw new Exception('Failed to create or read execution');
             }
-
-            /**
-             * Usage
-             */
-
-            $queueForUsage
-                ->addMetric(METRIC_EXECUTIONS, 1) // per project
-                ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS), 1); // per function
         }
 
         if ($execution->getAttribute('status') !== 'processing') {
@@ -186,13 +176,13 @@ Server::setResource('execute', function () {
             $executionResponse = $executor->createExecution(
                 projectId: $project->getId(),
                 deploymentId: $deploymentId,
-                version: $function->getAttribute('version'),
                 body: \strlen($body) > 0 ? $body : null,
                 variables: $vars,
                 timeout: $function->getAttribute('timeout', 0),
                 image: $runtime['image'],
                 source: $build->getAttribute('path', ''),
                 entrypoint: $deployment->getAttribute('entrypoint', ''),
+                version: $function->getAttribute('version'),
                 path: $path,
                 method: $method,
                 headers: $headers,
@@ -275,13 +265,24 @@ Server::setResource('execute', function () {
             roles: $target['roles']
         );
 
-        /** Trigger usage queue */
-        $queueForUsage
-            ->setProject($project)
-            ->addMetric(METRIC_EXECUTIONS_COMPUTE, (int)($execution->getAttribute('duration') * 1000))// per project
-            ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_COMPUTE), (int)($execution->getAttribute('duration') * 1000))
-            ->trigger()
-        ;
+        /** Update usage stats */
+        if (App::getEnv('_APP_USAGE_STATS', 'enabled') === 'enabled') {
+            $usage = new Stats($statsd);
+            $usage
+                ->setParam('projectId', $project->getId())
+                ->setParam('projectInternalId', $project->getInternalId())
+                ->setParam('functionId', $function->getId()) // TODO: We should use functionInternalId in usage stats
+                ->setParam('executions.{scope}.compute', 1)
+                ->setParam('executionStatus', $execution->getAttribute('status', ''))
+                ->setParam('executionTime', $execution->getAttribute('duration'))
+                ->setParam('networkRequestSize', 0)
+                ->setParam('networkResponseSize', 0)
+                ->submit();
+        }
+
+        if (!empty($error)) {
+            throw new Exception($error, $errorCode);
+        }
     };
 });
 
@@ -289,10 +290,10 @@ $server->job()
     ->inject('message')
     ->inject('dbForProject')
     ->inject('queueForFunctions')
-    ->inject('queueForUsage')
+    ->inject('statsd')
     ->inject('execute')
     ->inject('log')
-    ->action(function (Message $message, Database $dbForProject, Func $queueForFunctions, Usage $queueForUsage, callable $execute, Log $log) {
+    ->action(function (Message $message, Database $dbForProject, Func $queueForFunctions, Client $statsd, callable $execute, Log $log) {
         $payload = $message->getPayload() ?? [];
 
         if (empty($payload)) {
@@ -334,7 +335,7 @@ $server->job()
                     }
                     Console::success('Iterating function: ' . $function->getAttribute('name'));
                     $execute(
-                        queueForUsage: $queueForUsage,
+                        statsd: $statsd,
                         dbForProject: $dbForProject,
                         project: $project,
                         function: $function,
@@ -382,7 +383,7 @@ $server->job()
                     path: $payload['path'],
                     method: $payload['method'],
                     headers: $payload['headers'],
-                    queueForUsage: $queueForUsage,
+                    statsd: $statsd,
                 );
                 break;
             case 'schedule':
@@ -402,7 +403,7 @@ $server->job()
                     path: $payload['path'],
                     method: $payload['method'],
                     headers: $payload['headers'],
-                    queueForUsage: $queueForUsage,
+                    statsd: $statsd,
                 );
                 break;
         }

app/workers/migrations.php

@@ -60,7 +60,7 @@ class MigrationsV1 extends Worker
             return;
         }
 
-        $this->dbForProject = $this->getProjectDB(new Document($this->args['project']));
+        $this->dbForProject = $this->getProjectDB($project);
 
         $this->processMigration();
     }

app/workers/usage.php

@@ -1,288 +0,0 @@
-<?php
-
-require_once __DIR__ . '/../worker.php';
-
-use Swoole\Timer;
-use Utopia\App;
-use Utopia\Cache\Cache;
-use Utopia\Database\Database;
-use Utopia\Database\DateTime;
-use Utopia\Database\Document;
-use Utopia\Database\Exception\Duplicate;
-use Utopia\Database\Validator\Authorization;
-use Utopia\Queue\Message;
-use Utopia\CLI\Console;
-use Utopia\Queue\Server;
-use Utopia\Registry\Registry;
-
-Authorization::disable();
-Authorization::setDefaultStatus(false);
-
-$stats = [];
-
-$periods['1h']  = 'Y-m-d H:00';
-$periods['1d']  = 'Y-m-d 00:00';
-//$periods['1m']  = 'Y-m-1 00:00';
-$periods['inf'] = '0000-00-00 00:00';
-
-const INFINITY_PERIOD = '_inf_';
-
-/**
- * On Documents that tied by relations like functions>deployments>build || documents>collection>database || buckets>files.
- * When we remove a parent document we need to deduct his children aggregation from the project scope.
- */
-Server::setResource('reduce', function (Cache $cache, Registry $register, $pools) {
-    return function ($database, $projectInternalId, Document $document, array &$metrics) use ($pools, $cache, $register): void {
-        try {
-            $dbForProject = new Database(
-                $pools
-                    ->get($database)
-                    ->pop()
-                    ->getResource(),
-                $cache
-            );
-
-            $dbForProject->setNamespace('_' . $projectInternalId);
-
-            switch (true) {
-                case $document->getCollection() === 'users': // users
-                    $sessions = count($document->getAttribute(METRIC_SESSIONS, 0));
-                    if (!empty($sessions)) {
-                        $metrics[] = [
-                            'key' => METRIC_SESSIONS,
-                            'value' => ($sessions * -1),
-                        ];
-                    }
-                    break;
-                case $document->getCollection() === 'databases': // databases
-                    $collections = $dbForProject->getDocument('stats', md5(INFINITY_PERIOD . str_replace('{databaseInternalId}', $document->getInternalId(), METRIC_DATABASE_ID_COLLECTIONS)));
-                    $documents = $dbForProject->getDocument('stats', md5(INFINITY_PERIOD . str_replace('{databaseInternalId}', $document->getInternalId(), METRIC_DATABASE_ID_DOCUMENTS)));
-                    if (!empty($collections['value'])) {
-                        $metrics[] = [
-                            'key' => METRIC_COLLECTIONS,
-                            'value' => ($collections['value'] * -1),
-                        ];
-                    }
-
-                    if (!empty($documents['value'])) {
-                        $metrics[] = [
-                            'key' => METRIC_DOCUMENTS,
-                            'value' => ($documents['value'] * -1),
-                        ];
-                    }
-                    break;
-                case str_starts_with($document->getCollection(), 'database_') && !str_contains($document->getCollection(), 'collection'): //collections
-                    $parts = explode('_', $document->getCollection());
-                    $databaseInternalId = $parts[1] ?? 0;
-                    $documents = $dbForProject->getDocument('stats', md5(INFINITY_PERIOD . str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId, $document->getInternalId()], METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS)));
-
-                    if (!empty($documents['value'])) {
-                        $metrics[] = [
-                            'key' => METRIC_DOCUMENTS,
-                            'value' => ($documents['value'] * -1),
-                        ];
-                        $metrics[] = [
-                            'key' => str_replace('{databaseInternalId}', $databaseInternalId, METRIC_DATABASE_ID_DOCUMENTS),
-                            'value' => ($documents['value'] * -1),
-                        ];
-                    }
-                    break;
-
-                case $document->getCollection() === 'buckets':
-                    $files = $dbForProject->getDocument('stats', md5(INFINITY_PERIOD . str_replace('{bucketInternalId}', $document->getInternalId(), METRIC_BUCKET_ID_FILES)));
-                    $storage = $dbForProject->getDocument('stats', md5(INFINITY_PERIOD . str_replace('{bucketInternalId}', $document->getInternalId(), METRIC_BUCKET_ID_FILES_STORAGE)));
-
-                    if (!empty($files['value'])) {
-                        $metrics[] = [
-                            'key' => METRIC_FILES,
-                            'value' => ($files['value'] * -1),
-                        ];
-                    }
-
-                    if (!empty($storage['value'])) {
-                        $metrics[] = [
-                            'key' => METRIC_FILES_STORAGE,
-                            'value' => ($storage['value'] * -1),
-                        ];
-                    }
-                    break;
-
-                case $document->getCollection() === 'functions':
-                    $deployments = $dbForProject->getDocument('stats', md5(INFINITY_PERIOD . str_replace(['{resourceType}', '{resourceInternalId}'], ['functions', $document->getInternalId()], METRIC_FUNCTION_ID_DEPLOYMENTS)));
-                    $deploymentsStorage = $dbForProject->getDocument('stats', md5(INFINITY_PERIOD . str_replace(['{resourceType}', '{resourceInternalId}'], ['functions', $document->getInternalId()], METRIC_FUNCTION_ID_DEPLOYMENTS_STORAGE)));
-                    $builds = $dbForProject->getDocument('stats', md5(INFINITY_PERIOD .  str_replace('{functionInternalId}', $document->getInternalId(), METRIC_FUNCTION_ID_BUILDS)));
-                    $buildsStorage = $dbForProject->getDocument('stats', md5(INFINITY_PERIOD . str_replace('{functionInternalId}', $document->getInternalId(), METRIC_FUNCTION_ID_BUILDS_STORAGE)));
-                    $buildsCompute = $dbForProject->getDocument('stats', md5(INFINITY_PERIOD . str_replace('{functionInternalId}', $document->getInternalId(), METRIC_FUNCTION_ID_BUILDS_COMPUTE)));
-                    $executions = $dbForProject->getDocument('stats', md5(INFINITY_PERIOD .  str_replace('{functionInternalId}', $document->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS)));
-                    $executionsCompute = $dbForProject->getDocument('stats', md5(INFINITY_PERIOD . str_replace('{functionInternalId}', $document->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_COMPUTE)));
-
-                    if (!empty($deployments['value'])) {
-                        $metrics[] = [
-                            'key' => METRIC_DEPLOYMENTS,
-                            'value' => ($deployments['value'] * -1),
-                        ];
-                    }
-
-                    if (!empty($deploymentsStorage['value'])) {
-                        $metrics[] = [
-                            'key' => METRIC_DEPLOYMENTS_STORAGE,
-                            'value' => ($deploymentsStorage['value'] * -1),
-                        ];
-                    }
-
-                    if (!empty($builds['value'])) {
-                        $metrics[] = [
-                            'key' => METRIC_BUILDS,
-                            'value' => ($builds['value'] * -1),
-                        ];
-                    }
-
-                    if (!empty($buildsStorage['value'])) {
-                        $metrics[] = [
-                            'key' => METRIC_BUILDS_STORAGE,
-                            'value' => ($buildsStorage['value'] * -1),
-                        ];
-                    }
-
-                    if (!empty($buildsCompute['value'])) {
-                        $metrics[] = [
-                            'key' => METRIC_BUILDS_COMPUTE,
-                            'value' => ($buildsCompute['value'] * -1),
-                        ];
-                    }
-
-                    if (!empty($executions['value'])) {
-                        $metrics[] = [
-                            'key' => METRIC_EXECUTIONS,
-                            'value' => ($executions['value'] * -1),
-                        ];
-                    }
-
-                    if (!empty($executionsCompute['value'])) {
-                        $metrics[] = [
-                            'key' => METRIC_EXECUTIONS_COMPUTE,
-                            'value' => ($executionsCompute['value'] * -1),
-                        ];
-                    }
-                    break;
-                default:
-                    break;
-            }
-        } catch (\Exception $e) {
-            console::error("[reducer] " . " {DateTime::now()} " .  " {$projectInternalId} " . " {$e->getMessage()}");
-        } finally {
-            $pools->reclaim();
-        }
-    };
-}, ['cache', 'register', 'pools']);
-
-
-$server->job()
-    ->inject('message')
-    ->inject('reduce')
-
-    ->action(function (Message $message, callable $reduce) use (&$stats) {
-
-        $payload = $message->getPayload() ?? [];
-        $project = new Document($payload['project'] ?? []);
-        $projectId = $project->getInternalId();
-        foreach ($payload['reduce'] ?? [] as $document) {
-            if (empty($document)) {
-                continue;
-            }
-
-             $reduce(
-                 database: $project->getAttribute('database'),
-                 projectInternalId: $project->getInternalId(),
-                 document: new Document($document),
-                 metrics:  $payload['metrics'],
-             );
-        }
-
-        $stats[$projectId]['database'] = $project->getAttribute('database');
-        foreach ($payload['metrics'] ?? [] as $metric) {
-            if (!isset($stats[$projectId]['keys'][$metric['key']])) {
-                $stats[$projectId]['keys'][$metric['key']] = $metric['value'];
-                continue;
-            }
-            $stats[$projectId]['keys'][$metric['key']] += $metric['value'];
-        }
-    });
-
-$server
-    ->workerStart()
-    ->inject('register')
-    ->inject('cache')
-    ->inject('pools')
-    ->action(function ($register, $cache, $pools) use ($periods, &$stats) {
-        Timer::tick(30000, function () use ($register, $cache, $pools, $periods, &$stats) {
-
-            $offset = count($stats);
-            $projects = array_slice($stats, 0, $offset, true);
-            array_splice($stats, 0, $offset);
-
-            foreach ($projects as $projectInternalId => $project) {
-                try {
-                    $dbForProject = new Database(
-                        $pools
-                        ->get($project['database'])
-                        ->pop()
-                        ->getResource(),
-                        $cache
-                    );
-
-                    $dbForProject->setNamespace('_' . $projectInternalId);
-
-                    foreach ($project['keys'] ?? [] as $key => $value) {
-                        if ($value == 0) {
-                            continue;
-                        }
-
-                        foreach ($periods as $period => $format) {
-                            $time = 'inf' === $period ? null : date($format, time());
-                            $id = \md5("{$time}_{$period}_{$key}");
-
-                            try {
-                                $dbForProject->createDocument('stats', new Document([
-                                    '$id' => $id,
-                                    'period' => $period,
-                                    'time' => $time,
-                                    'metric' => $key,
-                                    'value' => $value,
-                                    'region' => App::getEnv('_APP_REGION', 'default'),
-                                ]));
-                            } catch (Duplicate $th) {
-                                if ($value < 0) {
-                                    $dbForProject->decreaseDocumentAttribute(
-                                        'stats',
-                                        $id,
-                                        'value',
-                                        abs($value)
-                                    );
-                                } else {
-                                    $dbForProject->increaseDocumentAttribute(
-                                        'stats',
-                                        $id,
-                                        'value',
-                                        $value
-                                    );
-                                }
-                            }
-                        }
-                    }
-                    if (!empty($project['keys'])) {
-                        $dbForProject->createDocument('statsLogger', new Document([
-                            'time' => DateTime::now(),
-                            'metrics' => $project['keys'],
-                        ]));
-                    }
-                } catch (\Exception $e) {
-                    $now = DateTime::now();
-                    console::error("[Error] " . " Time: {$now} " .  " projectInternalId: {$projectInternalId}" . " File: {$e->getFile()}" . " Line: {$e->getLine()} " . " message: {$e->getMessage()}");
-                } finally {
-                    $pools->reclaim();
-                }
-            }
-        });
-    });
-$server->start();

bin/usage

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+php /usr/src/code/app/cli.php usage $@

bin/worker-usage

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-QUEUE=v1-usage php /usr/src/code/app/workers/usage.php $@

composer.json

@@ -43,14 +43,14 @@
         "ext-sockets": "*",
         "appwrite/php-runtimes": "0.12.0",
         "appwrite/php-clamav": "2.0.*",
-        "utopia-php/abuse": "0.27.*",
+        "utopia-php/abuse": "0.31.*",
         "utopia-php/analytics": "0.10.*",
-        "utopia-php/audit": "0.29.*",
+        "utopia-php/audit": "0.33.*",
         "utopia-php/cache": "0.8.*",
         "utopia-php/cli": "0.15.*",
         "utopia-php/config": "0.2.*",
-        "utopia-php/database": "0.38.*",
-        "utopia-php/domains": "1.1.*",
+        "utopia-php/database": "0.42.*",
+        "utopia-php/domains": "0.3.*",
         "utopia-php/framework": "0.30.0",
         "utopia-php/dsn": "0.1.*",
         "utopia-php/image": "0.5.*",
@@ -65,18 +65,19 @@
         "utopia-php/registry": "0.5.*",
         "utopia-php/storage": "0.14.*",
         "utopia-php/swoole": "0.5.*",
-        "utopia-php/vcs": "0.1.*",
+        "utopia-php/vcs": "0.2.*",
         "utopia-php/websocket": "0.1.*",
         "resque/php-resque": "1.3.6",
         "matomo/device-detector": "6.1.*",
         "dragonmantank/cron-expression": "3.3.2",
+        "influxdb/influxdb-php": "1.15.2",
         "phpmailer/phpmailer": "6.8.0",
         "chillerlan/php-qrcode": "4.3.4",
         "adhocore/jwt": "1.1.2",
         "webonyx/graphql-php": "14.11.*",
         "slickdeals/statsd": "3.1.0",
         "league/csv": "9.7.1",
-        "utopia-php/migration": "^0.2.0"
+        "utopia-php/migration": "^0.3.0"
     },
     "repositories": [
         {
@@ -85,7 +86,7 @@
         }
     ],
     "require-dev": {
-        "appwrite/sdk-generator": "dev-master as 0.33.99",
+        "appwrite/sdk-generator": "0.34.*",
         "ext-fileinfo": "*",
         "phpunit/phpunit": "9.5.20",
         "squizlabs/php_codesniffer": "^3.7",

docker-compose.yml

@@ -72,8 +72,6 @@ services:
       - traefik.http.routers.appwrite_api_https.rule=PathPrefix(`/`)
       - traefik.http.routers.appwrite_api_https.service=appwrite_api
       - traefik.http.routers.appwrite_api_https.tls=true
-      - traefik.http.routers.appwrite_api_https.tls.domains[0].main=$_APP_DOMAIN_FUNCTIONS
-      - traefik.http.routers.appwrite_api_https.tls.domains[0].sans=*.$_APP_DOMAIN_FUNCTIONS
     volumes:
       - appwrite-uploads:/storage/uploads:rw
       - appwrite-cache:/storage/cache:rw
@@ -86,7 +84,7 @@ services:
       - ./docs:/usr/src/code/docs
       - ./public:/usr/src/code/public
       - ./src:/usr/src/code/src
-      - ./dev:/usr/local/dev
+      - ./dev:/usr/src/code/dev
     depends_on:
       - mariadb
       - redis
@@ -140,6 +138,8 @@ services:
       - _APP_SMTP_PASSWORD
       - _APP_USERS_STATS_RECIPIENTS
       - _APP_USAGE_STATS
+      - _APP_INFLUXDB_HOST
+      - _APP_INFLUXDB_PORT
       - _APP_STORAGE_LIMIT
       - _APP_STORAGE_PREVIEW_LIMIT
       - _APP_STORAGE_ANTIVIRUS
@@ -156,6 +156,8 @@ services:
       - _APP_EXECUTOR_HOST
       - _APP_LOGGING_PROVIDER
       - _APP_LOGGING_CONFIG
+      - _APP_STATSD_HOST
+      - _APP_STATSD_PORT
       - _APP_MAINTENANCE_INTERVAL
       - _APP_MAINTENANCE_RETENTION_EXECUTION
       - _APP_MAINTENANCE_RETENTION_CACHE
@@ -178,6 +180,7 @@ services:
       - _APP_VCS_GITHUB_CLIENT_ID
       - _APP_MIGRATIONS_FIREBASE_CLIENT_ID
       - _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET
+      - _APP_ASSISTANT_OPENAI_API_KEY
 
   appwrite-realtime:
     entrypoint: realtime
@@ -620,11 +623,13 @@ services:
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
       - ./tests:/usr/src/code/tests
-      - ./vendor:/usr/src/code/tests
     depends_on:
       - mariadb
     environment:
       - _APP_ENV
+      - _APP_WORKER_PER_CORE
+      - _APP_CONNECTIONS_MAX
+      - _APP_POOL_CLIENTS
       - _APP_OPENSSL_KEY_V1
       - _APP_DOMAIN
       - _APP_DOMAIN_TARGET
@@ -688,18 +693,19 @@ services:
       - _APP_MAINTENANCE_RETENTION_AUDIT
       - _APP_MAINTENANCE_RETENTION_SCHEDULES
 
-  appwrite-worker-usage:
-    entrypoint: worker-usage
+  appwrite-usage:
+    entrypoint: usage
     <<: *x-logging
-    container_name: appwrite-worker-usage
+    container_name: appwrite-usage
     image: appwrite-dev
     networks:
       - appwrite
     volumes:
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
+      - ./dev:/usr/local/dev
     depends_on:
-      - redis
+      - influxdb
       - mariadb
     environment:
       - _APP_ENV
@@ -712,6 +718,9 @@ services:
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_INFLUXDB_HOST
+      - _APP_INFLUXDB_PORT
+      - _APP_USAGE_AGGREGATION_INTERVAL
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
       - _APP_REDIS_USER
@@ -760,8 +769,7 @@ services:
   appwrite-assistant:
     container_name: appwrite-assistant
     hostname: appwrite-assistant
-    image: appwrite/assistant:0.1.1
-    platform: linux/amd64
+    image: appwrite/assistant:0.1.3
     networks:
       - appwrite
     environment:
@@ -772,7 +780,7 @@ services:
     hostname: executor
     <<: *x-logging
     stop_signal: SIGINT
-    image: openruntimes/executor:0.3.1
+    image: openruntimes/executor:0.3.3
     networks:
       - appwrite
       - runtimes
@@ -869,6 +877,26 @@ services:
   #     - appwrite
   #   volumes:
   #     - appwrite-uploads:/storage/uploads
+
+  influxdb:
+    image: appwrite/influxdb:1.5.0
+    container_name: appwrite-influxdb
+    <<: *x-logging
+    networks:
+      - appwrite
+    volumes:
+      - appwrite-influxdb:/var/lib/influxdb:rw
+
+  telegraf:
+    image: appwrite/telegraf:1.4.0
+    container_name: appwrite-telegraf
+    <<: *x-logging
+    networks:
+      - appwrite
+    environment:
+      - _APP_INFLUXDB_HOST
+      - _APP_INFLUXDB_PORT
+
   # Dev Tools Start ------------------------------------------------------------------------------------------
   #
   # The Appwrite Team uses the following tools to help debug, monitor and diagnose the Appwrite stack
@@ -879,6 +907,7 @@ services:
   # RequestCatcher - An HTTP server. Catches all system https calls and displays them using a simple HTTP API. Used to debug & tests webhooks and HTTP tasks
   # RedisCommander - A nice UI for exploring Redis data
   # Resque - A nice UI for exploring Redis pub/sub, view the different queues workloads, pending and failed tasks
+  # Chronograf - A nice UI for exploring InfluxDB data
   # Webgrind - A nice UI for exploring and debugging code-level stuff
 
   maildev: # used mainly for dev tests
@@ -941,6 +970,25 @@ services:
   #     - RESQUE_WEB_PORT=6379
   #     - RESQUE_WEB_HTTP_BASIC_AUTH_USER=user
   #     - RESQUE_WEB_HTTP_BASIC_AUTH_PASSWORD=password
+
+  # chronograf:
+  #   image: chronograf:1.6
+  #   container_name: appwrite-chronograf
+  #   networks:
+  #   - appwrite
+  #   volumes:
+  #   - appwrite-chronograf:/var/lib/chronograf
+  #   ports:
+  #   - "8888:8888"
+  #   environment:
+  #   - INFLUXDB_URL=http://influxdb:8086
+  #   - KAPACITOR_URL=http://kapacitor:9092
+  #   - AUTH_DURATION=48h
+  #   - TOKEN_SECRET=duperduper5674829!jwt
+  #   - GH_CLIENT_ID=d86f7145a41eacfc52cc
+  #   - GH_CLIENT_SECRET=9e0081062367a2134e7f2ea95ba1a32d08b6c8ab
+  #   - GH_ORGS=appwrite
+
   # webgrind:
   #   image: 'jokkedk/webgrind:latest'
   #   volumes:
@@ -976,6 +1024,8 @@ volumes:
   appwrite-cache:
   appwrite-uploads:
   appwrite-certificates:
+  appwrite-influxdb:
+  appwrite-config:
   appwrite-functions:
   appwrite-builds:
-  appwrite-config:
+  # appwrite-chronograf:

docs/references/teams/update-team-membership.md

@@ -1 +1 @@
-Modify the roles of a team member. Only team members with the owner role have access to this endpoint. Learn more about [roles and permissions](/docs/permissions).
+Modify the roles of a team member. Only team members with the owner role have access to this endpoint. Learn more about [roles and permissions](/docs/permissions).

phpcs.xml

@@ -7,6 +7,8 @@
     <ini name="memory_limit" value="4096M"/>
     <!-- Exclude SDK's for performance reasons -->
     <exclude-pattern>./app/sdks</exclude-pattern>
+    <!-- Exclude functions as they are in different languages -->
+    <exclude-pattern>./tests/resources/functions</exclude-pattern>
     <!-- Exclude console -->
     <exclude-pattern>./app/console</exclude-pattern>
     <!-- Ignore max line width -->

src/Appwrite/Auth/OAuth2/Firebase.php

@@ -27,6 +27,38 @@ class Firebase extends OAuth2
         'https://www.googleapis.com/auth/userinfo.profile'
     ];
 
+    /**
+     * @var array
+     */
+    protected array $iamPermissions = [
+        // Database
+        'datastore.databases.get',
+        'datastore.databases.list',
+        'datastore.entities.get',
+        'datastore.entities.list',
+        'datastore.indexes.get',
+        'datastore.indexes.list',
+        // Generic Firebase permissions
+        'firebase.projects.get',
+
+        // Auth
+        'firebaseauth.configs.get',
+        'firebaseauth.configs.getHashConfig',
+        'firebaseauth.configs.getSecret',
+        'firebaseauth.users.get',
+        'identitytoolkit.tenants.get',
+        'identitytoolkit.tenants.list',
+
+        // IAM Assignment
+        'iam.serviceAccounts.list',
+
+        // Storage
+        'storage.buckets.get',
+        'storage.buckets.list',
+        'storage.objects.get',
+        'storage.objects.list'
+    ];
+
     /**
      * @return string
      */
@@ -198,7 +230,7 @@ class Firebase extends OAuth2
     /*
         Be careful with the setIAMPolicy method, it will overwrite all existing policies
     **/
-    public function assignIAMRoles(string $accessToken, string $email, string $projectId)
+    public function assignIAMRole(string $accessToken, string $email, string $projectId, array $role)
     {
         // Get IAM Roles
         $iamRoles = $this->request('POST', 'https://cloudresourcemanager.googleapis.com/v1/projects/' . $projectId . ':getIamPolicy', [
@@ -209,14 +241,7 @@ class Firebase extends OAuth2
         $iamRoles = \json_decode($iamRoles, true);
 
         $iamRoles['bindings'][] = [
-            'role' => 'roles/identitytoolkit.admin',
-            'members' => [
-                'serviceAccount:' . $email
-            ]
-        ];
-
-        $iamRoles['bindings'][] = [
-            'role' => 'roles/firebase.admin',
+            'role' => $role['name'],
             'members' => [
                 'serviceAccount:' . $email
             ]
@@ -226,14 +251,69 @@ class Firebase extends OAuth2
         $this->request('POST', 'https://cloudresourcemanager.googleapis.com/v1/projects/' . $projectId . ':setIamPolicy', [
             'Authorization: Bearer ' . \urlencode($accessToken),
             'Content-Type: application/json'
-        ], json_encode([
+        ], \json_encode([
             'policy' => $iamRoles
         ]));
     }
 
+    private function generateRandomString($length = 10): string
+    {
+        $characters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+        $charactersLength = strlen($characters);
+        $randomString = '';
+        for ($i = 0; $i < $length; $i++) {
+            $randomString .= $characters[random_int(0, $charactersLength - 1)];
+        }
+        return $randomString;
+    }
+
+    private function createCustomRole(string $accessToken, string $projectId): array
+    {
+        // Check if role already exists
+        try {
+            $role = $this->request('GET', 'https://iam.googleapis.com/v1/projects/' . $projectId . '/roles/appwriteMigrations', [
+                'Content-Type: application/json',
+                'Authorization: Bearer ' . \urlencode($accessToken),
+            ]);
+
+            $role = \json_decode($role, true);
+
+            return $role;
+        } catch (\Exception $e) {
+            if ($e->getCode() !== 404) {
+                throw $e;
+            }
+        }
+
+        // Create role if doesn't exist or isn't correct
+        $role = $this->request(
+            'POST',
+            'https://iam.googleapis.com/v1/projects/' . $projectId . '/roles/',
+            [
+                'Content-Type: application/json',
+                'Authorization: Bearer ' . \urlencode($accessToken),
+            ],
+            \json_encode(
+                [
+                    'roleId' => 'appwriteMigrations',
+                    'role' => [
+                        'title' => 'Appwrite Migrations',
+                        'description' => 'A helper role for Appwrite Migrations',
+                        'includedPermissions' => $this->iamPermissions,
+                        'stage' => 'GA'
+                    ]
+                ]
+            )
+        );
+
+        return json_decode($role, true);
+    }
+
     public function createServiceAccount(string $accessToken, string $projectId): array
     {
         // Create Service Account
+        $uid = $this->generateRandomString();
+
         $response = $this->request(
             'POST',
             'https://iam.googleapis.com/v1/projects/' . $projectId . '/serviceAccounts',
@@ -241,17 +321,22 @@ class Firebase extends OAuth2
                 'Authorization: Bearer ' . \urlencode($accessToken),
                 'Content-Type: application/json'
             ],
-            json_encode([
-                'accountId' => 'appwrite-migrations',
+            \json_encode([
+                'accountId' => 'appwrite-' . $uid,
                 'serviceAccount' => [
-                    'displayName' => 'Appwrite Migrations'
+                    'displayName' => 'Appwrite Migrations ' . $uid
                 ]
             ])
         );
 
         $response = json_decode($response, true);
 
-        $this->assignIAMRoles($accessToken, $response['email'], $projectId);
+        // Create and assign IAM Roles
+        $role = $this->createCustomRole($accessToken, $projectId);
+
+        \sleep(1); // Wait for IAM to propagate changes.
+
+        $this->assignIAMRole($accessToken, $response['email'], $projectId, $role);
 
         // Create Service Account Key
         $responseKey = $this->request(
@@ -267,4 +352,38 @@ class Firebase extends OAuth2
 
         return json_decode(base64_decode($responseKey['privateKeyData']), true);
     }
+
+    public function cleanupServiceAccounts(string $accessToken, string $projectId)
+    {
+        // List Service Accounts
+        $response = $this->request(
+            'GET',
+            'https://iam.googleapis.com/v1/projects/' . $projectId . '/serviceAccounts',
+            [
+                'Authorization: Bearer ' . \urlencode($accessToken),
+                'Content-Type: application/json'
+            ]
+        );
+
+        $response = json_decode($response, true);
+
+        if (empty($response['accounts'])) {
+            return false;
+        }
+
+        foreach ($response['accounts'] as $account) {
+            if (strpos($account['email'], 'appwrite-') !== false) {
+                $this->request(
+                    'DELETE',
+                    'https://iam.googleapis.com/v1/projects/' . $projectId . '/serviceAccounts/' . $account['email'],
+                    [
+                        'Authorization: Bearer ' . \urlencode($accessToken),
+                        'Content-Type: application/json'
+                    ]
+                );
+            }
+        }
+
+        return true;
+    }
 }

src/Appwrite/Extend/Exception.php

@@ -195,6 +195,7 @@ class Exception extends \Exception
 
     /** Router */
     public const ROUTER_HOST_NOT_FOUND             = 'router_host_not_found';
+    public const ROUTER_DOMAIN_NOT_CONFIGURED      = 'router_domain_not_configured';
 
     /** Proxy */
     public const RULE_RESOURCE_NOT_FOUND            = 'rule_resource_not_found';

src/Appwrite/GraphQL/Types/Mapper.php

@@ -252,6 +252,8 @@ class Mapper
             case 'Appwrite\Utopia\Database\Validator\Queries\Base':
             case 'Appwrite\Utopia\Database\Validator\Queries\Buckets':
             case 'Appwrite\Utopia\Database\Validator\Queries\Collections':
+            case 'Appwrite\Utopia\Database\Validator\Queries\Attributes':
+            case 'Appwrite\Utopia\Database\Validator\Queries\Indexes':
             case 'Appwrite\Utopia\Database\Validator\Queries\Databases':
             case 'Appwrite\Utopia\Database\Validator\Queries\Deployments':
             case 'Appwrite\Utopia\Database\Validator\Queries\Installations':

src/Appwrite/Messaging/Adapter/Realtime.php

@@ -330,6 +330,11 @@ class Realtime extends Adapter
                     $roles = [Role::team($project->getAttribute('teamId'))->toString()];
                 }
 
+                break;
+            case 'migrations':
+                $channels[] = 'console';
+                $projectId = 'console';
+                $roles = [Role::team($project->getAttribute('teamId'))->toString()];
                 break;
         }
 

src/Appwrite/Migration/Migration.php

@@ -369,7 +369,7 @@ abstract class Migration
         $indexKey = array_search($indexId, array_column($indexes, '$id'));
 
         if ($indexKey === false) {
-            throw new Exception("Attribute {$indexId} not found");
+            throw new Exception("Index {$indexId} not found");
         }
 
         $index = $indexes[$indexKey];

src/Appwrite/Migration/Version/V19.php

@@ -40,6 +40,22 @@ class V19 extends Migration
 
         Console::info('Migrating Documents');
         $this->forEachDocument([$this, 'fixDocument']);
+
+        try {
+            $this->projectDB->deleteAttribute('projects', 'domains');
+            $this->projectDB->deleteCachedCollection('projects');
+        } catch (\Throwable $th) {
+            Console::warning("'domains' from projects: {$th->getMessage()}");
+        }
+
+        try {
+            $this->projectDB->deleteAttribute('functions', 'schedule');
+            $this->projectDB->deleteCachedCollection('functions');
+        } catch (\Throwable $th) {
+            Console::warning("'schedule' from functions: {$th->getMessage()}");
+        }
+
+        // TODO: delete builds stderr and stdout
     }
 
     /**
@@ -91,7 +107,8 @@ class V19 extends Migration
                 case '_metadata':
                     $this->createCollection('identities');
                     $this->createCollection('migrations');
-                    $this->createCollection('statsLogger'); // TODO: should we do this now?
+                    // Holding off on this until a future release
+                    // $this->createCollection('statsLogger');
                     break;
                 case 'attributes':
                 case 'indexes':
@@ -115,15 +132,46 @@ class V19 extends Migration
                         Console::warning("'error' from {$id}: {$th->getMessage()}");
                     }
                     break;
+                case 'buckets':
+                    // Recreate indexes so they're the right size
+                    $indexesToDelete = [
+                        '_key_name',
+                    ];
+                    foreach ($indexesToDelete as $index) {
+                        try {
+                            $this->projectDB->deleteIndex($id, $index);
+                            $this->projectDB->deleteCachedCollection($id);
+                        } catch (\Throwable $th) {
+                            Console::warning("'$index' from {$id}: {$th->getMessage()}");
+                        }
+                    }
+
+                    $indexesToCreate = [
+                        ...$indexesToDelete
+                    ];
+                    foreach ($indexesToCreate as $index) {
+                        try {
+                            $this->createIndexFromCollection($this->projectDB, $id, $index);
+                            $this->projectDB->deleteCachedCollection($id);
+                        } catch (\Throwable $th) {
+                            Console::warning("'$index' from {$id}: {$th->getMessage()}");
+                        }
+                    }
+                    break;
                 case 'builds':
                     try {
                         $this->createAttributeFromCollection($this->projectDB, $id, 'deploymentInternalId');
                         $this->projectDB->deleteCachedCollection($id);
-
-                        // TODO: stderr and stdout => logs
                     } catch (\Throwable $th) {
                         Console::warning("'deploymentInternalId' from {$id}: {$th->getMessage()}");
                     }
+
+                    try {
+                        $this->createAttributeFromCollection($this->projectDB, $id, 'logs');
+                        $this->projectDB->deleteCachedCollection($id);
+                    } catch (\Throwable $th) {
+                        Console::warning("'logs' from {$id}: {$th->getMessage()}");
+                    }
                     break;
                 case 'certificates':
                     try {
@@ -149,18 +197,48 @@ class V19 extends Migration
                     }
                     break;
                 case 'deployments':
-                    try {
-                        $this->createAttributeFromCollection($this->projectDB, $id, 'resourceInternalId');
-                        $this->projectDB->deleteCachedCollection($id);
-                    } catch (\Throwable $th) {
-                        Console::warning("'resourceInternalId' from {$id}: {$th->getMessage()}");
+                    $attributesToCreate = [
+                        'resourceInternalId',
+                        'buildInternalId',
+                        'type',
+                    ];
+                    foreach ($attributesToCreate as $attribute) {
+                        try {
+                            $this->createAttributeFromCollection($this->projectDB, $id, $attribute);
+                            $this->projectDB->deleteCachedCollection($id);
+                        } catch (\Throwable $th) {
+                            Console::warning("$attribute from {$id}: {$th->getMessage()}");
+                        }
                     }
 
-                    try {
-                        $this->createAttributeFromCollection($this->projectDB, $id, 'buildInternalId');
-                        $this->projectDB->deleteCachedCollection($id);
-                    } catch (\Throwable $th) {
-                        Console::warning("'buildInternalId' from {$id}: {$th->getMessage()}");
+                    // Recreate indexes so they're the right size
+                    $indexesToDelete = [
+                        '_key_entrypoint',
+                        '_key_resource',
+                        '_key_resource_type',
+                        '_key_buildId',
+                    ];
+                    foreach ($indexesToDelete as $index) {
+                        try {
+                            $this->projectDB->deleteIndex($id, $index);
+                            $this->projectDB->deleteCachedCollection($id);
+                        } catch (\Throwable $th) {
+                            Console::warning("'$index' from {$id}: {$th->getMessage()}");
+                        }
+                    }
+
+                    $indexesToCreate = [
+                        '_key_resource',
+                        '_key_resource_type',
+                        '_key_buildId',
+                    ];
+                    foreach ($indexesToCreate as $index) {
+                        try {
+                            $this->createIndexFromCollection($this->projectDB, $id, $index);
+                            $this->projectDB->deleteCachedCollection($id);
+                        } catch (\Throwable $th) {
+                            Console::warning("'$index' from {$id}: {$th->getMessage()}");
+                        }
                     }
                     break;
                 case 'executions':
@@ -199,6 +277,34 @@ class V19 extends Migration
                         Console::warning("'responseStatusCode' from {$id}: {$th->getMessage()}");
                     }
                     break;
+                case 'files':
+                    // Recreate indexes so they're the right size
+                    $indexesToDelete = [
+                        '_key_name',
+                        '_key_signature',
+                        '_key_mimeType',
+                    ];
+                    foreach ($indexesToDelete as $index) {
+                        try {
+                            $this->projectDB->deleteIndex($id, $index);
+                            $this->projectDB->deleteCachedCollection($id);
+                        } catch (\Throwable $th) {
+                            Console::warning("'$index' from {$id}: {$th->getMessage()}");
+                        }
+                    }
+
+                    $indexesToCreate = [
+                        ...$indexesToDelete
+                    ];
+                    foreach ($indexesToCreate as $index) {
+                        try {
+                            $this->createIndexFromCollection($this->projectDB, $id, $index);
+                            $this->projectDB->deleteCachedCollection($id);
+                        } catch (\Throwable $th) {
+                            Console::warning("'$index' from {$id}: {$th->getMessage()}");
+                        }
+                    }
+                    break;
                 case 'functions':
                     $attributesToCreate = [
                         'live',
@@ -227,7 +333,23 @@ class V19 extends Migration
                         }
                     }
 
+                    // Recreate indexes so they're the right size
+                    $indexesToDelete = [
+                        '_key_name',
+                        '_key_runtime',
+                        '_key_deployment',
+                    ];
+                    foreach ($indexesToDelete as $index) {
+                        try {
+                            $this->projectDB->deleteIndex($id, $index);
+                            $this->projectDB->deleteCachedCollection($id);
+                        } catch (\Throwable $th) {
+                            Console::warning("'$index' from {$id}: {$th->getMessage()}");
+                        }
+                    }
+
                     $indexesToCreate = [
+                        ...$indexesToDelete,
                         '_key_installationId',
                         '_key_installationInternalId',
                         '_key_providerRepositoryId',
@@ -274,7 +396,6 @@ class V19 extends Migration
                 case 'projects':
                     $attributesToCreate = [
                         'database',
-                        'enabled',
                         'smtp',
                         'templates',
                     ];
@@ -284,13 +405,11 @@ class V19 extends Migration
                             $this->projectDB->deleteCachedCollection($id);
                         } catch (\Throwable $th) {
                             Console::warning("'$attribute' from {$id}: {$th->getMessage()}");
+                            Console::warning($th->getTraceAsString());
                         }
                     }
-
-                    // TODO: delete domains?
                     break;
                 case 'stats':
-                    // TODO: should we do this now?
                     try {
                         $this->projectDB->updateAttribute($id, 'value', signed: true);
                         $this->projectDB->deleteCachedCollection($id);
@@ -298,26 +417,27 @@ class V19 extends Migration
                         Console::warning("'value' from {$id}: {$th->getMessage()}");
                     }
 
-                    try {
-                        $this->projectDB->deleteAttribute($id, 'type');
-                        $this->projectDB->deleteCachedCollection($id);
-                    } catch (\Throwable $th) {
-                        Console::warning("'type' from {$id}: {$th->getMessage()}");
-                    }
+                    // Holding off on these until a future release
+                    // try {
+                    //     $this->projectDB->deleteAttribute($id, 'type');
+                    //     $this->projectDB->deleteCachedCollection($id);
+                    // } catch (\Throwable $th) {
+                    //     Console::warning("'type' from {$id}: {$th->getMessage()}");
+                    // }
 
-                    try {
-                        $this->projectDB->deleteIndex($id, '_key_metric_period_time');
-                        $this->projectDB->deleteCachedCollection($id);
-                    } catch (\Throwable $th) {
-                        Console::warning("'_key_metric_period_time' from {$id}: {$th->getMessage()}");
-                    }
+                    // try {
+                    //     $this->projectDB->deleteIndex($id, '_key_metric_period_time');
+                    //     $this->projectDB->deleteCachedCollection($id);
+                    // } catch (\Throwable $th) {
+                    //     Console::warning("'_key_metric_period_time' from {$id}: {$th->getMessage()}");
+                    // }
 
-                    try {
-                        $this->createIndexFromCollection($this->projectDB, $id, '_key_metric_period_time');
-                        $this->projectDB->deleteCachedCollection($id);
-                    } catch (\Throwable $th) {
-                        Console::warning("'_key_metric_period_time' from {$id}: {$th->getMessage()}");
-                    }
+                    // try {
+                    //     $this->createIndexFromCollection($this->projectDB, $id, '_key_metric_period_time');
+                    //     $this->projectDB->deleteCachedCollection($id);
+                    // } catch (\Throwable $th) {
+                    //     Console::warning("'_key_metric_period_time' from {$id}: {$th->getMessage()}");
+                    // }
                     break;
                 case 'users':
                     try {
@@ -359,7 +479,7 @@ class V19 extends Migration
                         $this->projectDB->deleteIndex($id, '_key_uniqueKey');
                         $this->projectDB->deleteCachedCollection($id);
                     } catch (\Throwable $th) {
-                        Console::warning("'_key_function' from {$id}: {$th->getMessage()}");
+                        Console::warning("'_key_uniqueKey' from {$id}: {$th->getMessage()}");
                     }
 
                     try {
@@ -380,12 +500,12 @@ class V19 extends Migration
                         $this->projectDB->renameAttribute($id, 'functionId', 'resourceId');
                         $this->projectDB->deleteCachedCollection($id);
                     } catch (\Throwable $th) {
-                        Console::warning("'resourceInternalId' from {$id}: {$th->getMessage()}");
+                        Console::warning("'resourceId' from {$id}: {$th->getMessage()}");
                     }
 
                     $indexesToCreate = [
                         '_key_resourceInternalId',
-                        '_key_resourceId',
+                        '_key_resourceId_resourceType',
                         '_key_resourceType',
                         '_key_uniqueKey',
                     ];
@@ -416,7 +536,6 @@ class V19 extends Migration
     {
         switch ($document->getCollection()) {
             case '_metadata':
-                // TODO: migrate statsLogger?
                 break;
             case 'attributes':
             case 'indexes':
@@ -429,6 +548,8 @@ class V19 extends Migration
                 $deploymentId = $document->getAttribute('deploymentId');
                 $deployment = $this->projectDB->getDocument('deployments', $deploymentId);
                 $document->setAttribute('deploymentInternalId', $deployment->getInternalId());
+
+                // TODO: how to combine stderr & stdout > logs?
                 break;
             case 'collections':
             case 'databases':
@@ -440,8 +561,10 @@ class V19 extends Migration
                 $document->setAttribute('resourceInternalId', $function->getInternalId());
 
                 $buildId = $document->getAttribute('buildId');
-                $build = $this->projectDB->getDocument('builds', $buildId);
-                $document->setAttribute('buildInternalId', $build->getInternalId());
+                if (!empty($buildId)) {
+                    $build = $this->projectDB->getDocument('builds', $buildId);
+                    $document->setAttribute('buildInternalId', $build->getInternalId());
+                }
 
                 $document->setAttribute('type', 'manual');
                 break;
@@ -459,9 +582,11 @@ class V19 extends Migration
                 $document->setAttribute('logging', true);
                 $document->setAttribute('version', 'v2');
                 $deploymentId = $document->getAttribute('deployment');
-                $deployment = $this->projectDB->getDocument('deployments', $deploymentId);
-                $document->setAttribute('deploymentInternalId', $deployment->getInternalId());
-                $document->setAttribute('entrypoint', $deployment->getAttribute('entrypoint'));
+                if (!empty($deploymentId)) {
+                    $deployment = $this->projectDB->getDocument('deployments', $deploymentId);
+                    $document->setAttribute('deploymentInternalId', $deployment->getInternalId());
+                    $document->setAttribute('entrypoint', $deployment->getAttribute('entrypoint'));
+                }
 
                 $schedule = $this->consoleDB->createDocument('schedules', new Document([
                     'region' => App::getEnv('_APP_REGION', 'default'), // Todo replace with projects region
@@ -492,7 +617,27 @@ class V19 extends Migration
 
                 break;
             case 'rules':
-                // TODO: convert domains
+                $status = 'created';
+                if ($document->getAttribute('verification', false)) {
+                    $status = 'verified';
+                }
+
+                $ruleDocument = new Document([
+                    'projectId' => $this->project->getId(),
+                    'projectInternalId' => $this->project->getInternalId(),
+                    'domain' => $document->getAttribute('domain'),
+                    'resourceType' => 'api',
+                    'resourceInternalId' => '',
+                    'resourceId' => '',
+                    'status' => $status,
+                    'certificateId' => $document->getAttribute('certificateId'),
+                ]);
+
+                try {
+                    $this->consoleDB->createDocument('rules', $ruleDocument);
+                } catch (\Throwable $th) {
+                    Console::warning("Error migrating domain {$document->getAttribute('domain')}: {$th->getMessage()}");
+                }
 
                 break;
             default:

src/Appwrite/Platform/Services/Tasks.php

@@ -30,6 +30,7 @@ class Tasks extends Service
         $this->type = self::TYPE_CLI;
         $this
             ->addAction(Version::getName(), new Version())
+            ->addAction(Usage::getName(), new Usage())
             ->addAction(Vars::getName(), new Vars())
             ->addAction(SSL::getName(), new SSL())
             ->addAction(Hamster::getName(), new Hamster())

src/Appwrite/Platform/Tasks/SDKs.php

@@ -51,7 +51,7 @@ class SDKs extends Action
         $production = ($git) ? (Console::confirm('Type "Appwrite" to push code to production git repos') == 'Appwrite') : false;
         $message = ($git) ? Console::confirm('Please enter your commit message:') : '';
 
-        if (!in_array($version, ['0.6.x', '0.7.x', '0.8.x', '0.9.x', '0.10.x', '0.11.x', '0.12.x', '0.13.x', '0.14.x', '0.15.x', '1.0.x', '1.1.x', '1.2.x', '1.3.x', 'latest'])) {
+        if (!in_array($version, ['0.6.x', '0.7.x', '0.8.x', '0.9.x', '0.10.x', '0.11.x', '0.12.x', '0.13.x', '0.14.x', '0.15.x', '1.0.x', '1.1.x', '1.2.x', '1.3.x', '1.4.x', 'latest'])) {
             throw new Exception('Unknown version given');
         }
 

src/Appwrite/Platform/Tasks/Usage.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace Appwrite\Platform\Tasks;
+
+use Appwrite\Usage\Calculators\TimeSeries;
+use InfluxDB\Database as InfluxDatabase;
+use Utopia\App;
+use Utopia\CLI\Console;
+use Utopia\Database\Database as UtopiaDatabase;
+use Throwable;
+use Utopia\Platform\Action;
+use Utopia\Registry\Registry;
+
+class Usage extends Action
+{
+    public static function getName(): string
+    {
+        return 'usage';
+    }
+
+    public function __construct()
+    {
+        $this
+            ->desc('Schedules syncing data from influxdb to Appwrite console db')
+            ->inject('dbForConsole')
+            ->inject('influxdb')
+            ->inject('register')
+            ->inject('getProjectDB')
+            ->inject('logError')
+            ->callback(fn ($dbForConsole, $influxDB, $register, $getProjectDB, $logError) => $this->action($dbForConsole, $influxDB, $register, $getProjectDB, $logError));
+    }
+
+    protected function aggregateTimeseries(UtopiaDatabase $database, InfluxDatabase $influxDB, callable $logError): void
+    {
+    }
+
+    public function action(UtopiaDatabase $dbForConsole, InfluxDatabase $influxDB, Registry $register, callable $getProjectDB, callable $logError)
+    {
+        Console::title('Usage Aggregation V1');
+        Console::success(APP_NAME . ' usage aggregation process v1 has started');
+
+        $errorLogger = fn(Throwable $error, string $action = 'syncUsageStats') => $logError($error, "usage", $action);
+
+        $interval = (int) App::getEnv('_APP_USAGE_AGGREGATION_INTERVAL', '30'); // 30 seconds (by default)
+        $region = App::getEnv('region', 'default');
+        $usage = new TimeSeries($region, $dbForConsole, $influxDB, $getProjectDB, $register, $errorLogger);
+
+        Console::loop(function () use ($interval, $usage) {
+            $now = date('d-m-Y H:i:s', time());
+            Console::info("[{$now}] Aggregating Timeseries Usage data every {$interval} seconds");
+            $loopStart = microtime(true);
+
+            $usage->collect();
+
+            $loopTook = microtime(true) - $loopStart;
+            $now = date('d-m-Y H:i:s', time());
+            Console::info("[{$now}] Aggregation took {$loopTook} seconds");
+        }, $interval);
+    }
+}

src/Appwrite/Specification/Format.php

@@ -3,6 +3,7 @@
 namespace Appwrite\Specification;
 
 use Utopia\App;
+use Utopia\Config\Config;
 use Utopia\Route;
 use Appwrite\Utopia\Response\Model;
 
@@ -38,6 +39,17 @@ abstract class Format
         'license.url' => '',
     ];
 
+    /*
+     * Blacklist to omit the enum types for the given route's parameter
+     */
+    protected array $enumBlacklist = [
+        [
+            'namespace' => 'users',
+            'method' => 'getUsage',
+            'parameter' => 'provider'
+        ]
+    ];
+
     public function __construct(App $app, array $services, array $routes, array $models, array $keys, int $authCount)
     {
         $this->app = $app;
@@ -97,4 +109,141 @@ abstract class Format
     {
         return $this->params[$key] ?? $default;
     }
+
+    protected function getEnumName(string $service, string $method, string $param): ?string
+    {
+        switch ($service) {
+            case 'account':
+                switch ($method) {
+                    case 'createOAuth2Session':
+                        return 'Provider';
+                }
+                break;
+            case 'avatars':
+                switch ($method) {
+                    case 'getBrowser':
+                        return 'Browser';
+                    case 'getCreditCard':
+                        return 'CreditCard';
+                    case 'getFlag':
+                        return  'Flag';
+                }
+                break;
+            case 'storage':
+                switch ($method) {
+                    case 'getFilePreview':
+                        switch ($param) {
+                            case 'gravity':
+                                return 'ImageGravity';
+                            case 'output':
+                                return  'ImageFormat';
+                        }
+                        break;
+                }
+                break;
+            case 'databases':
+                switch ($method) {
+                    case 'createRelationshipAttribute':
+                        switch ($param) {
+                            case 'type':
+                                return 'RelationshipType';
+                            case 'onDelete':
+                                return 'RelationMutate';
+                        }
+                        break;
+                    case 'updateRelationshipAttribute':
+                        switch ($param) {
+                            case 'onDelete':
+                                return 'RelationMutate';
+                        }
+                        break;
+                    case 'createIndex':
+                        switch ($param) {
+                            case 'type':
+                                return 'IndexType';
+                            case 'orders':
+                                return 'OrderBy';
+                        }
+                }
+                break;
+            case 'projects':
+                switch ($method) {
+                    case 'createPlatform':
+                        switch ($param) {
+                            case 'type':
+                                return 'PlatformType';
+                        }
+                        break;
+                }
+                break;
+        }
+        return null;
+    }
+    public function getEnumKeys(string $service, string $method, string $param): array
+    {
+        $values = [];
+        switch ($service) {
+            case 'avatars':
+                switch ($method) {
+                    case 'getBrowser':
+                        $codes = Config::getParam('avatar-browsers');
+                        foreach ($codes as $code => $value) {
+                            $values[] = $value['name'];
+                        }
+                        return $values;
+                    case 'getCreditCard':
+                        $codes = Config::getParam('avatar-credit-cards');
+                        foreach ($codes as $code => $value) {
+                            $values[] = $value['name'];
+                        }
+                        return $values;
+                    case 'getFlag':
+                        $codes = Config::getParam('avatar-flags');
+                        foreach ($codes as $code => $value) {
+                            $values[] = $value['name'];
+                        }
+                        return $values;
+                }
+                break;
+            case 'databases':
+                switch ($method) {
+                    case 'getUsage':
+                    case 'getCollectionUsage':
+                    case 'getDatabaseUsage':
+                        // Range Enum Keys
+                        $values  = ['Twenty Four Hours', 'Seven Days', 'Thirty Days', 'Ninety Days'];
+                        return $values;
+                }
+                break;
+            case 'function':
+                switch ($method) {
+                    case 'getUsage':
+                    case 'getFunctionUsage':
+                        // Range Enum Keys
+                        $values = ['Twenty Four Hours', 'Seven Days', 'Thirty Days', 'Ninety Days'];
+                        return $values;
+                }
+                break;
+            case 'users':
+                switch ($method) {
+                    case 'getUsage':
+                    case 'getUserUsage':
+                        // Range Enum Keys
+                        if ($param == 'range') {
+                            $values = ['Twenty Four Hours', 'Seven Days', 'Thirty Days', 'Ninety Days'];
+                            return $values;
+                        }
+                }
+                break;
+            case 'storage':
+                switch ($method) {
+                    case 'getUsage':
+                    case 'getBucketUsage':
+                        // Range Enum Keys
+                        $values = ['Twenty Four Hours', 'Seven Days', 'Thirty Days', 'Ninety Days'];
+                        return $values;
+                }
+        }
+        return $values;
+    }
 }

src/Appwrite/Specification/Format/OpenAPI3.php

@@ -343,6 +343,8 @@ class OpenAPI3 extends Format
                     case 'Utopia\Validator\ArrayList':
                     case 'Appwrite\Utopia\Database\Validator\Queries\Buckets':
                     case 'Appwrite\Utopia\Database\Validator\Queries\Collections':
+                    case 'Appwrite\Utopia\Database\Validator\Queries\Indexes':
+                    case 'Appwrite\Utopia\Database\Validator\Queries\Attributes':
                     case 'Appwrite\Utopia\Database\Validator\Queries\Databases':
                     case 'Appwrite\Utopia\Database\Validator\Queries\Deployments':
                     case 'Appwrite\Utopia\Database\Validator\Queries\Installations':
@@ -415,6 +417,25 @@ class OpenAPI3 extends Format
                         $node['schema']['type'] = $validator->getType();
                         $node['schema']['x-example'] = $validator->getList()[0];
 
+                        //Iterate from the blackList. If it matches with the current one, then it is a blackList
+                        // Do not add the enum
+                        $allowed = true;
+                        foreach ($this->enumBlacklist as $blacklist) {
+                            if (
+                                $blacklist['namespace'] == $route->getLabel('sdk.namespace', '')
+                                && $blacklist['method'] == $route->getLabel('sdk.method', '')
+                                && $blacklist['parameter'] == $name
+                            ) {
+                                $allowed = false;
+                                break;
+                            }
+                        }
+
+                        if ($allowed) {
+                                $node['schema']['enum'] = $validator->getList();
+                                $node['schema']['x-enum-name'] = $this->getEnumName($route->getLabel('sdk.namespace', ''), $route->getLabel('sdk.method', ''), $name);
+                                $node['schema']['x-enum-keys'] = $this->getEnumKeys($route->getLabel('sdk.namespace', ''), $route->getLabel('sdk.method', ''), $name);
+                        }
                         if ($validator->getType() === 'integer') {
                             $node['format'] = 'int32';
                         }
@@ -445,6 +466,13 @@ class OpenAPI3 extends Format
                         'x-example' => $node['schema']['x-example'] ?? null
                     ];
 
+                    if (isset($node['schema']['enum'])) {
+                        /// If the enum flag is Set, add the enum values to the body
+                        $body['content'][$consumes[0]]['schema']['properties'][$name]['enum'] = $node['schema']['enum'];
+                        $body['content'][$consumes[0]]['schema']['properties'][$name]['x-enum-name'] = $node['schema']['x-enum-name'] ?? null;
+                        $body['content'][$consumes[0]]['schema']['properties'][$name]['x-enum-keys'] = $node['schema']['x-enum-keys'] ?? null;
+                    }
+
                     if ($node['schema']['x-upload-id'] ?? false) {
                         $body['content'][$consumes[0]]['schema']['properties'][$name]['x-upload-id'] = $node['schema']['x-upload-id'];
                     }

src/Appwrite/Specification/Format/Swagger2.php

@@ -293,6 +293,7 @@ class Swagger2 extends Format
                     $validator = $validator->getValidator();
                 }
 
+
                 switch ((!empty($validator)) ? \get_class($validator) : '') {
                     case 'Utopia\Validator\Text':
                         $node['type'] = $validator->getType();
@@ -342,6 +343,8 @@ class Swagger2 extends Format
                     case 'Utopia\Validator\ArrayList':
                     case 'Appwrite\Utopia\Database\Validator\Queries\Buckets':
                     case 'Appwrite\Utopia\Database\Validator\Queries\Collections':
+                    case 'Appwrite\Utopia\Database\Validator\Queries\Indexes':
+                    case 'Appwrite\Utopia\Database\Validator\Queries\Attributes':
                     case 'Appwrite\Utopia\Database\Validator\Queries\Databases':
                     case 'Appwrite\Utopia\Database\Validator\Queries\Deployments':
                     case 'Appwrite\Utopia\Database\Validator\Queries\Installations':
@@ -417,6 +420,22 @@ class Swagger2 extends Format
                         $node['type'] = $validator->getType();
                         $node['x-example'] = $validator->getList()[0];
 
+                        //Iterate from the blackList. If it matches with the current one, then it is a blackList
+                        // Do not add the enum
+                        $allowed = true;
+                        foreach ($this->enumBlacklist as $blacklist) {
+                            if ($blacklist['namespace'] == $route->getLabel('sdk.namespace', '') && $blacklist['method'] == $route->getLabel('sdk.method', '') && $blacklist['parameter'] == $name) {
+                                $allowed = false;
+                                break;
+                            }
+                        }
+
+                        if ($allowed) {
+                            $node['enum'] = $validator->getList();
+                            $node['x-enum-name'] = $this->getEnumName($route->getLabel('sdk.namespace', ''), $route->getLabel('sdk.method', ''), $name);
+                            $node['x-enum-keys'] = $this->getEnumKeys($route->getLabel('sdk.namespace', ''), $route->getLabel('sdk.method', ''), $name);
+                        }
+
                         if ($validator->getType() === 'integer') {
                             $node['format'] = 'int32';
                         }
@@ -455,6 +474,13 @@ class Swagger2 extends Format
                         'x-example' => $node['x-example'] ?? null,
                     ];
 
+                    if (isset($node['enum'])) {
+                        /// If the enum flag is Set, add the enum values to the body
+                        $body['schema']['properties'][$name]['enum'] = $node['enum'];
+                        $body['schema']['properties'][$name]['x-enum-name'] = $node['x-enum-name'] ?? null;
+                        $body['schema']['properties'][$name]['x-enum-keys'] = $node['x-enum-keys'] ?? null;
+                    }
+
                     if ($node['x-global'] ?? false) {
                         $body['schema']['properties'][$name]['x-global'] = true;
                     }

src/Appwrite/Usage/Calculator.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Appwrite\Usage;
+
+abstract class Calculator
+{
+    protected string $region;
+
+    public function __construct(string $region)
+    {
+        $this->region = $region;
+    }
+
+    abstract public function collect(): void;
+}

src/Appwrite/Usage/Calculators/TimeSeries.php

@@ -0,0 +1,557 @@
+<?php
+
+namespace Appwrite\Usage\Calculators;
+
+use Utopia\App;
+use Appwrite\Usage\Calculator;
+use Utopia\Database\Database;
+use Utopia\Database\Document;
+use InfluxDB\Database as InfluxDatabase;
+use DateTime;
+use Utopia\Registry\Registry;
+
+class TimeSeries extends Calculator
+{
+    /**
+     * InfluxDB
+     *
+     * @var InfluxDatabase
+     */
+    protected InfluxDatabase $influxDB;
+
+    /**
+     * Utopia Database
+     *
+     * @var Database
+     */
+    protected Database $database;
+
+    /**
+     * Error Handler Callback
+     *
+     * @var callable
+     */
+    protected $errorHandler;
+
+    /**
+     * Callback to get project DB
+     *
+     * @var callable
+     */
+    protected mixed $getProjectDB;
+
+    /**
+     * Registry
+     *
+     * @var Registry
+     */
+    protected Registry $register;
+
+    /**
+     * Latest times for metric that was synced to the database
+     *
+     * @var array
+     */
+    private array $latestTime = [];
+
+    /**
+     * Periods the metrics are collected for
+     * @var array
+     */
+    protected array $periods = [
+        [
+            'key' => '1h',
+            'startTime' => '-24 hours'
+        ],
+        [
+            'key' => '1d',
+            'startTime' => '-30 days'
+        ]
+    ];
+
+    /**
+     * All the metrics that we are collecting
+     *
+     * @var array
+     */
+    protected array $metrics = [
+        'project.$all.network.requests' => [
+            'table' => 'appwrite_usage_project_{scope}_network_requests',
+        ],
+        'project.$all.network.bandwidth' => [
+            'table' => 'appwrite_usage_project_{scope}_network_bandwidth',
+        ],
+        'project.$all.network.inbound' => [
+            'table' => 'appwrite_usage_project_{scope}_network_inbound',
+        ],
+        'project.$all.network.outbound' => [
+            'table' => 'appwrite_usage_project_{scope}_network_outbound',
+        ],
+        /* Users service metrics */
+        'users.$all.requests.create' => [
+            'table' => 'appwrite_usage_users_{scope}_requests_create',
+        ],
+        'users.$all.requests.read' => [
+            'table' => 'appwrite_usage_users_{scope}_requests_read',
+        ],
+        'users.$all.requests.update' => [
+            'table' => 'appwrite_usage_users_{scope}_requests_update',
+        ],
+        'users.$all.requests.delete' => [
+            'table' => 'appwrite_usage_users_{scope}_requests_delete',
+        ],
+
+        'databases.$all.requests.create' => [
+            'table' => 'appwrite_usage_databases_{scope}_requests_create',
+        ],
+        'databases.$all.requests.read' => [
+            'table' => 'appwrite_usage_databases_{scope}_requests_read',
+        ],
+        'databases.$all.requests.update' => [
+            'table' => 'appwrite_usage_databases_{scope}_requests_update',
+        ],
+        'databases.$all.requests.delete' => [
+            'table' => 'appwrite_usage_databases_{scope}_requests_delete',
+        ],
+
+        'collections.$all.requests.create' => [
+            'table' => 'appwrite_usage_collections_{scope}_requests_create',
+        ],
+        'collections.$all.requests.read' => [
+            'table' => 'appwrite_usage_collections_{scope}_requests_read',
+        ],
+        'collections.$all.requests.update' => [
+            'table' => 'appwrite_usage_collections_{scope}_requests_update',
+        ],
+        'collections.$all.requests.delete' => [
+            'table' => 'appwrite_usage_collections_{scope}_requests_delete',
+        ],
+
+        'documents.$all.requests.create' => [
+            'table' => 'appwrite_usage_documents_{scope}_requests_create',
+        ],
+        'documents.$all.requests.read' => [
+            'table' => 'appwrite_usage_documents_{scope}_requests_read',
+        ],
+        'documents.$all.requests.update' => [
+            'table' => 'appwrite_usage_documents_{scope}_requests_update',
+        ],
+        'documents.$all.requests.delete' => [
+            'table' => 'appwrite_usage_documents_{scope}_requests_delete',
+        ],
+
+        'collections.databaseId.requests.create' => [
+            'table' => 'appwrite_usage_collections_{scope}_requests_create',
+            'groupBy' => ['databaseId'],
+        ],
+        'collections.databaseId.requests.read' => [
+            'table' => 'appwrite_usage_collections_{scope}_requests_read',
+            'groupBy' => ['databaseId'],
+        ],
+        'collections.databaseId.requests.update' => [
+            'table' => 'appwrite_usage_collections_{scope}_requests_update',
+            'groupBy' => ['databaseId'],
+        ],
+        'collections.databaseId.requests.delete' => [
+            'table' => 'appwrite_usage_collections_{scope}_requests_delete',
+            'groupBy' => ['databaseId'],
+        ],
+
+        'documents.databaseId.requests.create' => [
+            'table' => 'appwrite_usage_documents_{scope}_requests_create',
+            'groupBy' => ['databaseId'],
+        ],
+        'documents.databaseId.requests.read' => [
+            'table' => 'appwrite_usage_documents_{scope}_requests_read',
+            'groupBy' => ['databaseId'],
+        ],
+        'documents.databaseId.requests.update' => [
+            'table' => 'appwrite_usage_documents_{scope}_requests_update',
+            'groupBy' => ['databaseId'],
+        ],
+        'documents.databaseId.requests.delete' => [
+            'table' => 'appwrite_usage_documents_{scope}_requests_delete',
+            'groupBy' => ['databaseId'],
+        ],
+
+        'documents.databaseId/collectionId.requests.create' => [
+            'table' => 'appwrite_usage_documents_{scope}_requests_create',
+            'groupBy' => ['databaseId', 'collectionId'],
+        ],
+        'documents.databaseId/collectionId.requests.read' => [
+            'table' => 'appwrite_usage_documents_{scope}_requests_read',
+            'groupBy' => ['databaseId', 'collectionId'],
+        ],
+        'documents.databaseId/collectionId.requests.update' => [
+            'table' => 'appwrite_usage_documents_{scope}_requests_update',
+            'groupBy' => ['databaseId', 'collectionId'],
+        ],
+        'documents.databaseId/collectionId.requests.delete' => [
+            'table' => 'appwrite_usage_documents_{scope}_requests_delete',
+            'groupBy' => ['databaseId', 'collectionId'],
+        ],
+
+        'buckets.$all.requests.create' => [
+            'table' => 'appwrite_usage_buckets_{scope}_requests_create',
+        ],
+        'buckets.$all.requests.read' => [
+            'table' => 'appwrite_usage_buckets_{scope}_requests_read',
+        ],
+        'buckets.$all.requests.update' => [
+            'table' => 'appwrite_usage_buckets_{scope}_requests_update',
+        ],
+        'buckets.$all.requests.delete' => [
+            'table' => 'appwrite_usage_buckets_{scope}_requests_delete',
+        ],
+
+        'files.$all.requests.create' => [
+            'table' => 'appwrite_usage_files_{scope}_requests_create',
+        ],
+        'files.$all.requests.read' => [
+            'table' => 'appwrite_usage_files_{scope}_requests_read',
+        ],
+        'files.$all.requests.update' => [
+            'table' => 'appwrite_usage_files_{scope}_requests_update',
+        ],
+        'files.$all.requests.delete' => [
+            'table' => 'appwrite_usage_files_{scope}_requests_delete',
+        ],
+
+        'files.bucketId.requests.create' => [
+            'table' => 'appwrite_usage_files_{scope}_requests_create',
+            'groupBy' => ['bucketId'],
+        ],
+        'files.bucketId.requests.read' => [
+            'table' => 'appwrite_usage_files_{scope}_requests_read',
+            'groupBy' => ['bucketId'],
+        ],
+        'files.bucketId.requests.update' => [
+            'table' => 'appwrite_usage_files_{scope}_requests_update',
+            'groupBy' => ['bucketId'],
+        ],
+        'files.bucketId.requests.delete' => [
+            'table' => 'appwrite_usage_files_{scope}_requests_delete',
+            'groupBy' => ['bucketId'],
+        ],
+
+        'sessions.$all.requests.create' => [
+            'table' => 'appwrite_usage_sessions__{scope}_requests_create',
+        ],
+        'sessions.provider.requests.create' => [
+            'table' => 'appwrite_usage_sessions_{scope}_requests_create',
+            'groupBy' => ['provider'],
+        ],
+        'sessions.$all.requests.delete' => [
+            'table' => 'appwrite_usage_sessions_{scope}_requests_delete',
+        ],
+        'executions.$all.compute.total' => [
+            'table' => 'appwrite_usage_executions_{scope}_compute',
+        ],
+        'builds.$all.compute.total' => [
+            'table' => 'appwrite_usage_builds_{scope}_compute',
+        ],
+        'executions.$all.compute.failure' => [
+            'table' => 'appwrite_usage_executions_{scope}_compute',
+            'filters' => [
+                'functionStatus' => 'failed',
+            ],
+        ],
+        'builds.$all.compute.failure' => [
+            'table' => 'appwrite_usage_builds_{scope}_compute',
+            'filters' => [
+                'functionStatus' => 'failed',
+            ],
+        ],
+        'executions.$all.compute.success' => [
+            'table' => 'appwrite_usage_executions_{scope}_compute',
+            'filters' => [
+                'functionStatus' => 'success',
+            ],
+        ],
+        'builds.$all.compute.success' => [
+            'table' => 'appwrite_usage_builds_{scope}_compute',
+            'filters' => [
+                'functionStatus' => 'success',
+            ],
+        ],
+        'executions.functionId.compute.total' => [
+            'table' => 'appwrite_usage_executions_{scope}_compute',
+            'groupBy' => ['functionId'],
+        ],
+        'builds.functionId.compute.total' => [
+            'table' => 'appwrite_usage_builds_{scope}_compute',
+            'groupBy' => ['functionId'],
+        ],
+
+        'executions.functionId.compute.failure' => [
+            'table' => 'appwrite_usage_executions_{scope}_compute',
+            'groupBy' => ['functionId'],
+            'filters' => [
+                'functionStatus' => 'failed',
+            ],
+        ],
+        'builds.functionId.compute.failure' => [
+            'table' => 'appwrite_usage_builds_{scope}_compute',
+            'groupBy' => ['functionId'],
+            'filters' => [
+                'functionBuildStatus' => 'failed',
+            ],
+        ],
+        'executions.functionId.compute.success' => [
+            'table' => 'appwrite_usage_executions_{scope}_compute',
+            'groupBy' => ['functionId'],
+            'filters' => [
+                'functionStatus' => 'success',
+            ],
+        ],
+        'builds.functionId.compute.success' => [
+            'table' => 'appwrite_usage_builds_{scope}_compute',
+            'groupBy' => ['functionId'],
+            'filters' => [
+                'functionBuildStatus' => 'success',
+            ],
+        ],
+
+        // counters
+        'users.$all.count.total' => [
+            'table' => 'appwrite_usage_users_{scope}_count_total',
+        ],
+        'buckets.$all.count.total' => [
+            'table' => 'appwrite_usage_buckets_{scope}_count_total',
+        ],
+        'files.$all.count.total' => [
+            'table' => 'appwrite_usage_files_{scope}_count_total',
+        ],
+        'files.bucketId.count.total' => [
+            'table' => 'appwrite_usage_files_{scope}_count_total',
+            'groupBy' => ['bucketId']
+        ],
+        'databases.$all.count.total' => [
+            'table' => 'appwrite_usage_databases_{scope}_count_total',
+        ],
+        'collections.$all.count.total' => [
+            'table' => 'appwrite_usage_collections_{scope}_count_total',
+        ],
+        'documents.$all.count.total' => [
+            'table' => 'appwrite_usage_documents_{scope}_count_total',
+        ],
+        'collections.databaseId.count.total' => [
+            'table' => 'appwrite_usage_collections_{scope}_count_total',
+            'groupBy' => ['databaseId']
+        ],
+        'documents.databaseId.count.total' => [
+            'table' => 'appwrite_usage_documents_{scope}_count_total',
+            'groupBy' => ['databaseId']
+        ],
+        'documents.databaseId/collectionId.count.total' => [
+            'table' => 'appwrite_usage_documents_{scope}_count_total',
+            'groupBy' => ['databaseId', 'collectionId']
+        ],
+        'deployments.$all.storage.size' => [
+            'table' => 'appwrite_usage_deployments_{scope}_storage_size',
+        ],
+        'project.$all.storage.size' => [
+            'table' => 'appwrite_usage_project_{scope}_storage_size',
+        ],
+        'files.$all.storage.size' => [
+            'table' => 'appwrite_usage_files_{scope}_storage_size',
+        ],
+        'files.$bucketId.storage.size' => [
+            'table' => 'appwrite_usage_files_{scope}_storage_size',
+            'groupBy' => ['bucketId']
+        ],
+
+        'builds.$all.compute.time' => [
+            'table' => 'appwrite_usage_executions_{scope}_compute_time',
+        ],
+        'executions.$all.compute.time' => [
+            'table' => 'appwrite_usage_executions_{scope}_compute_time',
+        ],
+
+        'executions.functionId.compute.time' => [
+            'table' => 'appwrite_usage_executions_{scope}_compute_time',
+            'groupBy' => ['functionId'],
+        ],
+        'builds.functionId.compute.time' => [
+            'table' => 'appwrite_usage_builds_{scope}_compute_time',
+            'groupBy' => ['functionId'],
+        ],
+
+        'project.$all.compute.time' => [ // Built time + execution time
+            'table' => 'appwrite_usage_project_{scope}_compute_time',
+            'groupBy' => ['functionId'],
+        ],
+
+        'deployments.$all.storage.size' => [
+            'table' => 'appwrite_usage_deployments_{scope}_storage_size'
+        ],
+        'project.$all.storage.size' => [
+            'table' => 'appwrite_usage_project_{scope}_storage_size'
+        ],
+        'files.$all.storage.size' => [
+            'table' => 'appwrite_usage_files_{scope}_storage_size'
+        ],
+        'files.bucketId.storage.size' => [
+            'table' => 'appwrite_usage_files_{scope}_storage_size',
+            'groupBy' => ['bucketId']
+        ]
+    ];
+
+    public function __construct(string $region, Database $database, InfluxDatabase $influxDB, callable $getProjectDB, Registry $register, callable $errorHandler = null)
+    {
+        parent::__construct($region);
+        $this->database = $database;
+        $this->influxDB = $influxDB;
+        $this->getProjectDB = $getProjectDB;
+        $this->register = $register;
+        $this->errorHandler = $errorHandler;
+    }
+
+    /**
+     * Create or Update Mertic
+     * Create or update each metric in the stats collection for the given project
+     *
+     * @param string $projectId
+     * @param int $time
+     * @param string $period
+     * @param string $metric
+     * @param int $value
+     * @param int $type
+     *
+     * @return void
+     */
+    private function createOrUpdateMetric(string $projectId, string $time, string $period, string $metric, int $value, int $type): void
+    {
+        $id = \md5("{$time}_{$period}_{$metric}");
+        $project = $this->database->getDocument('projects', $projectId);
+        $database = call_user_func($this->getProjectDB, $project);
+
+        try {
+            $document = $database->getDocument('stats', $id);
+            if ($document->isEmpty()) {
+                $database->createDocument('stats', new Document([
+                    '$id' => $id,
+                    'period' => $period,
+                    'time' => $time,
+                    'metric' => $metric,
+                    'value' => $value,
+                    'type' => $type,
+                    'region' => $this->region,
+                ]));
+            } else {
+                $database->updateDocument(
+                    'stats',
+                    $document->getId(),
+                    $document->setAttribute('value', $value)
+                );
+            }
+        } catch (\Exception $e) { // if projects are deleted this might fail
+            if (is_callable($this->errorHandler)) {
+                call_user_func($this->errorHandler, $e, "sync_project_{$projectId}_metric_{$metric}");
+            } else {
+                throw $e;
+            }
+        }
+
+        $this->register->get('pools')->reclaim();
+    }
+
+    /**
+     * Sync From InfluxDB
+     * Sync stats from influxDB to stats collection in the Appwrite database
+     *
+     * @param string $metric
+     * @param array $options
+     * @param array $period
+     *
+     * @return void
+     */
+    private function syncFromInfluxDB(string $metric, array $options, array $period): void
+    {
+        $start = DateTime::createFromFormat('U', \strtotime($period['startTime']))->format(DateTime::RFC3339);
+        if (!empty($this->latestTime[$metric][$period['key']])) {
+            $start = $this->latestTime[$metric][$period['key']];
+        }
+        $end = (new DateTime())->format(DateTime::RFC3339);
+
+        $table = $options['table']; //Which influxdb table to query for this metric
+        $groupBy = empty($options['groupBy']) ? '' : ', ' . implode(', ', array_map(fn($groupBy) => '"' . $groupBy . '" ', $options['groupBy'])); //Some sub level metrics may be grouped by other tags like collectionId, bucketId, etc
+
+        $filters = $options['filters'] ?? []; // Some metrics might have additional filters, like function's status
+        if (!empty($filters)) {
+            $filters = ' AND ' . implode(' AND ', array_map(fn ($filter, $value) => "\"{$filter}\"='{$value}'", array_keys($filters), array_values($filters)));
+        } else {
+            $filters = '';
+        }
+
+        $query = "SELECT sum(value) AS \"value\" ";
+        $query .= "FROM \"{$table}\" ";
+        $query .= "WHERE \"time\" > '{$start}' ";
+        $query .= "AND \"time\" < '{$end}' ";
+        $query .= "AND \"metric_type\"='counter' {$filters} ";
+        $query .= "GROUP BY time({$period['key']}), \"projectId\" {$groupBy} ";
+        $query .= "FILL(null)";
+
+        try {
+            $result = $this->influxDB->query($query);
+            $points = $result->getPoints();
+            foreach ($points as $point) {
+                $projectId = $point['projectId'];
+
+                if (!empty($projectId) && $projectId !== 'console') {
+                    $metricUpdated = $metric;
+                    if (!empty($groupBy)) {
+                        foreach ($options['groupBy'] as $groupBy) {
+                            $groupedBy = $point[$groupBy] ?? '';
+                            if (empty($groupedBy)) {
+                                continue;
+                            }
+                            $metricUpdated = str_replace($groupBy, $groupedBy, $metricUpdated);
+                        }
+                    }
+
+                    $value = (!empty($point['value'])) ? $point['value'] : 0;
+
+                    $this->createOrUpdateMetric(
+                        $point['projectId'],
+                        $point['time'],
+                        $period['key'],
+                        $metricUpdated,
+                        $value,
+                        0
+                    );
+                    $this->latestTime[$metric][$period['key']] = $point['time'];
+                }
+            }
+        } catch (\Exception $e) { // if projects are deleted this might fail
+            if (is_callable($this->errorHandler)) {
+                call_user_func($this->errorHandler, $e, "sync_metric_{$metric}_influxdb");
+            } else {
+                throw $e;
+            }
+        }
+    }
+
+    /**
+     * Collect Stats
+     * Collect all the stats from Influd DB to Database
+     *
+     * @return void
+     */
+    public function collect(): void
+    {
+        foreach ($this->periods as $period) {
+            foreach ($this->metrics as $metric => $options) { //for each metrics
+                try {
+                    $this->syncFromInfluxDB($metric, $options, $period);
+                } catch (\Exception $e) {
+                    if (is_callable($this->errorHandler)) {
+                        call_user_func($this->errorHandler, $e);
+                    } else {
+                        throw $e;
+                    }
+                }
+            }
+        }
+    }
+}

src/Appwrite/Usage/Stats.php

@@ -0,0 +1,225 @@
+<?php
+
+namespace Appwrite\Usage;
+
+use Utopia\App;
+
+class Stats
+{
+    /**
+     * @var array
+     */
+    protected $params = [];
+
+    /**
+     * @var mixed
+     */
+    protected $statsd;
+
+    /**
+     * @var string
+     */
+    protected $namespace = 'appwrite.usage';
+
+    /**
+     * Event constructor.
+     *
+     * @param mixed $statsd
+     */
+    public function __construct($statsd)
+    {
+        $this->statsd = $statsd;
+    }
+
+    /**
+     * @param string $key
+     * @param mixed  $value
+     *
+     * @return $this
+     */
+    public function setParam(string $key, $value): self
+    {
+        $this->params[$key] = $value;
+
+        return $this;
+    }
+
+    /**
+     * @param string $key
+     *
+     * @return mixed|null
+     */
+    public function getParam(string $key)
+    {
+        return (isset($this->params[$key])) ? $this->params[$key] : null;
+    }
+
+    /**
+     * @param string $namespace
+     *
+     * @return $this
+     */
+    public function setNamespace(string $namespace): self
+    {
+        $this->namespace = $namespace;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getNamespace()
+    {
+        return $this->namespace;
+    }
+
+    /**
+     * Submit data to StatsD.
+     * Send various metrics to StatsD based on the parameters that are set
+     * @return void
+     */
+    public function submit(): void
+    {
+        $projectId = $this->params['projectId'] ?? '';
+        $projectInternalId = $this->params['projectInternalId'];
+        $tags = ",projectInternalId={$projectInternalId},projectId={$projectId},version=" . App::getEnv('_APP_VERSION', 'UNKNOWN');
+
+        // the global namespace is prepended to every key (optional)
+        $this->statsd->setNamespace($this->namespace);
+
+        $httpRequest = $this->params['project.{scope}.network.requests'] ?? 0;
+        $httpMethod = $this->params['httpMethod'] ?? '';
+        if ($httpRequest >= 1) {
+            $this->statsd->increment('project.{scope}.network.requests' . $tags . ',method=' . \strtolower($httpMethod));
+        }
+
+        $inbound = $this->params['project.{scope}.network.inbound'] ?? 0;
+        $outbound = $this->params['project.{scope}.network.outbound'] ?? 0;
+        $this->statsd->count('project.{scope}.network.inbound' . $tags, $inbound);
+        $this->statsd->count('project.{scope}.network.outbound' . $tags, $outbound);
+        $this->statsd->count('project.{scope}.network.bandwidth' . $tags, $inbound + $outbound);
+
+        $usersMetrics = [
+            'users.{scope}.requests.create',
+            'users.{scope}.requests.read',
+            'users.{scope}.requests.update',
+            'users.{scope}.requests.delete',
+            'users.{scope}.count.total',
+        ];
+
+        foreach ($usersMetrics as $metric) {
+            $value = $this->params[$metric] ?? 0;
+            if ($value === 1 || $value === -1) {
+                $this->statsd->count($metric . $tags, $value);
+            }
+        }
+
+        $dbMetrics = [
+            'databases.{scope}.requests.create',
+            'databases.{scope}.requests.read',
+            'databases.{scope}.requests.update',
+            'databases.{scope}.requests.delete',
+            'collections.{scope}.requests.create',
+            'collections.{scope}.requests.read',
+            'collections.{scope}.requests.update',
+            'collections.{scope}.requests.delete',
+            'documents.{scope}.requests.create',
+            'documents.{scope}.requests.read',
+            'documents.{scope}.requests.update',
+            'documents.{scope}.requests.delete',
+            'databases.{scope}.count.total',
+            'collections.{scope}.count.total',
+            'documents.{scope}.count.total'
+        ];
+
+        foreach ($dbMetrics as $metric) {
+            $value = $this->params[$metric] ?? 0;
+            if ($value === 1 || $value === -1) {
+                $dbTags = $tags . ",collectionId=" . ($this->params['collectionId'] ?? '') . ",databaseId=" . ($this->params['databaseId'] ?? '');
+                $this->statsd->count($metric . $dbTags, $value);
+            }
+        }
+
+        $storageMertics = [
+            'buckets.{scope}.requests.create',
+            'buckets.{scope}.requests.read',
+            'buckets.{scope}.requests.update',
+            'buckets.{scope}.requests.delete',
+            'files.{scope}.requests.create',
+            'files.{scope}.requests.read',
+            'files.{scope}.requests.update',
+            'files.{scope}.requests.delete',
+            'buckets.{scope}.count.total',
+            'files.{scope}.count.total',
+            'files.{scope}.storage.size'
+        ];
+
+        foreach ($storageMertics as $metric) {
+            $value = $this->params[$metric] ?? 0;
+            if ($value !== 0) {
+                $storageTags = $tags . ",bucketId=" . ($this->params['bucketId'] ?? '');
+                $this->statsd->count($metric . $storageTags, $value);
+            }
+        }
+
+        $sessionsMetrics = [
+            'sessions.{scope}.requests.create',
+            'sessions.{scope}.requests.update',
+            'sessions.{scope}.requests.delete',
+        ];
+
+        foreach ($sessionsMetrics as $metric) {
+            $value = $this->params[$metric] ?? 0;
+            if ($value >= 1) {
+                $sessionTags = $tags . ",provider=" . ($this->params['provider'] ?? '');
+                $this->statsd->count($metric . $sessionTags, $value);
+            }
+        }
+
+        $functionId = $this->params['functionId'] ?? '';
+        $functionExecution = $this->params['executions.{scope}.compute'] ?? 0;
+        $functionExecutionTime = ($this->params['executionTime'] ?? 0) * 1000; // ms
+        $functionExecutionStatus = $this->params['executionStatus'] ?? '';
+
+        $functionBuild = $this->params['builds.{scope}.compute'] ?? 0;
+        $functionBuildTime = ($this->params['buildTime'] ?? 0) * 1000; // ms
+        $functionBuildStatus = $this->params['buildStatus'] ?? '';
+        $functionCompute = $functionExecutionTime + $functionBuildTime;
+        $functionTags = $tags . ',functionId=' . $functionId;
+
+        $deploymentSize = $this->params['deployment.{scope}.storage.size'] ?? 0;
+        $storageSize = $this->params['files.{scope}.storage.size'] ?? 0;
+        if ($deploymentSize + $storageSize > 0 || $deploymentSize + $storageSize <= -1) {
+            $this->statsd->count('project.{scope}.storage.size' . $tags, $deploymentSize + $storageSize);
+        }
+
+        if ($deploymentSize !== 0) {
+            $this->statsd->count('deployments.{scope}.storage.size' . $functionTags, $deploymentSize);
+        }
+
+        if ($functionExecution >= 1) {
+            $this->statsd->increment('executions.{scope}.compute' . $functionTags . ',functionStatus=' . $functionExecutionStatus);
+            if ($functionExecutionTime > 0) {
+                $this->statsd->count('executions.{scope}.compute.time' . $functionTags, $functionExecutionTime);
+            }
+        }
+        if ($functionBuild >= 1) {
+            $this->statsd->increment('builds.{scope}.compute' . $functionTags . ',functionBuildStatus=' . $functionBuildStatus);
+            $this->statsd->count('builds.{scope}.compute.time' . $functionTags, $functionBuildTime);
+        }
+        if ($functionBuild + $functionExecution >= 1) {
+            $this->statsd->count('project.{scope}.compute.time' . $functionTags, $functionCompute);
+        }
+
+        $this->reset();
+    }
+
+    public function reset(): self
+    {
+        $this->params = [];
+        $this->namespace = 'appwrite.usage';
+
+        return $this;
+    }
+}

src/Appwrite/Utopia/Database/Validator/Queries/Attributes.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator\Queries;
+
+use Utopia\Database\Validator\Query\Select;
+
+class Attributes extends Base
+{
+    public const ALLOWED_ATTRIBUTES = [
+        'key',
+        'type',
+        'size',
+        'required',
+        'array',
+        'status',
+        'error'
+    ];
+
+    /**
+     * Expression constructor
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct('attributes', self::ALLOWED_ATTRIBUTES);
+    }
+}

src/Appwrite/Utopia/Database/Validator/Queries/Base.php

@@ -2,13 +2,13 @@
 
 namespace Appwrite\Utopia\Database\Validator\Queries;
 
+use Appwrite\Extend\Exception;
 use Utopia\Database\Validator\Queries;
 use Utopia\Database\Validator\Query\Limit;
 use Utopia\Database\Validator\Query\Offset;
 use Utopia\Database\Validator\Query\Cursor;
 use Utopia\Database\Validator\Query\Filter;
 use Utopia\Database\Validator\Query\Order;
-use Utopia\Database\Validator\Query\Select;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
@@ -69,7 +69,6 @@ class Base extends Queries
             new Cursor(),
             new Filter($attributes),
             new Order($attributes),
-            new Select($attributes),
         ];
 
         parent::__construct($validators);

src/Appwrite/Utopia/Database/Validator/Queries/Indexes.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator\Queries;
+
+class Indexes extends Base
+{
+    public const ALLOWED_ATTRIBUTES = [
+        'key',
+        'type',
+        'status',
+        'attributes',
+        'error',
+    ];
+
+    /**
+     * Expression constructor
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct('indexes', self::ALLOWED_ATTRIBUTES);
+    }
+}

src/Appwrite/Utopia/Response.php

@@ -263,6 +263,8 @@ class Response extends SwooleResponse
     public const MODEL_PERMISSIONS = 'permissions';
     public const MODEL_RULE = 'rule';
     public const MODEL_TASK = 'task';
+    public const MODEL_DOMAIN = 'domain';
+    public const MODEL_DOMAIN_LIST = 'domainList';
 
     // Tests (keep last)
     public const MODEL_MOCK = 'mock';

src/Appwrite/Utopia/Response/Filters/V12.php

@@ -81,7 +81,7 @@ class V12 extends Filter
             case Response::MODEL_WEBHOOK_LIST:
             case Response::MODEL_KEY_LIST:
             case Response::MODEL_PLATFORM_LIST:
-            // case Response::MODEL_DOMAIN_LIST:
+            case Response::MODEL_DOMAIN_LIST:
             case Response::MODEL_COUNTRY_LIST:
             case Response::MODEL_CONTINENT_LIST:
             case Response::MODEL_LANGUAGE_LIST:

src/Appwrite/Utopia/Response/Filters/V14.php

@@ -23,7 +23,7 @@ class V14 extends Filter
 
                 break;
             case Response::MODEL_DOCUMENT:
-            // case Response::MODEL_DOMAIN:
+            case Response::MODEL_DOMAIN:
             case Response::MODEL_FUNCTION:
             case Response::MODEL_TEAM:
             case Response::MODEL_MEMBERSHIP:
@@ -38,10 +38,10 @@ class V14 extends Filter
                 $parsedResponse = $this->parseRemoveAttributesList($content, 'documents', ['$createdAt', '$updatedAt']);
 
                 break;
-            // case Response::MODEL_DOMAIN_LIST:
-            //     $parsedResponse = $this->parseRemoveAttributesList($content, 'domains', ['$createdAt', '$updatedAt']);
+            case Response::MODEL_DOMAIN_LIST:
+                $parsedResponse = $this->parseRemoveAttributesList($content, 'domains', ['$createdAt', '$updatedAt']);
 
-            //     break;
+                break;
             case Response::MODEL_FUNCTION_LIST:
                 $parsedResponse = $this->parseRemoveAttributesList($content, 'functions', ['$createdAt', '$updatedAt']);
 

src/Appwrite/Utopia/Response/Filters/V15.php

@@ -50,7 +50,7 @@ class V15 extends Filter
                 break;
             case Response::MODEL_DATABASE:
             case Response::MODEL_DEPLOYMENT:
-            // case Response::MODEL_DOMAIN:
+            case Response::MODEL_DOMAIN:
             case Response::MODEL_PLATFORM:
             case Response::MODEL_PROJECT:
             case Response::MODEL_TEAM:
@@ -59,7 +59,7 @@ class V15 extends Filter
                 break;
             case Response::MODEL_DATABASE_LIST:
             case Response::MODEL_DEPLOYMENT_LIST:
-            // case Response::MODEL_DOMAIN_LIST:
+            case Response::MODEL_DOMAIN_LIST:
             case Response::MODEL_PLATFORM_LIST:
             case Response::MODEL_PROJECT_LIST:
             case Response::MODEL_TEAM_LIST:
@@ -72,9 +72,9 @@ class V15 extends Filter
                     case Response::MODEL_DEPLOYMENT_LIST:
                         $listKey = 'deployments';
                         break;
-                    // case Response::MODEL_DOMAIN_LIST:
-                    //     $listKey = 'domains';
-                    //     break;
+                    case Response::MODEL_DOMAIN_LIST:
+                        $listKey = 'domains';
+                        break;
                     case Response::MODEL_PLATFORM_LIST:
                         $listKey = 'platforms';
                         break;

src/Appwrite/Utopia/Response/Model/AttributeRelationship.php

@@ -3,6 +3,7 @@
 namespace Appwrite\Utopia\Response\Model;
 
 use Appwrite\Utopia\Response;
+use Utopia\Database\Document;
 
 class AttributeRelationship extends Attribute
 {
@@ -73,4 +74,23 @@ class AttributeRelationship extends Attribute
     {
         return Response::MODEL_ATTRIBUTE_RELATIONSHIP;
     }
+
+    /**
+     * Process Document before returning it to the client
+     *
+     * @return Document
+     */
+    public function filter(Document $document): Document
+    {
+        $options = $document->getAttribute('options');
+        if (!\is_null($options)) {
+            $document->setAttribute('relatedCollection', $options['relatedCollection']);
+            $document->setAttribute('relationType', $options['relationType']);
+            $document->setAttribute('twoWay', $options['twoWay']);
+            $document->setAttribute('twoWayKey', $options['twoWayKey']);
+            $document->setAttribute('side', $options['side']);
+            $document->setAttribute('onDelete', $options['onDelete']);
+        }
+        return $document;
+    }
 }

src/Appwrite/Utopia/Response/Model/ConsoleVariables.php

@@ -33,6 +33,18 @@ class ConsoleVariables extends Model
                 'description' => 'Defines if usage stats are enabled. This value is set to \'enabled\' by default, to disable the usage stats set the value to \'disabled\'.',
                 'default' => '',
                 'example' => 'enabled',
+            ])
+            ->addRule('_APP_VCS_ENABLED', [
+                'type' => self::TYPE_BOOLEAN,
+                'description' => 'Defines if VCS (Version Control System) is enabled.',
+                'default' => false,
+                'example' => true,
+            ])
+            ->addRule('_APP_ASSISTANT_ENABLED', [
+                'type' => self::TYPE_BOOLEAN,
+                'description' => 'Defines if AI assistant is enabled.',
+                'default' => false,
+                'example' => true,
             ]);
     }
 

src/Appwrite/Utopia/Response/Model/Func.php

@@ -111,6 +111,12 @@ class Func extends Model
                 'default' => '',
                 'example' => 'npm install',
             ])
+            ->addRule('version', [
+                'type' => self::TYPE_STRING,
+                'description' => 'Version of Open Runtimes used for the function.',
+                'default' => 'v3',
+                'example' => 'v2',
+            ])
             ->addRule('installationId', [
                 'type' => self::TYPE_STRING,
                 'description' => 'Function VCS (Version Control System) installation id.',

src/Appwrite/Utopia/Response/Model/Migration.php

@@ -30,7 +30,7 @@ class Migration extends Model
             ])
             ->addRule('status', [
                 'type' => self::TYPE_STRING,
-                'description' => 'Migration status ( pending, processing, failed. completed ) ',
+                'description' => 'Migration status ( pending, processing, failed, completed ) ',
                 'default' => '',
                 'example' => 'pending',
             ])

src/Appwrite/Utopia/Response/Model/UsageBuckets.php

@@ -16,7 +16,7 @@ class UsageBuckets extends Model
                 'default' => '',
                 'example' => '30d',
             ])
-            ->addRule('filesTotal', [
+            ->addRule('filesCount', [
                 'type' => Response::MODEL_METRIC,
                 'description' => 'Aggregated stats for total number of files in this bucket.',
                 'default' => [],
@@ -30,6 +30,34 @@ class UsageBuckets extends Model
                 'example' => [],
                 'array' => true
             ])
+            ->addRule('filesCreate', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for files created.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('filesRead', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for files read.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('filesUpdate', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for files updated.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('filesDelete', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for files deleted.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
         ;
     }
 

src/Appwrite/Utopia/Response/Model/UsageCollection.php

@@ -16,13 +16,41 @@ class UsageCollection extends Model
                 'default' => '',
                 'example' => '30d',
             ])
-            ->addRule('documentsTotal', [
+            ->addRule('documentsCount', [
                 'type' => Response::MODEL_METRIC,
                 'description' => 'Aggregated stats for total number of documents.',
                 'default' => [],
                 'example' => [],
                 'array' => true
             ])
+            ->addRule('documentsCreate', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for documents created.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('documentsRead', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for documents read.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('documentsUpdate', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for documents updated.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('documentsDelete', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for documents deleted.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
         ;
     }
 

src/Appwrite/Utopia/Response/Model/UsageDatabase.php

@@ -16,16 +16,72 @@ class UsageDatabase extends Model
                 'default' => '',
                 'example' => '30d',
             ])
-            ->addRule('collectionsTotal', [
+            ->addRule('documentsCount', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for total number of documents.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('collectionsCount', [
                 'type' => Response::MODEL_METRIC,
                 'description' => 'Aggregated stats for total number of collections.',
                 'default' => [],
                 'example' => [],
                 'array' => true
             ])
-            ->addRule('documentsTotal', [
+            ->addRule('documentsCreate', [
                 'type' => Response::MODEL_METRIC,
-                'description' => 'Aggregated stats for total number of documents.',
+                'description' => 'Aggregated stats for documents created.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('documentsRead', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for documents read.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('documentsUpdate', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for documents updated.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('documentsDelete', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for documents deleted.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('collectionsCreate', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for collections created.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('collectionsRead', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for collections read.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('collectionsUpdate', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for collections updated.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('collectionsDelete', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for collections delete.',
                 'default' => [],
                 'example' => [],
                 'array' => true

src/Appwrite/Utopia/Response/Model/UsageDatabases.php

@@ -16,23 +16,107 @@ class UsageDatabases extends Model
                 'default' => '',
                 'example' => '30d',
             ])
-            ->addRule('databasesTotal', [
+            ->addRule('databasesCount', [
                 'type' => Response::MODEL_METRIC,
                 'description' => 'Aggregated stats for total number of documents.',
                 'default' => [],
                 'example' => [],
                 'array' => true
             ])
-            ->addRule('collectionsTotal', [
+            ->addRule('documentsCount', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for total number of documents.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('collectionsCount', [
                 'type' => Response::MODEL_METRIC,
                 'description' => 'Aggregated stats for total number of collections.',
                 'default' => [],
                 'example' => [],
                 'array' => true
             ])
-            ->addRule('documentsTotal', [
+            ->addRule('databasesCreate', [
                 'type' => Response::MODEL_METRIC,
-                'description' => 'Aggregated stats for total number of documents.',
+                'description' => 'Aggregated stats for documents created.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('databasesRead', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for documents read.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('databasesUpdate', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for documents updated.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('databasesDelete', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for total number of collections.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('documentsCreate', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for documents created.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('documentsRead', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for documents read.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('documentsUpdate', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for documents updated.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('documentsDelete', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for documents deleted.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('collectionsCreate', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for collections created.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('collectionsRead', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for collections read.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('collectionsUpdate', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for collections updated.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('collectionsDelete', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for collections delete.',
                 'default' => [],
                 'example' => [],
                 'array' => true

src/Appwrite/Utopia/Response/Model/UsageFunction.php

@@ -16,16 +16,30 @@ class UsageFunction extends Model
                 'default' => '',
                 'example' => '30d',
             ])
-            ->addRule('deploymentsTotal', [
+            ->addRule('executionsTotal', [
                 'type' => Response::MODEL_METRIC,
-                'description' => 'Aggregated stats for number of function deployments.',
+                'description' => 'Aggregated stats for number of function executions.',
                 'default' => [],
                 'example' => [],
                 'array' => true
             ])
-            ->addRule('deploymentsStorage', [
+            ->addRule('executionsFailure', [
                 'type' => Response::MODEL_METRIC,
-                'description' => 'Aggregated stats for function deployments storage.',
+                'description' => 'Aggregated stats for function execution failures.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('executionsSuccess', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for function execution successes.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('executionsTime', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for function execution duration.',
                 'default' => [],
                 'example' => [],
                 'array' => true
@@ -37,31 +51,23 @@ class UsageFunction extends Model
                 'example' => [],
                 'array' => true
             ])
-            ->addRule('buildsStorage', [
+            ->addRule('buildsFailure', [
                 'type' => Response::MODEL_METRIC,
-                'description' => 'Aggregated stats for builds  storage.',
+                'description' => 'Aggregated stats for function build failures.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('buildsSuccess', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for function build successes.',
                 'default' => [],
                 'example' => [],
                 'array' => true
             ])
             ->addRule('buildsTime', [
                 'type' => Response::MODEL_METRIC,
-                'description' => 'Aggregated stats for function build  compute.',
-                'default' => [],
-                'example' => [],
-                'array' => true
-            ])
-            ->addRule('executionsTotal', [
-                'type' => Response::MODEL_METRIC,
-                'description' => 'Aggregated stats for number of function executions.',
-                'default' => [],
-                'example' => [],
-                'array' => true
-            ])
-
-            ->addRule('executionsTime', [
-                'type' => Response::MODEL_METRIC,
-                'description' => 'Aggregated stats for function execution compute.',
+                'description' => 'Aggregated stats for function build duration.',
                 'default' => [],
                 'example' => [],
                 'array' => true

src/Appwrite/Utopia/Response/Model/UsageFunctions.php

@@ -16,23 +16,30 @@ class UsageFunctions extends Model
                 'default' => '',
                 'example' => '30d',
             ])
-            ->addRule('functionsTotal', [
+            ->addRule('executionsTotal', [
                 'type' => Response::MODEL_METRIC,
-                'description' => 'Aggregated stats for number of functions.',
+                'description' => 'Aggregated stats for number of function executions.',
                 'default' => [],
                 'example' => [],
                 'array' => true
             ])
-            ->addRule('deploymentsTotal', [
+            ->addRule('executionsFailure', [
                 'type' => Response::MODEL_METRIC,
-                'description' => 'Aggregated stats for number of function deployments.',
+                'description' => 'Aggregated stats for function execution failures.',
                 'default' => [],
                 'example' => [],
                 'array' => true
             ])
-            ->addRule('deploymentsStorage', [
+            ->addRule('executionsSuccess', [
                 'type' => Response::MODEL_METRIC,
-                'description' => 'Aggregated stats for function deployments storage.',
+                'description' => 'Aggregated stats for function execution successes.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('executionsTime', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for function execution duration.',
                 'default' => [],
                 'example' => [],
                 'array' => true
@@ -44,31 +51,23 @@ class UsageFunctions extends Model
                 'example' => [],
                 'array' => true
             ])
-            ->addRule('buildsStorage', [
+            ->addRule('buildsFailure', [
                 'type' => Response::MODEL_METRIC,
-                'description' => 'Aggregated stats for builds  storage.',
+                'description' => 'Aggregated stats for function build failures.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('buildsSuccess', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for function build successes.',
                 'default' => [],
                 'example' => [],
                 'array' => true
             ])
             ->addRule('buildsTime', [
                 'type' => Response::MODEL_METRIC,
-                'description' => 'Aggregated stats for function build compute.',
-                'default' => [],
-                'example' => [],
-                'array' => true
-            ])
-            ->addRule('executionsTotal', [
-                'type' => Response::MODEL_METRIC,
-                'description' => 'Aggregated stats for number of function executions.',
-                'default' => [],
-                'example' => [],
-                'array' => true
-            ])
-
-            ->addRule('executionsTime', [
-                'type' => Response::MODEL_METRIC,
-                'description' => 'Aggregated stats for function execution compute.',
+                'description' => 'Aggregated stats for function build duration.',
                 'default' => [],
                 'example' => [],
                 'array' => true

src/Appwrite/Utopia/Response/Model/UsageProject.php

@@ -16,7 +16,7 @@ class UsageProject extends Model
                 'default' => '',
                 'example' => '30d',
             ])
-            ->addRule('requestsTotal', [
+            ->addRule('requests', [
                 'type' => Response::MODEL_METRIC,
                 'description' => 'Aggregated stats for number of requests.',
                 'default' => [],
@@ -30,42 +30,42 @@ class UsageProject extends Model
                 'example' => [],
                 'array' => true
             ])
-            ->addRule('executionsTotal', [
+            ->addRule('executions', [
                 'type' => Response::MODEL_METRIC,
                 'description' => 'Aggregated stats for function executions.',
                 'default' => [],
                 'example' => [],
                 'array' => true
             ])
-            ->addRule('documentsTotal', [
+            ->addRule('documents', [
                 'type' => Response::MODEL_METRIC,
                 'description' => 'Aggregated stats for number of documents.',
                 'default' => [],
                 'example' => [],
                 'array' => true
             ])
-            ->addRule('databasesTotal', [
+            ->addRule('databases', [
                 'type' => Response::MODEL_METRIC,
                 'description' => 'Aggregated stats for number of databases.',
                 'default' => [],
                 'example' => [],
                 'array' => true
             ])
-            ->addRule('usersTotal', [
+            ->addRule('users', [
                 'type' => Response::MODEL_METRIC,
                 'description' => 'Aggregated stats for number of users.',
                 'default' => [],
                 'example' => [],
                 'array' => true
             ])
-            ->addRule('filesStorage', [
+            ->addRule('storage', [
                 'type' => Response::MODEL_METRIC,
                 'description' => 'Aggregated stats for the occupied storage size (in bytes).',
                 'default' => [],
                 'example' => [],
                 'array' => true
             ])
-            ->addRule('bucketsTotal', [
+            ->addRule('buckets', [
                 'type' => Response::MODEL_METRIC,
                 'description' => 'Aggregated stats for number of buckets.',
                 'default' => [],

src/Appwrite/Utopia/Response/Model/UsageStorage.php

@@ -16,23 +16,79 @@ class UsageStorage extends Model
                 'default' => '',
                 'example' => '30d',
             ])
-            ->addRule('bucketsTotal', [
+            ->addRule('storage', [
                 'type' => Response::MODEL_METRIC,
-                'description' => 'Aggregated stats for total number of buckets.',
+                'description' => 'Aggregated stats for the occupied storage size (in bytes).',
                 'default' => [],
                 'example' => [],
                 'array' => true
             ])
-            ->addRule('filesTotal', [
+            ->addRule('filesCount', [
                 'type' => Response::MODEL_METRIC,
                 'description' => 'Aggregated stats for total number of files.',
                 'default' => [],
                 'example' => [],
                 'array' => true
             ])
-            ->addRule('filesStorage', [
+            ->addRule('bucketsCount', [
                 'type' => Response::MODEL_METRIC,
-                'description' => 'Aggregated stats for the occupied storage size (in bytes).',
+                'description' => 'Aggregated stats for total number of buckets.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('bucketsCreate', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for buckets created.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('bucketsRead', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for buckets read.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('bucketsUpdate', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for buckets updated.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('bucketsDelete', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for buckets deleted.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('filesCreate', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for files created.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('filesRead', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for files read.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('filesUpdate', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for files updated.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('filesDelete', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for files deleted.',
                 'default' => [],
                 'example' => [],
                 'array' => true

src/Appwrite/Utopia/Response/Model/UsageUsers.php

@@ -16,21 +16,62 @@ class UsageUsers extends Model
                 'default' => '',
                 'example' => '30d',
             ])
-            ->addRule('usersTotal', [
+            ->addRule('usersCount', [
                 'type' => Response::MODEL_METRIC,
                 'description' => 'Aggregated stats for total number of users.',
                 'default' => [],
                 'example' => [],
                 'array' => true
             ])
-
-            ->addRule('sessionsTotal', [
+            ->addRule('usersCreate', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for users created.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('usersRead', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for users read.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('usersUpdate', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for users updated.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('usersDelete', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for users deleted.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('sessionsCreate', [
                 'type' => Response::MODEL_METRIC,
                 'description' => 'Aggregated stats for sessions created.',
                 'default' => [],
                 'example' => [],
                 'array' => true
             ])
+            ->addRule('sessionsProviderCreate', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for sessions created for a provider ( email, anonymous or oauth2 ).',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
+            ->addRule('sessionsDelete', [
+                'type' => Response::MODEL_METRIC,
+                'description' => 'Aggregated stats for sessions deleted.',
+                'default' => [],
+                'example' => [],
+                'array' => true
+            ])
         ;
     }
 

src/Executor/Executor.php

@@ -100,8 +100,6 @@ class Executor
     }
 
     /**
-     *
-     *
      * Listen to realtime logs stream of a runtime
      *
      * @param string $deploymentId
@@ -180,7 +178,9 @@ class Executor
         array $headers,
         string $runtimeEntrypoint = null,
     ) {
-        $headers['host'] = App::getEnv('_APP_DOMAIN', '');
+        if (empty($headers['host'])) {
+            $headers['host'] = App::getEnv('_APP_DOMAIN', '');
+        }
 
         $runtimeId = "$projectId-$deploymentId";
         $route = '/runtimes/' . $runtimeId . '/execution';

tests/e2e/Services/Console/ConsoleConsoleClientTest.php

@@ -24,10 +24,12 @@ class ConsoleConsoleClientTest extends Scope
         ], $this->getHeaders()), []);
 
         $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertCount(4, $response['body']);
+        $this->assertCount(6, $response['body']);
         $this->assertIsString($response['body']['_APP_DOMAIN_TARGET']);
         $this->assertIsInt($response['body']['_APP_STORAGE_LIMIT']);
         $this->assertIsInt($response['body']['_APP_FUNCTIONS_SIZE_LIMIT']);
         $this->assertIsString($response['body']['_APP_DOMAIN_TARGET']);
+        $this->assertIsString($response['body']['_APP_VCS_ENABLED']);
+        $this->assertIsString($response['body']['_APP_ASSISTANT_ENABLED']);
     }
 }

tests/e2e/Services/Databases/DatabasesBase.php

@@ -5,10 +5,12 @@ namespace Tests\E2E\Services\Databases;
 use Appwrite\Extend\Exception;
 use Tests\E2E\Client;
 use Utopia\Database\Database;
+use Utopia\Database\Document;
 use Utopia\Database\DateTime;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Helpers\Role;
+use Utopia\Database\Query;
 use Utopia\Database\Validator\Datetime as DatetimeValidator;
 
 trait DatabasesBase
@@ -316,6 +318,32 @@ trait DatabasesBase
         return $data;
     }
 
+    /**
+     * @depends testCreateAttributes
+     */
+    public function testListAttributes(array $data): void
+    {
+        $databaseId = $data['databaseId'];
+        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/collections/' . $data['moviesId'] . '/attributes', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey'],
+        ]), [
+            'queries' => ['equal("type", "string")', 'limit(2)', 'cursorAfter(title)'],
+        ]);
+        $this->assertEquals(200, $response['headers']['status-code']);
+        $this->assertEquals(2, \count($response['body']['attributes']));
+        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/collections/' . $data['moviesId'] . '/attributes', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey'],
+        ]), [
+            'queries' => ['select(["key"])'],
+        ]);
+        $this->assertEquals(Exception::GENERAL_ARGUMENT_INVALID, $response['body']['type']);
+        $this->assertEquals(400, $response['headers']['status-code']);
+    }
+
     /**
      * @depends testCreateAttributes
      */
@@ -698,7 +726,6 @@ trait DatabasesBase
         $this->assertEquals(10, $attributes['body']['total']);
 
         $attributes = $attributes['body']['attributes'];
-
         $this->assertIsArray($attributes);
         $this->assertCount(10, $attributes);
 
@@ -1048,6 +1075,32 @@ trait DatabasesBase
         return $data;
     }
 
+    /**
+     * @depends testCreateIndexes
+     */
+    public function testListIndexes(array $data): void
+    {
+        $databaseId = $data['databaseId'];
+        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/collections/' . $data['moviesId'] . '/indexes', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey'],
+        ]), [
+            'queries' => ['equal("type", "key")', 'limit(2)'],
+        ]);
+        $this->assertEquals(200, $response['headers']['status-code']);
+        $this->assertEquals(2, \count($response['body']['indexes']));
+        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/collections/' . $data['moviesId'] . '/indexes', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey'],
+        ]), [
+            'queries' => ['select(["key"])'],
+        ]);
+        $this->assertEquals(Exception::GENERAL_ARGUMENT_INVALID, $response['body']['type']);
+        $this->assertEquals(400, $response['headers']['status-code']);
+    }
+
     /**
      * @depends testCreateIndexes
      */
@@ -1325,7 +1378,7 @@ trait DatabasesBase
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
             'queries' => [
-                'select(["title", "releaseYear"])',
+                'select(["title", "releaseYear", "$id"])',
             ],
         ]);
 
@@ -4045,10 +4098,9 @@ trait DatabasesBase
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
             'queries' => [
-                'select(["libraries.*"])',
+                'select(["libraries.*", "$id"])',
             ],
         ]);
-
         $document = $response['body']['documents'][0];
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertArrayHasKey('libraries', $document);
@@ -4058,7 +4110,7 @@ trait DatabasesBase
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
             'queries' => [
-                'select(["fullName"])'
+                'select(["fullName", "$id"])'
             ],
         ]);
 

tests/e2e/Services/Databases/DatabasesConsoleClientTest.php

@@ -109,108 +109,47 @@ class DatabasesConsoleClientTest extends Scope
      * @depends testCreateCollection
      * @param array $data
      */
-    public function testGetCollection(array $data)
-    {
-        $databaseId = $data['databaseId'];
-        $moviesCollectionId = $data['moviesId'];
+    // public function testGetDatabaseUsage(array $data)
+    // {
+    //     $databaseId = $data['databaseId'];
+    //     /**
+    //      * Test for FAILURE
+    //      */
 
-        /**
-         * Test When database is disabled but can still call get collection
-         */
-        $collection = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/collections/' . $moviesCollectionId, array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()));
+    //     $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/usage', array_merge([
+    //         'content-type' => 'application/json',
+    //         'x-appwrite-project' => $this->getProject()['$id']
+    //     ], $this->getHeaders()), [
+    //         'range' => '32h'
+    //     ]);
 
-        $this->assertEquals(200, $collection['headers']['status-code']);
-        $this->assertEquals('Movies', $collection['body']['name']);
-        $this->assertEquals($moviesCollectionId, $collection['body']['$id']);
-        $this->assertTrue($collection['body']['enabled']);
-    }
+    //     $this->assertEquals(400, $response['headers']['status-code']);
 
-    /**
-     * @depends testCreateCollection
-     * @param array $data
-     */
-    public function testUpdateCollection(array $data)
-    {
-        $databaseId = $data['databaseId'];
-        $moviesCollectionId = $data['moviesId'];
+    //     /**
+    //      * Test for SUCCESS
+    //      */
 
-        /**
-         * Test When database is disabled but can still call update collection
-         */
-        $collection = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/collections/' . $moviesCollectionId, array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()), [
-            'name' => 'Movies Updated',
-            'enabled' => false
-        ]);
+    //     $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/usage', array_merge([
+    //         'content-type' => 'application/json',
+    //         'x-appwrite-project' => $this->getProject()['$id']
+    //     ], $this->getHeaders()), [
+    //         'range' => '24h'
+    //     ]);
 
-        $this->assertEquals(200, $collection['headers']['status-code']);
-        $this->assertEquals('Movies Updated', $collection['body']['name']);
-        $this->assertEquals($moviesCollectionId, $collection['body']['$id']);
-        $this->assertFalse($collection['body']['enabled']);
-    }
-
-    /**
-     * @depends testCreateCollection
-     * @param array $data
-     */
-    public function testDeleteCollection(array $data)
-    {
-        $databaseId = $data['databaseId'];
-        $tvShowsId = $data['tvShowsId'];
-
-        /**
-         * Test When database is disabled but can still call Delete collection
-         */
-        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/collections/' . $tvShowsId, array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()));
-
-        $this->assertEquals(204, $response['headers']['status-code']);
-        $this->assertEquals($response['body'], "");
-    }
-
-    /**
-     * @depends testCreateCollection
-     */
-    public function testGetDatabaseUsage(array $data)
-    {
-        $databaseId = $data['databaseId'];
-        /**
-         * Test for FAILURE
-         */
-
-        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/usage', array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id']
-        ], $this->getHeaders()), [
-            'range' => '32h'
-        ]);
-
-        $this->assertEquals(400, $response['headers']['status-code']);
-
-        /**
-         * Test for SUCCESS
-         */
-
-        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/usage', array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id']
-        ], $this->getHeaders()), [
-            'range' => '24h'
-        ]);
-
-        $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertEquals(count($response['body']), 3);
-        $this->assertEquals($response['body']['range'], '24h');
-        $this->assertIsArray($response['body']['documentsTotal']);
-        $this->assertIsArray($response['body']['collectionsTotal']);
-    }
+    //     $this->assertEquals(200, $response['headers']['status-code']);
+    //     $this->assertEquals(count($response['body']), 11);
+    //     $this->assertEquals($response['body']['range'], '24h');
+    //     $this->assertIsArray($response['body']['documentsCount']);
+    //     $this->assertIsArray($response['body']['collectionsCount']);
+    //     $this->assertIsArray($response['body']['documentsCreate']);
+    //     $this->assertIsArray($response['body']['documentsRead']);
+    //     $this->assertIsArray($response['body']['documentsUpdate']);
+    //     $this->assertIsArray($response['body']['documentsDelete']);
+    //     $this->assertIsArray($response['body']['collectionsCreate']);
+    //     $this->assertIsArray($response['body']['collectionsRead']);
+    //     $this->assertIsArray($response['body']['collectionsUpdate']);
+    //     $this->assertIsArray($response['body']['collectionsDelete']);
+    // }
 
 
     /**
@@ -250,10 +189,15 @@ class DatabasesConsoleClientTest extends Scope
         ], $this->getHeaders()), [
             'range' => '24h'
         ]);
+
         $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertEquals(count($response['body']), 2);
+        $this->assertEquals(count($response['body']), 6);
         $this->assertEquals($response['body']['range'], '24h');
-        $this->assertIsArray($response['body']['documentsTotal']);
+        $this->assertIsArray($response['body']['documentsCount']);
+        $this->assertIsArray($response['body']['documentsCreate']);
+        $this->assertIsArray($response['body']['documentsRead']);
+        $this->assertIsArray($response['body']['documentsUpdate']);
+        $this->assertIsArray($response['body']['documentsDelete']);
     }
 
     /**

tests/e2e/Services/Databases/DatabasesCustomClientTest.php

@@ -316,4 +316,420 @@ class DatabasesCustomClientTest extends Scope
         $this->assertEquals($relation['body']['relatedCollection'], $collection1RelationAttribute['relatedCollection']);
         $this->assertEquals('restrict', $collection1RelationAttribute['onDelete']);
     }
+
+    public function testUpdateWithoutRelationPermission(): void
+    {
+        $userId = $this->getUser()['$id'];
+        $database = $this->client->call(Client::METHOD_POST, '/databases', [
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ], [
+            'databaseId' => ID::unique(),
+            'name' => ID::unique(),
+        ]);
+
+        $databaseId = $database['body']['$id'];
+
+        // Creating collection 1
+        $collection1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'collectionId' => ID::custom('collection1'),
+            'name' => ID::custom('collection1'),
+            'documentSecurity' => false,
+            'permissions' => [
+                Permission::create(Role::user($userId)),
+                Permission::read(Role::user($userId)),
+                Permission::delete(Role::user($userId)),
+            ]
+        ]);
+
+        // Creating collection 2
+        $collection2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'collectionId' => ID::custom('collection2'),
+            'name' => ID::custom('collection2'),
+            'documentSecurity' => false,
+            'permissions' => [
+                Permission::read(Role::user($userId)),
+            ]
+        ]);
+
+        $collection3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'collectionId' => ID::custom('collection3'),
+            'name' => ID::custom('collection3'),
+            'documentSecurity' => false,
+            'permissions' => [
+                Permission::create(Role::user($userId)),
+                Permission::read(Role::user($userId)),
+                Permission::delete(Role::user($userId)),
+            ]
+        ]);
+
+        $collection4 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'collectionId' => ID::custom('collection4'),
+            'name' => ID::custom('collection4'),
+            'documentSecurity' => false,
+            'permissions' => [
+                Permission::read(Role::user($userId)),
+            ]
+        ]);
+
+        $collection5 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'collectionId' => ID::custom('collection5'),
+            'name' => ID::custom('collection5'),
+            'documentSecurity' => false,
+            'permissions' => [
+                Permission::create(Role::user($userId)),
+                Permission::read(Role::user($userId)),
+                Permission::delete(Role::user($userId)),
+            ]
+        ]);
+
+        // Creating one to one relationship from collection 1 to colletion 2
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections/' . $collection1['body']['$id'] . '/attributes/relationship', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'relatedCollectionId' => $collection2['body']['$id'],
+            'type' => 'oneToOne',
+            'twoWay' => false,
+            'onDelete' => 'setNull',
+            'key' => $collection2['body']['$id']
+        ]);
+
+        // Creating one to one relationship from collection 2 to colletion 3
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections/' . $collection2['body']['$id'] . '/attributes/relationship', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'relatedCollectionId' => $collection3['body']['$id'],
+            'type' => 'oneToOne',
+            'twoWay' => false,
+            'onDelete' => 'setNull',
+            'key' => $collection3['body']['$id']
+        ]);
+
+        // Creating one to one relationship from collection 3 to colletion 4
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections/' . $collection3['body']['$id'] . '/attributes/relationship', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'relatedCollectionId' => $collection4['body']['$id'],
+            'type' => 'oneToOne',
+            'twoWay' => false,
+            'onDelete' => 'setNull',
+            'key' => $collection4['body']['$id']
+        ]);
+
+        // Creating one to one relationship from collection 4 to colletion 5
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections/' . $collection4['body']['$id'] . '/attributes/relationship', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'relatedCollectionId' => $collection5['body']['$id'],
+            'type' => 'oneToOne',
+            'twoWay' => false,
+            'onDelete' => 'setNull',
+            'key' => $collection5['body']['$id']
+        ]);
+
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections/' . $collection1['body']['$id'] . '/attributes/string', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'key' => "Title",
+            'size' => 100,
+            'required' => false,
+            'array' => false,
+            'default' => null,
+        ]);
+
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections/' . $collection2['body']['$id'] . '/attributes/string', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'key' => "Rating",
+            'size' => 100,
+            'required' => false,
+            'array' => false,
+            'default' => null,
+        ]);
+
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections/' . $collection3['body']['$id'] . '/attributes/string', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'key' => "Rating",
+            'size' => 100,
+            'required' => false,
+            'array' => false,
+            'default' => null,
+        ]);
+
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections/' . $collection4['body']['$id'] . '/attributes/string', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'key' => "Rating",
+            'size' => 100,
+            'required' => false,
+            'array' => false,
+            'default' => null,
+        ]);
+
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections/' . $collection5['body']['$id'] . '/attributes/string', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'key' => "Rating",
+            'size' => 100,
+            'required' => false,
+            'array' => false,
+            'default' => null,
+        ]);
+
+        \sleep(2);
+        // Creating parent document with a child reference to test the permissions
+        $parentDocument = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections/' . $collection1['body']['$id'] . '/documents', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'documentId' => ID::custom($collection1['body']['$id']),
+            'data' => [
+                'Title' => 'Captain America',
+                $collection2['body']['$id'] => [
+                    '$id' => ID::custom($collection2['body']['$id']),
+                    'Rating' => '10',
+                    $collection3['body']['$id'] => [
+                        '$id' => ID::custom($collection3['body']['$id']),
+                        'Rating' => '10',
+                        $collection4['body']['$id'] => [
+                            '$id' => ID::custom($collection4['body']['$id']),
+                            'Rating' => '10',
+                            $collection5['body']['$id'] => [
+                                '$id' => ID::custom($collection5['body']['$id']),
+                                'Rating' => '10'
+                            ]
+                        ]
+                    ]
+                ]
+            ]
+        ]);
+
+        $this->assertEquals(201, $parentDocument['headers']['status-code']);
+        // This is the point of the test. We should not need any authorization permission to update the document with same data.
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/collections/' . $collection1['body']['$id'] . '/documents/' . $collection1['body']['$id'], array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'documentId' => ID::custom($collection1['body']['$id']),
+            'data' => [
+                'Title' => 'Captain America',
+                $collection2['body']['$id'] => [
+                    '$id' => $collection2['body']['$id'],
+                    'Rating' => '10',
+                    $collection3['body']['$id'] => [
+                        '$id' => $collection3['body']['$id'],
+                        'Rating' => '10',
+                        $collection4['body']['$id'] => [
+                            '$id' => $collection4['body']['$id'],
+                            'Rating' => '10',
+                            $collection5['body']['$id'] => [
+                                '$id' => $collection5['body']['$id'],
+                                'Rating' => '10'
+                            ]
+                        ]
+                    ]
+                ]
+            ]
+        ]);
+        $this->assertEquals(200, $response['headers']['status-code']);
+        $this->assertEquals($parentDocument['body'], $response['body']);
+
+        // Giving update permission of collection 3 to user.
+        $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/collections/collection3', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'collectionId' => ID::custom('collection3'),
+            'name' => ID::custom('collection3'),
+            'documentSecurity' => false,
+            'permissions' => [
+                Permission::create(Role::user($userId)),
+                Permission::read(Role::user($userId)),
+                Permission::update(Role::user($userId)),
+                Permission::delete(Role::user($userId)),
+            ]
+        ]);
+
+        // This is the point of this test. We should be allowed to do this action, and it should not fail on permission check
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/collections/' . $collection1['body']['$id'] . '/documents/' . $collection1['body']['$id'], array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'data' => [
+                'Title' => 'Captain America',
+                $collection2['body']['$id'] => [
+                    '$id' => ID::custom($collection2['body']['$id']),
+                    'Rating' => '10',
+                    $collection3['body']['$id'] => [
+                        '$id' => ID::custom($collection3['body']['$id']),
+                        'Rating' => '11',
+                        $collection4['body']['$id'] => [
+                            '$id' => ID::custom($collection4['body']['$id']),
+                            'Rating' => '10',
+                            $collection5['body']['$id'] => [
+                                '$id' => ID::custom($collection5['body']['$id']),
+                                'Rating' => '11'
+                            ]
+                        ]
+                    ]
+                ]
+            ]
+        ]);
+
+        $this->assertEquals(200, $response['headers']['status-code']);
+        $this->assertEquals(11, $response['body'][$collection2['body']['$id']]['collection3']['Rating']);
+
+        // We should not be allowed to update the document as we do not have permission for collection 2.
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/collections/' . $collection1['body']['$id'] . '/documents/' . $collection1['body']['$id'], array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'data' => [
+                'Title' => 'Captain America',
+                $collection2['body']['$id'] => [
+                    '$id' => ID::custom($collection2['body']['$id']),
+                    'Rating' => '11',
+                    $collection3['body']['$id'] => null,
+                ]
+            ]
+        ]);
+
+        $this->assertEquals(401, $response['headers']['status-code']);
+
+        // We should not be allowed to update the document as we do not have permission for collection 2.
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/collections/' . $collection2['body']['$id'] . '/documents/' . $collection2['body']['$id'], array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'data' => [
+                'Rating' => '11',
+            ]
+        ]);
+
+        $this->assertEquals(401, $response['headers']['status-code']);
+
+        // Removing update permission from collection 3.
+        $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/collections/collection3', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'collectionId' => ID::custom('collection3'),
+            'name' => ID::custom('collection3'),
+            'documentSecurity' => false,
+            'permissions' => [
+                Permission::create(Role::user($userId)),
+                Permission::read(Role::user($userId)),
+                Permission::delete(Role::user($userId)),
+            ]
+        ]);
+
+        // Giving update permission to collection 2.
+        $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/collections/collection2', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'collectionId' => ID::custom('collection2'),
+            'name' => ID::custom('collection2'),
+            'documentSecurity' => false,
+            'permissions' => [
+                Permission::create(Role::user($userId)),
+                Permission::update(Role::user($userId)),
+                Permission::read(Role::user($userId)),
+                Permission::delete(Role::user($userId)),
+            ]
+        ]);
+
+        // Creating collection 3 new document
+        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections/' . $collection3['body']['$id'] . '/documents', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'documentId' => ID::custom('collection3Doc1'),
+            'data' => [
+                'Rating' => '20'
+            ]
+        ]);
+
+        $this->assertEquals(201, $response['headers']['status-code']);
+
+        // We should be allowed to link a new document from collection 3 to collection 2.
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/collections/' . $collection1['body']['$id'] . '/documents/' . $collection1['body']['$id'], array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'data' => [
+                'Title' => 'Captain America',
+                $collection2['body']['$id'] => [
+                    '$id' => ID::custom($collection2['body']['$id']),
+                    $collection3['body']['$id'] => 'collection3Doc1',
+                ]
+            ]
+        ]);
+
+        $this->assertEquals(200, $response['headers']['status-code']);
+
+
+        // We should be allowed to link and create a new document from collection 3 to collection 2.
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/collections/' . $collection1['body']['$id'] . '/documents/' . $collection1['body']['$id'], array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'data' => [
+                'Title' => 'Captain America',
+                $collection2['body']['$id'] => [
+                    '$id' => ID::custom($collection2['body']['$id']),
+                    $collection3['body']['$id'] => [
+                        '$id' => ID::custom('collection3Doc2')
+                    ],
+                ]
+            ]
+        ]);
+
+        $this->assertEquals(200, $response['headers']['status-code']);
+    }
 }

tests/e2e/Services/Functions/FunctionsConsoleClientTest.php

@@ -68,7 +68,7 @@ class FunctionsConsoleClientTest extends Scope
     /**
      * @depends testCreateFunction
      */
-    public function testGetFunctionUsage(array $data)
+    public function testGetCollectionUsage(array $data)
     {
         /**
          * Test for FAILURE
@@ -104,15 +104,16 @@ class FunctionsConsoleClientTest extends Scope
         ]);
 
         $this->assertEquals($response['headers']['status-code'], 200);
-        $this->assertEquals(count($response['body']), 8);
+        $this->assertEquals(count($response['body']), 9);
         $this->assertEquals($response['body']['range'], '24h');
-        $this->assertIsArray($response['body']['deploymentsTotal']);
-        $this->assertIsArray($response['body']['deploymentsStorage']);
-        $this->assertIsArray($response['body']['buildsTotal']);
-        $this->assertIsArray($response['body']['buildsStorage']);
-        $this->assertIsArray($response['body']['buildsTime']);
         $this->assertIsArray($response['body']['executionsTotal']);
+        $this->assertIsArray($response['body']['executionsFailure']);
+        $this->assertIsArray($response['body']['executionsSuccess']);
         $this->assertIsArray($response['body']['executionsTime']);
+        $this->assertIsArray($response['body']['buildsTotal']);
+        $this->assertIsArray($response['body']['buildsFailure']);
+        $this->assertIsArray($response['body']['buildsSuccess']);
+        $this->assertIsArray($response['body']['buildsTime']);
     }
 
     /**