@directus/api 15.0.0 → 17.0.0

package/dist/webhooks.js

@@ -1,7 +1,7 @@
+import { useBus } from './bus/index.js';
 import getDatabase from './database/index.js';
 import emitter from './emitter.js';
-import logger from './logger.js';
-import { getMessenger } from './messenger.js';
+import { useLogger } from './logger.js';
 import { getAxios } from './request/index.js';
 import { WebhooksService } from './services/webhooks.js';
 import { getSchema } from './utils/get-schema.js';
@@ -10,7 +10,7 @@ let registered = [];
 const reloadQueue = new JobQueue();
 export async function init() {
     await register();
-    const messenger = getMessenger();
+    const messenger = useBus();
     messenger.subscribe('webhooks', (event) => {
         if (event['type'] === 'reload') {
             reloadQueue.enqueue(async () => {
@@ -42,6 +42,7 @@ export function unregister() {
     registered = [];
 }
 function createHandler(webhook, event) {
+    const logger = useLogger();
     return async (meta, context) => {
         if (webhook.collections.includes(meta['collection']) === false)
             return;

package/dist/websocket/controllers/base.js

@@ -1,15 +1,14 @@
-import { parseJSON } from '@directus/utils';
+import { useEnv } from '@directus/env';
+import { InvalidProviderConfigError, TokenExpiredError } from '@directus/errors';
+import { parseJSON, toBoolean } from '@directus/utils';
 import { parse } from 'url';
 import { v4 as uuid } from 'uuid';
 import WebSocket, { WebSocketServer } from 'ws';
 import { fromZodError } from 'zod-validation-error';
 import emitter from '../../emitter.js';
-import env from '../../env.js';
-import { InvalidProviderConfigError, TokenExpiredError } from '@directus/errors';
-import logger from '../../logger.js';
+import { useLogger } from '../../logger.js';
 import { createRateLimiter } from '../../rate-limiter.js';
 import { getAccountabilityForToken } from '../../utils/get-accountability-for-token.js';
-import { toBoolean } from '../../utils/to-boolean.js';
 import { authenticateConnection, authenticationSuccess } from '../authenticate.js';
 import { WebSocketError, handleWebSocketError } from '../errors.js';
 import { AuthMode, WebSocketAuthMessage, WebSocketMessage } from '../messages.js';
@@ -18,6 +17,7 @@ import { getMessageType } from '../utils/message.js';
 import { waitForAnyMessage, waitForMessageType } from '../utils/wait-for-message.js';
 import { registerWebSocketEvents } from './hooks.js';
 const TOKEN_CHECK_INTERVAL = 15 * 60 * 1000; // 15 minutes
+const logger = useLogger();
 export default class SocketController {
     server;
     clients;
@@ -27,7 +27,11 @@ export default class SocketController {
     rateLimiter;
     authInterval;
     constructor(httpServer, configPrefix) {
-        this.server = new WebSocketServer({ noServer: true });
+        this.server = new WebSocketServer({
+            noServer: true,
+            // @ts-ignore TODO Remove once @types/ws has been updated
+            autoPong: false,
+        });
         this.clients = new Set();
         this.authInterval = null;
         const { endpoint, authentication, maxConnections } = this.getEnvironmentConfig(configPrefix);
@@ -40,6 +44,7 @@ export default class SocketController {
         registerWebSocketEvents();
     }
     getEnvironmentConfig(configPrefix) {
+        const env = useEnv();
         const endpoint = String(env[`${configPrefix}_PATH`]);
         const authMode = AuthMode.safeParse(String(env[`${configPrefix}_AUTH`]).toLowerCase());
         const authTimeout = Number(env[`${configPrefix}_AUTH_TIMEOUT`]) * 1000;
@@ -60,6 +65,7 @@ export default class SocketController {
         };
     }
     getRateLimiter() {
+        const env = useEnv();
         if (toBoolean(env['RATE_LIMITER_ENABLED']) === true) {
             return createRateLimiter('RATE_LIMITER', {
                 keyPrefix: 'websocket',

package/dist/websocket/controllers/graphql.js

@@ -1,6 +1,6 @@
+import { useEnv } from '@directus/env';
 import { CloseCode, MessageType, makeServer } from 'graphql-ws';
-import env from '../../env.js';
-import logger from '../../logger.js';
+import { useLogger } from '../../logger.js';
 import { bindPubSub } from '../../services/graphql/subscription.js';
 import { GraphQLService } from '../../services/index.js';
 import { getSchema } from '../../utils/get-schema.js';
@@ -9,10 +9,12 @@ import { handleWebSocketError } from '../errors.js';
 import { ConnectionParams, WebSocketMessage } from '../messages.js';
 import { getMessageType } from '../utils/message.js';
 import SocketController from './base.js';
+const logger = useLogger();
 export class GraphQLSubscriptionController extends SocketController {
     gql;
     constructor(httpServer) {
         super(httpServer, 'WEBSOCKETS_GRAPHQL');
+        const env = useEnv();
         this.server.on('connection', (ws, auth) => {
             this.bindEvents(this.createClient(ws, auth));
         });

package/dist/websocket/controllers/hooks.js

@@ -1,5 +1,5 @@
+import { useBus } from '../../bus/index.js';
 import emitter from '../../emitter.js';
-import { getMessenger } from '../../messenger.js';
 let actionsRegistered = false;
 export function registerWebSocketEvents() {
     if (actionsRegistered)
@@ -21,6 +21,7 @@ export function registerWebSocketEvents() {
         'settings',
         'shares',
         'users',
+        'versions',
         'webhooks',
     ]);
     registerFieldsHooks();
@@ -128,7 +129,7 @@ function registerSortHooks() {
  * @param transform Transformer function
  */
 function registerAction(event, transform) {
-    const messenger = getMessenger();
+    const messenger = useBus();
     emitter.onAction(event, async (data) => {
         // push the event through the Redis pub/sub
         messenger.publish('websocket.event', transform(data));

package/dist/websocket/controllers/index.js

@@ -1,10 +1,11 @@
-import env from '../../env.js';
-import { toBoolean } from '../../utils/to-boolean.js';
+import { useEnv } from '@directus/env';
+import { toBoolean } from '@directus/utils';
 import { GraphQLSubscriptionController } from './graphql.js';
 import { WebSocketController } from './rest.js';
 let websocketController;
 let subscriptionController;
 export function createWebSocketController(server) {
+    const env = useEnv();
     if (toBoolean(env['WEBSOCKETS_REST_ENABLED'])) {
         websocketController = new WebSocketController(server);
     }
@@ -13,6 +14,7 @@ export function getWebSocketController() {
     return websocketController;
 }
 export function createSubscriptionController(server) {
+    const env = useEnv();
     if (toBoolean(env['WEBSOCKETS_GRAPHQL_ENABLED'])) {
         subscriptionController = new GraphQLSubscriptionController(server);
     }

package/dist/websocket/controllers/rest.js

@@ -1,14 +1,16 @@
+import { useEnv } from '@directus/env';
 import { parseJSON } from '@directus/utils';
 import emitter from '../../emitter.js';
-import env from '../../env.js';
-import logger from '../../logger.js';
+import { useLogger } from '../../logger.js';
 import { refreshAccountability } from '../authenticate.js';
 import { WebSocketError, handleWebSocketError } from '../errors.js';
 import { WebSocketMessage } from '../messages.js';
 import SocketController from './base.js';
+const logger = useLogger();
 export class WebSocketController extends SocketController {
     constructor(httpServer) {
         super(httpServer, 'WEBSOCKETS_REST');
+        const env = useEnv();
         this.server.on('connection', (ws, auth) => {
             this.bindEvents(this.createClient(ws, auth));
         });

package/dist/websocket/errors.js

@@ -1,7 +1,7 @@
 import { isDirectusError } from '@directus/errors';
 import { ZodError } from 'zod';
 import { fromZodError } from 'zod-validation-error';
-import logger from '../logger.js';
+import { useLogger } from '../logger.js';
 export class WebSocketError extends Error {
     type;
     code;
@@ -38,6 +38,7 @@ export class WebSocketError extends Error {
     }
 }
 export function handleWebSocketError(client, error, type) {
+    const logger = useLogger();
     if (isDirectusError(error)) {
         client.send(WebSocketError.fromError(error, type).toMessage());
         return;

package/dist/websocket/handlers/heartbeat.js

@@ -1,10 +1,11 @@
+import { useEnv } from '@directus/env';
+import { ServiceUnavailableError } from '@directus/errors';
+import { toBoolean } from '@directus/utils';
 import emitter from '../../emitter.js';
-import env from '../../env.js';
-import { toBoolean } from '../../utils/to-boolean.js';
 import { WebSocketController, getWebSocketController } from '../controllers/index.js';
 import { WebSocketMessage } from '../messages.js';
 import { fmtMessage, getMessageType } from '../utils/message.js';
-import { ServiceUnavailableError } from '@directus/errors';
+const env = useEnv();
 const HEARTBEAT_FREQUENCY = Number(env['WEBSOCKETS_HEARTBEAT_PERIOD']) * 1000;
 export class HeartbeatHandler {
     pulse;

package/dist/websocket/handlers/subscribe.d.ts

@@ -1,4 +1,4 @@
-import type { Messenger } from '../../messenger.js';
+import { type Bus } from '@directus/memory';
 import type { WebSocketEvent } from '../messages.js';
 import { WebSocketSubscribeMessage } from '../messages.js';
 import type { Subscription, WebSocketClient } from '../types.js';
@@ -7,7 +7,7 @@ import type { Subscription, WebSocketClient } from '../types.js';
  */
 export declare class SubscribeHandler {
     subscriptions: Record<string, Set<Subscription>>;
-    protected messenger: Messenger;
+    protected messenger: Bus;
     /**
      * Initialize the handler
      */

package/dist/websocket/handlers/subscribe.js

@@ -1,13 +1,14 @@
-import emitter from '../../emitter.js';
 import { InvalidPayloadError } from '@directus/errors';
-import { getMessenger } from '../../messenger.js';
+import {} from '@directus/memory';
+import { useBus } from '../../bus/index.js';
+import emitter from '../../emitter.js';
 import { getSchema } from '../../utils/get-schema.js';
 import { sanitizeQuery } from '../../utils/sanitize-query.js';
 import { refreshAccountability } from '../authenticate.js';
 import { WebSocketError, handleWebSocketError } from '../errors.js';
 import { WebSocketSubscribeMessage } from '../messages.js';
-import { fmtMessage, getMessageType } from '../utils/message.js';
 import { getPayload } from '../utils/items.js';
+import { fmtMessage, getMessageType } from '../utils/message.js';
 /**
  * Handler responsible for subscriptions
  */
@@ -21,7 +22,7 @@ export class SubscribeHandler {
      */
     constructor() {
         this.subscriptions = {};
-        this.messenger = getMessenger();
+        this.messenger = useBus();
         this.bindWebSocket();
         // listen to the Redis pub/sub and dispatch
         this.messenger.subscribe('websocket.event', (message) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "15.0.0",
+  "version": "17.0.0",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -59,7 +59,7 @@
   ],
   "dependencies": {
     "@authenio/samlify-node-xmllint": "2.0.0",
-    "@aws-sdk/client-ses": "3.478.0",
+    "@aws-sdk/client-ses": "3.511.0",
     "@directus/format-title": "10.1.0",
     "@godaddy/terminus": "4.12.1",
     "@rollup/plugin-alias": "5.1.0",
@@ -67,7 +67,7 @@
     "@rollup/plugin-virtual": "3.0.2",
     "argon2": "0.31.2",
     "async": "3.2.5",
-    "axios": "1.6.2",
+    "axios": "1.6.7",
     "busboy": "1.6.0",
     "bytes": "3.1.2",
     "camelcase": "8.0.0",
@@ -78,27 +78,28 @@
     "cookie-parser": "1.4.6",
     "cors": "2.8.5",
     "cron-parser": "4.9.0",
-    "date-fns": "3.0.1",
+    "date-fns": "3.3.1",
     "deep-diff": "1.0.2",
     "destroy": "1.2.0",
-    "dotenv": "16.3.1",
+    "dotenv": "16.4.1",
     "encodeurl": "1.0.2",
     "eventemitter2": "6.4.9",
     "execa": "8.0.1",
-    "exif-reader": "1.2.0",
+    "exif-reader": "2.0.1",
     "express": "4.18.2",
     "flat": "6.0.1",
     "fs-extra": "11.2.0",
     "glob-to-regexp": "0.4.1",
     "graphql": "16.8.1",
     "graphql-compose": "9.0.10",
-    "graphql-ws": "5.14.2",
+    "graphql-ws": "5.14.3",
     "helmet": "7.1.0",
     "icc": "3.0.0",
-    "inquirer": "9.2.12",
+    "inquirer": "9.2.14",
     "ioredis": "5.3.2",
-    "isolated-vm": "4.6.0",
-    "joi": "17.11.0",
+    "ip-matching": "2.1.2",
+    "isolated-vm": "4.7.2",
+    "joi": "17.12.0",
     "js-yaml": "4.1.0",
     "js2xmlparser": "5.0.0",
     "json2csv": "5.0.7",
@@ -108,61 +109,62 @@
     "ldapjs": "2.3.3",
     "liquidjs": "10.10.0",
     "lodash-es": "4.17.21",
-    "marked": "11.1.0",
+    "marked": "11.2.0",
     "micromustache": "8.0.3",
     "mime-types": "2.1.35",
     "minimatch": "9.0.3",
     "ms": "2.1.3",
-    "nanoid": "5.0.4",
+    "nanoid": "5.0.5",
     "node-machine-id": "1.1.12",
     "node-schedule": "2.1.1",
-    "nodemailer": "6.9.7",
+    "nodemailer": "6.9.9",
     "object-hash": "3.0.0",
-    "openapi3-ts": "4.2.0",
-    "openid-client": "5.6.1",
-    "ora": "7.0.1",
+    "openapi3-ts": "4.2.1",
+    "openid-client": "5.6.4",
+    "ora": "8.0.1",
     "otplib": "12.0.1",
     "p-limit": "5.0.0",
     "p-queue": "8.0.1",
     "papaparse": "5.4.1",
-    "pino": "8.17.1",
-    "pino-http": "8.6.0",
+    "pino": "8.18.0",
+    "pino-http": "9.0.0",
     "pino-http-print": "3.1.0",
-    "pino-pretty": "10.3.0",
+    "pino-pretty": "10.3.1",
     "qs": "6.11.2",
-    "rate-limiter-flexible": "4.0.0",
-    "rollup": "4.9.1",
+    "rate-limiter-flexible": "4.0.1",
+    "rollup": "4.9.6",
     "samlify": "2.8.10",
     "sanitize-html": "2.11.0",
-    "sharp": "0.33.1",
+    "sharp": "0.33.2",
     "snappy": "7.2.2",
     "stream-json": "1.8.0",
-    "tinypool": "0.8.1",
     "tsx": "4.7.0",
     "uuid": "9.0.1",
     "uuid-validate": "0.0.3",
     "wellknown": "0.5.0",
-    "ws": "8.15.1",
+    "ws": "8.16.0",
     "zod": "3.22.4",
-    "zod-validation-error": "2.1.0",
-    "@directus/constants": "11.0.2",
-    "@directus/extensions": "0.2.1",
-    "@directus/errors": "0.2.1",
-    "@directus/app": "10.13.3",
-    "@directus/extensions-sdk": "10.3.0",
-    "@directus/pressure": "1.0.14",
-    "@directus/specs": "10.2.5",
-    "@directus/storage": "10.0.8",
-    "@directus/storage-driver-azure": "10.0.15",
+    "zod-validation-error": "3.0.0",
+    "@directus/app": "10.15.0",
+    "@directus/env": "1.0.1",
+    "@directus/extensions": "0.3.1",
+    "@directus/errors": "0.2.2",
+    "@directus/constants": "11.0.3",
+    "@directus/extensions-sdk": "10.3.2",
+    "@directus/memory": "1.0.1",
+    "@directus/pressure": "1.0.15",
     "@directus/schema": "11.0.1",
-    "@directus/storage-driver-cloudinary": "10.0.15",
-    "@directus/storage-driver-gcs": "10.0.15",
-    "@directus/storage-driver-local": "10.0.15",
-    "@directus/validation": "0.0.10",
-    "@directus/utils": "11.0.3",
-    "@directus/storage-driver-s3": "10.0.15",
-    "@directus/storage-driver-supabase": "1.0.7",
-    "directus": "10.8.3"
+    "@directus/specs": "10.2.6",
+    "@directus/storage": "10.0.9",
+    "@directus/storage-driver-azure": "10.0.16",
+    "@directus/storage-driver-cloudinary": "10.0.16",
+    "@directus/storage-driver-gcs": "10.0.16",
+    "@directus/storage-driver-local": "10.0.16",
+    "@directus/storage-driver-supabase": "1.0.8",
+    "@directus/storage-driver-s3": "10.0.16",
+    "@directus/validation": "0.0.11",
+    "@directus/utils": "11.0.4",
+    "directus": "10.9.1"
   },
   "devDependencies": {
     "@ngneat/falso": "7.1.1",
@@ -175,9 +177,8 @@
     "@types/deep-diff": "1.0.5",
     "@types/destroy": "1.0.3",
     "@types/encodeurl": "1.0.2",
-    "@types/exif-reader": "1.0.0",
     "@types/express": "4.17.21",
-    "@types/express-serve-static-core": "4.17.41",
+    "@types/express-serve-static-core": "4.17.43",
     "@types/fs-extra": "11.0.4",
     "@types/glob-to-regexp": "0.4.4",
     "@types/inquirer": "9.0.7",
@@ -188,37 +189,36 @@
     "@types/lodash-es": "4.17.12",
     "@types/mime-types": "2.1.4",
     "@types/ms": "0.7.34",
-    "@types/node": "18.19.3",
-    "@types/node-schedule": "2.1.5",
+    "@types/node": "18.19.14",
+    "@types/node-schedule": "2.1.6",
     "@types/nodemailer": "6.4.14",
     "@types/object-hash": "3.0.6",
     "@types/papaparse": "5.3.14",
-    "@types/qs": "6.9.10",
-    "@types/sanitize-html": "2.9.5",
+    "@types/qs": "6.9.11",
+    "@types/sanitize-html": "2.11.0",
     "@types/stream-json": "1.7.7",
-    "@types/supertest": "2.0.16",
-    "@types/uuid": "9.0.7",
+    "@types/uuid": "9.0.8",
     "@types/uuid-validate": "0.0.3",
     "@types/wellknown": "0.5.8",
     "@types/ws": "8.5.10",
-    "@vitest/coverage-v8": "1.1.0",
+    "@vitest/coverage-v8": "1.2.2",
     "copyfiles": "2.4.1",
     "form-data": "4.0.0",
     "knex-mock-client": "2.0.1",
-    "supertest": "6.3.3",
     "typescript": "5.3.3",
-    "vitest": "1.1.0",
+    "vitest": "1.2.2",
+    "@directus/random": "0.2.5",
     "@directus/tsconfig": "1.0.1",
-    "@directus/types": "11.0.3"
+    "@directus/types": "11.0.5"
   },
   "optionalDependencies": {
-    "@keyv/redis": "2.8.1",
+    "@keyv/redis": "2.8.4",
     "mysql": "2.18.1",
     "nodemailer-mailgun-transport": "2.1.5",
     "nodemailer-sendgrid": "1.0.3",
-    "oracledb": "6.2.0",
+    "oracledb": "6.3.0",
     "pg": "8.11.3",
-    "sqlite3": "5.1.6",
+    "sqlite3": "5.1.7",
     "tedious": "16.6.1"
   },
   "engines": {

package/dist/__utils__/items-utils.d.ts

@@ -1,2 +0,0 @@
-export declare const sqlFieldFormatter: (schema: Record<string, any>, table: string) => string;
-export declare const sqlFieldList: (schema: Record<string, any>, table: string) => string;

package/dist/__utils__/items-utils.js

@@ -1,31 +0,0 @@
-// dynamically adds fields to the sql strings as the schema grows
-export const sqlFieldFormatter = (schema, table) => {
-    const fields = [];
-    // Exclude alias fields, unable to selected in DB
-    for (const field of Object.keys(schema['collections'][table].fields)) {
-        if (schema['collections'][table].fields[field].type !== 'alias') {
-            fields.push(field);
-        }
-    }
-    let sql = '';
-    for (const field of fields.slice(0, fields.length - 1)) {
-        sql += `"${table}"."${field}", `;
-    }
-    sql += `"${table}"."${fields[fields.length - 1]}"`;
-    return sql;
-};
-export const sqlFieldList = (schema, table) => {
-    const fields = [];
-    // Exclude alias fields, unable to selected in DB
-    for (const field of Object.keys(schema['collections'][table].fields)) {
-        if (schema['collections'][table].fields[field].type !== 'alias') {
-            fields.push(field);
-        }
-    }
-    let sql = '';
-    for (const field of fields.slice(0, fields.length - 1)) {
-        sql += `"${field}", `;
-    }
-    sql += `"${fields[fields.length - 1]}"`;
-    return sql;
-};

package/dist/__utils__/mock-env.d.ts

@@ -1,18 +0,0 @@
-export declare function setEnv(newEnv: Record<string, string>): void;
-/** Static env mock - to be used inside `vi.mock` */
-export declare function mockEnv(options?: {
-    env?: Record<string, string>;
-    withDefaults?: boolean;
-}): Promise<{
-    readonly default: Record<string, any>;
-}>;
-/** Dynamic env mock */
-export declare function doMockEnv(options?: {
-    env?: Record<string, string>;
-    withDefaults?: boolean;
-}): {
-    env: {
-        [x: string]: string;
-    };
-    setEnv: (newEnv: Record<string, string>) => void;
-};

package/dist/__utils__/mock-env.js

@@ -1,41 +0,0 @@
-import { afterEach, vi } from 'vitest';
-let env = {};
-export function setEnv(newEnv) {
-    env = { ...env, ...newEnv };
-}
-/** Static env mock - to be used inside `vi.mock` */
-export async function mockEnv(options) {
-    const initialEnv = options?.env ?? {};
-    const withDefaults = options && 'withDefaults' in options ? options.withDefaults : true;
-    env = { ...initialEnv };
-    afterEach(() => {
-        env = { ...initialEnv };
-    });
-    const { defaults, processValues } = await vi.importActual('../env.js');
-    return {
-        get default() {
-            return processValues({ ...(withDefaults && defaults), ...env });
-        },
-    };
-}
-/** Dynamic env mock */
-export function doMockEnv(options) {
-    const initialEnv = options?.env ?? {};
-    const withDefaults = options && 'withDefaults' in options ? options.withDefaults : true;
-    let env = { ...initialEnv };
-    vi.doMock('../env.js', async () => {
-        const { defaults, processValues } = await vi.importActual('../env.js');
-        return {
-            get default() {
-                return processValues({ ...(withDefaults && defaults), ...env });
-            },
-        };
-    });
-    afterEach(() => {
-        env = { ...initialEnv };
-    });
-    return { env, setEnv };
-    function setEnv(newEnv) {
-        env = { ...env, ...newEnv };
-    }
-}

package/dist/__utils__/schemas.d.ts

@@ -1,13 +0,0 @@
-import type { CollectionsOverview, Relation } from '@directus/types';
-export declare const systemSchema: {
-    collections: CollectionsOverview;
-    relations: Relation[];
-};
-export declare const userSchema: {
-    collections: CollectionsOverview;
-    relations: Relation[];
-};
-export declare const snapshotApplyTestSchema: {
-    collections: CollectionsOverview;
-    relations: Relation[];
-};