@directus/api 21.0.0 → 21.0.2

package/dist/cache.d.ts

@@ -13,7 +13,7 @@ export declare function clearSystemCache(opts?: {
 }): Promise<void>;
 export declare function setSystemCache(key: string, value: any, ttl?: number): Promise<void>;
 export declare function getSystemCache(key: string): Promise<Record<string, any>>;
-export declare function setSchemaCache(schema: SchemaOverview): Promise<void>;
-export declare function getSchemaCache(): Promise<SchemaOverview | undefined>;
+export declare function setLocalSchemaCache(schema: SchemaOverview): Promise<void>;
+export declare function getLocalSchemaCache(): Promise<SchemaOverview | undefined>;
 export declare function setCacheValue(cache: Keyv, key: string, value: Record<string, any> | Record<string, any>[], ttl?: number): Promise<void>;
 export declare function getCacheValue(cache: Keyv, key: string): Promise<any>;

package/dist/cache.js

@@ -72,11 +72,11 @@ export async function getSystemCache(key) {
     const { systemCache } = getCache();
     return await getCacheValue(systemCache, key);
 }
-export async function setSchemaCache(schema) {
+export async function setLocalSchemaCache(schema) {
     const { localSchemaCache } = getCache();
     await localSchemaCache.set('schema', schema);
 }
-export async function getSchemaCache() {
+export async function getLocalSchemaCache() {
     const { localSchemaCache } = getCache();
     return await localSchemaCache.get('schema');
 }

package/dist/middleware/respond.js

@@ -20,6 +20,7 @@ export const respond = asyncHandler(async (req, res) => {
         exceedsMaxSize = valueSize > maxSize;
     }
     if ((req.method.toLowerCase() === 'get' || req.originalUrl?.startsWith('/graphql')) &&
+        req.originalUrl?.startsWith('/auth') === false &&
         env['CACHE_ENABLED'] === true &&
         cache &&
         !req.sanitizedQuery.export &&

package/dist/request/is-denied-ip.js

@@ -1,4 +1,5 @@
 import { useEnv } from '@directus/env';
+import { matches } from 'ip-matching';
 import os from 'node:os';
 import { useLogger } from '../logger/index.js';
 import { ipInNetworks } from '../utils/ip-in-networks.js';
@@ -24,8 +25,13 @@ export function isDeniedIp(ip) {
             if (!networkInfo)
                 continue;
             for (const info of networkInfo) {
-                if (info.address === ip)
+                if (info.internal && info.cidr) {
+                    if (matches(ip, info.cidr))
+                        return true;
+                }
+                else if (info.address === ip) {
                     return true;
+                }
             }
         }
     }

package/dist/utils/get-schema.js

@@ -4,7 +4,7 @@ import { systemCollectionRows } from '@directus/system-data';
 import { parseJSON, toArray } from '@directus/utils';
 import { mapValues } from 'lodash-es';
 import { useBus } from '../bus/index.js';
-import { getSchemaCache, setSchemaCache } from '../cache.js';
+import { getLocalSchemaCache, setLocalSchemaCache } from '../cache.js';
 import { ALIAS_TYPES } from '../constants.js';
 import getDatabase from '../database/index.js';
 import { useLock } from '../lock/index.js';
@@ -22,7 +22,7 @@ export async function getSchema(options, attempt = 0) {
         const schemaInspector = createInspector(database);
         return await getDatabaseSchema(database, schemaInspector);
     }
-    const cached = await getSchemaCache();
+    const cached = await getLocalSchemaCache();
     if (cached) {
         return cached;
     }
@@ -40,39 +40,34 @@ export async function getSchema(options, attempt = 0) {
     const currentProcessShouldHandleOperation = processId === 1;
     if (currentProcessShouldHandleOperation === false) {
         logger.trace('Schema cache is prepared in another process, waiting for result.');
-        return new Promise((resolve, reject) => {
-            const TIMEOUT = 10000;
-            const timeout = setTimeout(() => {
-                logger.trace('Did not receive schema callback message in time. Pulling schema...');
-                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);
+        const timeout = new Promise((_, reject) => setTimeout(reject, env['CACHE_SCHEMA_SYNC_TIMEOUT']));
+        const subscription = new Promise((resolve, reject) => {
+            bus.subscribe(messageKey, busListener).catch(reject);
+            function busListener(options) {
+                if (options.schema === null) {
+                    return reject();
                 }
+                cleanup();
+                setLocalSchemaCache(options.schema).catch(reject);
+                resolve(options.schema);
+            }
+            function cleanup() {
+                bus.unsubscribe(messageKey, busListener).catch(reject);
             }
         });
+        return Promise.race([timeout, subscription]).catch(() => getSchema(options, attempt + 1));
     }
+    let schema = null;
     try {
         const database = options?.database || getDatabase();
         const schemaInspector = createInspector(database);
-        const schema = await getDatabaseSchema(database, schemaInspector);
-        await setSchemaCache(schema);
+        schema = await getDatabaseSchema(database, schemaInspector);
+        await setLocalSchemaCache(schema);
         return schema;
     }
     finally {
+        await bus.publish(messageKey, { schema });
         await lock.delete(lockKey);
-        bus.publish(messageKey, { ready: true });
     }
 }
 async function getDatabaseSchema(database, schemaInspector) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "21.0.0",
+  "version": "21.0.2",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -149,29 +149,29 @@
     "ws": "8.18.0",
     "zod": "3.23.8",
     "zod-validation-error": "3.3.0",
-    "@directus/app": "12.2.2",
-    "@directus/errors": "0.4.0",
     "@directus/constants": "11.0.4",
-    "@directus/env": "1.3.1",
+    "@directus/env": "1.3.2",
     "@directus/extensions": "1.0.10",
     "@directus/extensions-registry": "1.0.10",
+    "@directus/app": "12.2.3",
     "@directus/extensions-sdk": "11.0.10",
     "@directus/format-title": "10.1.2",
-    "@directus/memory": "1.0.11",
+    "@directus/errors": "0.4.0",
+    "@directus/memory": "1.0.12",
     "@directus/pressure": "1.0.22",
     "@directus/schema": "11.0.4",
-    "@directus/specs": "10.2.11",
     "@directus/storage": "10.1.0",
-    "@directus/storage-driver-cloudinary": "10.0.24",
+    "@directus/specs": "10.2.11",
     "@directus/storage-driver-azure": "10.0.24",
     "@directus/storage-driver-gcs": "10.0.25",
+    "@directus/storage-driver-cloudinary": "10.0.24",
+    "@directus/storage-driver-s3": "10.1.1",
     "@directus/storage-driver-local": "10.1.0",
     "@directus/storage-driver-supabase": "1.0.16",
-    "@directus/storage-driver-s3": "10.1.1",
-    "@directus/utils": "11.0.11",
-    "@directus/validation": "0.0.19",
     "@directus/system-data": "1.1.1",
-    "directus": "10.13.2"
+    "@directus/utils": "11.0.11",
+    "directus": "10.13.4",
+    "@directus/validation": "0.0.19"
   },
   "devDependencies": {
     "@ngneat/falso": "7.2.0",
@@ -212,8 +212,8 @@
     "knex-mock-client": "2.0.1",
     "typescript": "5.4.5",
     "vitest": "1.5.3",
-    "@directus/tsconfig": "1.0.1",
     "@directus/random": "0.2.8",
+    "@directus/tsconfig": "1.0.1",
     "@directus/types": "11.2.1"
   },
   "optionalDependencies": {