feat: add asBlob parameter to baseIpfsStorage to retrieve ipfs item a…

packages/ipfs-storage/src/ipfs/base.ts

@@ -21,7 +21,11 @@
     return cid;
   }
 
-  public async get<T>(uriOrHash: string, asJson = true): Promise<T | string> {
+  public async get<T>(
+    uriOrHash: string,
+    asJson = true,
+    asBlob = false
+  ): Promise<T | string | Blob | Uint8Array> {
     let cid: CID = null;
     try {
       cid = CID.parse(
@@ -34,30 +38,79 @@
     }
 
     const value = await (cid
-      ? this.getByCID<T>(cid.toString(), asJson)
-      : this.getByURL<T>(uriOrHash, asJson));
+      ? this.getByCID<T>(cid.toString(), asJson, asBlob)
+      : this.getByURL<T>(uriOrHash, asJson, asBlob));
     return value;
   }
-
-  public async getByCID<T>(cid: string, asJson = true): Promise<T | string> {
+  public async getByCID<T>(
+    cid: string,
+    asJson: true,
+    asBlob: false
+  ): Promise<T>;
+  public async getByCID(
+    cid: string,
+    asJson: false,
+    asBlob: true
+  ): Promise<Blob>;
+  public async getByCID(
+    cid: string,
+    asJson: false,
+    asBlob: false
+  ): Promise<Uint8Array>;
+  public async getByCID<T>(
+    cid: string,
+    asJson: boolean,
+    asBlob: boolean
+  ): Promise<Uint8Array | Blob | T>;
+  public async getByCID<T>(
+    cid: string,
+    asJson = true,
+    asBlob = false
+  ): Promise<Uint8Array | Blob | T> {
     const chunks = [];
     for await (const chunk of this.ipfsClient.cat(cid)) {
       chunks.push(chunk);
     }
     const data = concat(chunks);
-    if (!asJson) {
-      return data as unknown as T;
+    if (!asJson && asBlob) {
+      return new Blob([data]);
+    } else if (!asJson) {
+      return data;
     }
     const dataStr = toString(data);
-    return JSON.parse(dataStr);
+    return JSON.parse(dataStr) as T;
   }
-
-  public async getByURL<T>(url: string, asJson = true): Promise<T | string> {
+  public async getByURL<T>(
+    url: string,
+    asJson: true,
+    asBlob: false
+  ): Promise<T>;
+  public async getByURL(
+    url: string,
+    asJson: false,
+    asBlob: true
+  ): Promise<Blob>;
+  public async getByURL(
+    url: string,
+    asJson: false,
+    asBlob: false
+  ): Promise<string>;
+  public async getByURL<T>(
+    url: string,
+    asJson: boolean,
+    asBlob: boolean
+  ): Promise<string | Blob | T>;
+  public async getByURL<T>(
+    url: string,
+    asJson = true,
+    asBlob = false
+  ): Promise<string | Blob | T> {
     const response = await fetch(url);
-
-    if (!asJson) {
+    if (!asJson && asBlob) {
+      return response.blob();
+    } else if (!asJson) {
       return response.text();
     }
-    return response.json();
+    return response.json() as T;
   }
 }

packages/ipfs-storage/src/ipfs/metadata.ts

@@ -41,9 +41,9 @@ export class IpfsMetadataStorage
    * @returns Offer metadata.
    */
   public async getMetadata(metadataUriOrHash: string): Promise<AnyMetadata> {
-    const metadata = (await this.get<ERC721Metadata>(
+    const metadata = (await this.get(
       metadataUriOrHash
-    )) as ERC721Metadata;
+    )) as unknown as ERC721Metadata;
     if (metadata.type) {
       this.validateMetadata(metadata);
     }

packages/react-kit/src/components/form/Upload/WithUploadToIpfs.tsx

@@ -24,8 +24,8 @@ export interface WithUploadToIpfsProps {
   saveToIpfs: (
     files: File[] | null
   ) => Promise<false | FileProps[] | undefined>;
-  loadMedia: (src: string) => string;
-  removeFile: (src: string) => void;
+  loadMedia: (src: string) => Promise<string | undefined>;
+  removeFile: (src: string) => Promise<void>;
 }
 export function WithUploadToIpfs<P extends WithUploadToIpfsProps>(
   WrappedComponent: React.ComponentType<P>

packages/react-kit/src/hooks/useRenderTemplate.ts

@@ -28,10 +28,11 @@ export function useRenderTemplate(
       setRenderStatus(ProgressStatus.LOADING);
       if (ipfsMetadataStorage && coreSDK) {
         try {
-          const rawTemplate = await ipfsMetadataStorage.get<Uint8Array>(
+          const rawTemplate = (await ipfsMetadataStorage.get<Uint8Array>(
             templateUrl,
+            false,
             false
-          );
+          )) as Uint8Array;
           const template = Buffer.from(rawTemplate).toString("utf-8");
           let theOfferData = offerData;
           // If the offerData is not specified, retrieve the data from offerId

packages/react-kit/src/lib/base64/base64.ts

@@ -48,10 +48,8 @@ export const fetchIpfsBase64Media = async (
     return [];
   }
   const fetchPromises = ipfsLinks.map(async (src) => {
-    const imgData = await ipfsMetadataStorage.get(src, false);
-    const base64str = await blobToBase64(
-      new Blob([imgData as unknown as BlobPart])
-    );
+    const imgData = await ipfsMetadataStorage.get<Blob>(src, false, true);
+    const base64str = await blobToBase64(new Blob([imgData]));
     if (!String(base64str).includes("base64")) {
       throw new Error("Decoded image is not in base64");
     }