directus 9.23.1 → 9.23.4

package/dist/services/relations.js

@@ -27,19 +27,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RelationsService = void 0;
-const relations_1 = require("../database/system-data/relations");
-const exceptions_1 = require("../exceptions");
-const utils_1 = require("@directus/shared/utils");
-const items_1 = require("./items");
-const permissions_1 = require("./permissions");
 const schema_1 = __importDefault(require("@directus/schema"));
-const database_1 = __importStar(require("../database"));
-const get_default_index_name_1 = require("../utils/get-default-index-name");
+const utils_1 = require("@directus/shared/utils");
 const cache_1 = require("../cache");
+const database_1 = __importStar(require("../database"));
 const helpers_1 = require("../database/helpers");
+const relations_1 = require("../database/system-data/relations");
 const emitter_1 = __importDefault(require("../emitter"));
+const exceptions_1 = require("../exceptions");
+const get_default_index_name_1 = require("../utils/get-default-index-name");
 const get_schema_1 = require("../utils/get-schema");
+const items_1 = require("./items");
+const permissions_1 = require("./permissions");
 class RelationsService {
+    knex;
+    permissionsService;
+    schemaInspector;
+    accountability;
+    schema;
+    relationsItemService;
+    systemCache;
+    helpers;
     constructor(options) {
         this.knex = options.knex || (0, database_1.default)();
         this.permissionsService = new permissions_1.PermissionsService(options);
@@ -83,12 +91,11 @@ class RelationsService {
         return await this.filterForbidden(results);
     }
     async readOne(collection, field) {
-        var _a;
         if (this.accountability && this.accountability.admin !== true) {
             if (this.hasReadAccess === false) {
                 throw new exceptions_1.ForbiddenException();
             }
-            const permissions = (_a = this.accountability.permissions) === null || _a === void 0 ? void 0 : _a.find((permission) => {
+            const permissions = this.accountability.permissions?.find((permission) => {
                 return permission.action === 'read' && permission.collection === collection;
             });
             if (!permissions || !permissions.fields)
@@ -167,13 +174,12 @@ class RelationsService {
             await this.knex.transaction(async (trx) => {
                 if (relation.related_collection) {
                     await trx.schema.alterTable(relation.collection, async (table) => {
-                        var _a;
                         this.alterType(table, relation);
                         const constraintName = (0, get_default_index_name_1.getDefaultIndexName)('foreign', relation.collection, relation.field);
                         const builder = table
                             .foreign(relation.field, constraintName)
                             .references(`${relation.related_collection}.${this.schema.collections[relation.related_collection].primary}`);
-                        if ((_a = relation.schema) === null || _a === void 0 ? void 0 : _a.on_delete) {
+                        if (relation.schema?.on_delete) {
                             builder.onDelete(relation.schema.on_delete);
                         }
                     });
@@ -186,7 +192,7 @@ class RelationsService {
                     // happens in `filterForbidden` down below
                 });
                 await relationsItemService.createOne(metaRow, {
-                    bypassEmitAction: (params) => (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
+                    bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
                 });
             });
         }
@@ -194,10 +200,10 @@ class RelationsService {
             if (runPostColumnChange) {
                 await this.helpers.schema.postColumnChange();
             }
-            if ((opts === null || opts === void 0 ? void 0 : opts.autoPurgeSystemCache) !== false) {
-                await (0, cache_1.clearSystemCache)();
+            if (opts?.autoPurgeSystemCache !== false) {
+                await (0, cache_1.clearSystemCache)({ autoPurgeCache: opts?.autoPurgeCache });
             }
-            if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
+            if (opts?.emitEvents !== false && nestedActionEvents.length > 0) {
                 const updatedSchema = await (0, get_schema_1.getSchema)();
                 for (const nestedActionEvent of nestedActionEvents) {
                     nestedActionEvent.context.schema = updatedSchema;
@@ -232,10 +238,9 @@ class RelationsService {
             await this.knex.transaction(async (trx) => {
                 if (existingRelation.related_collection) {
                     await trx.schema.alterTable(collection, async (table) => {
-                        var _a;
                         let constraintName = (0, get_default_index_name_1.getDefaultIndexName)('foreign', collection, field);
                         // If the FK already exists in the DB, drop it first
-                        if (existingRelation === null || existingRelation === void 0 ? void 0 : existingRelation.schema) {
+                        if (existingRelation?.schema) {
                             constraintName = existingRelation.schema.constraint_name || constraintName;
                             table.dropForeign(field, constraintName);
                             constraintName = this.helpers.schema.constraintName(constraintName);
@@ -245,7 +250,7 @@ class RelationsService {
                         const builder = table
                             .foreign(field, constraintName || undefined)
                             .references(`${existingRelation.related_collection}.${this.schema.collections[existingRelation.related_collection].primary}`);
-                        if ((_a = relation.schema) === null || _a === void 0 ? void 0 : _a.on_delete) {
+                        if (relation.schema?.on_delete) {
                             builder.onDelete(relation.schema.on_delete);
                         }
                     });
@@ -258,9 +263,9 @@ class RelationsService {
                     // happens in `filterForbidden` down below
                 });
                 if (relation.meta) {
-                    if (existingRelation === null || existingRelation === void 0 ? void 0 : existingRelation.meta) {
+                    if (existingRelation?.meta) {
                         await relationsItemService.updateOne(existingRelation.meta.id, relation.meta, {
-                            bypassEmitAction: (params) => (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
+                            bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
                         });
                     }
                     else {
@@ -270,7 +275,7 @@ class RelationsService {
                             many_field: relation.field,
                             one_collection: existingRelation.related_collection || null,
                         }, {
-                            bypassEmitAction: (params) => (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
+                            bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
                         });
                     }
                 }
@@ -280,10 +285,10 @@ class RelationsService {
             if (runPostColumnChange) {
                 await this.helpers.schema.postColumnChange();
             }
-            if ((opts === null || opts === void 0 ? void 0 : opts.autoPurgeSystemCache) !== false) {
-                await (0, cache_1.clearSystemCache)();
+            if (opts?.autoPurgeSystemCache !== false) {
+                await (0, cache_1.clearSystemCache)({ autoPurgeCache: opts?.autoPurgeCache });
             }
-            if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
+            if (opts?.emitEvents !== false && nestedActionEvents.length > 0) {
                 const updatedSchema = await (0, get_schema_1.getSchema)();
                 for (const nestedActionEvent of nestedActionEvents) {
                     nestedActionEvent.context.schema = updatedSchema;
@@ -313,10 +318,9 @@ class RelationsService {
         const nestedActionEvents = [];
         try {
             await this.knex.transaction(async (trx) => {
-                var _a;
                 const existingConstraints = await this.schemaInspector.foreignKeys();
                 const constraintNames = existingConstraints.map((key) => key.constraint_name);
-                if (((_a = existingRelation.schema) === null || _a === void 0 ? void 0 : _a.constraint_name) &&
+                if (existingRelation.schema?.constraint_name &&
                     constraintNames.includes(existingRelation.schema.constraint_name)) {
                     await trx.schema.alterTable(existingRelation.collection, (table) => {
                         table.dropForeign(existingRelation.field, existingRelation.schema.constraint_name);
@@ -337,7 +341,7 @@ class RelationsService {
                         accountability: this.accountability,
                     },
                 };
-                if (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) {
+                if (opts?.bypassEmitAction) {
                     opts.bypassEmitAction(actionEvent);
                 }
                 else {
@@ -349,10 +353,10 @@ class RelationsService {
             if (runPostColumnChange) {
                 await this.helpers.schema.postColumnChange();
             }
-            if ((opts === null || opts === void 0 ? void 0 : opts.autoPurgeSystemCache) !== false) {
-                await (0, cache_1.clearSystemCache)();
+            if (opts?.autoPurgeSystemCache !== false) {
+                await (0, cache_1.clearSystemCache)({ autoPurgeCache: opts?.autoPurgeCache });
             }
-            if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
+            if (opts?.emitEvents !== false && nestedActionEvents.length > 0) {
                 const updatedSchema = await (0, get_schema_1.getSchema)();
                 for (const nestedActionEvent of nestedActionEvents) {
                     nestedActionEvent.context.schema = updatedSchema;
@@ -365,10 +369,9 @@ class RelationsService {
      * Whether or not the current user has read access to relations
      */
     get hasReadAccess() {
-        var _a, _b;
-        return !!((_b = (_a = this.accountability) === null || _a === void 0 ? void 0 : _a.permissions) === null || _b === void 0 ? void 0 : _b.find((permission) => {
+        return !!this.accountability?.permissions?.find((permission) => {
             return permission.collection === 'directus_relations' && permission.action === 'read';
-        }));
+        });
     }
     /**
      * Combine raw schema foreign key information with Directus relations meta rows to form final
@@ -400,11 +403,10 @@ class RelationsService {
             return !results.find((relation) => relation.meta === meta);
         })
             .map((meta) => {
-            var _a;
             return {
                 collection: meta.many_collection,
                 field: meta.many_field,
-                related_collection: (_a = meta.one_collection) !== null && _a !== void 0 ? _a : null,
+                related_collection: meta.one_collection ?? null,
                 schema: null,
                 meta: meta,
             };
@@ -417,16 +419,16 @@ class RelationsService {
      * permissions to
      */
     async filterForbidden(relations) {
-        var _a, _b, _c;
-        if (this.accountability === null || ((_a = this.accountability) === null || _a === void 0 ? void 0 : _a.admin) === true)
+        if (this.accountability === null || this.accountability?.admin === true)
             return relations;
-        const allowedCollections = (_c = (_b = this.accountability.permissions) === null || _b === void 0 ? void 0 : _b.filter((permission) => {
+        const allowedCollections = this.accountability.permissions
+            ?.filter((permission) => {
             return permission.action === 'read';
-        }).map(({ collection }) => collection)) !== null && _c !== void 0 ? _c : [];
+        })
+            .map(({ collection }) => collection) ?? [];
         const allowedFields = this.permissionsService.getAllowedFields('read');
         relations = (0, utils_1.toArray)(relations);
         return relations.filter((relation) => {
-            var _a, _b, _c;
             let collectionsAllowed = true;
             let fieldsAllowed = true;
             if (allowedCollections.includes(relation.collection) === false) {
@@ -435,8 +437,8 @@ class RelationsService {
             if (relation.related_collection && allowedCollections.includes(relation.related_collection) === false) {
                 collectionsAllowed = false;
             }
-            if (((_a = relation.meta) === null || _a === void 0 ? void 0 : _a.one_allowed_collections) &&
-                ((_b = relation.meta) === null || _b === void 0 ? void 0 : _b.one_allowed_collections.every((collection) => allowedCollections.includes(collection))) === false) {
+            if (relation.meta?.one_allowed_collections &&
+                relation.meta?.one_allowed_collections.every((collection) => allowedCollections.includes(collection)) === false) {
                 collectionsAllowed = false;
             }
             if (!allowedFields[relation.collection] ||
@@ -445,7 +447,7 @@ class RelationsService {
                 fieldsAllowed = false;
             }
             if (relation.related_collection &&
-                ((_c = relation.meta) === null || _c === void 0 ? void 0 : _c.one_field) &&
+                relation.meta?.one_field &&
                 (!allowedFields[relation.related_collection] ||
                     (allowedFields[relation.related_collection].includes('*') === false &&
                         allowedFields[relation.related_collection].includes(relation.meta.one_field) === false))) {

package/dist/services/revisions.d.ts

@@ -1,4 +1,4 @@
-import { AbstractServiceOptions, PrimaryKey } from '../types';
+import type { AbstractServiceOptions, PrimaryKey } from '../types';
 import { ItemsService } from './index';
 export declare class RevisionsService extends ItemsService {
     constructor(options: AbstractServiceOptions);

package/dist/services/revisions.js

@@ -11,14 +11,14 @@ class RevisionsService extends index_1.ItemsService {
         const revision = await super.readOne(pk);
         if (!revision)
             throw new exceptions_1.ForbiddenException();
-        if (!revision.data)
+        if (!revision['data'])
             throw new exceptions_1.InvalidPayloadException(`Revision doesn't contain data to revert to`);
-        const service = new index_1.ItemsService(revision.collection, {
+        const service = new index_1.ItemsService(revision['collection'], {
             accountability: this.accountability,
             knex: this.knex,
             schema: this.schema,
         });
-        await service.updateOne(revision.item, revision.data);
+        await service.updateOne(revision['item'], revision['data']);
     }
 }
 exports.RevisionsService = RevisionsService;

package/dist/services/roles.d.ts

@@ -1,5 +1,5 @@
-import { AbstractServiceOptions, MutationOptions, PrimaryKey } from '../types';
-import { Query } from '@directus/shared/types';
+import type { Query } from '@directus/shared/types';
+import type { AbstractServiceOptions, MutationOptions, PrimaryKey } from '../types';
 import { ItemsService } from './items';
 export declare class RolesService extends ItemsService {
     constructor(options: AbstractServiceOptions);

package/dist/services/roles.js

@@ -18,7 +18,7 @@ class RolesService extends items_1.ItemsService {
             .whereNotIn('id', excludeKeys)
             .andWhere({ admin_access: true })
             .first();
-        const otherAdminRolesCount = +((otherAdminRoles === null || otherAdminRoles === void 0 ? void 0 : otherAdminRoles.count) || 0);
+        const otherAdminRolesCount = +(otherAdminRoles?.count || 0);
         if (otherAdminRolesCount === 0)
             throw new exceptions_1.UnprocessableEntityException(`You can't delete the last admin role.`);
     }
@@ -29,10 +29,10 @@ class RolesService extends items_1.ItemsService {
         // The users that will now be in this new non-admin role
         let userKeys = [];
         if (Array.isArray(users)) {
-            userKeys = users.map((user) => (typeof user === 'string' ? user : user.id)).filter((id) => id);
+            userKeys = users.map((user) => (typeof user === 'string' ? user : user['id'])).filter((id) => id);
         }
         else {
-            userKeys = users.update.map((user) => user.id).filter((id) => id);
+            userKeys = users.update.map((user) => user['id']).filter((id) => id);
         }
         const usersThatWereInRoleBefore = (await this.knex.select('id').from('directus_users').where('role', '=', key)).map((user) => user.id);
         const usersThatAreRemoved = usersThatWereInRoleBefore.filter((id) => Array.isArray(users) ? userKeys.includes(id) === false : users.delete.includes(id) === true);
@@ -49,7 +49,7 @@ class RolesService extends items_1.ItemsService {
             .andWhere({ 'directus_roles.admin_access': true })
             .leftJoin('directus_roles', 'directus_users.role', 'directus_roles.id')
             .first();
-        const otherAdminUsersCount = +((otherAdminUsers === null || otherAdminUsers === void 0 ? void 0 : otherAdminUsers.count) || 0);
+        const otherAdminUsersCount = +(otherAdminUsers?.count || 0);
         if (otherAdminUsersCount === 0) {
             throw new exceptions_1.UnprocessableEntityException(`You can't remove the last admin user from the admin role.`);
         }
@@ -58,7 +58,7 @@ class RolesService extends items_1.ItemsService {
     async updateOne(key, data, opts) {
         try {
             if ('users' in data) {
-                await this.checkForOtherAdminUsers(key, data.users);
+                await this.checkForOtherAdminUsers(key, data['users']);
             }
         }
         catch (err) {
@@ -69,7 +69,7 @@ class RolesService extends items_1.ItemsService {
     async updateBatch(data, opts) {
         const primaryKeyField = this.schema.collections[this.collection].primary;
         const keys = data.map((item) => item[primaryKeyField]);
-        const setsToNoAdmin = data.some((item) => item.admin_access === false);
+        const setsToNoAdmin = data.some((item) => item['admin_access'] === false);
         try {
             if (setsToNoAdmin) {
                 await this.checkForOtherAdminRoles(keys);
@@ -82,7 +82,7 @@ class RolesService extends items_1.ItemsService {
     }
     async updateMany(keys, data, opts) {
         try {
-            if ('admin_access' in data && data.admin_access === false) {
+            if ('admin_access' in data && data['admin_access'] === false) {
                 await this.checkForOtherAdminRoles(keys);
             }
         }

package/dist/services/schema.d.ts

@@ -1,6 +1,6 @@
-import { Accountability } from '@directus/shared/types';
-import { Knex } from 'knex';
-import { AbstractServiceOptions, Snapshot, SnapshotDiff, SnapshotDiffWithHash, SnapshotWithHash } from '../types';
+import type { Accountability } from '@directus/shared/types';
+import type { Knex } from 'knex';
+import type { AbstractServiceOptions, Snapshot, SnapshotDiff, SnapshotDiffWithHash, SnapshotWithHash } from '../types';
 export declare class SchemaService {
     knex: Knex;
     accountability: Accountability | null;

package/dist/services/schema.js

@@ -13,21 +13,20 @@ const get_versioned_hash_1 = require("../utils/get-versioned-hash");
 const validate_diff_1 = require("../utils/validate-diff");
 const validate_snapshot_1 = require("../utils/validate-snapshot");
 class SchemaService {
+    knex;
+    accountability;
     constructor(options) {
-        var _a, _b;
-        this.knex = (_a = options.knex) !== null && _a !== void 0 ? _a : (0, database_1.default)();
-        this.accountability = (_b = options.accountability) !== null && _b !== void 0 ? _b : null;
+        this.knex = options.knex ?? (0, database_1.default)();
+        this.accountability = options.accountability ?? null;
     }
     async snapshot() {
-        var _a;
-        if (((_a = this.accountability) === null || _a === void 0 ? void 0 : _a.admin) !== true)
+        if (this.accountability?.admin !== true)
             throw new exceptions_1.ForbiddenException();
         const currentSnapshot = await (0, get_snapshot_1.getSnapshot)({ database: this.knex });
         return currentSnapshot;
     }
     async apply(payload) {
-        var _a;
-        if (((_a = this.accountability) === null || _a === void 0 ? void 0 : _a.admin) !== true)
+        if (this.accountability?.admin !== true)
             throw new exceptions_1.ForbiddenException();
         const currentSnapshot = await this.snapshot();
         const snapshotWithHash = this.getHashedSnapshot(currentSnapshot);
@@ -36,11 +35,10 @@ class SchemaService {
         await (0, apply_diff_1.applyDiff)(currentSnapshot, payload.diff, { database: this.knex });
     }
     async diff(snapshot, options) {
-        var _a, _b;
-        if (((_a = this.accountability) === null || _a === void 0 ? void 0 : _a.admin) !== true)
+        if (this.accountability?.admin !== true)
             throw new exceptions_1.ForbiddenException();
-        (0, validate_snapshot_1.validateSnapshot)(snapshot, options === null || options === void 0 ? void 0 : options.force);
-        const currentSnapshot = (_b = options === null || options === void 0 ? void 0 : options.currentSnapshot) !== null && _b !== void 0 ? _b : (await (0, get_snapshot_1.getSnapshot)({ database: this.knex }));
+        (0, validate_snapshot_1.validateSnapshot)(snapshot, options?.force);
+        const currentSnapshot = options?.currentSnapshot ?? (await (0, get_snapshot_1.getSnapshot)({ database: this.knex }));
         const diff = (0, get_snapshot_diff_1.getSnapshotDiff)(currentSnapshot, snapshot);
         if (diff.collections.length === 0 && diff.fields.length === 0 && diff.relations.length === 0) {
             return null;

package/dist/services/server.d.ts

@@ -1,6 +1,6 @@
-import { Knex } from 'knex';
-import { AbstractServiceOptions } from '../types';
-import { Accountability, SchemaOverview } from '@directus/shared/types';
+import type { Knex } from 'knex';
+import type { Accountability, SchemaOverview } from '@directus/shared/types';
+import type { AbstractServiceOptions } from '../types';
 import { SettingsService } from './settings';
 export declare class ServerService {
     knex: Knex;

package/dist/services/server.js

@@ -30,20 +30,25 @@ exports.ServerService = void 0;
 const lodash_1 = require("lodash");
 const os_1 = __importDefault(require("os"));
 const perf_hooks_1 = require("perf_hooks");
+const utils_1 = require("@directus/shared/utils");
+const node_stream_1 = require("node:stream");
 // @ts-ignore
 const package_json_1 = require("../../package.json");
 const cache_1 = require("../cache");
 const database_1 = __importStar(require("../database"));
 const env_1 = __importDefault(require("../env"));
 const logger_1 = __importDefault(require("../logger"));
-const rate_limiter_1 = require("../middleware/rate-limiter");
-const storage_1 = require("../storage");
-const utils_1 = require("@directus/shared/utils");
 const mailer_1 = __importDefault(require("../mailer"));
-const settings_1 = require("./settings");
+const rate_limiter_global_1 = require("../middleware/rate-limiter-global");
+const rate_limiter_ip_1 = require("../middleware/rate-limiter-ip");
+const storage_1 = require("../storage");
 const get_os_info_1 = require("../utils/get-os-info");
-const node_stream_1 = require("node:stream");
+const settings_1 = require("./settings");
 class ServerService {
+    knex;
+    accountability;
+    settingsService;
+    schema;
     constructor(options) {
         this.knex = options.knex || (0, database_1.default)();
         this.accountability = options.accountability || null;
@@ -51,7 +56,6 @@ class ServerService {
         this.settingsService = new settings_1.SettingsService({ knex: this.knex, schema: this.schema });
     }
     async serverInfo() {
-        var _a, _b;
         const info = {};
         const projectInfo = await this.settingsService.readSingleton({
             fields: [
@@ -66,31 +70,40 @@ class ServerService {
                 'custom_css',
             ],
         });
-        info.project = projectInfo;
-        if ((_a = this.accountability) === null || _a === void 0 ? void 0 : _a.user) {
-            if (env_1.default.RATE_LIMITER_ENABLED) {
-                info.rateLimit = {
-                    points: env_1.default.RATE_LIMITER_POINTS,
-                    duration: env_1.default.RATE_LIMITER_DURATION,
+        info['project'] = projectInfo;
+        if (this.accountability?.user) {
+            if (env_1.default['RATE_LIMITER_ENABLED']) {
+                info['rateLimit'] = {
+                    points: env_1.default['RATE_LIMITER_POINTS'],
+                    duration: env_1.default['RATE_LIMITER_DURATION'],
                 };
             }
             else {
-                info.rateLimit = false;
+                info['rateLimit'] = false;
             }
-            info.flows = {
-                execAllowedModules: env_1.default.FLOWS_EXEC_ALLOWED_MODULES ? (0, utils_1.toArray)(env_1.default.FLOWS_EXEC_ALLOWED_MODULES) : [],
+            if (env_1.default['RATE_LIMITER_GLOBAL_ENABLED']) {
+                info['rateLimitGlobal'] = {
+                    points: env_1.default['RATE_LIMITER_GLOBAL_POINTS'],
+                    duration: env_1.default['RATE_LIMITER_GLOBAL_DURATION'],
+                };
+            }
+            else {
+                info['rateLimitGlobal'] = false;
+            }
+            info['flows'] = {
+                execAllowedModules: env_1.default['FLOWS_EXEC_ALLOWED_MODULES'] ? (0, utils_1.toArray)(env_1.default['FLOWS_EXEC_ALLOWED_MODULES']) : [],
             };
         }
-        if (((_b = this.accountability) === null || _b === void 0 ? void 0 : _b.admin) === true) {
+        if (this.accountability?.admin === true) {
             const { osType, osVersion } = (0, get_os_info_1.getOSInfo)();
-            info.directus = {
+            info['directus'] = {
                 version: package_json_1.version,
             };
-            info.node = {
+            info['node'] = {
                 version: process.versions.node,
                 uptime: Math.round(process.uptime()),
             };
-            info.os = {
+            info['os'] = {
                 type: osType,
                 version: osVersion,
                 uptime: Math.round(os_1.default.uptime()),
@@ -100,14 +113,20 @@ class ServerService {
         return info;
     }
     async health() {
-        var _a;
         const { nanoid } = await import('nanoid');
         const checkID = nanoid(5);
         const data = {
             status: 'ok',
             releaseId: package_json_1.version,
-            serviceId: env_1.default.KEY,
-            checks: (0, lodash_1.merge)(...(await Promise.all([testDatabase(), testCache(), testRateLimiter(), testStorage(), testEmail()]))),
+            serviceId: env_1.default['KEY'],
+            checks: (0, lodash_1.merge)(...(await Promise.all([
+                testDatabase(),
+                testCache(),
+                testRateLimiter(),
+                testRateLimiterGlobal(),
+                testStorage(),
+                testEmail(),
+            ]))),
         };
         for (const [service, healthData] of Object.entries(data.checks)) {
             for (const healthCheck of healthData) {
@@ -126,7 +145,7 @@ class ServerService {
             if (data.status === 'error')
                 break;
         }
-        if (((_a = this.accountability) === null || _a === void 0 ? void 0 : _a.admin) !== true) {
+        if (this.accountability?.admin !== true) {
             return { status: data.status };
         }
         else {
@@ -134,7 +153,7 @@ class ServerService {
         }
         async function testDatabase() {
             const database = (0, database_1.default)();
-            const client = env_1.default.DB_CLIENT;
+            const client = env_1.default['DB_CLIENT'];
             const checks = {};
             // Response time
             // ----------------------------------------------------------------------------------------
@@ -144,7 +163,7 @@ class ServerService {
                     componentType: 'datastore',
                     observedUnit: 'ms',
                     observedValue: 0,
-                    threshold: env_1.default.DB_HEALTHCHECK_THRESHOLD ? +env_1.default.DB_HEALTHCHECK_THRESHOLD : 150,
+                    threshold: env_1.default['DB_HEALTHCHECK_THRESHOLD'] ? +env_1.default['DB_HEALTHCHECK_THRESHOLD'] : 150,
                 },
             ];
             const startTime = perf_hooks_1.performance.now();
@@ -178,7 +197,7 @@ class ServerService {
             return checks;
         }
         async function testCache() {
-            if (env_1.default.CACHE_ENABLED !== true) {
+            if (env_1.default['CACHE_ENABLED'] !== true) {
                 return {};
             }
             const { cache } = (0, cache_1.getCache)();
@@ -189,7 +208,7 @@ class ServerService {
                         componentType: 'cache',
                         observedValue: 0,
                         observedUnit: 'ms',
-                        threshold: env_1.default.CACHE_HEALTHCHECK_THRESHOLD ? +env_1.default.CACHE_HEALTHCHECK_THRESHOLD : 150,
+                        threshold: env_1.default['CACHE_HEALTHCHECK_THRESHOLD'] ? +env_1.default['CACHE_HEALTHCHECK_THRESHOLD'] : 150,
                     },
                 ],
             };
@@ -213,7 +232,7 @@ class ServerService {
             return checks;
         }
         async function testRateLimiter() {
-            if (env_1.default.RATE_LIMITER_ENABLED !== true) {
+            if (env_1.default['RATE_LIMITER_ENABLED'] !== true) {
                 return {};
             }
             const checks = {
@@ -223,14 +242,14 @@ class ServerService {
                         componentType: 'ratelimiter',
                         observedValue: 0,
                         observedUnit: 'ms',
-                        threshold: env_1.default.RATE_LIMITER_HEALTHCHECK_THRESHOLD ? +env_1.default.RATE_LIMITER_HEALTHCHECK_THRESHOLD : 150,
+                        threshold: env_1.default['RATE_LIMITER_HEALTHCHECK_THRESHOLD'] ? +env_1.default['RATE_LIMITER_HEALTHCHECK_THRESHOLD'] : 150,
                     },
                 ],
             };
             const startTime = perf_hooks_1.performance.now();
             try {
-                await rate_limiter_1.rateLimiter.consume(`health-${checkID}`, 1);
-                await rate_limiter_1.rateLimiter.delete(`health-${checkID}`);
+                await rate_limiter_ip_1.rateLimiter.consume(`health-${checkID}`, 1);
+                await rate_limiter_ip_1.rateLimiter.delete(`health-${checkID}`);
             }
             catch (err) {
                 checks['rateLimiter:responseTime'][0].status = 'error';
@@ -246,10 +265,47 @@ class ServerService {
             }
             return checks;
         }
+        async function testRateLimiterGlobal() {
+            if (env_1.default['RATE_LIMITER_GLOBAL_ENABLED'] !== true) {
+                return {};
+            }
+            const checks = {
+                'rateLimiterGlobal:responseTime': [
+                    {
+                        status: 'ok',
+                        componentType: 'ratelimiter',
+                        observedValue: 0,
+                        observedUnit: 'ms',
+                        threshold: env_1.default['RATE_LIMITER_GLOBAL_HEALTHCHECK_THRESHOLD']
+                            ? +env_1.default['RATE_LIMITER_GLOBAL_HEALTHCHECK_THRESHOLD']
+                            : 150,
+                    },
+                ],
+            };
+            const startTime = perf_hooks_1.performance.now();
+            try {
+                await rate_limiter_global_1.rateLimiterGlobal.consume(`health-${checkID}`, 1);
+                await rate_limiter_global_1.rateLimiterGlobal.delete(`health-${checkID}`);
+            }
+            catch (err) {
+                checks['rateLimiterGlobal:responseTime'][0].status = 'error';
+                checks['rateLimiterGlobal:responseTime'][0].output = err;
+            }
+            finally {
+                const endTime = perf_hooks_1.performance.now();
+                checks['rateLimiterGlobal:responseTime'][0].observedValue = +(endTime - startTime).toFixed(3);
+                if (checks['rateLimiterGlobal:responseTime'][0].observedValue >
+                    checks['rateLimiterGlobal:responseTime'][0].threshold &&
+                    checks['rateLimiterGlobal:responseTime'][0].status !== 'error') {
+                    checks['rateLimiterGlobal:responseTime'][0].status = 'warn';
+                }
+            }
+            return checks;
+        }
         async function testStorage() {
             const storage = await (0, storage_1.getStorage)();
             const checks = {};
-            for (const location of (0, utils_1.toArray)(env_1.default.STORAGE_LOCATIONS)) {
+            for (const location of (0, utils_1.toArray)(env_1.default['STORAGE_LOCATIONS'])) {
                 const disk = storage.location(location);
                 const envThresholdKey = `STORAGE_${location}_HEALTHCHECK_THRESHOLD`.toUpperCase();
                 checks[`storage:${location}:responseTime`] = [

package/dist/services/settings.d.ts

@@ -1,4 +1,4 @@
-import { AbstractServiceOptions } from '../types';
+import type { AbstractServiceOptions } from '../types';
 import { ItemsService } from './items';
 export declare class SettingsService extends ItemsService {
     constructor(options: AbstractServiceOptions);

package/dist/services/shares.d.ts

@@ -1,4 +1,4 @@
-import { AbstractServiceOptions, Item, LoginResult, MutationOptions, PrimaryKey } from '../types';
+import type { AbstractServiceOptions, Item, LoginResult, MutationOptions, PrimaryKey } from '../types';
 import { AuthorizationService } from './authorization';
 import { ItemsService } from './items';
 export declare class SharesService extends ItemsService {