oxen-io
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add some logs to attachment download

This commit is contained in:
Audric Ackermann 2020-11-24 16:20:02 +11:00
parent 2ec337dd31
commit 0addf2146a
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ts/receiver/attachments.ts
View File

@ -12,7 +12,7 @@ export async function downloadAttachment(attachment: any) {
serverUrl serverUrl
); );
let res: ArrayBuffer | any = null; let res: ArrayBuffer | null = null;
// TODO: we need attachments to remember which API should be used to retrieve them // TODO: we need attachments to remember which API should be used to retrieve them
if (!defaultFileserver) { if (!defaultFileserver) {
@ -26,20 +26,29 @@ export async function downloadAttachment(attachment: any) {
} }
// Fallback to using the default fileserver // Fallback to using the default fileserver
if (defaultFileserver || !res || !res.ok) { if (defaultFileserver || !res || res.byteLength === 0) {
res = await window.lokiFileServerAPI.downloadAttachment(attachment.url); res = await window.lokiFileServerAPI.downloadAttachment(attachment.url);
} }
if (res.byteLength === 0) {
window.log.error('Failed to download attachment. Length is 0');
throw new Error(
`Failed to download attachment. Length is 0 for ${attachment.url}`
);
}
// FIXME "178" test to remove once this is fixed server side. // FIXME "178" test to remove once this is fixed server side.
if (!res.response || !res.response.data || res.response.data.length === 178) { if (!window.lokiFeatureFlags.useFileOnionRequestsV2) {
if (res?.response?.data?.length === 178) { if (res.byteLength === 178) {
window.log.error( window.log.error(
'Data of 178 length corresponds of a 404 returned as 200 by file.getsession.org.' 'Data of 178 length corresponds of a 404 returned as 200 by file.getsession.org.'
); );
throw new Error(
`downloadAttachment: invalid response for ${attachment.url}`
);
} }
throw new Error( } else {
`downloadAttachment: invalid response for ${attachment.url}` // if useFileOnionRequestsV2 is true, we expect an ArrayBuffer not empty
);
} }
// The attachment id is actually just the absolute url of the attachment // The attachment id is actually just the absolute url of the attachment