directus 9.11.1 → 9.12.2

package/dist/database/system-data/relations/relations.yaml

@@ -61,6 +61,20 @@ data:
     many_field: dashboard
     one_collection: directus_dashboards
     one_field: panels
+  - many_collection: directus_flows
+    many_field: operation
+    one_collection: directus_operations
+  - many_collection: directus_operations
+    many_field: flow
+    one_collection: directus_flows
+    one_field: operations
+    one_deselect_action: delete
+  - many_collection: directus_operations
+    many_field: resolve
+    one_collection: directus_operations
+  - many_collection: directus_operations
+    many_field: reject
+    one_collection: directus_operations
   - many_collection: directus_files
     many_field: modified_by
     one_collection: directus_users
@@ -88,6 +102,12 @@ data:
   - many_collection: directus_panels
     many_field: user_created
     one_collection: directus_users
+  - many_collection: directus_flows
+    many_field: user_created
+    one_collection: directus_users
+  - many_collection: directus_operations
+    many_field: user_created
+    one_collection: directus_users
   - many_collection: directus_notifications
     many_field: recipient
     one_collection: directus_users

package/dist/env.d.ts

@@ -1,6 +1,6 @@
 /**
  * @NOTE
- * See example.env for all possible keys
+ * For all possible keys, see: https://docs.directus.io/configuration/config-options/
  */
 declare let env: Record<string, any>;
 export default env;

package/dist/env.js

@@ -1,7 +1,7 @@
 "use strict";
 /**
  * @NOTE
- * See example.env for all possible keys
+ * For all possible keys, see: https://docs.directus.io/configuration/config-options/
  */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -28,22 +28,11 @@ const allowedEnvironmentVars = [
     'ROOT_REDIRECT',
     'SERVE_APP',
     'GRAPHQL_INTROSPECTION',
+    'LOGGER_.+',
     // server
-    'SERVER_KEEP_ALIVE_TIMEOUT',
-    'SERVER_HEADERS_TIMEOUT',
+    'SERVER_.+',
     // database
-    'DB_CLIENT',
-    'DB_HOST',
-    'DB_PORT',
-    'DB_DATABASE',
-    'DB_USER',
-    'DB_PASSWORD',
-    'DB_FILENAME',
-    'DB_CONNECTION_STRING',
-    'DB_POOL_.+',
-    'DB_EXCLUDE_TABLES',
-    'DB_CHARSET',
-    'DB_VERSION',
+    'DB_.+',
     // security
     'KEY',
     'SECRET',
@@ -62,12 +51,7 @@ const allowedEnvironmentVars = [
     'CONTENT_SECURITY_POLICY_.+',
     'HSTS_.+',
     // hashing
-    'HASH_MEMORY_COST',
-    'HASH_LENGTH',
-    'HASH_TIME_COST',
-    'HASH_PARALLELISM',
-    'HASH_TYPE',
-    'HASH_ASSOCIATED_DATA',
+    'HASH_.+',
     // cors
     'CORS_ENABLED',
     'CORS_ORIGIN',
@@ -77,15 +61,7 @@ const allowedEnvironmentVars = [
     'CORS_CREDENTIALS',
     'CORS_MAX_AGE',
     // rate limiting
-    'RATE_LIMITER_ENABLED',
-    'RATE_LIMITER_POINTS',
-    'RATE_LIMITER_DURATION',
-    'RATE_LIMITER_STORE',
-    'RATE_LIMITER_REDIS',
-    'RATE_LIMITER_REDIS_HOST',
-    'RATE_LIMITER_REDIS_PORT',
-    'RATE_LIMITER_REDIS_PASSWORD',
-    'RATE_LIMITER_MEMCACHE',
+    'RATE_LIMITER_.+',
     // cache
     'CACHE_ENABLED',
     'CACHE_TTL',

package/dist/extensions.d.ts

@@ -13,10 +13,11 @@ declare class ExtensionManager {
     private apiExtensions;
     private apiEmitter;
     private endpointRouter;
+    private reloadQueue;
     private watcher;
     constructor();
     initialize(options?: Partial<Options>): Promise<void>;
-    reload(): Promise<void>;
+    reload(): void;
     getExtensionsList(type?: ExtensionType): string[];
     getAppExtensions(type: AppExtensionType): string | undefined;
     getEndpointRouter(): Router;
@@ -29,9 +30,12 @@ declare class ExtensionManager {
     private getSharedDepsMapping;
     private registerHooks;
     private registerEndpoints;
+    private registerOperations;
     private registerHook;
     private registerEndpoint;
+    private registerOperation;
     private unregisterHooks;
     private unregisterEndpoints;
+    private unregisterOperations;
 }
 export {};

package/dist/extensions.js

@@ -45,6 +45,9 @@ const get_module_default_1 = __importDefault(require("./utils/get-module-default
 const lodash_1 = require("lodash");
 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 job_queue_1 = require("./utils/job-queue");
 let extensionManager;
 function getExtensionManager() {
     if (extensionManager) {
@@ -63,11 +66,12 @@ class ExtensionManager {
         this.isLoaded = false;
         this.extensions = [];
         this.appExtensions = {};
-        this.apiExtensions = { hooks: [], endpoints: [] };
+        this.apiExtensions = { hooks: [], endpoints: [], operations: [] };
         this.watcher = null;
         this.options = defaultOptions;
         this.apiEmitter = new emitter_1.Emitter();
         this.endpointRouter = (0, express_1.Router)();
+        this.reloadQueue = new job_queue_1.JobQueue();
     }
     async initialize(options = {}) {
         this.options = {
@@ -84,27 +88,29 @@ class ExtensionManager {
             }
         }
     }
-    async reload() {
-        if (this.isLoaded) {
-            logger_1.default.info('Reloading extensions');
-            const prevExtensions = (0, lodash_1.clone)(this.extensions);
-            await this.unload();
-            await this.load();
-            const added = this.extensions.filter((extension) => !prevExtensions.some((prevExtension) => extension.path === prevExtension.path));
-            const removed = prevExtensions.filter((prevExtension) => !this.extensions.some((extension) => prevExtension.path === extension.path));
-            this.updateWatchedExtensions(added, removed);
-            const addedExtensions = added.map((extension) => extension.name);
-            const removedExtensions = removed.map((extension) => extension.name);
-            if (addedExtensions.length > 0) {
-                logger_1.default.info(`Added extensions: ${addedExtensions.join(', ')}`);
+    reload() {
+        this.reloadQueue.enqueue(async () => {
+            if (this.isLoaded) {
+                logger_1.default.info('Reloading extensions');
+                const prevExtensions = (0, lodash_1.clone)(this.extensions);
+                await this.unload();
+                await this.load();
+                const added = this.extensions.filter((extension) => !prevExtensions.some((prevExtension) => extension.path === prevExtension.path));
+                const removed = prevExtensions.filter((prevExtension) => !this.extensions.some((extension) => prevExtension.path === extension.path));
+                this.updateWatchedExtensions(added, removed);
+                const addedExtensions = added.map((extension) => extension.name);
+                const removedExtensions = removed.map((extension) => extension.name);
+                if (addedExtensions.length > 0) {
+                    logger_1.default.info(`Added extensions: ${addedExtensions.join(', ')}`);
+                }
+                if (removedExtensions.length > 0) {
+                    logger_1.default.info(`Removed extensions: ${removedExtensions.join(', ')}`);
+                }
             }
-            if (removedExtensions.length > 0) {
-                logger_1.default.info(`Removed extensions: ${removedExtensions.join(', ')}`);
+            else {
+                logger_1.default.warn('Extensions have to be loaded before they can be reloaded');
             }
-        }
-        else {
-            logger_1.default.warn('Extensions have to be loaded before they can be reloaded');
-        }
+        });
     }
     getExtensionsList(type) {
         if (type === undefined) {
@@ -131,6 +137,7 @@ class ExtensionManager {
         }
         this.registerHooks();
         this.registerEndpoints();
+        await this.registerOperations();
         if (env_1.default.SERVE_APP) {
             this.appExtensions = await this.generateExtensionBundles();
         }
@@ -139,6 +146,7 @@ class ExtensionManager {
     async unload() {
         this.unregisterHooks();
         this.unregisterEndpoints();
+        this.unregisterOperations();
         this.apiEmitter.offAll();
         if (env_1.default.SERVE_APP) {
             this.appExtensions = {};
@@ -148,8 +156,13 @@ class ExtensionManager {
     initializeWatcher() {
         if (this.options.watch && !this.watcher) {
             logger_1.default.info('Watching extensions for changes...');
-            const localExtensionPaths = (env_1.default.SERVE_APP ? constants_1.EXTENSION_TYPES : constants_1.API_EXTENSION_TYPES).map((type) => path_1.default.posix.join(path_1.default.relative('.', env_1.default.EXTENSIONS_PATH).split(path_1.default.sep).join(path_1.default.posix.sep), (0, utils_1.pluralize)(type), '*', 'index.js'));
-            this.watcher = chokidar_1.default.watch([path_1.default.resolve('.', 'package.json'), ...localExtensionPaths], {
+            const localExtensionPaths = (env_1.default.SERVE_APP ? constants_1.EXTENSION_TYPES : constants_1.API_EXTENSION_TYPES).flatMap((type) => {
+                const typeDir = path_1.default.posix.join(path_1.default.relative('.', env_1.default.EXTENSIONS_PATH).split(path_1.default.sep).join(path_1.default.posix.sep), (0, utils_1.pluralize)(type));
+                return (0, utils_1.isHybridExtension)(type)
+                    ? [path_1.default.posix.join(typeDir, '*', 'app.js'), path_1.default.posix.join(typeDir, '*', 'api.js')]
+                    : path_1.default.posix.join(typeDir, '*', 'index.js');
+            });
+            this.watcher = chokidar_1.default.watch([path_1.default.resolve('package.json'), ...localExtensionPaths], {
                 ignoreInitial: true,
             });
             this.watcher
@@ -162,9 +175,14 @@ class ExtensionManager {
         if (this.watcher) {
             const toPackageExtensionPaths = (extensions) => extensions
                 .filter((extension) => !extension.local)
-                .map((extension) => extension.type !== 'pack'
-                ? path_1.default.resolve(extension.path, extension.entrypoint || '')
-                : path_1.default.resolve(extension.path, 'package.json'));
+                .flatMap((extension) => extension.type === constants_1.PACK_EXTENSION_TYPE
+                ? path_1.default.resolve(extension.path, 'package.json')
+                : (0, utils_1.isExtensionObject)(extension, constants_1.HYBRID_EXTENSION_TYPES)
+                    ? [
+                        path_1.default.resolve(extension.path, extension.entrypoint.app),
+                        path_1.default.resolve(extension.path, extension.entrypoint.api),
+                    ]
+                    : path_1.default.resolve(extension.path, extension.entrypoint));
             const addedPackageExtensionPaths = toPackageExtensionPaths(added);
             const removedPackageExtensionPaths = toPackageExtensionPaths(removed);
             this.watcher.add(addedPackageExtensionPaths);
@@ -223,7 +241,10 @@ class ExtensionManager {
         const hooks = this.extensions.filter((extension) => extension.type === 'hook');
         for (const hook of hooks) {
             try {
-                this.registerHook(hook);
+                const hookPath = path_1.default.resolve(hook.path, hook.entrypoint);
+                const hookInstance = require(hookPath);
+                const config = (0, get_module_default_1.default)(hookInstance);
+                this.registerHook(config, hookPath);
             }
             catch (error) {
                 logger_1.default.warn(`Couldn't register hook "${hook.name}"`);
@@ -235,7 +256,10 @@ class ExtensionManager {
         const endpoints = this.extensions.filter((extension) => extension.type === 'endpoint');
         for (const endpoint of endpoints) {
             try {
-                this.registerEndpoint(endpoint, this.endpointRouter);
+                const endpointPath = path_1.default.resolve(endpoint.path, endpoint.entrypoint);
+                const endpointInstance = require(endpointPath);
+                const config = (0, get_module_default_1.default)(endpointInstance);
+                this.registerEndpoint(config, endpointPath, endpoint.name, this.endpointRouter);
             }
             catch (error) {
                 logger_1.default.warn(`Couldn't register endpoint "${endpoint.name}"`);
@@ -243,12 +267,33 @@ class ExtensionManager {
             }
         }
     }
-    registerHook(hook) {
-        const hookPath = path_1.default.resolve(hook.path, hook.entrypoint || '');
-        const hookInstance = require(hookPath);
-        const register = (0, get_module_default_1.default)(hookInstance);
+    async registerOperations() {
+        const internalPaths = await (0, globby_1.default)(path_1.default.posix.join(path_1.default.relative('.', __dirname).split(path_1.default.sep).join(path_1.default.posix.sep), 'operations/*/index.(js|ts)'));
+        const internalOperations = internalPaths.map((internalPath) => {
+            const dirs = internalPath.split(path_1.default.sep);
+            return {
+                name: dirs[dirs.length - 2],
+                path: dirs.slice(0, -1).join(path_1.default.sep),
+                entrypoint: { api: dirs[dirs.length - 1] },
+            };
+        });
+        const operations = this.extensions.filter((extension) => extension.type === 'operation');
+        for (const operation of [...internalOperations, ...operations]) {
+            try {
+                const operationPath = path_1.default.resolve(operation.path, operation.entrypoint.api);
+                const operationInstance = require(operationPath);
+                const config = (0, get_module_default_1.default)(operationInstance);
+                this.registerOperation(config, operationPath);
+            }
+            catch (error) {
+                logger_1.default.warn(`Couldn't register operation "${operation.name}"`);
+                logger_1.default.warn(error);
+            }
+        }
+    }
+    registerHook(register, path) {
         const hookHandler = {
-            path: hookPath,
+            path,
             events: [],
         };
         const registerFunctions = {
@@ -309,12 +354,9 @@ class ExtensionManager {
         });
         this.apiExtensions.hooks.push(hookHandler);
     }
-    registerEndpoint(endpoint, router) {
-        const endpointPath = path_1.default.resolve(endpoint.path, endpoint.entrypoint || '');
-        const endpointInstance = require(endpointPath);
-        const mod = (0, get_module_default_1.default)(endpointInstance);
-        const register = typeof mod === 'function' ? mod : mod.handler;
-        const routeName = typeof mod === 'function' ? endpoint.name : mod.id;
+    registerEndpoint(config, path, name, router) {
+        const register = typeof config === 'function' ? config : config.handler;
+        const routeName = typeof config === 'function' ? name : config.id;
         const scopedRouter = express_1.default.Router();
         router.use(`/${routeName}`, scopedRouter);
         register(scopedRouter, {
@@ -327,7 +369,14 @@ class ExtensionManager {
             getSchema: get_schema_1.getSchema,
         });
         this.apiExtensions.endpoints.push({
-            path: endpointPath,
+            path,
+        });
+    }
+    registerOperation(config, path) {
+        const flowManager = (0, flows_1.getFlowManager)();
+        flowManager.addOperation(config.id, config.handler);
+        this.apiExtensions.operations.push({
+            path,
         });
     }
     unregisterHooks() {
@@ -359,4 +408,12 @@ class ExtensionManager {
         this.endpointRouter.stack = [];
         this.apiExtensions.endpoints = [];
     }
+    unregisterOperations() {
+        for (const operation of this.apiExtensions.operations) {
+            delete require.cache[require.resolve(operation.path)];
+        }
+        const flowManager = (0, flows_1.getFlowManager)();
+        flowManager.clearOperations();
+        this.apiExtensions.operations = [];
+    }
 }

package/dist/flows.d.ts

@@ -0,0 +1,22 @@
+import { OperationHandler } from '@directus/shared/types';
+export declare function getFlowManager(): FlowManager;
+declare class FlowManager {
+    private isLoaded;
+    private operations;
+    private triggerHandlers;
+    private operationFlowHandlers;
+    private webhookFlowHandlers;
+    private reloadQueue;
+    constructor();
+    initialize(): Promise<void>;
+    reload(): Promise<void>;
+    addOperation(id: string, operation: OperationHandler): void;
+    clearOperations(): void;
+    runOperationFlow(id: string, data: unknown, context: Record<string, unknown>): Promise<unknown>;
+    runWebhookFlow(id: string, data: unknown, context: Record<string, unknown>): Promise<unknown>;
+    private load;
+    private unload;
+    private executeFlow;
+    private executeOperation;
+}
+export {};