2021-07-22 04:15:17 -05:00
|
|
|
// Thanks: https://github.com/kwhitley/apicache
|
|
|
|
// We duplicated the library because it is unmaintened and prevent us to upgrade to recent NodeJS versions
|
|
|
|
|
2021-08-27 07:32:44 -05:00
|
|
|
import express from 'express'
|
2021-07-22 04:15:17 -05:00
|
|
|
import { OutgoingHttpHeaders } from 'http'
|
2023-07-31 07:34:36 -05:00
|
|
|
import { HttpStatusCodeType } from '@peertube/peertube-models'
|
|
|
|
import { isTestInstance } from '@peertube/peertube-node-utils'
|
|
|
|
import { parseDurationToMs } from '@server/helpers/core-utils.js'
|
|
|
|
import { logger } from '@server/helpers/logger.js'
|
|
|
|
import { Redis } from '@server/lib/redis.js'
|
|
|
|
import { asyncMiddleware } from '@server/middlewares/index.js'
|
2021-07-22 04:15:17 -05:00
|
|
|
|
|
|
|
export interface APICacheOptions {
|
|
|
|
headerBlacklist?: string[]
|
2023-07-31 07:34:36 -05:00
|
|
|
excludeStatus?: HttpStatusCodeType[]
|
2021-07-22 04:15:17 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
interface CacheObject {
|
|
|
|
status: number
|
|
|
|
headers: OutgoingHttpHeaders
|
|
|
|
data: any
|
|
|
|
encoding: BufferEncoding
|
|
|
|
timestamp: number
|
|
|
|
}
|
|
|
|
|
|
|
|
export class ApiCache {
|
|
|
|
|
|
|
|
private readonly options: APICacheOptions
|
|
|
|
private readonly timers: { [ id: string ]: NodeJS.Timeout } = {}
|
|
|
|
|
Add Podcast RSS feeds (#5487)
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Add correct feed image to RSS channel
* Prefer HLS videos for podcast RSS
Remove video/stream titles, add optional height attribute to podcast RSS
* Prefix podcast RSS images with root server URL
* Add optional video query support to include captions
* Add transcripts & person images to podcast RSS feed
* Prefer webseed/webtorrent files over HLS fragmented mp4s
* Experimentally adding podcast fields to basic config page
* Add validation for new basic config fields
* Don't include "content" in podcast feed, use full description for "description"
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Add correct feed image to RSS channel
* Prefer HLS videos for podcast RSS
Remove video/stream titles, add optional height attribute to podcast RSS
* Prefix podcast RSS images with root server URL
* Add optional video query support to include captions
* Add transcripts & person images to podcast RSS feed
* Prefer webseed/webtorrent files over HLS fragmented mp4s
* Experimentally adding podcast fields to basic config page
* Add validation for new basic config fields
* Don't include "content" in podcast feed, use full description for "description"
* Add medium/socialInteract to podcast RSS feeds. Use HTML for description
* Change base production image to bullseye, install prosody in image
* Add liveItem and trackers to Podcast RSS feeds
Remove height from alternateEnclosure, replaced with title.
* Clear Podcast RSS feed cache when live streams start/end
* Upgrade to Node 16
* Refactor clearCacheRoute to use ApiCache
* Remove unnecessary type hint
* Update dockerfile to node 16, install python-is-python2
* Use new file paths for captions/playlists
* Fix legacy videos in RSS after migration to object storage
* Improve method of identifying non-fragmented mp4s in podcast RSS feeds
* Don't include fragmented MP4s in podcast RSS feeds
* Add experimental support for podcast:categories on the podcast RSS item
* Fix undefined category when no videos exist
Allows for empty feeds to exist (important for feeds that might only go live)
* Add support for podcast:locked -- user has to opt in to show their email
* Use comma for podcast:categories delimiter
* Make cache clearing async
* Fix merge, temporarily test with pfeed-podcast
* Syntax changes
* Add EXT_MIMETYPE constants for captions
* Update & fix tests, fix enclosure mimetypes, remove admin email
* Add test for podacst:socialInteract
* Add filters hooks for podcast customTags
* Remove showdown, updated to pfeed-podcast 6.1.2
* Add 'action:api.live-video.state.updated' hook
* Avoid assigning undefined category to podcast feeds
* Remove nvmrc
* Remove comment
* Remove unused podcast config
* Remove more unused podcast config
* Fix MChannelAccountDefault type hint missed in merge
* Remove extra line
* Re-add newline in config
* Fix lint errors for isEmailPublic
* Fix thumbnails in podcast feeds
* Requested changes based on review
* Provide podcast rss 2.0 only on video channels
* Misc cleanup for a less messy PR
* Lint fixes
* Remove pfeed-podcast
* Add peertube version to new hooks
* Don't use query include, remove TODO
* Remove film medium hack
* Clear podcast rss cache before video/channel update hooks
* Clear podcast rss cache before video uploaded/deleted hooks
* Refactor podcast feed cache clearing
* Set correct person name from video channel
* Styling
* Fix tests
---------
Co-authored-by: Chocobozzz <me@florianbigard.com>
2023-05-22 09:00:05 -05:00
|
|
|
private readonly index = {
|
|
|
|
groups: [] as string[],
|
|
|
|
all: [] as string[]
|
|
|
|
}
|
|
|
|
|
|
|
|
// Cache keys per group
|
|
|
|
private groups: { [groupIndex: string]: string[] } = {}
|
2021-07-22 04:15:17 -05:00
|
|
|
|
2023-06-05 03:05:49 -05:00
|
|
|
private readonly seed: number
|
|
|
|
|
2021-07-22 04:15:17 -05:00
|
|
|
constructor (options: APICacheOptions) {
|
2023-06-05 03:05:49 -05:00
|
|
|
this.seed = new Date().getTime()
|
|
|
|
|
2021-07-22 04:15:17 -05:00
|
|
|
this.options = {
|
|
|
|
headerBlacklist: [],
|
|
|
|
excludeStatus: [],
|
|
|
|
|
|
|
|
...options
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
buildMiddleware (strDuration: string) {
|
|
|
|
const duration = parseDurationToMs(strDuration)
|
|
|
|
|
2021-12-24 07:49:03 -06:00
|
|
|
return asyncMiddleware(
|
|
|
|
async (req: express.Request, res: express.Response, next: express.NextFunction) => {
|
Add Podcast RSS feeds (#5487)
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Add correct feed image to RSS channel
* Prefer HLS videos for podcast RSS
Remove video/stream titles, add optional height attribute to podcast RSS
* Prefix podcast RSS images with root server URL
* Add optional video query support to include captions
* Add transcripts & person images to podcast RSS feed
* Prefer webseed/webtorrent files over HLS fragmented mp4s
* Experimentally adding podcast fields to basic config page
* Add validation for new basic config fields
* Don't include "content" in podcast feed, use full description for "description"
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Add correct feed image to RSS channel
* Prefer HLS videos for podcast RSS
Remove video/stream titles, add optional height attribute to podcast RSS
* Prefix podcast RSS images with root server URL
* Add optional video query support to include captions
* Add transcripts & person images to podcast RSS feed
* Prefer webseed/webtorrent files over HLS fragmented mp4s
* Experimentally adding podcast fields to basic config page
* Add validation for new basic config fields
* Don't include "content" in podcast feed, use full description for "description"
* Add medium/socialInteract to podcast RSS feeds. Use HTML for description
* Change base production image to bullseye, install prosody in image
* Add liveItem and trackers to Podcast RSS feeds
Remove height from alternateEnclosure, replaced with title.
* Clear Podcast RSS feed cache when live streams start/end
* Upgrade to Node 16
* Refactor clearCacheRoute to use ApiCache
* Remove unnecessary type hint
* Update dockerfile to node 16, install python-is-python2
* Use new file paths for captions/playlists
* Fix legacy videos in RSS after migration to object storage
* Improve method of identifying non-fragmented mp4s in podcast RSS feeds
* Don't include fragmented MP4s in podcast RSS feeds
* Add experimental support for podcast:categories on the podcast RSS item
* Fix undefined category when no videos exist
Allows for empty feeds to exist (important for feeds that might only go live)
* Add support for podcast:locked -- user has to opt in to show their email
* Use comma for podcast:categories delimiter
* Make cache clearing async
* Fix merge, temporarily test with pfeed-podcast
* Syntax changes
* Add EXT_MIMETYPE constants for captions
* Update & fix tests, fix enclosure mimetypes, remove admin email
* Add test for podacst:socialInteract
* Add filters hooks for podcast customTags
* Remove showdown, updated to pfeed-podcast 6.1.2
* Add 'action:api.live-video.state.updated' hook
* Avoid assigning undefined category to podcast feeds
* Remove nvmrc
* Remove comment
* Remove unused podcast config
* Remove more unused podcast config
* Fix MChannelAccountDefault type hint missed in merge
* Remove extra line
* Re-add newline in config
* Fix lint errors for isEmailPublic
* Fix thumbnails in podcast feeds
* Requested changes based on review
* Provide podcast rss 2.0 only on video channels
* Misc cleanup for a less messy PR
* Lint fixes
* Remove pfeed-podcast
* Add peertube version to new hooks
* Don't use query include, remove TODO
* Remove film medium hack
* Clear podcast rss cache before video/channel update hooks
* Clear podcast rss cache before video uploaded/deleted hooks
* Refactor podcast feed cache clearing
* Set correct person name from video channel
* Styling
* Fix tests
---------
Co-authored-by: Chocobozzz <me@florianbigard.com>
2023-05-22 09:00:05 -05:00
|
|
|
const key = this.getCacheKey(req)
|
2021-12-24 07:49:03 -06:00
|
|
|
const redis = Redis.Instance.getClient()
|
2021-07-22 04:15:17 -05:00
|
|
|
|
2021-12-24 07:49:03 -06:00
|
|
|
if (!Redis.Instance.isConnected()) return this.makeResponseCacheable(res, next, key, duration)
|
2021-07-22 04:15:17 -05:00
|
|
|
|
2021-12-24 07:49:03 -06:00
|
|
|
try {
|
2022-11-14 09:26:20 -06:00
|
|
|
const obj = await redis.hgetall(key)
|
2021-12-24 07:49:03 -06:00
|
|
|
if (obj?.response) {
|
2021-07-22 04:15:17 -05:00
|
|
|
return this.sendCachedResponse(req, res, JSON.parse(obj.response), duration)
|
|
|
|
}
|
|
|
|
|
|
|
|
return this.makeResponseCacheable(res, next, key, duration)
|
2021-12-24 07:49:03 -06:00
|
|
|
} catch (err) {
|
|
|
|
return this.makeResponseCacheable(res, next, key, duration)
|
|
|
|
}
|
2021-07-22 04:15:17 -05:00
|
|
|
}
|
2021-12-24 07:49:03 -06:00
|
|
|
)
|
2021-07-22 04:15:17 -05:00
|
|
|
}
|
|
|
|
|
Add Podcast RSS feeds (#5487)
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Add correct feed image to RSS channel
* Prefer HLS videos for podcast RSS
Remove video/stream titles, add optional height attribute to podcast RSS
* Prefix podcast RSS images with root server URL
* Add optional video query support to include captions
* Add transcripts & person images to podcast RSS feed
* Prefer webseed/webtorrent files over HLS fragmented mp4s
* Experimentally adding podcast fields to basic config page
* Add validation for new basic config fields
* Don't include "content" in podcast feed, use full description for "description"
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Add correct feed image to RSS channel
* Prefer HLS videos for podcast RSS
Remove video/stream titles, add optional height attribute to podcast RSS
* Prefix podcast RSS images with root server URL
* Add optional video query support to include captions
* Add transcripts & person images to podcast RSS feed
* Prefer webseed/webtorrent files over HLS fragmented mp4s
* Experimentally adding podcast fields to basic config page
* Add validation for new basic config fields
* Don't include "content" in podcast feed, use full description for "description"
* Add medium/socialInteract to podcast RSS feeds. Use HTML for description
* Change base production image to bullseye, install prosody in image
* Add liveItem and trackers to Podcast RSS feeds
Remove height from alternateEnclosure, replaced with title.
* Clear Podcast RSS feed cache when live streams start/end
* Upgrade to Node 16
* Refactor clearCacheRoute to use ApiCache
* Remove unnecessary type hint
* Update dockerfile to node 16, install python-is-python2
* Use new file paths for captions/playlists
* Fix legacy videos in RSS after migration to object storage
* Improve method of identifying non-fragmented mp4s in podcast RSS feeds
* Don't include fragmented MP4s in podcast RSS feeds
* Add experimental support for podcast:categories on the podcast RSS item
* Fix undefined category when no videos exist
Allows for empty feeds to exist (important for feeds that might only go live)
* Add support for podcast:locked -- user has to opt in to show their email
* Use comma for podcast:categories delimiter
* Make cache clearing async
* Fix merge, temporarily test with pfeed-podcast
* Syntax changes
* Add EXT_MIMETYPE constants for captions
* Update & fix tests, fix enclosure mimetypes, remove admin email
* Add test for podacst:socialInteract
* Add filters hooks for podcast customTags
* Remove showdown, updated to pfeed-podcast 6.1.2
* Add 'action:api.live-video.state.updated' hook
* Avoid assigning undefined category to podcast feeds
* Remove nvmrc
* Remove comment
* Remove unused podcast config
* Remove more unused podcast config
* Fix MChannelAccountDefault type hint missed in merge
* Remove extra line
* Re-add newline in config
* Fix lint errors for isEmailPublic
* Fix thumbnails in podcast feeds
* Requested changes based on review
* Provide podcast rss 2.0 only on video channels
* Misc cleanup for a less messy PR
* Lint fixes
* Remove pfeed-podcast
* Add peertube version to new hooks
* Don't use query include, remove TODO
* Remove film medium hack
* Clear podcast rss cache before video/channel update hooks
* Clear podcast rss cache before video uploaded/deleted hooks
* Refactor podcast feed cache clearing
* Set correct person name from video channel
* Styling
* Fix tests
---------
Co-authored-by: Chocobozzz <me@florianbigard.com>
2023-05-22 09:00:05 -05:00
|
|
|
clearGroupSafe (group: string) {
|
|
|
|
const run = async () => {
|
|
|
|
const cacheKeys = this.groups[group]
|
|
|
|
if (!cacheKeys) return
|
|
|
|
|
|
|
|
for (const key of cacheKeys) {
|
|
|
|
try {
|
|
|
|
await this.clear(key)
|
|
|
|
} catch (err) {
|
|
|
|
logger.error('Cannot clear ' + key, { err })
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
delete this.groups[group]
|
|
|
|
}
|
|
|
|
|
|
|
|
void run()
|
|
|
|
}
|
|
|
|
|
|
|
|
private getCacheKey (req: express.Request) {
|
2023-06-05 03:05:49 -05:00
|
|
|
return Redis.Instance.getPrefix() + 'api-cache-' + this.seed + '-' + req.originalUrl
|
Add Podcast RSS feeds (#5487)
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Add correct feed image to RSS channel
* Prefer HLS videos for podcast RSS
Remove video/stream titles, add optional height attribute to podcast RSS
* Prefix podcast RSS images with root server URL
* Add optional video query support to include captions
* Add transcripts & person images to podcast RSS feed
* Prefer webseed/webtorrent files over HLS fragmented mp4s
* Experimentally adding podcast fields to basic config page
* Add validation for new basic config fields
* Don't include "content" in podcast feed, use full description for "description"
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Add correct feed image to RSS channel
* Prefer HLS videos for podcast RSS
Remove video/stream titles, add optional height attribute to podcast RSS
* Prefix podcast RSS images with root server URL
* Add optional video query support to include captions
* Add transcripts & person images to podcast RSS feed
* Prefer webseed/webtorrent files over HLS fragmented mp4s
* Experimentally adding podcast fields to basic config page
* Add validation for new basic config fields
* Don't include "content" in podcast feed, use full description for "description"
* Add medium/socialInteract to podcast RSS feeds. Use HTML for description
* Change base production image to bullseye, install prosody in image
* Add liveItem and trackers to Podcast RSS feeds
Remove height from alternateEnclosure, replaced with title.
* Clear Podcast RSS feed cache when live streams start/end
* Upgrade to Node 16
* Refactor clearCacheRoute to use ApiCache
* Remove unnecessary type hint
* Update dockerfile to node 16, install python-is-python2
* Use new file paths for captions/playlists
* Fix legacy videos in RSS after migration to object storage
* Improve method of identifying non-fragmented mp4s in podcast RSS feeds
* Don't include fragmented MP4s in podcast RSS feeds
* Add experimental support for podcast:categories on the podcast RSS item
* Fix undefined category when no videos exist
Allows for empty feeds to exist (important for feeds that might only go live)
* Add support for podcast:locked -- user has to opt in to show their email
* Use comma for podcast:categories delimiter
* Make cache clearing async
* Fix merge, temporarily test with pfeed-podcast
* Syntax changes
* Add EXT_MIMETYPE constants for captions
* Update & fix tests, fix enclosure mimetypes, remove admin email
* Add test for podacst:socialInteract
* Add filters hooks for podcast customTags
* Remove showdown, updated to pfeed-podcast 6.1.2
* Add 'action:api.live-video.state.updated' hook
* Avoid assigning undefined category to podcast feeds
* Remove nvmrc
* Remove comment
* Remove unused podcast config
* Remove more unused podcast config
* Fix MChannelAccountDefault type hint missed in merge
* Remove extra line
* Re-add newline in config
* Fix lint errors for isEmailPublic
* Fix thumbnails in podcast feeds
* Requested changes based on review
* Provide podcast rss 2.0 only on video channels
* Misc cleanup for a less messy PR
* Lint fixes
* Remove pfeed-podcast
* Add peertube version to new hooks
* Don't use query include, remove TODO
* Remove film medium hack
* Clear podcast rss cache before video/channel update hooks
* Clear podcast rss cache before video uploaded/deleted hooks
* Refactor podcast feed cache clearing
* Set correct person name from video channel
* Styling
* Fix tests
---------
Co-authored-by: Chocobozzz <me@florianbigard.com>
2023-05-22 09:00:05 -05:00
|
|
|
}
|
|
|
|
|
2021-07-22 04:15:17 -05:00
|
|
|
private shouldCacheResponse (response: express.Response) {
|
|
|
|
if (!response) return false
|
2023-07-31 07:34:36 -05:00
|
|
|
if (this.options.excludeStatus.includes(response.statusCode as HttpStatusCodeType)) return false
|
2021-07-22 04:15:17 -05:00
|
|
|
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
Add Podcast RSS feeds (#5487)
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Add correct feed image to RSS channel
* Prefer HLS videos for podcast RSS
Remove video/stream titles, add optional height attribute to podcast RSS
* Prefix podcast RSS images with root server URL
* Add optional video query support to include captions
* Add transcripts & person images to podcast RSS feed
* Prefer webseed/webtorrent files over HLS fragmented mp4s
* Experimentally adding podcast fields to basic config page
* Add validation for new basic config fields
* Don't include "content" in podcast feed, use full description for "description"
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Add correct feed image to RSS channel
* Prefer HLS videos for podcast RSS
Remove video/stream titles, add optional height attribute to podcast RSS
* Prefix podcast RSS images with root server URL
* Add optional video query support to include captions
* Add transcripts & person images to podcast RSS feed
* Prefer webseed/webtorrent files over HLS fragmented mp4s
* Experimentally adding podcast fields to basic config page
* Add validation for new basic config fields
* Don't include "content" in podcast feed, use full description for "description"
* Add medium/socialInteract to podcast RSS feeds. Use HTML for description
* Change base production image to bullseye, install prosody in image
* Add liveItem and trackers to Podcast RSS feeds
Remove height from alternateEnclosure, replaced with title.
* Clear Podcast RSS feed cache when live streams start/end
* Upgrade to Node 16
* Refactor clearCacheRoute to use ApiCache
* Remove unnecessary type hint
* Update dockerfile to node 16, install python-is-python2
* Use new file paths for captions/playlists
* Fix legacy videos in RSS after migration to object storage
* Improve method of identifying non-fragmented mp4s in podcast RSS feeds
* Don't include fragmented MP4s in podcast RSS feeds
* Add experimental support for podcast:categories on the podcast RSS item
* Fix undefined category when no videos exist
Allows for empty feeds to exist (important for feeds that might only go live)
* Add support for podcast:locked -- user has to opt in to show their email
* Use comma for podcast:categories delimiter
* Make cache clearing async
* Fix merge, temporarily test with pfeed-podcast
* Syntax changes
* Add EXT_MIMETYPE constants for captions
* Update & fix tests, fix enclosure mimetypes, remove admin email
* Add test for podacst:socialInteract
* Add filters hooks for podcast customTags
* Remove showdown, updated to pfeed-podcast 6.1.2
* Add 'action:api.live-video.state.updated' hook
* Avoid assigning undefined category to podcast feeds
* Remove nvmrc
* Remove comment
* Remove unused podcast config
* Remove more unused podcast config
* Fix MChannelAccountDefault type hint missed in merge
* Remove extra line
* Re-add newline in config
* Fix lint errors for isEmailPublic
* Fix thumbnails in podcast feeds
* Requested changes based on review
* Provide podcast rss 2.0 only on video channels
* Misc cleanup for a less messy PR
* Lint fixes
* Remove pfeed-podcast
* Add peertube version to new hooks
* Don't use query include, remove TODO
* Remove film medium hack
* Clear podcast rss cache before video/channel update hooks
* Clear podcast rss cache before video uploaded/deleted hooks
* Refactor podcast feed cache clearing
* Set correct person name from video channel
* Styling
* Fix tests
---------
Co-authored-by: Chocobozzz <me@florianbigard.com>
2023-05-22 09:00:05 -05:00
|
|
|
private addIndexEntries (key: string, res: express.Response) {
|
2021-07-22 04:15:17 -05:00
|
|
|
this.index.all.unshift(key)
|
Add Podcast RSS feeds (#5487)
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Add correct feed image to RSS channel
* Prefer HLS videos for podcast RSS
Remove video/stream titles, add optional height attribute to podcast RSS
* Prefix podcast RSS images with root server URL
* Add optional video query support to include captions
* Add transcripts & person images to podcast RSS feed
* Prefer webseed/webtorrent files over HLS fragmented mp4s
* Experimentally adding podcast fields to basic config page
* Add validation for new basic config fields
* Don't include "content" in podcast feed, use full description for "description"
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Add correct feed image to RSS channel
* Prefer HLS videos for podcast RSS
Remove video/stream titles, add optional height attribute to podcast RSS
* Prefix podcast RSS images with root server URL
* Add optional video query support to include captions
* Add transcripts & person images to podcast RSS feed
* Prefer webseed/webtorrent files over HLS fragmented mp4s
* Experimentally adding podcast fields to basic config page
* Add validation for new basic config fields
* Don't include "content" in podcast feed, use full description for "description"
* Add medium/socialInteract to podcast RSS feeds. Use HTML for description
* Change base production image to bullseye, install prosody in image
* Add liveItem and trackers to Podcast RSS feeds
Remove height from alternateEnclosure, replaced with title.
* Clear Podcast RSS feed cache when live streams start/end
* Upgrade to Node 16
* Refactor clearCacheRoute to use ApiCache
* Remove unnecessary type hint
* Update dockerfile to node 16, install python-is-python2
* Use new file paths for captions/playlists
* Fix legacy videos in RSS after migration to object storage
* Improve method of identifying non-fragmented mp4s in podcast RSS feeds
* Don't include fragmented MP4s in podcast RSS feeds
* Add experimental support for podcast:categories on the podcast RSS item
* Fix undefined category when no videos exist
Allows for empty feeds to exist (important for feeds that might only go live)
* Add support for podcast:locked -- user has to opt in to show their email
* Use comma for podcast:categories delimiter
* Make cache clearing async
* Fix merge, temporarily test with pfeed-podcast
* Syntax changes
* Add EXT_MIMETYPE constants for captions
* Update & fix tests, fix enclosure mimetypes, remove admin email
* Add test for podacst:socialInteract
* Add filters hooks for podcast customTags
* Remove showdown, updated to pfeed-podcast 6.1.2
* Add 'action:api.live-video.state.updated' hook
* Avoid assigning undefined category to podcast feeds
* Remove nvmrc
* Remove comment
* Remove unused podcast config
* Remove more unused podcast config
* Fix MChannelAccountDefault type hint missed in merge
* Remove extra line
* Re-add newline in config
* Fix lint errors for isEmailPublic
* Fix thumbnails in podcast feeds
* Requested changes based on review
* Provide podcast rss 2.0 only on video channels
* Misc cleanup for a less messy PR
* Lint fixes
* Remove pfeed-podcast
* Add peertube version to new hooks
* Don't use query include, remove TODO
* Remove film medium hack
* Clear podcast rss cache before video/channel update hooks
* Clear podcast rss cache before video uploaded/deleted hooks
* Refactor podcast feed cache clearing
* Set correct person name from video channel
* Styling
* Fix tests
---------
Co-authored-by: Chocobozzz <me@florianbigard.com>
2023-05-22 09:00:05 -05:00
|
|
|
|
|
|
|
const groups = res.locals.apicacheGroups || []
|
|
|
|
|
|
|
|
for (const group of groups) {
|
|
|
|
if (!this.groups[group]) this.groups[group] = []
|
|
|
|
|
|
|
|
this.groups[group].push(key)
|
|
|
|
}
|
2021-07-22 04:15:17 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
private filterBlacklistedHeaders (headers: OutgoingHttpHeaders) {
|
|
|
|
return Object.keys(headers)
|
|
|
|
.filter(key => !this.options.headerBlacklist.includes(key))
|
|
|
|
.reduce((acc, header) => {
|
|
|
|
acc[header] = headers[header]
|
|
|
|
|
|
|
|
return acc
|
|
|
|
}, {})
|
|
|
|
}
|
|
|
|
|
|
|
|
private createCacheObject (status: number, headers: OutgoingHttpHeaders, data: any, encoding: BufferEncoding) {
|
|
|
|
return {
|
|
|
|
status,
|
|
|
|
headers: this.filterBlacklistedHeaders(headers),
|
|
|
|
data,
|
|
|
|
encoding,
|
|
|
|
|
|
|
|
// Seconds since epoch, used to properly decrement max-age headers in cached responses.
|
|
|
|
timestamp: new Date().getTime() / 1000
|
|
|
|
} as CacheObject
|
|
|
|
}
|
|
|
|
|
2021-12-24 07:49:03 -06:00
|
|
|
private async cacheResponse (key: string, value: object, duration: number) {
|
2021-07-22 04:15:17 -05:00
|
|
|
const redis = Redis.Instance.getClient()
|
|
|
|
|
2021-12-24 07:49:03 -06:00
|
|
|
if (Redis.Instance.isConnected()) {
|
|
|
|
await Promise.all([
|
2022-11-14 09:26:20 -06:00
|
|
|
redis.hset(key, 'response', JSON.stringify(value)),
|
|
|
|
redis.hset(key, 'duration', duration + ''),
|
2021-07-22 04:15:17 -05:00
|
|
|
redis.expire(key, duration / 1000)
|
2021-12-24 07:49:03 -06:00
|
|
|
])
|
2021-07-22 04:15:17 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// add automatic cache clearing from duration, includes max limit on setTimeout
|
2021-12-24 07:49:03 -06:00
|
|
|
this.timers[key] = setTimeout(() => {
|
|
|
|
this.clear(key)
|
|
|
|
.catch(err => logger.error('Cannot clear Redis key %s.', key, { err }))
|
|
|
|
}, Math.min(duration, 2147483647))
|
2021-07-22 04:15:17 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
private accumulateContent (res: express.Response, content: any) {
|
|
|
|
if (!content) return
|
|
|
|
|
|
|
|
if (typeof content === 'string') {
|
|
|
|
res.locals.apicache.content = (res.locals.apicache.content || '') + content
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
if (Buffer.isBuffer(content)) {
|
|
|
|
let oldContent = res.locals.apicache.content
|
|
|
|
|
|
|
|
if (typeof oldContent === 'string') {
|
|
|
|
oldContent = Buffer.from(oldContent)
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!oldContent) {
|
|
|
|
oldContent = Buffer.alloc(0)
|
|
|
|
}
|
|
|
|
|
|
|
|
res.locals.apicache.content = Buffer.concat(
|
|
|
|
[ oldContent, content ],
|
|
|
|
oldContent.length + content.length
|
|
|
|
)
|
|
|
|
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
res.locals.apicache.content = content
|
|
|
|
}
|
|
|
|
|
|
|
|
private makeResponseCacheable (res: express.Response, next: express.NextFunction, key: string, duration: number) {
|
|
|
|
const self = this
|
|
|
|
|
|
|
|
res.locals.apicache = {
|
2024-02-22 03:12:04 -06:00
|
|
|
write: res.write.bind(res),
|
|
|
|
writeHead: res.writeHead.bind(res),
|
|
|
|
end: res.end.bind(res),
|
2021-07-22 04:15:17 -05:00
|
|
|
cacheable: true,
|
|
|
|
content: undefined,
|
2022-03-24 07:36:47 -05:00
|
|
|
headers: undefined
|
2021-07-22 04:15:17 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// Patch express
|
|
|
|
res.writeHead = function () {
|
|
|
|
if (self.shouldCacheResponse(res)) {
|
|
|
|
res.setHeader('cache-control', 'max-age=' + (duration / 1000).toFixed(0))
|
|
|
|
} else {
|
|
|
|
res.setHeader('cache-control', 'no-cache, no-store, must-revalidate')
|
|
|
|
}
|
|
|
|
|
|
|
|
res.locals.apicache.headers = Object.assign({}, res.getHeaders())
|
|
|
|
return res.locals.apicache.writeHead.apply(this, arguments as any)
|
|
|
|
}
|
|
|
|
|
|
|
|
res.write = function (chunk: any) {
|
|
|
|
self.accumulateContent(res, chunk)
|
|
|
|
return res.locals.apicache.write.apply(this, arguments as any)
|
|
|
|
}
|
|
|
|
|
|
|
|
res.end = function (content: any, encoding: BufferEncoding) {
|
|
|
|
if (self.shouldCacheResponse(res)) {
|
|
|
|
self.accumulateContent(res, content)
|
|
|
|
|
|
|
|
if (res.locals.apicache.cacheable && res.locals.apicache.content) {
|
Add Podcast RSS feeds (#5487)
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Add correct feed image to RSS channel
* Prefer HLS videos for podcast RSS
Remove video/stream titles, add optional height attribute to podcast RSS
* Prefix podcast RSS images with root server URL
* Add optional video query support to include captions
* Add transcripts & person images to podcast RSS feed
* Prefer webseed/webtorrent files over HLS fragmented mp4s
* Experimentally adding podcast fields to basic config page
* Add validation for new basic config fields
* Don't include "content" in podcast feed, use full description for "description"
* Initial test implementation of Podcast RSS
This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option.
I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort.
* Update to pfeed-podcast 1.2.2
* Add correct feed image to RSS channel
* Prefer HLS videos for podcast RSS
Remove video/stream titles, add optional height attribute to podcast RSS
* Prefix podcast RSS images with root server URL
* Add optional video query support to include captions
* Add transcripts & person images to podcast RSS feed
* Prefer webseed/webtorrent files over HLS fragmented mp4s
* Experimentally adding podcast fields to basic config page
* Add validation for new basic config fields
* Don't include "content" in podcast feed, use full description for "description"
* Add medium/socialInteract to podcast RSS feeds. Use HTML for description
* Change base production image to bullseye, install prosody in image
* Add liveItem and trackers to Podcast RSS feeds
Remove height from alternateEnclosure, replaced with title.
* Clear Podcast RSS feed cache when live streams start/end
* Upgrade to Node 16
* Refactor clearCacheRoute to use ApiCache
* Remove unnecessary type hint
* Update dockerfile to node 16, install python-is-python2
* Use new file paths for captions/playlists
* Fix legacy videos in RSS after migration to object storage
* Improve method of identifying non-fragmented mp4s in podcast RSS feeds
* Don't include fragmented MP4s in podcast RSS feeds
* Add experimental support for podcast:categories on the podcast RSS item
* Fix undefined category when no videos exist
Allows for empty feeds to exist (important for feeds that might only go live)
* Add support for podcast:locked -- user has to opt in to show their email
* Use comma for podcast:categories delimiter
* Make cache clearing async
* Fix merge, temporarily test with pfeed-podcast
* Syntax changes
* Add EXT_MIMETYPE constants for captions
* Update & fix tests, fix enclosure mimetypes, remove admin email
* Add test for podacst:socialInteract
* Add filters hooks for podcast customTags
* Remove showdown, updated to pfeed-podcast 6.1.2
* Add 'action:api.live-video.state.updated' hook
* Avoid assigning undefined category to podcast feeds
* Remove nvmrc
* Remove comment
* Remove unused podcast config
* Remove more unused podcast config
* Fix MChannelAccountDefault type hint missed in merge
* Remove extra line
* Re-add newline in config
* Fix lint errors for isEmailPublic
* Fix thumbnails in podcast feeds
* Requested changes based on review
* Provide podcast rss 2.0 only on video channels
* Misc cleanup for a less messy PR
* Lint fixes
* Remove pfeed-podcast
* Add peertube version to new hooks
* Don't use query include, remove TODO
* Remove film medium hack
* Clear podcast rss cache before video/channel update hooks
* Clear podcast rss cache before video uploaded/deleted hooks
* Refactor podcast feed cache clearing
* Set correct person name from video channel
* Styling
* Fix tests
---------
Co-authored-by: Chocobozzz <me@florianbigard.com>
2023-05-22 09:00:05 -05:00
|
|
|
self.addIndexEntries(key, res)
|
2021-07-22 04:15:17 -05:00
|
|
|
|
|
|
|
const headers = res.locals.apicache.headers || res.getHeaders()
|
|
|
|
const cacheObject = self.createCacheObject(
|
|
|
|
res.statusCode,
|
|
|
|
headers,
|
|
|
|
res.locals.apicache.content,
|
|
|
|
encoding
|
|
|
|
)
|
|
|
|
self.cacheResponse(key, cacheObject, duration)
|
2021-12-24 07:49:03 -06:00
|
|
|
.catch(err => logger.error('Cannot cache response', { err }))
|
2021-07-22 04:15:17 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
res.locals.apicache.end.apply(this, arguments as any)
|
|
|
|
} as any
|
|
|
|
|
|
|
|
next()
|
|
|
|
}
|
|
|
|
|
|
|
|
private sendCachedResponse (request: express.Request, response: express.Response, cacheObject: CacheObject, duration: number) {
|
|
|
|
const headers = response.getHeaders()
|
|
|
|
|
|
|
|
if (isTestInstance()) {
|
|
|
|
Object.assign(headers, {
|
|
|
|
'x-api-cache-cached': 'true'
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
Object.assign(headers, this.filterBlacklistedHeaders(cacheObject.headers || {}), {
|
|
|
|
// Set properly decremented max-age header
|
|
|
|
// This ensures that max-age is in sync with the cache expiration
|
|
|
|
'cache-control':
|
|
|
|
'max-age=' +
|
|
|
|
Math.max(
|
|
|
|
0,
|
|
|
|
(duration / 1000 - (new Date().getTime() / 1000 - cacheObject.timestamp))
|
|
|
|
).toFixed(0)
|
|
|
|
})
|
|
|
|
|
|
|
|
// unstringify buffers
|
|
|
|
let data = cacheObject.data
|
|
|
|
if (data && data.type === 'Buffer') {
|
|
|
|
data = typeof data.data === 'number'
|
|
|
|
? Buffer.alloc(data.data)
|
|
|
|
: Buffer.from(data.data)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Test Etag against If-None-Match for 304
|
|
|
|
const cachedEtag = cacheObject.headers.etag
|
|
|
|
const requestEtag = request.headers['if-none-match']
|
|
|
|
|
|
|
|
if (requestEtag && cachedEtag === requestEtag) {
|
|
|
|
response.writeHead(304, headers)
|
|
|
|
return response.end()
|
|
|
|
}
|
|
|
|
|
|
|
|
response.writeHead(cacheObject.status || 200, headers)
|
|
|
|
|
|
|
|
return response.end(data, cacheObject.encoding)
|
|
|
|
}
|
|
|
|
|
2021-12-24 07:49:03 -06:00
|
|
|
private async clear (target: string) {
|
2021-07-22 04:15:17 -05:00
|
|
|
const redis = Redis.Instance.getClient()
|
|
|
|
|
|
|
|
if (target) {
|
|
|
|
clearTimeout(this.timers[target])
|
|
|
|
delete this.timers[target]
|
|
|
|
|
|
|
|
try {
|
2021-12-24 07:49:03 -06:00
|
|
|
await redis.del(target)
|
2021-07-22 04:15:17 -05:00
|
|
|
} catch (err) {
|
|
|
|
logger.error('Cannot delete %s in redis cache.', target, { err })
|
|
|
|
}
|
|
|
|
|
|
|
|
this.index.all = this.index.all.filter(key => key !== target)
|
|
|
|
} else {
|
|
|
|
for (const key of this.index.all) {
|
|
|
|
clearTimeout(this.timers[key])
|
|
|
|
delete this.timers[key]
|
|
|
|
|
|
|
|
try {
|
2021-12-24 07:49:03 -06:00
|
|
|
await redis.del(key)
|
2021-07-22 04:15:17 -05:00
|
|
|
} catch (err) {
|
|
|
|
logger.error('Cannot delete %s in redis cache.', key, { err })
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
this.index.all = []
|
|
|
|
}
|
|
|
|
|
|
|
|
return this.index
|
|
|
|
}
|
|
|
|
}
|