@vendure/job-queue-plugin 2.0.0-next.1 → 2.0.0-next.10

package/package/bullmq/plugin.d.ts

@@ -1,5 +1,3 @@
-import { HealthCheckRegistryService } from '@vendure/core';
-import { RedisHealthIndicator } from './redis-health-indicator';
 import { BullMQPluginOptions } from './types';
 /**
  * @description
@@ -92,13 +90,10 @@ import { BullMQPluginOptions } from './types';
  * @docsCategory job-queue-plugin
  */
 export declare class BullMQJobQueuePlugin {
-    private registry;
-    private redis;
     static options: BullMQPluginOptions;
     /**
      * @description
      * Configures the plugin.
      */
     static init(options: BullMQPluginOptions): typeof BullMQJobQueuePlugin;
-    constructor(registry: HealthCheckRegistryService, redis: RedisHealthIndicator);
 }

package/package/bullmq/plugin.js

@@ -5,15 +5,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var BullMQJobQueuePlugin_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BullMQJobQueuePlugin = void 0;
 const core_1 = require("@vendure/core");
 const bullmq_job_queue_strategy_1 = require("./bullmq-job-queue-strategy");
 const constants_1 = require("./constants");
+const redis_health_check_strategy_1 = require("./redis-health-check-strategy");
 const redis_health_indicator_1 = require("./redis-health-indicator");
 const redis_job_buffer_storage_strategy_1 = require("./redis-job-buffer-storage-strategy");
 /**
@@ -107,11 +105,6 @@ const redis_job_buffer_storage_strategy_1 = require("./redis-job-buffer-storage-
  * @docsCategory job-queue-plugin
  */
 let BullMQJobQueuePlugin = BullMQJobQueuePlugin_1 = class BullMQJobQueuePlugin {
-    constructor(registry, redis) {
-        this.registry = registry;
-        this.redis = redis;
-        registry.registerIndicatorFunction(() => this.redis.isHealthy('redis (job queue)'));
-    }
     /**
      * @description
      * Configures the plugin.
@@ -127,14 +120,14 @@ BullMQJobQueuePlugin = BullMQJobQueuePlugin_1 = __decorate([
         configuration: config => {
             config.jobQueueOptions.jobQueueStrategy = new bullmq_job_queue_strategy_1.BullMQJobQueueStrategy();
             config.jobQueueOptions.jobBufferStorageStrategy = new redis_job_buffer_storage_strategy_1.RedisJobBufferStorageStrategy();
+            config.systemOptions.healthChecks.push(new redis_health_check_strategy_1.RedisHealthCheckStrategy());
             return config;
         },
         providers: [
             { provide: constants_1.BULLMQ_PLUGIN_OPTIONS, useFactory: () => BullMQJobQueuePlugin_1.options },
             redis_health_indicator_1.RedisHealthIndicator,
         ],
-    }),
-    __metadata("design:paramtypes", [core_1.HealthCheckRegistryService, redis_health_indicator_1.RedisHealthIndicator])
+    })
 ], BullMQJobQueuePlugin);
 exports.BullMQJobQueuePlugin = BullMQJobQueuePlugin;
 //# sourceMappingURL=plugin.js.map

package/package/bullmq/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/bullmq/plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,wCAA8F;AAE9F,2EAAqE;AACrE,2CAAoD;AACpD,qEAAgE;AAChE,2FAAoF;AAGpF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyFG;AAaH,IAAa,oBAAoB,4BAAjC,MAAa,oBAAoB;IAY7B,YAAoB,QAAoC,EAAU,KAA2B;QAAzE,aAAQ,GAAR,QAAQ,CAA4B;QAAU,UAAK,GAAL,KAAK,CAAsB;QACzF,QAAQ,CAAC,yBAAyB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC,CAAC;IACxF,CAAC;IAXD;;;OAGG;IACH,MAAM,CAAC,IAAI,CAAC,OAA4B;QACpC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;CAKJ,CAAA;AAfY,oBAAoB;IAZhC,IAAA,oBAAa,EAAC;QACX,OAAO,EAAE,CAAC,yBAAkB,CAAC;QAC7B,aAAa,EAAE,MAAM,CAAC,EAAE;YACpB,MAAM,CAAC,eAAe,CAAC,gBAAgB,GAAG,IAAI,kDAAsB,EAAE,CAAC;YACvE,MAAM,CAAC,eAAe,CAAC,wBAAwB,GAAG,IAAI,iEAA6B,EAAE,CAAC;YACtF,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,SAAS,EAAE;YACP,EAAE,OAAO,EAAE,iCAAqB,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,sBAAoB,CAAC,OAAO,EAAE;YAClF,6CAAoB;SACvB;KACJ,CAAC;qCAagC,iCAA0B,EAAiB,6CAAoB;GAZpF,oBAAoB,CAehC;AAfY,oDAAoB"}
+{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/bullmq/plugin.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,wCAAkE;AAElE,2EAAqE;AACrE,2CAAoD;AACpD,+EAAyE;AACzE,qEAAgE;AAChE,2FAAoF;AAGpF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyFG;AAcH,IAAa,oBAAoB,4BAAjC,MAAa,oBAAoB;IAG7B;;;OAGG;IACH,MAAM,CAAC,IAAI,CAAC,OAA4B;QACpC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ,CAAA;AAXY,oBAAoB;IAbhC,IAAA,oBAAa,EAAC;QACX,OAAO,EAAE,CAAC,yBAAkB,CAAC;QAC7B,aAAa,EAAE,MAAM,CAAC,EAAE;YACpB,MAAM,CAAC,eAAe,CAAC,gBAAgB,GAAG,IAAI,kDAAsB,EAAE,CAAC;YACvE,MAAM,CAAC,eAAe,CAAC,wBAAwB,GAAG,IAAI,iEAA6B,EAAE,CAAC;YACtF,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,sDAAwB,EAAE,CAAC,CAAC;YACvE,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,SAAS,EAAE;YACP,EAAE,OAAO,EAAE,iCAAqB,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,sBAAoB,CAAC,OAAO,EAAE;YAClF,6CAAoB;SACvB;KACJ,CAAC;GACW,oBAAoB,CAWhC;AAXY,oDAAoB"}

package/package/bullmq/redis-health-check-strategy.d.ts

@@ -0,0 +1,6 @@
+import { HealthIndicatorFunction } from '@nestjs/terminus';
+import { HealthCheckStrategy, Injector } from '@vendure/core';
+export declare class RedisHealthCheckStrategy implements HealthCheckStrategy {
+    init(injector: Injector): void;
+    getHealthIndicator(): HealthIndicatorFunction;
+}

package/package/bullmq/redis-health-check-strategy.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RedisHealthCheckStrategy = void 0;
+const redis_health_indicator_1 = require("./redis-health-indicator");
+let indicator;
+class RedisHealthCheckStrategy {
+    init(injector) {
+        indicator = injector.get(redis_health_indicator_1.RedisHealthIndicator);
+    }
+    getHealthIndicator() {
+        return () => indicator.isHealthy('redis (job queue)');
+    }
+}
+exports.RedisHealthCheckStrategy = RedisHealthCheckStrategy;
+//# sourceMappingURL=redis-health-check-strategy.js.map

package/package/bullmq/redis-health-check-strategy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"redis-health-check-strategy.js","sourceRoot":"","sources":["../../src/bullmq/redis-health-check-strategy.ts"],"names":[],"mappings":";;;AAGA,qEAAgE;AAEhE,IAAI,SAA+B,CAAC;AAEpC,MAAa,wBAAwB;IACjC,IAAI,CAAC,QAAkB;QACnB,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,6CAAoB,CAAC,CAAC;IACnD,CAAC;IACD,kBAAkB;QACd,OAAO,GAAG,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC;IAC1D,CAAC;CACJ;AAPD,4DAOC"}

package/package/bullmq/redis-health-indicator.js

@@ -62,7 +62,7 @@ let RedisHealthIndicator = class RedisHealthIndicator extends terminus_1.HealthI
             core_1.Logger.error(`Redis health check error closing connection: ${e.message}`, constants_1.loggerCtx, e.stack);
         }
         const result = this.getStatus(key, pingResult === 'PONG');
-        if (pingResult) {
+        if (pingResult === 'PONG') {
             return result;
         }
         throw new terminus_1.HealthCheckError('Redis failed', result);

package/package/bullmq/redis-health-indicator.js.map

@@ -1 +1 @@
-{"version":3,"file":"redis-health-indicator.js","sourceRoot":"","sources":["../../src/bullmq/redis-health-indicator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,+CAA4F;AAC5F,wCAAuC;AACvC,mCAAyC;AAGzC,2CAA+D;AAI/D,IAAa,oBAAoB,GAAjC,MAAa,oBAAqB,SAAQ,0BAAe;IAErD,YAAmD,OAA4B;QAC3E,KAAK,EAAE,CAAC;QADuC,YAAO,GAAP,OAAO,CAAqB;IAE/E,CAAC;IACD,KAAK,CAAC,SAAS,CAAC,GAAW,EAAE,SAAS,GAAG,IAAI;QACzC,MAAM,UAAU,GAAG,IAAI,wBAAe,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAChE,MAAM,UAAU,GAAG,MAAM,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3D,IAAI;gBACA,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;oBACzB,aAAM,CAAC,KAAK,CAAC,6BAA6B,GAAG,CAAC,OAAO,EAAE,EAAE,qBAAS,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;oBAC/E,OAAO,CAAC,GAAG,CAAC,CAAC;gBACjB,CAAC,CAAC,CAAC;gBACH,IAAI,IAAI,CAAC,YAAY,EAAE;oBACnB,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;iBACnC;gBACD,MAAM,OAAO,GAAG,IAAI,OAAO,CACvB,QAAQ,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,GAAG,UAAU,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CACpE,CAAC;gBACF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;gBAChE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAChC,IAAI,CAAC,MAAM,EAAE;oBACT,OAAO,CAAC,SAAS,CAAC,CAAC;oBACnB,OAAO;iBACV;gBACD,MAAM,CAAC,IAAI,CAAC,CAAC,GAAQ,EAAE,GAAQ,EAAE,EAAE;oBAC/B,IAAI,GAAG,EAAE;wBACL,OAAO,CAAC,GAAG,CAAC,CAAC;qBAChB;yBAAM;wBACH,OAAO,CAAC,GAAG,CAAC,CAAC;qBAChB;gBACL,CAAC,CAAC,CAAC;aACN;YAAC,OAAO,CAAM,EAAE;gBACb,OAAO,CAAC,CAAC,CAAC,CAAC;aACd;QACL,CAAC,CAAC,CAAC;QAEH,IAAI;YACA,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;YACzB,iCAAiC;SACpC;QAAC,OAAO,CAAM,EAAE;YACb,aAAM,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC,OAAO,EAAE,EAAE,qBAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;SACjG;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,UAAU,KAAK,MAAM,CAAC,CAAC;QAE1D,IAAI,UAAU,EAAE;YACZ,OAAO,MAAM,CAAC;SACjB;QACD,MAAM,IAAI,2BAAgB,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IACvD,CAAC;CACJ,CAAA;AAnDY,oBAAoB;IADhC,IAAA,mBAAU,GAAE;IAGI,WAAA,IAAA,eAAM,EAAC,iCAAqB,CAAC,CAAA;;GAFjC,oBAAoB,CAmDhC;AAnDY,oDAAoB"}
+{"version":3,"file":"redis-health-indicator.js","sourceRoot":"","sources":["../../src/bullmq/redis-health-indicator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,+CAA4F;AAC5F,wCAAuC;AACvC,mCAAyC;AAGzC,2CAA+D;AAI/D,IAAa,oBAAoB,GAAjC,MAAa,oBAAqB,SAAQ,0BAAe;IAErD,YAAmD,OAA4B;QAC3E,KAAK,EAAE,CAAC;QADuC,YAAO,GAAP,OAAO,CAAqB;IAE/E,CAAC;IACD,KAAK,CAAC,SAAS,CAAC,GAAW,EAAE,SAAS,GAAG,IAAI;QACzC,MAAM,UAAU,GAAG,IAAI,wBAAe,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAChE,MAAM,UAAU,GAAG,MAAM,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3D,IAAI;gBACA,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;oBACzB,aAAM,CAAC,KAAK,CAAC,6BAA6B,GAAG,CAAC,OAAO,EAAE,EAAE,qBAAS,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;oBAC/E,OAAO,CAAC,GAAG,CAAC,CAAC;gBACjB,CAAC,CAAC,CAAC;gBACH,IAAI,IAAI,CAAC,YAAY,EAAE;oBACnB,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;iBACnC;gBACD,MAAM,OAAO,GAAG,IAAI,OAAO,CACvB,QAAQ,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,GAAG,UAAU,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CACpE,CAAC;gBACF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;gBAChE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAChC,IAAI,CAAC,MAAM,EAAE;oBACT,OAAO,CAAC,SAAS,CAAC,CAAC;oBACnB,OAAO;iBACV;gBACD,MAAM,CAAC,IAAI,CAAC,CAAC,GAAQ,EAAE,GAAQ,EAAE,EAAE;oBAC/B,IAAI,GAAG,EAAE;wBACL,OAAO,CAAC,GAAG,CAAC,CAAC;qBAChB;yBAAM;wBACH,OAAO,CAAC,GAAG,CAAC,CAAC;qBAChB;gBACL,CAAC,CAAC,CAAC;aACN;YAAC,OAAO,CAAM,EAAE;gBACb,OAAO,CAAC,CAAC,CAAC,CAAC;aACd;QACL,CAAC,CAAC,CAAC;QAEH,IAAI;YACA,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;YACzB,iCAAiC;SACpC;QAAC,OAAO,CAAM,EAAE;YACb,aAAM,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC,OAAO,EAAE,EAAE,qBAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;SACjG;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,UAAU,KAAK,MAAM,CAAC,CAAC;QAE1D,IAAI,UAAU,KAAK,MAAM,EAAE;YACvB,OAAO,MAAM,CAAC;SACjB;QACD,MAAM,IAAI,2BAAgB,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IACvD,CAAC;CACJ,CAAA;AAnDY,oBAAoB;IADhC,IAAA,mBAAU,GAAE;IAGI,WAAA,IAAA,eAAM,EAAC,iCAAqB,CAAC,CAAA;;GAFjC,oBAAoB,CAmDhC;AAnDY,oDAAoB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vendure/job-queue-plugin",
-  "version": "2.0.0-next.1",
+  "version": "2.0.0-next.10",
   "license": "MIT",
   "main": "package/index.js",
   "types": "package/index.d.ts",
@@ -24,11 +24,12 @@
   "devDependencies": {
     "@google-cloud/pubsub": "^2.8.0",
     "@types/ioredis": "^4.28.8",
-    "@vendure/common": "^2.0.0-next.1",
-    "@vendure/core": "^2.0.0-next.1",
+    "@vendure/common": "^2.0.0-next.10",
+    "@vendure/core": "^2.0.0-next.10",
     "bullmq": "^1.74.3",
+    "redis": "^3.0.2",
     "rimraf": "^3.0.2",
     "typescript": "4.5.5"
   },
-  "gitHead": "b4c89c2f48b93b2e1ae6ebf43ba5cc12cb7f4588"
+  "gitHead": "73604e37177100cbf756112f7448aafba8f413d8"
 }