zio
/
bsky-app
2
0
Fork 0
Code Pull Requests Packages Releases Activity

[Videos] Fix uploads (#5042) 

* fix pds url

* fix service auth exp

* whoopsie wrong branch
zio/stable
Samuel Newman 2024-08-30 18:44:00 +01:00 committed by GitHub
parent c60e8d0772
commit e7954e590b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/strings/url-helpers.ts
View File

@ -340,7 +340,7 @@ export function shortLinkToHref(url: string): string {
} }
} }
export function getHostnameFromUrl(url: string): string | null { export function getHostnameFromUrl(url: string | URL): string | null {
let urlp let urlp
try { try {
urlp = new URL(url) urlp = new URL(url)
@ -350,7 +350,7 @@ export function getHostnameFromUrl(url: string): string | null {
return urlp.hostname return urlp.hostname
} }
export function getServiceAuthAudFromUrl(url: string): string | null { export function getServiceAuthAudFromUrl(url: string | URL): string | null {
const hostname = getHostnameFromUrl(url) const hostname = getHostnameFromUrl(url)
if (!hostname) { if (!hostname) {
return null return null

9
src/state/queries/video/video-upload.ts
View File

@ -28,14 +28,11 @@ export const useUploadVideoMutation = ({
mutationFn: cancelable(async (video: CompressedVideo) => { mutationFn: cancelable(async (video: CompressedVideo) => {
const uri = createVideoEndpointUrl('/xrpc/app.bsky.video.uploadVideo', { const uri = createVideoEndpointUrl('/xrpc/app.bsky.video.uploadVideo', {
did: currentAccount!.did, did: currentAccount!.did,
name: `${nanoid(12)}.mp4`, // @TODO what are we limiting this to? name: `${nanoid(12)}.mp4`,
}) })
if (!currentAccount?.service) { const serviceAuthAud = getServiceAuthAudFromUrl(agent.dispatchUrl)
throw new Error('User is not logged in')
}
const serviceAuthAud = getServiceAuthAudFromUrl(currentAccount.service)
if (!serviceAuthAud) { if (!serviceAuthAud) {
throw new Error('Agent does not have a PDS URL') throw new Error('Agent does not have a PDS URL')
} }
@ -44,7 +41,7 @@ export const useUploadVideoMutation = ({
{ {
aud: serviceAuthAud, aud: serviceAuthAud,
lxm: 'com.atproto.repo.uploadBlob', lxm: 'com.atproto.repo.uploadBlob',
exp: Date.now() + 1000 * 60 * 30, // 30 minutes exp: Date.now() / 1000 + 60 * 30, // 30 minutes
}, },
) )

13
src/state/queries/video/video-upload.web.ts
View File

@ -30,11 +30,8 @@ export const useUploadVideoMutation = ({
name: `${nanoid(12)}.mp4`, // @TODO: make sure it's always mp4' name: `${nanoid(12)}.mp4`, // @TODO: make sure it's always mp4'
}) })
if (!currentAccount?.service) { const serviceAuthAud = getServiceAuthAudFromUrl(agent.dispatchUrl)
throw new Error('User is not logged in')
}
const serviceAuthAud = getServiceAuthAudFromUrl(currentAccount.service)
if (!serviceAuthAud) { if (!serviceAuthAud) {
throw new Error('Agent does not have a PDS URL') throw new Error('Agent does not have a PDS URL')
} }
@ -43,11 +40,15 @@ export const useUploadVideoMutation = ({
{ {
aud: serviceAuthAud, aud: serviceAuthAud,
lxm: 'com.atproto.repo.uploadBlob', lxm: 'com.atproto.repo.uploadBlob',
exp: Date.now() + 1000 * 60 * 30, // 30 minutes exp: Date.now() / 1000 + 60 * 30, // 30 minutes
}, },
) )
const bytes = await fetch(video.uri).then(res => res.arrayBuffer()) let bytes = video.bytes
if (!bytes) {
bytes = await fetch(video.uri).then(res => res.arrayBuffer())
}
const xhr = new XMLHttpRequest() const xhr = new XMLHttpRequest()
const res = await new Promise<AppBskyVideoDefs.JobStatus>( const res = await new Promise<AppBskyVideoDefs.JobStatus>(