podverse-mq 5.1.6-alpha.3 → 5.1.6-alpha.5

package/dist/functions/mq/rss/runParser.d.ts

@@ -1,3 +1,4 @@
 import { MQQueueName, ActiveMQArtemisService } from "@queue/services/activeMQArtemis";
 export declare const mqRSSRunParser: (activeMQArtemisService: ActiveMQArtemisService, queueName: MQQueueName) => Promise<void>;
+export declare const getIsProcessing: () => boolean;
 //# sourceMappingURL=runParser.d.ts.map

package/dist/functions/mq/rss/runParser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runParser.d.ts","sourceRoot":"","sources":["../../../../src/functions/mq/rss/runParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAEtF,eAAO,MAAM,cAAc,GACzB,wBAAwB,sBAAsB,EAC9C,WAAW,WAAW,kBAwBvB,CAAC"}
+{"version":3,"file":"runParser.d.ts","sourceRoot":"","sources":["../../../../src/functions/mq/rss/runParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAItF,eAAO,MAAM,cAAc,GACzB,wBAAwB,sBAAsB,EAC9C,WAAW,WAAW,kBAkCvB,CAAC;AAEF,eAAO,MAAM,eAAe,eAAqB,CAAC"}

package/dist/functions/mq/rss/runParser.js

@@ -9,19 +9,27 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mqRSSRunParser = void 0;
+exports.getIsProcessing = exports.mqRSSRunParser = void 0;
 const podverse_parser_1 = require("podverse-parser");
+let isProcessing = false;
 const mqRSSRunParser = (activeMQArtemisService, queueName) => __awaiter(void 0, void 0, void 0, function* () {
     yield activeMQArtemisService.initialize();
     yield activeMQArtemisService.consumeMessages(queueName, (context) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
+        // Don't accept new messages if we're shutting down
+        if (activeMQArtemisService.getIsShuttingDown()) {
+            console.log('Shutting down - rejecting new message to requeue it');
+            (_a = context.delivery) === null || _a === void 0 ? void 0 : _a.release();
+            return;
+        }
+        isProcessing = true;
         try {
-            const bodyStr = (_b = (_a = context.message) === null || _a === void 0 ? void 0 : _a.body) !== null && _b !== void 0 ? _b : '';
+            const bodyStr = (_c = (_b = context.message) === null || _b === void 0 ? void 0 : _b.body) !== null && _c !== void 0 ? _c : '';
             const receivedMessage = JSON.parse(bodyStr);
             const { url, podcast_index_id, options } = receivedMessage;
             if (url || podcast_index_id) {
                 yield (0, podverse_parser_1.parseRSSFeedAndSaveToDatabase)(url, podcast_index_id, options);
-                (_c = context.delivery) === null || _c === void 0 ? void 0 : _c.accept();
+                (_d = context.delivery) === null || _d === void 0 ? void 0 : _d.accept();
             }
             else {
                 throw new Error(`mqRSSRunParser: url or podcast_index_id not found in message ${bodyStr}`);
@@ -29,11 +37,16 @@ const mqRSSRunParser = (activeMQArtemisService, queueName) => __awaiter(void 0,
         }
         catch (error) {
             console.error('Error processing message', error);
-            (_d = context.delivery) === null || _d === void 0 ? void 0 : _d.reject({
+            (_e = context.delivery) === null || _e === void 0 ? void 0 : _e.reject({
                 condition: 'podverse:processing-error',
                 description: error.message,
             });
         }
+        finally {
+            isProcessing = false;
+        }
     }));
 });
 exports.mqRSSRunParser = mqRSSRunParser;
+const getIsProcessing = () => isProcessing;
+exports.getIsProcessing = getIsProcessing;

package/dist/index.d.ts

@@ -3,7 +3,7 @@ export { mqRSSAdd } from './functions/mq/rss/add';
 export { mqRSSAddAll } from './functions/mq/rss/addAll';
 export { mqRSSAddRecentlyUpdatedFeedsFromPodcastIndex } from './functions/mq/rss/addRecentlyUpdatedFeedsFromPodcastIndex';
 export { mqRSSSetupDlqConsumers } from './functions/mq/rss/dlqHandling';
-export { mqRSSRunParser } from './functions/mq/rss/runParser';
+export { mqRSSRunParser, getIsProcessing } from './functions/mq/rss/runParser';
 export { mqRSSRunLiveItemListener } from './functions/mq/rss/runLiveItemListener';
 export { ActiveMQArtemisService, ActiveMQArtemisServiceParams } from './services/activeMQArtemis';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,uBAAuB,CAAC;AAE/B,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,4CAA4C,EAAE,MAAM,4DAA4D,CAAC;AAC1H,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAElF,OAAO,EAAE,sBAAsB,EAAE,4BAA4B,EAAE,MAAM,4BAA4B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,uBAAuB,CAAC;AAE/B,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,4CAA4C,EAAE,MAAM,4DAA4D,CAAC;AAC1H,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/E,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAElF,OAAO,EAAE,sBAAsB,EAAE,4BAA4B,EAAE,MAAM,4BAA4B,CAAC"}

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ActiveMQArtemisService = exports.mqRSSRunLiveItemListener = exports.mqRSSRunParser = exports.mqRSSSetupDlqConsumers = exports.mqRSSAddRecentlyUpdatedFeedsFromPodcastIndex = exports.mqRSSAddAll = exports.mqRSSAdd = void 0;
+exports.ActiveMQArtemisService = exports.mqRSSRunLiveItemListener = exports.getIsProcessing = exports.mqRSSRunParser = exports.mqRSSSetupDlqConsumers = exports.mqRSSAddRecentlyUpdatedFeedsFromPodcastIndex = exports.mqRSSAddAll = exports.mqRSSAdd = void 0;
 require("./module-alias-config");
 var add_1 = require("./functions/mq/rss/add");
 Object.defineProperty(exports, "mqRSSAdd", { enumerable: true, get: function () { return add_1.mqRSSAdd; } });
@@ -12,6 +12,7 @@ var dlqHandling_1 = require("./functions/mq/rss/dlqHandling");
 Object.defineProperty(exports, "mqRSSSetupDlqConsumers", { enumerable: true, get: function () { return dlqHandling_1.mqRSSSetupDlqConsumers; } });
 var runParser_1 = require("./functions/mq/rss/runParser");
 Object.defineProperty(exports, "mqRSSRunParser", { enumerable: true, get: function () { return runParser_1.mqRSSRunParser; } });
+Object.defineProperty(exports, "getIsProcessing", { enumerable: true, get: function () { return runParser_1.getIsProcessing; } });
 var runLiveItemListener_1 = require("./functions/mq/rss/runLiveItemListener");
 Object.defineProperty(exports, "mqRSSRunLiveItemListener", { enumerable: true, get: function () { return runLiveItemListener_1.mqRSSRunLiveItemListener; } });
 var activeMQArtemis_1 = require("./services/activeMQArtemis");

package/dist/services/activeMQArtemis/index.d.ts

@@ -1,6 +1,6 @@
 import { EventContext } from 'rhea';
 import { LoggerService } from 'podverse-helpers/dist/lib/backend/logger';
-export type MQQueueName = 'rss-normal' | 'rss-on-demand' | 'rss-live' | 'DLQ' | `DLQ.${'rss-normal' | 'rss-on-demand' | 'rss-live'}`;
+export type MQQueueName = 'rss-normal' | 'rss-on-demand' | 'rss-live' | `DLQ.${'rss-normal' | 'rss-on-demand' | 'rss-live'}`;
 type MQRSSMessage = {
     url: string;
     podcast_index_id: number | null;
@@ -26,6 +26,7 @@ export declare class ActiveMQArtemisService {
     private params;
     private logger;
     private connecting;
+    private isShuttingDown;
     constructor(params: ActiveMQArtemisServiceParams, logger: LoggerService);
     initialize(): Promise<void>;
     private connect;
@@ -40,6 +41,8 @@ export declare class ActiveMQArtemisService {
      */
     sendSampleToDLQ(queueName: MQQueueName, sample: Record<string, unknown>, failureDescription?: string): Promise<void>;
     consumeMessages(queueName: MQQueueName, processMessage: (context: EventContext) => Promise<void> | void): Promise<void>;
+    getIsShuttingDown(): boolean;
+    close(): Promise<void>;
 }
 export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/services/activeMQArtemis/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/activeMQArtemis/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAgC,YAAY,EAAE,MAAM,MAAM,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AAIzE,MAAM,MAAM,WAAW,GACnB,YAAY,GACZ,eAAe,GACf,UAAU,GACV,KAAK,GACL,OAAO,YAAY,GAAG,eAAe,GAAG,UAAU,EAAE,CAAC;AAEzD,KAAK,YAAY,GAAG;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC,CAAC;AAEF,KAAK,OAAO,GAAG,YAAY,CAAC;AAE5B,KAAK,iBAAiB,GAAG;IACvB,SAAS,EAAE,WAAW,CAAA;IACtB,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAAA;IAC3B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAA;CACjC,CAAA;AAED,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,sBAAsB;IACjC,OAAO,CAAC,UAAU,CAA2B;IAC7C,OAAO,CAAC,OAAO,CAAuC;IACtD,OAAO,CAAC,SAAS,CAAyC;IAC1D,OAAO,CAAC,MAAM,CAA+B;IAC7C,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,UAAU,CAAS;gBAEf,MAAM,EAAE,4BAA4B,EAAE,MAAM,EAAE,aAAa;IAKjE,UAAU;YASF,OAAO;YAwDP,YAAY;YAaZ,cAAc;IAa5B,OAAO,CAAC,kBAAkB;IAQpB,WAAW,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAyC3D;;;;OAIG;IACG,eAAe,CACnB,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,kBAAkB,SAAqC,GACtD,OAAO,CAAC,IAAI,CAAC;IAoDV,eAAe,CAAC,SAAS,EAAE,WAAW,EAAE,cAAc,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;CA0B9G"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/activeMQArtemis/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAgC,YAAY,EAAE,MAAM,MAAM,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AAGzE,MAAM,MAAM,WAAW,GACnB,YAAY,GACZ,eAAe,GACf,UAAU,GACV,OAAO,YAAY,GAAG,eAAe,GAAG,UAAU,EAAE,CAAC;AAEzD,KAAK,YAAY,GAAG;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC,CAAC;AAEF,KAAK,OAAO,GAAG,YAAY,CAAC;AAE5B,KAAK,iBAAiB,GAAG;IACvB,SAAS,EAAE,WAAW,CAAA;IACtB,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAAA;IAC3B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAA;CACjC,CAAA;AAED,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,sBAAsB;IACjC,OAAO,CAAC,UAAU,CAA2B;IAC7C,OAAO,CAAC,OAAO,CAAuC;IACtD,OAAO,CAAC,SAAS,CAAyC;IAC1D,OAAO,CAAC,MAAM,CAA+B;IAC7C,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,cAAc,CAAS;gBAEnB,MAAM,EAAE,4BAA4B,EAAE,MAAM,EAAE,aAAa;IAKjE,UAAU;YASF,OAAO;YAwDP,YAAY;YAaZ,cAAc;IAa5B,OAAO,CAAC,kBAAkB;IAQpB,WAAW,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAyC3D;;;;OAIG;IACG,eAAe,CACnB,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,kBAAkB,SAAqC,GACtD,OAAO,CAAC,IAAI,CAAC;IAoDV,eAAe,CAAC,SAAS,EAAE,WAAW,EAAE,cAAc,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IA0B7G,iBAAiB,IAAI,OAAO;IAItB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAsC7B"}

package/dist/services/activeMQArtemis/index.js

@@ -21,6 +21,7 @@ class ActiveMQArtemisService {
         this.senders = new Map();
         this.receivers = new Map();
         this.connecting = false;
+        this.isShuttingDown = false;
         this.params = params;
         this.logger = logger;
     }
@@ -170,7 +171,7 @@ class ActiveMQArtemisService {
                 if (!this.connection)
                     yield this.connect();
                 // Choose target based on what exists in your broker
-                const dlqTargets = ['DLQ', `DLQ.${queueName}`];
+                const dlqTargets = [`DLQ.${queueName}`];
                 for (const dlqQueue of dlqTargets) {
                     const sender = this.connection.open_sender({ target: { address: dlqQueue } });
                     yield new Promise((resolve) => sender.once('sender_open', () => resolve()));
@@ -244,5 +245,47 @@ class ActiveMQArtemisService {
             }
         });
     }
+    getIsShuttingDown() {
+        return this.isShuttingDown;
+    }
+    close() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.isShuttingDown = true;
+            this.logger.info('Closing ActiveMQ Artemis connection...');
+            // Close all receivers first to stop accepting new messages
+            for (const [queueName, receiver] of this.receivers.entries()) {
+                try {
+                    receiver.close();
+                    this.logger.info(`Closed receiver for queue ${queueName}`);
+                }
+                catch (error) {
+                    this.logger.logError(`Error closing receiver for ${queueName}`, error);
+                }
+            }
+            this.receivers.clear();
+            // Close all senders
+            for (const [queueName, sender] of this.senders.entries()) {
+                try {
+                    sender.close();
+                    this.logger.info(`Closed sender for queue ${queueName}`);
+                }
+                catch (error) {
+                    this.logger.logError(`Error closing sender for ${queueName}`, error);
+                }
+            }
+            this.senders.clear();
+            // Close the connection
+            if (this.connection) {
+                try {
+                    this.connection.close();
+                    this.logger.info('Closed ActiveMQ Artemis connection');
+                }
+                catch (error) {
+                    this.logger.logError('Error closing connection', error);
+                }
+                this.connection = null;
+            }
+        });
+    }
 }
 exports.ActiveMQArtemisService = ActiveMQArtemisService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "podverse-mq",
-  "version": "5.1.6-alpha.3",
+  "version": "5.1.6-alpha.5",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",