From 8fc9ca29165fa17484acfd165ad2e5ac5129304d Mon Sep 17 00:00:00 2001 From: wukko Date: Mon, 11 Nov 2024 12:23:53 +0600 Subject: [PATCH] api/bluesky: add a dispatcher & update unknown error message --- api/src/processing/match.js | 3 ++- api/src/processing/services/bluesky.js | 13 +++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/api/src/processing/match.js b/api/src/processing/match.js index 8500c3b5..96036e5e 100644 --- a/api/src/processing/match.js +++ b/api/src/processing/match.js @@ -240,7 +240,8 @@ export default async function({ host, patternMatch, params }) { case "bsky": r = await bluesky({ ...patternMatch, - alwaysProxy: params.alwaysProxy + alwaysProxy: params.alwaysProxy, + dispatcher }); break; diff --git a/api/src/processing/services/bluesky.js b/api/src/processing/services/bluesky.js index 98b92c64..75ee8e6a 100644 --- a/api/src/processing/services/bluesky.js +++ b/api/src/processing/services/bluesky.js @@ -2,12 +2,12 @@ import HLS from "hls-parser"; import { cobaltUserAgent } from "../../config.js"; import { createStream } from "../../stream/manage.js"; -const extractVideo = async ({ media, filename }) => { +const extractVideo = async ({ media, filename, dispatcher }) => { const urlMasterHLS = media?.playlist; if (!urlMasterHLS) return { error: "fetch.empty" }; if (!urlMasterHLS.startsWith("https://video.bsky.app/")) return { error: "fetch.empty" }; - const masterHLS = await fetch(urlMasterHLS) + const masterHLS = await fetch(urlMasterHLS, { dispatcher }) .then(r => { if (r.status !== 200) return; return r.text(); @@ -64,7 +64,7 @@ const extractImages = ({ getPost, filename, alwaysProxy }) => { return { picker }; } -export default async function ({ user, post, alwaysProxy }) { +export default async function ({ user, post, alwaysProxy, dispatcher }) { const apiEndpoint = new URL("https://public.api.bsky.app/xrpc/app.bsky.feed.getPostThread?depth=0&parentHeight=0"); apiEndpoint.searchParams.set( "uri", @@ -73,8 +73,9 @@ export default async function ({ user, post, alwaysProxy }) { const getPost = await fetch(apiEndpoint, { headers: { - "user-agent": cobaltUserAgent - } + "user-agent": cobaltUserAgent, + }, + dispatcher }).then(r => r.json()).catch(() => {}); if (!getPost) return { error: "fetch.empty" }; @@ -87,7 +88,7 @@ export default async function ({ user, post, alwaysProxy }) { case "InvalidRequest": return { error: "link.unsupported" }; default: - return { error: "fetch.empty" }; + return { error: "content.post.unavailable" }; } }