@directus/api 35.0.2 → 35.2.0

package/dist/websocket/collab/permissions-cache.js

@@ -12,9 +12,9 @@ const env = useEnv();
 */
 var PermissionCache = class {
 	cache;
-	tags = new Map();
-	keyTags = new Map();
-	timers = new Map();
+	tags = /* @__PURE__ */ new Map();
+	keyTags = /* @__PURE__ */ new Map();
+	timers = /* @__PURE__ */ new Map();
 	bus = useBus();
 	invalidationCount = 0;
 	constructor(maxSize) {
@@ -35,7 +35,7 @@ var PermissionCache = class {
 	handleInvalidation(event) {
 		const { collection, keys, key } = event;
 		const items = keys || (key ? [key] : []);
-		const affectedKeys = new Set();
+		const affectedKeys = /* @__PURE__ */ new Set();
 		if ([
 			"directus_roles",
 			"directus_permissions",
@@ -48,41 +48,20 @@ var PermissionCache = class {
 			this.clear();
 			return;
 		}
-		if (IRRELEVANT_COLLECTIONS.includes(collection)) {
-			return;
-		}
+		if (IRRELEVANT_COLLECTIONS.includes(collection)) return;
 		this.invalidationCount++;
-		if (this.invalidationCount >= Number.MAX_SAFE_INTEGER) {
-			this.invalidationCount = 1;
-		}
-		if (!this.tags.has(`collection:${collection}`) && !this.tags.has(`dependency:${collection}`) && !this.tags.has(`collection-dependency:${collection}`)) {
-			return;
-		}
-		if (items.length === 0 && this.tags.has(`collection:${collection}`)) {
-			for (const k of this.tags.get(`collection:${collection}`)) affectedKeys.add(k);
-		}
+		if (this.invalidationCount >= Number.MAX_SAFE_INTEGER) this.invalidationCount = 1;
+		if (!this.tags.has(`collection:${collection}`) && !this.tags.has(`dependency:${collection}`) && !this.tags.has(`collection-dependency:${collection}`)) return;
+		if (items.length === 0 && this.tags.has(`collection:${collection}`)) for (const k of this.tags.get(`collection:${collection}`)) affectedKeys.add(k);
 		for (const id of items) {
 			const tag = `item:${collection}:${id}`;
-			if (this.tags.has(tag)) {
-				for (const k of this.tags.get(tag)) affectedKeys.add(k);
-			}
+			if (this.tags.has(tag)) for (const k of this.tags.get(tag)) affectedKeys.add(k);
 		}
 		const depTags = [`dependency:${collection}`];
-		if (items.length > 0) {
-			for (const id of items) {
-				depTags.push(`dependency:${collection}:${id}`);
-			}
-		} else {
-			depTags.push(`collection-dependency:${collection}`);
-		}
-		for (const tag of depTags) {
-			if (this.tags.has(tag)) {
-				for (const k of this.tags.get(tag)) affectedKeys.add(k);
-			}
-		}
-		for (const k of affectedKeys) {
-			this.invalidateKey(k);
-		}
+		if (items.length > 0) for (const id of items) depTags.push(`dependency:${collection}:${id}`);
+		else depTags.push(`collection-dependency:${collection}`);
+		for (const tag of depTags) if (this.tags.has(tag)) for (const k of this.tags.get(tag)) affectedKeys.add(k);
+		for (const k of affectedKeys) this.invalidateKey(k);
 	}
 	/**
 	* Get cached allowed fields for a given accountability and collection/item.
@@ -103,9 +82,7 @@ var PermissionCache = class {
 		}
 		if (!this.cache.has(key) && this.cache.size >= this.cache.capacity) {
 			const lruKey = this.cache.keys().next().value;
-			if (lruKey) {
-				this.cleanupKeyMetadata(lruKey);
-			}
+			if (lruKey) this.cleanupKeyMetadata(lruKey);
 		}
 		this.cache.set(key, fields);
 		if (ttlMs) {
@@ -148,13 +125,9 @@ var PermissionCache = class {
 	* Maintains bidirectional mappings: tag → keys and key → tags.
 	*/
 	addTag(key, tag) {
-		if (!this.tags.has(tag)) {
-			this.tags.set(tag, new Set());
-		}
+		if (!this.tags.has(tag)) this.tags.set(tag, /* @__PURE__ */ new Set());
 		this.tags.get(tag).add(key);
-		if (!this.keyTags.has(key)) {
-			this.keyTags.set(key, new Set());
-		}
+		if (!this.keyTags.has(key)) this.keyTags.set(key, /* @__PURE__ */ new Set());
 		this.keyTags.get(key).add(tag);
 	}
 	/**
@@ -174,9 +147,7 @@ var PermissionCache = class {
 	* Clear the entire cache.
 	*/
 	clear() {
-		for (const timer of this.timers.values()) {
-			clearTimeout(timer);
-		}
+		for (const timer of this.timers.values()) clearTimeout(timer);
 		this.timers.clear();
 		this.cache.clear();
 		this.tags.clear();

package/dist/websocket/collab/room.js

@@ -46,9 +46,7 @@ var RoomManager = class {
 	* Remove a room from local memory
 	*/
 	removeRoom(uid) {
-		if (this.rooms[uid]) {
-			delete this.rooms[uid];
-		}
+		if (this.rooms[uid]) delete this.rooms[uid];
 	}
 	/**
 	* Get an existing room by UID.
@@ -57,19 +55,12 @@ var RoomManager = class {
 	*/
 	async getRoom(uid) {
 		let room = this.rooms[uid];
-		if (!room) {
-			const store = useStore(uid);
-			room = await store(async (store$1) => {
-				if (!await store$1.has("uid")) return;
-				const collection = await store$1.get("collection");
-				const item = await store$1.get("item");
-				const version = await store$1.get("version");
-				const changes = await store$1.get("changes");
-				const room$1 = new Room(uid, collection, item, version, changes, this.messenger);
-				this.rooms[uid] = room$1;
-				return room$1;
-			});
-		}
+		if (!room) room = await useStore(uid)(async (store) => {
+			if (!await store.has("uid")) return;
+			const room$1 = new Room(uid, await store.get("collection"), await store.get("item"), await store.get("version"), await store.get("changes"), this.messenger);
+			this.rooms[uid] = room$1;
+			return room$1;
+		});
 		await room?.ensureInitialized();
 		return room;
 	}
@@ -78,11 +69,7 @@ var RoomManager = class {
 	*/
 	async getClientRooms(uid) {
 		const rooms = [];
-		for (const room of Object.values(this.rooms)) {
-			if (await room.hasClient(uid)) {
-				rooms.push(room);
-			}
-		}
+		for (const room of Object.values(this.rooms)) if (await room.hasClient(uid)) rooms.push(room);
 		return rooms;
 	}
 	/**
@@ -96,11 +83,9 @@ var RoomManager = class {
 	*/
 	async cleanupRooms(uids) {
 		const rooms = uids ? uids.map((uid) => this.rooms[uid]).filter((room) => !!room) : Object.values(this.rooms);
-		for (const room of rooms) {
-			if (await room.close()) {
-				delete this.rooms[room.uid];
-				useLogger().debug(`[Collab] Closed inactive room ${room.getDisplayName()}`);
-			}
+		for (const room of rooms) if (await room.close()) {
+			delete this.rooms[room.uid];
+			useLogger().debug(`[Collab] Closed inactive room ${room.getDisplayName()}`);
 		}
 	}
 	/**
@@ -157,11 +142,7 @@ var Room = class {
 			try {
 				const schema = await getSchema();
 				const result = await (async () => {
-					if (this.version) {
-						const service$1 = getService("directus_versions", { schema });
-						const versionData = await service$1.readOne(this.version);
-						return versionData["delta"] ?? {};
-					}
+					if (this.version) return (await getService("directus_versions", { schema }).readOne(this.version))["delta"] ?? {};
 					const service = getService(collection, { schema });
 					return item ? await service.readOne(item) : await service.readSingleton({});
 				})();
@@ -175,9 +156,7 @@ var Room = class {
 							const relation = schema.relations.find((r) => r.collection === collection && r.field === key);
 							if (relation) {
 								const pkField = schema.collections[relation.related_collection]?.primary;
-								if (pkField && isEqual(value[pkField], result[key])) {
-									return false;
-								}
+								if (pkField && isEqual(value[pkField], result[key])) return false;
 							}
 						}
 						return true;
@@ -185,9 +164,7 @@ var Room = class {
 					await store.set("changes", changes);
 					return await store.get("clients");
 				});
-				for (const client of clients) {
-					this.send(client.uid, { action: ACTION.SERVER.SAVE });
-				}
+				for (const client of clients) this.send(client.uid, { action: ACTION.SERVER.SAVE });
 			} catch (err) {
 				useLogger().error(err, `[Collab] External update handler failed for ${collection}/${item ?? "singleton"}`);
 			}
@@ -238,8 +215,7 @@ var Room = class {
 	}
 	async hasClient(id) {
 		return this.store(async (store) => {
-			const clients = await store.get("clients");
-			return clients.findIndex((c) => c.uid === id) !== -1;
+			return (await store.get("clients")).findIndex((c) => c.uid === id) !== -1;
 		});
 	}
 	async getFocusByUser(id) {
@@ -259,36 +235,27 @@ var Room = class {
 		this.messenger.addClient(client);
 		let added = false;
 		let clientColor;
-		if (!await this.hasClient(client.uid)) {
-			await this.store(async (store) => {
-				const clients$1 = await store.get("clients");
-				added = true;
-				const existingColors = clients$1.map((c) => c.color);
-				const colorsAvailable = COLORS.filter((color$1) => !existingColors.includes(color$1));
-				if (colorsAvailable.length === 0) {
-					colorsAvailable.push(...COLORS);
-				}
-				if (color && colorsAvailable.includes(color)) {
-					clientColor = color;
-				} else {
-					clientColor = colorsAvailable[random(colorsAvailable.length - 1)];
-				}
-				clients$1.push({
-					uid: client.uid,
-					accountability: client.accountability,
-					color: clientColor
-				});
-				await store.set("clients", clients$1);
-			});
-		}
-		if (added && clientColor) {
-			await this.sendExcluding({
-				action: ACTION.SERVER.JOIN,
-				user: client.accountability.user,
-				connection: client.uid,
+		if (!await this.hasClient(client.uid)) await this.store(async (store) => {
+			const clients$1 = await store.get("clients");
+			added = true;
+			const existingColors = clients$1.map((c) => c.color);
+			const colorsAvailable = COLORS.filter((color$1) => !existingColors.includes(color$1));
+			if (colorsAvailable.length === 0) colorsAvailable.push(...COLORS);
+			if (color && colorsAvailable.includes(color)) clientColor = color;
+			else clientColor = colorsAvailable[random(colorsAvailable.length - 1)];
+			clients$1.push({
+				uid: client.uid,
+				accountability: client.accountability,
 				color: clientColor
-			}, client.uid);
-		}
+			});
+			await store.set("clients", clients$1);
+		});
+		if (added && clientColor) await this.sendExcluding({
+			action: ACTION.SERVER.JOIN,
+			user: client.accountability.user,
+			connection: client.uid,
+			color: clientColor
+		}, client.uid);
 		const { changes, focuses, clients } = await this.store(async (store) => {
 			return {
 				changes: await store.get("changes"),
@@ -334,9 +301,7 @@ var Room = class {
 				delete focuses[uid];
 				await store.set("focuses", focuses);
 			}
-			if (clients.length === 0) {
-				await store.set("changes", {});
-			}
+			if (clients.length === 0) await store.set("changes", {});
 		});
 		this.sendAll({
 			action: ACTION.SERVER.LEAVE,
@@ -363,15 +328,11 @@ var Room = class {
 				knex,
 				itemId: this.item
 			}) || {};
-			for (const field of Object.keys(changes)) {
-				if (field in sanitizedChanges) {
-					this.send(client.uid, {
-						action: ACTION.SERVER.UPDATE,
-						field,
-						changes: sanitizedChanges[field]
-					});
-				}
-			}
+			for (const field of Object.keys(changes)) if (field in sanitizedChanges) this.send(client.uid, {
+				action: ACTION.SERVER.UPDATE,
+				field,
+				changes: sanitizedChanges[field]
+			});
 		}
 	}
 	/**
@@ -406,13 +367,8 @@ var Room = class {
 		if (fields.length === 0) return;
 		const clients = await this.store(async (store) => {
 			let changes = await store.get("changes");
-			if (fields.includes("*")) {
-				changes = {};
-			} else {
-				for (const field of fields) {
-					delete changes[field];
-				}
-			}
+			if (fields.includes("*")) changes = {};
+			else for (const field of fields) delete changes[field];
 			await store.set("changes", changes);
 			return await store.get("clients");
 		});
@@ -424,17 +380,9 @@ var Room = class {
 				knex
 			});
 			const sendFields = [];
-			if (fields.includes("*") && allowedFields?.includes("*")) {
-				sendFields.push("*");
-			} else if (fields.includes("*")) {
-				sendFields.push(...allowedFields ?? []);
-			} else {
-				for (const field of fields) {
-					if (allowedFields?.includes("*") || allowedFields?.includes(field)) {
-						sendFields.push(field);
-					}
-				}
-			}
+			if (fields.includes("*") && allowedFields?.includes("*")) sendFields.push("*");
+			else if (fields.includes("*")) sendFields.push(...allowedFields ?? []);
+			else for (const field of fields) if (allowedFields?.includes("*") || allowedFields?.includes(field)) sendFields.push(field);
 			this.send(client.uid, {
 				action: ACTION.SERVER.DISCARD,
 				fields: uniq(sendFields)
@@ -459,9 +407,7 @@ var Room = class {
 				};
 			}
 			const currentFocuser = Object.entries(focuses).find(([_, f]) => f === field)?.[0];
-			if (currentFocuser && currentFocuser !== sender.uid) {
-				return { success: false };
-			}
+			if (currentFocuser && currentFocuser !== sender.uid) return { success: false };
 			focuses[sender.uid] = field;
 			await store.set("focuses", focuses);
 			return {
@@ -489,16 +435,10 @@ var Room = class {
 		return true;
 	}
 	async sendAll(message) {
-		for (const client of await this.getClients()) {
-			this.send(client.uid, message);
-		}
+		for (const client of await this.getClients()) this.send(client.uid, message);
 	}
 	async sendExcluding(message, exclude) {
-		for (const client of await this.getClients()) {
-			if (client.uid !== exclude) {
-				this.send(client.uid, message);
-			}
-		}
+		for (const client of await this.getClients()) if (client.uid !== exclude) this.send(client.uid, message);
 	}
 	send(client, message) {
 		this.messenger.sendClient(client, {
@@ -519,17 +459,14 @@ var Room = class {
 		let roomClients = [];
 		if (force) {
 			roomClients = await this.getClients();
-			for (const client of roomClients) {
-				if (this.messenger.hasClient(client.uid)) {
-					if (reason) this.messenger.sendError(client.uid, reason);
-					if (terminate) this.messenger.terminateClient(client.uid);
-				}
+			for (const client of roomClients) if (this.messenger.hasClient(client.uid)) {
+				if (reason) this.messenger.sendError(client.uid, reason);
+				if (terminate) this.messenger.terminateClient(client.uid);
 			}
 		}
 		const closed = await this.store(async (store) => {
 			if (!force) {
-				const clients = await store.get("clients");
-				if (clients.length > 0) return false;
+				if ((await store.get("clients")).length > 0) return false;
 			}
 			if (!await store.has("uid")) return false;
 			await store.delete("uid");
@@ -545,17 +482,13 @@ var Room = class {
 			await this.messenger.unregisterRoom(this.uid);
 			this.messenger.sendRoom(this.uid, { action: "close" });
 			if (force) {
-				for (const client of roomClients) {
-					if (!this.messenger.hasClient(client.uid)) {
-						if (reason) this.messenger.sendError(client.uid, reason);
-						if (terminate) this.messenger.terminateClient(client.uid);
-					}
+				for (const client of roomClients) if (!this.messenger.hasClient(client.uid)) {
+					if (reason) this.messenger.sendError(client.uid, reason);
+					if (terminate) this.messenger.terminateClient(client.uid);
 				}
 			}
 		}
-		if (closed || force) {
-			this.dispose();
-		}
+		if (closed || force) this.dispose();
 		return closed;
 	}
 	dispose() {

package/dist/websocket/collab/verify-permissions.js

@@ -23,7 +23,7 @@ async function verifyPermissions(accountability, collection, item, action = "rea
 	if (!schema.collections[collection]) return [];
 	if (accountability.admin) return ["*"];
 	const cached = permissionCache.get(accountability, collection, String(item), action);
-	if (cached !== undefined) return cached;
+	if (cached !== void 0) return cached;
 	const startInvalidationCount = permissionCache.getInvalidationCount();
 	let itemData = null;
 	try {
@@ -47,62 +47,51 @@ async function verifyPermissions(accountability, collection, item, action = "rea
 		});
 		const hasItemRules = rawPermissions.some((p) => p.permissions && Object.keys(p.permissions).length > 0);
 		if (hasItemRules) {
-			const dynamicVariableContext = extractRequiredDynamicVariableContextForPermissions(rawPermissions);
-			const permissionsContext = await fetchDynamicVariableData({
-				accountability,
-				policies,
-				dynamicVariableContext
-			}, {
-				knex,
-				schema
-			});
-			const processedPermissions = processPermissions({
+			const fieldsToFetch = processPermissions({
 				permissions: rawPermissions,
 				accountability,
-				permissionsContext
-			});
-			const fieldsToFetch = processedPermissions.map((perm) => perm.permissions ? filterToFields(perm.permissions, collection, schema) : []).flat();
-			if (item && action !== "create") {
-				try {
-					itemData = await adminService.readOne(item, { fields: fieldsToFetch });
-				} catch {
-					permissionCache.set(accountability, collection, String(item), action, null, []);
-					return null;
-				}
-			} else if (schema.collections[collection]?.singleton && action !== "create") {
+				permissionsContext: await fetchDynamicVariableData({
+					accountability,
+					policies,
+					dynamicVariableContext: extractRequiredDynamicVariableContextForPermissions(rawPermissions)
+				}, {
+					knex,
+					schema
+				})
+			}).map((perm) => perm.permissions ? filterToFields(perm.permissions, collection, schema) : []).flat();
+			if (item && action !== "create") try {
+				itemData = await adminService.readOne(item, { fields: fieldsToFetch });
+			} catch {
+				permissionCache.set(accountability, collection, String(item), action, null, []);
+				return null;
+			}
+			else if (schema.collections[collection]?.singleton && action !== "create") {
 				const pkField = schema.collections[collection].primary;
 				if (pkField) {
-					if (Array.from(fieldsToFetch).some((field) => field === "*" || field === pkField) === false) {
-						fieldsToFetch.push(pkField);
-					}
+					if (Array.from(fieldsToFetch).some((field) => field === "*" || field === pkField) === false) fieldsToFetch.push(pkField);
 				}
 				itemData = await adminService.readSingleton({ fields: fieldsToFetch });
 			}
 		}
 		let allowedFields = [];
-		if ((item || schema.collections[collection]?.singleton) && hasItemRules) {
-			const primaryKeys = item ? [item] : [];
-			const validationContext = {
-				collection,
-				accountability,
-				action,
-				primaryKeys,
-				returnAllowedRootFields: true
-			};
-			allowedFields = (await validateItemAccess(validationContext, {
-				knex,
-				schema
-			})).allowedRootFields || [];
-		} else {
-			allowedFields = await fetchAllowedFields({
-				accountability,
-				action,
-				collection
-			}, {
-				knex,
-				schema
-			});
-		}
+		if ((item || schema.collections[collection]?.singleton) && hasItemRules) allowedFields = (await validateItemAccess({
+			collection,
+			accountability,
+			action,
+			primaryKeys: item ? [item] : [],
+			returnAllowedRootFields: true
+		}, {
+			knex,
+			schema
+		})).allowedRootFields || [];
+		else allowedFields = await fetchAllowedFields({
+			accountability,
+			action,
+			collection
+		}, {
+			knex,
+			schema
+		});
 		if (permissionCache.getInvalidationCount() === startInvalidationCount) {
 			const { ttlMs, dependencies } = calculateCacheMetadata(collection, itemData, rawPermissions, schema, accountability);
 			permissionCache.set(accountability, collection, String(item), action, allowedFields, dependencies, ttlMs);