@directus/api 14.1.2 → 16.0.0

package/dist/utils/validate-snapshot.js

@@ -4,7 +4,7 @@ import { ALIAS_TYPES } from '../constants.js';
 import { getDatabaseClient } from '../database/index.js';
 import { InvalidPayloadError } from '@directus/errors';
 import { DatabaseClients } from '../types/index.js';
-import { version as currentDirectusVersion } from './package.js';
+import { version } from 'directus/version';
 const snapshotJoiSchema = Joi.object({
     version: Joi.number().valid(1).required(),
     directus: Joi.string().required(),
@@ -51,9 +51,9 @@ export function validateSnapshot(snapshot, force = false) {
     // Bypass checks when "force" option is enabled
     if (force)
         return;
-    if (snapshot.directus !== currentDirectusVersion) {
+    if (snapshot.directus !== version) {
         throw new InvalidPayloadError({
-            reason: `Provided snapshot's directus version ${snapshot.directus} does not match the current instance's version ${currentDirectusVersion}. You can bypass this check by passing the "force" query parameter`,
+            reason: `Provided snapshot's directus version ${snapshot.directus} does not match the current instance's version ${version}. You can bypass this check by passing the "force" query parameter`,
         });
     }
     if (!snapshot.vendor) {

package/dist/utils/validate-storage.js

@@ -1,11 +1,13 @@
+import { useEnv } from '@directus/env';
 import { toArray } from '@directus/utils';
 import { constants } from 'fs';
 import { access } from 'node:fs/promises';
 import path from 'path';
-import env from '../env.js';
 import { getExtensionsPath } from '../extensions/lib/get-extensions-path.js';
-import logger from '../logger.js';
+import { useLogger } from '../logger.js';
 export async function validateStorage() {
+    const env = useEnv();
+    const logger = useLogger();
     if (env['DB_CLIENT'] === 'sqlite3') {
         try {
             await access(path.dirname(env['DB_FILENAME']), constants.R_OK | constants.W_OK);

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.d.ts

@@ -2,6 +2,8 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
+/// <reference types="node/http.js" />
+/// <reference types="pino-http" />
 import type { IncomingMessage, Server as httpServer } from 'http';
 import type { ParsedUrlQuery } from 'querystring';
 import type { RateLimiterAbstract } from 'rate-limiter-flexible';

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.d.ts

@@ -1,4 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
+/// <reference types="node/http.js" />
+/// <reference types="pino-http" />
 import type { Server } from 'graphql-ws';
 import type { Server as httpServer } from 'http';
 import type { GraphQLSocket, UpgradeContext, WebSocketClient } from '../types.js';

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));
         });
@@ -37,7 +39,7 @@ export class GraphQLSubscriptionController extends SocketController {
             send: (data) => new Promise((resolve, reject) => {
                 client.send(data, (err) => (err ? reject(err) : resolve()));
             }),
-            close: (code, reason) => client.close(code, reason),
+            close: (code, reason) => client.close(code, reason), // for standard closures
             onMessage: (cb) => {
                 client.on('parsed-message', async (message) => {
                     try {

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.d.ts

@@ -1,4 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
+/// <reference types="node/http.js" />
+/// <reference types="pino-http" />
 import type { Server as httpServer } from 'http';
 import { GraphQLSubscriptionController } from './graphql.js';
 import { WebSocketController } from './rest.js';

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.d.ts

@@ -1,4 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
+/// <reference types="node/http.js" />
+/// <reference types="pino-http" />
 import type { Server as httpServer } from 'http';
 import { WebSocketMessage } from '../messages.js';
 import SocketController from './base.js';

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/dist/websocket/types.d.ts

@@ -1,6 +1,8 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
+/// <reference types="node/http.js" />
+/// <reference types="pino-http" />
 import type { Accountability, Query } from '@directus/types';
 import type { IncomingMessage } from 'http';
 import type internal from 'stream';
@@ -12,7 +14,7 @@ export type AuthenticationState = {
 };
 export type WebSocketClient = WebSocket & AuthenticationState & {
     uid: string | number;
-    auth_timer: NodeJS.Timer | null;
+    auth_timer: NodeJS.Timeout | null;
 };
 export type UpgradeRequest = IncomingMessage & AuthenticationState;
 export type SubscriptionEvent = 'create' | 'update' | 'delete';