@directus/api 9.25.1 → 9.25.2

package/dist/app.js

@@ -6,7 +6,6 @@ import { createRequire } from 'node:module';
 import path from 'path';
 import qs from 'qs';
 import { registerAuthProviders } from './auth.js';
-import { flushCaches } from './cache.js';
 import activityRouter from './controllers/activity.js';
 import assetsRouter from './controllers/assets.js';
 import authRouter from './controllers/auth.js';
@@ -76,7 +75,6 @@ export default async function createApp() {
     if ((await validateMigrations()) === false) {
         logger.warn(`Database migrations have not all been run`);
     }
-    await flushCaches();
     await registerAuthProviders();
     const extensionManager = getExtensionManager();
     const flowManager = getFlowManager();

package/dist/controllers/assets.js

@@ -105,18 +105,23 @@ asyncHandler(async (req, res) => {
         accountability: req.accountability,
         schema: req.schema,
     });
+    const vary = ['Origin', 'Cache-Control'];
     const transformation = res.locals['transformation'].key
         ? res.locals['shortcuts'].find((transformation) => transformation['key'] === res.locals['transformation'].key)
         : res.locals['transformation'];
-    if (transformation.format === 'auto' && req.headers.accept) {
-        let format = 'jpg';
-        if (req.headers.accept.includes('image/webp')) {
+    if (transformation.format === 'auto') {
+        let format;
+        if (req.headers.accept?.includes('image/avif')) {
+            format = 'avif';
+        }
+        else if (req.headers.accept?.includes('image/webp')) {
             format = 'webp';
         }
-        else if (req.headers.accept.includes('image/avif')) {
-            format = 'avif';
+        else {
+            format = 'jpg';
         }
         transformation.format = format;
+        vary.push('Accept');
     }
     let range = undefined;
     if (req.headers.range) {
@@ -141,6 +146,7 @@ asyncHandler(async (req, res) => {
     res.setHeader('Content-Type', file.type);
     res.setHeader('Accept-Ranges', 'bytes');
     res.setHeader('Cache-Control', getCacheControlHeader(req, getMilliseconds(env['ASSETS_CACHE_TTL']), false, true));
+    res.setHeader('Vary', vary.join(', '));
     const unixTime = Date.parse(file.modified_on);
     if (!Number.isNaN(unixTime)) {
         const lastModifiedDate = new Date(unixTime);

package/dist/database/migrations/run.js

@@ -4,6 +4,7 @@ import { orderBy } from 'lodash-es';
 import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import path from 'path';
+import { flushCaches } from '../../cache.js';
 import env from '../../env.js';
 import logger from '../../logger.js';
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -59,6 +60,7 @@ export default async function run(database, direction, log = true) {
         }
         await up(database);
         await database.insert({ version: nextVersion.version, name: nextVersion.name }).into('directus_migrations');
+        await flushCaches(true);
     }
     async function down() {
         const lastAppliedMigration = orderBy(completedMigrations, ['timestamp', 'version'], ['desc', 'desc'])[0];
@@ -75,10 +77,13 @@ export default async function run(database, direction, log = true) {
         }
         await down(database);
         await database('directus_migrations').delete().where({ version: migration.version });
+        await flushCaches(true);
     }
     async function latest() {
+        let needsCacheFlush = false;
         for (const migration of migrations) {
             if (migration.completed === false) {
+                needsCacheFlush = true;
                 const { up } = await import(`file://${migration.file}`);
                 if (log) {
                     logger.info(`Applying ${migration.name}...`);
@@ -87,5 +92,8 @@ export default async function run(database, direction, log = true) {
                 await database.insert({ version: migration.version, name: migration.name }).into('directus_migrations');
             }
         }
+        if (needsCacheFlush) {
+            await flushCaches(true);
+        }
     }
 }

package/dist/extensions.js

@@ -7,7 +7,6 @@ import nodeResolveDefault from '@rollup/plugin-node-resolve';
 import virtualDefault from '@rollup/plugin-virtual';
 import chokidar from 'chokidar';
 import express, { Router } from 'express';
-import globby from 'globby';
 import { clone, escapeRegExp } from 'lodash-es';
 import { schedule, validate } from 'node-cron';
 import { readdir } from 'node:fs/promises';
@@ -67,15 +66,15 @@ class ExtensionManager {
         this.appExtensionChunks = new Map();
     }
     async initialize(options = {}) {
-        const prevOptions = this.options;
         this.options = {
             ...defaultOptions,
             ...options,
         };
-        if (!prevOptions.watch && this.options.watch) {
+        const wasWatcherInitialized = this.watcher !== null;
+        if (this.options.watch && !wasWatcherInitialized) {
             this.initializeWatcher();
         }
-        else if (prevOptions.watch && !this.options.watch) {
+        else if (!this.options.watch && wasWatcherInitialized) {
             await this.closeWatcher();
         }
         if (!this.isLoaded) {
@@ -85,7 +84,7 @@ class ExtensionManager {
                 logger.info(`Loaded extensions: ${loadedExtensions.map((ext) => ext.name).join(', ')}`);
             }
         }
-        if (!prevOptions.watch && this.options.watch) {
+        if (this.options.watch && !wasWatcherInitialized) {
             this.updateWatchedExtensions(this.extensions);
         }
     }
@@ -198,29 +197,32 @@ class ExtensionManager {
         this.isLoaded = false;
     }
     initializeWatcher() {
-        if (!this.watcher) {
-            logger.info('Watching extensions for changes...');
-            const localExtensionPaths = NESTED_EXTENSION_TYPES.flatMap((type) => {
-                const typeDir = path.posix.join(pathToRelativeUrl(env['EXTENSIONS_PATH']), pluralize(type));
-                if (isIn(type, HYBRID_EXTENSION_TYPES)) {
-                    return [path.posix.join(typeDir, '*', 'app.js'), path.posix.join(typeDir, '*', 'api.js')];
-                }
-                else {
-                    return path.posix.join(typeDir, '*', 'index.js');
-                }
-            });
-            this.watcher = chokidar.watch([path.resolve('package.json'), ...localExtensionPaths], {
-                ignoreInitial: true,
-            });
-            this.watcher
-                .on('add', () => this.reload())
-                .on('change', () => this.reload())
-                .on('unlink', () => this.reload());
-        }
+        logger.info('Watching extensions for changes...');
+        const localExtensionPaths = NESTED_EXTENSION_TYPES.flatMap((type) => {
+            const typeDir = path.posix.join(pathToRelativeUrl(env['EXTENSIONS_PATH']), pluralize(type));
+            const fileExts = ['js', 'mjs', 'cjs'];
+            if (isIn(type, HYBRID_EXTENSION_TYPES)) {
+                return [
+                    path.posix.join(typeDir, '*', `app.{${fileExts.join()}}`),
+                    path.posix.join(typeDir, '*', `api.{${fileExts.join()}}`),
+                ];
+            }
+            else {
+                return path.posix.join(typeDir, '*', `index.{${fileExts.join()}}`);
+            }
+        });
+        this.watcher = chokidar.watch([path.resolve('package.json'), ...localExtensionPaths], {
+            ignoreInitial: true,
+        });
+        this.watcher
+            .on('add', () => this.reload())
+            .on('change', () => this.reload())
+            .on('unlink', () => this.reload());
     }
     async closeWatcher() {
         if (this.watcher) {
             await this.watcher.close();
+            this.watcher = null;
         }
     }
     updateWatchedExtensions(added, removed = []) {
@@ -295,7 +297,7 @@ class ExtensionManager {
         for (const hook of hooks) {
             try {
                 const hookPath = path.resolve(hook.path, hook.entrypoint);
-                const hookInstance = await import(`file://${hookPath}`);
+                const hookInstance = await import(`./${pathToRelativeUrl(hookPath, __dirname)}?t=${Date.now()}`);
                 const config = getModuleDefault(hookInstance);
                 this.registerHook(config);
                 this.apiExtensions.push({ path: hookPath });
@@ -311,7 +313,7 @@ class ExtensionManager {
         for (const endpoint of endpoints) {
             try {
                 const endpointPath = path.resolve(endpoint.path, endpoint.entrypoint);
-                const endpointInstance = await import(`file://${endpointPath}`);
+                const endpointInstance = await import(`./${pathToRelativeUrl(endpointPath, __dirname)}?t=${Date.now()}`);
                 const config = getModuleDefault(endpointInstance);
                 this.registerEndpoint(config, endpoint.name);
                 this.apiExtensions.push({ path: endpointPath });
@@ -323,20 +325,17 @@ class ExtensionManager {
         }
     }
     async registerOperations() {
-        const internalPaths = await globby(path.posix.join(pathToRelativeUrl(__dirname), 'operations/*/index.(js|ts)'));
-        const internalOperations = internalPaths.map((internalPath) => {
-            const dirs = internalPath.split(path.sep);
-            return {
-                name: dirs[dirs.length - 2],
-                path: dirs.slice(0, -1).join(path.sep),
-                entrypoint: { api: dirs[dirs.length - 1] },
-            };
-        });
+        const internalOperations = await readdir(path.join(__dirname, 'operations'));
+        for (const operation of internalOperations) {
+            const operationInstance = await import(`./operations/${operation}/index.js`);
+            const config = getModuleDefault(operationInstance);
+            this.registerOperation(config);
+        }
         const operations = this.extensions.filter((extension) => extension.type === 'operation');
-        for (const operation of [...internalOperations, ...operations]) {
+        for (const operation of operations) {
             try {
                 const operationPath = path.resolve(operation.path, operation.entrypoint.api);
-                const operationInstance = await import(`file://${operationPath}`);
+                const operationInstance = await import(`./${pathToRelativeUrl(operationPath, __dirname)}?t=${Date.now()}`);
                 const config = getModuleDefault(operationInstance);
                 this.registerOperation(config);
                 this.apiExtensions.push({ path: operationPath });
@@ -352,7 +351,7 @@ class ExtensionManager {
         for (const bundle of bundles) {
             try {
                 const bundlePath = path.resolve(bundle.path, bundle.entrypoint.api);
-                const bundleInstances = await import(`file://${bundlePath}`);
+                const bundleInstances = await import(`./${pathToRelativeUrl(bundlePath, __dirname)}?t=${Date.now()}`);
                 const configs = getModuleDefault(bundleInstances);
                 for (const { config } of configs.hooks) {
                     this.registerHook(config);

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

@@ -1,10 +1,12 @@
 import hash from 'object-hash';
 import url from 'url';
 import { getGraphqlQueryAndVariables } from './get-graphql-query-and-variables.js';
+import { version } from './package.js';
 export function getCacheKey(req) {
     const path = url.parse(req.originalUrl).pathname;
     const isGraphQl = path?.startsWith('/graphql');
     const info = {
+        version,
         user: req.accountability?.user || null,
         path,
         query: isGraphQl ? getGraphqlQueryAndVariables(req) : req.sanitizedQuery,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "9.25.1",
+  "version": "9.25.2",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "type": "module",
   "keywords": [
@@ -95,7 +95,6 @@
     "fast-redact": "3.1.2",
     "flat": "5.0.2",
     "fs-extra": "11.1.0",
-    "globby": "11.1.0",
     "graphql": "16.6.0",
     "graphql-compose": "9.0.10",
     "helmet": "6.0.1",
@@ -144,20 +143,20 @@
     "uuid-validate": "0.0.3",
     "vm2": "3.9.16",
     "wellknown": "0.5.0",
-    "@directus/app": "9.25.1",
-    "@directus/constants": "9.25.1",
-    "@directus/exceptions": "9.25.1",
-    "@directus/extensions-sdk": "9.25.1",
-    "@directus/schema": "9.25.1",
-    "@directus/specs": "9.25.1",
-    "@directus/storage": "9.25.1",
-    "@directus/storage-driver-azure": "9.25.1",
-    "@directus/storage-driver-cloudinary": "9.25.1",
-    "@directus/storage-driver-gcs": "9.25.1",
-    "@directus/storage-driver-local": "9.25.1",
-    "@directus/storage-driver-s3": "9.25.1",
-    "@directus/update-check": "9.25.1",
-    "@directus/utils": "9.25.1"
+    "@directus/app": "9.25.2",
+    "@directus/constants": "9.25.2",
+    "@directus/exceptions": "9.25.2",
+    "@directus/extensions-sdk": "9.25.2",
+    "@directus/schema": "9.25.2",
+    "@directus/specs": "9.25.2",
+    "@directus/storage": "9.25.2",
+    "@directus/storage-driver-azure": "9.25.2",
+    "@directus/storage-driver-cloudinary": "9.25.2",
+    "@directus/storage-driver-gcs": "9.25.2",
+    "@directus/storage-driver-local": "9.25.2",
+    "@directus/storage-driver-s3": "9.25.2",
+    "@directus/update-check": "9.25.2",
+    "@directus/utils": "9.25.2"
   },
   "devDependencies": {
     "@directus/tsconfig": "0.0.6",
@@ -206,7 +205,7 @@
     "supertest": "6.3.3",
     "typescript": "4.9.5",
     "vitest": "0.29.3",
-    "@directus/types": "9.25.1"
+    "@directus/types": "9.25.2"
   },
   "optionalDependencies": {
     "@keyv/redis": "2.5.7",