mirror of
https://github.com/directus/directus.git
synced 2026-04-03 03:00:39 -04:00
* Update `@directus/api` deps (minor)
@aws-sdk/client-ses 3.292.0 → 3.316.0
@godaddy/terminus 4.11.2 → 4.12.0
@rollup/plugin-alias 4.0.3 → 4.0.4
@rollup/plugin-node-resolve 15.0.1 → 15.0.2
@types/node 18.15.3 → 18.15.11
@vitest/coverage-c8 0.29.3 → 0.30.1
axios 1.3.4 → 1.3.6
fs-extra 11.1.0 → 11.1.1
helmet 6.0.1 → 6.1.5
ioredis 5.3.1 → 5.3.2
joi 17.8.4 → 17.9.1
liquidjs 10.6.1 → 10.7.0
marked 4.2.12 → 4.3.0
nanoid 3.3.4 → 3.3.6
rollup 3.19.1 → 3.20.6
sharp 0.31.3 → 0.32.0
vitest 0.29.3 → 0.30.1
vm2 3.9.16 → 3.9.17
* Update `@directus/api` deps (major)
@rollup/plugin-alias 4.0.4 → 5.0.0
@types/inquirer 8.2.6 → 9.0.3
@types/node 18.15.11 → 18.15.12
camelcase 6.3.0 → 7.0.1
chalk 4.1.2 → 5.2.0
commander 9.5.0 → 10.0.1
execa 5.1.1 → 7.1.1
icc 2.0.0 → 3.0.0
inquirer 8.2.5 → 9.1.5
~ldapjs 2.3.3 → 3.0.2~
nanoid 3.3.6 → 4.0.2
~openapi3-ts 3.2.0 → 4.1.1~
ora 5.4.1 → 6.3.0
strip-bom-stream 4.0.0 → 5.0.0
tedious 15.1.3 → 16.0.0
typescript 4.9.5 → 5.0.4
* Update `@directus/app` deps
@babel/core 7.21.3 → 7.21.4
@babel/preset-env 7.20.2 → 7.21.4
@fortawesome/fontawesome-svg-core 6.3.0 → 6.4.0
@fortawesome/free-brands-svg-icons 6.3.0 → 6.4.0
@fullcalendar/core 6.1.4 → 6.1.5
@fullcalendar/daygrid 6.1.4 → 6.1.5
@fullcalendar/interaction 6.1.4 → 6.1.5
@fullcalendar/list 6.1.4 → 6.1.5
@fullcalendar/timegrid 6.1.4 → 6.1.5
@pinia/testing 0.0.15 → 0.0.16
@popperjs/core 2.11.6 → 2.11.7
@storybook/addon-actions 7.0.0-rc.4 → 7.0.6
@storybook/addon-backgrounds 7.0.0-rc.4 → 7.0.6
@storybook/addon-docs 7.0.0-rc.4 → 7.0.6
@storybook/addon-essentials 7.0.0-rc.4 → 7.0.6
@storybook/addon-links 7.0.0-rc.4 → 7.0.6
@storybook/addon-mdx-gfm 7.0.0-rc.4 → 7.0.6
@storybook/addon-measure 7.0.0-rc.4 → 7.0.6
@storybook/addon-outline 7.0.0-rc.4 → 7.0.6
@storybook/client-api 7.0.0-rc.4 → 7.0.6
@storybook/client-logger 7.0.0-rc.4 → 7.0.6
@storybook/vue3 7.0.0-rc.4 → 7.0.6
@storybook/vue3-vite 7.0.0-rc.4 → 7.0.6
@types/diff 5.0.2 → 5.0.3
@types/dompurify 3.0.0 → 3.0.2
@types/lodash 4.14.191 → 4.14.194
@vitejs/plugin-vue 4.0.0 → 4.1.0
@vue/test-utils 2.3.1 → 2.3.2
apexcharts 3.37.1 → 3.39.0
axios 1.3.4 → 1.3.6
dompurify 3.0.1 → 3.0.2
happy-dom 8.9.0 → 9.8.4
marked 4.2.12 → 4.3.0
nanoid 4.0.1 → 4.0.2
pinia 2.0.33 → 2.0.34
sass 1.59.3 → 1.62.0
storybook 7.0.0-rc.4 → 7.0.6
typescript 4.9.5 → 5.0.4
vite 4.1.4 → 4.2.2
vitest 0.29.3 → 0.30.1
webpack 5.76.2 → 5.80.0
* Update root deps
* Update `@directus/composables` deps
* Update `@directus/constant` deps
* Update `create-directus-extension` deps
* Update `@directus/exceptions` deps
* tsconfig workaround: ignoreDeprecations
* Update `@directus/extensions-sdk` deps
* Update `@directus/schema` deps
* Update `@directus/storage` deps
* Update `@directus/storage-driver-azure` deps
* Update `@directus/storage-driver-cloudinary` deps
* Update `@directus/storage-driver-gcs` deps
* Update `@directus/storage-driver-local` deps
* Update `@directus/storage-driver-s3` deps
* Update `@directus/types` deps
* Update `@directus/update-check` deps
* Update `@directus/utils` deps
* tsconfig workaround in schema: ignoreDeprecations
* tsconfig workaround in remaining packages: ignoreDeprecations
* Update `tests-blackbox` deps
* Revert "tsconfig workaround: ignoreDeprecations"
This reverts commit 5d97da55e3.
* Revert tsconfig override
* Update tsconfig
* Fix imports in @directus/utils
* Fix imports in composables
* Fix imports in extensions-sdk
* Fix imports in @directus/api
* Move RateLimiterAbstract to types import as well
* Bump pnpm to 8.3.1
* Update `docs` deps
> [...] the @vueuse/head package will be deprecated. If you're setting up this package on a new project, you should use the @unhead/vue package directly [...]
* Remove obselete dep `concurrently` from extensions-sdk
Co-authored-by: Azri Kahar <42867097+azrikahar@users.noreply.github.com>
* New day, new updates
Also forgot to include minor updates of deps in `tests-blackbox` in previous
commit
* Fix `api` tests
---------
Co-authored-by: Rijk van Zanten <rijkvanzanten@me.com>
Co-authored-by: Azri Kahar <42867097+azrikahar@users.noreply.github.com>
192 lines
6.0 KiB
TypeScript
192 lines
6.0 KiB
TypeScript
import type { SchemaOverview } from '@directus/types';
|
|
import { getSimpleHash } from '@directus/utils';
|
|
import type { Options } from 'keyv';
|
|
import Keyv from 'keyv';
|
|
import env from './env.js';
|
|
import logger from './logger.js';
|
|
import { getMessenger } from './messenger.js';
|
|
import { compress, decompress } from './utils/compress.js';
|
|
import { getConfigFromEnv } from './utils/get-config-from-env.js';
|
|
import { getMilliseconds } from './utils/get-milliseconds.js';
|
|
import { validateEnv } from './utils/validate-env.js';
|
|
|
|
import { createRequire } from 'node:module';
|
|
|
|
const require = createRequire(import.meta.url);
|
|
|
|
let cache: Keyv | null = null;
|
|
let systemCache: Keyv | null = null;
|
|
let localSchemaCache: Keyv | null = null;
|
|
let sharedSchemaCache: Keyv | null = null;
|
|
let lockCache: Keyv | null = null;
|
|
let messengerSubscribed = false;
|
|
|
|
type Store = 'memory' | 'redis' | 'memcache';
|
|
|
|
const messenger = getMessenger();
|
|
|
|
if (
|
|
env['MESSENGER_STORE'] === 'redis' &&
|
|
env['CACHE_STORE'] === 'memory' &&
|
|
env['CACHE_AUTO_PURGE'] &&
|
|
!messengerSubscribed
|
|
) {
|
|
messengerSubscribed = true;
|
|
|
|
messenger.subscribe('schemaChanged', async (opts) => {
|
|
if (cache && opts?.['autoPurgeCache'] !== false) {
|
|
await cache.clear();
|
|
}
|
|
});
|
|
}
|
|
|
|
export function getCache(): {
|
|
cache: Keyv | null;
|
|
systemCache: Keyv;
|
|
sharedSchemaCache: Keyv;
|
|
localSchemaCache: Keyv;
|
|
lockCache: Keyv;
|
|
} {
|
|
if (env['CACHE_ENABLED'] === true && cache === null) {
|
|
validateEnv(['CACHE_NAMESPACE', 'CACHE_TTL', 'CACHE_STORE']);
|
|
cache = getKeyvInstance(env['CACHE_STORE'], getMilliseconds(env['CACHE_TTL']));
|
|
cache.on('error', (err) => logger.warn(err, `[cache] ${err}`));
|
|
}
|
|
|
|
if (systemCache === null) {
|
|
systemCache = getKeyvInstance(env['CACHE_STORE'], getMilliseconds(env['CACHE_SYSTEM_TTL']), '_system');
|
|
systemCache.on('error', (err) => logger.warn(err, `[system-cache] ${err}`));
|
|
}
|
|
|
|
if (sharedSchemaCache === null) {
|
|
sharedSchemaCache = getKeyvInstance(env['CACHE_STORE'], getMilliseconds(env['CACHE_SYSTEM_TTL']), '_schema_shared');
|
|
sharedSchemaCache.on('error', (err) => logger.warn(err, `[shared-schema-cache] ${err}`));
|
|
}
|
|
|
|
if (localSchemaCache === null) {
|
|
localSchemaCache = getKeyvInstance('memory', getMilliseconds(env['CACHE_SYSTEM_TTL']), '_schema');
|
|
localSchemaCache.on('error', (err) => logger.warn(err, `[schema-cache] ${err}`));
|
|
}
|
|
|
|
if (lockCache === null) {
|
|
lockCache = getKeyvInstance(env['CACHE_STORE'], undefined, '_lock');
|
|
lockCache.on('error', (err) => logger.warn(err, `[lock-cache] ${err}`));
|
|
}
|
|
|
|
return { cache, systemCache, sharedSchemaCache, localSchemaCache, lockCache };
|
|
}
|
|
|
|
export async function flushCaches(forced?: boolean): Promise<void> {
|
|
const { cache } = getCache();
|
|
await clearSystemCache({ forced });
|
|
await cache?.clear();
|
|
}
|
|
|
|
export async function clearSystemCache(opts?: {
|
|
forced?: boolean | undefined;
|
|
autoPurgeCache?: false | undefined;
|
|
}): Promise<void> {
|
|
const { systemCache, localSchemaCache, lockCache } = getCache();
|
|
|
|
// Flush system cache when forced or when system cache lock not set
|
|
if (opts?.forced || !(await lockCache.get('system-cache-lock'))) {
|
|
await lockCache.set('system-cache-lock', true, 10000);
|
|
await systemCache.clear();
|
|
await lockCache.delete('system-cache-lock');
|
|
}
|
|
|
|
await localSchemaCache.clear();
|
|
messenger.publish('schemaChanged', { autoPurgeCache: opts?.autoPurgeCache });
|
|
}
|
|
|
|
export async function setSystemCache(key: string, value: any, ttl?: number): Promise<void> {
|
|
const { systemCache, lockCache } = getCache();
|
|
|
|
if (!(await lockCache.get('system-cache-lock'))) {
|
|
await setCacheValue(systemCache, key, value, ttl);
|
|
}
|
|
}
|
|
|
|
export async function getSystemCache(key: string): Promise<Record<string, any>> {
|
|
const { systemCache } = getCache();
|
|
|
|
return await getCacheValue(systemCache, key);
|
|
}
|
|
|
|
export async function setSchemaCache(schema: SchemaOverview): Promise<void> {
|
|
const { localSchemaCache, sharedSchemaCache } = getCache();
|
|
const schemaHash = await getSimpleHash(JSON.stringify(schema));
|
|
|
|
await sharedSchemaCache.set('hash', schemaHash);
|
|
|
|
await localSchemaCache.set('schema', schema);
|
|
await localSchemaCache.set('hash', schemaHash);
|
|
}
|
|
|
|
export async function getSchemaCache(): Promise<SchemaOverview | undefined> {
|
|
const { localSchemaCache, sharedSchemaCache } = getCache();
|
|
|
|
const sharedSchemaHash = await sharedSchemaCache.get('hash');
|
|
if (!sharedSchemaHash) return;
|
|
|
|
const localSchemaHash = await localSchemaCache.get('hash');
|
|
if (!localSchemaHash || localSchemaHash !== sharedSchemaHash) return;
|
|
|
|
return await localSchemaCache.get('schema');
|
|
}
|
|
|
|
export async function setCacheValue(
|
|
cache: Keyv,
|
|
key: string,
|
|
value: Record<string, any> | Record<string, any>[],
|
|
ttl?: number
|
|
) {
|
|
const compressed = await compress(value);
|
|
await cache.set(key, compressed, ttl);
|
|
}
|
|
|
|
export async function getCacheValue(cache: Keyv, key: string): Promise<any> {
|
|
const value = await cache.get(key);
|
|
if (!value) return undefined;
|
|
const decompressed = await decompress(value);
|
|
return decompressed;
|
|
}
|
|
|
|
function getKeyvInstance(store: Store, ttl: number | undefined, namespaceSuffix?: string): Keyv {
|
|
switch (store) {
|
|
case 'redis':
|
|
return new Keyv(getConfig('redis', ttl, namespaceSuffix));
|
|
case 'memcache':
|
|
return new Keyv(getConfig('memcache', ttl, namespaceSuffix));
|
|
case 'memory':
|
|
default:
|
|
return new Keyv(getConfig('memory', ttl, namespaceSuffix));
|
|
}
|
|
}
|
|
|
|
function getConfig(store: Store = 'memory', ttl: number | undefined, namespaceSuffix = ''): Options<any> {
|
|
const config: Options<any> = {
|
|
namespace: `${env['CACHE_NAMESPACE']}${namespaceSuffix}`,
|
|
ttl,
|
|
};
|
|
|
|
if (store === 'redis') {
|
|
const KeyvRedis = require('@keyv/redis');
|
|
config.store = new KeyvRedis(env['CACHE_REDIS'] || getConfigFromEnv('CACHE_REDIS_'));
|
|
}
|
|
|
|
if (store === 'memcache') {
|
|
const KeyvMemcache = require('keyv-memcache');
|
|
|
|
// keyv-memcache uses memjs which only accepts a comma separated string instead of an array,
|
|
// so we need to join array into a string when applicable. See #7986
|
|
const cacheMemcache = Array.isArray(env['CACHE_MEMCACHE'])
|
|
? env['CACHE_MEMCACHE'].join(',')
|
|
: env['CACHE_MEMCACHE'];
|
|
|
|
config.store = new KeyvMemcache(cacheMemcache);
|
|
}
|
|
|
|
return config;
|
|
}
|