mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restart input stream on retried request

Browse source 
Co-authored-by: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
This commit is contained in:
automated-signal 2024-07-11 17:59:40 -05:00 committed by GitHub
parent 87f7203141
commit 45425c158d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ts/textsecure/WebAPI.ts
View file

@ -169,7 +169,7 @@ type PromiseAjaxOptionsType = {
basicAuth?: string; basicAuth?: string;
certificateAuthority?: string; certificateAuthority?: string;
contentType?: string; contentType?: string;
data?: Uint8Array | Readable | string; data?: Uint8Array | (() => Readable) | string;
disableRetries?: boolean; disableRetries?: boolean;
disableSessionResumption?: boolean; disableSessionResumption?: boolean;
headers?: HeaderListType; headers?: HeaderListType;
@ -299,7 +299,7 @@ async function getFetchOptions(
const fetchOptions = { const fetchOptions = {
method: options.type, method: options.type,
body: options.data, body: typeof options.data === 'function' ? options.data() : options.data,
headers: { headers: {
'User-Agent': getUserAgent(options.version), 'User-Agent': getUserAgent(options.version),
'X-Signal-Agent': 'OWD', 'X-Signal-Agent': 'OWD',
@ -1303,7 +1303,7 @@ export type WebAPIType = {
elements: VerifyServiceIdRequestType elements: VerifyServiceIdRequestType
) => Promise<VerifyServiceIdResponseType>; ) => Promise<VerifyServiceIdResponseType>;
putEncryptedAttachment: ( putEncryptedAttachment: (
encryptedBin: Uint8Array | Readable, encryptedBin: Uint8Array | (() => Readable),
uploadForm: AttachmentV3ResponseType uploadForm: AttachmentV3ResponseType
) => Promise<void>; ) => Promise<void>;
putProfile: ( putProfile: (
@ -3530,7 +3530,7 @@ export function initialize({
} }
async function putEncryptedAttachment( async function putEncryptedAttachment(
encryptedBin: Uint8Array | Readable, encryptedBin: Uint8Array | (() => Readable),
uploadForm: AttachmentV3ResponseType uploadForm: AttachmentV3ResponseType
) { ) {
const { signedUploadLocation, headers } = uploadForm; const { signedUploadLocation, headers } = uploadForm;

2
ts/util/uploadAttachment.ts
View file

@ -146,7 +146,7 @@ export async function uploadFile({
}); });
} else { } else {
await server.putEncryptedAttachment( await server.putEncryptedAttachment(
createReadStream(absoluteCiphertextPath), () => createReadStream(absoluteCiphertextPath),
uploadForm uploadForm
); );
} }