response fixes

Author: ravish1729

src/Lighthouse/uploadEncrypted/decrypt/browser.ts

@@ -1,14 +1,14 @@
 /* istanbul ignore file */
 import { decryptFile } from '../encryptionBrowser'
 import { lighthouseConfig } from '../../../lighthouse.config'
-import { retryFetch } from '../../utils/util'
+import { fetchWithTimeout } from '../../utils/util'
 
 export default async (
   cid: string,
   fileEncryptionKey: string,
   mimeType: string
 ) => {
-  const response = await retryFetch(
+  const response = await fetchWithTimeout(
     lighthouseConfig.lighthouseGateway + '/api/v0/cat/' + cid,
     {
       method: 'POST',

src/Lighthouse/uploadEncrypted/decrypt/node.ts

@@ -1,11 +1,11 @@
 /* istanbul ignore file */
 import { decryptFile } from '../encryptionNode'
 import { lighthouseConfig } from '../../../lighthouse.config'
-import { retryFetch } from '../../utils/util'
+import { fetchWithTimeout } from '../../utils/util'
 
 export default async (cid: string, fileEncryptionKey: any) => {
   try {
-    const response = await retryFetch(
+    const response = await fetchWithTimeout(
       lighthouseConfig.lighthouseGateway + '/api/v0/cat/' + cid,
       {
         method: 'POST',

src/Lighthouse/uploadEncrypted/encrypt/file/browser.ts

@@ -6,7 +6,7 @@ import {
 } from '../../../../types'
 import { encryptFile } from '../../encryptionBrowser'
 import { lighthouseConfig } from '../../../../lighthouse.config'
-import { checkDuplicateFileNames, retryFetch } from '../../../utils/util'
+import { checkDuplicateFileNames, fetchWithTimeout } from '../../../utils/util'
 
 declare const FileReader: any
 
@@ -74,7 +74,7 @@ export default async (
     })
 
     const response = uploadProgressCallback
-      ? await retryFetch(endpoint, {
+      ? await fetchWithTimeout(endpoint, {
           method: 'POST',
           body: formData,
           timeout: 7200000,
@@ -88,7 +88,7 @@ export default async (
             })
           },
         })
-      : await retryFetch(endpoint, {
+      : await fetchWithTimeout(endpoint, {
           method: 'POST',
           body: formData,
           timeout: 7200000,
@@ -115,13 +115,7 @@ export default async (
       new Uint8Array(chunks.flatMap((chunk) => [...chunk]))
     ) as any
 
-    if (typeof responseData === 'string') {
-      responseData = JSON.parse(
-        `[${responseData.slice(0, -1)}]`.split('\n').join(',')
-      )
-    } else {
-      responseData = [responseData]
-    }
+    responseData = JSON.parse(responseData)
 
     const savedKey = await Promise.all(
       responseData.map(async (data: IFileUploadedResponse) => {

src/Lighthouse/uploadEncrypted/encrypt/file/node.ts

@@ -3,7 +3,7 @@ import { generate, saveShards } from '@lighthouse-web3/kavach'
 import { encryptFile } from '../../encryptionNode'
 import { walk } from '../../../upload/files/node'
 import { IFileUploadedResponse } from '../../../../types'
-import { retryFetch } from '../../../utils/util'
+import { fetchWithTimeout } from '../../../utils/util'
 
 export default async (
   sourcePath: any,
@@ -28,7 +28,7 @@ export default async (
       const blob = new Blob([Buffer.from(encryptedData)])
       formData.append('file', blob, sourcePath.replace(/^.*[\\/]/, ''))
 
-      const response = await retryFetch(endpoint, {
+      const response = await fetchWithTimeout(endpoint, {
         method: 'POST',
         body: formData,
         timeout: 7200000,
@@ -81,7 +81,7 @@ export default async (
       })
     )
 
-    const response = await retryFetch(endpoint, {
+    const response = await fetchWithTimeout(endpoint, {
       method: 'POST',
       body: formData,
       timeout: 7200000,
@@ -96,9 +96,7 @@ export default async (
     }
 
     const responseText = await response.text()
-    const jsondata = JSON.parse(
-      `[${responseText.slice(0, -1)}]`.split('\n').join(',')
-    ) as IFileUploadedResponse[]
+    const jsondata = JSON.parse(responseText) as IFileUploadedResponse[]
 
     const savedKey = await Promise.all(
       jsondata.map(async (data) => {

src/Lighthouse/uploadEncrypted/encrypt/text/browser.ts

@@ -2,7 +2,7 @@
 import { encryptFile } from '../../encryptionBrowser'
 import { generate, saveShards } from '@lighthouse-web3/kavach'
 import { lighthouseConfig } from '../../../../lighthouse.config'
-import { retryFetch } from '../../../utils/util'
+import { fetchWithTimeout } from '../../../utils/util'
 
 export default async (
   text: string,
@@ -32,7 +32,7 @@ export default async (
       name
     )
 
-    const response = await retryFetch(endpoint, {
+    const response = await fetchWithTimeout(endpoint, {
       method: 'POST',
       body: formData,
       timeout: 7200000,

src/Lighthouse/uploadEncrypted/encrypt/text/node.ts

@@ -2,7 +2,7 @@
 import { encryptFile } from '../../encryptionNode'
 import { generate, saveShards } from '@lighthouse-web3/kavach'
 import { lighthouseConfig } from '../../../../lighthouse.config'
-import { retryFetch } from '../../../utils/util'
+import { fetchWithTimeout } from '../../../utils/util'
 
 export default async (
   text: string,
@@ -27,7 +27,7 @@ export default async (
     const blob = new Blob([Buffer.from(encryptedData)])
     formData.append('file', blob, name)
 
-    const response = await retryFetch(endpoint, {
+    const response = await fetchWithTimeout(endpoint, {
       method: 'POST',
       body: formData,
       credentials: 'include',