franpcode/Baileys
1
0
Fork 0
mirror of https://github.com/FranP-code/Baileys.git synced 2025-10-13 00:32:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: merge conflict errors

Browse Source
This commit is contained in:
Adhiraj Singh
2021-12-17 19:30:10 +05:30
parent be0e2210d9
commit d8b415a075
1 changed files with 48 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Utils/messages-media.ts
View File

@@ -4,13 +4,13 @@ import type { Options, Response } from 'got'
import { Boom } from '@hapi/boom' import { Boom } from '@hapi/boom'
import * as Crypto from 'crypto' import * as Crypto from 'crypto'
import { Readable, Transform } from 'stream' import { Readable, Transform } from 'stream'
import { createReadStream, createWriteStream, promises as fs, ReadStream, WriteStream } from 'fs' import { createReadStream, createWriteStream, promises as fs, WriteStream } from 'fs'
import { exec } from 'child_process' import { exec } from 'child_process'
import { tmpdir } from 'os' import { tmpdir } from 'os'
import { URL } from 'url' import { URL } from 'url'
import { join } from 'path' import { join } from 'path'
import { once } from 'events' import { once } from 'events'
import { MessageType, WAMessageContent, WAProto, WAGenericMediaMessage, WAMediaUpload, MediaType, DownloadableMessage } from '../Types' import { MessageType, WAMessageContent, WAProto, WAGenericMediaMessage, WAMediaUpload, MediaType, DownloadableMessage, CommonSocketConfig, WAMediaUploadFunction, MediaConnInfo } from '../Types'
import { generateMessageID } from './generics' import { generateMessageID } from './generics'
import { hkdf } from './crypto' import { hkdf } from './crypto'
import { DEFAULT_ORIGIN, MEDIA_PATH_MAP } from '../Defaults' import { DEFAULT_ORIGIN, MEDIA_PATH_MAP } from '../Defaults'
@@ -463,10 +463,11 @@ export function extensionForMediaMessage(message: WAMessageContent) {
export const getWAUploadToServer = ({ customUploadHosts, agent, logger }: CommonSocketConfig<any>, refreshMediaConn: (force: boolean) => Promise<MediaConnInfo>): WAMediaUploadFunction => { export const getWAUploadToServer = ({ customUploadHosts, agent, logger }: CommonSocketConfig<any>, refreshMediaConn: (force: boolean) => Promise<MediaConnInfo>): WAMediaUploadFunction => {
return async(stream, { mediaType, fileEncSha256B64, timeoutMs }) => { return async(stream, { mediaType, fileEncSha256B64, timeoutMs }) => {
const { default: got } = await import('got')
// send a query JSON to obtain the url & auth token to upload our media // send a query JSON to obtain the url & auth token to upload our media
let uploadInfo = await refreshMediaConn(false) let uploadInfo = await refreshMediaConn(false)
let mediaUrl: string let urls: { mediaUrl: string, directPath: string }
const hosts = [ ...customUploadHosts, ...uploadInfo.hosts.map(h => h.hostname) ] const hosts = [ ...customUploadHosts, ...uploadInfo.hosts.map(h => h.hostname) ]
for (let hostname of hosts) { for (let hostname of hosts) {
const auth = encodeURIComponent(uploadInfo.auth) // the auth token const auth = encodeURIComponent(uploadInfo.auth) // the auth token
@@ -488,10 +489,14 @@ export const getWAUploadToServer = ({ customUploadHosts, agent, logger }: Common
} }
) )
const result = JSON.parse(responseText) const result = JSON.parse(responseText)
mediaUrl = result?.url
if (mediaUrl) break if(result?.url || result?.directPath) {
else { urls = {
mediaUrl: result.url,
directPath: result.direct_path
}
break
} else {
uploadInfo = await refreshMediaConn(true) uploadInfo = await refreshMediaConn(true)
throw new Error(`upload failed, reason: ${JSON.stringify(result)}`) throw new Error(`upload failed, reason: ${JSON.stringify(result)}`)
} }
@@ -500,12 +505,12 @@ export const getWAUploadToServer = ({ customUploadHosts, agent, logger }: Common
logger.debug(`Error in uploading to ${hostname} (${error}) ${isLast ? '' : ', retrying...'}`) logger.debug(`Error in uploading to ${hostname} (${error}) ${isLast ? '' : ', retrying...'}`)
} }
} }
if (!mediaUrl) { if (!urls) {
throw new Boom( throw new Boom(
'Media upload failed on all hosts', 'Media upload failed on all hosts',
{ statusCode: 500 } { statusCode: 500 }
) )
} }
return { mediaUrl } return urls
} }
} }