cid version

Author: ravish1729

src/Lighthouse/upload/buffer/browser.ts

@@ -1,9 +1,9 @@
 import { lighthouseConfig } from '../../../lighthouse.config'
 
-export default async (blob: any, apiKey: string, mimeType = '') => {
+export default async (blob: any, apiKey: string, cidVersion: number) => {
   try {
     const token = 'Bearer ' + apiKey
-    const endpoint = lighthouseConfig.lighthouseNode + '/api/v0/add'
+    const endpoint = lighthouseConfig.lighthouseNode + `/api/v0/add?cid-version=${cidVersion}`
 
     // Upload file
     const formData = new FormData()

src/Lighthouse/upload/buffer/index.ts

@@ -1,12 +1,12 @@
 import uploadBuffer from './node'
 import uploadTypedArray from './browser'
 
-export default async (buffer: any, apiKey: string) => {
+export default async (buffer: any, apiKey: string, cidVersion: number = 1) => {
   // Upload File to IPFS
   //@ts-ignore
   if (typeof window === 'undefined') {
-    return await uploadBuffer(buffer, apiKey)
+    return await uploadBuffer(buffer, apiKey, cidVersion)
   } else {
-    return await uploadTypedArray(buffer, apiKey)
+    return await uploadTypedArray(buffer, apiKey, cidVersion)
   }
 }

src/Lighthouse/upload/buffer/node.ts

@@ -1,9 +1,9 @@
 import { lighthouseConfig } from '../../../lighthouse.config'
 
-export default async (buffer: any, apiKey: string, mimeType = '') => {
+export default async (buffer: any, apiKey: string, cidVersion: number) => {
   try {
     const token = 'Bearer ' + apiKey
-    const endpoint = lighthouseConfig.lighthouseNode + '/api/v0/add'
+    const endpoint = lighthouseConfig.lighthouseNode + `/api/v0/add?cid-version=${cidVersion}`
 
     // Upload file
     const blob = new Blob([buffer])

src/Lighthouse/upload/files/browser.ts

@@ -2,22 +2,23 @@
 import { lighthouseConfig } from '../../../lighthouse.config'
 import {
   IUploadProgressCallback,
-  UploadFileReturnType
+  IFileUploadedResponse
 } from '../../../types'
 import { fetchWithTimeout } from '../../utils/util'
 
 // eslint-disable-next-line @typescript-eslint/no-empty-function
-export default async <T extends boolean>(
+export default async (
   files: any,
   accessToken: string,
+  cidVersion: number,
   uploadProgressCallback?: (data: IUploadProgressCallback) => void
-): Promise<{ data: UploadFileReturnType<T> }> => {
+): Promise<{ data: IFileUploadedResponse }>  => {
   try {
     const isDirectory = [...files].some(file => file.webkitRelativePath)
-    let endpoint = lighthouseConfig.lighthouseNode + `/api/v0/add?wrap-with-directory=false`
+    let endpoint = lighthouseConfig.lighthouseNode + `/api/v0/add?wrap-with-directory=false&cid-version=${cidVersion}`
 
     if(!isDirectory && files.length > 1) {
-      endpoint = lighthouseConfig.lighthouseNode + `/api/v0/add?wrap-with-directory=true`
+      endpoint = lighthouseConfig.lighthouseNode + `/api/v0/add?wrap-with-directory=true&cid-version=${cidVersion}`
     }
 
     const formData = new FormData()

src/Lighthouse/upload/files/index.ts

@@ -5,31 +5,21 @@ import {
   IFileUploadedResponse
 } from '../../../types'
 
-async function uploadFiles(
-  sourcePath: string | any,
-  apiKey: string,
-  uploadProgressCallback?: (data: IUploadProgressCallback) => void
-): Promise<{ data: IFileUploadedResponse }>
-
-async function uploadFiles(
-  sourcePath: string | any,
-  apiKey: string,
-  uploadProgressCallback?: (data: IUploadProgressCallback) => void
-): Promise<{ data: IFileUploadedResponse[] }>
-
 async function uploadFiles(
   path: string | any,
   apiKey: string,
+  cidVersion: number = 1,
   uploadProgressCallback?: (data: IUploadProgressCallback) => void
-) {
+): Promise<{ data: IFileUploadedResponse }> {
   // Upload File to IPFS
   //@ts-ignore
   if (typeof window === 'undefined') {
-    return await uploadFile(path, apiKey)
+    return await uploadFile(path, apiKey, cidVersion)
   } else {
     return await uploadFileBrowser(
       path,
       apiKey,
+      cidVersion,
       uploadProgressCallback
     )
   }

src/Lighthouse/upload/files/node.ts

@@ -1,8 +1,7 @@
 import basePathConvert from '../../utils/basePathConvert'
 import { lighthouseConfig } from '../../../lighthouse.config'
-import { UploadFileReturnType } from '../../../types'
 import { fetchWithTimeout } from '../../utils/util'
-
+import { IFileUploadedResponse } from '../../../types'
 export async function walk(dir: string) {
   const { readdir, stat } = eval(`require`)('fs-extra')
   let results: string[] = []
@@ -22,10 +21,11 @@ export async function walk(dir: string) {
   return results
 }
 
-export default async <T extends boolean>(
+export default async (
   sourcePath: string,
-  apiKey: string
-): Promise<{ data: UploadFileReturnType<T> }> => {
+  apiKey: string,
+  cidVersion: number
+): Promise<{ data: IFileUploadedResponse }> => {
   const { createReadStream, lstatSync } = eval(`require`)('fs-extra')
   const path = eval(`require`)('path')
 
@@ -34,7 +34,7 @@ export default async <T extends boolean>(
   try {
     const endpoint =
       lighthouseConfig.lighthouseNode +
-      `/api/v0/add?wrap-with-directory=false`
+      `/api/v0/add?wrap-with-directory=false&cid-version=${cidVersion}`
     if (stats.isFile()) {
       const data = new FormData()
       const stream = createReadStream(sourcePath)

src/Lighthouse/upload/text/browser.ts

@@ -1,10 +1,10 @@
 import { lighthouseConfig } from '../../../lighthouse.config'
 import { fetchWithTimeout } from '../../utils/util'
 
-export default async (text: string, apiKey: string, name: string) => {
+export default async (text: string, apiKey: string, name: string, cidVersion: number) => {
   try {
     const token = 'Bearer ' + apiKey
-    const endpoint = lighthouseConfig.lighthouseNode + '/api/v0/add'
+    const endpoint = lighthouseConfig.lighthouseNode + `/api/v0/add?cid-version=${cidVersion}`
 
     // Upload file
     const formData = new FormData()

src/Lighthouse/upload/text/index.ts

@@ -1,12 +1,12 @@
 import uploadTextServer from './node'
 import uploadTextBrowser from './browser'
 
-export default async (text: string, apiKey: string, name = 'text') => {
+export default async (text: string, apiKey: string, name = 'text', cidVersion: number = 1) => {
   // Upload File to IPFS
   //@ts-ignore
   if (typeof window === 'undefined') {
-    return await uploadTextServer(text, apiKey, name)
+    return await uploadTextServer(text, apiKey, name, cidVersion)
   } else {
-    return await uploadTextBrowser(text, apiKey, name)
+    return await uploadTextBrowser(text, apiKey, name, cidVersion)
   }
 }

src/Lighthouse/upload/text/node.ts

@@ -1,10 +1,10 @@
 import { lighthouseConfig } from '../../../lighthouse.config'
 import { fetchWithTimeout } from '../../utils/util'
 
-export default async (text: string, apiKey: string, name: string) => {
+export default async (text: string, apiKey: string, name: string, cidVersion: number) => {
   try {
     const token = 'Bearer ' + apiKey
-    const endpoint = lighthouseConfig.lighthouseNode + '/api/v0/add'
+    const endpoint = lighthouseConfig.lighthouseNode + `/api/v0/add?cid-version=${cidVersion}`
 
     // Upload file
     const formData = new FormData()

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

@@ -29,6 +29,7 @@ export default async (
   apiKey: string,
   publicKey: string,
   auth_token: string,
+  cidVersion: number,
   uploadProgressCallback?: (data: IUploadProgressCallback) => void
 ): Promise<{ data: IFileUploadedResponse[] }> => {
   try {
@@ -38,7 +39,7 @@ export default async (
       mimeType = files[0].type
     }
     const endpoint =
-      lighthouseConfig.lighthouseNode + '/api/v0/add?wrap-with-directory=false'
+      lighthouseConfig.lighthouseNode + `/api/v0/add?wrap-with-directory=false&cid-version=${cidVersion}`
     const token = 'Bearer ' + apiKey
 
     const fileArr = []