Merge pull request #25 from MarcelRobitaille/issue_22

Gracefully handle channel page giving 404

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## [3.0.2] 2025-01-03
+
+### Fixes
+- Fix writing headers after sending response in authentication server.
+- Gracefully handle channel page giving 404 (instead of killing the process) (#22).
+
 ## [3.0.1] 2024-12-31
 
 ### Fixes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bbyen",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Bring Back YouTube Email Notifications!",
   "main": "src/index.js",
   "scripts": {

src/google/auth/index.ts

@@ -74,13 +74,12 @@ const genAuthToken = async (oauth2Client: OAuth2Client) => {
 				try {
 					logger.info('Creating tokens from code')
 					const { tokens } = await oauth2Client.getToken(code)
-					res.end('Authorization successful. You may now close this tab.')
 					res.writeHead(200)
+						.end('Authorization successful. You may now close this tab.')
 					resolve(tokens)
 				} catch (err) {
 					console.error(err)
-					res.end(`Authorization failed. ${err}`)
-					res.writeHead(500)
+					res.writeHead(500).end(`Authorization failed. ${err}`)
 					reject(err)
 				}
 				server.close()

src/videos.ts

@@ -55,17 +55,19 @@ const getChannelsVideos = async ({
 	auth,
 	sendVideoEmail,
 	db,
-}: IGetChannelsVideos): boolean => {
-	const { channelId, channelTitle, channelThumbnail } = channel
+}: IGetChannelsVideos): Promise<boolean> => {
+	const { channelId, channelThumbnail } = channel
 
 	const videosSent = new Set((await db.all(SQL`
 		SELECT videoId FROM videos WHERE channelId=${channelId};
 	`)).map(v => v.videoId))
 
-	const feed = await parser.parseURL([
-		'https://www.youtube.com/feeds/videos.xml',
-		'?channel_id=', channelId,
-	].join(''))
+	const url = `https://www.youtube.com/feeds/videos.xml?channel_id=${channelId}`
+	const feed = await parser.parseURL(url)
+		.catch((err) => {
+			logger.warn(`Error parsing videos from '${url}': ${err.message}`)
+			return { items: [] }
+		})
 
 	for (let { videoId } of feed.items) {
 		try {