podverse-parser 5.1.6-alpha.3 → 5.1.7-alpha.0

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 import './module-alias-config';
 export { parseChapters } from './lib/chapters/chapters';
-export { parseRSSFeedAndSaveToDatabase, ParseRSSFeedAndSaveToDatabase } from './lib/rss/parser';
+export { parseRSSFeedAndSaveToDatabase } from './lib/rss/parser';
 //# 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,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,6BAA6B,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,uBAAuB,CAAC;AAE/B,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAC"}

package/dist/lib/rss/feed/feed.js

@@ -90,7 +90,7 @@ const handleParsedFeed = (parsedFeed_2, feed_1, ...args_1) => __awaiter(void 0,
         throw new errors_1.FeedNoChangesSinceLastParsedError(feed.id);
     }
     const feedService = new podverse_orm_1.FeedService();
-    return feedService.update(feed.id, { last_parsed_file_hash: currentFeedFileHash });
+    return feedService.update(feed.id, { last_parsed_file_hash: null });
 });
 exports.handleParsedFeed = handleParsedFeed;
 const checkIfFeedIsParsing = (feed) => {

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

@@ -1,6 +1,14 @@
-export declare const getAndParseRSSFeed: (url: string) => Promise<import("podcast-partytime").FeedObject>;
-export type ParseRSSFeedAndSaveToDatabase = {
-    forceParse?: boolean;
+import { OnDemandParserEventType } from 'podverse-helpers';
+import { FeedObject } from 'podcast-partytime';
+export declare const getAndParseRSSFeed: (url: string) => Promise<FeedObject>;
+export type ParseRSSOnDemandParserEvent = {
+    accountId: number | null;
+    remoteParentPodcastIndexId: number | null;
+    type: OnDemandParserEventType | null;
 };
-export declare const parseRSSFeedAndSaveToDatabase: (url: string, podcast_index_id: number, options: ParseRSSFeedAndSaveToDatabase) => Promise<void>;
+export type ParseRSSFeedAndSaveToDatabaseOptions = {
+    forceParse: boolean;
+    onDemandParserEvent: ParseRSSOnDemandParserEvent;
+};
+export declare const parseRSSFeedAndSaveToDatabase: (url: string, podcast_index_id: number, options: ParseRSSFeedAndSaveToDatabaseOptions) => Promise<void>;
 //# 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":"AAsBA,eAAO,MAAM,kBAAkB,GAAU,KAAK,MAAM,oDAUnD,CAAC;AAQF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAA;AAED,eAAO,MAAM,6BAA6B,GACxC,KAAK,MAAM,EACX,kBAAkB,MAAM,EACxB,SAAS,6BAA6B,kBAwFvC,CAAC"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../src/lib/rss/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EAIxB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAa,MAAM,mBAAmB,CAAC;AAgC1D,eAAO,MAAM,kBAAkB,GAAU,KAAK,MAAM,wBAUnD,CAAC;AAQF,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;AAED,eAAO,MAAM,6BAA6B,GACxC,KAAK,MAAM,EACX,kBAAkB,MAAM,EACxB,SAAS,oCAAoC,kBAuI9C,CAAC"}

package/dist/lib/rss/parser.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseRSSFeedAndSaveToDatabase = exports.getAndParseRSSFeed = void 0;
+const podverse_helpers_1 = require("podverse-helpers");
 const podcast_partytime_1 = require("podcast-partytime");
 const podverse_orm_1 = require("podverse-orm");
 // import { handleNewItemsNotifications, handleNewLiveItemsNotifications } from '@parser/lib/notifications';
@@ -25,6 +26,7 @@ const loggerService_1 = require("@parser/factories/loggerService");
 // import { firebaseAccessTokenServiceFactory } from '@parser/factories/firebaseAccessTokenService';
 // import { NotificationsServiceFactory } from '@parser/factories/notificationsService';
 const _request_1 = require("../_request");
+const parsedFeed_1 = require("./hash/parsedFeed");
 /*
   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.
@@ -40,11 +42,31 @@ const getAndParseRSSFeed = (url) => __awaiter(void 0, void 0, void 0, function*
 });
 exports.getAndParseRSSFeed = getAndParseRSSFeed;
 const parseRSSFeedAndSaveToDatabase = (url, podcast_index_id, options) => __awaiter(void 0, void 0, void 0, function* () {
+    const { onDemandParserEvent } = options;
+    const onDemandParserEventService = new podverse_orm_1.OnDemandParserEventService();
+    if (onDemandParserEvent) {
+        const { accountId, type } = onDemandParserEvent;
+        if (accountId && type) {
+            if (type === podverse_helpers_1.OnDemandParserEventType.ADD) {
+                const count = yield onDemandParserEventService.getCountByAccountIdAndTypeSince(accountId, podverse_helpers_1.OnDemandParserEventType.ADD, (0, podverse_helpers_1.getOnDemandParserEventDateRange)());
+                if (count >= podverse_helpers_1.ON_DEMAND_ADD_PARSER_LIMIT) {
+                    throw new Error('Monthly on-demand add feed parser limit reached');
+                }
+            }
+            else if (type === podverse_helpers_1.OnDemandParserEventType.REFRESH) {
+                const count = yield onDemandParserEventService.getCountByAccountIdAndTypeSince(accountId, podverse_helpers_1.OnDemandParserEventType.REFRESH, (0, podverse_helpers_1.getOnDemandParserEventDateRange)());
+                if (count >= podverse_helpers_1.ON_DEMAND_REFRESH_PARSER_LIMIT) {
+                    throw new Error('Monthly on-demand refresh feed parser limit reached');
+                }
+            }
+        }
+    }
     const feedService = new podverse_orm_1.FeedService();
     let feed = null;
     let channel = null;
     const timerFullRunLabel = `parseRSSFeedAndSaveToDatabase ${url} ${podcast_index_id}`;
     timerManager_1.timerManager.start(timerFullRunLabel);
+    let parsedFeed = null;
     try {
         if (!url || !podcast_index_id) {
             throw new Error(`parseRSSFeedAndSaveToDatabase: url or podcast_index_id is missing for ${url} ${podcast_index_id}`);
@@ -54,7 +76,7 @@ const parseRSSFeedAndSaveToDatabase = (url, podcast_index_id, options) => __awai
         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.podcast_index_id} ${feed.url}`);
         }
-        const parsedFeed = yield (0, feed_1.handleRequestRSSFeed)(feed);
+        parsedFeed = yield (0, feed_1.handleRequestRSSFeed)(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)) {
@@ -105,11 +127,35 @@ const parseRSSFeedAndSaveToDatabase = (url, podcast_index_id, options) => __awai
         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 (parsedFeed) {
+                const currentFeedFileHash = (0, parsedFeed_1.getParsedFeedMd5Hash)(parsedFeed);
+                yield feedService.update(feed.id, {
+                    is_parsing: null,
+                    last_parsed_file_hash: currentFeedFileHash
+                });
+            }
+        }
+        if (onDemandParserEvent) {
+            const { accountId, remoteParentPodcastIndexId, type } = onDemandParserEvent;
+            if (accountId && type) {
+                const accountService = new podverse_orm_1.AccountService();
+                const account = yield accountService.get(accountId);
+                if (account) {
+                    yield onDemandParserEventService.create({
+                        account,
+                        podcastIndexId: podcast_index_id,
+                        remoteParentPodcastIndexId: remoteParentPodcastIndexId,
+                        type,
+                    });
+                }
+            }
         }
     }
     if (channel) {
-        yield (0, remoteItemParser_1.handleAllRemoteItemsFeedParsing)(channel);
+        yield (0, remoteItemParser_1.handleAllRemoteItemsFeedParsing)(channel, {
+            accountId: (onDemandParserEvent === null || onDemandParserEvent === void 0 ? void 0 : onDemandParserEvent.accountId) || null,
+            remoteParentPodcastIndexId: podcast_index_id,
+        });
     }
     return;
 });

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

@@ -1,3 +1,7 @@
-import { Channel } from "podverse-orm";
-export declare const handleAllRemoteItemsFeedParsing: (channel: Channel) => Promise<void>;
+import { Channel } from 'podverse-orm';
+export type OnDemandParserRemoteItemParams = {
+    accountId: number | null;
+    remoteParentPodcastIndexId: number;
+};
+export declare const handleAllRemoteItemsFeedParsing: (channel: Channel, params: OnDemandParserRemoteItemParams) => Promise<void>;
 //# sourceMappingURL=remoteItemParser.d.ts.map

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;AAwD3F,eAAO,MAAM,+BAA+B,GAAU,SAAS,OAAO,kBAOrE,CAAC"}
+{"version":3,"file":"remoteItemParser.d.ts","sourceRoot":"","sources":["../../../src/lib/rss/remoteItemParser.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,OAAO,EAUR,MAAM,cAAc,CAAC;AAUtB,MAAM,MAAM,8BAA8B,GAAG;IAC3C,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,0BAA0B,EAAE,MAAM,CAAC;CACpC,CAAA;AAoED,eAAO,MAAM,+BAA+B,GAAU,SAAS,OAAO,EAAE,QAAQ,8BAA8B,kBAO7G,CAAC"}

package/dist/lib/rss/remoteItemParser.js

@@ -28,8 +28,16 @@ function handleRequestDelay(url) {
         }
     });
 }
-const handleRemoteItemsFeedParsing = (feedGuidsToParse) => __awaiter(void 0, void 0, void 0, function* () {
+const handleRemoteItemsFeedParsing = (feedGuidsToParse, params) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
+    const { accountId, remoteParentPodcastIndexId } = params;
+    if (accountId) {
+        const onDemandParserEventService = new podverse_orm_1.OnDemandParserEventService();
+        const count = yield onDemandParserEventService.getCountByAccountIdAndTypeSince(accountId, podverse_helpers_1.OnDemandParserEventType.REMOTE_ITEM, (0, podverse_helpers_1.getOnDemandParserEventDateRange)());
+        if (count >= podverse_helpers_1.ON_DEMAND_REMOTE_ITEM_PARSER_LIMIT) {
+            throw new Error('Monthly on-demand remote item feed parser limit reached');
+        }
+    }
     const piFeedDatas = [];
     for (const feedGuid of feedGuidsToParse) {
         const feedService = new podverse_orm_1.FeedService();
@@ -54,46 +62,53 @@ const handleRemoteItemsFeedParsing = (feedGuidsToParse) => __awaiter(void 0, voi
         if (!feed) {
             yield handleRequestDelay(piFeedData.url);
             loggerService_1.loggerService.info(`handleRemoteItemsFeedParsing: ${piFeedData.url} ${piFeedData.id}`);
-            yield (0, parser_1.parseRSSFeedAndSaveToDatabase)(piFeedData.url, piFeedData.id, { forceParse: false });
+            yield (0, parser_1.parseRSSFeedAndSaveToDatabase)(piFeedData.url, piFeedData.id, {
+                forceParse: false,
+                onDemandParserEvent: {
+                    accountId,
+                    remoteParentPodcastIndexId,
+                    type: podverse_helpers_1.OnDemandParserEventType.REMOTE_ITEM,
+                },
+            });
         }
     }
 });
-const handleAllRemoteItemsFeedParsing = (channel) => __awaiter(void 0, void 0, void 0, function* () {
+const handleAllRemoteItemsFeedParsing = (channel, params) => __awaiter(void 0, void 0, void 0, function* () {
     const channelService = new podverse_orm_1.ChannelService();
     const latestChannel = yield channelService.get(channel.id);
-    yield handleRemoteItemsPodrollParsing(channel);
-    yield handleRemoteItemsPublisherParsing(channel);
-    yield handleRemoteItemsChannelParsing(channel);
-    yield handleRemoteItemsItemValueTimeSplitParsing(latestChannel);
+    yield handleRemoteItemsPodrollParsing(channel, params);
+    yield handleRemoteItemsPublisherParsing(channel, params);
+    yield handleRemoteItemsChannelParsing(channel, params);
+    yield handleRemoteItemsItemValueTimeSplitParsing(latestChannel, params);
 });
 exports.handleAllRemoteItemsFeedParsing = handleAllRemoteItemsFeedParsing;
-const handleRemoteItemsPodrollParsing = (channel) => __awaiter(void 0, void 0, void 0, function* () {
+const handleRemoteItemsPodrollParsing = (channel, params) => __awaiter(void 0, void 0, void 0, function* () {
     const channelPodrollService = new podverse_orm_1.ChannelPodrollService();
     const channelPodroll = yield channelPodrollService.get(channel);
     if (channelPodroll) {
         const channelPodrollRemoteItemService = new podverse_orm_1.ChannelPodrollRemoteItemService();
         const channelPodrollRemoteItems = yield channelPodrollRemoteItemService.getAll(channelPodroll);
-        const feedGuidsToParse = channelPodrollRemoteItems.map((remoteItem) => remoteItem.feed_guid);
-        yield handleRemoteItemsFeedParsing(feedGuidsToParse);
+        const feedGuidsToParse = channelPodrollRemoteItems.map(remoteItem => remoteItem.feed_guid);
+        yield handleRemoteItemsFeedParsing(feedGuidsToParse, params);
     }
 });
-const handleRemoteItemsPublisherParsing = (channel) => __awaiter(void 0, void 0, void 0, function* () {
+const handleRemoteItemsPublisherParsing = (channel, params) => __awaiter(void 0, void 0, void 0, function* () {
     const channelPublisherService = new podverse_orm_1.ChannelPublisherService();
     const channelPublisher = yield channelPublisherService.get(channel);
     if (channelPublisher) {
         const channelPublisherRemoteItemService = new podverse_orm_1.ChannelPublisherRemoteItemService();
         const channelPublisherRemoteItems = yield channelPublisherRemoteItemService.getAll(channelPublisher);
-        const feedGuidsToParse = channelPublisherRemoteItems.map((remoteItem) => remoteItem.feed_guid);
-        yield handleRemoteItemsFeedParsing(feedGuidsToParse);
+        const feedGuidsToParse = channelPublisherRemoteItems.map(remoteItem => remoteItem.feed_guid);
+        yield handleRemoteItemsFeedParsing(feedGuidsToParse, params);
     }
 });
-const handleRemoteItemsChannelParsing = (channel) => __awaiter(void 0, void 0, void 0, function* () {
+const handleRemoteItemsChannelParsing = (channel, params) => __awaiter(void 0, void 0, void 0, function* () {
     const channelRemoteItemService = new podverse_orm_1.ChannelRemoteItemService();
     const channelRemoteItems = yield channelRemoteItemService.getAll(channel);
-    const feedGuidsToParse = channelRemoteItems.map((remoteItem) => remoteItem.feed_guid);
-    yield handleRemoteItemsFeedParsing(feedGuidsToParse);
+    const feedGuidsToParse = channelRemoteItems.map(remoteItem => remoteItem.feed_guid);
+    yield handleRemoteItemsFeedParsing(feedGuidsToParse, params);
 });
-const handleRemoteItemsItemValueTimeSplitParsing = (channel) => __awaiter(void 0, void 0, void 0, function* () {
+const handleRemoteItemsItemValueTimeSplitParsing = (channel, params) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
     if (channel.has_value_time_splits) {
         const itemService = new podverse_orm_1.ItemService();
@@ -113,7 +128,7 @@ const handleRemoteItemsItemValueTimeSplitParsing = (channel) => __awaiter(void 0
                             for (const itemValueTimeSplit of itemValue.item_value_time_splits) {
                                 if (itemValueTimeSplit.item_value_time_split_remote_item) {
                                     const feedGuid = itemValueTimeSplit.item_value_time_split_remote_item.feed_guid;
-                                    yield handleRemoteItemsFeedParsing([feedGuid]);
+                                    yield handleRemoteItemsFeedParsing([feedGuid], params);
                                 }
                             }
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "podverse-parser",
-  "version": "5.1.6-alpha.3",
+  "version": "5.1.7-alpha.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,9 +18,9 @@
   "dependencies": {
     "module-alias": "^2.2.3",
     "podcast-partytime": "^4.9.1",
-    "podverse-external-services": "^5.1.6-alpha.3",
-    "podverse-helpers": "^5.1.6-alpha.1",
-    "podverse-orm": "^5.1.6-alpha.3"
+    "podverse-external-services": "^5.1.7-alpha.0",
+    "podverse-helpers": "^5.1.7-alpha.0",
+    "podverse-orm": "^5.1.7-alpha.0"
   },
   "devDependencies": {
     "@eslint/config-array": "^0.21.0",