@vendure/core 2.2.0-next.1 → 2.2.0-next.2

package/dist/entity/refund/refund.entity.d.ts

@@ -6,8 +6,20 @@ import { RefundLine } from '../order-line-reference/refund-line.entity';
 import { Payment } from '../payment/payment.entity';
 export declare class Refund extends VendureEntity {
     constructor(input?: DeepPartial<Refund>);
+    /**
+     * @deprecated Since v2.2, the `items` field will not be used by default. Instead, the `total` field
+     * alone will be used to determine the refund amount.
+     */
     items: number;
+    /**
+     * @deprecated Since v2.2, the `shipping` field will not be used by default. Instead, the `total` field
+     * alone will be used to determine the refund amount.
+     */
     shipping: number;
+    /**
+     * @deprecated Since v2.2, the `adjustment` field will not be used by default. Instead, the `total` field
+     * alone will be used to determine the refund amount.
+     */
     adjustment: number;
     total: number;
     method: string;

package/dist/entity/refund/refund.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"refund.entity.js","sourceRoot":"","sources":["../../../src/entity/refund/refund.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qCAA6F;AAI7F,qDAAoD;AACpD,gEAAkD;AAClD,wDAA2C;AAC3C,mFAAwE;AACxE,8DAAoD;AAG7C,IAAM,MAAM,GAAZ,MAAM,MAAO,SAAQ,2BAAa;IACrC,YAAY,KAA2B;QACnC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;CA+BJ,CAAA;AA7BG;IAAC,IAAA,uBAAK,GAAE;;qCAAe;AAEvB;IAAC,IAAA,uBAAK,GAAE;;wCAAkB;AAE1B;IAAC,IAAA,uBAAK,GAAE;;0CAAoB;AAE5B;IAAC,IAAA,uBAAK,GAAE;;qCAAe;AAEvB;IAAC,IAAA,gBAAM,GAAE;;sCAAgB;AAEzB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sCAAgB;AAE3C;IAAC,IAAA,gBAAM,EAAC,SAAS,CAAC;;qCAAoB;AAEtC;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CAAuB;AAElD;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,+BAAU,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC;IAClD,IAAA,mBAAS,GAAE;;qCACQ;AAEpB;IAAC,IAAA,eAAK,GAAE;IACP,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,wBAAO,CAAC;IAC1B,IAAA,oBAAU,GAAE;8BACJ,wBAAO;uCAAC;AAEjB;IAAC,IAAA,8BAAQ,GAAE;;yCACG;AAEd;IAAC,IAAA,gBAAM,EAAC,aAAa,CAAC;;wCAA2B;AAjCxC,MAAM;IADlB,IAAA,gBAAM,GAAE;;GACI,MAAM,CAkClB;AAlCY,wBAAM"}
+{"version":3,"file":"refund.entity.js","sourceRoot":"","sources":["../../../src/entity/refund/refund.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qCAA6F;AAI7F,qDAAoD;AACpD,gEAAkD;AAClD,wDAA2C;AAC3C,mFAAwE;AACxE,8DAAoD;AAG7C,IAAM,MAAM,GAAZ,MAAM,MAAO,SAAQ,2BAAa;IACrC,YAAY,KAA2B;QACnC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;CA2CJ,CAAA;AArCG;IAAC,IAAA,uBAAK,GAAE;;qCAAe;AAMvB;IAAC,IAAA,uBAAK,GAAE;;wCAAkB;AAM1B;IAAC,IAAA,uBAAK,GAAE;;0CAAoB;AAE5B;IAAC,IAAA,uBAAK,GAAE;;qCAAe;AAEvB;IAAC,IAAA,gBAAM,GAAE;;sCAAgB;AAEzB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sCAAgB;AAE3C;IAAC,IAAA,gBAAM,EAAC,SAAS,CAAC;;qCAAoB;AAEtC;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CAAuB;AAElD;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,+BAAU,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC;IAClD,IAAA,mBAAS,GAAE;;qCACQ;AAEpB;IAAC,IAAA,eAAK,GAAE;IACP,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,wBAAO,CAAC;IAC1B,IAAA,oBAAU,GAAE;8BACJ,wBAAO;uCAAC;AAEjB;IAAC,IAAA,8BAAQ,GAAE;;yCACG;AAEd;IAAC,IAAA,gBAAM,EAAC,aAAa,CAAC;;wCAA2B;AA7CxC,MAAM;IADlB,IAAA,gBAAM,GAAE;;GACI,MAAM,CA8ClB;AA9CY,wBAAM"}

package/dist/entity/register-custom-entity-fields.js

@@ -5,7 +5,6 @@ const shared_utils_1 = require("@vendure/common/lib/shared-utils");
 const typeorm_1 = require("typeorm");
 const DateUtils_1 = require("typeorm/util/DateUtils");
 const vendure_logger_1 = require("../config/logger/vendure-logger");
-const custom_entity_fields_1 = require("./custom-entity-fields");
 /**
  * The maximum length of the "length" argument of a MySQL varchar column.
  */
@@ -197,60 +196,49 @@ function assertLocaleFieldsNotSpecified(config, entityName) {
  * stage of the app lifecycle, before the AppModule is initialized.
  */
 function registerCustomEntityFields(config) {
-    registerCustomFieldsForEntity(config, 'Address', custom_entity_fields_1.CustomAddressFields);
-    assertLocaleFieldsNotSpecified(config, 'Address');
-    registerCustomFieldsForEntity(config, 'Administrator', custom_entity_fields_1.CustomAdministratorFields);
-    assertLocaleFieldsNotSpecified(config, 'Administrator');
-    registerCustomFieldsForEntity(config, 'Asset', custom_entity_fields_1.CustomAssetFields);
-    assertLocaleFieldsNotSpecified(config, 'Asset');
-    registerCustomFieldsForEntity(config, 'Collection', custom_entity_fields_1.CustomCollectionFields);
-    registerCustomFieldsForEntity(config, 'Collection', custom_entity_fields_1.CustomCollectionFieldsTranslation, true);
-    registerCustomFieldsForEntity(config, 'Channel', custom_entity_fields_1.CustomChannelFields);
-    assertLocaleFieldsNotSpecified(config, 'Channel');
-    registerCustomFieldsForEntity(config, 'Customer', custom_entity_fields_1.CustomCustomerFields);
-    assertLocaleFieldsNotSpecified(config, 'Customer');
-    registerCustomFieldsForEntity(config, 'CustomerGroup', custom_entity_fields_1.CustomCustomerGroupFields);
-    assertLocaleFieldsNotSpecified(config, 'CustomerGroup');
-    registerCustomFieldsForEntity(config, 'Facet', custom_entity_fields_1.CustomFacetFields);
-    registerCustomFieldsForEntity(config, 'Facet', custom_entity_fields_1.CustomFacetFieldsTranslation, true);
-    registerCustomFieldsForEntity(config, 'FacetValue', custom_entity_fields_1.CustomFacetValueFields);
-    registerCustomFieldsForEntity(config, 'FacetValue', custom_entity_fields_1.CustomFacetValueFieldsTranslation, true);
-    registerCustomFieldsForEntity(config, 'Fulfillment', custom_entity_fields_1.CustomFulfillmentFields);
-    assertLocaleFieldsNotSpecified(config, 'Fulfillment');
-    registerCustomFieldsForEntity(config, 'Order', custom_entity_fields_1.CustomOrderFields);
-    assertLocaleFieldsNotSpecified(config, 'Order');
-    registerCustomFieldsForEntity(config, 'OrderLine', custom_entity_fields_1.CustomOrderLineFields);
-    assertLocaleFieldsNotSpecified(config, 'OrderLine');
-    registerCustomFieldsForEntity(config, 'PaymentMethod', custom_entity_fields_1.CustomPaymentMethodFields);
-    registerCustomFieldsForEntity(config, 'PaymentMethod', custom_entity_fields_1.CustomPaymentMethodFieldsTranslation, true);
-    registerCustomFieldsForEntity(config, 'Product', custom_entity_fields_1.CustomProductFields);
-    registerCustomFieldsForEntity(config, 'Product', custom_entity_fields_1.CustomProductFieldsTranslation, true);
-    registerCustomFieldsForEntity(config, 'ProductOption', custom_entity_fields_1.CustomProductOptionFields);
-    registerCustomFieldsForEntity(config, 'ProductOption', custom_entity_fields_1.CustomProductOptionFieldsTranslation, true);
-    registerCustomFieldsForEntity(config, 'ProductOptionGroup', custom_entity_fields_1.CustomProductOptionGroupFields);
-    registerCustomFieldsForEntity(config, 'ProductOptionGroup', custom_entity_fields_1.CustomProductOptionGroupFieldsTranslation, true);
-    registerCustomFieldsForEntity(config, 'ProductVariant', custom_entity_fields_1.CustomProductVariantFields);
-    registerCustomFieldsForEntity(config, 'ProductVariant', custom_entity_fields_1.CustomProductVariantFieldsTranslation, true);
-    registerCustomFieldsForEntity(config, 'Promotion', custom_entity_fields_1.CustomPromotionFields);
-    registerCustomFieldsForEntity(config, 'Promotion', custom_entity_fields_1.CustomPromotionFieldsTranslation, true);
-    registerCustomFieldsForEntity(config, 'TaxCategory', custom_entity_fields_1.CustomTaxCategoryFields);
-    assertLocaleFieldsNotSpecified(config, 'TaxCategory');
-    registerCustomFieldsForEntity(config, 'TaxRate', custom_entity_fields_1.CustomTaxRateFields);
-    assertLocaleFieldsNotSpecified(config, 'TaxRate');
-    registerCustomFieldsForEntity(config, 'User', custom_entity_fields_1.CustomUserFields);
-    assertLocaleFieldsNotSpecified(config, 'User');
-    registerCustomFieldsForEntity(config, 'GlobalSettings', custom_entity_fields_1.CustomGlobalSettingsFields);
-    assertLocaleFieldsNotSpecified(config, 'GlobalSettings');
-    registerCustomFieldsForEntity(config, 'Region', custom_entity_fields_1.CustomRegionFields);
-    registerCustomFieldsForEntity(config, 'Region', custom_entity_fields_1.CustomRegionFieldsTranslation, true);
-    registerCustomFieldsForEntity(config, 'Seller', custom_entity_fields_1.CustomSellerFields);
-    assertLocaleFieldsNotSpecified(config, 'Seller');
-    registerCustomFieldsForEntity(config, 'ShippingMethod', custom_entity_fields_1.CustomShippingMethodFields);
-    registerCustomFieldsForEntity(config, 'ShippingMethod', custom_entity_fields_1.CustomShippingMethodFieldsTranslation, true);
-    registerCustomFieldsForEntity(config, 'StockLocation', custom_entity_fields_1.CustomStockLocationFields);
-    assertLocaleFieldsNotSpecified(config, 'StockLocation');
-    registerCustomFieldsForEntity(config, 'Zone', custom_entity_fields_1.CustomZoneFields);
-    assertLocaleFieldsNotSpecified(config, 'Zone');
+    var _a;
+    // In order to determine the classes used for the custom field embedded types, we need
+    // to introspect the metadata args storage.
+    const metadataArgsStorage = (0, typeorm_1.getMetadataArgsStorage)();
+    for (const [entityName, customFieldsConfig] of Object.entries((_a = config.customFields) !== null && _a !== void 0 ? _a : {})) {
+        if (customFieldsConfig && customFieldsConfig.length) {
+            const customFieldsMetadata = getCustomFieldsMetadata(entityName);
+            const customFieldsClass = customFieldsMetadata.type();
+            if (customFieldsClass && typeof customFieldsClass !== 'string') {
+                registerCustomFieldsForEntity(config, entityName, customFieldsClass);
+            }
+            const translationsMetadata = metadataArgsStorage
+                .filterRelations(customFieldsMetadata.target)
+                .find(m => m.propertyName === 'translations');
+            if (translationsMetadata) {
+                // This entity is translatable, which means that we should
+                // also register any localized custom fields on the related
+                // EntityTranslation entity.
+                const translationType = translationsMetadata.type();
+                const customFieldsTranslationsMetadata = getCustomFieldsMetadata(translationType);
+                const customFieldsTranslationClass = customFieldsTranslationsMetadata.type();
+                if (customFieldsTranslationClass && typeof customFieldsTranslationClass !== 'string') {
+                    registerCustomFieldsForEntity(config, entityName, customFieldsTranslationClass, true);
+                }
+            }
+            else {
+                assertLocaleFieldsNotSpecified(config, entityName);
+            }
+        }
+    }
+    function getCustomFieldsMetadata(entity) {
+        const entityName = typeof entity === 'string' ? entity : entity.name;
+        const metadataArgs = metadataArgsStorage.embeddeds.find(item => {
+            if (item.propertyName === 'customFields') {
+                const targetName = typeof item.target === 'string' ? item.target : item.target.name;
+                return targetName === entityName;
+            }
+        });
+        if (!metadataArgs) {
+            throw new Error(`Could not find embedded CustomFields property on entity "${entityName}"`);
+        }
+        return metadataArgs;
+    }
 }
 exports.registerCustomEntityFields = registerCustomEntityFields;
 //# sourceMappingURL=register-custom-entity-fields.js.map

package/dist/entity/register-custom-entity-fields.js.map

@@ -1 +1 @@
-{"version":3,"file":"register-custom-entity-fields.js","sourceRoot":"","sources":["../../src/entity/register-custom-entity-fields.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"register-custom-entity-fields.js","sourceRoot":"","sources":["../../src/entity/register-custom-entity-fields.ts"],"names":[],"mappings":"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"}

package/dist/i18n/messages/de.json

@@ -73,10 +73,10 @@
     "ORDER_LIMIT_ERROR": "Der Artikel konnte nicht hinzugefügt werden. Eine Bestellung kann maximal { maxItems } Artikel enthalten",
     "ORDER_MODIFICATION_ERROR": "Der Inhalt der Bestellung kann nur im Status \"AddingItems\" geändert werden",
     "ORDER_PAYMENT_STATE_ERROR": "Eine Zahlung kann nur im Status \"ArrangingPayment\" hinzugefügt werden",
-    "ORDER_STATE_TRANSITION_ERROR": "Der Status der Bestellung kan nicht von \"{ fromState }\" zu \"{ toState }\" geändert werden",
+    "ORDER_STATE_TRANSITION_ERROR": "Der Status der Bestellung kann nicht von \"{ fromState }\" zu \"{ toState }\" geändert werden",
     "PASSWORD_ALREADY_SET_ERROR": "Ein Passwort wurde während der Registrierung bereits festgelegt",
-    "PASSWORD_RESET_TOKEN_EXPIRED_ERROR": "Das Token zum Passwortzurücksetzen ist leider abgelaufen",
-    "PASSWORD_RESET_TOKEN_INVALID_ERROR": "Das Token zum Passwortzurücksetzen ist leider falsch",
+    "PASSWORD_RESET_TOKEN_EXPIRED_ERROR": "Das Token zum Zurücksetzen des Passwortes ist leider abgelaufen",
+    "PASSWORD_RESET_TOKEN_INVALID_ERROR": "Das Token zum Zurücksetzen des Passwortes ist leider falsch",
     "PAYMENT_DECLINED_ERROR": "Die Zahlung wurde abgelehnt",
     "PAYMENT_FAILED_ERROR": "Zahlung fehlgeschlagen",
     "PAYMENT_ORDER_MISMATCH_ERROR": "Die Zahlung und OrderLines gehören nicht zueinander",

package/dist/i18n/messages/en.json

@@ -50,6 +50,7 @@
     "promotion-channels-can-only-be-changed-from-default-channel": "Promotions channels may only be changed from the Default Channel",
     "stockonhand-cannot-be-negative": "stockOnHand cannot be a negative value",
     "superadmin-must-have-superadmin-role": "Cannot remove the SuperAdmin role from the sole SuperAdmin",
+    "target-customer-not-assigned-to-order-channels": "The target Customer is not assigned to the same Channels as the Order. Missing channels IDs: { missingChannelIds }",
     "unauthorized": "The credentials did not match. Please check and try again"
   },
   "errorResult": {
@@ -94,6 +95,7 @@
     "PAYMENT_STATE_TRANSITION_ERROR": "Cannot transition Payment from \"{ fromState }\" to \"{ toState }\"",
     "PRODUCT_OPTION_IN_USE_ERROR": "Cannot remove ProductOptionGroup \"{ optionGroupCode }\" as it is used by {productVariantCount, plural, one {1 ProductVariant} other {# ProductVariants}}. Use the `force` argument to remove it anyway",
     "QUANTITY_TOO_GREAT_ERROR": "The specified quantity is greater than the available OrderItems",
+    "REFUND_AMOUNT_ERROR": "The amount specified exceeds the refundable amount for this payment",
     "REFUND_ORDER_STATE_ERROR": "Cannot refund an Order in the \"{ orderState }\" state",
     "SETTLE_PAYMENT_ERROR": "Settling the payment failed",
     "VERIFICATION_TOKEN_EXPIRED_ERROR": "Verification token has expired. Use refreshCustomerVerification to send a new token.",

package/dist/job-queue/job-queue.service.d.ts

@@ -114,5 +114,10 @@ export declare class JobQueueService implements OnModuleDestroy {
      * registered JobQueue.
      */
     getJobQueues(): GraphQlJobQueue[];
+    /**
+     * We wrap the process function in order to catch any errors thrown and pass them to
+     * any configured ErrorHandlerStrategies.
+     */
+    private createWrappedProcessFn;
     private shouldStartQueue;
 }

package/dist/job-queue/job-queue.service.js

@@ -73,6 +73,8 @@ let JobQueueService = class JobQueueService {
         if (this.configService.jobQueueOptions.prefix) {
             options = Object.assign(Object.assign({}, options), { name: `${this.configService.jobQueueOptions.prefix}${options.name}` });
         }
+        const wrappedProcessFn = this.createWrappedProcessFn(options.process);
+        options = Object.assign(Object.assign({}, options), { process: wrappedProcessFn });
         const queue = new job_queue_1.JobQueue(options, this.jobQueueStrategy, this.jobBufferService);
         if (this.hasStarted && this.shouldStartQueue(queue.name)) {
             await queue.start();
@@ -158,6 +160,26 @@ let JobQueueService = class JobQueueService {
             running: queue.started,
         }));
     }
+    /**
+     * We wrap the process function in order to catch any errors thrown and pass them to
+     * any configured ErrorHandlerStrategies.
+     */
+    createWrappedProcessFn(processFn) {
+        const { errorHandlers } = this.configService.systemOptions;
+        return async (job) => {
+            try {
+                return await processFn(job);
+            }
+            catch (e) {
+                for (const handler of errorHandlers) {
+                    if (e instanceof Error) {
+                        void handler.handleWorkerError(e, { job });
+                    }
+                }
+                throw e;
+            }
+        };
+    }
     shouldStartQueue(queueName) {
         if (this.configService.jobQueueOptions.activeQueues.length > 0) {
             if (!this.configService.jobQueueOptions.activeQueues.includes(queueName)) {

package/dist/job-queue/job-queue.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"job-queue.service.js","sourceRoot":"","sources":["../../src/job-queue/job-queue.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"job-queue.service.js","sourceRoot":"","sources":["../../src/job-queue/job-queue.service.ts"],"names":[],"mappings":"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"}

package/dist/job-queue/polling-job-queue-strategy.d.ts

@@ -1,6 +1,7 @@
 import { ID } from '@vendure/common/lib/shared-types';
 import { InjectableJobQueueStrategy } from './injectable-job-queue-strategy';
 import { Job } from './job';
+import { QueueNameProcessStorage } from './queue-name-process-storage';
 import { JobData } from './types';
 /**
  * @description
@@ -41,6 +42,36 @@ export interface PollingJobQueueStrategyConfig {
      * @default () => 1000
      */
     backoffStrategy?: BackoffStrategy;
+    /**
+     * @description
+     * The timeout in ms which the queue will use when attempting a graceful shutdown.
+     * That means, when the server is shut down but a job is running, the job queue will
+     * wait for the job to complete before allowing the server to shut down. If the job
+     * does not complete within this timeout window, the job will be forced to stop
+     * and the server will shut down anyway.
+     *
+     * @since 2.2.0
+     * @default 20_000
+     */
+    gracefulShutdownTimeout?: number;
+}
+declare class ActiveQueue<Data extends JobData<Data> = object> {
+    private readonly queueName;
+    private readonly process;
+    private readonly jobQueueStrategy;
+    private timer;
+    private running;
+    private activeJobs;
+    private errorNotifier$;
+    private queueStopped$;
+    private subscription;
+    private readonly pollInterval;
+    constructor(queueName: string, process: (job: Job<Data>) => Promise<any>, jobQueueStrategy: PollingJobQueueStrategy);
+    start(): void;
+    stop(stopActiveQueueTimeout?: number): Promise<void>;
+    private awaitRunningJobsOrTimeout;
+    private onFailOrComplete;
+    private removeJobFromActive;
 }
 /**
  * @description
@@ -57,7 +88,8 @@ export declare abstract class PollingJobQueueStrategy extends InjectableJobQueue
     pollInterval: number | ((queueName: string) => number);
     setRetries: (queueName: string, job: Job) => number;
     backOffStrategy?: BackoffStrategy;
-    private activeQueues;
+    gracefulShutdownTimeout: number;
+    protected activeQueues: QueueNameProcessStorage<ActiveQueue<any>>;
     constructor(config?: PollingJobQueueStrategyConfig);
     constructor(concurrency?: number, pollInterval?: number);
     start<Data extends JobData<Data> = object>(queueName: string, process: (job: Job<Data>) => Promise<any>): Promise<void>;
@@ -81,3 +113,4 @@ export declare abstract class PollingJobQueueStrategy extends InjectableJobQueue
      */
     abstract findOne(id: ID): Promise<Job | undefined>;
 }
+export {};

package/dist/job-queue/polling-job-queue-strategy.js

@@ -19,10 +19,6 @@ class ActiveQueue {
         this.activeJobs = [];
         this.errorNotifier$ = new rxjs_1.Subject();
         this.queueStopped$ = new rxjs_1.Subject();
-        this.subscription = this.errorNotifier$.pipe((0, operators_1.throttleTime)(3000)).subscribe(([message, stack]) => {
-            vendure_logger_1.Logger.error(message);
-            vendure_logger_1.Logger.debug(stack);
-        });
         this.pollInterval =
             typeof this.jobQueueStrategy.pollInterval === 'function'
                 ? this.jobQueueStrategy.pollInterval(queueName)
@@ -30,6 +26,10 @@ class ActiveQueue {
     }
     start() {
         vendure_logger_1.Logger.debug(`Starting JobQueue "${this.queueName}"`);
+        this.subscription = this.errorNotifier$.pipe((0, operators_1.throttleTime)(3000)).subscribe(([message, stack]) => {
+            vendure_logger_1.Logger.error(message);
+            vendure_logger_1.Logger.debug(stack);
+        });
         this.running = true;
         const runNextJobs = async () => {
             try {
@@ -41,11 +41,15 @@ class ActiveQueue {
                         await this.jobQueueStrategy.update(nextJob);
                         const onProgress = (job) => this.jobQueueStrategy.update(job);
                         nextJob.on('progress', onProgress);
-                        const cancellationSignal$ = (0, rxjs_1.interval)(this.pollInterval * 5).pipe(
+                        const cancellationSub = (0, rxjs_1.interval)(this.pollInterval * 5)
+                            .pipe(
                         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                        (0, operators_1.switchMap)(() => this.jobQueueStrategy.findOne(nextJob.id)), (0, operators_1.filter)(job => (job === null || job === void 0 ? void 0 : job.state) === generated_types_1.JobState.CANCELLED), (0, operators_1.take)(1));
+                        (0, operators_1.switchMap)(() => this.jobQueueStrategy.findOne(nextJob.id)), (0, operators_1.filter)(job => (job === null || job === void 0 ? void 0 : job.state) === generated_types_1.JobState.CANCELLED), (0, operators_1.take)(1))
+                            .subscribe(() => {
+                            nextJob.cancel();
+                        });
                         const stopSignal$ = this.queueStopped$.pipe((0, operators_1.take)(1));
-                        (0, rxjs_1.race)((0, rxjs_1.from)(this.process(nextJob)), cancellationSignal$, stopSignal$)
+                        (0, rxjs_1.race)((0, rxjs_1.from)(this.process(nextJob)), stopSignal$)
                             .toPromise()
                             .then(result => {
                             if (result === STOP_SIGNAL) {
@@ -61,10 +65,11 @@ class ActiveQueue {
                             nextJob.fail(err);
                         })
                             .finally(() => {
-                            if (!this.running && nextJob.state !== generated_types_1.JobState.PENDING) {
-                                return;
-                            }
+                            // if (!this.running && nextJob.state !== JobState.PENDING) {
+                            //     return;
+                            // }
                             nextJob.off('progress', onProgress);
+                            cancellationSub.unsubscribe();
                             return this.onFailOrComplete(nextJob);
                         })
                             .catch((err) => {
@@ -85,24 +90,45 @@ class ActiveQueue {
         };
         void runNextJobs();
     }
-    stop() {
+    async stop(stopActiveQueueTimeout = 20000) {
         this.running = false;
-        this.queueStopped$.next(STOP_SIGNAL);
         clearTimeout(this.timer);
+        await this.awaitRunningJobsOrTimeout(stopActiveQueueTimeout);
+        vendure_logger_1.Logger.info(`Stopped queue: ${this.queueName}`);
+        this.subscription.unsubscribe();
+        // Allow any job status changes to be persisted
+        // before we permit the application shutdown to continue.
+        // Otherwise, the DB connection will close before our
+        // changes are persisted.
+        await new Promise(resolve => setTimeout(resolve, 1000));
+    }
+    awaitRunningJobsOrTimeout(stopActiveQueueTimeout = 20000) {
         const start = +new Date();
-        // Wait for 2 seconds to allow running jobs to complete
-        const maxTimeout = 2000;
-        let pollTimer;
+        let timeout;
         return new Promise(resolve => {
-            const pollActiveJobs = async () => {
-                const timedOut = +new Date() - start > maxTimeout;
-                if (this.activeJobs.length === 0 || timedOut) {
-                    clearTimeout(pollTimer);
+            let lastStatusUpdate = +new Date();
+            const pollActiveJobs = () => {
+                const now = +new Date();
+                const timedOut = stopActiveQueueTimeout === undefined ? false : now - start > stopActiveQueueTimeout;
+                if (this.activeJobs.length === 0) {
+                    clearTimeout(timeout);
                     resolve();
+                    return;
                 }
-                else {
-                    pollTimer = setTimeout(pollActiveJobs, 50);
+                if (timedOut) {
+                    vendure_logger_1.Logger.warn(`Timed out (${stopActiveQueueTimeout}ms) waiting for ${this.activeJobs.length} active jobs in queue "${this.queueName}" to complete. Forcing stop...`);
+                    this.queueStopped$.next(STOP_SIGNAL);
+                    clearTimeout(timeout);
+                    resolve();
+                    return;
                 }
+                if (this.activeJobs.length > 0) {
+                    if (now - lastStatusUpdate > 2000) {
+                        vendure_logger_1.Logger.info(`Stopping queue: ${this.queueName} - waiting for ${this.activeJobs.length} active jobs to complete...`);
+                        lastStatusUpdate = now;
+                    }
+                }
+                timeout = setTimeout(pollActiveJobs, 200);
             };
             void pollActiveJobs();
         });
@@ -113,7 +139,9 @@ class ActiveQueue {
     }
     removeJobFromActive(job) {
         const index = this.activeJobs.indexOf(job);
-        this.activeJobs.splice(index, 1);
+        if (index !== -1) {
+            this.activeJobs.splice(index, 1);
+        }
     }
 }
 /**
@@ -128,7 +156,7 @@ class ActiveQueue {
  */
 class PollingJobQueueStrategy extends injectable_job_queue_strategy_1.InjectableJobQueueStrategy {
     constructor(concurrencyOrConfig, maybePollInterval) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         super();
         this.activeQueues = new queue_name_process_storage_1.QueueNameProcessStorage();
         if (concurrencyOrConfig && (0, shared_utils_1.isObject)(concurrencyOrConfig)) {
@@ -136,11 +164,13 @@ class PollingJobQueueStrategy extends injectable_job_queue_strategy_1.Injectable
             this.pollInterval = (_b = concurrencyOrConfig.pollInterval) !== null && _b !== void 0 ? _b : 200;
             this.backOffStrategy = (_c = concurrencyOrConfig.backoffStrategy) !== null && _c !== void 0 ? _c : (() => 1000);
             this.setRetries = (_d = concurrencyOrConfig.setRetries) !== null && _d !== void 0 ? _d : ((_, job) => job.retries);
+            this.gracefulShutdownTimeout = (_e = concurrencyOrConfig.gracefulShutdownTimeout) !== null && _e !== void 0 ? _e : 20000;
         }
         else {
             this.concurrency = concurrencyOrConfig !== null && concurrencyOrConfig !== void 0 ? concurrencyOrConfig : 1;
             this.pollInterval = maybePollInterval !== null && maybePollInterval !== void 0 ? maybePollInterval : 200;
             this.setRetries = (_, job) => job.retries;
+            this.gracefulShutdownTimeout = 20000;
         }
     }
     async start(queueName, process) {
@@ -160,7 +190,7 @@ class PollingJobQueueStrategy extends injectable_job_queue_strategy_1.Injectable
         if (!active) {
             return;
         }
-        await active.stop();
+        await active.stop(this.gracefulShutdownTimeout);
     }
     async cancelJob(jobId) {
         const job = await this.findOne(jobId);

package/dist/job-queue/polling-job-queue-strategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"polling-job-queue-strategy.js","sourceRoot":"","sources":["../../src/job-queue/polling-job-queue-strategy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"polling-job-queue-strategy.js","sourceRoot":"","sources":["../../src/job-queue/polling-job-queue-strategy.ts"],"names":[],"mappings":"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"}

package/dist/plugin/default-job-queue-plugin/default-job-queue-plugin.d.ts

@@ -67,6 +67,18 @@ export interface DefaultJobQueueOptions {
      * @since 1.3.0
      */
     useDatabaseForBuffer?: boolean;
+    /**
+     * @description
+     * The timeout in ms which the queue will use when attempting a graceful shutdown.
+     * That means when the server is shut down but a job is running, the job queue will
+     * wait for the job to complete before allowing the server to shut down. If the job
+     * does not complete within this timeout window, the job will be forced to stop
+     * and the server will shut down anyway.
+     *
+     * @since 2.2.0
+     * @default 20_000
+     */
+    gracefulShutdownTimeout?: number;
 }
 /**
  * @description

package/dist/plugin/default-job-queue-plugin/default-job-queue-plugin.js

@@ -120,12 +120,13 @@ DefaultJobQueuePlugin = DefaultJobQueuePlugin_1 = __decorate([
             : [job_record_entity_1.JobRecord],
         configuration: config => {
             var _a;
-            const { pollInterval, concurrency, backoffStrategy, setRetries } = (_a = DefaultJobQueuePlugin_1.options) !== null && _a !== void 0 ? _a : {};
+            const { pollInterval, concurrency, backoffStrategy, setRetries, gracefulShutdownTimeout } = (_a = DefaultJobQueuePlugin_1.options) !== null && _a !== void 0 ? _a : {};
             config.jobQueueOptions.jobQueueStrategy = new sql_job_queue_strategy_1.SqlJobQueueStrategy({
                 concurrency,
                 pollInterval,
                 backoffStrategy,
                 setRetries,
+                gracefulShutdownTimeout,
             });
             if (DefaultJobQueuePlugin_1.options.useDatabaseForBuffer === true) {
                 config.jobQueueOptions.jobBufferStorageStrategy = new sql_job_buffer_storage_strategy_1.SqlJobBufferStorageStrategy();

package/dist/plugin/default-job-queue-plugin/default-job-queue-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"default-job-queue-plugin.js","sourceRoot":"","sources":["../../../src/plugin/default-job-queue-plugin/default-job-queue-plugin.ts"],"names":[],"mappings":";;;;;;;;;;AAIA,kEAA6D;AAC7D,sDAAkD;AAElD,yEAA6D;AAC7D,2DAAgD;AAChD,uFAAgF;AAChF,qEAA+D;AAsE/D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyFG;AAuBI,IAAM,qBAAqB,6BAA3B,MAAM,qBAAqB;IAI9B,MAAM,CAAC,IAAI,CAAC,OAA+B;QACvC,uBAAqB,CAAC,OAAO,GAAG,OAAO,CAAC;QACxC,OAAO,uBAAqB,CAAC;IACjC,CAAC;;AAND,gBAAgB;AACT,6BAAO,GAA2B,EAAE,CAAC;AAFnC,qBAAqB;IAtBjC,IAAA,8BAAa,EAAC;QACX,OAAO,EAAE,CAAC,yCAAkB,CAAC;QAC7B,QAAQ,EAAE,GAAG,EAAE,CACX,uBAAqB,CAAC,OAAO,CAAC,oBAAoB,KAAK,IAAI;YACvD,CAAC,CAAC,CAAC,6BAAS,EAAE,0CAAe,CAAC;YAC9B,CAAC,CAAC,CAAC,6BAAS,CAAC;QACrB,aAAa,EAAE,MAAM,CAAC,EAAE;;YACpB,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,EAAE,GAC5D,MAAA,uBAAqB,CAAC,OAAO,mCAAI,EAAE,CAAC;YACxC,MAAM,CAAC,eAAe,CAAC,gBAAgB,GAAG,IAAI,4CAAmB,CAAC;gBAC9D,WAAW;gBACX,YAAY;gBACZ,eAAe;gBACf,UAAU;aACb,CAAC,CAAC;YACH,IAAI,uBAAqB,CAAC,OAAO,CAAC,oBAAoB,KAAK,IAAI,EAAE;gBAC7D,MAAM,CAAC,eAAe,CAAC,wBAAwB,GAAG,IAAI,6DAA2B,EAAE,CAAC;aACvF;YACD,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,aAAa,EAAE,QAAQ;KAC1B,CAAC;GACW,qBAAqB,CAQjC;AARY,sDAAqB"}
+{"version":3,"file":"default-job-queue-plugin.js","sourceRoot":"","sources":["../../../src/plugin/default-job-queue-plugin/default-job-queue-plugin.ts"],"names":[],"mappings":";;;;;;;;;;AAIA,kEAA6D;AAC7D,sDAAkD;AAElD,yEAA6D;AAC7D,2DAAgD;AAChD,uFAAgF;AAChF,qEAA+D;AAkF/D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyFG;AAwBI,IAAM,qBAAqB,6BAA3B,MAAM,qBAAqB;IAI9B,MAAM,CAAC,IAAI,CAAC,OAA+B;QACvC,uBAAqB,CAAC,OAAO,GAAG,OAAO,CAAC;QACxC,OAAO,uBAAqB,CAAC;IACjC,CAAC;;AAND,gBAAgB;AACT,6BAAO,GAA2B,EAAE,CAAC;AAFnC,qBAAqB;IAvBjC,IAAA,8BAAa,EAAC;QACX,OAAO,EAAE,CAAC,yCAAkB,CAAC;QAC7B,QAAQ,EAAE,GAAG,EAAE,CACX,uBAAqB,CAAC,OAAO,CAAC,oBAAoB,KAAK,IAAI;YACvD,CAAC,CAAC,CAAC,6BAAS,EAAE,0CAAe,CAAC;YAC9B,CAAC,CAAC,CAAC,6BAAS,CAAC;QACrB,aAAa,EAAE,MAAM,CAAC,EAAE;;YACpB,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,EAAE,uBAAuB,EAAE,GACrF,MAAA,uBAAqB,CAAC,OAAO,mCAAI,EAAE,CAAC;YACxC,MAAM,CAAC,eAAe,CAAC,gBAAgB,GAAG,IAAI,4CAAmB,CAAC;gBAC9D,WAAW;gBACX,YAAY;gBACZ,eAAe;gBACf,UAAU;gBACV,uBAAuB;aAC1B,CAAC,CAAC;YACH,IAAI,uBAAqB,CAAC,OAAO,CAAC,oBAAoB,KAAK,IAAI,EAAE;gBAC7D,MAAM,CAAC,eAAe,CAAC,wBAAwB,GAAG,IAAI,6DAA2B,EAAE,CAAC;aACvF;YACD,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,aAAa,EAAE,QAAQ;KAC1B,CAAC;GACW,qBAAqB,CAQjC;AARY,sDAAqB"}

package/dist/plugin/default-search-plugin/indexer/indexer.controller.d.ts

@@ -2,9 +2,10 @@ import { Observable } from 'rxjs';
 import { RequestContextCacheService } from '../../../cache/request-context-cache.service';
 import { ConfigService } from '../../../config/config.service';
 import { TransactionalConnection } from '../../../connection/transactional-connection';
+import { Job } from '../../../job-queue/index';
 import { ProductPriceApplicator } from '../../../service/helpers/product-price-applicator/product-price-applicator';
 import { ProductVariantService } from '../../../service/services/product-variant.service';
-import { DefaultSearchPluginInitOptions, ProductChannelMessageData, ReindexMessageData, ReindexMessageResponse, UpdateAssetMessageData, UpdateProductMessageData, UpdateVariantMessageData, UpdateVariantsByIdMessageData, VariantChannelMessageData } from '../types';
+import { DefaultSearchPluginInitOptions, ProductChannelMessageData, ReindexMessageResponse, UpdateAssetMessageData, UpdateIndexQueueJobData, UpdateProductMessageData, UpdateVariantMessageData, UpdateVariantsByIdJobData, VariantChannelMessageData } from '../types';
 export declare const BATCH_SIZE = 1000;
 export declare const productRelations: string[];
 export declare const variantRelations: string[];
@@ -18,8 +19,8 @@ export declare class IndexerController {
     private options;
     private queue;
     constructor(connection: TransactionalConnection, productPriceApplicator: ProductPriceApplicator, configService: ConfigService, requestContextCache: RequestContextCacheService, productVariantService: ProductVariantService, options: DefaultSearchPluginInitOptions);
-    reindex({ ctx: rawContext }: ReindexMessageData): Observable<ReindexMessageResponse>;
-    updateVariantsById({ ctx: rawContext, ids, }: UpdateVariantsByIdMessageData): Observable<ReindexMessageResponse>;
+    reindex(job: Job<UpdateIndexQueueJobData>): Observable<ReindexMessageResponse>;
+    updateVariantsById(job: Job<UpdateVariantsByIdJobData>): Observable<ReindexMessageResponse>;
     updateProduct(data: UpdateProductMessageData): Promise<boolean>;
     updateVariants(data: UpdateVariantMessageData): Promise<boolean>;
     deleteProduct(data: UpdateProductMessageData): Promise<boolean>;