podverse-mq 5.1.12-alpha.0 → 5.1.12-alpha.1

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

@@ -1,7 +1,7 @@
 import { ActiveMQArtemisService } from "@queue/services/activeMQArtemis";
-import { MQQueueConfig } from "podverse-helpers";
+import { MQQueueConfigFunctionParams } from "podverse-helpers";
 import { ParseRSSFeedAndSaveToDatabaseOptions } from "podverse-parser";
-type MQRSSAddOptions = MQQueueConfig & {
+type MQRSSAddOptions = MQQueueConfigFunctionParams & {
     feedUrl: string;
     podcast_index_id: number;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../../../src/functions/mq/rss/add.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAEzE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,oCAAoC,EAAE,MAAM,iBAAiB,CAAC;AAEvE,KAAK,eAAe,GAAG,aAAa,GAAG;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAA;AAED,eAAO,MAAM,QAAQ,GACnB,wBAAwB,sBAAsB,EAC9C,SAAS,eAAe,EACxB,YAAY,oCAAoC,kBAgBjD,CAAC"}
+{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../../../src/functions/mq/rss/add.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAEzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,oCAAoC,EAAE,MAAM,iBAAiB,CAAC;AAEvE,KAAK,eAAe,GAAG,2BAA2B,GAAG;IACnD,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAA;AAED,eAAO,MAAM,QAAQ,GACnB,wBAAwB,sBAAsB,EAC9C,SAAS,eAAe,EACxB,YAAY,oCAAoC,kBA0BjD,CAAC"}

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

@@ -12,16 +12,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.mqRSSAdd = void 0;
 const mqRSSAdd = (activeMQArtemisService, options, msgOptions) => __awaiter(void 0, void 0, void 0, function* () {
     yield activeMQArtemisService.initialize();
-    const message = {
-        url: options.feedUrl,
-        podcast_index_id: options.podcast_index_id,
-        options: msgOptions
-    };
-    yield activeMQArtemisService.sendMessage({
-        queueName: options.queueName,
-        message,
-        priority: options.priority,
-        dedupeCacheTimeMS: options.dedupeCacheTimeMS
-    });
+    try {
+        const message = {
+            url: options.feedUrl,
+            podcast_index_id: options.podcast_index_id,
+            options: msgOptions
+        };
+        yield activeMQArtemisService.sendMessage({
+            queueName: options.queueName,
+            message,
+            priority: options.priority,
+            dedupeCacheTimeMS: options.dedupeCacheTimeMS
+        });
+    }
+    finally {
+        try {
+            if (options.closeAfterSend) {
+                yield activeMQArtemisService.close();
+            }
+        }
+        catch (_a) {
+            // swallow
+        }
+    }
 });
 exports.mqRSSAdd = mqRSSAdd;

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

@@ -1,7 +1,7 @@
 import { ActiveMQArtemisService } from "@queue/services/activeMQArtemis";
-import { MQQueueConfig } from "podverse-helpers";
+import { MQQueueConfigFunctionParams } from "podverse-helpers";
 import { ParseRSSFeedAndSaveToDatabaseOptions } from "podverse-parser";
-type MQRSSAddAllConfig = MQQueueConfig;
+type MQRSSAddAllConfig = MQQueueConfigFunctionParams;
 export declare const mqRSSAddAll: (activeMQArtemisService: ActiveMQArtemisService, options: MQRSSAddAllConfig, msgOptions: ParseRSSFeedAndSaveToDatabaseOptions) => Promise<void>;
 export {};
 //# sourceMappingURL=addAll.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"addAll.d.ts","sourceRoot":"","sources":["../../../../src/functions/mq/rss/addAll.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAEzE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,oCAAoC,EAAE,MAAM,iBAAiB,CAAC;AAEvE,KAAK,iBAAiB,GAAG,aAAa,CAAC;AAEvC,eAAO,MAAM,WAAW,GACtB,wBAAwB,sBAAsB,EAC9C,SAAS,iBAAiB,EAC1B,YAAY,oCAAoC,kBAqBjD,CAAC"}
+{"version":3,"file":"addAll.d.ts","sourceRoot":"","sources":["../../../../src/functions/mq/rss/addAll.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAEzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,oCAAoC,EAAE,MAAM,iBAAiB,CAAC;AAEvE,KAAK,iBAAiB,GAAG,2BAA2B,CAAC;AAErD,eAAO,MAAM,WAAW,GACtB,wBAAwB,sBAAsB,EAC9C,SAAS,iBAAiB,EAC1B,YAAY,oCAAoC,kBA+BjD,CAAC"}

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

@@ -15,18 +15,30 @@ const mqRSSAddAll = (activeMQArtemisService, options, msgOptions) => __awaiter(v
     const feedService = new podverse_orm_1.FeedService();
     const feeds = yield feedService.getAll();
     yield activeMQArtemisService.initialize();
-    for (const feed of feeds) {
-        const message = {
-            url: feed.url,
-            podcast_index_id: feed.podcast_index_id,
-            options: msgOptions
-        };
-        yield activeMQArtemisService.sendMessage({
-            queueName: options.queueName,
-            message,
-            priority: options.priority,
-            dedupeCacheTimeMS: options.dedupeCacheTimeMS
-        });
+    try {
+        for (const feed of feeds) {
+            const message = {
+                url: feed.url,
+                podcast_index_id: feed.podcast_index_id,
+                options: msgOptions
+            };
+            yield activeMQArtemisService.sendMessage({
+                queueName: options.queueName,
+                message,
+                priority: options.priority,
+                dedupeCacheTimeMS: options.dedupeCacheTimeMS
+            });
+        }
+    }
+    finally {
+        try {
+            if (options.closeAfterSend) {
+                yield activeMQArtemisService.close();
+            }
+        }
+        catch (_a) {
+            // swallow
+        }
     }
 });
 exports.mqRSSAddAll = mqRSSAddAll;

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

@@ -1,8 +1,8 @@
 import { PodcastIndexService } from 'podverse-external-services';
-import { MQQueueConfig } from 'podverse-helpers';
+import { MQQueueConfigFunctionParams } from 'podverse-helpers';
 import { ActiveMQArtemisService } from "@queue/services/activeMQArtemis";
 import { ParseRSSFeedAndSaveToDatabaseOptions } from 'podverse-parser';
-type MQRSSAddAllRecentlyUpdatedFeedsOptions = MQQueueConfig & {
+type MQRSSAddAllRecentlyUpdatedFeedsOptions = MQQueueConfigFunctionParams & {
     sinceRange: number;
 };
 export declare const mqRSSAddRecentlyUpdatedFeedsFromPodcastIndex: (activeMQArtemisService: ActiveMQArtemisService, podcastIndexService: PodcastIndexService, options: MQRSSAddAllRecentlyUpdatedFeedsOptions, msgOptions: ParseRSSFeedAndSaveToDatabaseOptions) => Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"addRecentlyUpdatedFeedsFromPodcastIndex.d.ts","sourceRoot":"","sources":["../../../../src/functions/mq/rss/addRecentlyUpdatedFeedsFromPodcastIndex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAEzE,OAAO,EAAE,oCAAoC,EAAE,MAAM,iBAAiB,CAAC;AAEvE,KAAK,sCAAsC,GAAG,aAAa,GAAG;IAC5D,UAAU,EAAE,MAAM,CAAC;CACpB,CAAA;AAED,eAAO,MAAM,4CAA4C,GACvD,wBAAwB,sBAAsB,EAC9C,qBAAqB,mBAAmB,EACxC,SAAS,sCAAsC,EAC/C,YAAY,oCAAoC,kBA4BjD,CAAC"}
+{"version":3,"file":"addRecentlyUpdatedFeedsFromPodcastIndex.d.ts","sourceRoot":"","sources":["../../../../src/functions/mq/rss/addRecentlyUpdatedFeedsFromPodcastIndex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAC;AAE/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAEzE,OAAO,EAAE,oCAAoC,EAAE,MAAM,iBAAiB,CAAC;AAEvE,KAAK,sCAAsC,GAAG,2BAA2B,GAAG;IAC1E,UAAU,EAAE,MAAM,CAAC;CACpB,CAAA;AAED,eAAO,MAAM,4CAA4C,GACvD,wBAAwB,sBAAsB,EAC9C,qBAAqB,mBAAmB,EACxC,SAAS,sCAAsC,EAC/C,YAAY,oCAAoC,kBAsCjD,CAAC"}

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

@@ -15,23 +15,35 @@ const mqRSSAddRecentlyUpdatedFeedsFromPodcastIndex = (activeMQArtemisService, po
     const sinceRange = options.sinceRange;
     const recentlyUpdatedFeeds = yield podcastIndexService.recentGetData(sinceRange);
     yield activeMQArtemisService.initialize();
-    for (const feed of recentlyUpdatedFeeds) {
-        const feedService = new podverse_orm_1.FeedService();
-        const podcast_index_id = feed.feedId;
-        const dbFeed = yield feedService.getByPodcastIndexId(podcast_index_id);
-        const shouldAddToQueue = !!dbFeed;
-        if (shouldAddToQueue) {
-            const message = {
-                url: feed.feedUrl,
-                podcast_index_id: feed.feedId,
-                options: msgOptions
-            };
-            yield activeMQArtemisService.sendMessage({
-                queueName: options.queueName,
-                message,
-                priority: options.priority,
-                dedupeCacheTimeMS: options.dedupeCacheTimeMS
-            });
+    try {
+        for (const feed of recentlyUpdatedFeeds) {
+            const feedService = new podverse_orm_1.FeedService();
+            const podcast_index_id = feed.feedId;
+            const dbFeed = yield feedService.getByPodcastIndexId(podcast_index_id);
+            const shouldAddToQueue = !!dbFeed;
+            if (shouldAddToQueue) {
+                const message = {
+                    url: feed.feedUrl,
+                    podcast_index_id: feed.feedId,
+                    options: msgOptions
+                };
+                yield activeMQArtemisService.sendMessage({
+                    queueName: options.queueName,
+                    message,
+                    priority: options.priority,
+                    dedupeCacheTimeMS: options.dedupeCacheTimeMS
+                });
+            }
+        }
+    }
+    finally {
+        try {
+            if (options.closeAfterSend) {
+                yield activeMQArtemisService.close();
+            }
+        }
+        catch (_a) {
+            // swallow
         }
     }
 });

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

@@ -1 +1 @@
-{"version":3,"file":"runLiveItemListener.d.ts","sourceRoot":"","sources":["../../../../src/functions/mq/rss/runLiveItemListener.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAe,MAAM,iCAAiC,CAAC;AAMtF,eAAO,MAAM,wBAAwB,GACnC,wBAAwB,sBAAsB,SA4I/C,CAAC"}
+{"version":3,"file":"runLiveItemListener.d.ts","sourceRoot":"","sources":["../../../../src/functions/mq/rss/runLiveItemListener.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAe,MAAM,iCAAiC,CAAC;AAMtF,eAAO,MAAM,wBAAwB,GACnC,wBAAwB,sBAAsB,SA6I/C,CAAC"}

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

@@ -89,7 +89,7 @@ const mqRSSRunLiveItemListener = (activeMQArtemisService) => {
                                     const queueType = 'rss-live';
                                     const mqConstantMessageOptions = podverse_helpers_1.MQ_QUEUES[queueType];
                                     for (const addRSSObj of addRSSObjs) {
-                                        yield (0, add_1.mqRSSAdd)(activeMQArtemisService, Object.assign(Object.assign({}, mqConstantMessageOptions), { feedUrl: addRSSObj.url, podcast_index_id: addRSSObj.podcast_index_id }), {
+                                        yield (0, add_1.mqRSSAdd)(activeMQArtemisService, Object.assign(Object.assign({}, mqConstantMessageOptions), { feedUrl: addRSSObj.url, podcast_index_id: addRSSObj.podcast_index_id, closeAfterSend: false }), {
                                             forceParse: true,
                                             onDemandParserEvent: {
                                                 accountId: null,

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":"AAEA,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAGtF,eAAO,MAAM,cAAc,GACzB,wBAAwB,sBAAsB,EAC9C,WAAW,WAAW,kBAmCvB,CAAC"}

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

@@ -10,7 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mqRSSRunParser = void 0;
+const podverse_helpers_1 = require("podverse-helpers");
 const podverse_parser_1 = require("podverse-parser");
+const add_1 = require("./add");
 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* () {
@@ -20,7 +22,18 @@ const mqRSSRunParser = (activeMQArtemisService, queueName) => __awaiter(void 0,
             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);
+                const result = yield (0, podverse_parser_1.parseRSSFeedAndSaveToDatabase)(url, podcast_index_id, options);
+                if (result && Array.isArray(result.remoteItemsToParse) && result.remoteItemsToParse.length > 0) {
+                    const mqConfig = podverse_helpers_1.MQ_QUEUES['rss-slow'];
+                    for (const item of result.remoteItemsToParse) {
+                        try {
+                            yield (0, add_1.mqRSSAdd)(activeMQArtemisService, { queueName: mqConfig.queueName, dedupeCacheTimeMS: mqConfig.dedupeCacheTimeMS, priority: mqConfig.priority, closeAfterSend: false, feedUrl: item.url, podcast_index_id: item.podcast_index_id }, item.options);
+                        }
+                        catch (err) {
+                            console.error('Error enqueueing remote item', err);
+                        }
+                    }
+                }
                 (_c = context.delivery) === null || _c === void 0 ? void 0 : _c.accept();
             }
             else {

package/dist/index.d.ts

@@ -6,4 +6,5 @@ export { mqRSSSetupDlqConsumers } from './functions/mq/rss/dlqHandling';
 export { mqRSSRunParser } from './functions/mq/rss/runParser';
 export { mqRSSRunLiveItemListener } from './functions/mq/rss/runLiveItemListener';
 export { ActiveMQArtemisService, ActiveMQArtemisServiceParams } from './services/activeMQArtemis';
+export { createActiveMQShutdown } from './services/activeMQArtemis/shutdown';
 //# 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,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAElF,OAAO,EAAE,sBAAsB,EAAE,4BAA4B,EAAE,MAAM,4BAA4B,CAAC;AAClG,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,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.createActiveMQShutdown = exports.ActiveMQArtemisService = exports.mqRSSRunLiveItemListener = 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; } });
@@ -16,3 +16,5 @@ 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");
 Object.defineProperty(exports, "ActiveMQArtemisService", { enumerable: true, get: function () { return activeMQArtemis_1.ActiveMQArtemisService; } });
+var shutdown_1 = require("./services/activeMQArtemis/shutdown");
+Object.defineProperty(exports, "createActiveMQShutdown", { enumerable: true, get: function () { return shutdown_1.createActiveMQShutdown; } });

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;AAEzE,OAAO,EAAE,oCAAoC,EAAE,MAAM,qCAAqC,CAAC;AAE3F,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;IAChC,OAAO,EAAE,oCAAoC,CAAC;CAC/C,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;IAc5B,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;IA4B7G,iBAAiB,IAAI,OAAO;IAItB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAsC7B"}
+{"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,OAAO,EAAE,oCAAoC,EAAE,MAAM,qCAAqC,CAAC;AAE3F,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;IAChC,OAAO,EAAE,oCAAoC,CAAC;CAC/C,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;YAkEP,YAAY;YAaZ,cAAc;IAc5B,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;IA4B7G,iBAAiB,IAAI,OAAO;IAItB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAkF7B"}

package/dist/services/activeMQArtemis/index.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActiveMQArtemisService = void 0;
 const rhea_1 = __importDefault(require("rhea"));
 const crypto_1 = __importDefault(require("crypto"));
+const os_1 = require("podverse-helpers/dist/lib/backend/os");
 class ActiveMQArtemisService {
     constructor(params, logger) {
         this.connection = null;
@@ -52,11 +53,20 @@ class ActiveMQArtemisService {
                         this.connecting = false; // allow retry attempts later
                         return reject(err);
                     }
+                    const idleTimeOut = 30000;
+                    const baseId = process.env.CONTAINER_ID
+                        || process.env.HOSTNAME
+                        || `podverse-mq-${crypto_1.default.randomBytes(4).toString('hex')}`;
+                    const containerId = `${baseId}${(0, os_1.getContainerIpPart)()}`;
                     const connection = rheaLike.connect({
                         host: this.params.host,
                         port: this.params.port,
                         username: this.params.username,
                         password: this.params.password,
+                        // send AMQP heartbeats so broker (default 60s TTL) sees activity and stays alive until manually closed
+                        idle_time_out: idleTimeOut,
+                        container_id: containerId,
+                        properties: { product: 'podverse-mq' },
                         reconnect: true,
                         reconnect_limit: -1
                     });
@@ -254,40 +264,91 @@ class ActiveMQArtemisService {
     }
     close() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.isShuttingDown)
+                return;
             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);
+            const closeTimeoutMs = 10000;
+            const doClose = () => __awaiter(this, void 0, void 0, function* () {
+                // 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}`);
+                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);
+                    }
                 }
-                catch (error) {
-                    this.logger.logError(`Error closing sender for ${queueName}`, error);
+                this.senders.clear();
+                // Close the connection
+                if (this.connection) {
+                    try {
+                        // Prevent reconnect attempts while we're shutting down
+                        try {
+                            // Attempt to disable reconnect behavior before closing.
+                            // rhea doesn't provide a documented toggle here, so remove event listeners
+                            // and try to flip common internal flags if present to avoid immediate reconnects.
+                            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                            const connAny = this.connection;
+                            if (connAny) {
+                                if (typeof connAny.removeAllListeners === 'function') {
+                                    connAny.removeAllListeners();
+                                }
+                                // some rhea versions expose internal options or flags we can defensively set
+                                if (connAny.options && typeof connAny.options.reconnect !== 'undefined') {
+                                    try {
+                                        connAny.options.reconnect = false;
+                                    }
+                                    catch (_a) {
+                                        // swallow
+                                    }
+                                }
+                                try {
+                                    connAny.reconnect = false;
+                                }
+                                catch (_b) {
+                                    // swallow
+                                }
+                            }
+                        }
+                        catch (_c) {
+                            // swallow - this is best-effort cleanup prior to close
+                        }
+                        this.connection.close();
+                        this.logger.info('Closed ActiveMQ Artemis connection');
+                    }
+                    catch (error) {
+                        this.logger.logError('Error closing connection', error);
+                    }
+                    this.connection = null;
                 }
+            });
+            // race close against a timeout to avoid hanging shutdown; create timer before starting close
+            let timer;
+            const timeoutPromise = new Promise((resolve) => {
+                timer = setTimeout(() => {
+                    this.logger.error(`ActiveMQ Artemis close() timed out after ${closeTimeoutMs}ms`);
+                    resolve();
+                }, closeTimeoutMs);
+            });
+            try {
+                yield Promise.race([doClose(), timeoutPromise]);
             }
-            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;
+            finally {
+                if (timer)
+                    clearTimeout(timer);
             }
         });
     }

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

@@ -0,0 +1,13 @@
+type LoggerLike = {
+    info?: (...args: any[]) => void;
+    error?: (...args: any[]) => void;
+    log?: (...args: any[]) => void;
+};
+export declare const createActiveMQShutdown: (activeMQService: {
+    close: () => Promise<void>;
+}, logger?: LoggerLike, onShutdown?: () => void, exitOnShutdown?: boolean) => {
+    shutdown: (signal?: string) => Promise<void>;
+    unregister: () => void;
+};
+export {};
+//# sourceMappingURL=shutdown.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"shutdown.d.ts","sourceRoot":"","sources":["../../../src/services/activeMQArtemis/shutdown.ts"],"names":[],"mappings":"AAEA,KAAK,UAAU,GAAG;IAChB,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IAChC,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IACjC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;CAChC,CAAC;AAEF,eAAO,MAAM,sBAAsB,GACjC,iBAAiB;IAAE,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,EAC/C,SAAQ,UAAoB,EAC5B,aAAa,MAAM,IAAI,EACvB,wBAAqB;wBAEY,MAAM;;CA8BxC,CAAC"}

package/dist/services/activeMQArtemis/shutdown.js

@@ -0,0 +1,46 @@
+"use strict";
+/* eslint-disable @typescript-eslint/no-explicit-any */
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createActiveMQShutdown = void 0;
+const createActiveMQShutdown = (activeMQService, logger = console, onShutdown, exitOnShutdown = true) => {
+    const shutdown = (signal) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a, _b, _c;
+        try {
+            if (onShutdown)
+                onShutdown();
+            (_a = logger.info) === null || _a === void 0 ? void 0 : _a.call(logger, `Shutting down${signal ? ` due to ${signal}` : ''}`);
+        }
+        catch (_d) {
+            // ignore errors from onShutdown
+        }
+        try {
+            yield activeMQService.close();
+            (_b = logger.info) === null || _b === void 0 ? void 0 : _b.call(logger, 'ActiveMQ Artemis connection closed');
+        }
+        catch (err) {
+            (_c = logger.error) === null || _c === void 0 ? void 0 : _c.call(logger, 'Error during Artemis shutdown', err);
+        }
+        if (exitOnShutdown)
+            process.exit(0);
+    });
+    const handler = (sig) => void shutdown(sig);
+    process.on('SIGINT', handler);
+    process.on('SIGTERM', handler);
+    return {
+        shutdown,
+        unregister: () => {
+            process.removeListener('SIGINT', handler);
+            process.removeListener('SIGTERM', handler);
+        },
+    };
+};
+exports.createActiveMQShutdown = createActiveMQShutdown;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "podverse-mq",
-  "version": "5.1.12-alpha.0",
+  "version": "5.1.12-alpha.1",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -17,10 +17,10 @@
   "license": "AGPLv3",
   "dependencies": {
     "module-alias": "^2.2.3",
-    "podverse-external-services": "^5.1.12-alpha.0",
-    "podverse-helpers": "^5.1.12-alpha.0",
-    "podverse-orm": "^5.1.12-alpha.0",
-    "podverse-parser": "^5.1.12-alpha.0",
+    "podverse-external-services": "^5.1.12-alpha.2",
+    "podverse-helpers": "^5.1.12-alpha.1",
+    "podverse-orm": "^5.1.12-alpha.1",
+    "podverse-parser": "^5.1.12-alpha.1",
     "rhea": "^2.0.6",
     "ws": "^8.18.3"
   },