mirror of
https://github.com/directus/directus.git
synced 2026-01-27 20:38:21 -05:00
* Step 1 * Step 2 * False sense of confidence * Couple more before dinner * Update schema package * Update format-title * Upgrade specs file * Close * Replace ts-node-dev with tsx, and various others * Replace lodash with lodash-es * Add lodash-es types * Update knex import * More fun is had * FSE * Consolidate repos * Various tweaks and fixes * Fix specs * Remove dependency on knex-schema-inspector * Fix wrong imports of inspector * Move shared exceptions to new package * Move constants to separate module * Move types to new types package * Use directus/types * I believe this is no longer needed * [WIP] Start moving utils to esm * ESMify Shared * Move shared utils to @directus/utils * Use @directus/utils instead of @directus/shared/utils * It runs! * Use correct schemaoverview type * Fix imports * Fix the thing * Start on new update-checker lib * Use new update-check package * Swap out directus/shared in app * Pushing through the last bits now * Dangerously make extensions SDK ESM * Use @directus/types in tests * Copy util function to test * Fix linter config * Add missing import * Hot takes * Fix build * Curse these default exports * No tests in constants * Add tests * Remove tests from types * Add tests for exceptions * Fix test * Fix app tests * Fix import in test * Fix various tests * Fix specs export * Some more tests * Remove broken integration tests These were broken beyond repair.. They were also written before we really knew what we we're doing with tests, so I think it's better to say goodbye and start over with these * Regenerate lockfile * Fix imports from merge * I create my own problems * Make sharp play nice * Add vitest config * Install missing blackbox dep * Consts shouldn't be in types tsk tsk tsk tsk * Fix type/const usage in extensions-sdk * cursed.default * Reduce circular deps * Fix circular dep in items service * vvv * Trigger testing for all vendors * Add workaround for rollup * Prepend the file protocol for the ESM loader to be compatible with Windows "WARN: Only URLs with a scheme in: file and data are supported by the default ESM loader. On Windows, absolute paths must be valid file:// URLs. Received protocol 'c:'" * Fix postgres * Schema package updates Co-authored-by: Azri Kahar <42867097+azrikahar@users.noreply.github.com> * Resolve cjs/mjs extensions * Clean-up eslint config * fixed extension concatination * using string interpolation for consistency * Revert MySQL optimisation * Revert testing for all vendors * Replace tsx with esbuild-kit/esm-loader Is a bit faster and we can rely on the built-in `watch` and `inspect` functionalities of Node.js Note: The possibility to watch other files (.env in our case) might be added in the future, see https://github.com/nodejs/node/issues/45467 * Use exact version for esbuild-kit/esm-loader * Fix import --------- Co-authored-by: ian <licitdev@gmail.com> Co-authored-by: Brainslug <tim@brainslug.nl> Co-authored-by: Azri Kahar <42867097+azrikahar@users.noreply.github.com> Co-authored-by: Pascal Jufer <pascal-jufer@bluewin.ch>
59 lines
2.0 KiB
TypeScript
59 lines
2.0 KiB
TypeScript
import type { RequestHandler } from 'express';
|
|
import { getCache, getCacheValue } from '../cache.js';
|
|
import env from '../env.js';
|
|
import logger from '../logger.js';
|
|
import asyncHandler from '../utils/async-handler.js';
|
|
import { getCacheControlHeader } from '../utils/get-cache-headers.js';
|
|
import { getCacheKey } from '../utils/get-cache-key.js';
|
|
import { shouldSkipCache } from '../utils/should-skip-cache.js';
|
|
|
|
const checkCacheMiddleware: RequestHandler = asyncHandler(async (req, res, next) => {
|
|
const { cache } = getCache();
|
|
|
|
if (req.method.toLowerCase() !== 'get' && req.originalUrl?.startsWith('/graphql') === false) return next();
|
|
if (env['CACHE_ENABLED'] !== true) return next();
|
|
if (!cache) return next();
|
|
|
|
if (shouldSkipCache(req)) {
|
|
if (env['CACHE_STATUS_HEADER']) res.setHeader(`${env['CACHE_STATUS_HEADER']}`, 'MISS');
|
|
return next();
|
|
}
|
|
|
|
const key = getCacheKey(req);
|
|
|
|
let cachedData;
|
|
|
|
try {
|
|
cachedData = await getCacheValue(cache, key);
|
|
} catch (err: any) {
|
|
logger.warn(err, `[cache] Couldn't read key ${key}. ${err.message}`);
|
|
if (env['CACHE_STATUS_HEADER']) res.setHeader(`${env['CACHE_STATUS_HEADER']}`, 'MISS');
|
|
return next();
|
|
}
|
|
|
|
if (cachedData) {
|
|
let cacheExpiryDate;
|
|
|
|
try {
|
|
cacheExpiryDate = (await getCacheValue(cache, `${key}__expires_at`))?.exp;
|
|
} catch (err: any) {
|
|
logger.warn(err, `[cache] Couldn't read key ${`${key}__expires_at`}. ${err.message}`);
|
|
if (env['CACHE_STATUS_HEADER']) res.setHeader(`${env['CACHE_STATUS_HEADER']}`, 'MISS');
|
|
return next();
|
|
}
|
|
|
|
const cacheTTL = cacheExpiryDate ? cacheExpiryDate - Date.now() : undefined;
|
|
|
|
res.setHeader('Cache-Control', getCacheControlHeader(req, cacheTTL, true, true));
|
|
res.setHeader('Vary', 'Origin, Cache-Control');
|
|
if (env['CACHE_STATUS_HEADER']) res.setHeader(`${env['CACHE_STATUS_HEADER']}`, 'HIT');
|
|
|
|
return res.json(cachedData);
|
|
} else {
|
|
if (env['CACHE_STATUS_HEADER']) res.setHeader(`${env['CACHE_STATUS_HEADER']}`, 'MISS');
|
|
return next();
|
|
}
|
|
});
|
|
|
|
export default checkCacheMiddleware;
|