directus 9.21.2 → 9.22.1

package/dist/utils/parse-image-metadata.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseXmp = exports.parseIptc = void 0;
+const IPTC_ENTRY_TYPES = new Map([
+    [0x78, 'caption'],
+    [0x6e, 'credit'],
+    [0x19, 'keywords'],
+    [0x37, 'dateCreated'],
+    [0x50, 'byline'],
+    [0x55, 'bylineTitle'],
+    [0x7a, 'captionWriter'],
+    [0x69, 'headline'],
+    [0x74, 'copyright'],
+    [0x0f, 'category'],
+]);
+const IPTC_ENTRY_MARKER = Buffer.from([0x1c, 0x02]);
+function parseIptc(buffer) {
+    if (!Buffer.isBuffer(buffer))
+        return {};
+    const iptc = {};
+    let lastIptcEntryPos = buffer.indexOf(IPTC_ENTRY_MARKER);
+    while (lastIptcEntryPos !== -1) {
+        lastIptcEntryPos = buffer.indexOf(IPTC_ENTRY_MARKER, lastIptcEntryPos + IPTC_ENTRY_MARKER.byteLength);
+        const iptcBlockTypePos = lastIptcEntryPos + IPTC_ENTRY_MARKER.byteLength;
+        const iptcBlockSizePos = iptcBlockTypePos + 1;
+        const iptcBlockDataPos = iptcBlockSizePos + 2;
+        const iptcBlockType = buffer.readUInt8(iptcBlockTypePos);
+        const iptcBlockSize = buffer.readUInt16BE(iptcBlockSizePos);
+        if (!IPTC_ENTRY_TYPES.has(iptcBlockType)) {
+            continue;
+        }
+        const iptcBlockTypeId = IPTC_ENTRY_TYPES.get(iptcBlockType);
+        const iptcData = buffer.subarray(iptcBlockDataPos, iptcBlockDataPos + iptcBlockSize).toString();
+        if (iptcBlockTypeId) {
+            if (iptc[iptcBlockTypeId] == null) {
+                iptc[iptcBlockTypeId] = iptcData;
+            }
+            else if (Array.isArray(iptc[iptcBlockTypeId])) {
+                iptc[iptcBlockTypeId].push(iptcData);
+            }
+            else {
+                iptc[iptcBlockTypeId] = [iptc[iptcBlockTypeId], iptcData];
+            }
+        }
+    }
+    return iptc;
+}
+exports.parseIptc = parseIptc;
+function parseXmp(buffer) {
+    const xmp = {};
+    ['title', 'description', 'rights', 'creator', 'subject'].forEach((x) => {
+        const tagRegex = new RegExp(`<dc:${x}>(.*?)</dc:${x}>`, 'smig'), tagMatches = tagRegex.exec(buffer.toString());
+        if (!tagMatches || tagMatches.length === 0) {
+            return;
+        }
+        const value = tagMatches[1].trim();
+        if (value.toLowerCase().indexOf('<rdf:bag>') === 0) {
+            const r = new RegExp('<rdf:li>(.*?)</rdf:li>', 'smig');
+            let match = r.exec(value);
+            const result = [];
+            while (match) {
+                result.push(match[1]);
+                match = r.exec(value);
+            }
+            xmp[x] = result;
+        }
+        else {
+            xmp[x] = value.replace(/<[^>]*>?/gm, '').trim();
+        }
+    });
+    return xmp;
+}
+exports.parseXmp = parseXmp;

package/dist/utils/track.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.track = void 0;
-const axios_1 = __importDefault(require("axios"));
 const ms_1 = __importDefault(require("ms"));
 const node_machine_id_1 = require("node-machine-id");
 const os_1 = __importDefault(require("os"));
@@ -14,10 +13,11 @@ const env_1 = __importDefault(require("../env"));
 const logger_1 = __importDefault(require("../logger"));
 const utils_1 = require("@directus/shared/utils");
 async function track(event) {
+    const axios = (await import('axios')).default;
     if (env_1.default.TELEMETRY !== false) {
         const info = await getEnvInfo(event);
         try {
-            await axios_1.default.post('https://telemetry.directus.io/', info);
+            await axios.post('https://telemetry.directus.io/', info);
         }
         catch (err) {
             if (env_1.default.NODE_ENV === 'development') {

package/dist/utils/validate-env.js

@@ -4,11 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateEnv = void 0;
-const env_1 = __importDefault(require("../env"));
+const env_1 = require("../env");
 const logger_1 = __importDefault(require("../logger"));
 function validateEnv(requiredKeys) {
+    const env = (0, env_1.getEnv)();
     for (const requiredKey of requiredKeys) {
-        if (requiredKey in env_1.default === false) {
+        if (requiredKey in env === false) {
             logger_1.default.error(`"${requiredKey}" Environment Variable is missing.`);
             process.exit(1);
         }

package/dist/webhooks.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unregister = exports.register = exports.reload = exports.init = void 0;
-const axios_1 = __importDefault(require("axios"));
 const database_1 = __importDefault(require("./database"));
 const emitter_1 = __importDefault(require("./emitter"));
 const logger_1 = __importDefault(require("./logger"));
@@ -53,6 +52,7 @@ function unregister() {
 exports.unregister = unregister;
 function createHandler(webhook, event) {
     return async (meta, context) => {
+        const axios = (await import('axios')).default;
         if (webhook.collections.includes(meta.collection) === false)
             return;
         const webhookPayload = {
@@ -66,7 +66,7 @@ function createHandler(webhook, event) {
             ...meta,
         };
         try {
-            await (0, axios_1.default)({
+            await axios({
                 url: webhook.url,
                 method: webhook.method,
                 data: webhook.data ? webhookPayload : null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "directus",
-  "version": "9.21.2",
+  "version": "9.22.1",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -90,7 +90,7 @@
     "encodeurl": "1.0.2",
     "eventemitter2": "6.4.9",
     "execa": "5.1.1",
-    "exifr": "7.1.3",
+    "exif-reader": "1.0.3",
     "express": "4.18.2",
     "fast-redact": "3.1.2",
     "flat": "5.0.2",
@@ -99,6 +99,7 @@
     "graphql": "16.6.0",
     "graphql-compose": "9.0.10",
     "helmet": "6.0.0",
+    "icc": "2.0.0",
     "inquirer": "8.2.4",
     "ioredis": "5.2.4",
     "joi": "17.7.0",
@@ -128,6 +129,7 @@
     "pino": "8.7.0",
     "pino-http": "8.2.1",
     "pino-http-print": "3.1.0",
+    "pino-pretty": "9.1.1",
     "qs": "6.11.0",
     "rate-limiter-flexible": "2.4.1",
     "rollup": "3.3.0",
@@ -143,17 +145,20 @@
     "uuid-validate": "0.0.3",
     "vm2": "3.9.11",
     "wellknown": "0.5.0",
-    "@directus/app": "9.21.2",
-    "@directus/drive": "9.21.2",
-    "@directus/drive-azure": "9.21.2",
-    "@directus/drive-gcs": "9.21.2",
-    "@directus/drive-s3": "9.21.2",
-    "@directus/extensions-sdk": "9.21.2",
-    "@directus/schema": "9.21.2",
-    "@directus/shared": "9.21.2",
-    "@directus/specs": "9.21.2"
+    "@directus/app": "9.22.1",
+    "@directus/extensions-sdk": "9.22.1",
+    "@directus/schema": "9.22.1",
+    "@directus/shared": "9.22.1",
+    "@directus/specs": "9.22.1",
+    "@directus/storage": "9.22.1",
+    "@directus/storage-driver-azure": "9.22.1",
+    "@directus/storage-driver-cloudinary": "9.22.1",
+    "@directus/storage-driver-gcs": "9.22.1",
+    "@directus/storage-driver-local": "9.22.1",
+    "@directus/storage-driver-s3": "9.22.1"
   },
   "devDependencies": {
+    "@ngneat/falso": "6.3.0",
     "@types/async": "3.2.15",
     "@types/busboy": "1.5.0",
     "@types/bytes": "3.1.1",
@@ -162,6 +167,7 @@
     "@types/deep-diff": "1.0.1",
     "@types/destroy": "1.0.0",
     "@types/encodeurl": "1.0.0",
+    "@types/exif-reader": "1.0.0",
     "@types/express": "4.17.14",
     "@types/express-serve-static-core": "4.17.31",
     "@types/fast-redact": "3.0.2",

package/dist/storage.d.ts

@@ -1,3 +0,0 @@
-import { StorageManager } from '@directus/drive';
-declare const storage: StorageManager;
-export default storage;

package/dist/storage.js

@@ -1,61 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const drive_1 = require("@directus/drive");
-const drive_azure_1 = require("@directus/drive-azure");
-const drive_gcs_1 = require("@directus/drive-gcs");
-const drive_s3_1 = require("@directus/drive-s3");
-const env_1 = __importDefault(require("./env"));
-const get_config_from_env_1 = require("./utils/get-config-from-env");
-const utils_1 = require("@directus/shared/utils");
-const validate_env_1 = require("./utils/validate-env");
-(0, validate_env_1.validateEnv)(['STORAGE_LOCATIONS']);
-const storage = new drive_1.StorageManager(getStorageConfig());
-registerDrivers(storage);
-exports.default = storage;
-function getStorageConfig() {
-    const config = {
-        disks: {},
-    };
-    const locations = (0, utils_1.toArray)(env_1.default.STORAGE_LOCATIONS);
-    locations.forEach((location) => {
-        location = location.trim();
-        const diskConfig = {
-            driver: env_1.default[`STORAGE_${location.toUpperCase()}_DRIVER`],
-            config: (0, get_config_from_env_1.getConfigFromEnv)(`STORAGE_${location.toUpperCase()}_`),
-        };
-        delete diskConfig.config.publicUrl;
-        delete diskConfig.config.driver;
-        config.disks[location] = diskConfig;
-    });
-    return config;
-}
-function registerDrivers(storage) {
-    const usedDrivers = [];
-    for (const [key, value] of Object.entries(env_1.default)) {
-        if ((key.startsWith('STORAGE') && key.endsWith('DRIVER')) === false)
-            continue;
-        if (value && usedDrivers.includes(value) === false)
-            usedDrivers.push(value);
-    }
-    usedDrivers.forEach((driver) => {
-        const storageDriver = getStorageDriver(driver);
-        if (storageDriver) {
-            storage.registerDriver(driver, storageDriver);
-        }
-    });
-}
-function getStorageDriver(driver) {
-    switch (driver) {
-        case 'local':
-            return drive_1.LocalFileSystemStorage;
-        case 's3':
-            return drive_s3_1.AmazonWebServicesS3Storage;
-        case 'gcs':
-            return drive_gcs_1.GoogleCloudStorage;
-        case 'azure':
-            return drive_azure_1.AzureBlobWebServicesStorage;
-    }
-}