directus 9.22.4 → 9.23.3

package/dist/utils/validate-snapshot.js

@@ -0,0 +1,71 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateSnapshot = void 0;
+const package_json_1 = require("../../package.json");
+const exceptions_1 = require("../exceptions");
+const database_1 = require("../database");
+const joi_1 = __importDefault(require("joi"));
+const constants_1 = require("@directus/shared/constants");
+const constants_2 = require("../constants");
+const types_1 = require("../types");
+const snapshotJoiSchema = joi_1.default.object({
+    version: joi_1.default.number().valid(1).required(),
+    directus: joi_1.default.string().required(),
+    vendor: joi_1.default.string()
+        .valid(...types_1.DatabaseClients)
+        .optional(),
+    collections: joi_1.default.array().items(joi_1.default.object({
+        collection: joi_1.default.string(),
+        meta: joi_1.default.any(),
+        schema: joi_1.default.object({
+            name: joi_1.default.string(),
+        }),
+    })),
+    fields: joi_1.default.array().items(joi_1.default.object({
+        collection: joi_1.default.string(),
+        field: joi_1.default.string(),
+        meta: joi_1.default.any(),
+        schema: joi_1.default.object({
+            default_value: joi_1.default.any(),
+            max_length: [joi_1.default.number(), joi_1.default.string(), joi_1.default.valid(null)],
+            is_nullable: joi_1.default.bool(),
+        })
+            .unknown()
+            .allow(null),
+        type: joi_1.default.string()
+            .valid(...constants_1.TYPES, ...constants_2.ALIAS_TYPES)
+            .allow(null),
+    })),
+    relations: joi_1.default.array().items(joi_1.default.object({
+        collection: joi_1.default.string(),
+        field: joi_1.default.string(),
+        meta: joi_1.default.any(),
+        related_collection: joi_1.default.any(),
+        schema: joi_1.default.any(),
+    })),
+});
+/**
+ * Validates the snapshot against the current instance.
+ **/
+function validateSnapshot(snapshot, force = false) {
+    const { error } = snapshotJoiSchema.validate(snapshot);
+    if (error)
+        throw new exceptions_1.InvalidPayloadException(error.message);
+    // Bypass checks when "force" option is enabled
+    if (force)
+        return;
+    if (snapshot.directus !== package_json_1.version) {
+        throw new exceptions_1.InvalidPayloadException(`Provided snapshot's directus version ${snapshot.directus} does not match the current instance's version ${package_json_1.version}. You can bypass this check by passing the "force" query parameter.`);
+    }
+    if (!snapshot.vendor) {
+        throw new exceptions_1.InvalidPayloadException('Provided snapshot does not contain the "vendor" property. You can bypass this check by passing the "force" query parameter.');
+    }
+    const currentVendor = (0, database_1.getDatabaseClient)();
+    if (snapshot.vendor !== currentVendor) {
+        throw new exceptions_1.InvalidPayloadException(`Provided snapshot's vendor ${snapshot.vendor} does not match the current instance's vendor ${currentVendor}. You can bypass this check by passing the "force" query parameter.`);
+    }
+}
+exports.validateSnapshot = validateSnapshot;

package/dist/utils/validate-snapshot.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/webhooks.js

@@ -7,9 +7,10 @@ exports.unregister = exports.register = exports.reload = exports.init = void 0;
 const database_1 = __importDefault(require("./database"));
 const emitter_1 = __importDefault(require("./emitter"));
 const logger_1 = __importDefault(require("./logger"));
+const messenger_1 = require("./messenger");
+const index_1 = require("./request/index");
 const services_1 = require("./services");
 const get_schema_1 = require("./utils/get-schema");
-const messenger_1 = require("./messenger");
 const job_queue_1 = require("./utils/job-queue");
 let registered = [];
 const reloadQueue = new job_queue_1.JobQueue();
@@ -52,9 +53,9 @@ 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 axios = await (0, index_1.getAxios)();
         const webhookPayload = {
             event,
             accountability: context.accountability
@@ -81,7 +82,7 @@ function createHandler(webhook, event) {
 }
 function mergeHeaders(headerArray) {
     const headers = {};
-    for (const { header, value } of headerArray !== null && headerArray !== void 0 ? headerArray : []) {
+    for (const { header, value } of headerArray ?? []) {
         headers[header] = value;
     }
     return headers;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "directus",
-  "version": "9.22.4",
+  "version": "9.23.3",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -65,21 +65,20 @@
   ],
   "dependencies": {
     "@authenio/samlify-node-xmllint": "2.0.0",
-    "@aws-sdk/client-ses": "3.236.0",
+    "@aws-sdk/client-ses": "3.292.0",
     "@directus/format-title": "9.15.0",
     "@godaddy/terminus": "4.11.2",
-    "@rollup/plugin-alias": "4.0.2",
+    "@rollup/plugin-alias": "4.0.3",
     "@rollup/plugin-virtual": "3.0.1",
-    "argon2": "0.30.2",
+    "argon2": "0.30.3",
     "async": "3.2.4",
-    "async-mutex": "0.4.0",
-    "axios": "1.2.1",
+    "axios": "1.3.4",
     "busboy": "1.6.0",
     "bytes": "3.1.2",
     "camelcase": "6.3.0",
-    "chalk": "4.1.1",
+    "chalk": "4.1.2",
     "chokidar": "3.5.3",
-    "commander": "9.4.1",
+    "commander": "9.5.0",
     "cookie-parser": "1.4.6",
     "cors": "2.8.5",
     "csv-parser": "3.0.0",
@@ -90,51 +89,51 @@
     "encodeurl": "1.0.2",
     "eventemitter2": "6.4.9",
     "execa": "5.1.1",
-    "exif-reader": "1.1.0",
+    "exif-reader": "1.2.0",
     "express": "4.18.2",
     "fast-redact": "3.1.2",
     "flat": "5.0.2",
     "fs-extra": "11.1.0",
-    "globby": "11.0.4",
+    "globby": "11.1.0",
     "graphql": "16.6.0",
     "graphql-compose": "9.0.10",
     "helmet": "6.0.1",
     "icc": "2.0.0",
-    "inquirer": "8.2.4",
-    "ioredis": "5.2.4",
-    "joi": "17.7.0",
+    "inquirer": "8.2.5",
+    "ioredis": "5.3.1",
+    "joi": "17.8.4",
     "js-yaml": "4.1.0",
     "js2xmlparser": "5.0.0",
     "json2csv": "5.0.7",
     "jsonwebtoken": "9.0.0",
     "keyv": "4.5.2",
-    "knex": "2.3.0",
-    "knex-schema-inspector": "3.0.0",
+    "knex": "2.4.2",
+    "knex-schema-inspector": "3.0.1",
     "ldapjs": "2.3.3",
-    "liquidjs": "10.3.3",
+    "liquidjs": "10.6.1",
     "lodash": "4.17.21",
-    "marked": "4.2.4",
+    "marked": "4.2.12",
     "micromustache": "8.0.3",
     "mime-types": "2.1.35",
     "ms": "2.1.3",
     "nanoid": "3.3.4",
     "node-cron": "3.0.2",
     "node-machine-id": "1.1.12",
-    "nodemailer": "6.8.0",
+    "nodemailer": "6.9.1",
     "object-hash": "3.0.0",
-    "openapi3-ts": "3.1.2",
-    "openid-client": "5.3.1",
-    "ora": "5.4.0",
+    "openapi3-ts": "3.2.0",
+    "openid-client": "5.4.0",
+    "ora": "5.4.1",
     "otplib": "12.0.1",
-    "pino": "8.8.0",
-    "pino-http": "8.3.0",
+    "pino": "8.11.0",
+    "pino-http": "8.3.3",
     "pino-http-print": "3.1.0",
-    "pino-pretty": "9.1.1",
-    "qs": "6.11.0",
+    "pino-pretty": "10.0.0",
+    "qs": "6.11.1",
     "rate-limiter-flexible": "2.4.1",
-    "rollup": "3.7.5",
-    "samlify": "2.8.7",
-    "sanitize-html": "2.8.1",
+    "rollup": "3.19.1",
+    "samlify": "2.8.10",
+    "sanitize-html": "2.10.0",
     "sharp": "0.31.3",
     "snappy": "7.2.2",
     "stream-json": "1.7.5",
@@ -143,23 +142,24 @@
     "update-check": "1.5.4",
     "uuid": "9.0.0",
     "uuid-validate": "0.0.3",
-    "vm2": "3.9.13",
+    "vm2": "3.9.14",
     "wellknown": "0.5.0",
-    "@directus/app": "9.22.3",
-    "@directus/extensions-sdk": "9.22.4",
-    "@directus/schema": "9.22.4",
-    "@directus/shared": "9.22.3",
-    "@directus/specs": "9.22.4",
-    "@directus/storage": "9.22.4",
-    "@directus/storage-driver-azure": "9.22.4",
-    "@directus/storage-driver-cloudinary": "9.22.4",
-    "@directus/storage-driver-gcs": "9.22.4",
-    "@directus/storage-driver-local": "9.22.4",
-    "@directus/storage-driver-s3": "9.22.4"
+    "@directus/app": "9.23.3",
+    "@directus/extensions-sdk": "9.23.3",
+    "@directus/schema": "9.23.3",
+    "@directus/shared": "9.23.3",
+    "@directus/specs": "9.23.3",
+    "@directus/storage": "9.23.3",
+    "@directus/storage-driver-azure": "9.23.3",
+    "@directus/storage-driver-cloudinary": "9.23.3",
+    "@directus/storage-driver-gcs": "9.23.3",
+    "@directus/storage-driver-local": "9.23.3",
+    "@directus/storage-driver-s3": "9.23.3",
+    "@directus/utils": "9.23.3"
   },
   "devDependencies": {
-    "@ngneat/falso": "6.3.2",
-    "@types/async": "3.2.16",
+    "@ngneat/falso": "6.4.0",
+    "@types/async": "3.2.18",
     "@types/busboy": "1.5.0",
     "@types/bytes": "3.1.1",
     "@types/cookie-parser": "1.4.3",
@@ -168,51 +168,51 @@
     "@types/destroy": "1.0.0",
     "@types/encodeurl": "1.0.0",
     "@types/exif-reader": "1.0.0",
-    "@types/express": "4.17.15",
-    "@types/express-serve-static-core": "4.17.31",
+    "@types/express": "4.17.17",
+    "@types/express-serve-static-core": "4.17.33",
     "@types/fast-redact": "3.0.2",
     "@types/flat": "5.0.2",
-    "@types/fs-extra": "9.0.13",
-    "@types/inquirer": "8.2.1",
+    "@types/fs-extra": "11.0.1",
+    "@types/inquirer": "8.2.6",
     "@types/js-yaml": "4.0.5",
     "@types/json2csv": "5.0.3",
-    "@types/jsonwebtoken": "8.5.9",
+    "@types/jsonwebtoken": "9.0.1",
     "@types/keyv": "3.1.4",
     "@types/ldapjs": "2.2.5",
     "@types/lodash": "4.14.191",
     "@types/marked": "4.0.8",
     "@types/mime-types": "2.1.1",
     "@types/ms": "0.7.31",
-    "@types/node": "18.11.17",
-    "@types/node-cron": "3.0.6",
+    "@types/node": "18.15.3",
+    "@types/node-cron": "3.0.7",
     "@types/nodemailer": "6.4.7",
     "@types/object-hash": "3.0.2",
     "@types/qs": "6.9.7",
-    "@types/sanitize-html": "2.8.0",
-    "@types/sharp": "0.31.0",
-    "@types/stream-json": "1.7.2",
-    "@types/uuid": "9.0.0",
+    "@types/sanitize-html": "2.9.0",
+    "@types/sharp": "0.31.1",
+    "@types/stream-json": "1.7.3",
+    "@types/uuid": "9.0.1",
     "@types/uuid-validate": "0.0.1",
     "@types/wellknown": "0.5.4",
-    "@vitest/coverage-c8": "0.26.2",
+    "@vitest/coverage-c8": "0.29.3",
     "copyfiles": "2.4.1",
     "form-data": "4.0.0",
-    "knex-mock-client": "1.11.0",
+    "knex-mock-client": "2.0.0",
     "ts-node": "10.9.1",
     "ts-node-dev": "2.0.0",
-    "typescript": "4.9.4",
-    "vitest": "0.26.2"
+    "typescript": "4.9.5",
+    "vitest": "0.29.3"
   },
   "optionalDependencies": {
-    "@keyv/redis": "2.5.4",
+    "@keyv/redis": "2.5.6",
     "keyv-memcache": "1.3.3",
     "memcached": "2.2.2",
     "mysql": "2.18.1",
     "nodemailer-mailgun-transport": "2.1.5",
     "nodemailer-sendgrid": "1.0.3",
-    "pg": "8.8.0",
-    "sqlite3": "5.1.4",
-    "tedious": "15.1.2"
+    "pg": "8.10.0",
+    "sqlite3": "5.1.6",
+    "tedious": "15.1.3"
   },
   "engines": {
     "node": ">=12.20.0"
@@ -221,7 +221,7 @@
     "build": "tsc --build && copyfiles \"src/**/*.{yaml,liquid}\" -u 1 dist",
     "cli": "NODE_ENV=development SERVE_APP=false ts-node --script-mode --transpile-only src/cli/run.ts",
     "dev": "NODE_ENV=development SERVE_APP=false ts-node-dev --files --transpile-only --respawn --watch \".env\" --inspect=0 --exit-child -- src/start.ts",
-    "start": "npx directus start",
+    "start": "node cli.js start",
     "test": "vitest run",
     "test:coverage": "vitest run --coverage",
     "test:watch": "vitest"