directus 9.21.2 → 9.22.0

package/dist/database/migrations/run.js

@@ -1,37 +1,16 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const format_title_1 = __importDefault(require("@directus/format-title"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
+const lodash_1 = require("lodash");
 const path_1 = __importDefault(require("path"));
 const env_1 = __importDefault(require("../../env"));
 const logger_1 = __importDefault(require("../../logger"));
-const lodash_1 = require("lodash");
+const dynamic_import_1 = require("../../utils/dynamic-import");
+// @ts-ignore
+const format_title_1 = __importDefault(require("@directus/format-title"));
 async function run(database, direction, log = true) {
     let migrationFiles = await fs_extra_1.default.readdir(__dirname);
     const customMigrationsPath = path_1.default.resolve(env_1.default.EXTENSIONS_PATH, 'migrations');
@@ -65,7 +44,6 @@ async function run(database, direction, log = true) {
     if (direction === 'latest')
         await latest();
     async function up() {
-        var _a;
         const currentVersion = completedMigrations[completedMigrations.length - 1];
         let nextVersion;
         if (!currentVersion) {
@@ -79,7 +57,7 @@ async function run(database, direction, log = true) {
         if (!nextVersion) {
             throw Error('Nothing to upgrade');
         }
-        const { up } = await (_a = nextVersion.file, Promise.resolve().then(() => __importStar(require(_a))));
+        const { up } = await (0, dynamic_import_1.dynamicImport)(nextVersion.file);
         if (log) {
             logger_1.default.info(`Applying ${nextVersion.name}...`);
         }
@@ -87,7 +65,6 @@ async function run(database, direction, log = true) {
         await database.insert({ version: nextVersion.version, name: nextVersion.name }).into('directus_migrations');
     }
     async function down() {
-        var _a;
         const lastAppliedMigration = (0, lodash_1.orderBy)(completedMigrations, ['timestamp', 'version'], ['desc', 'desc'])[0];
         if (!lastAppliedMigration) {
             throw Error('Nothing to downgrade');
@@ -96,7 +73,7 @@ async function run(database, direction, log = true) {
         if (!migration) {
             throw new Error("Couldn't find migration");
         }
-        const { down } = await (_a = migration.file, Promise.resolve().then(() => __importStar(require(_a))));
+        const { down } = await (0, dynamic_import_1.dynamicImport)(migration.file);
         if (log) {
             logger_1.default.info(`Undoing ${migration.name}...`);
         }
@@ -104,10 +81,9 @@ async function run(database, direction, log = true) {
         await database('directus_migrations').delete().where({ version: migration.version });
     }
     async function latest() {
-        var _a;
         for (const migration of migrations) {
             if (migration.completed === false) {
-                const { up } = await (_a = migration.file, Promise.resolve().then(() => __importStar(require(_a))));
+                const { up } = await (0, dynamic_import_1.dynamicImport)(migration.file);
                 if (log) {
                     logger_1.default.info(`Applying ${migration.name}...`);
                 }

package/dist/database/run-ast.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -10,7 +33,8 @@ const helpers_1 = require("../database/helpers");
 const env_1 = __importDefault(require("../env"));
 const payload_1 = require("../services/payload");
 const apply_function_to_column_name_1 = require("../utils/apply-function-to-column-name");
-const apply_query_1 = __importDefault(require("../utils/apply-query"));
+const apply_query_1 = __importStar(require("../utils/apply-query"));
+const get_collection_from_alias_1 = require("../utils/get-collection-from-alias");
 const get_column_1 = require("../utils/get-column");
 const strip_function_1 = require("../utils/strip-function");
 /**
@@ -33,7 +57,7 @@ async function runAST(originalAST, schema, options) {
         // Retrieve the database columns to select in the current AST
         const { fieldNodes, primaryKeyField, nestedCollectionNodes } = await parseCurrentLevel(schema, collection, children, query);
         // The actual knex query builder instance. This is a promise that resolves with the raw items from the db
-        const dbQuery = getDBQuery(schema, knex, collection, fieldNodes, query);
+        const dbQuery = await getDBQuery(schema, knex, collection, fieldNodes, query);
         const rawItems = await dbQuery;
         if (!rawItems)
             return null;
@@ -152,17 +176,119 @@ function getColumnPreprocessor(knex, schema, table) {
             return helpers.st.asText(table, field.field);
         }
         if (fieldNode.type === 'functionField') {
-            return (0, get_column_1.getColumn)(knex, table, fieldNode.name, alias, schema, fieldNode.query);
+            return (0, get_column_1.getColumn)(knex, table, fieldNode.name, alias, schema, { query: fieldNode.query });
         }
         return (0, get_column_1.getColumn)(knex, table, fieldNode.name, alias, schema);
     };
 }
-function getDBQuery(schema, knex, table, fieldNodes, query) {
+async function getDBQuery(schema, knex, table, fieldNodes, query) {
     const preProcess = getColumnPreprocessor(knex, schema, table);
-    const dbQuery = knex.select(fieldNodes.map(preProcess)).from(table);
     const queryCopy = (0, lodash_1.clone)(query);
+    const helpers = (0, helpers_1.getHelpers)(knex);
     queryCopy.limit = typeof queryCopy.limit === 'number' ? queryCopy.limit : 100;
-    return (0, apply_query_1.default)(knex, table, dbQuery, queryCopy, schema);
+    // Queries with aggregates and groupBy will not have duplicate result
+    if (queryCopy.aggregate || queryCopy.group) {
+        const flatQuery = knex.select(fieldNodes.map(preProcess)).from(table);
+        return await (0, apply_query_1.default)(knex, table, flatQuery, queryCopy, schema).query;
+    }
+    const primaryKey = schema.collections[table].primary;
+    const aliasMap = Object.create(null);
+    let dbQuery = knex.from(table);
+    let sortRecords;
+    const innerQuerySortRecords = [];
+    let hasMultiRelationalSort;
+    if (queryCopy.sort) {
+        const sortResult = (0, apply_query_1.applySort)(knex, schema, dbQuery, queryCopy.sort, table, aliasMap, true);
+        if (sortResult) {
+            sortRecords = sortResult.sortRecords;
+            hasMultiRelationalSort = sortResult.hasMultiRelationalSort;
+        }
+    }
+    const { hasMultiRelationalFilter } = await (0, apply_query_1.default)(knex, table, dbQuery, queryCopy, schema, {
+        aliasMap,
+        isInnerQuery: true,
+        hasMultiRelationalSort,
+    });
+    const needsInnerQuery = hasMultiRelationalSort || hasMultiRelationalFilter;
+    if (needsInnerQuery) {
+        dbQuery.select(`${table}.${primaryKey}`).distinct();
+    }
+    else {
+        dbQuery.select(fieldNodes.map(preProcess));
+    }
+    if (sortRecords) {
+        if (needsInnerQuery) {
+            sortRecords.map((sortRecord) => {
+                const sortAlias = `sort_${(0, apply_query_1.generateAlias)()}`;
+                if (sortRecord.column.includes('.')) {
+                    const [alias, field] = sortRecord.column.split('.');
+                    dbQuery.select((0, get_column_1.getColumn)(knex, alias, field, sortAlias, schema, {
+                        originalCollectionName: (0, get_collection_from_alias_1.getCollectionFromAlias)(alias, aliasMap),
+                    }));
+                }
+                else {
+                    dbQuery.select((0, get_column_1.getColumn)(knex, table, sortRecord.column, sortAlias, schema));
+                }
+                innerQuerySortRecords.push({ alias: sortAlias, order: sortRecord.order });
+            });
+            if (hasMultiRelationalSort) {
+                let orderByString = '';
+                const orderByFields = [];
+                sortRecords.map((sortRecord) => {
+                    if (orderByString.length === 0) {
+                        orderByString += ' order by';
+                    }
+                    else {
+                        orderByString += ',';
+                    }
+                    if (sortRecord.column.includes('.')) {
+                        orderByString += ` ?? ${sortRecord.order}`;
+                        const [alias, field] = sortRecord.column.split('.');
+                        orderByFields.push((0, get_column_1.getColumn)(knex, alias, field, false, schema, {
+                            originalCollectionName: (0, get_collection_from_alias_1.getCollectionFromAlias)(alias, aliasMap),
+                        }));
+                    }
+                    else {
+                        orderByString += ` ?? ${sortRecord.order}`;
+                        orderByFields.push((0, get_column_1.getColumn)(knex, table, sortRecord.column, false, schema));
+                    }
+                });
+                dbQuery = helpers.schema.applyMultiRelationalSort(knex, dbQuery, table, primaryKey, orderByString, orderByFields);
+            }
+        }
+        else {
+            // Clears the order if any, eg: from MSSQL offset
+            dbQuery.clear('order');
+            sortRecords.map((sortRecord) => {
+                if (sortRecord.column.includes('.')) {
+                    const [alias, field] = sortRecord.column.split('.');
+                    sortRecord.column = (0, get_column_1.getColumn)(knex, alias, field, false, schema, {
+                        originalCollectionName: (0, get_collection_from_alias_1.getCollectionFromAlias)(alias, aliasMap),
+                    });
+                }
+                else {
+                    sortRecord.column = (0, get_column_1.getColumn)(knex, table, sortRecord.column, false, schema);
+                }
+            });
+            dbQuery.orderBy(sortRecords);
+        }
+    }
+    if (!needsInnerQuery)
+        return dbQuery;
+    const wrapperQuery = knex
+        .select(fieldNodes.map(preProcess))
+        .from(table)
+        .innerJoin(knex.raw('??', dbQuery.as('inner')), `${table}.${primaryKey}`, `inner.${primaryKey}`);
+    if (sortRecords && needsInnerQuery) {
+        innerQuerySortRecords.map((innerQuerySortRecord) => {
+            wrapperQuery.orderBy(`inner.${innerQuerySortRecord.alias}`, innerQuerySortRecord.order);
+        });
+        if (hasMultiRelationalSort) {
+            wrapperQuery.where('inner.directus_row_number', '=', 1);
+            (0, apply_query_1.applyLimit)(wrapperQuery, queryCopy.limit);
+        }
+    }
+    return wrapperQuery;
 }
 function applyParentFilters(schema, nestedCollectionNodes, parentItem) {
     var _a;

package/dist/database/system-data/fields/index.js

@@ -7,9 +7,10 @@ exports.systemFieldRows = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const lodash_1 = require("lodash");
 const path_1 = __importDefault(require("path"));
-const format_title_1 = __importDefault(require("@directus/format-title"));
 const get_auth_providers_1 = require("../../../utils/get-auth-providers");
 const require_yaml_1 = require("../../../utils/require-yaml");
+// @ts-ignore
+const format_title_1 = __importDefault(require("@directus/format-title"));
 const defaults = (0, require_yaml_1.requireYAML)(require.resolve('./_defaults.yaml'));
 const fieldData = fs_extra_1.default.readdirSync(path_1.default.resolve(__dirname));
 exports.systemFieldRows = [];

package/dist/env.js

@@ -14,7 +14,6 @@ const lodash_1 = require("lodash");
 const path_1 = __importDefault(require("path"));
 const require_yaml_1 = require("./utils/require-yaml");
 const utils_1 = require("@directus/shared/utils");
-const utils_2 = require("@directus/shared/utils");
 // keeping this here for now to prevent a circular import to constants.ts
 const allowedEnvironmentVars = [
     // general
@@ -107,6 +106,7 @@ const allowedEnvironmentVars = [
     'ASSETS_TRANSFORM_IMAGE_MAX_DIMENSION',
     'ASSETS_TRANSFORM_MAX_OPERATIONS',
     'ASSETS_CONTENT_SECURITY_POLICY',
+    'ASSETS_INVALID_IMAGE_SENSITIVITY_LEVEL',
     // auth
     'AUTH_PROVIDERS',
     'AUTH_DISABLE_DEFAULT',
@@ -237,6 +237,7 @@ const defaults = {
     ASSETS_TRANSFORM_MAX_CONCURRENT: 1,
     ASSETS_TRANSFORM_IMAGE_MAX_DIMENSION: 6000,
     ASSETS_TRANSFORM_MAX_OPERATIONS: 5,
+    ASSETS_INVALID_IMAGE_SENSITIVITY_LEVEL: 'warning',
     IP_TRUST_PROXY: true,
     IP_CUSTOM_HEADER: false,
     IMPORT_IP_DENY_LIST: '0.0.0.0',
@@ -437,7 +438,7 @@ function processValues(env) {
 }
 function tryJSON(value) {
     try {
-        return (0, utils_2.parseJSON)(value);
+        return (0, utils_1.parseJSON)(value);
     }
     catch {
         return value;

package/dist/exceptions/range-not-satisfiable.d.ts

@@ -1,5 +1,5 @@
 import { BaseException } from '@directus/shared/exceptions';
-import { Range } from '@directus/drive';
+import type { Range } from '@directus/storage';
 export declare class RangeNotSatisfiableException extends BaseException {
     constructor(range?: Range);
 }

package/dist/extensions.d.ts

@@ -1,5 +1,5 @@
-import { Router } from 'express';
 import { ExtensionType } from '@directus/shared/types';
+import { Router } from 'express';
 export declare function getExtensionManager(): ExtensionManager;
 type Options = {
     schedule: boolean;
@@ -14,6 +14,8 @@ declare class ExtensionManager {
     private apiEmitter;
     private hookEvents;
     private endpointRouter;
+    private hookEmbedsHead;
+    private hookEmbedsBody;
     private reloadQueue;
     private watcher;
     constructor();
@@ -22,6 +24,10 @@ declare class ExtensionManager {
     getExtensionsList(type?: ExtensionType): string[];
     getAppExtensions(): string | null;
     getEndpointRouter(): Router;
+    getEmbeds(): {
+        head: string;
+        body: string;
+    };
     private load;
     private unload;
     private initializeWatcher;

package/dist/extensions.js

@@ -27,31 +27,32 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExtensionManager = void 0;
+const constants_1 = require("@directus/shared/constants");
+const sharedExceptions = __importStar(require("@directus/shared/exceptions"));
+const node_1 = require("@directus/shared/utils/node");
 const express_1 = __importStar(require("express"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
-const node_1 = require("@directus/shared/utils/node");
-const constants_1 = require("@directus/shared/constants");
 const database_1 = __importDefault(require("./database"));
 const emitter_1 = __importStar(require("./emitter"));
 const env_1 = __importDefault(require("./env"));
 const exceptions = __importStar(require("./exceptions"));
-const sharedExceptions = __importStar(require("@directus/shared/exceptions"));
 const logger_1 = __importDefault(require("./logger"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
+const dynamic_import_1 = require("./utils/dynamic-import");
 const get_schema_1 = require("./utils/get-schema");
-const services = __importStar(require("./services"));
-const node_cron_1 = require("node-cron");
-const rollup_1 = require("rollup");
-const plugin_virtual_1 = __importDefault(require("@rollup/plugin-virtual"));
+const utils_1 = require("@directus/shared/utils");
 const plugin_alias_1 = __importDefault(require("@rollup/plugin-alias"));
-const url_1 = require("./utils/url");
-const get_module_default_1 = __importDefault(require("./utils/get-module-default"));
-const lodash_1 = require("lodash");
+const plugin_virtual_1 = __importDefault(require("@rollup/plugin-virtual"));
 const chokidar_1 = __importDefault(require("chokidar"));
-const utils_1 = require("@directus/shared/utils");
-const flows_1 = require("./flows");
 const globby_1 = __importDefault(require("globby"));
+const lodash_1 = require("lodash");
+const node_cron_1 = require("node-cron");
+const rollup_1 = require("rollup");
+const flows_1 = require("./flows");
+const services = __importStar(require("./services"));
+const get_module_default_1 = __importDefault(require("./utils/get-module-default"));
 const job_queue_1 = require("./utils/job-queue");
+const url_1 = require("./utils/url");
 let extensionManager;
 function getExtensionManager() {
     if (extensionManager) {
@@ -72,6 +73,8 @@ class ExtensionManager {
         this.appExtensions = null;
         this.apiExtensions = [];
         this.hookEvents = [];
+        this.hookEmbedsHead = [];
+        this.hookEmbedsBody = [];
         this.watcher = null;
         this.options = defaultOptions;
         this.apiEmitter = new emitter_1.Emitter();
@@ -139,6 +142,17 @@ class ExtensionManager {
     getEndpointRouter() {
         return this.endpointRouter;
     }
+    getEmbeds() {
+        return {
+            head: wrapEmbeds('Custom Embed Head', this.hookEmbedsHead),
+            body: wrapEmbeds('Custom Embed Body', this.hookEmbedsBody),
+        };
+        function wrapEmbeds(label, content) {
+            if (content.length === 0)
+                return '';
+            return `<!-- Start ${label} -->\n${content.join('\n')}\n<!-- End ${label} -->`;
+        }
+    }
     async load() {
         try {
             await (0, node_1.ensureExtensionDirs)(env_1.default.EXTENSIONS_PATH, env_1.default.SERVE_APP ? constants_1.EXTENSION_TYPES : constants_1.API_OR_HYBRID_EXTENSION_TYPES);
@@ -252,12 +266,11 @@ class ExtensionManager {
         return depsMapping;
     }
     async registerHooks() {
-        var _a;
         const hooks = this.extensions.filter((extension) => extension.type === 'hook');
         for (const hook of hooks) {
             try {
                 const hookPath = path_1.default.resolve(hook.path, hook.entrypoint);
-                const hookInstance = await (_a = hookPath, Promise.resolve().then(() => __importStar(require(_a))));
+                const hookInstance = await (0, dynamic_import_1.dynamicImport)(hookPath);
                 const config = (0, get_module_default_1.default)(hookInstance);
                 this.registerHook(config);
                 this.apiExtensions.push({ path: hookPath });
@@ -380,6 +393,19 @@ class ExtensionManager {
                     logger_1.default.warn(`Couldn't register cron hook. Provided cron is invalid: ${cron}`);
                 }
             },
+            embed: (position, code) => {
+                const content = typeof code === 'function' ? code() : code;
+                if (content.trim().length === 0) {
+                    logger_1.default.warn(`Couldn't register embed hook. Provided code is empty!`);
+                    return;
+                }
+                if (position === 'head') {
+                    this.hookEmbedsHead.push(content);
+                }
+                if (position === 'body') {
+                    this.hookEmbedsBody.push(content);
+                }
+            },
         };
         register(registerFunctions, {
             services,

package/dist/logger.js

@@ -41,13 +41,31 @@ const pinoOptions = {
         censor: '--redact--',
     },
 };
+const httpLoggerOptions = {
+    level: env_1.default.LOG_LEVEL || 'info',
+    redact: {
+        paths: ['req.headers.authorization', `req.cookies.${env_1.default.REFRESH_TOKEN_COOKIE_NAME}`],
+        censor: '--redact--',
+    },
+};
 if (env_1.default.LOG_STYLE !== 'raw') {
     pinoOptions.transport = {
+        target: 'pino-pretty',
+        options: {
+            ignore: 'hostname,pid',
+            sync: true,
+        },
+    };
+    httpLoggerOptions.transport = {
         target: 'pino-http-print',
         options: {
             all: true,
             translateTime: 'SYS:HH:MM:ss',
             relativeUrl: true,
+            prettyOptions: {
+                ignore: 'hostname,pid',
+                sync: true,
+            },
         },
     };
 }
@@ -67,12 +85,20 @@ if (loggerEnvConfig.levels) {
             };
         },
     };
+    httpLoggerOptions.formatters = {
+        level(label, number) {
+            return {
+                severity: customLogLevels[label] || 'info',
+                level: number,
+            };
+        },
+    };
     delete loggerEnvConfig.levels;
 }
 const logger = (0, pino_1.default)((0, lodash_1.merge)(pinoOptions, loggerEnvConfig));
 const httpLoggerEnvConfig = (0, get_config_from_env_1.getConfigFromEnv)('LOGGER_HTTP', ['LOGGER_HTTP_LOGGER']);
 exports.expressLogger = (0, pino_http_1.default)({
-    logger,
+    logger: (0, pino_1.default)((0, lodash_1.merge)(httpLoggerOptions, loggerEnvConfig)),
     ...httpLoggerEnvConfig,
     serializers: {
         req(request) {

package/dist/operations/request/index.d.ts

@@ -1,7 +1,6 @@
-import { Method } from 'axios';
 type Options = {
     url: string;
-    method: Method;
+    method: string;
     body: Record<string, any> | string | null;
     headers?: {
         header: string;

package/dist/operations/request/index.js

@@ -4,12 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("@directus/shared/utils");
-const axios_1 = __importDefault(require("axios"));
 const encodeurl_1 = __importDefault(require("encodeurl"));
 exports.default = (0, utils_1.defineOperationApi)({
     id: 'request',
     handler: async ({ url, method, body, headers }) => {
         var _a;
+        const axios = (await import('axios')).default;
         const customHeaders = (_a = headers === null || headers === void 0 ? void 0 : headers.reduce((acc, { header, value }) => {
             acc[header] = value;
             return acc;
@@ -17,7 +17,7 @@ exports.default = (0, utils_1.defineOperationApi)({
         if (!customHeaders['Content-Type'] && isValidJSON(body)) {
             customHeaders['Content-Type'] = 'application/json';
         }
-        const result = await (0, axios_1.default)({
+        const result = await axios({
             url: (0, encodeurl_1.default)(url),
             method,
             data: body,

package/dist/services/assets.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
-import { Range, StatResponse } from '@directus/drive';
+import type { Range, Stat } from '@directus/storage';
 import { Accountability } from '@directus/shared/types';
+import type { Readable } from 'node:stream';
 import { Knex } from 'knex';
 import { AbstractServiceOptions, TransformationParams, TransformationPreset } from '../types';
 import { AuthorizationService } from './authorization';
@@ -10,8 +11,8 @@ export declare class AssetsService {
     authorizationService: AuthorizationService;
     constructor(options: AbstractServiceOptions);
     getAsset(id: string, transformation: TransformationParams | TransformationPreset, range?: Range): Promise<{
-        stream: NodeJS.ReadableStream;
+        stream: Readable;
         file: any;
-        stat: StatResponse;
+        stat: Stat;
     }>;
 }

package/dist/services/assets.js

@@ -37,7 +37,7 @@ const database_1 = __importDefault(require("../database"));
 const env_1 = __importDefault(require("../env"));
 const exceptions_1 = require("../exceptions");
 const logger_1 = __importDefault(require("../logger"));
-const storage_1 = __importDefault(require("../storage"));
+const storage_1 = require("../storage");
 const TransformationUtils = __importStar(require("../utils/transformations"));
 const authorization_1 = require("./authorization");
 sharp_1.default.concurrency(1);
@@ -52,6 +52,7 @@ class AssetsService {
     }
     async getAsset(id, transformation, range) {
         var _a;
+        const storage = await (0, storage_1.getStorage)();
         const publicSettings = await this.knex
             .select('project_logo', 'public_background', 'public_foreground')
             .from('directus_settings')
@@ -71,7 +72,7 @@ class AssetsService {
         const file = (await this.knex.select('*').from('directus_files').where({ id }).first());
         if (!file)
             throw new exceptions_1.ForbiddenException();
-        const { exists } = await storage_1.default.disk(file.storage).exists(file.filename_disk);
+        const exists = await storage.location(file.storage).exists(file.filename_disk);
         if (!exists)
             throw new exceptions_1.ForbiddenException();
         if (range) {
@@ -113,15 +114,15 @@ class AssetsService {
             const assetFilename = path_1.default.basename(file.filename_disk, path_1.default.extname(file.filename_disk)) +
                 getAssetSuffix(transforms) +
                 (maybeNewFormat ? `.${maybeNewFormat}` : path_1.default.extname(file.filename_disk));
-            const { exists } = await storage_1.default.disk(file.storage).exists(assetFilename);
+            const exists = await storage.location(file.storage).exists(assetFilename);
             if (maybeNewFormat) {
                 file.type = (0, mime_types_1.contentType)(assetFilename) || null;
             }
             if (exists) {
                 return {
-                    stream: storage_1.default.disk(file.storage).getStream(assetFilename, range),
+                    stream: await storage.location(file.storage).read(assetFilename, range),
                     file,
-                    stat: await storage_1.default.disk(file.storage).getStat(assetFilename),
+                    stat: await storage.location(file.storage).stat(assetFilename),
                 };
             }
             // Check image size before transforming. Processing an image that's too large for the
@@ -135,10 +136,11 @@ class AssetsService {
                 throw new exceptions_1.IllegalAssetTransformation(`Image is too large to be transformed, or image size couldn't be determined.`);
             }
             return await semaphore.runExclusive(async () => {
-                const readStream = storage_1.default.disk(file.storage).getStream(file.filename_disk, range);
+                const readStream = await storage.location(file.storage).read(file.filename_disk, range);
                 const transformer = (0, sharp_1.default)({
                     limitInputPixels: Math.pow(env_1.default.ASSETS_TRANSFORM_IMAGE_MAX_DIMENSION, 2),
                     sequentialRead: true,
+                    failOn: env_1.default.ASSETS_INVALID_IMAGE_SENSITIVITY_LEVEL,
                 });
                 if (transforms.find((transform) => transform[0] === 'rotate') === undefined)
                     transformer.rotate();
@@ -147,17 +149,17 @@ class AssetsService {
                     logger_1.default.error(e, `Couldn't transform file ${file.id}`);
                     readStream.unpipe(transformer);
                 });
-                await storage_1.default.disk(file.storage).put(assetFilename, readStream.pipe(transformer), type);
+                await storage.location(file.storage).write(assetFilename, readStream.pipe(transformer), type);
                 return {
-                    stream: storage_1.default.disk(file.storage).getStream(assetFilename, range),
-                    stat: await storage_1.default.disk(file.storage).getStat(assetFilename),
+                    stream: await storage.location(file.storage).read(assetFilename, range),
+                    stat: await storage.location(file.storage).stat(assetFilename),
                     file,
                 };
             });
         }
         else {
-            const readStream = storage_1.default.disk(file.storage).getStream(file.filename_disk, range);
-            const stat = await storage_1.default.disk(file.storage).getStat(file.filename_disk);
+            const readStream = await storage.location(file.storage).read(file.filename_disk, range);
+            const stat = await storage.location(file.storage).stat(file.filename_disk);
             return { stream: readStream, file, stat };
         }
     }