directus 9.16.1 → 9.17.2

package/dist/services/server.js

@@ -143,7 +143,7 @@ class ServerService {
                     componentType: 'datastore',
                     observedUnit: 'ms',
                     observedValue: 0,
-                    threshold: 150,
+                    threshold: env_1.default.DB_HEALTHCHECK_THRESHOLD ? +env_1.default.DB_HEALTHCHECK_THRESHOLD : 150,
                 },
             ];
             const startTime = perf_hooks_1.performance.now();
@@ -188,7 +188,7 @@ class ServerService {
                         componentType: 'cache',
                         observedValue: 0,
                         observedUnit: 'ms',
-                        threshold: 150,
+                        threshold: env_1.default.CACHE_HEALTHCHECK_THRESHOLD ? +env_1.default.CACHE_HEALTHCHECK_THRESHOLD : 150,
                     },
                 ],
             };
@@ -222,7 +222,7 @@ class ServerService {
                         componentType: 'ratelimiter',
                         observedValue: 0,
                         observedUnit: 'ms',
-                        threshold: 150,
+                        threshold: env_1.default.RATE_LIMITER_HEALTHCHECK_THRESHOLD ? +env_1.default.RATE_LIMITER_HEALTHCHECK_THRESHOLD : 150,
                     },
                 ],
             };
@@ -249,13 +249,14 @@ class ServerService {
             const checks = {};
             for (const location of (0, utils_1.toArray)(env_1.default.STORAGE_LOCATIONS)) {
                 const disk = storage_1.default.disk(location);
+                const envThresholdKey = `STORAGE_${location}_HEALTHCHECK_THRESHOLD`.toUpperCase();
                 checks[`storage:${location}:responseTime`] = [
                     {
                         status: 'ok',
                         componentType: 'objectstore',
                         observedValue: 0,
                         observedUnit: 'ms',
-                        threshold: 750,
+                        threshold: env_1.default[envThresholdKey] ? +env_1.default[envThresholdKey] : 750,
                     },
                 ];
                 const startTime = perf_hooks_1.performance.now();

package/dist/services/shares.js

@@ -31,7 +31,7 @@ class SharesService extends items_1.ItemsService {
         return super.createOne(data, opts);
     }
     async login(payload) {
-        var _a, _b;
+        var _a, _b, _c;
         const record = await this.knex
             .select({
             share_id: 'id',
@@ -86,6 +86,7 @@ class SharesService extends items_1.ItemsService {
             expires: refreshTokenExpiration,
             ip: (_a = this.accountability) === null || _a === void 0 ? void 0 : _a.ip,
             user_agent: (_b = this.accountability) === null || _b === void 0 ? void 0 : _b.userAgent,
+            origin: (_c = this.accountability) === null || _c === void 0 ? void 0 : _c.origin,
             share: record.share_id,
         });
         await this.knex('directus_sessions').delete().where('expires', '<', new Date());

package/dist/utils/async-handler.d.ts

@@ -1,7 +1,3 @@
-import { ErrorRequestHandler, RequestHandler } from 'express';
-/**
- * Handles promises in routes.
- */
-declare function asyncHandler(handler: RequestHandler): RequestHandler;
-declare function asyncHandler(handler: ErrorRequestHandler): ErrorRequestHandler;
+import type { RequestHandler, Request, Response, NextFunction } from 'express';
+declare const asyncHandler: (fn: RequestHandler) => (req: Request, res: Response, next: NextFunction) => Promise<void>;
 export default asyncHandler;

package/dist/utils/async-handler.js

@@ -1,16 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-function asyncHandler(handler) {
-    if (handler.length === 2 || handler.length === 3) {
-        const scoped = (req, res, next) => Promise.resolve(handler(req, res, next)).catch(next);
-        return scoped;
-    }
-    else if (handler.length === 4) {
-        const scoped = (err, req, res, next) => Promise.resolve(handler(err, req, res, next)).catch(next);
-        return scoped;
-    }
-    else {
-        throw new Error(`Failed to asyncHandle() function "${handler.name}"`);
-    }
-}
+const asyncHandler = (fn) => (req, res, next) => Promise.resolve(fn(req, res, next)).catch(next);
 exports.default = asyncHandler;

package/dist/utils/async-handler.test.d.ts

@@ -0,0 +1 @@
+import '../../src/types/express.d.ts';

package/dist/utils/async-handler.test.js

@@ -0,0 +1,18 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+require("../../src/types/express.d.ts");
+const async_handler_1 = __importDefault(require("./async-handler"));
+let mockRequest;
+let mockResponse;
+const nextFunction = jest.fn();
+test('Wraps async middleware in Promise resolve that will catch rejects and pass them to the nextFn', async () => {
+    const err = new Error('testing');
+    const middleware = async (_req, _res, _next) => {
+        throw err;
+    };
+    await (0, async_handler_1.default)(middleware)(mockRequest, mockResponse, nextFunction);
+    expect(nextFunction).toHaveBeenCalledWith(err);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "directus",
-  "version": "9.16.1",
+  "version": "9.17.2",
   "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.",
@@ -66,16 +66,16 @@
   ],
   "dependencies": {
     "@aws-sdk/client-ses": "^3.107.0",
-    "@directus/app": "9.16.1",
-    "@directus/drive": "9.16.1",
-    "@directus/drive-azure": "9.16.1",
-    "@directus/drive-gcs": "9.16.1",
-    "@directus/drive-s3": "9.16.1",
+    "@directus/app": "9.17.2",
+    "@directus/drive": "9.17.2",
+    "@directus/drive-azure": "9.17.2",
+    "@directus/drive-gcs": "9.17.2",
+    "@directus/drive-s3": "9.17.2",
     "@directus/extensions-sdk": "^9.14.1",
     "@directus/format-title": "^9.15.0",
-    "@directus/schema": "9.16.1",
-    "@directus/shared": "9.16.1",
-    "@directus/specs": "9.16.1",
+    "@directus/schema": "9.17.2",
+    "@directus/shared": "9.17.2",
+    "@directus/specs": "9.17.2",
     "@godaddy/terminus": "^4.10.2",
     "@rollup/plugin-alias": "^3.1.9",
     "@rollup/plugin-virtual": "^2.1.0",
@@ -97,6 +97,7 @@
     "deep-map": "^2.0.0",
     "destroy": "^1.2.0",
     "dotenv": "^10.0.0",
+    "encodeurl": "^1.0.2",
     "eventemitter2": "^6.4.5",
     "execa": "^5.1.1",
     "exifr": "^7.1.3",
@@ -126,7 +127,7 @@
     "mime-types": "^2.1.35",
     "ms": "^2.1.3",
     "nanoid": "^3.1.23",
-    "node-cron": "^3.0.1",
+    "node-cron": "^3.0.2",
     "node-machine-id": "^1.1.12",
     "nodemailer": "^6.7.5",
     "object-hash": "^2.2.0",
@@ -146,7 +147,6 @@
     "snappy": "^7.1.1",
     "stream-json": "^1.7.4",
     "strip-bom-stream": "^4.0.0",
-    "supertest": "^6.2.3",
     "tmp-promise": "^3.0.3",
     "update-check": "^1.5.4",
     "uuid": "^8.3.2",
@@ -160,6 +160,7 @@
     "memcached": "^2.2.2",
     "mysql": "^2.18.1",
     "nodemailer-mailgun-transport": "^2.1.4",
+    "nodemailer-sendgrid": "^1.0.3",
     "pg": "^8.7.3",
     "sqlite3": "^5.0.8",
     "tedious": "^13.0.0"
@@ -175,6 +176,7 @@
     "@types/cors": "2.8.12",
     "@types/deep-diff": "1.0.1",
     "@types/destroy": "1.0.0",
+    "@types/encodeurl": "^1.0.0",
     "@types/express": "4.17.13",
     "@types/express-pino-logger": "4.0.3",
     "@types/express-serve-static-core": "^4.17.29",
@@ -214,6 +216,7 @@
     "jest": "28.1.2",
     "knex-mock-client": "1.8.4",
     "rimraf": "3.0.2",
+    "supertest": "^6.2.3",
     "ts-jest": "28.0.5",
     "ts-node": "^10.8.2",
     "ts-node-dev": "1.1.8",