@directus/api 20.1.0 → 21.0.0

package/dist/app.js

@@ -44,12 +44,12 @@ import { isInstalled, validateDatabaseConnection, validateDatabaseExtensions, va
 import emitter from './emitter.js';
 import { getExtensionManager } from './extensions/index.js';
 import { getFlowManager } from './flows.js';
-import { createExpressLogger, useLogger } from './logger.js';
+import { createExpressLogger, useLogger } from './logger/index.js';
 import authenticate from './middleware/authenticate.js';
 import cache from './middleware/cache.js';
 import { checkIP } from './middleware/check-ip.js';
 import cors from './middleware/cors.js';
-import errorHandler from './middleware/error-handler.js';
+import { errorHandler } from './middleware/error-handler.js';
 import extractToken from './middleware/extract-token.js';
 import getPermissions from './middleware/get-permissions.js';
 import rateLimiterGlobal from './middleware/rate-limiter-global.js';

package/dist/auth/drivers/ldap.js

@@ -5,7 +5,7 @@ import Joi from 'joi';
 import ldap from 'ldapjs';
 import getDatabase from '../../database/index.js';
 import emitter from '../../emitter.js';
-import { useLogger } from '../../logger.js';
+import { useLogger } from '../../logger/index.js';
 import { respond } from '../../middleware/respond.js';
 import { AuthenticationService } from '../../services/authentication.js';
 import { UsersService } from '../../services/users.js';

package/dist/auth/drivers/oauth2.js

@@ -9,7 +9,7 @@ import { getAuthProvider } from '../../auth.js';
 import { REFRESH_COOKIE_OPTIONS, SESSION_COOKIE_OPTIONS } from '../../constants.js';
 import getDatabase from '../../database/index.js';
 import emitter from '../../emitter.js';
-import { useLogger } from '../../logger.js';
+import { useLogger } from '../../logger/index.js';
 import { respond } from '../../middleware/respond.js';
 import { AuthenticationService } from '../../services/authentication.js';
 import { UsersService } from '../../services/users.js';

package/dist/auth/drivers/openid.js

@@ -9,7 +9,7 @@ import { getAuthProvider } from '../../auth.js';
 import { REFRESH_COOKIE_OPTIONS, SESSION_COOKIE_OPTIONS } from '../../constants.js';
 import getDatabase from '../../database/index.js';
 import emitter from '../../emitter.js';
-import { useLogger } from '../../logger.js';
+import { useLogger } from '../../logger/index.js';
 import { respond } from '../../middleware/respond.js';
 import { AuthenticationService } from '../../services/authentication.js';
 import { UsersService } from '../../services/users.js';

package/dist/auth/drivers/saml.js

@@ -7,7 +7,7 @@ import { getAuthProvider } from '../../auth.js';
 import { REFRESH_COOKIE_OPTIONS, SESSION_COOKIE_OPTIONS } from '../../constants.js';
 import getDatabase from '../../database/index.js';
 import emitter from '../../emitter.js';
-import { useLogger } from '../../logger.js';
+import { useLogger } from '../../logger/index.js';
 import { respond } from '../../middleware/respond.js';
 import { AuthenticationService } from '../../services/authentication.js';
 import { UsersService } from '../../services/users.js';

package/dist/auth.js

@@ -4,7 +4,7 @@ import { toArray } from '@directus/utils';
 import { LDAPAuthDriver, LocalAuthDriver, OAuth2AuthDriver, OpenIDAuthDriver, SAMLAuthDriver, } from './auth/drivers/index.js';
 import { DEFAULT_AUTH_PROVIDER } from './constants.js';
 import getDatabase from './database/index.js';
-import { useLogger } from './logger.js';
+import { useLogger } from './logger/index.js';
 import { getConfigFromEnv } from './utils/get-config-from-env.js';
 import { getSchema } from './utils/get-schema.js';
 const providers = new Map();

package/dist/cache.d.ts

@@ -3,7 +3,6 @@ import Keyv from 'keyv';
 export declare function getCache(): {
     cache: Keyv | null;
     systemCache: Keyv;
-    sharedSchemaCache: Keyv;
     localSchemaCache: Keyv;
     lockCache: Keyv;
 };

package/dist/cache.js

@@ -1,8 +1,7 @@
 import { useEnv } from '@directus/env';
-import { getSimpleHash } from '@directus/utils';
 import Keyv from 'keyv';
 import { useBus } from './bus/index.js';
-import { useLogger } from './logger.js';
+import { useLogger } from './logger/index.js';
 import { redisConfigAvailable } from './redis/index.js';
 import { compress, decompress } from './utils/compress.js';
 import { getConfigFromEnv } from './utils/get-config-from-env.js';
@@ -15,16 +14,16 @@ const require = createRequire(import.meta.url);
 let cache = null;
 let systemCache = null;
 let localSchemaCache = null;
-let sharedSchemaCache = null;
 let lockCache = null;
 let messengerSubscribed = false;
 const messenger = useBus();
-if (redisConfigAvailable() && env['CACHE_STORE'] === 'memory' && env['CACHE_AUTO_PURGE'] && !messengerSubscribed) {
+if (redisConfigAvailable() && !messengerSubscribed) {
     messengerSubscribed = true;
     messenger.subscribe('schemaChanged', async (opts) => {
-        if (cache && opts?.['autoPurgeCache'] !== false) {
+        if (env['CACHE_STORE'] === 'memory' && env['CACHE_AUTO_PURGE'] && cache && opts?.['autoPurgeCache'] !== false) {
             await cache.clear();
         }
+        await localSchemaCache?.clear();
     });
 }
 export function getCache() {
@@ -37,10 +36,6 @@ export function getCache() {
         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}`));
@@ -49,7 +44,7 @@ export function getCache() {
         lockCache = getKeyvInstance(env['CACHE_STORE'], undefined, '_lock');
         lockCache.on('error', (err) => logger.warn(err, `[lock-cache] ${err}`));
     }
-    return { cache, systemCache, sharedSchemaCache, localSchemaCache, lockCache };
+    return { cache, systemCache, localSchemaCache, lockCache };
 }
 export async function flushCaches(forced) {
     const { cache } = getCache();
@@ -57,14 +52,13 @@ export async function flushCaches(forced) {
     await cache?.clear();
 }
 export async function clearSystemCache(opts) {
-    const { systemCache, localSchemaCache, lockCache, sharedSchemaCache } = getCache();
+    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 sharedSchemaCache.clear();
     await localSchemaCache.clear();
     messenger.publish('schemaChanged', { autoPurgeCache: opts?.autoPurgeCache });
 }
@@ -79,20 +73,11 @@ export async function getSystemCache(key) {
     return await getCacheValue(systemCache, key);
 }
 export async function setSchemaCache(schema) {
-    const { localSchemaCache, sharedSchemaCache } = getCache();
-    const schemaHash = getSimpleHash(JSON.stringify(schema));
-    await sharedSchemaCache.set('hash', schemaHash);
+    const { localSchemaCache } = getCache();
     await localSchemaCache.set('schema', schema);
-    await localSchemaCache.set('hash', schemaHash);
 }
 export async function getSchemaCache() {
-    const { localSchemaCache, sharedSchemaCache } = getCache();
-    const sharedSchemaHash = await sharedSchemaCache.get('hash');
-    if (!sharedSchemaHash)
-        return;
-    const localSchemaHash = await localSchemaCache.get('hash');
-    if (!localSchemaHash || localSchemaHash !== sharedSchemaHash)
-        return;
+    const { localSchemaCache } = getCache();
     return await localSchemaCache.get('schema');
 }
 export async function setCacheValue(cache, key, value, ttl) {

package/dist/cli/commands/bootstrap/index.js

@@ -2,7 +2,7 @@ import { useEnv } from '@directus/env';
 import getDatabase, { hasDatabaseConnection, isInstalled, validateDatabaseConnection, } from '../../../database/index.js';
 import runMigrations from '../../../database/migrations/run.js';
 import installDatabase from '../../../database/seeds/run.js';
-import { useLogger } from '../../../logger.js';
+import { useLogger } from '../../../logger/index.js';
 import { RolesService } from '../../../services/roles.js';
 import { SettingsService } from '../../../services/settings.js';
 import { UsersService } from '../../../services/users.js';

package/dist/cli/commands/count/index.js

@@ -1,5 +1,5 @@
 import getDatabase from '../../../database/index.js';
-import { useLogger } from '../../../logger.js';
+import { useLogger } from '../../../logger/index.js';
 export default async function count(collection) {
     const database = getDatabase();
     const logger = useLogger();

package/dist/cli/commands/database/install.js

@@ -1,6 +1,6 @@
 import installSeeds from '../../../database/seeds/run.js';
 import getDatabase from '../../../database/index.js';
-import { useLogger } from '../../../logger.js';
+import { useLogger } from '../../../logger/index.js';
 export default async function start() {
     const database = getDatabase();
     const logger = useLogger();

package/dist/cli/commands/database/migrate.js

@@ -1,6 +1,6 @@
 import run from '../../../database/migrations/run.js';
 import getDatabase from '../../../database/index.js';
-import { useLogger } from '../../../logger.js';
+import { useLogger } from '../../../logger/index.js';
 export default async function migrate(direction) {
     const database = getDatabase();
     const logger = useLogger();

package/dist/cli/commands/roles/create.js

@@ -1,7 +1,7 @@
 import { getSchema } from '../../../utils/get-schema.js';
 import { RolesService } from '../../../services/roles.js';
 import getDatabase from '../../../database/index.js';
-import { useLogger } from '../../../logger.js';
+import { useLogger } from '../../../logger/index.js';
 export default async function rolesCreate({ role: name, admin }) {
     const database = getDatabase();
     const logger = useLogger();

package/dist/cli/commands/schema/apply.js

@@ -5,7 +5,7 @@ import inquirer from 'inquirer';
 import { load as loadYaml } from 'js-yaml';
 import path from 'path';
 import getDatabase, { isInstalled, validateDatabaseConnection } from '../../../database/index.js';
-import { useLogger } from '../../../logger.js';
+import { useLogger } from '../../../logger/index.js';
 import { DiffKind } from '../../../types/index.js';
 import { isNestedMetaUpdate } from '../../../utils/apply-diff.js';
 import { applySnapshot } from '../../../utils/apply-snapshot.js';

package/dist/cli/commands/schema/snapshot.js

@@ -3,7 +3,7 @@ import inquirer from 'inquirer';
 import { dump as toYaml } from 'js-yaml';
 import path from 'path';
 import getDatabase from '../../../database/index.js';
-import { useLogger } from '../../../logger.js';
+import { useLogger } from '../../../logger/index.js';
 import { getSnapshot } from '../../../utils/get-snapshot.js';
 export async function snapshot(snapshotPath, options) {
     const database = getDatabase();

package/dist/cli/commands/users/create.js

@@ -1,5 +1,5 @@
 import getDatabase from '../../../database/index.js';
-import { useLogger } from '../../../logger.js';
+import { useLogger } from '../../../logger/index.js';
 import { UsersService } from '../../../services/users.js';
 import { getSchema } from '../../../utils/get-schema.js';
 export default async function usersCreate({ email, password, role, }) {

package/dist/cli/commands/users/passwd.js

@@ -1,5 +1,5 @@
 import getDatabase from '../../../database/index.js';
-import { useLogger } from '../../../logger.js';
+import { useLogger } from '../../../logger/index.js';
 import { UsersService } from '../../../services/users.js';
 import { generateHash } from '../../../utils/generate-hash.js';
 import { getSchema } from '../../../utils/get-schema.js';

package/dist/cli/load-extensions.js

@@ -1,7 +1,7 @@
 import { useEnv } from '@directus/env';
 import { isInstalled, validateMigrations } from '../database/index.js';
 import { getExtensionManager } from '../extensions/index.js';
-import { useLogger } from '../logger.js';
+import { useLogger } from '../logger/index.js';
 export const loadExtensions = async () => {
     const env = useEnv();
     const logger = useLogger();

package/dist/constants.js

@@ -82,8 +82,8 @@ export const SUPPORTED_IMAGE_METADATA_FORMATS = [
 /** Resumable uploads */
 export const RESUMABLE_UPLOADS = {
     ENABLED: toBoolean(env['TUS_ENABLED']),
-    CHUNK_SIZE: bytes(env['TUS_CHUNK_SIZE']),
-    MAX_SIZE: bytes(env['FILES_MAX_UPLOAD_SIZE']),
+    CHUNK_SIZE: bytes.parse(env['TUS_CHUNK_SIZE']),
+    MAX_SIZE: bytes.parse(env['FILES_MAX_UPLOAD_SIZE']),
     EXPIRATION_TIME: getMilliseconds(env['TUS_UPLOAD_EXPIRATION'], 600_000 /* 10min */),
     SCHEDULE: String(env['TUS_CLEANUP_SCHEDULE']),
 };

package/dist/controllers/assets.js

@@ -6,7 +6,7 @@ import { Router } from 'express';
 import { merge, pick } from 'lodash-es';
 import { ASSET_TRANSFORM_QUERY_KEYS, SYSTEM_ASSET_ALLOW_LIST } from '../constants.js';
 import getDatabase from '../database/index.js';
-import { useLogger } from '../logger.js';
+import { useLogger } from '../logger/index.js';
 import useCollection from '../middleware/use-collection.js';
 import { AssetsService } from '../services/assets.js';
 import { PayloadService } from '../services/payload.js';

package/dist/controllers/auth.js

@@ -3,7 +3,7 @@ import { ErrorCode, InvalidPayloadError, isDirectusError } from '@directus/error
 import { Router } from 'express';
 import { createLDAPAuthRouter, createLocalAuthRouter, createOAuth2AuthRouter, createOpenIDAuthRouter, createSAMLAuthRouter, } from '../auth/drivers/index.js';
 import { DEFAULT_AUTH_PROVIDER, REFRESH_COOKIE_OPTIONS, SESSION_COOKIE_OPTIONS } from '../constants.js';
-import { useLogger } from '../logger.js';
+import { useLogger } from '../logger/index.js';
 import { respond } from '../middleware/respond.js';
 import { AuthenticationService } from '../services/authentication.js';
 import { UsersService } from '../services/users.js';

package/dist/controllers/files.js

@@ -35,7 +35,7 @@ export const multipartHandler = (req, res, next) => {
         headers,
         defParamCharset: 'utf8',
         limits: {
-            fileSize: env['FILES_MAX_UPLOAD_SIZE'] ? bytes(env['FILES_MAX_UPLOAD_SIZE']) : undefined,
+            fileSize: env['FILES_MAX_UPLOAD_SIZE'] ? bytes.parse(env['FILES_MAX_UPLOAD_SIZE']) : undefined,
         },
     });
     const savedFiles = [];

package/dist/controllers/schema.js

@@ -3,7 +3,7 @@ import { parseJSON } from '@directus/utils';
 import Busboy from 'busboy';
 import express from 'express';
 import { load as loadYaml } from 'js-yaml';
-import { useLogger } from '../logger.js';
+import { useLogger } from '../logger/index.js';
 import { respond } from '../middleware/respond.js';
 import { SchemaService } from '../services/schema.js';
 import asyncHandler from '../utils/async-handler.js';

package/dist/controllers/tus.js

@@ -26,7 +26,7 @@ const checkFileAccess = asyncHandler(async (req, _res, next) => {
     if (!req.accountability?.admin) {
         const action = mapAction(req.method);
         if (action === 'create') {
-            // checkAccess doesnt seem to work as expected for "create" actions
+            // checkAccess doesn't seem to work as expected for "create" actions
             const hasPermission = Boolean(req.accountability?.permissions?.find((permission) => {
                 return permission.collection === 'directus_files' && permission.action === action;
             }));
@@ -45,21 +45,23 @@ const checkFileAccess = asyncHandler(async (req, _res, next) => {
     return next();
 });
 const handler = asyncHandler(async (req, res) => {
-    const tusServer = await createTusServer({
+    const [tusServer, cleanupServer] = await createTusServer({
         schema: req.schema,
         accountability: req.accountability,
     });
     await tusServer.handle(req, res);
+    cleanupServer();
 });
 export function scheduleTusCleanup() {
     if (!RESUMABLE_UPLOADS.ENABLED)
         return;
     if (validateCron(RESUMABLE_UPLOADS.SCHEDULE)) {
         scheduleSynchronizedJob('tus-cleanup', RESUMABLE_UPLOADS.SCHEDULE, async () => {
-            const tusServer = await createTusServer({
+            const [tusServer, cleanupServer] = await createTusServer({
                 schema: await getSchema(),
             });
             await tusServer.cleanUpExpiredUploads();
+            cleanupServer();
         });
     }
 }

package/dist/database/index.js

@@ -9,7 +9,7 @@ import path from 'path';
 import { performance } from 'perf_hooks';
 import { promisify } from 'util';
 import { getExtensionsPath } from '../extensions/lib/get-extensions-path.js';
-import { useLogger } from '../logger.js';
+import { useLogger } from '../logger/index.js';
 import { getConfigFromEnv } from '../utils/get-config-from-env.js';
 import { validateEnv } from '../utils/validate-env.js';
 import { getHelpers } from './helpers/index.js';
@@ -122,15 +122,19 @@ export function getDatabase() {
     }
     database = knex.default(knexConfig);
     validateDatabaseCharset(database);
-    const times = {};
+    const times = new Map();
     database
-        .on('query', (queryInfo) => {
-        times[queryInfo.__knexUid] = performance.now();
+        .on('query', ({ __knexUid }) => {
+        times.set(__knexUid, performance.now());
     })
         .on('query-response', (_response, queryInfo) => {
-        const delta = performance.now() - times[queryInfo.__knexUid];
-        logger.trace(`[${delta.toFixed(3)}ms] ${queryInfo.sql} [${queryInfo.bindings.join(', ')}]`);
-        delete times[queryInfo.__knexUid];
+        const time = times.get(queryInfo.__knexUid);
+        let delta;
+        if (time) {
+            delta = performance.now() - time;
+            times.delete(queryInfo.__knexUid);
+        }
+        logger.trace(`[${delta ? delta.toFixed(3) : '?'}ms] ${queryInfo.sql} [${(queryInfo.bindings ?? []).join(', ')}]`);
     });
     return database;
 }

package/dist/database/migrations/20210518A-add-foreign-key-constraints.js

@@ -1,5 +1,5 @@
 import { createInspector } from '@directus/schema';
-import { useLogger } from '../../logger.js';
+import { useLogger } from '../../logger/index.js';
 import { getDefaultIndexName } from '../../utils/get-default-index-name.js';
 export async function up(knex) {
     const logger = useLogger();

package/dist/database/migrations/20210519A-add-system-fk-triggers.js

@@ -1,5 +1,5 @@
 import { createInspector } from '@directus/schema';
-import { useLogger } from '../../logger.js';
+import { useLogger } from '../../logger/index.js';
 /**
  * Things to keep in mind:
  *

package/dist/database/migrations/20210802A-replace-groups.js

@@ -1,5 +1,5 @@
 import { parseJSON } from '@directus/utils';
-import { useLogger } from '../../logger.js';
+import { useLogger } from '../../logger/index.js';
 export async function up(knex) {
     const logger = useLogger();
     const dividerGroups = await knex.select('*').from('directus_fields').where('interface', '=', 'group-divider');

package/dist/database/migrations/20230721A-require-shares-fields.js

@@ -1,5 +1,5 @@
 import { createInspector } from '@directus/schema';
-import { useLogger } from '../../logger.js';
+import { useLogger } from '../../logger/index.js';
 import { getHelpers } from '../helpers/index.js';
 export async function up(knex) {
     const helper = getHelpers(knex).schema;

package/dist/database/migrations/20240305A-change-useragent-type.js

@@ -7,7 +7,7 @@ export async function up(knex) {
     ]);
 }
 export async function down(knex) {
-    const helper = await getHelpers(knex).schema;
+    const helper = getHelpers(knex).schema;
     const opts = {
         nullable: false,
         length: 255,

package/dist/database/migrations/20240716A-update-files-date-fields.d.ts

@@ -0,0 +1,3 @@
+import type { Knex } from 'knex';
+export declare function up(knex: Knex): Promise<void>;
+export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20240716A-update-files-date-fields.js

@@ -0,0 +1,33 @@
+import { getHelpers } from '../helpers/index.js';
+export async function up(knex) {
+    const helper = getHelpers(knex).schema;
+    const isMysql = helper.isOneOfClients(['mysql']);
+    if (isMysql) {
+        // Knex creates invalid statement on MySQL, see https://github.com/knex/knex/issues/1888
+        await knex.schema.raw('ALTER TABLE `directus_files` CHANGE `uploaded_on` `created_on` TIMESTAMP NOT NULL DEFAULT current_timestamp();');
+    }
+    else {
+        await knex.schema.alterTable('directus_files', (table) => {
+            table.renameColumn('uploaded_on', 'created_on');
+        });
+    }
+    await knex.schema.alterTable('directus_files', (table) => {
+        table.timestamp('uploaded_on');
+    });
+    await knex('directus_files').update('uploaded_on', knex.ref('created_on'));
+}
+export async function down(knex) {
+    await knex.schema.alterTable('directus_files', (table) => {
+        table.dropColumn('uploaded_on');
+    });
+    const helper = getHelpers(knex).schema;
+    const isMysql = helper.isOneOfClients(['mysql']);
+    if (isMysql) {
+        await knex.schema.raw('ALTER TABLE `directus_files` CHANGE `created_on` `uploaded_on` TIMESTAMP NOT NULL DEFAULT current_timestamp();');
+    }
+    else {
+        await knex.schema.alterTable('directus_files', (table) => {
+            table.renameColumn('created_on', 'uploaded_on');
+        });
+    }
+}

package/dist/database/migrations/run.js

@@ -6,7 +6,7 @@ import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import path from 'path';
 import { flushCaches } from '../../cache.js';
-import { useLogger } from '../../logger.js';
+import { useLogger } from '../../logger/index.js';
 import getModuleDefault from '../../utils/get-module-default.js';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 export default async function run(database, direction, log = true) {

package/dist/emitter.js

@@ -1,6 +1,6 @@
 import ee2 from 'eventemitter2';
 import getDatabase from './database/index.js';
-import { useLogger } from './logger.js';
+import { useLogger } from './logger/index.js';
 export class Emitter {
     filterEmitter;
     actionEmitter;

package/dist/extensions/lib/get-shared-deps-mapping.js

@@ -5,7 +5,7 @@ import { readdir } from 'node:fs/promises';
 import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import path from 'path';
-import { useLogger } from '../../logger.js';
+import { useLogger } from '../../logger/index.js';
 import { Url } from '../../utils/url.js';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 export const getSharedDepsMapping = async (deps) => {

package/dist/extensions/lib/installation/manager.js

@@ -9,7 +9,7 @@ import { Readable } from 'node:stream';
 import Queue from 'p-queue';
 import { join } from 'path';
 import { extract } from 'tar';
-import { useLogger } from '../../../logger.js';
+import { useLogger } from '../../../logger/index.js';
 import { getStorage } from '../../../storage/index.js';
 import { getExtensionsPath } from '../get-extensions-path.js';
 const env = useEnv();

package/dist/extensions/lib/sandbox/register/call-reference.js

@@ -1,5 +1,5 @@
 import { useEnv } from '@directus/env';
-import { useLogger } from '../../../../logger.js';
+import { useLogger } from '../../../../logger/index.js';
 export async function callReference(fn, args) {
     const env = useEnv();
     const logger = useLogger();

package/dist/extensions/lib/sandbox/sdk/generators/log.js

@@ -1,4 +1,4 @@
-import { useLogger } from '../../../../../logger.js';
+import { useLogger } from '../../../../../logger/index.js';
 export function logGenerator(requestedScopes) {
     const logger = useLogger();
     return (message) => {

package/dist/extensions/lib/sync-extensions.js

@@ -8,7 +8,7 @@ import { pipeline } from 'node:stream/promises';
 import Queue from 'p-queue';
 import { useBus } from '../../bus/index.js';
 import { useLock } from '../../lock/index.js';
-import { useLogger } from '../../logger.js';
+import { useLogger } from '../../logger/index.js';
 import { getStorage } from '../../storage/index.js';
 import { getExtensionsPath } from './get-extensions-path.js';
 import { SyncStatus, getSyncStatus, setSyncStatus } from './sync-status.js';

package/dist/extensions/manager.js

@@ -20,7 +20,7 @@ import { useBus } from '../bus/index.js';
 import getDatabase from '../database/index.js';
 import emitter, { Emitter } from '../emitter.js';
 import { getFlowManager } from '../flows.js';
-import { useLogger } from '../logger.js';
+import { useLogger } from '../logger/index.js';
 import * as services from '../services/index.js';
 import { deleteFromRequireCache } from '../utils/delete-from-require-cache.js';
 import getModuleDefault from '../utils/get-module-default.js';

package/dist/flows.js

@@ -7,7 +7,7 @@ import { get } from 'micromustache';
 import { useBus } from './bus/index.js';
 import getDatabase from './database/index.js';
 import emitter from './emitter.js';
-import { useLogger } from './logger.js';
+import { useLogger } from './logger/index.js';
 import { ActivityService } from './services/activity.js';
 import { FlowsService } from './services/flows.js';
 import * as services from './services/index.js';

package/dist/{logger.js → logger/index.js}

@@ -4,7 +4,8 @@ import { merge } from 'lodash-es';
 import { URL } from 'node:url';
 import { pino } from 'pino';
 import { pinoHttp, stdSerializers } from 'pino-http';
-import { getConfigFromEnv } from './utils/get-config-from-env.js';
+import { getConfigFromEnv } from '../utils/get-config-from-env.js';
+import { redactQuery } from './redact-query.js';
 export const _cache = { logger: undefined };
 export const useLogger = () => {
     if (_cache.logger) {
@@ -78,7 +79,7 @@ export const createExpressLogger = () => {
     }
     if (env['LOG_STYLE'] === 'raw') {
         httpLoggerOptions.redact = {
-            paths: ['req.headers.authorization', 'req.headers.cookie', 'res.headers'],
+            paths: ['req.headers.authorization', 'req.headers.cookie', 'res.headers', 'req.query.access_token'],
             censor: (value, pathParts) => {
                 const path = pathParts.join('.');
                 if (path === 'res.headers') {
@@ -131,10 +132,3 @@ export const createExpressLogger = () => {
         },
     });
 };
-function redactQuery(originalPath) {
-    const url = new URL(originalPath, 'http://example.com/');
-    if (url.searchParams.has('access_token')) {
-        url.searchParams.set('access_token', REDACTED_TEXT);
-    }
-    return url.pathname + url.search;
-}

package/dist/logger/redact-query.d.ts

@@ -0,0 +1 @@
+export declare function redactQuery(originalPath: string): string;

package/dist/logger/redact-query.js

@@ -0,0 +1,13 @@
+import { REDACTED_TEXT } from '@directus/utils';
+export function redactQuery(originalPath) {
+    try {
+        const url = new URL(originalPath, 'http://example.com/');
+        if (url.searchParams.has('access_token')) {
+            url.searchParams.set('access_token', REDACTED_TEXT);
+        }
+        return url.pathname + url.search;
+    }
+    catch {
+        return originalPath;
+    }
+}

package/dist/mailer.js

@@ -1,6 +1,6 @@
 import { useEnv } from '@directus/env';
 import nodemailer from 'nodemailer';
-import { useLogger } from './logger.js';
+import { useLogger } from './logger/index.js';
 import { getConfigFromEnv } from './utils/get-config-from-env.js';
 import { createRequire } from 'node:module';
 const require = createRequire(import.meta.url);

package/dist/middleware/cache.js

@@ -1,6 +1,6 @@
 import { useEnv } from '@directus/env';
 import { getCache, getCacheValue } from '../cache.js';
-import { useLogger } from '../logger.js';
+import { useLogger } from '../logger/index.js';
 import asyncHandler from '../utils/async-handler.js';
 import { getCacheControlHeader } from '../utils/get-cache-headers.js';
 import { getCacheKey } from '../utils/get-cache-key.js';