@archvisioninc/canvas 2.6.5 → 2.6.6

package/dist/helpers/utilityHelpers.js

@@ -418,25 +418,36 @@ export const getImageFileFromBuffer = args => {
     });
     const url = URL.createObjectURL(blob);
     if (asBase64Data) {
-      const base64DataUrl = `data:image/png;base64,${btoa(String.fromCharCode(...new Uint8Array(buffer)))}`;
-      return base64DataUrl;
+      return new Promise((resolve, reject) => {
+        const reader = new FileReader();
+        reader.onloadend = () => {
+          resolve(reader.result);
+        };
+        reader.onerror = error => {
+          console.error('Error reading buffer: ', error);
+          reject(error);
+        };
+        reader.readAsDataURL(blob);
+      });
     }
-    return url;
+    return Promise.resolve(url);
   } catch (error) {
     console.error('Unable to get image from buffer: ', error);
+    return Promise.reject(error);
   }
 };
-export const getTextureUrl = args => {
+export const getTextureUrl = async args => {
   const {
     texture,
     asBase64Data
   } = args || {};
   const buffer = texture?._buffer;
   if (_.isEmpty(buffer)) return texture?.url || '';
-  return getImageFileFromBuffer({
+  const url = await getImageFileFromBuffer({
     buffer,
     asBase64Data
   });
+  return url;
 };
 export const materialData = material => {
   const meshesWithMaterial = getUserMeshes().map(mesh => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@archvisioninc/canvas",
-  "version": "2.6.5",
+  "version": "2.6.6",
   "private": false,
   "main": "dist/Canvas.js",
   "module": "dist/Canvas.js",

package/src/package/helpers/utilityHelpers.js

@@ -476,22 +476,36 @@ export const getImageFileFromBuffer = args => {
     const url = URL.createObjectURL(blob);
 
     if (asBase64Data) {
-      const base64DataUrl = `data:image/png;base64,${btoa(String.fromCharCode(...new Uint8Array(buffer)))}`;
-      return base64DataUrl;
+      return new Promise((resolve, reject) => {
+        const reader = new FileReader();
+
+        reader.onloadend = () => {
+          resolve(reader.result);
+        };
+
+        reader.onerror = error => {
+          console.error('Error reading buffer: ', error);
+          reject(error);
+        };
+
+        reader.readAsDataURL(blob);
+      });
     }
 
-    return url;
+    return Promise.resolve(url);
   } catch (error) {
     console.error('Unable to get image from buffer: ', error);
+    return Promise.reject(error);
   }
 };
 
-export const getTextureUrl = args => {
+export const getTextureUrl = async args => {
   const { texture, asBase64Data } = args || {};
   const buffer = texture?._buffer;
 
   if (_.isEmpty(buffer)) return texture?.url || '';
-  return getImageFileFromBuffer({ buffer, asBase64Data });
+  const url = await getImageFileFromBuffer({ buffer, asBase64Data });
+  return url;
 };
 
 export const materialData = material => {