directus 9.2.2 → 9.3.0

package/dist/cli/commands/bootstrap/index.js

@@ -30,6 +30,7 @@ const logger_1 = __importDefault(require("../../../logger"));
 const get_schema_1 = require("../../../utils/get-schema");
 const services_1 = require("../../../services");
 const database_1 = __importStar(require("../../../database"));
+const defaults_1 = require("../../utils/defaults");
 async function bootstrap({ skipAdminInit }) {
     logger_1.default.info('Initializing bootstrap...');
     const database = (0, database_1.default)();
@@ -75,7 +76,7 @@ async function waitForDatabase(database) {
 async function createDefaultAdmin(schema) {
     logger_1.default.info('Setting up first admin role...');
     const rolesService = new services_1.RolesService({ schema });
-    const role = await rolesService.createOne({ name: 'Admin', admin_access: true });
+    const role = await rolesService.createOne(defaults_1.defaultAdminRole);
     logger_1.default.info('Adding first admin user...');
     const usersService = new services_1.UsersService({ schema });
     let adminEmail = env_1.default.ADMIN_EMAIL;
@@ -88,5 +89,5 @@ async function createDefaultAdmin(schema) {
         adminPassword = (0, nanoid_1.nanoid)(12);
         logger_1.default.info(`No admin password provided. Defaulting to "${adminPassword}"`);
     }
-    await usersService.createOne({ email: adminEmail, password: adminPassword, role });
+    await usersService.createOne({ email: adminEmail, password: adminPassword, role, ...defaults_1.defaultAdminUser });
 }

package/dist/cli/commands/init/index.js

@@ -15,6 +15,7 @@ const create_env_1 = __importDefault(require("../../utils/create-env"));
 const drivers_1 = require("../../utils/drivers");
 const questions_1 = require("./questions");
 const generate_hash_1 = require("../../../utils/generate-hash");
+const defaults_1 = require("../../utils/defaults");
 async function init() {
     const rootPath = process.cwd();
     const { client } = await inquirer_1.default.prompt([
@@ -79,19 +80,14 @@ async function init() {
     const roleID = (0, uuid_1.v4)();
     await db('directus_roles').insert({
         id: roleID,
-        name: 'Administrator',
-        icon: 'verified',
-        admin_access: true,
-        description: 'Initial administrative role with unrestricted App/API access',
+        ...defaults_1.defaultAdminRole,
     });
     await db('directus_users').insert({
         id: userID,
-        status: 'active',
         email: firstUser.email,
         password: firstUser.password,
-        first_name: 'Admin',
-        last_name: 'User',
         role: roleID,
+        ...defaults_1.defaultAdminUser,
     });
     await db.destroy();
     process.stdout.write(`\nYour project has been created at ${chalk_1.default.green(rootPath)}.\n`);

package/dist/cli/utils/defaults.d.ts

@@ -0,0 +1,11 @@
+export declare const defaultAdminRole: {
+    name: string;
+    icon: string;
+    admin_access: boolean;
+    description: string;
+};
+export declare const defaultAdminUser: {
+    status: string;
+    first_name: string;
+    last_name: string;
+};

package/dist/cli/utils/defaults.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defaultAdminUser = exports.defaultAdminRole = void 0;
+exports.defaultAdminRole = {
+    name: 'Administrator',
+    icon: 'verified',
+    admin_access: true,
+    description: '$t:admin_description',
+};
+exports.defaultAdminUser = {
+    status: 'active',
+    first_name: 'Admin',
+    last_name: 'User',
+};

package/dist/emitter.d.ts

@@ -1,10 +1,9 @@
 import { ActionHandler, FilterHandler, HookContext, InitHandler } from './types';
-declare class Emitter {
+export declare class Emitter {
     private filterEmitter;
     private actionEmitter;
     private initEmitter;
     constructor();
-    eventsToEmit(event: string, meta: Record<string, any>): string[];
     emitFilter<T>(event: string, payload: T, meta: Record<string, any>, context: HookContext): Promise<T>;
     emitAction(event: string, meta: Record<string, any>, context: HookContext): void;
     emitInit(event: string, meta: Record<string, any>): Promise<void>;
@@ -14,6 +13,8 @@ declare class Emitter {
     offFilter(event: string, handler: FilterHandler): void;
     offAction(event: string, handler: ActionHandler): void;
     offInit(event: string, handler: InitHandler): void;
+    offAll(): void;
+    private eventsToEmit;
 }
 declare const emitter: Emitter;
 export default emitter;

package/dist/emitter.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Emitter = void 0;
 const eventemitter2_1 = require("eventemitter2");
 const logger_1 = __importDefault(require("./logger"));
 class Emitter {
@@ -18,12 +19,6 @@ class Emitter {
         this.actionEmitter = new eventemitter2_1.EventEmitter2(emitterOptions);
         this.initEmitter = new eventemitter2_1.EventEmitter2(emitterOptions);
     }
-    eventsToEmit(event, meta) {
-        if (event.startsWith('items')) {
-            return [event, `${meta.collection}.${event}`];
-        }
-        return [event];
-    }
     async emitFilter(event, payload, meta, context) {
         const events = this.eventsToEmit(event, meta);
         const listeners = events.flatMap((event) => this.filterEmitter.listeners(event));
@@ -72,6 +67,18 @@ class Emitter {
     offInit(event, handler) {
         this.initEmitter.off(event, handler);
     }
+    offAll() {
+        this.filterEmitter.removeAllListeners();
+        this.actionEmitter.removeAllListeners();
+        this.initEmitter.removeAllListeners();
+    }
+    eventsToEmit(event, meta) {
+        if (event.startsWith('items')) {
+            return [event, `${meta.collection}.${event}`];
+        }
+        return [event];
+    }
 }
+exports.Emitter = Emitter;
 const emitter = new Emitter();
 exports.default = emitter;

package/dist/extensions.d.ts

@@ -7,6 +7,7 @@ declare class ExtensionManager {
     private appExtensions;
     private apiHooks;
     private apiEndpoints;
+    private apiEmitter;
     private endpointRouter;
     private isScheduleHookEnabled;
     constructor();

package/dist/extensions.js

@@ -28,7 +28,7 @@ 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 = __importDefault(require("./emitter"));
+const emitter_1 = __importStar(require("./emitter"));
 const env_1 = __importDefault(require("./env"));
 const exceptions = __importStar(require("./exceptions"));
 const sharedExceptions = __importStar(require("@directus/shared/exceptions"));
@@ -61,6 +61,7 @@ class ExtensionManager {
         this.apiHooks = [];
         this.apiEndpoints = [];
         this.isScheduleHookEnabled = true;
+        this.apiEmitter = new emitter_1.Emitter();
         this.endpointRouter = (0, express_1.Router)();
     }
     async initialize({ schedule } = { schedule: true }) {
@@ -92,6 +93,7 @@ class ExtensionManager {
         logger_1.default.info('Reloading extensions');
         this.unregisterHooks();
         this.unregisterEndpoints();
+        this.apiEmitter.offAll();
         if (env_1.default.SERVE_APP) {
             this.appExtensions = {};
         }
@@ -237,6 +239,7 @@ class ExtensionManager {
             exceptions: { ...exceptions, ...sharedExceptions },
             env: env_1.default,
             database: (0, database_1.default)(),
+            emitter: this.apiEmitter,
             logger: logger_1.default,
             getSchema: get_schema_1.getSchema,
         });
@@ -254,6 +257,7 @@ class ExtensionManager {
             exceptions: { ...exceptions, ...sharedExceptions },
             env: env_1.default,
             database: (0, database_1.default)(),
+            emitter: this.apiEmitter,
             logger: logger_1.default,
             getSchema: get_schema_1.getSchema,
         });

package/dist/services/files.js

@@ -64,14 +64,20 @@ class FilesService extends items_1.ItemsService {
         payload.filesize = size;
         if (['image/jpeg', 'image/png', 'image/webp', 'image/gif', 'image/tiff'].includes(payload.type)) {
             const buffer = await storage_1.default.disk(data.storage).getBuffer(payload.filename_disk);
-            const meta = await (0, sharp_1.default)(buffer.content, {}).metadata();
-            if (meta.orientation && meta.orientation >= 5) {
-                payload.height = meta.width;
-                payload.width = meta.height;
+            try {
+                const meta = await (0, sharp_1.default)(buffer.content, {}).metadata();
+                if (meta.orientation && meta.orientation >= 5) {
+                    payload.height = meta.width;
+                    payload.width = meta.height;
+                }
+                else {
+                    payload.width = meta.width;
+                    payload.height = meta.height;
+                }
             }
-            else {
-                payload.width = meta.width;
-                payload.height = meta.height;
+            catch (err) {
+                logger_1.default.warn(`Couldn't extract sharp metadata from file`);
+                logger_1.default.warn(err);
             }
             payload.metadata = {};
             try {
@@ -95,7 +101,7 @@ class FilesService extends items_1.ItemsService {
                 }
             }
             catch (err) {
-                logger_1.default.warn(`Couldn't extract metadata from file`);
+                logger_1.default.warn(`Couldn't extract EXIF metadata from file`);
                 logger_1.default.warn(err);
             }
         }

package/dist/types/extensions.d.ts

@@ -5,6 +5,7 @@ import { Logger } from 'pino';
 import env from '../env';
 import * as exceptions from '../exceptions';
 import * as services from '../services';
+import { Emitter } from '../emitter';
 import { getSchema } from '../utils/get-schema';
 import { SchemaOverview } from './schema';
 export declare type ExtensionContext = {
@@ -12,6 +13,7 @@ export declare type ExtensionContext = {
     exceptions: typeof exceptions;
     database: Knex;
     env: typeof env;
+    emitter: Emitter;
     logger: Logger;
     getSchema: typeof getSchema;
 };

package/dist/utils/apply-snapshot.js

@@ -10,6 +10,7 @@ const database_1 = __importDefault(require("../database"));
 const get_schema_1 = require("./get-schema");
 const services_1 = require("../services");
 const lodash_1 = require("lodash");
+const logger_1 = __importDefault(require("../logger"));
 async function applySnapshot(snapshot, options) {
     var _a, _b, _c, _d;
     const database = (_a = options === null || options === void 0 ? void 0 : options.database) !== null && _a !== void 0 ? _a : (0, database_1.default)();
@@ -20,7 +21,13 @@ async function applySnapshot(snapshot, options) {
         const collectionsService = new services_1.CollectionsService({ knex: trx, schema });
         for (const { collection, diff } of snapshotDiff.collections) {
             if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'D') {
-                await collectionsService.deleteOne(collection);
+                try {
+                    await collectionsService.deleteOne(collection);
+                }
+                catch (err) {
+                    logger_1.default.error(`Failed to delete collection "${collection}"`);
+                    throw err;
+                }
             }
             if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'N' && diff[0].rhs) {
                 // We'll nest the to-be-created fields in the same collection creation, to prevent
@@ -28,10 +35,16 @@ async function applySnapshot(snapshot, options) {
                 const fields = snapshotDiff.fields
                     .filter((fieldDiff) => fieldDiff.collection === collection)
                     .map((fieldDiff) => fieldDiff.diff[0].rhs);
-                await collectionsService.createOne({
-                    ...diff[0].rhs,
-                    fields,
-                });
+                try {
+                    await collectionsService.createOne({
+                        ...diff[0].rhs,
+                        fields,
+                    });
+                }
+                catch (err) {
+                    logger_1.default.error(`Failed to create collection "${collection}"`);
+                    throw err;
+                }
                 // Now that the fields are in for this collection, we can strip them from the field
                 // edits
                 snapshotDiff.fields = snapshotDiff.fields.filter((fieldDiff) => fieldDiff.collection !== collection);
@@ -41,27 +54,51 @@ async function applySnapshot(snapshot, options) {
                     return field.collection === collection;
                 });
                 if (newValues) {
-                    await collectionsService.updateOne(collection, newValues);
+                    try {
+                        await collectionsService.updateOne(collection, newValues);
+                    }
+                    catch (err) {
+                        logger_1.default.error(`Failed to update collection "${collection}"`);
+                        throw err;
+                    }
                 }
             }
         }
         const fieldsService = new services_1.FieldsService({ knex: trx, schema: await (0, get_schema_1.getSchema)({ database: trx }) });
         for (const { collection, field, diff } of snapshotDiff.fields) {
             if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'N') {
-                await fieldsService.createField(collection, diff[0].rhs);
+                try {
+                    await fieldsService.createField(collection, diff[0].rhs);
+                }
+                catch (err) {
+                    logger_1.default.error(`Failed to create field "${collection}.${field}"`);
+                    throw err;
+                }
             }
             if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'E' || (diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'A') {
                 const newValues = snapshot.fields.find((snapshotField) => {
                     return snapshotField.collection === collection && snapshotField.field === field;
                 });
                 if (newValues) {
-                    await fieldsService.updateField(collection, {
-                        ...newValues,
-                    });
+                    try {
+                        await fieldsService.updateField(collection, {
+                            ...newValues,
+                        });
+                    }
+                    catch (err) {
+                        logger_1.default.error(`Failed to update field "${collection}.${field}"`);
+                        throw err;
+                    }
                 }
             }
             if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'D') {
-                await fieldsService.deleteField(collection, field);
+                try {
+                    await fieldsService.deleteField(collection, field);
+                }
+                catch (err) {
+                    logger_1.default.error(`Failed to delete field "${collection}.${field}"`);
+                    throw err;
+                }
                 // Field deletion also cleans up the relationship. We should ignore any relationship
                 // changes attached to this now non-existing field
                 snapshotDiff.relations = snapshotDiff.relations.filter((relation) => (relation.collection === collection && relation.field === field) === false);
@@ -74,18 +111,36 @@ async function applySnapshot(snapshot, options) {
                 (0, lodash_1.set)(structure, diffEdit.path, undefined);
             }
             if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'N') {
-                await relationsService.createOne(diff[0].rhs);
+                try {
+                    await relationsService.createOne(diff[0].rhs);
+                }
+                catch (err) {
+                    logger_1.default.error(`Failed to create relation "${collection}.${field}"`);
+                    throw err;
+                }
             }
             if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'E' || (diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'A') {
                 const newValues = snapshot.relations.find((relation) => {
                     return relation.collection === collection && relation.field === field;
                 });
                 if (newValues) {
-                    await relationsService.updateOne(collection, field, newValues);
+                    try {
+                        await relationsService.updateOne(collection, field, newValues);
+                    }
+                    catch (err) {
+                        logger_1.default.error(`Failed to update relation "${collection}.${field}"`);
+                        throw err;
+                    }
                 }
             }
             if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'D') {
-                await relationsService.deleteOne(collection, field);
+                try {
+                    await relationsService.deleteOne(collection, field);
+                }
+                catch (err) {
+                    logger_1.default.error(`Failed to delete relation "${collection}.${field}"`);
+                    throw err;
+                }
             }
         }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "directus",
-	"version": "9.2.2",
+	"version": "9.3.0",
 	"license": "GPL-3.0-only",
 	"homepage": "https://github.com/directus/directus#readme",
 	"description": "Directus is a real-time API and App dashboard for managing SQL database content.",
@@ -76,16 +76,16 @@
 	],
 	"dependencies": {
 		"@aws-sdk/client-ses": "^3.40.0",
-		"@directus/app": "9.2.2",
-		"@directus/drive": "9.2.2",
-		"@directus/drive-azure": "9.2.2",
-		"@directus/drive-gcs": "9.2.2",
-		"@directus/drive-s3": "9.2.2",
-		"@directus/extensions-sdk": "9.2.2",
-		"@directus/format-title": "9.2.2",
-		"@directus/schema": "9.2.2",
-		"@directus/shared": "9.2.2",
-		"@directus/specs": "9.2.2",
+		"@directus/app": "9.3.0",
+		"@directus/drive": "9.3.0",
+		"@directus/drive-azure": "9.3.0",
+		"@directus/drive-gcs": "9.3.0",
+		"@directus/drive-s3": "9.3.0",
+		"@directus/extensions-sdk": "9.3.0",
+		"@directus/format-title": "9.3.0",
+		"@directus/schema": "9.3.0",
+		"@directus/shared": "9.3.0",
+		"@directus/specs": "9.3.0",
 		"@godaddy/terminus": "^4.9.0",
 		"@rollup/plugin-alias": "^3.1.2",
 		"@rollup/plugin-virtual": "^2.0.3",
@@ -169,7 +169,7 @@
 		"sqlite3": "^5.0.2",
 		"tedious": "^13.0.0"
 	},
-	"gitHead": "546d525175c7ecc6ac9c235b4ebf77a1ae209e10",
+	"gitHead": "4b444baf5b73467a74f6d57c33277146bc86285c",
 	"devDependencies": {
 		"@types/async": "3.2.10",
 		"@types/atob": "2.1.2",
@@ -209,7 +209,7 @@
 		"copyfiles": "2.4.1",
 		"cross-env": "7.0.3",
 		"jest": "27.3.1",
-		"knex-mock-client": "^1.6.1",
+		"knex-mock-client": "1.6.1",
 		"ts-jest": "27.0.7",
 		"ts-node-dev": "1.1.8",
 		"typescript": "4.5.2"