podverse-parser 5.1.17-alpha.0 → 5.1.20-alpha.0

package/dist/config/index.d.ts

@@ -17,5 +17,12 @@ export declare const config: {
     parser: {
         addRemoteItemsToMQ: boolean;
     };
+    defaults: {
+        account: {
+            settings: {
+                locale: string;
+            };
+        };
+    };
 };
 //# sourceMappingURL=index.d.ts.map

package/dist/config/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;CAmBlB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;CA0BlB,CAAC"}

package/dist/config/index.js

@@ -19,5 +19,12 @@ exports.config = {
     },
     parser: {
         addRemoteItemsToMQ: process.env.PARSER_ADD_REMOTE_ITEMS_TO_MQ === 'true',
+    },
+    defaults: {
+        account: {
+            settings: {
+                locale: process.env.DEFAULT_ACCOUNT_SETTINGS_LOCALE || 'en-US',
+            }
+        }
     }
 };

package/dist/lib/notifications/handleNewItemNotifications.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handleNewItemNotifications.d.ts","sourceRoot":"","sources":["../../../src/lib/notifications/handleNewItemNotifications.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAA6B,MAAM,cAAc,CAAC;AAElE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAuCpE;;GAEG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,OAAO,EAChB,iBAAiB,EAAE,uBAAuB,GACzC,OAAO,CAAC,IAAI,CAAC,CA+Ef"}
+{"version":3,"file":"handleNewItemNotifications.d.ts","sourceRoot":"","sources":["../../../src/lib/notifications/handleNewItemNotifications.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAA6B,MAAM,cAAc,CAAC;AAElE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAuCpE;;GAEG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,OAAO,EAChB,iBAAiB,EAAE,uBAAuB,GACzC,OAAO,CAAC,IAAI,CAAC,CAiFf"}

package/dist/lib/notifications/handleNewItemNotifications.js

@@ -57,7 +57,7 @@ function handleNewItemNotifications(channel, parsedItemsResult) {
             if (!devicesResult) {
                 return;
             }
-            const { devices: allDevices } = devicesResult;
+            const { devices: allDevices, webPushSubscriptions, upSubscriptions } = devicesResult;
             // Get the items to send notifications for using batch queries
             const itemService = new podverse_orm_1.ItemService();
             const items = [];
@@ -98,15 +98,17 @@ function handleNewItemNotifications(channel, parsedItemsResult) {
                 imageUrl: (0, sharedNotificationHelpers_1.getBestImageUrl)(item, channelImages),
                 itemIdText: item.id_text,
                 channelIdText: channel.id_text,
-                messageType
+                messageType,
+                mediumId: channel.medium_id
             }));
             // Group devices by locale and platform
             const groupedDevices = (0, sharedNotificationHelpers_1.groupDevicesByLocaleAndPlatform)(allDevices);
             // Send notifications
-            yield (0, sharedNotificationHelpers_1.sendItemNotifications)(itemNotifications, groupedDevices);
+            yield (0, sharedNotificationHelpers_1.sendItemNotifications)(itemNotifications, groupedDevices, webPushSubscriptions, upSubscriptions);
         }
         catch (error) {
             loggerService_1.loggerService.logError('handleNewItemNotifications', error);
+            loggerService_1.loggerService.logError(`handleNewItemNotifications: Error details - Channel: ${channel.id_text}, Error: ${error.message}`, error);
         }
     });
 }

package/dist/lib/notifications/handleNewLiveItemNotifications.js

@@ -53,7 +53,7 @@ function sendLiveItemNotificationsForStatus(channel, itemGuids, channelImages, m
         if (!devicesResult) {
             return;
         }
-        const { devices: allDevices } = devicesResult;
+        const { devices: allDevices, webPushSubscriptions, upSubscriptions } = devicesResult;
         // Get the items to send notifications for using batch queries
         const itemService = new podverse_orm_1.ItemService();
         const items = yield itemService.getManyByGuid(channel, itemGuids, {
@@ -84,11 +84,12 @@ function sendLiveItemNotificationsForStatus(channel, itemGuids, channelImages, m
             imageUrl: (0, sharedNotificationHelpers_1.getBestImageUrl)(item, channelImages),
             itemIdText: item.id_text,
             channelIdText: channel.id_text,
-            messageType
+            messageType,
+            mediumId: channel.medium_id
         }));
         // Group devices by locale and platform
         const groupedDevices = (0, sharedNotificationHelpers_1.groupDevicesByLocaleAndPlatform)(allDevices);
         // Send notifications
-        yield (0, sharedNotificationHelpers_1.sendItemNotifications)(itemNotifications, groupedDevices);
+        yield (0, sharedNotificationHelpers_1.sendItemNotifications)(itemNotifications, groupedDevices, webPushSubscriptions, upSubscriptions);
     });
 }

package/dist/lib/notifications/sharedNotificationHelpers.d.ts

@@ -1,6 +1,6 @@
 import { AccountFCMDevicePlatformEnum, AccountNotificationTypeEnum } from 'podverse-helpers';
 import { Channel, ChannelImage, Item } from 'podverse-orm';
-import { NotificationMessageType, NotificationPlatform } from 'podverse-external-services';
+import { NotificationMessageType, NotificationPlatform, WebPushSubscription, UPSubscription } from 'podverse-notifications';
 export type DeviceWithLocale = {
     fcm_token: string;
     platform: NotificationPlatform;
@@ -14,6 +14,7 @@ export type ItemNotificationData = {
     itemIdText: string;
     channelIdText: string;
     messageType: NotificationMessageType;
+    mediumId: number;
 };
 /**
  * Selects the best image from a list based on notification requirements.
@@ -45,10 +46,12 @@ export declare function loadChannelImages(channel: Channel): Promise<ChannelImag
  */
 export declare function getDevicesForNotificationType(channelIdText: string, notificationType: AccountNotificationTypeEnum): Promise<{
     devices: DeviceWithLocale[];
+    webPushSubscriptions: Map<string, WebPushSubscription[]>;
+    upSubscriptions: Map<string, UPSubscription[]>;
     accountLocaleMap: Map<number, string>;
 } | null>;
 /**
  * Sends notifications for items to grouped devices
  */
-export declare function sendItemNotifications(itemNotifications: ItemNotificationData[], groupedDevices: Map<string, Map<NotificationPlatform, string[]>>): Promise<void>;
+export declare function sendItemNotifications(itemNotifications: ItemNotificationData[], groupedDevices: Map<string, Map<NotificationPlatform, string[]>>, webPushSubscriptions: Map<string, WebPushSubscription[]>, upSubscriptions: Map<string, UPSubscription[]>): Promise<void>;
 //# sourceMappingURL=sharedNotificationHelpers.d.ts.map

package/dist/lib/notifications/sharedNotificationHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sharedNotificationHelpers.d.ts","sourceRoot":"","sources":["../../../src/lib/notifications/sharedNotificationHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAC;AAC7F,OAAO,EAIL,OAAO,EACP,YAAY,EAEZ,IAAI,EACL,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,uBAAuB,EAA4B,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAGrH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,uBAAuB,CAAC;CACtC,CAAC;AAOF;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,CAAC,SAAS;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EACzF,MAAM,EAAE,CAAC,EAAE,GACV,MAAM,GAAG,IAAI,CA8Bf;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,YAAY,EAAE,GAAG,MAAM,GAAG,IAAI,CAexF;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,4BAA4B,GAAG,oBAAoB,CAY5F;AAED;;GAEG;AACH,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,oBAAoB,EAAE,MAAM,EAAE,CAAC,CAAC,CAgB7H;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAUjF;AAED;;GAEG;AACH,wBAAsB,6BAA6B,CACjD,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,2BAA2B,GAC5C,OAAO,CAAC;IAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG,IAAI,CAAC,CA0DxF;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,iBAAiB,EAAE,oBAAoB,EAAE,EACzC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,oBAAoB,EAAE,MAAM,EAAE,CAAC,CAAC,GAC/D,OAAO,CAAC,IAAI,CAAC,CAmCf"}
+{"version":3,"file":"sharedNotificationHelpers.d.ts","sourceRoot":"","sources":["../../../src/lib/notifications/sharedNotificationHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAC;AAC7F,OAAO,EAML,OAAO,EACP,YAAY,EAEZ,IAAI,EACL,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,uBAAuB,EAAE,oBAAoB,EAA4B,mBAAmB,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAItJ,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,uBAAuB,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAOF;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,CAAC,SAAS;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EACzF,MAAM,EAAE,CAAC,EAAE,GACV,MAAM,GAAG,IAAI,CA8Bf;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,YAAY,EAAE,GAAG,MAAM,GAAG,IAAI,CAexF;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,4BAA4B,GAAG,oBAAoB,CAW5F;AAED;;GAEG;AACH,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,oBAAoB,EAAE,MAAM,EAAE,CAAC,CAAC,CAgB7H;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAUjF;AAED;;GAEG;AACH,wBAAsB,6BAA6B,CACjD,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,2BAA2B,GAC5C,OAAO,CAAC;IAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAAC,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,EAAE,CAAC,CAAC;IAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC;IAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG,IAAI,CAAC,CA+FlM;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,iBAAiB,EAAE,oBAAoB,EAAE,EACzC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,oBAAoB,EAAE,MAAM,EAAE,CAAC,CAAC,EAChE,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,EAAE,CAAC,EACxD,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,GAC7C,OAAO,CAAC,IAAI,CAAC,CAqGf"}

package/dist/lib/notifications/sharedNotificationHelpers.js

@@ -18,8 +18,9 @@ exports.getDevicesForNotificationType = getDevicesForNotificationType;
 exports.sendItemNotifications = sendItemNotifications;
 const podverse_helpers_1 = require("podverse-helpers");
 const podverse_orm_1 = require("podverse-orm");
-const podverse_external_services_1 = require("podverse-external-services");
+const podverse_notifications_1 = require("podverse-notifications");
 const loggerService_1 = require("@parser/factories/loggerService");
+const config_1 = require("@parser/config");
 // Minimum acceptable image size for notifications (in pixels)
 const NOTIFICATION_IMAGE_MIN_SIZE = 200;
 // Ideal image size for notifications - not too large to waste bandwidth
@@ -81,9 +82,8 @@ function convertPlatform(platform) {
             return 'android';
         case podverse_helpers_1.AccountFCMDevicePlatformEnum.iOS:
             return 'ios';
-        case podverse_helpers_1.AccountFCMDevicePlatformEnum.Generic:
         default:
-            return 'generic';
+            return 'web';
     }
 }
 /**
@@ -144,7 +144,7 @@ function getDevicesForNotificationType(channelIdText, notificationType) {
             if (hasType) {
                 accountIdsWithTypeEnabled.push(notificationChannel.account_id);
                 // Store the locale for each account
-                const locale = ((_d = (_c = (_b = notificationChannel.account) === null || _b === void 0 ? void 0 : _b.account_settings) === null || _c === void 0 ? void 0 : _c.account_settings_locale) === null || _d === void 0 ? void 0 : _d.locale) || 'en-US';
+                const locale = ((_d = (_c = (_b = notificationChannel.account) === null || _b === void 0 ? void 0 : _b.account_settings) === null || _c === void 0 ? void 0 : _c.account_settings_locale) === null || _d === void 0 ? void 0 : _d.locale) || config_1.config.defaults.account.settings.locale;
                 accountLocaleMap.set(notificationChannel.account_id, locale);
             }
         }
@@ -155,31 +155,65 @@ function getDevicesForNotificationType(channelIdText, notificationType) {
         // Get all FCM devices for the filtered account IDs in a single batch query
         const accountFCMDeviceService = new podverse_orm_1.AccountFCMDeviceService();
         const deviceResults = yield accountFCMDeviceService.getAllForAccountIds(accountIdsWithTypeEnabled);
-        // Early return if no devices to send to
-        if (deviceResults.length === 0) {
+        // Get all Web Push devices for the filtered account IDs in a single batch query
+        const accountWebPushDeviceService = new podverse_orm_1.AccountWebPushDeviceService();
+        const webPushDeviceResults = yield accountWebPushDeviceService.getAllForAccountIds(accountIdsWithTypeEnabled);
+        // Get all Unified Push devices for the filtered account IDs in a single batch query
+        const accountUPDeviceService = new podverse_orm_1.AccountUPDeviceService();
+        const upDeviceResults = yield accountUPDeviceService.getAllForAccountIds(accountIdsWithTypeEnabled);
+        // Early return if no devices to send to (FCM, Web Push, or UP)
+        if (deviceResults.length === 0 && webPushDeviceResults.length === 0 && upDeviceResults.length === 0) {
             return null;
         }
-        // Map devices to DeviceWithLocale format
+        // Map FCM devices to DeviceWithLocale format
         const devices = deviceResults.map(device => ({
             fcm_token: device.fcm_token,
             platform: convertPlatform(device.platform),
-            locale: device.locale || accountLocaleMap.get(device.account_id) || 'en-US',
+            locale: device.locale || accountLocaleMap.get(device.account_id) || config_1.config.defaults.account.settings.locale,
             account_id: device.account_id
         }));
-        return { devices, accountLocaleMap };
+        // Map Web Push devices to WebPushSubscription format, grouped by locale
+        const webPushSubscriptions = new Map();
+        for (const device of webPushDeviceResults) {
+            const locale = device.locale || accountLocaleMap.get(device.account_id) || 'en-US';
+            if (!webPushSubscriptions.has(locale)) {
+                webPushSubscriptions.set(locale, []);
+            }
+            webPushSubscriptions.get(locale).push({
+                endpoint: device.endpoint,
+                keys: {
+                    p256dh: device.p256dh,
+                    auth: device.auth
+                }
+            });
+        }
+        // Map UP devices to UPSubscription format, grouped by locale
+        const upSubscriptions = new Map();
+        for (const device of upDeviceResults) {
+            const locale = device.locale || accountLocaleMap.get(device.account_id) || 'en-US';
+            if (!upSubscriptions.has(locale)) {
+                upSubscriptions.set(locale, []);
+            }
+            upSubscriptions.get(locale).push({
+                up_endpoint: device.up_endpoint,
+                up_auth_key: device.up_auth_key
+            });
+        }
+        return { devices, webPushSubscriptions, upSubscriptions, accountLocaleMap };
     });
 }
 /**
  * Sends notifications for items to grouped devices
  */
-function sendItemNotifications(itemNotifications, groupedDevices) {
+function sendItemNotifications(itemNotifications, groupedDevices, webPushSubscriptions, upSubscriptions) {
     return __awaiter(this, void 0, void 0, function* () {
         for (const itemNotification of itemNotifications) {
             const messageText = `${itemNotification.channelTitle} - ${itemNotification.itemTitle}`;
+            // Send to FCM devices
             for (const [locale, platformMap] of groupedDevices) {
                 for (const [platform, tokens] of platformMap) {
                     try {
-                        yield (0, podverse_external_services_1.notificationOrchestrator)({
+                        yield (0, podverse_notifications_1.notificationOrchestrator)({
                             service: 'firebase',
                             tokens,
                             messageText,
@@ -188,6 +222,7 @@ function sendItemNotifications(itemNotifications, groupedDevices) {
                             platform,
                             icon: itemNotification.imageUrl || undefined,
                             linkIdText: itemNotification.itemIdText,
+                            mediumId: itemNotification.mediumId,
                             data: {
                                 itemIdText: itemNotification.itemIdText,
                                 channelIdText: itemNotification.channelIdText,
@@ -201,6 +236,58 @@ function sendItemNotifications(itemNotifications, groupedDevices) {
                     }
                 }
             }
+            // Send to Web Push subscriptions
+            for (const [locale, subscriptions] of webPushSubscriptions) {
+                if (subscriptions.length > 0) {
+                    try {
+                        yield (0, podverse_notifications_1.notificationOrchestrator)({
+                            service: 'webpush',
+                            subscriptions,
+                            messageText,
+                            messageType: itemNotification.messageType,
+                            locale,
+                            icon: itemNotification.imageUrl || undefined,
+                            linkIdText: itemNotification.itemIdText,
+                            mediumId: itemNotification.mediumId,
+                            data: {
+                                itemIdText: itemNotification.itemIdText,
+                                channelIdText: itemNotification.channelIdText,
+                                type: itemNotification.messageType
+                            }
+                        });
+                        loggerService_1.loggerService.info(`Sent ${itemNotification.messageType} Web Push notification to ${subscriptions.length} subscription(s) (${locale}) for item: ${itemNotification.itemIdText}`);
+                    }
+                    catch (error) {
+                        loggerService_1.loggerService.logError(`Failed to send Web Push notification for item ${itemNotification.itemIdText} to ${subscriptions.length} subscription(s) (${locale})`, error);
+                    }
+                }
+            }
+            // Send to Unified Push subscriptions
+            for (const [locale, subscriptions] of upSubscriptions) {
+                if (subscriptions.length > 0) {
+                    try {
+                        yield (0, podverse_notifications_1.notificationOrchestrator)({
+                            service: 'unifiedpush',
+                            subscriptions,
+                            messageText,
+                            messageType: itemNotification.messageType,
+                            locale,
+                            icon: itemNotification.imageUrl || undefined,
+                            linkIdText: itemNotification.itemIdText,
+                            mediumId: itemNotification.mediumId,
+                            data: {
+                                itemIdText: itemNotification.itemIdText,
+                                channelIdText: itemNotification.channelIdText,
+                                type: itemNotification.messageType
+                            }
+                        });
+                        loggerService_1.loggerService.info(`Sent ${itemNotification.messageType} Unified Push notification to ${subscriptions.length} subscription(s) (${locale}) for item: ${itemNotification.itemIdText}`);
+                    }
+                    catch (error) {
+                        loggerService_1.loggerService.logError(`Failed to send Unified Push notification for item ${itemNotification.itemIdText} to ${subscriptions.length} subscription(s) (${locale})`, error);
+                    }
+                }
+            }
         }
     });
 }

package/dist/lib/rss/parser.d.ts

@@ -16,5 +16,5 @@ export declare const parseRSSFeedAndSaveToDatabase: (url: string, podcast_index_
         podcast_index_id: number;
         options: ParseRSSFeedAndSaveToDatabaseOptions;
     }[];
-}>;
+} | undefined>;
 //# sourceMappingURL=parser.d.ts.map

package/dist/lib/rss/parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../src/lib/rss/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EAKxB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAa,MAAM,oBAAoB,CAAC;AAmC3D,eAAO,MAAM,kBAAkB,GAAU,KAAK,MAAM,wBAUnD,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,0BAA0B,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1C,IAAI,EAAE,uBAAuB,GAAG,IAAI,CAAC;CACtC,CAAA;AAED,MAAM,MAAM,oCAAoC,GAAG;IACjD,UAAU,EAAE,OAAO,CAAC;IACpB,mBAAmB,EAAE,2BAA2B,CAAC;CAClD,CAAA;AAgBD,eAAO,MAAM,6BAA6B,GACxC,KAAK,MAAM,EACX,kBAAkB,MAAM,EACxB,SAAS,oCAAoC;;;;;;EAoI9C,CAAC"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../src/lib/rss/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EAKxB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAa,MAAM,oBAAoB,CAAC;AAmC3D,eAAO,MAAM,kBAAkB,GAAU,KAAK,MAAM,wBAUnD,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,0BAA0B,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1C,IAAI,EAAE,uBAAuB,GAAG,IAAI,CAAC;CACtC,CAAA;AAED,MAAM,MAAM,oCAAoC,GAAG;IACjD,UAAU,EAAE,OAAO,CAAC;IACpB,mBAAmB,EAAE,2BAA2B,CAAC;CAClD,CAAA;AAgBD,eAAO,MAAM,6BAA6B,GACxC,KAAK,MAAM,EACX,kBAAkB,MAAM,EACxB,SAAS,oCAAoC;;;;;;cAuI9C,CAAC"}

package/dist/lib/rss/parser.js

@@ -96,6 +96,7 @@ const parseRSSFeedAndSaveToDatabase = (url, podcast_index_id, options) => __awai
         }
         parsedFeed = yield (0, feed_1.handleRequestRSSFeed)(feed);
         feed = yield (0, feed_1.handleParsedFeed)(parsedFeed, feed, options);
+        // A race condition is possible. Save "is_parsing" state to valkey instead?
         yield feedService.update(feed.id, { is_parsing: new Date() });
         if ((0, podverse_orm_1.checkIfSpamFeed)(parsedFeed)) {
             yield feedService.updateFlagStatus(feed, podverse_orm_1.FeedFlagStatusStatusEnum.Spam);
@@ -125,6 +126,8 @@ const parseRSSFeedAndSaveToDatabase = (url, podcast_index_id, options) => __awai
     catch (error) {
         if (error instanceof errors_1.FeedIsParsingError) {
             loggerService_1.loggerService.warn(`Feed ${feed === null || feed === void 0 ? void 0 : feed.id} is already parsing.`);
+            // return so the is_parsing flag is not reset
+            return;
         }
         else if (error instanceof errors_1.FeedNoChangesSinceLastParsedError) {
             loggerService_1.loggerService.warn(`Feed ${feed === null || feed === void 0 ? void 0 : feed.id} has no changes since last parsed.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "podverse-parser",
-  "version": "5.1.17-alpha.0",
+  "version": "5.1.20-alpha.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -17,9 +17,10 @@
   "license": "AGPLv3",
   "dependencies": {
     "module-alias": "^2.2.3",
-    "podverse-external-services": "^5.1.17-alpha.0",
-    "podverse-helpers": "^5.1.17-alpha.0",
-    "podverse-orm": "^5.1.17-alpha.0",
+    "podverse-external-services": "^5.1.20-alpha.0",
+    "podverse-helpers": "^5.1.20-alpha.0",
+    "podverse-notifications": "^5.1.20-alpha.0",
+    "podverse-orm": "^5.1.20-alpha.0",
     "podverse-partytime": "^5.0.0"
   },
   "devDependencies": {