removed multi

Author: ravish1729

src/Lighthouse/upload/files/browser.ts

@@ -5,21 +5,23 @@ import {
   UploadFileReturnType,
   DealParameters,
 } from '../../../types'
-import { checkDuplicateFileNames, retryFetch } from '../../utils/util'
+import file from '../../uploadEncrypted/encrypt/file'
+import { fetchWithTimeout } from '../../utils/util'
 
 // eslint-disable-next-line @typescript-eslint/no-empty-function
 export default async <T extends boolean>(
   files: any,
   accessToken: string,
-  multi: boolean,
   dealParameters: DealParameters | undefined,
   uploadProgressCallback?: (data: IUploadProgressCallback) => void
 ): Promise<{ data: UploadFileReturnType<T> }> => {
   try {
-    const endpoint =
-      lighthouseConfig.lighthouseNode +
-      `/api/v0/add?wrap-with-directory=${multi}`
-    checkDuplicateFileNames(files)
+    const isDirectory = files.length === 1 && files[0].webkitRelativePath
+    let endpoint = lighthouseConfig.lighthouseNode + `/api/v0/add?wrap-with-directory=false`
+
+    if(!isDirectory && files.length > 1) {
+      endpoint = lighthouseConfig.lighthouseNode + `/api/v0/add?wrap-with-directory=true`
+    }
 
     const formData = new FormData()
     for (let i = 0; i < files.length; i++) {
@@ -36,7 +38,7 @@ export default async <T extends boolean>(
     })
 
     const response = uploadProgressCallback
-      ? await retryFetch(endpoint, {
+      ? await fetchWithTimeout(endpoint, {
           method: 'POST',
           body: formData,
           headers: headers,
@@ -47,7 +49,7 @@ export default async <T extends boolean>(
             })
           },
         })
-      : await retryFetch(endpoint, {
+      : await fetchWithTimeout(endpoint, {
           method: 'POST',
           body: formData,
           headers: headers,
@@ -59,20 +61,10 @@ export default async <T extends boolean>(
     }
 
     const responseText = await response.text()
+    console.log(responseText)
+    console.log(typeof(responseText))
 
-    let data
-    if (typeof responseText === 'string') {
-      if (multi) {
-        data = JSON.parse(
-          `[${responseText.slice(0, -1)}]`.split('\n').join(',')
-        )
-      } else {
-        const temp = responseText.split('\n')
-        data = JSON.parse(temp[temp.length - 2])
-      }
-    }
-
-    return { data }
+    return { data: JSON.parse(responseText) }
   } catch (error: any) {
     throw new Error(error?.message)
   }

src/Lighthouse/upload/files/index.ts

@@ -9,54 +9,34 @@ import {
 async function uploadFiles(
   sourcePath: string | any,
   apiKey: string,
-  multi?: false,
   dealParameters?: DealParameters,
   uploadProgressCallback?: (data: IUploadProgressCallback) => void
 ): Promise<{ data: IFileUploadedResponse }>
 
 async function uploadFiles(
   sourcePath: string | any,
   apiKey: string,
-  multi?: true,
   dealParameters?: DealParameters,
   uploadProgressCallback?: (data: IUploadProgressCallback) => void
 ): Promise<{ data: IFileUploadedResponse[] }>
 
 async function uploadFiles(
   path: string | any,
   apiKey: string,
-  multi?: boolean,
   dealParameters?: DealParameters,
   uploadProgressCallback?: (data: IUploadProgressCallback) => void
 ) {
   // Upload File to IPFS
-
-  if (multi) {
-    //@ts-ignore
-    if (typeof window === 'undefined') {
-      return await uploadFile(path, apiKey, true, dealParameters)
-    } else {
-      return await uploadFileBrowser(
-        path,
-        apiKey,
-        true,
-        dealParameters,
-        uploadProgressCallback
-      )
-    }
+  //@ts-ignore
+  if (typeof window === 'undefined') {
+    return await uploadFile(path, apiKey, dealParameters)
   } else {
-    //@ts-ignore
-    if (typeof window === 'undefined') {
-      return await uploadFile(path, apiKey, false, dealParameters)
-    } else {
-      return await uploadFileBrowser(
-        path,
-        apiKey,
-        false,
-        dealParameters,
-        uploadProgressCallback
-      )
-    }
+    return await uploadFileBrowser(
+      path,
+      apiKey,
+      dealParameters,
+      uploadProgressCallback
+    )
   }
 }
 

src/Lighthouse/upload/files/node.ts

@@ -1,7 +1,7 @@
 import basePathConvert from '../../utils/basePathConvert'
 import { lighthouseConfig } from '../../../lighthouse.config'
 import { UploadFileReturnType, DealParameters } from '../../../types'
-import { retryFetch } from '../../utils/util'
+import { fetchWithTimeout } from '../../utils/util'
 
 export async function walk(dir: string) {
   const { readdir, stat } = eval(`require`)('fs-extra')
@@ -25,7 +25,6 @@ export async function walk(dir: string) {
 export default async <T extends boolean>(
   sourcePath: string,
   apiKey: string,
-  multi: boolean,
   dealParameters: DealParameters | undefined
 ): Promise<{ data: UploadFileReturnType<T> }> => {
   const { createReadStream, lstatSync } = eval(`require`)('fs-extra')
@@ -36,7 +35,7 @@ export default async <T extends boolean>(
   try {
     const endpoint =
       lighthouseConfig.lighthouseNode +
-      `/api/v0/add?wrap-with-directory=${multi}`
+      `/api/v0/add?wrap-with-directory=false`
     if (stats.isFile()) {
       const data = new FormData()
       const stream = createReadStream(sourcePath)
@@ -48,7 +47,7 @@ export default async <T extends boolean>(
 
       data.append('file', blob, path.basename(sourcePath))
 
-      const response = await retryFetch(endpoint, {
+      const response = await fetchWithTimeout(endpoint, {
         method: 'POST',
         body: data,
         credentials: 'include',
@@ -67,12 +66,7 @@ export default async <T extends boolean>(
       }
 
       let responseData = (await response.text()) as any
-      if (multi) {
-        const temp = responseData.split('\n')
-        responseData = JSON.parse(temp[temp.length - 2])
-      } else {
-        responseData = JSON.parse(responseData)
-      }
+      responseData = JSON.parse(responseData)
 
       return { data: responseData }
     } else {
@@ -90,11 +84,11 @@ export default async <T extends boolean>(
         data.append(
           'file',
           blob,
-          multi ? path.basename(file) : basePathConvert(sourcePath, file)
+          basePathConvert(sourcePath, file)
         )
       }
 
-      const response = await retryFetch(endpoint, {
+      const response = await fetchWithTimeout(endpoint, {
         method: 'POST',
         body: data,
         credentials: 'include',
@@ -113,17 +107,7 @@ export default async <T extends boolean>(
       }
 
       let responseData = (await response.text()) as any
-
-      if (typeof responseData === 'string') {
-        if (multi) {
-          responseData = JSON.parse(
-            `[${responseData.slice(0, -1)}]`.split('\n').join(',')
-          )
-        } else {
-          const temp = responseData.split('\n')
-          responseData = JSON.parse(temp[temp.length - 2])
-        }
-      }
+      responseData = JSON.parse(responseData)
 
       return { data: responseData }
     }

src/Lighthouse/upload/text/browser.ts

@@ -1,5 +1,5 @@
 import { lighthouseConfig } from '../../../lighthouse.config'
-import { retryFetch } from '../../utils/util'
+import { fetchWithTimeout } from '../../utils/util'
 
 export default async (text: string, apiKey: string, name: string) => {
   try {
@@ -11,7 +11,7 @@ export default async (text: string, apiKey: string, name: string) => {
     const blob = new Blob([text], { type: 'text/plain' })
     formData.append('file', blob, name)
 
-    const response = await retryFetch(endpoint, {
+    const response = await fetchWithTimeout(endpoint, {
       method: 'POST',
       body: formData,
       timeout: 7200000,

src/Lighthouse/upload/text/node.ts

@@ -1,5 +1,5 @@
 import { lighthouseConfig } from '../../../lighthouse.config'
-import { retryFetch } from '../../utils/util'
+import { fetchWithTimeout } from '../../utils/util'
 
 export default async (text: string, apiKey: string, name: string) => {
   try {
@@ -12,7 +12,7 @@ export default async (text: string, apiKey: string, name: string) => {
 
     formData.append('file', blob, name)
 
-    const response = await retryFetch(endpoint, {
+    const response = await fetchWithTimeout(endpoint, {
       method: 'POST',
       body: formData,
       credentials: 'include',