podverse-parser 5.1.0-alpha.8 → 5.1.3-alpha.0

package/dist/lib/rss/liveItem/liveItem.js

@@ -12,11 +12,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleParsedLiveItems = void 0;
 const podverse_helpers_1 = require("podverse-helpers");
 const podverse_orm_1 = require("podverse-orm");
-const config_1 = require("@parser/config");
 const liveItem_1 = require("@parser/lib/compat/partytime/liveItem");
 const item_1 = require("@parser/lib/rss/item/item");
 const itemFlagStatus_1 = require("podverse-orm/dist/entities/item/itemFlagStatus");
-const processLiveItemBatch = (liveItemObjDtosBatch, channel, channelSeasonIndex, existingLiveItemMap, updatedLiveItemIds, newItemGuids, transactionalEntityManager, timerAccumulator, liveItemService) => __awaiter(void 0, void 0, void 0, function* () {
+const timerManager_1 = require("@parser/factories/timerManager");
+const loggerService_1 = require("@parser/factories/loggerService");
+const processLiveItemBatch = (liveItemObjDtosBatch, channel, channelSeasonIndex, existingLiveItemMap, updatedLiveItemIds, newItemGuids, 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+transactionalEntityManager, 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+timerAccumulator, liveItemService) => __awaiter(void 0, void 0, void 0, function* () {
     for (const liveItemObjDto of liveItemObjDtosBatch) {
         const itemDto = liveItemObjDto.item;
         const item = yield (0, item_1.handleParsedItem)({
@@ -39,9 +44,9 @@ const processLiveItemBatch = (liveItemObjDtosBatch, channel, channelSeasonIndex,
     }
 });
 const logTimerAccumulator = (timerAccumulator) => {
-    if (config_1.config.shouldLogTimer) {
+    if (timerManager_1.timerManager.shouldLogTimer) {
         Object.entries(timerAccumulator).forEach(([key, value]) => {
-            podverse_helpers_1.logger.info(`${key} took ${value}ms`);
+            loggerService_1.loggerService.info(`${key} took ${value}ms`);
         });
     }
 };
@@ -50,21 +55,21 @@ const handleParsedLiveItems = (parsedLiveItems, channel, channelSeasonIndex) =>
     const liveItemService = new podverse_orm_1.LiveItemService();
     const existingLiveItems = yield liveItemService.getManyByChannel(channel, { relations: ['item', 'live_item_status'] });
     const existingLiveItemMap = new Map(existingLiveItems.map(live_item => [live_item.item.guid, live_item]));
-    const existingLiveItemIds = existingLiveItems.map(live_item => live_item.id);
-    const updatedLiveItemIds = [];
+    const existingLiveItemItemIds = existingLiveItems.map(live_item => live_item.item.id);
+    const updatedLiveItemItemIds = [];
     const newItemGuids = [];
     const liveItemObjDtos = (0, liveItem_1.compatLiveItemsDtos)(parsedLiveItems);
     const timerAccumulator = (0, item_1.createItemTimerAccumulator)();
     const liveItemObjDtosBatchs = (0, podverse_helpers_1.chunkArray)(liveItemObjDtos, 50);
     for (const liveItemObjDtosBatch of liveItemObjDtosBatchs) {
         yield podverse_orm_1.AppDataSourceReadWrite.manager.transaction((transactionalEntityManager) => __awaiter(void 0, void 0, void 0, function* () {
-            yield processLiveItemBatch(liveItemObjDtosBatch, channel, channelSeasonIndex, existingLiveItemMap, updatedLiveItemIds, newItemGuids, transactionalEntityManager, timerAccumulator, liveItemService);
+            yield processLiveItemBatch(liveItemObjDtosBatch, channel, channelSeasonIndex, existingLiveItemMap, updatedLiveItemItemIds, newItemGuids, transactionalEntityManager, timerAccumulator, liveItemService);
         }));
     }
     logTimerAccumulator(timerAccumulator);
-    const itemIdsToDelete = existingLiveItemIds.filter(id => !updatedLiveItemIds.includes(id));
+    const itemIdsToDelete = existingLiveItemItemIds.filter(id => !updatedLiveItemItemIds.includes(id));
     const itemsToDelete = existingLiveItems
-        .filter(liveItem => itemIdsToDelete.includes(liveItem.id))
+        .filter(liveItem => itemIdsToDelete.includes(liveItem.item.id))
         .map(liveItem => liveItem.item);
     yield itemService.updateManyFlagStatus(itemsToDelete, itemFlagStatus_1.ItemFlagStatusStatusEnum.PendingArchive);
     return { newItemGuids };

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

@@ -1,3 +1,7 @@
 export declare const getAndParseRSSFeed: (url: string) => Promise<import("podcast-partytime").FeedObject>;
-export declare const parseRSSFeedAndSaveToDatabase: (url: string, podcast_index_id: number) => Promise<void>;
+type ParseRSSFeedAndSaveToDatabase = {
+    forceParse?: boolean;
+};
+export declare const parseRSSFeedAndSaveToDatabase: (url: string, podcast_index_id: number, options?: ParseRSSFeedAndSaveToDatabase) => Promise<void>;
+export {};
 //# 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":"AAoBA,eAAO,MAAM,kBAAkB,GAAU,KAAK,MAAM,oDASnD,CAAC;AAQF,eAAO,MAAM,6BAA6B,GAAU,KAAK,MAAM,EAAE,kBAAkB,MAAM,kBAoFxF,CAAC"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../src/lib/rss/parser.ts"],"names":[],"mappings":"AAsBA,eAAO,MAAM,kBAAkB,GAAU,KAAK,MAAM,oDAUnD,CAAC;AAQF,KAAK,6BAA6B,GAAG;IACnC,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAA;AAED,eAAO,MAAM,6BAA6B,GACxC,KAAK,MAAM,EACX,kBAAkB,MAAM,EACxB,UAAS,6BAAkC,kBAwF5C,CAAC"}

package/dist/lib/rss/parser.js

@@ -11,10 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseRSSFeedAndSaveToDatabase = exports.getAndParseRSSFeed = void 0;
 const podcast_partytime_1 = require("podcast-partytime");
-const podverse_external_services_1 = require("podverse-external-services");
-const podverse_helpers_1 = require("podverse-helpers");
 const podverse_orm_1 = require("podverse-orm");
-const config_1 = require("@parser/config");
 const notifications_1 = require("@parser/lib/notifications");
 const channel_1 = require("@parser/lib/rss/channel/channel");
 const channelSeason_1 = require("@parser/lib/rss/channel/channelSeason");
@@ -23,38 +20,42 @@ const item_1 = require("@parser/lib/rss/item/item");
 const liveItem_1 = require("@parser/lib/rss/liveItem/liveItem");
 const remoteItemParser_1 = require("@parser/lib/rss/remoteItemParser");
 const errors_1 = require("./errors");
+const timerManager_1 = require("@parser/factories/timerManager");
+const loggerService_1 = require("@parser/factories/loggerService");
+const firebaseAccessTokenService_1 = require("@parser/factories/firebaseAccessTokenService");
+const notificationsService_1 = require("@parser/factories/notificationsService");
+const _request_1 = require("../_request");
 /*
   NOTE: All RSS feeds that have a podcast_index_id will be saved to the database.
   RSS feeds without podcast_index_id (Add By RSS feeds) will NOT be saved to the database.
 */
 const getAndParseRSSFeed = (url) => __awaiter(void 0, void 0, void 0, function* () {
-    const xml = yield (0, podverse_helpers_1.request)(url);
-    const parsedFeed = (0, podcast_partytime_1.parseFeed)(xml, { allowMissingGuid: true });
+    const response = yield (0, _request_1._request)(url);
+    const data = response.data;
+    const parsedFeed = (0, podcast_partytime_1.parseFeed)(data, { allowMissingGuid: true });
     if (!parsedFeed) {
         throw new Error(`getAndParseRSSFeed: parsedFeed not found for ${url}`);
     }
     return parsedFeed;
 });
 exports.getAndParseRSSFeed = getAndParseRSSFeed;
-// export const parseRSSAddByRSSFeed = async (url: string) => {
-//   const parsedFeed = await getAndParseRSSFeed(url);
-//   const compatData = convertParsedRSSFeedToCompat(parsedFeed);
-//   return compatData;
-// };
-const parseRSSFeedAndSaveToDatabase = (url, podcast_index_id) => __awaiter(void 0, void 0, void 0, function* () {
+const parseRSSFeedAndSaveToDatabase = (url_1, podcast_index_id_1, ...args_1) => __awaiter(void 0, [url_1, podcast_index_id_1, ...args_1], void 0, function* (url, podcast_index_id, options = {}) {
     const feedService = new podverse_orm_1.FeedService();
     let feed = null;
     let channel = null;
     const timerFullRunLabel = `parseRSSFeedAndSaveToDatabase ${url} ${podcast_index_id}`;
-    podverse_helpers_1.timerManager.start(timerFullRunLabel);
+    timerManager_1.timerManager.start(timerFullRunLabel);
     try {
-        podverse_helpers_1.logger.info(`parseRSSFeedAndSaveToDatabase ${url} ${podcast_index_id}`);
+        if (!url || !podcast_index_id) {
+            throw new Error(`parseRSSFeedAndSaveToDatabase: url or podcast_index_id is missing for ${url} ${podcast_index_id}`);
+        }
+        loggerService_1.loggerService.info(`parseRSSFeedAndSaveToDatabase url: ${url} podcast_index_id: ${podcast_index_id}`);
         feed = yield (0, feed_1.handleGetRSSFeed)(url, podcast_index_id);
         if (!(0, podverse_orm_1.checkIfFeedFlagStatusShouldParse)(feed.feed_flag_status.id)) {
             throw new Error(`parseRSSFeedAndSaveToDatabase: feed_flag_status.status is not Active or AlwaysAllow for ${feed.id} ${feed.channel.podcast_index_id} ${feed.url}`);
         }
         const parsedFeed = yield (0, feed_1.handleRequestRSSFeed)(feed);
-        feed = yield (0, feed_1.handleParsedFeed)(parsedFeed, feed);
+        feed = yield (0, feed_1.handleParsedFeed)(parsedFeed, feed, options);
         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);
@@ -66,15 +67,16 @@ const parseRSSFeedAndSaveToDatabase = (url, podcast_index_id) => __awaiter(void
         const channelSeasonService = new podverse_orm_1.ChannelSeasonService();
         const channelSeasonIndex = yield channelSeasonService.getChannelSeasonIndex(channel);
         yield (0, channel_1.handleParsedChannel)(parsedFeed, channel, channelSeasonIndex);
-        podverse_helpers_1.logger.info(`item count: ${parsedFeed.items.length}`);
+        loggerService_1.loggerService.info(`item count: ${parsedFeed.items.length}`);
         const newItemIdentifiers = yield (0, item_1.handleParsedItems)(parsedFeed.items, channel, channelSeasonIndex);
         let newLiveItemIdentifiers = { newItemGuids: [] };
         if (parsedFeed.podcastLiveItems) {
             newLiveItemIdentifiers = yield (0, liveItem_1.handleParsedLiveItems)(parsedFeed.podcastLiveItems, channel, channelSeasonIndex);
         }
         if (newItemIdentifiers.newItemGuids.length > 0 || newLiveItemIdentifiers.newItemGuids.length > 0) {
-            const googleAuthToken = yield (0, podverse_external_services_1.firebaseGenerateAccessToken)();
-            const notificationsService = new podverse_external_services_1.NotificationsService({ googleAuthToken });
+            const firebaseAccessTokenService = (0, firebaseAccessTokenService_1.firebaseAccessTokenServiceFactory)();
+            const googleAuthToken = yield firebaseAccessTokenService.generateAccessToken();
+            const notificationsService = (0, notificationsService_1.NotificationsServiceFactory)(googleAuthToken);
             const accountFCMDeviceService = new podverse_orm_1.AccountFCMDeviceService();
             const itemService = new podverse_orm_1.ItemService();
             if (newItemIdentifiers.newItemGuids.length > 0) {
@@ -89,26 +91,25 @@ const parseRSSFeedAndSaveToDatabase = (url, podcast_index_id) => __awaiter(void
     }
     catch (error) {
         if (error instanceof errors_1.FeedIsParsingError) {
-            podverse_helpers_1.logger.warn(`Feed ${feed === null || feed === void 0 ? void 0 : feed.id} is already parsing.`);
+            loggerService_1.loggerService.warn(`Feed ${feed === null || feed === void 0 ? void 0 : feed.id} is already parsing.`);
         }
         else if (error instanceof errors_1.FeedNoChangesSinceLastParsedError) {
-            podverse_helpers_1.logger.warn(`Feed ${feed === null || feed === void 0 ? void 0 : feed.id} has no changes since last parsed.`);
+            loggerService_1.loggerService.warn(`Feed ${feed === null || feed === void 0 ? void 0 : feed.id} has no changes since last parsed.`);
         }
         else {
             // TODO: Handle other errors
-            (0, podverse_helpers_1.logError)('parseRSSFeedAndSaveToDatabase', error);
+            loggerService_1.loggerService.logError('parseRSSFeedAndSaveToDatabase', error);
         }
     }
     finally {
-        podverse_helpers_1.timerManager.endAll();
+        loggerService_1.loggerService.info(`Finished parsing channel: ${channel === null || channel === void 0 ? void 0 : channel.id} ${channel === null || channel === void 0 ? void 0 : channel.id_text} feed: ${feed === null || feed === void 0 ? void 0 : feed.id} url: ${url} podcast_index_id: ${podcast_index_id}`);
+        timerManager_1.timerManager.endAll();
         if (feed) {
             yield feedService.update(feed.id, { is_parsing: null });
         }
     }
-    if (config_1.config.nodeEnv === 'production') {
-        if (channel) {
-            yield (0, remoteItemParser_1.handleAllRemoteItemsFeedParsing)(channel);
-        }
+    if (channel) {
+        yield (0, remoteItemParser_1.handleAllRemoteItemsFeedParsing)(channel);
     }
     return;
 });

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

@@ -1 +1 @@
-{"version":3,"file":"remoteItemParser.d.ts","sourceRoot":"","sources":["../../../src/lib/rss/remoteItemParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EACsD,MAAM,cAAc,CAAC;AAoD3F,eAAO,MAAM,+BAA+B,GAAU,SAAS,OAAO,kBAOrE,CAAC"}
+{"version":3,"file":"remoteItemParser.d.ts","sourceRoot":"","sources":["../../../src/lib/rss/remoteItemParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EACsD,MAAM,cAAc,CAAC;AAqD3F,eAAO,MAAM,+BAA+B,GAAU,SAAS,OAAO,kBAOrE,CAAC"}

package/dist/lib/rss/remoteItemParser.js

@@ -14,6 +14,7 @@ const podverse_helpers_1 = require("podverse-helpers");
 const podverse_orm_1 = require("podverse-orm");
 const podcastIndex_1 = require("@parser/factories/podcastIndex");
 const parser_1 = require("@parser/lib/rss/parser");
+const loggerService_1 = require("@parser/factories/loggerService");
 function handleRequestDelay(url) {
     return __awaiter(this, void 0, void 0, function* () {
         const delayConfig = [
@@ -49,7 +50,7 @@ const handleRemoteItemsFeedParsing = (feedGuidsToParse) => __awaiter(void 0, voi
         let feed = yield feedService.getByUrlAndPodcastIndexId({ url: piFeedData.url, podcast_index_id: piFeedData.id });
         if (!feed) {
             yield handleRequestDelay(piFeedData.url);
-            podverse_helpers_1.logger.info(`handleRemoteItemsFeedParsing: ${piFeedData.url} ${piFeedData.id}`);
+            loggerService_1.loggerService.info(`handleRemoteItemsFeedParsing: ${piFeedData.url} ${piFeedData.id}`);
             yield (0, parser_1.parseRSSFeedAndSaveToDatabase)(piFeedData.url, piFeedData.id);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "podverse-parser",
-  "version": "5.1.0-alpha.8",
+  "version": "5.1.3-alpha.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -17,20 +17,20 @@
   "license": "AGPLv3",
   "dependencies": {
     "module-alias": "^2.2.3",
-    "podcast-partytime": "^4.8.1",
-    "podverse-external-services": "^5.1.1-alpha.13",
-    "podverse-helpers": "^5.1.2-alpha.6",
-    "podverse-orm": "^5.1.0-alpha.10"
+    "podcast-partytime": "^4.9.1",
+    "podverse-external-services": "^5.1.3-alpha.0",
+    "podverse-helpers": "^5.1.3-alpha.0",
+    "podverse-orm": "^5.1.3-alpha.0"
   },
   "devDependencies": {
-    "@eslint/config-array": "^0.18.0",
-    "@eslint/eslintrc": "^3.1.0",
-    "@eslint/js": "^9.8.0",
-    "@types/node": "^22.0.0",
-    "eslint": "^9.9.0",
-    "nodemon": "^3.1.4",
+    "@eslint/config-array": "^0.21.0",
+    "@eslint/eslintrc": "^3.3.1",
+    "@eslint/js": "^9.35.0",
+    "@types/node": "^24.4.0",
+    "eslint": "^9.35.0",
+    "nodemon": "^3.1.10",
     "ts-node": "^10.9.2",
-    "typescript": "^5.5.4",
-    "typescript-eslint": "^8.0.1"
+    "typescript": "^5.9.2",
+    "typescript-eslint": "^8.44.0"
   }
 }