fix: merge conflict errors

src/Utils/messages-media.ts

@@ -4,13 +4,13 @@ import type { Options, Response } from 'got'
 import { Boom } from '@hapi/boom'
 import * as Crypto from 'crypto'
 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 { tmpdir } from 'os'
 import { URL } from 'url'
 import { join } from 'path'
 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 { hkdf } from './crypto'
 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 => {
     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
 		let uploadInfo = await refreshMediaConn(false)
 
-        let mediaUrl: string
+		let urls: { mediaUrl: string, directPath: string }
         const hosts = [ ...customUploadHosts, ...uploadInfo.hosts.map(h => h.hostname) ]
 		for (let hostname of hosts) {
 			const auth = encodeURIComponent(uploadInfo.auth) // the auth token
@@ -488,10 +489,14 @@ export const getWAUploadToServer = ({ customUploadHosts, agent, logger }: Common
 					}
 				)
 				const result = JSON.parse(responseText)
-                mediaUrl = result?.url
 				
-                if (mediaUrl) break
-                else {
+				if(result?.url || result?.directPath) {
+                    urls = {
+                        mediaUrl: result.url,
+                        directPath: result.direct_path
+                    }
+                    break
+                } else {
 					uploadInfo = await refreshMediaConn(true)
 					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...'}`)
 			}
 		}
-        if (!mediaUrl) {
+		if (!urls) {
 			throw new Boom(
 				'Media upload failed on all hosts',
 				{ statusCode: 500 }
 			)
 		}
-        return { mediaUrl }
+		return urls
 	}
 }