@directus/api 19.0.1 → 19.0.2

package/dist/controllers/utils.js

@@ -114,7 +114,8 @@ router.post('/cache/clear', asyncHandler(async (req, res) => {
         accountability: req.accountability,
         schema: req.schema,
     });
-    await service.clearCache();
+    const clearSystemCache = 'system' in req.query && (req.query['system'] === '' || Boolean(req.query['system']));
+    await service.clearCache({ system: clearSystemCache });
     res.status(200).end();
 }));
 export default router;

package/dist/services/utils.d.ts

@@ -10,5 +10,7 @@ export declare class UtilsService {
         item: PrimaryKey;
         to: PrimaryKey;
     }): Promise<void>;
-    clearCache(): Promise<void>;
+    clearCache({ system }: {
+        system: boolean;
+    }): Promise<void>;
 }

package/dist/services/utils.js

@@ -1,6 +1,6 @@
 import { ForbiddenError, InvalidPayloadError } from '@directus/errors';
 import { systemCollectionRows } from '@directus/system-data';
-import { flushCaches, getCache } from '../cache.js';
+import { clearSystemCache, getCache } from '../cache.js';
 import getDatabase from '../database/index.js';
 import emitter from '../emitter.js';
 import { shouldClearCache } from '../utils/should-clear-cache.js';
@@ -112,10 +112,14 @@ export class UtilsService {
             accountability: this.accountability,
         });
     }
-    async clearCache() {
+    async clearCache({ system }) {
         if (this.accountability?.admin !== true) {
             throw new ForbiddenError();
         }
-        return flushCaches(true);
+        const { cache } = getCache();
+        if (system) {
+            await clearSystemCache({ forced: true });
+        }
+        return cache?.clear();
     }
 }

package/dist/utils/get-cache-headers.js

@@ -16,6 +16,9 @@ export function getCacheControlHeader(req, ttl, globalCacheSettings, personalize
     // When the resource / current request shouldn't be cached
     if (ttl === undefined || ttl < 0)
         return 'no-cache';
+    // When the API cache can invalidate at any moment
+    if (globalCacheSettings && env['CACHE_AUTO_PURGE'] === true)
+        return 'no-cache';
     const headerValues = [];
     // When caching depends on the authentication status of the users
     if (personalized) {

package/dist/utils/get-schema.js

@@ -34,24 +34,33 @@ export async function getSchema(options, attempt = 0) {
     const lockKey = 'schemaCache--preparing';
     const messageKey = 'schemaCache--done';
     const processId = await lock.increment(lockKey);
+    if (processId >= env['CACHE_SCHEMA_MAX_ITERATIONS']) {
+        await lock.delete(lockKey);
+    }
     const currentProcessShouldHandleOperation = processId === 1;
     if (currentProcessShouldHandleOperation === false) {
         logger.trace('Schema cache is prepared in another process, waiting for result.');
-        return new Promise((resolve) => {
+        return new Promise((resolve, reject) => {
             const TIMEOUT = 10000;
-            let timeout;
-            const callback = async () => {
-                if (timeout)
-                    clearTimeout(timeout);
-                const schema = await getSchema(options, attempt + 1);
-                resolve(schema);
-                bus.unsubscribe(messageKey, callback);
-            };
-            bus.subscribe(messageKey, callback);
-            timeout = setTimeout(async () => {
+            const timeout = setTimeout(() => {
                 logger.trace('Did not receive schema callback message in time. Pulling schema...');
-                callback();
+                callback().catch(reject);
             }, TIMEOUT);
+            bus.subscribe(messageKey, callback);
+            async function callback() {
+                try {
+                    if (timeout)
+                        clearTimeout(timeout);
+                    const schema = await getSchema(options, attempt + 1);
+                    resolve(schema);
+                }
+                catch (error) {
+                    reject(error);
+                }
+                finally {
+                    bus.unsubscribe(messageKey, callback);
+                }
+            }
         });
     }
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "19.0.1",
+  "version": "19.0.2",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -146,29 +146,29 @@
     "ws": "8.16.0",
     "zod": "3.22.4",
     "zod-validation-error": "3.0.3",
-    "@directus/app": "12.0.1",
-    "@directus/env": "1.1.1",
-    "@directus/errors": "0.2.4",
-    "@directus/extensions-registry": "1.0.3",
-    "@directus/constants": "11.0.3",
+    "@directus/env": "1.1.2",
+    "@directus/app": "12.0.2",
     "@directus/extensions": "1.0.3",
+    "@directus/constants": "11.0.3",
+    "@directus/extensions-registry": "1.0.3",
+    "@directus/errors": "0.2.4",
     "@directus/extensions-sdk": "11.0.3",
     "@directus/format-title": "10.1.1",
-    "@directus/memory": "1.0.6",
     "@directus/pressure": "1.0.18",
     "@directus/schema": "11.0.1",
+    "@directus/memory": "1.0.6",
     "@directus/specs": "10.2.8",
     "@directus/storage-driver-azure": "10.0.19",
-    "@directus/storage": "10.0.11",
     "@directus/storage-driver-gcs": "10.0.19",
     "@directus/storage-driver-cloudinary": "10.0.19",
+    "@directus/storage-driver-local": "10.0.18",
+    "@directus/storage": "10.0.11",
     "@directus/storage-driver-s3": "10.0.20",
     "@directus/storage-driver-supabase": "1.0.11",
-    "@directus/storage-driver-local": "10.0.18",
     "@directus/system-data": "1.0.2",
-    "@directus/validation": "0.0.14",
+    "directus": "10.10.7",
     "@directus/utils": "11.0.7",
-    "directus": "10.10.6"
+    "@directus/validation": "0.0.14"
   },
   "devDependencies": {
     "@ngneat/falso": "7.2.0",