@directus/api 35.0.2 → 35.1.0

package/dist/redis/lib/create-redis.js

@@ -9,8 +9,7 @@ import { Redis } from "ioredis";
 * @returns New Redis instance based on global configuration
 */
 const createRedis = () => {
-	const env = useEnv();
-	return new Redis(env["REDIS"] ?? getConfigFromEnv("REDIS"));
+	return new Redis(useEnv()["REDIS"] ?? getConfigFromEnv("REDIS"));
 };
 
 //#endregion

package/dist/redis/lib/use-redis.js

@@ -7,7 +7,7 @@ import { Redis } from "ioredis";
 *
 * @see {@link useRedis}
 */
-const _cache = { redis: undefined };
+const _cache = { redis: void 0 };
 /**
 * Access the globally shared Redis instance
 * Creates new Redis instance on first invocation

package/dist/redis/utils/redis-config-available.js

@@ -6,9 +6,7 @@ import { useEnv } from "@directus/env";
 */
 const redisConfigAvailable = () => {
 	const env = useEnv();
-	if ("REDIS_ENABLED" in env) {
-		return env["REDIS_ENABLED"] === true;
-	}
+	if ("REDIS_ENABLED" in env) return env["REDIS_ENABLED"] === true;
 	return "REDIS" in env || Object.keys(env).some((key) => key.startsWith("REDIS_"));
 };
 

package/dist/request/agent-with-ip-validation.js

@@ -2,21 +2,17 @@ import { isDeniedIp } from "./is-denied-ip.js";
 import { isIP } from "node:net";
 
 //#region src/request/agent-with-ip-validation.ts
-const deniedError = (domain) => new Error(`Requested domain "${domain}" resolves to a denied IP address`);
+const deniedError = (domain) => /* @__PURE__ */ new Error(`Requested domain "${domain}" resolves to a denied IP address`);
 /** Extends a HTTP agent with IP validation */
 const agentWithIpValidation = (agent) => {
 	const _agent = agent;
 	const { createConnection } = _agent;
 	_agent.createConnection = function(options, oncreate) {
 		const { host } = options;
-		if (!host) {
-			throw new Error("Request cannot be verified due to missing host");
-		}
+		if (!host) throw new Error("Request cannot be verified due to missing host");
 		if (isIP(host) !== 0 && isDeniedIp(host)) throw deniedError(host);
 		const socket = createConnection?.call(this, options, oncreate);
-		if (!socket) {
-			throw new Error("Request cannot be verified due to lost socket");
-		}
+		if (!socket) throw new Error("Request cannot be verified due to lost socket");
 		socket.on("lookup", (error, address) => {
 			if (error || !isDeniedIp(address)) return;
 			return socket.destroy(deniedError(host));

package/dist/request/is-denied-ip.js

@@ -27,9 +27,7 @@ function isDeniedIp(ip) {
 			}
 			blockList.parseAddress(blockNetwork);
 		}
-		if (blockNetworkInterfaces) {
-			blockList.addLocalNetworkInterfaces();
-		}
+		if (blockNetworkInterfaces) blockList.addLocalNetworkInterfaces();
 	} catch (error) {
 		logger.warn(`Cannot verify IP address due to invalid "IMPORT_IP_DENY_LIST" config`);
 		logger.warn(error);

package/dist/schedules/metrics.js

@@ -7,15 +7,12 @@ import { toBoolean } from "@directus/utils";
 import { CronJob } from "cron";
 
 //#region src/schedules/metrics.ts
-const METRICS_LOCK_TIMEOUT = 10 * 60 * 1e3;
+const METRICS_LOCK_TIMEOUT = 600 * 1e3;
 let lockedAt = 0;
 const logger = useLogger();
 const metrics = useMetrics();
 async function handleMetricsJob() {
-	const now = Date.now();
-	if (lockedAt !== 0 && lockedAt > now - METRICS_LOCK_TIMEOUT) {
-		return;
-	}
+	if (lockedAt !== 0 && lockedAt > Date.now() - METRICS_LOCK_TIMEOUT) return;
 	lockedAt = Date.now();
 	try {
 		await metrics?.generate();
@@ -33,12 +30,8 @@ async function handleMetricsJob() {
 */
 async function schedule() {
 	const env = useEnv();
-	if (!toBoolean(env["METRICS_ENABLED"])) {
-		return false;
-	}
-	if (!validateCron(String(env["METRICS_SCHEDULE"]))) {
-		return false;
-	}
+	if (!toBoolean(env["METRICS_ENABLED"])) return false;
+	if (!validateCron(String(env["METRICS_SCHEDULE"]))) return false;
 	CronJob.from({
 		cronTime: String(env["METRICS_SCHEDULE"]),
 		onTick: handleMetricsJob,

package/dist/schedules/retention.js

@@ -12,7 +12,7 @@ import { Action } from "@directus/constants";
 //#region src/schedules/retention.ts
 const env = useEnv();
 const retentionLockKey = "schedule--data-retention";
-const retentionLockTimeout = 10 * 60 * 1e3;
+const retentionLockTimeout = 600 * 1e3;
 const ACTIVITY_RETENTION_TIMEFRAME = getMilliseconds(env["ACTIVITY_RETENTION"]);
 const FLOW_LOGS_RETENTION_TIMEFRAME = getMilliseconds(env["FLOW_LOGS_RETENTION"]);
 const REVISIONS_RETENTION_TIMEFRAME = getMilliseconds(env["REVISIONS_RETENTION"]);
@@ -41,31 +41,21 @@ async function handleRetentionJob() {
 	const lockTime = await lock.get(retentionLockKey);
 	const now = Date.now();
 	const helpers = getHelpers(database);
-	if (lockTime && Number(lockTime) > now - retentionLockTimeout) {
-		return;
-	}
+	if (lockTime && Number(lockTime) > now - retentionLockTimeout) return;
 	await lock.set(retentionLockKey, Date.now());
 	for (const task of retentionTasks) {
 		let count = 0;
-		if (task.timeframe === undefined) {
-			continue;
-		}
+		if (task.timeframe === void 0) continue;
 		do {
 			const subquery = database.queryBuilder().select(`${task.collection}.id`).from(task.collection).where("timestamp", "<", helpers.date.parse(new Date(Date.now() - task.timeframe))).limit(batch);
-			if (task.where) {
-				subquery.where(...task.where);
-			}
-			if (task.join) {
-				subquery.join(...task.join);
-			}
+			if (task.where) subquery.where(...task.where);
+			if (task.join) subquery.join(...task.join);
 			try {
 				let records = [];
 				const isMySQL = helpers.schema.isOneOfClients(["mysql"]);
 				if (isMySQL) {
 					records = await subquery.then((r) => r.map((r$1) => r$1.id));
-					if (records.length === 0) {
-						break;
-					}
+					if (records.length === 0) break;
 				}
 				count = await database(task.collection).whereIn("id", isMySQL ? records : subquery).delete();
 			} catch (error) {
@@ -84,23 +74,17 @@ async function handleRetentionJob() {
 */
 async function schedule() {
 	const env$1 = useEnv();
-	if (!toBoolean(env$1["RETENTION_ENABLED"])) {
-		return false;
-	}
-	if (!validateCron(String(env$1["RETENTION_SCHEDULE"]))) {
-		return false;
-	}
-	if (!ACTIVITY_RETENTION_TIMEFRAME || ACTIVITY_RETENTION_TIMEFRAME && REVISIONS_RETENTION_TIMEFRAME && ACTIVITY_RETENTION_TIMEFRAME > REVISIONS_RETENTION_TIMEFRAME) {
-		retentionTasks.push({
-			collection: "directus_revisions",
-			join: [
-				"directus_activity",
-				"directus_revisions.activity",
-				"directus_activity.id"
-			],
-			timeframe: REVISIONS_RETENTION_TIMEFRAME
-		});
-	}
+	if (!toBoolean(env$1["RETENTION_ENABLED"])) return false;
+	if (!validateCron(String(env$1["RETENTION_SCHEDULE"]))) return false;
+	if (!ACTIVITY_RETENTION_TIMEFRAME || ACTIVITY_RETENTION_TIMEFRAME && REVISIONS_RETENTION_TIMEFRAME && ACTIVITY_RETENTION_TIMEFRAME > REVISIONS_RETENTION_TIMEFRAME) retentionTasks.push({
+		collection: "directus_revisions",
+		join: [
+			"directus_activity",
+			"directus_revisions.activity",
+			"directus_activity.id"
+		],
+		timeframe: REVISIONS_RETENTION_TIMEFRAME
+	});
 	scheduleSynchronizedJob("retention", String(env$1["RETENTION_SCHEDULE"]), handleRetentionJob);
 	return true;
 }

package/dist/schedules/telemetry.js

@@ -19,8 +19,7 @@ const jobCallback = () => {
 * @returns Whether or not telemetry has been initialized
 */
 async function schedule() {
-	const env = useEnv();
-	if (toBoolean(env["TELEMETRY"]) === false) return false;
+	if (toBoolean(useEnv()["TELEMETRY"]) === false) return false;
 	scheduleSynchronizedJob("telemetry", "0 */6 * * *", jobCallback);
 	const { lockCache } = getCache();
 	if (!await lockCache.get("telemetry-lock")) {

package/dist/schedules/tus.js

@@ -12,13 +12,11 @@ import "../services/tus/index.js";
 */
 async function schedule() {
 	if (!RESUMABLE_UPLOADS.ENABLED) return false;
-	if (validateCron(RESUMABLE_UPLOADS.SCHEDULE)) {
-		scheduleSynchronizedJob("tus-cleanup", RESUMABLE_UPLOADS.SCHEDULE, async () => {
-			const [tusServer, cleanupServer] = await createTusServer({ schema: await getSchema() });
-			await tusServer.cleanUpExpiredUploads();
-			cleanupServer();
-		});
-	}
+	if (validateCron(RESUMABLE_UPLOADS.SCHEDULE)) scheduleSynchronizedJob("tus-cleanup", RESUMABLE_UPLOADS.SCHEDULE, async () => {
+		const [tusServer, cleanupServer] = await createTusServer({ schema: await getSchema() });
+		await tusServer.cleanUpExpiredUploads();
+		cleanupServer();
+	});
 	return true;
 }
 

package/dist/server.js

@@ -30,8 +30,7 @@ async function createServer() {
 		const startTime = process.hrtime();
 		const complete = once(function(finished) {
 			const elapsedTime = process.hrtime(startTime);
-			const elapsedNanoseconds = elapsedTime[0] * 1e9 + elapsedTime[1];
-			const elapsedMilliseconds = elapsedNanoseconds / 1e6;
+			const elapsedMilliseconds = (elapsedTime[0] * 1e9 + elapsedTime[1]) / 1e6;
 			const previousIn = req.socket._metrics?.in || 0;
 			const previousOut = req.socket._metrics?.out || 0;
 			const metrics = {
@@ -81,7 +80,7 @@ async function createServer() {
 		createLogsController(server);
 		startWebSocketHandlers();
 	}
-	const terminusOptions = {
+	createTerminus(server, {
 		timeout: env["SERVER_SHUTDOWN_TIMEOUT"] >= 0 && env["SERVER_SHUTDOWN_TIMEOUT"] < Infinity ? env["SERVER_SHUTDOWN_TIMEOUT"] : 1e3,
 		signals: [
 			"SIGINT",
@@ -91,13 +90,10 @@ async function createServer() {
 		beforeShutdown,
 		onSignal,
 		onShutdown
-	};
-	createTerminus(server, terminusOptions);
+	});
 	return server;
 	async function beforeShutdown() {
-		if (getNodeEnv() !== "development") {
-			logger.info("Shutting down...");
-		}
+		if (getNodeEnv() !== "development") logger.info("Shutting down...");
 		SERVER_ONLINE = false;
 	}
 	async function onSignal() {
@@ -107,8 +103,7 @@ async function createServer() {
 		await getCollabHandler()?.terminate();
 		await terminateAllBufferedCounters();
 		await shutdownAITelemetry();
-		const database = database_default();
-		await database.destroy();
+		await database_default().destroy();
 		logger.info("Database connections destroyed");
 	}
 	async function onShutdown() {
@@ -117,9 +112,7 @@ async function createServer() {
 			schema: null,
 			accountability: null
 		});
-		if (getNodeEnv() !== "development") {
-			logger.info("Directus shut down OK. Bye bye!");
-		}
+		if (getNodeEnv() !== "development") logger.info("Directus shut down OK. Bye bye!");
 	}
 }
 async function startServer() {
@@ -128,14 +121,11 @@ async function startServer() {
 	const path = env["UNIX_SOCKET_PATH"];
 	const port = env["PORT"];
 	let listenOptions;
-	if (path) {
-		listenOptions = { path };
-	} else {
-		listenOptions = {
-			host,
-			port: parseInt(port)
-		};
-	}
+	if (path) listenOptions = { path };
+	else listenOptions = {
+		host,
+		port: parseInt(port)
+	};
 	server.listen(listenOptions, () => {
 		const protocol = server instanceof https.Server ? "https" : "http";
 		logger.info(`Server started at ${listenOptions.port ? `${protocol}://${getAddress(server)}` : getAddress(server)}`);
@@ -149,9 +139,7 @@ async function startServer() {
 		if (err?.code === "EADDRINUSE") {
 			logger.error(`${listenOptions.port ? `Port ${listenOptions.port}` : getAddress(server)} is already in use`);
 			process.exit(1);
-		} else {
-			throw err;
-		}
+		} else throw err;
 	});
 }
 

package/dist/services/access.js

@@ -9,9 +9,7 @@ var AccessService = class extends ItemsService {
 	}
 	async clearCaches(opts) {
 		await clearSystemCache({ autoPurgeCache: opts?.autoPurgeCache });
-		if (this.cache && opts?.autoPurgeCache !== false) {
-			await this.cache.clear();
-		}
+		if (this.cache && opts?.autoPurgeCache !== false) await this.cache.clear();
 	}
 	async createOne(data, opts = {}) {
 		opts.userIntegrityCheckFlags = (opts.userIntegrityCheckFlags ?? UserIntegrityCheckFlag.None) | UserIntegrityCheckFlag.UserLimits;

package/dist/services/assets/name-deduper.js

@@ -6,9 +6,7 @@ var NameDeduper = class {
 	map = {};
 	add(name, options) {
 		name = sanitize(name ?? "") || options?.fallback;
-		if (!name) {
-			throw Error("Invalid \"name\" provided");
-		}
+		if (!name) throw Error("Invalid \"name\" provided");
 		const groupKey = options?.group ?? DEFAULT_GROUP;
 		const match = this.map[groupKey]?.[name];
 		if (match) {
@@ -16,9 +14,7 @@ var NameDeduper = class {
 			this.map[groupKey][name] += 1;
 			return dedupedName;
 		}
-		if (!this.map[groupKey]) {
-			this.map[groupKey] = {};
-		}
+		if (!this.map[groupKey]) this.map[groupKey] = {};
 		this.map[groupKey][name] = 1;
 		return name;
 	}

package/dist/services/assets.js

@@ -37,23 +37,15 @@ var AssetsService = class {
 		});
 	}
 	sanitizeFields(file, allowedFields) {
-		if (allowedFields.includes("*")) {
-			return file;
-		}
+		if (allowedFields.includes("*")) return file;
 		const bypassFields = ["type", "filesize"];
 		const fieldsToKeep = new Set([...allowedFields, ...bypassFields]);
 		const filteredFile = {};
-		for (const field of fieldsToKeep) {
-			if (field in file) {
-				filteredFile[field] = file[field];
-			}
-		}
+		for (const field of fieldsToKeep) if (field in file) filteredFile[field] = file[field];
 		return filteredFile;
 	}
 	zip(options) {
-		if (options.files.length === 0) {
-			throw new InvalidPayloadError({ reason: "No files found in the selected folders tree" });
-		}
+		if (options.files.length === 0) throw new InvalidPayloadError({ reason: "No files found in the selected folders tree" });
 		const archive = archiver("zip");
 		const complete = async () => {
 			const deduper = new NameDeduper();
@@ -68,26 +60,23 @@ var AssetsService = class {
 					"modified_on",
 					"type"
 				] });
-				const exists = await storage.location(file.storage).exists(file.filename_disk);
-				if (!exists) throw new ForbiddenError();
-				const version = file.modified_on ? (new Date(file.modified_on).getTime() / 1e3).toFixed() : undefined;
+				if (!await storage.location(file.storage).exists(file.filename_disk)) throw new ForbiddenError();
+				const version = file.modified_on ? (new Date(file.modified_on).getTime() / 1e3).toFixed() : void 0;
 				const assetStream = await storage.location(file.storage).read(file.filename_disk, { version });
 				const fileExtension = path.extname(file.filename_download) || file.type && "." + extension(file.type) || "";
 				const dedupedFileName = deduper.add(filename_download, {
 					group: folder,
 					fallback: file.id + fileExtension
 				});
-				const folderName = folder ? options.folders?.get(folder) : undefined;
+				const folderName = folder ? options.folders?.get(folder) : void 0;
 				archive.append(assetStream, {
 					name: dedupedFileName,
 					prefix: folderName
 				});
 			}
-			if (options.folders) {
-				for (const [, folder] of options.folders) {
-					if (archive.destroyed) break;
-					archive.append("", { name: folder + "/" });
-				}
+			if (options.folders) for (const [, folder] of options.folders) {
+				if (archive.destroyed) break;
+				archive.append("", { name: folder + "/" });
 			}
 			await archive.finalize();
 		};
@@ -97,12 +86,11 @@ var AssetsService = class {
 		};
 	}
 	async zipFiles(files) {
-		const filesService = new FilesService({
+		const filesToZip = await new FilesService({
 			schema: this.schema,
 			knex: this.knex,
 			accountability: this.accountability
-		});
-		const filesToZip = await filesService.readByQuery({
+		}).readByQuery({
 			filter: { id: { _in: files } },
 			limit: -1
 		});
@@ -113,18 +101,16 @@ var AssetsService = class {
 		})) });
 	}
 	async zipFolder(root) {
-		const foldersService = new FoldersService({
+		const folderTree = await new FoldersService({
 			schema: this.schema,
 			knex: this.knex,
 			accountability: this.accountability
-		});
-		const folderTree = await foldersService.buildTree(root);
-		const filesService = new FilesService({
+		}).buildTree(root);
+		const filesToZip = await new FilesService({
 			schema: this.schema,
 			knex: this.knex,
 			accountability: this.accountability
-		});
-		const filesToZip = await filesService.readByQuery({
+		}).readByQuery({
 			filter: { folder: { _in: Array.from(folderTree.keys()) } },
 			limit: -1
 		});
@@ -164,53 +150,40 @@ var AssetsService = class {
 				knex: this.knex,
 				schema: this.schema
 			});
-			if (!accessAllowed) {
-				throw new ForbiddenError({ reason: `You don't have permission to perform "read" for collection "directus_files" or it does not exist.` });
-			}
+			if (!accessAllowed) throw new ForbiddenError({ reason: `You don't have permission to perform "read" for collection "directus_files" or it does not exist.` });
 			allowedFields = allowedRootFields;
 		}
 		const file = await this.sudoFilesService.readOne(id, { limit: 1 });
-		const exists = await storage.location(file.storage).exists(file.filename_disk);
-		if (!exists) throw new ForbiddenError();
+		if (!await storage.location(file.storage).exists(file.filename_disk)) throw new ForbiddenError();
 		if (range) {
-			const missingRangeLimits = range.start === undefined && range.end === undefined;
-			const endBeforeStart = range.start !== undefined && range.end !== undefined && range.end <= range.start;
-			const startOverflow = range.start !== undefined && range.start >= file.filesize;
-			const endUnderflow = range.end !== undefined && range.end <= 0;
-			if (missingRangeLimits || endBeforeStart || startOverflow || endUnderflow) {
-				throw new RangeNotSatisfiableError({ range });
-			}
+			const missingRangeLimits = range.start === void 0 && range.end === void 0;
+			const endBeforeStart = range.start !== void 0 && range.end !== void 0 && range.end <= range.start;
+			const startOverflow = range.start !== void 0 && range.start >= file.filesize;
+			const endUnderflow = range.end !== void 0 && range.end <= 0;
+			if (missingRangeLimits || endBeforeStart || startOverflow || endUnderflow) throw new RangeNotSatisfiableError({ range });
 			const lastByte = file.filesize - 1;
 			if (range.end) {
-				if (range.start === undefined) {
+				if (range.start === void 0) {
 					range.start = file.filesize - range.end;
 					range.end = lastByte;
 				}
-				if (range.end >= file.filesize) {
-					range.end = lastByte;
-				}
+				if (range.end >= file.filesize) range.end = lastByte;
 			}
 			if (range.start) {
-				if (range.end === undefined) {
-					range.end = lastByte;
-				}
-				if (range.start < 0) {
-					range.start = 0;
-				}
+				if (range.end === void 0) range.end = lastByte;
+				if (range.start < 0) range.start = 0;
 			}
 		}
 		const type = file.type;
 		const transforms = transformation ? resolvePreset(transformation, file) : [];
-		const modifiedOn = file.modified_on ? new Date(file.modified_on) : undefined;
-		const version = modifiedOn ? (modifiedOn.getTime() / 1e3).toFixed() : undefined;
+		const modifiedOn = file.modified_on ? new Date(file.modified_on) : void 0;
+		const version = modifiedOn ? (modifiedOn.getTime() / 1e3).toFixed() : void 0;
 		if (type && transforms.length > 0 && SUPPORTED_IMAGE_TRANSFORM_FORMATS.includes(type)) {
 			const maybeNewFormat = maybeExtractFormat(transforms);
 			const assetFilename = path.basename(file.filename_disk, path.extname(file.filename_disk)) + getAssetSuffix(transforms) + (maybeNewFormat ? `.${maybeNewFormat}` : path.extname(file.filename_disk));
-			const exists$1 = await storage.location(file.storage).exists(assetFilename);
-			if (maybeNewFormat) {
-				file.type = contentType(assetFilename) || null;
-			}
-			if (exists$1) {
+			const exists = await storage.location(file.storage).exists(assetFilename);
+			if (maybeNewFormat) file.type = contentType(assetFilename) || null;
+			if (exists) {
 				const assetStream$1 = () => storage.location(file.storage).read(assetFilename, { range });
 				return {
 					stream: deferStream ? assetStream$1 : await assetStream$1(),
@@ -224,23 +197,17 @@ var AssetsService = class {
 				throw new IllegalAssetTransformationError({ invalidTransformations: ["width", "height"] });
 			}
 			const { queue, process } = sharp.counters();
-			if (queue + process > env["ASSETS_TRANSFORM_MAX_CONCURRENT"]) {
-				throw new ServiceUnavailableError({
-					service: "files",
-					reason: "Server too busy"
-				});
-			}
+			if (queue + process > env["ASSETS_TRANSFORM_MAX_CONCURRENT"]) throw new ServiceUnavailableError({
+				service: "files",
+				reason: "Server too busy"
+			});
 			const transformer = getSharpInstance();
 			transformer.timeout({ seconds: clamp(Math.round(getMilliseconds(env["ASSETS_TRANSFORM_TIMEOUT"], 0) / 1e3), 1, 3600) });
-			if (transforms.find((transform$1) => transform$1[0] === "rotate") === undefined) transformer.rotate();
+			if (transforms.find((transform$1) => transform$1[0] === "rotate") === void 0) transformer.rotate();
 			try {
-				for (const [method, ...args] of transforms) {
-					transformer[method].apply(transformer, args);
-				}
+				for (const [method, ...args] of transforms) transformer[method].apply(transformer, args);
 			} catch (error) {
-				if (error instanceof Error && error.message.startsWith("Expected")) {
-					throw new InvalidQueryError({ reason: error.message });
-				}
+				if (error instanceof Error && error.message.startsWith("Expected")) throw new InvalidQueryError({ reason: error.message });
 				throw error;
 			}
 			const readStream = await storage.location(file.storage).read(file.filename_disk, {
@@ -257,14 +224,11 @@ var AssetsService = class {
 				try {
 					await storage.location(file.storage).delete(assetFilename);
 				} catch {}
-				if (error?.message?.includes("timeout")) {
-					throw new ServiceUnavailableError({
-						service: "assets",
-						reason: `Transformation timed out`
-					});
-				} else {
-					throw error;
-				}
+				if (error?.message?.includes("timeout")) throw new ServiceUnavailableError({
+					service: "assets",
+					reason: `Transformation timed out`
+				});
+				else throw error;
 			}
 			const assetStream = () => storage.location(file.storage).read(assetFilename, {
 				range,