npm - @vendure/core - Versions diffs - 2.2.0-next.0 → 2.2.0-next.2 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (138) hide show

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

@@ -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 CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"polling-job-queue-strategy.js","sourceRoot":"","sources":["../../src/job-queue/polling-job-queue-strategy.ts"],"names":[],"mappings":";;;AAAA,yEAA+D;AAE/D,mEAA4D;AAC5D,+~~BAAmE~~;~~AACnE~~,8CAAuE;AAEvE,oEAAyD;AAEzD,mFAA6E;AAC7E,+BAA4B;AAC5B,6EAAuE;~~AA6CvE~~,MAAM,WAAW,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;AAE1C,MAAM,WAAW;IAUb,YACqB,SAAiB,EACjB,OAAyC,EACzC,gBAAyC;QAFzC,cAAS,GAAT,SAAS,CAAQ;QACjB,YAAO,GAAP,OAAO,CAAkC;QACzC,qBAAgB,GAAhB,gBAAgB,CAAyB;QAXtD,YAAO,GAAG,KAAK,CAAC;QAChB,eAAU,GAAqB,EAAE,CAAC;QAElC,mBAAc,GAAG,IAAI,cAAO,EAAoB,CAAC;QACjD,kBAAa,GAAG,IAAI,cAAO,EAAsB,CAAC;QAStD,IAAI,CAAC,YAAY,~~GAAG~~,IAAI,CAAC,~~cAAc~~,CAAC,~~IAAI~~,~~CAAC~~,~~IAAA~~,~~wBAAY~~,~~EAAC~~,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,~~OAAO~~,~~EAAE~~,~~KAAK~~,CAAC,~~EAAE~~,~~EAAE~~;~~YAC5F~~,~~uBAAM,~~CAAC,KAAK~~,CAAC,OAAO,CAAC,CAAC~~;~~YACtB~~,uBAAM,CAAC,KAAK,CAAC,~~KAAK~~,~~CAAC~~,CAAC~~;QACxB~~,~~CAAC~~,CAAC,CAAC;~~QACH~~,IAAI,CAAC,YAAY~~;YACb~~,~~OAAO~~,IAAI,CAAC,~~gBAAgB~~,CAAC,~~YAAY~~,~~KAAK~~,~~UAAU;gBACpD~~,~~CAAC~~,~~CAAC~~,IAAI,CAAC,~~gBAAgB,~~CAAC,~~YAAY,~~CAAC,SAAS,CAAC~~;gBAC/C~~,CAAC,CAAC,~~IAAI~~,CAAC,~~gBAAgB~~,CAAC,~~YAAY~~,CAAC~~;IACjD~~,CAAC~~;IAED~~,~~KAAK~~;~~QACD~~,uBAAM,CAAC,KAAK,CAAC,~~sBAAsB~~,~~IAAI~~,CAAC,~~SAAS~~,~~GAAG,~~CAAC,CAAC;~~QACtD~~,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,MAAM,WAAW,GAAG,KAAK,IAAI,EAAE;YAC3B,IAAI;gBACA,MAAM,gBAAgB,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;gBAChD,KAAK,IAAI,CAAC,GAAG,gBAAgB,EAAE,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC,EAAE,EAAE;oBACvE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBACjE,IAAI,OAAO,EAAE;wBACT,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;wBAC9B,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;wBAC5C,MAAM,UAAU,GAAG,CAAC,GAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;wBACnE,OAAO,CAAC,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;wBACnC,MAAM,~~mBAAmB~~,GAAG,IAAA,eAAQ,EAAC,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC,~~CAAC,~~IAAI;~~wBAC5D~~,oEAAoE;wBACpE,IAAA,qBAAS,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,EAAG,CAAC,CAAC,EAC3D,IAAA,kBAAM,EAAC,GAAG,CAAC,EAAE,CAAC,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK,MAAK,0BAAQ,CAAC,SAAS,CAAC,EAChD,IAAA,gBAAI,EAAC,CAAC,CAAC,CACV,CAAC;~~wBACF~~,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAA,gBAAI,EAAC,CAAC,CAAC,CAAC,CAAC;wBAErD,IAAA,WAAI,EAAC,IAAA,WAAI,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,~~mBAAmB,EAAE,~~WAAW,CAAC;~~6BAC9D~~,SAAS,EAAE;6BACX,IAAI,CACD,MAAM,CAAC,EAAE;4BACL,IAAI,MAAM,KAAK,WAAW,EAAE;gCACxB,OAAO,CAAC,KAAK,EAAE,CAAC;6BACnB;iCAAM,IAAI,MAAM,YAAY,SAAG,IAAI,MAAM,CAAC,KAAK,KAAK,0BAAQ,CAAC,SAAS,EAAE;gCACrE,OAAO,CAAC,MAAM,EAAE,CAAC;6BACpB;iCAAM;gCACH,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;6BAC5B;wBACL,CAAC,EACD,GAAG,CAAC,EAAE;4BACF,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;wBACtB,CAAC,CACJ;6BACA,OAAO,CAAC,GAAG,EAAE;4BACV,~~IAAI~~,~~CAAC~~,IAAI,~~CAAC,~~OAAO,~~IAAI,OAAO,~~CAAC,~~KAAK~~,~~KAAK,0BAAQ,~~CAAC,~~OAAO~~,EAAE~~;gCACrD~~,~~OAAO;6BACV;4BACD~~,~~OAAO~~,CAAC,~~GAAG~~,CAAC,~~UAAU~~,EAAE,~~UAAU,~~CAAC~~,CAAC~~;~~4BACpC~~,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;wBAC1C,CAAC,CAAC;6BACD,KAAK,CAAC,CAAC,GAAQ,EAAE,EAAE;4BAChB,uBAAM,CAAC,IAAI,CAAC,4BAA4B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;wBACnE,CAAC,CAAC,CAAC;qBACV;iBACJ;aACJ;YAAC,OAAO,CAAM,EAAE;gBACb,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;oBACrB,cACI,IAAI,CAAC,SACT,8DAA8D,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE;oBACzF,CAAC,CAAC,KAAK;iBACV,CAAC,CAAC;aACN;YACD,IAAI,IAAI,CAAC,OAAO,EAAE;gBACd,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;aAC3D;QACL,CAAC,CAAC;QAEF,KAAK,WAAW,EAAE,CAAC;IACvB,CAAC;IAED,IAAI;~~QACA~~,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,IAAI,CAAC,~~aAAa~~,CAAC,IAAI,CAAC,~~WAAW~~,CAAC,CAAC;~~QACrC~~,~~YAAY~~,CAAC,IAAI,CAAC,~~KAAK~~,CAAC,CAAC;~~QAEzB~~,~~MAAM~~,~~KAAK~~,~~GAAG~~,CAAC,~~IAAI~~,IAAI,EAAE,CAAC;~~QAC1B~~,~~uDAAuD~~;~~QACvD~~,MAAM,~~UAAU~~,GAAG,IAAI,CAAC;~~QACxB~~,IAAI,~~SAAc~~,CAAC;~~QACnB~~,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YACzB,~~MAAM~~,~~cAAc~~,GAAG,~~KAAK~~,IAAI,EAAE;~~gBAC9B~~,MAAM,~~QAAQ~~,GAAG,CAAC,IAAI,IAAI,EAAE,GAAG,KAAK,GAAG,~~UAAU~~,CAAC;~~gBAClD~~,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,EAAE;~~oBAC1C~~,~~YAAY~~,CAAC,SAAS,CAAC,CAAC;~~oBACxB~~,OAAO,EAAE,CAAC;~~iBACb~~;~~qBAAM~~;~~oBACH~~,SAAS,GAAG,UAAU,CAAC,cAAc,EAAE,~~EAAE~~,CAAC,CAAC;~~iBAC9C;YACL~~,CAAC,CAAC;YACF,KAAK,cAAc,EAAE,CAAC;QAC1B,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,GAAc;QACzC,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACxC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC;IAEO,mBAAmB,CAAC,GAAc;QACtC,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3C,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;~~IACrC~~,CAAC;CACJ;AAED;;;;;;;;;GASG;AACH,MAAsB,uBAAwB,SAAQ,0DAA0B;~~IAU5E~~,YAAY,mBAA4D,EAAE,iBAA0B;;QAChG,KAAK,EAAE,CAAC;~~QALJ~~,iBAAY,GAAG,IAAI,oDAAuB,EAAoB,CAAC;~~QAOnE~~,IAAI,mBAAmB,IAAI,IAAA,uBAAQ,EAAC,mBAAmB,CAAC,EAAE;YACtD,IAAI,CAAC,WAAW,GAAG,MAAA,mBAAmB,CAAC,WAAW,mCAAI,CAAC,CAAC;YACxD,IAAI,CAAC,YAAY,GAAG,MAAA,mBAAmB,CAAC,YAAY,mCAAI,GAAG,CAAC;YAC5D,IAAI,CAAC,eAAe,GAAG,MAAA,mBAAmB,CAAC,eAAe,mCAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;YAC3E,IAAI,CAAC,UAAU,GAAG,MAAA,mBAAmB,CAAC,UAAU,mCAAI,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;~~SACjF~~;aAAM;YACH,IAAI,CAAC,WAAW,GAAG,mBAAmB,aAAnB,mBAAmB,cAAnB,mBAAmB,GAAI,CAAC,CAAC;YAC5C,IAAI,CAAC,YAAY,GAAG,iBAAiB,aAAjB,iBAAiB,cAAjB,iBAAiB,GAAI,GAAG,CAAC;YAC7C,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC;~~SAC7C~~;IACL,CAAC;IAED,KAAK,CAAC,KAAK,CACP,SAAiB,EACjB,OAAyC;QAEzC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACtB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YACrC,OAAO;SACV;QACD,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE;YAC3C,OAAO;SACV;QACD,MAAM,MAAM,GAAG,IAAI,WAAW,CAAO,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAC/D,MAAM,CAAC,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,IAAI,CACN,SAAiB,EACjB,OAAyC;QAEzC,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAClE,IAAI,CAAC,MAAM,EAAE;YACT,OAAO;SACV;QACD,MAAM,MAAM,CAAC,IAAI,~~EAAE~~,CAAC;~~IACxB~~,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,KAAS;QACrB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACtC,IAAI,GAAG,EAAE;YACL,GAAG,CAAC,MAAM,EAAE,CAAC;YACb,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACvB,OAAO,GAAG,CAAC;SACd;IACL,CAAC;CAqBJ;~~AAhFD~~,~~0DAgFC~~"}
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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"}

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

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

	@@ -1 +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"}
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;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 CHANGED Viewed

@@ -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>;

package/dist/plugin/default-search-plugin/indexer/indexer.controller.js CHANGED Viewed

@@ -14,6 +14,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IndexerController = exports.workerLoggerCtx = exports.variantRelations = exports.productRelations = exports.BATCH_SIZE = void 0;
 const common_1 = require("@nestjs/common");
+const generated_types_1 = require("@vendure/common/lib/generated-types");
 const unique_1 = require("@vendure/common/lib/unique");
 const typeorm_1 = require("typeorm");
 const request_context_cache_service_1 = require("../../../cache/request-context-cache.service");
@@ -22,8 +23,8 @@ const utils_1 = require("../../../common/utils");
 const config_service_1 = require("../../../config/config.service");
 const vendure_logger_1 = require("../../../config/logger/vendure-logger");
 const transactional_connection_1 = require("../../../connection/transactional-connection");
-const product_entity_1 = require("../../../entity/product/product.entity");
 const product_variant_entity_1 = require("../../../entity/product-variant/product-variant.entity");
+const product_entity_1 = require("../../../entity/product/product.entity");
 const product_price_applicator_1 = require("../../../service/helpers/product-price-applicator/product-price-applicator");
 const product_variant_service_1 = require("../../../service/services/product-variant.service");
 const constants_1 = require("../constants");
@@ -51,7 +52,8 @@ let IndexerController = class IndexerController {
         this.options = options;
         this.queue = new async_queue_1.AsyncQueue('search-index');
     }
-    reindex({ ctx: rawContext }) {
+    reindex(job) {
+        const { ctx: rawContext } = job.data;
         const ctx = mutable_request_context_1.MutableRequestContext.deserialize(rawContext);
         return (0, utils_1.asyncObservable)(async (observer) => {
             const timeStart = Date.now();
@@ -64,6 +66,9 @@ let IndexerController = class IndexerController {
                 .delete({ languageCode: ctx.languageCode, channelId: ctx.channelId });
             vendure_logger_1.Logger.verbose('Deleted existing index items', exports.workerLoggerCtx);
             for (let i = 0; i < batches; i++) {
+                if (job.state === generated_types_1.JobState.CANCELLED) {
+                    throw new Error('reindex job was cancelled');
+                }
                 vendure_logger_1.Logger.verbose(`Processing batch ${i + 1} of ${batches}`, exports.workerLoggerCtx);
                 const variants = await qb
                     .take(exports.BATCH_SIZE)
@@ -84,7 +89,8 @@ let IndexerController = class IndexerController {
             };
         });
     }
-    updateVariantsById({ ctx: rawContext, ids, }) {
+    updateVariantsById(job) {
+        const { ctx: rawContext, ids } = job.data;
         const ctx = mutable_request_context_1.MutableRequestContext.deserialize(rawContext);
         return (0, utils_1.asyncObservable)(async (observer) => {
             const timeStart = Date.now();
@@ -92,6 +98,9 @@ let IndexerController = class IndexerController {
                 const batches = Math.ceil(ids.length / exports.BATCH_SIZE);
                 vendure_logger_1.Logger.verbose(`Updating ${ids.length} variants...`);
                 for (let i = 0; i < batches; i++) {
+                    if (job.state === generated_types_1.JobState.CANCELLED) {
+                        throw new Error('updateVariantsById job was cancelled');
+                    }
                     const begin = i * exports.BATCH_SIZE;
                     const end = begin + exports.BATCH_SIZE;
                     vendure_logger_1.Logger.verbose(`Updating ids from index ${begin} to ${end}`);

package/dist/plugin/default-search-plugin/indexer/indexer.controller.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"indexer.controller.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/indexer/indexer.controller.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"indexer.controller.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/indexer/indexer.controller.ts"],"names":[],"mappings":"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"}

package/dist/plugin/default-search-plugin/indexer/search-index.service.js CHANGED Viewed

@@ -31,7 +31,7 @@ let SearchIndexService = class SearchIndexService {
                 switch (data.type) {
                     case 'reindex':
                         vendure_logger_1.Logger.verbose('sending ReindexMessage');
-                        return this.jobWithProgress(job, this.indexerController.reindex(data));
+                        return this.jobWithProgress(job, this.indexerController.reindex(job));
                     case 'update-product':
                         return this.indexerController.updateProduct(data);
                     case 'update-variants':
@@ -41,7 +41,7 @@ let SearchIndexService = class SearchIndexService {
                     case 'delete-variant':
                         return this.indexerController.deleteVariant(data);
                     case 'update-variants-by-id':
-                        return this.jobWithProgress(job, this.indexerController.updateVariantsById(data));
+                        return this.jobWithProgress(job, this.indexerController.updateVariantsById(job));
                     case 'update-asset':
                         return this.indexerController.updateAsset(data);
                     case 'delete-asset':

package/dist/plugin/default-search-plugin/indexer/search-index.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"search-index.service.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/indexer/search-index.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAoE;AAEpE,mEAA+D;AAI/D,0EAA+D;AAM/D,4EAAuE;AAGvE,6DAAyD;AAEzD;;GAEG;AAEI,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAG3B,YAAoB,UAA2B,EAAU,iBAAoC;QAAzE,eAAU,GAAV,UAAU,CAAiB;QAAU,sBAAiB,GAAjB,iBAAiB,CAAmB;IAAG,CAAC;IAEjG,KAAK,CAAC,sBAAsB;QACxB,IAAI,CAAC,gBAAgB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;YACtD,IAAI,EAAE,qBAAqB;YAC3B,OAAO,EAAE,GAAG,CAAC,EAAE;gBACX,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;gBACtB,QAAQ,IAAI,CAAC,IAAI,EAAE;oBACf,KAAK,SAAS;wBACV,uBAAM,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC;wBACzC,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,~~IAAI~~,CAAC,CAAC,CAAC;~~oBAC3E~~,KAAK,gBAAgB;wBACjB,OAAO,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;oBACtD,KAAK,iBAAiB;wBAClB,OAAO,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;oBACvD,KAAK,gBAAgB;wBACjB,OAAO,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;oBACtD,KAAK,gBAAgB;wBACjB,OAAO,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;oBACtD,KAAK,uBAAuB;wBACxB,OAAO,IAAI,CAAC,eAAe,~~CAAC~~,GAAG,~~EAAE~~,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,~~IAAI~~,CAAC,~~CAAC~~,CAAC;~~oBACtF~~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~~AA1JY~~,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;qCAIuB,mCAAe,EAA6B,sCAAiB;GAHpF,kBAAkB,~~CA0J9B~~;~~AA1JY~~,gDAAkB"}
1	+ {"version":3,"file":"search-index.service.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/indexer/search-index.service.ts"],"names":[],"mappings":"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"}

package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.js CHANGED Viewed

@@ -69,17 +69,18 @@ class MysqlSearchStrategy {
         this.applyTermAndFilters(ctx, qb, input);
         if (sort) {
             if (sort.name) {
-                qb.addOrderBy(input.groupByProduct ? 'MIN(si.productName)' : 'si.productName', sort.name);
+                qb.addOrderBy('si_productName', sort.name);
             }
             if (sort.price) {
-                qb.addOrderBy(input.groupByProduct ? 'MIN(si.price)' : 'si.price', sort.price);
+                qb.addOrderBy('si_price', sort.price);
             }
         }
-        else {
-            if (input.term && input.term.length > this.minTermLength) {
-                qb.orderBy('score', 'DESC');
-            }
+        else if (input.term && input.term.length > this.minTermLength) {
+            qb.addOrderBy('score', 'DESC');
         }
+        // Required to ensure deterministic sorting.
+        // E.g. in case of sorting products with duplicate name, price or score results.
+        qb.addOrderBy('si_productVariantId', 'ASC');
         if (enabledOnly) {
             qb.andWhere('si.enabled = :enabled', { enabled: true });
         }

package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"mysql-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/mysql-search-strategy.ts"],"names":[],"mappings":";;;AAAA,yEAAoF;AAEpF,qCAAuD;AAIvD,yDAA8D;AAC9D,2FAAuF;AACvF,4CAAmD;AACnD,mFAAuE;AAIvE,qEAA6D;AAC7D,mEAMiC;AAEjC;;GAEG;AACH,MAAa,mBAAmB;IAAhC;QACqB,kBAAa,GAAG,CAAC,CAAC;~~IAwQvC~~,CAAC;~~IApQG~~,KAAK,CAAC,IAAI,CAAC,QAAkB;QACzB,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,kDAAuB,CAAC,CAAC;QACxD,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,+BAAmB,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,KAAkB,EAClB,WAAoB;QAEpB,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU;aAChC,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,CAAC,mBAAmB,EAAE,0BAA0B,CAAC,CAAC;aACzD,SAAS,CAAC,gCAAgC,EAAE,aAAa,CAAC,CAAC;QAEhE,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,aAAa,kCAAO,KAAK,KAAE,cAAc,EAAE,IAAI,IAAG,CAAC;QACjF,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE;YACvB,aAAa,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;SAChD;QACD,IAAI,WAAW,EAAE;YACb,aAAa,CAAC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SACtE;QACD,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE,CAAC;QAC3D,OAAO,IAAA,6CAAqB,EAAC,iBAAiB,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,KAAkB,EAClB,WAAoB;QAEpB,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU;aAChC,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,CAAC,mBAAmB,EAAE,0BAA0B,CAAC,CAAC;aACzD,SAAS,CAAC,gCAAgC,EAAE,aAAa,CAAC,CAAC;QAEhE,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;QACpD,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE;YACvB,aAAa,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;SAChD;QACD,IAAI,WAAW,EAAE;YACb,aAAa,CAAC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SACtE;QACD,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE,CAAC;QAC3D,OAAO,IAAA,kDAA0B,EAAC,iBAAiB,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,KAAkB,EAClB,WAAoB;QAEpB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC;QAC7B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACxB,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU;aACrB,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;QAC5D,IAAI,KAAK,CAAC,cAAc,EAAE;YACtB,EAAE,CAAC,SAAS,CAAC,eAAe,EAAE,UAAU,CAAC;iBACpC,SAAS,CAAC,eAAe,EAAE,UAAU,CAAC;iBACtC,SAAS,CAAC,sBAAsB,EAAE,iBAAiB,CAAC;iBACpD,SAAS,CAAC,sBAAsB,EAAE,iBAAiB,CAAC,CAAC;SAC7D;~~QACD~~,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;~~QACzC~~,IAAI,IAAI,EAAE;YACN,IAAI,IAAI,CAAC,IAAI,EAAE;gBACX,EAAE,CAAC,UAAU,CAAC,~~KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,~~gBAAgB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;~~aAC7F~~;YACD,IAAI,IAAI,CAAC,KAAK,EAAE;gBACZ,EAAE,CAAC,UAAU,CAAC,~~KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,~~UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;~~aAClF~~;SACJ;aAAM~~;YACH~~,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE;~~gBACtD~~,EAAE,CAAC,~~OAAO~~,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;~~aAC/B~~;~~SACJ~~;~~QACD~~,IAAI,WAAW,EAAE;YACb,EAAE,CAAC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SAC3D;QAED,OAAO,EAAE;aACJ,KAAK,CAAC,IAAI,CAAC;aACX,MAAM,CAAC,IAAI,CAAC;aACZ,UAAU,EAAE;aACZ,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,yCAAiB,EAAC,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;IAC1F,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,GAAmB,EAAE,KAAkB,EAAE,WAAoB;QAC7E,MAAM,OAAO,GAAG,IAAI,CAAC,mBAAmB,CACpC,GAAG,EACH,IAAI,CAAC,UAAU;aACV,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,EAC3D,KAAK,CACR,CAAC;QACF,IAAI,WAAW,EAAE;YACb,OAAO,CAAC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SAChE;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa;aAC7C,kBAAkB,EAAE;aACpB,MAAM,CAAC,mBAAmB,CAAC;aAC3B,IAAI,CAAC,IAAI,OAAO,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC;aACxC,aAAa,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;QAC5C,OAAO,YAAY,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC3D,CAAC;IAEO,mBAAmB,CACvB,GAAmB,EACnB,EAAuC,EACvC,KAAkB;QAElB,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,aAAa,EAAE,kBAAkB,EAAE,YAAY,EAAE,cAAc,EAAE,GAC9F,KAAK,CAAC;QAEV,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE;YAC1C,MAAM,QAAQ,GAAG,IAAI;iBAChB,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;iBACjB,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;iBAClB,IAAI,EAAE;iBACN,OAAO,CAAC,YAAY,EAAE,GAAG,CAAC;iBAC1B,IAAI,EAAE,CAAC;YACZ,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU;iBACjC,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;iBACnC,kBAAkB,CAAC,UAAU,CAAC;iBAC9B,MAAM,CAAC,oBAAoB,EAAE,iBAAiB,CAAC;iBAC/C,SAAS,CAAC,2BAA2B,EAAE,wBAAwB,CAAC;iBAChE,SAAS,CAAC,0CAA0C,EAAE,WAAW,CAAC;iBAClE,SAAS,CACN;;;sFAGkE,EAClE,OAAO,CACV;iBACA,KAAK,CACF,IAAI,kBAAQ,CAAC,GAAG,CAAC,EAAE;gBACf,GAAG,CAAC,KAAK,CAAC,8BAA8B,CAAC;qBACpC,OAAO,CAAC,8DAA8D,CAAC;qBACvE,OAAO,CAAC,qEAAqE,CAAC;qBAC9E,OAAO,CAAC,8DAA8D,CAAC,CAAC;YACjF,CAAC,CAAC,CACL;iBACA,QAAQ,CAAC,iCAAiC,CAAC;iBAC3C,aAAa,CAAC;gBACX,IAAI,EAAE,GAAG,QAAQ,GAAG;gBACpB,SAAS,EAAE,IAAI,QAAQ,GAAG;gBAC1B,SAAS,EAAE,GAAG,CAAC,SAAS;aAC3B,CAAC,CAAC;YAEP,EAAE,CAAC,SAAS,CAAC,IAAI,cAAc,CAAC,QAAQ,EAAE,GAAG,EAAE,aAAa,EAAE,gCAAgC,CAAC;iBAC1F,SAAS,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,mBAAmB,EAAE,OAAO,CAAC;iBACzF,QAAQ,CAAC,0DAA0D,CAAC;iBACpE,aAAa,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,CAAC;SACtD;aAAM;YACH,EAAE,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;SAC9B;QACD,IAAI,KAAK,CAAC,OAAO,IAAI,IAAI,EAAE;YACvB,IAAI,KAAK,CAAC,cAAc,EAAE;gBACtB,EAAE,CAAC,QAAQ,CAAC,8BAA8B,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;aAC3E;iBAAM;gBACH,EAAE,CAAC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;aACpE;SACJ;QACD,IAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,EAAE;YACvB,EAAE,CAAC,QAAQ,CACP,IAAI,kBAAQ,CAAC,GAAG,CAAC,EAAE;gBACf,KAAK,MAAM,EAAE,IAAI,aAAa,EAAE;oBAC5B,MAAM,WAAW,GAAG,IAAA,+CAAuB,EAAC,EAAE,CAAC,CAAC;oBAChD,MAAM,MAAM,GAAG,gBAAgB,WAAW,qBAAqB,CAAC;oBAChE,MAAM,MAAM,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,CAAC;oBACrC,IAAI,kBAAkB,KAAK,iCAAe,CAAC,GAAG,EAAE;wBAC5C,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;qBAChC;yBAAM;wBACH,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;qBAC/B;iBACJ;YACL,CAAC,CAAC,CACL,CAAC;SACL;QACD,IAAI,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,EAAE;YAC3B,EAAE,CAAC,QAAQ,CACP,IAAI,kBAAQ,CAAC,GAAG,CAAC,EAAE;gBACf,KAAK,MAAM,gBAAgB,IAAI,iBAAiB,EAAE;oBAC9C,GAAG,CAAC,QAAQ,CACR,IAAI,kBAAQ,CAAC,GAAG,CAAC,EAAE;;wBACf,IAAI,gBAAgB,CAAC,GAAG,KAAI,MAAA,gBAAgB,CAAC,EAAE,0CAAE,MAAM,CAAA,EAAE;4BACrD,MAAM,IAAI,uBAAc,CAAC,sCAAsC,CAAC,CAAC;yBACpE;wBACD,IAAI,gBAAgB,CAAC,GAAG,EAAE;4BACtB,MAAM,WAAW,GAAG,IAAA,+CAAuB,EAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;4BAClE,MAAM,MAAM,GAAG,gBAAgB,WAAW,qBAAqB,CAAC;4BAChE,MAAM,MAAM,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,gBAAgB,CAAC,GAAG,EAAE,CAAC;4BACvD,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;yBAC7B;wBACD,IAAI,MAAA,gBAAgB,CAAC,EAAE,0CAAE,MAAM,EAAE;4BAC7B,KAAK,MAAM,EAAE,IAAI,gBAAgB,CAAC,EAAE,EAAE;gCAClC,MAAM,WAAW,GAAG,IAAA,+CAAuB,EAAC,EAAE,CAAC,CAAC;gCAChD,MAAM,MAAM,GAAG,gBAAgB,WAAW,qBAAqB,CAAC;gCAChE,MAAM,MAAM,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,CAAC;gCACrC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;6BAC/B;yBACJ;oBACL,CAAC,CAAC,CACL,CAAC;iBACL;YACL,CAAC,CAAC,CACL,CAAC;SACL;QACD,IAAI,YAAY,EAAE;YACd,EAAE,CAAC,QAAQ,CAAC,+CAA+C,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;SAClF;QACD,IAAI,cAAc,EAAE;YAChB,EAAE,CAAC,QAAQ,CAAC,mDAAmD,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;SACxF;QAED,EAAE,CAAC,QAAQ,CAAC,2BAA2B,EAAE,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;QACvE,IAAA,gDAAwB,EAAC,EAAE,EAAE,GAAG,CAAC,YAAY,EAAE,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;QAEhF,IAAI,KAAK,CAAC,cAAc,KAAK,IAAI,EAAE;YAC/B,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;YAC3B,EAAE,CAAC,SAAS,CAAC,oBAAoB,EAAE,gBAAgB,CAAC,CAAC;SACxD;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAED;;;;OAIG;IACK,iBAAiB,CAAC,cAAuB;QAC7C,OAAO,IAAA,0CAAiB,EAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC;aAClD,GAAG,CAAC,GAAG,CAAC,EAAE;YACP,MAAM,aAAa,GAAG,MAAM,GAAG,EAAE,CAAC;YAClC,MAAM,KAAK,GAAG,MAAM,GAAG,EAAE,CAAC;YAC1B,IAAI,cAAc,IAAI,GAAG,KAAK,WAAW,EAAE;gBACvC,IACI,GAAG,KAAK,UAAU;oBAClB,GAAG,KAAK,eAAe;oBACvB,GAAG,KAAK,eAAe;oBACvB,GAAG,KAAK,YAAY,EACtB;oBACE,OAAO,gBAAgB,aAAa,SAAS,KAAK,GAAG,CAAC;iBACzD;qBAAM,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,gBAAgB,EAAE;oBAC3E,OAAO,OAAO,aAAa,SAAS,KAAK,GAAG,CAAC;iBAChD;qBAAM;oBACH,OAAO,OAAO,aAAa,SAAS,KAAK,GAAG,CAAC;iBAChD;aACJ;iBAAM;gBACH,OAAO,GAAG,aAAa,QAAQ,KAAK,GAAG,CAAC;aAC3C;QACL,CAAC,CAAC;aACD,IAAI,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;CACJ;~~AAzQD~~,~~kDAyQC~~"}
1	+ {"version":3,"file":"mysql-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/mysql-search-strategy.ts"],"names":[],"mappings":"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"}

package/dist/plugin/default-search-plugin/search-strategy/postgres-search-strategy.js CHANGED Viewed

@@ -75,14 +75,12 @@ class PostgresSearchStrategy {
                 qb.addOrderBy('"si_price"', sort.price);
             }
         }
-        else {
-            if (input.term && input.term.length > this.minTermLength) {
-                qb.addOrderBy('score', 'DESC');
-            }
-            else {
-                qb.addOrderBy('"si_productVariantId"', 'ASC');
-            }
+        else if (input.term && input.term.length > this.minTermLength) {
+            qb.addOrderBy('score', 'DESC');
         }
+        // Required to ensure deterministic sorting.
+        // E.g. in case of sorting products with duplicate name, price or score results.
+        qb.addOrderBy('"si_productVariantId"', 'ASC');
         if (enabledOnly) {
             qb.andWhere('"si"."enabled" = :enabled', { enabled: true });
         }

package/dist/plugin/default-search-plugin/search-strategy/postgres-search-strategy.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"postgres-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/postgres-search-strategy.ts"],"names":[],"mappings":";;;AAAA,yEAAoF;AAEpF,qCAAuD;AAIvD,yDAA8D;AAC9D,2FAAuF;AACvF,4CAAmD;AACnD,mFAAuE;AAIvE,qEAA6D;AAC7D,mEAMiC;AAEjC;;GAEG;AACH,MAAa,sBAAsB;IAAnC;QACqB,kBAAa,GAAG,CAAC,CAAC;~~IAsQvC~~,CAAC;~~IAlQG~~,KAAK,CAAC,IAAI,CAAC,QAAkB;QACzB,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,kDAAuB,CAAC,CAAC;QACxD,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,+BAAmB,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,KAAkB,EAClB,WAAoB;QAEpB,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU;aAChC,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,CAAC,kBAAkB,EAAE,8BAA8B,CAAC,CAAC;aAC5D,SAAS,CAAC,wCAAwC,EAAE,aAAa,CAAC,CAAC;QAExE,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAC1D,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE;YACvB,aAAa,CAAC,OAAO,CAAC,2CAA2C,CAAC,CAAC;SACtE;QACD,IAAI,WAAW,EAAE;YACb,aAAa,CAAC,QAAQ,CAAC,2BAA2B,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SAC1E;QACD,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE,CAAC;QAC3D,OAAO,IAAA,6CAAqB,EAAC,iBAAiB,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,KAAkB,EAClB,WAAoB;QAEpB,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU;aAChC,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,CAAC,kBAAkB,EAAE,8BAA8B,CAAC,CAAC;aAC5D,SAAS,CAAC,wCAAwC,EAAE,aAAa,CAAC,CAAC;QAExE,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAC1D,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE;YACvB,aAAa,CAAC,OAAO,CAAC,2CAA2C,CAAC,CAAC;SACtE;QACD,IAAI,WAAW,EAAE;YACb,aAAa,CAAC,QAAQ,CAAC,2BAA2B,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SAC1E;QACD,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE,CAAC;QAC3D,OAAO,IAAA,kDAA0B,EAAC,iBAAiB,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,KAAkB,EAClB,WAAoB;QAEpB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC;QAC7B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACxB,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU;aACrB,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;QAC/D,IAAI,KAAK,CAAC,cAAc,EAAE;YACtB,EAAE,CAAC,SAAS,CAAC,eAAe,EAAE,UAAU,CAAC;iBACpC,SAAS,CAAC,eAAe,EAAE,UAAU,CAAC;iBACtC,SAAS,CAAC,sBAAsB,EAAE,iBAAiB,CAAC;iBACpD,SAAS,CAAC,sBAAsB,EAAE,iBAAiB,CAAC,CAAC;SAC7D;~~QACD~~,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;QAEzC,IAAI,IAAI,EAAE;YACN,IAAI,IAAI,CAAC,IAAI,EAAE;gBACX,EAAE,CAAC,UAAU,CAAC,kBAAkB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;aAChD;YACD,IAAI,IAAI,CAAC,KAAK,EAAE;gBACZ,EAAE,CAAC,UAAU,CAAC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;aAC3C;SACJ;aAAM~~;YACH~~,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE;~~gBACtD~~,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;~~aAClC~~;~~iBAAM~~;~~gBACH~~,EAAE,CAAC,UAAU,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;~~aACjD;SACJ;QACD~~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~~AAvQD~~,~~wDAuQC~~"}
1	+ {"version":3,"file":"postgres-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/postgres-search-strategy.ts"],"names":[],"mappings":"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"}

package/dist/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.js CHANGED Viewed

@@ -58,13 +58,12 @@ class SqliteSearchStrategy {
         const sort = input.sort;
         const qb = this.connection.getRepository(ctx, search_index_item_entity_1.SearchIndexItem).createQueryBuilder('si');
         if (input.groupByProduct) {
-            qb.addSelect('MIN(si.price)', 'minPrice').addSelect('MAX(si.price)', 'maxPrice');
-            qb.addSelect('MIN(si.priceWithTax)', 'minPriceWithTax').addSelect('MAX(si.priceWithTax)', 'maxPriceWithTax');
+            qb.addSelect('MIN(si.price)', 'minPrice');
+            qb.addSelect('MAX(si.price)', 'maxPrice');
+            qb.addSelect('MIN(si.priceWithTax)', 'minPriceWithTax');
+            qb.addSelect('MAX(si.priceWithTax)', 'maxPriceWithTax');
         }
         this.applyTermAndFilters(ctx, qb, input);
-        if (input.term && input.term.length > this.minTermLength) {
-            qb.orderBy('score', 'DESC');
-        }
         if (sort) {
             if (sort.name) {
                 // TODO: v3 - set the collation on the SearchIndexItem entity
@@ -74,9 +73,12 @@ class SqliteSearchStrategy {
                 qb.addOrderBy('si.price', sort.price);
             }
         }
-        else {
-            qb.addOrderBy('si.productVariantId', 'ASC');
+        else if (input.term && input.term.length > this.minTermLength) {
+            qb.addOrderBy('score', 'DESC');
         }
+        // Required to ensure deterministic sorting.
+        // E.g. in case of sorting products with duplicate name, price or score results.
+        qb.addOrderBy('si.productVariantId', 'ASC');
         if (enabledOnly) {
             qb.andWhere('si.enabled = :enabled', { enabled: true });
         }