microboard-temp 0.5.68 → 0.5.70

package/dist/cjs/browser.js

@@ -678,6 +678,7 @@ __export(exports_browser, {
   getPlaceholderImage: () => getPlaceholderImage,
   getHotkeyLabel: () => getHotkeyLabel,
   getControlPointData: () => getControlPointData,
+  getBlobFromDataURL: () => getBlobFromDataURL,
   forceNumberIntoInterval: () => forceNumberIntoInterval,
   fileTosha256: () => fileTosha256,
   exportBoardSnapshot: () => exportBoardSnapshot,
@@ -41289,14 +41290,56 @@ async function fileTosha256(file) {
   return hashArray.map((byte) => byte.toString(16).padStart(2, "0")).join("");
 }
 
+// src/api/MediaHelpers.ts
+var uploadMediaToStorage = async (hash, blob, accessToken, boardId, type) => {
+  try {
+    const generateUrlResponse = await fetch(`${window.location.origin}/api/v1/media/generate-upload-url`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${accessToken}`
+      },
+      body: JSON.stringify({
+        fileSize: blob.size,
+        boardId,
+        hash
+      })
+    });
+    if (!generateUrlResponse.ok) {
+      conf.hooks.onUploadMediaError(generateUrlResponse, type);
+      throw new Error(`Failed to get presigned URL. Status: ${generateUrlResponse.status}`);
+    }
+    const data = await generateUrlResponse.json();
+    if (data.mediaUrl) {
+      console.log("Media already exists, skipping upload.");
+      return data.mediaUrl;
+    }
+    const { uploadUrl, promisedMediaUrl } = data;
+    if (!uploadUrl || !promisedMediaUrl) {
+      throw new Error("Server did not provide an uploadUrl or promisedMediaUrl in the response.");
+    }
+    const uploadResponse = await fetch(uploadUrl, {
+      method: "PUT",
+      headers: {
+        "Content-Type": blob.type
+      },
+      body: blob
+    });
+    if (!uploadResponse.ok) {
+      console.error("Direct upload to storage failed:", uploadResponse.status, uploadResponse.statusText);
+      throw new Error(`Direct upload to storage failed. Status: ${uploadResponse.status}`);
+    }
+    return promisedMediaUrl;
+  } catch (error) {
+    console.error("Media upload process error:", error);
+    throw error;
+  }
+};
+
 // src/Items/Image/ImageHelpers.ts
 var uploadToTheStorage = async (hash, dataURL, accessToken, boardId) => {
   return new Promise((resolve2, reject) => {
-    const base64String = dataURL.split(",")[1];
-    const mimeType = dataURL.split(",")[0].split(":")[1].split(";")[0];
-    const binaryString = window.atob(base64String);
-    const bytes = Uint8Array.from(binaryString, (char) => char.charCodeAt(0));
-    const blob = new Blob([bytes], { type: mimeType });
+    const { blob, mimeType } = getBlobFromDataURL(dataURL);
     fetch(`${window?.location.origin}/api/v1/media/image/${boardId}`, {
       method: "POST",
       headers: {
@@ -41318,6 +41361,14 @@ var uploadToTheStorage = async (hash, dataURL, accessToken, boardId) => {
     });
   });
 };
+var getBlobFromDataURL = (dataURL) => {
+  const base64String = dataURL.split(",")[1];
+  const mimeType = dataURL.split(",")[0].split(":")[1].split(";")[0];
+  const binaryString = window.atob(base64String);
+  const bytes = Uint8Array.from(binaryString, (char) => char.charCodeAt(0));
+  const blob = new Blob([bytes], { type: mimeType });
+  return { blob, base64String, mimeType };
+};
 var resizeAndConvertToPng = async (inp) => {
   return new Promise((resolve2, reject) => {
     if (typeof inp !== "string") {
@@ -41385,7 +41436,8 @@ var resizeAndConvertToPng = async (inp) => {
   });
 };
 var prepareImage = (inp, accessToken, boardId) => resizeAndConvertToPng(inp).then(({ width: width2, height: height2, dataURL, hash }) => {
-  return uploadToTheStorage(hash, dataURL, accessToken, boardId).then((src) => {
+  const { blob } = getBlobFromDataURL(dataURL);
+  return uploadMediaToStorage(hash, blob, accessToken, boardId, "image").then((src) => {
     return {
       imageDimension: { width: width2, height: height2 },
       base64: dataURL,
@@ -41456,7 +41508,7 @@ var prepareVideo = (file, accessToken, boardId) => {
         video.onseeked = null;
         prepareImage(captureFrame(0.1, video)?.src, accessToken, boardId).then((imageData) => {
           fileTosha256(file).then((hash) => {
-            uploadVideoToStorage(hash, file, accessToken, boardId).then((url) => {
+            uploadMediaToStorage(hash, file, accessToken, boardId, "video").then((url) => {
               resolve2({
                 url,
                 previewUrl: imageData.storageLink
@@ -41757,37 +41809,13 @@ class AudioItem extends BaseItem {
   }
 }
 // src/Items/Audio/AudioHelpers.ts
-var uploadAudioToStorage = async (hash, audioBlob, accessToken, boardId) => {
-  return new Promise((resolve2, reject) => {
-    fetch(`${window.location.origin}/api/v1/media/audio/${boardId}`, {
-      method: "POST",
-      headers: {
-        "Content-Type": audioBlob.type,
-        "x-audio-id": hash,
-        Authorization: `Bearer ${accessToken}`
-      },
-      body: audioBlob
-    }).then(async (response) => {
-      if (response.status !== 200) {
-        return conf.hooks.onUploadMediaError(response, "audio");
-      }
-      return response.json();
-    }).then((data) => {
-      console.log(data);
-      resolve2(data.src);
-    }).catch((error) => {
-      console.error("Media storage error:", error);
-      reject(error);
-    });
-  });
-};
 var prepareAudio = (file, accessToken, boardId) => {
   return new Promise((resolve2, reject) => {
     const audio = document.createElement("audio");
     audio.src = URL.createObjectURL(file);
     audio.onloadedmetadata = () => {
       fileTosha256(file).then((hash) => {
-        uploadAudioToStorage(hash, file, accessToken, boardId).then((url) => {
+        uploadMediaToStorage(hash, file, accessToken, boardId, "audio").then((url) => {
           resolve2(url);
         }).catch(reject);
       }).catch(() => {

package/dist/cjs/index.js

@@ -678,6 +678,7 @@ __export(exports_src, {
   getPlaceholderImage: () => getPlaceholderImage,
   getHotkeyLabel: () => getHotkeyLabel,
   getControlPointData: () => getControlPointData,
+  getBlobFromDataURL: () => getBlobFromDataURL,
   forceNumberIntoInterval: () => forceNumberIntoInterval,
   fileTosha256: () => fileTosha256,
   exportBoardSnapshot: () => exportBoardSnapshot,
@@ -41289,14 +41290,56 @@ async function fileTosha256(file) {
   return hashArray.map((byte) => byte.toString(16).padStart(2, "0")).join("");
 }
 
+// src/api/MediaHelpers.ts
+var uploadMediaToStorage = async (hash, blob, accessToken, boardId, type) => {
+  try {
+    const generateUrlResponse = await fetch(`${window.location.origin}/api/v1/media/generate-upload-url`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${accessToken}`
+      },
+      body: JSON.stringify({
+        fileSize: blob.size,
+        boardId,
+        hash
+      })
+    });
+    if (!generateUrlResponse.ok) {
+      conf.hooks.onUploadMediaError(generateUrlResponse, type);
+      throw new Error(`Failed to get presigned URL. Status: ${generateUrlResponse.status}`);
+    }
+    const data = await generateUrlResponse.json();
+    if (data.mediaUrl) {
+      console.log("Media already exists, skipping upload.");
+      return data.mediaUrl;
+    }
+    const { uploadUrl, promisedMediaUrl } = data;
+    if (!uploadUrl || !promisedMediaUrl) {
+      throw new Error("Server did not provide an uploadUrl or promisedMediaUrl in the response.");
+    }
+    const uploadResponse = await fetch(uploadUrl, {
+      method: "PUT",
+      headers: {
+        "Content-Type": blob.type
+      },
+      body: blob
+    });
+    if (!uploadResponse.ok) {
+      console.error("Direct upload to storage failed:", uploadResponse.status, uploadResponse.statusText);
+      throw new Error(`Direct upload to storage failed. Status: ${uploadResponse.status}`);
+    }
+    return promisedMediaUrl;
+  } catch (error) {
+    console.error("Media upload process error:", error);
+    throw error;
+  }
+};
+
 // src/Items/Image/ImageHelpers.ts
 var uploadToTheStorage = async (hash, dataURL, accessToken, boardId) => {
   return new Promise((resolve2, reject) => {
-    const base64String = dataURL.split(",")[1];
-    const mimeType = dataURL.split(",")[0].split(":")[1].split(";")[0];
-    const binaryString = window.atob(base64String);
-    const bytes = Uint8Array.from(binaryString, (char) => char.charCodeAt(0));
-    const blob = new Blob([bytes], { type: mimeType });
+    const { blob, mimeType } = getBlobFromDataURL(dataURL);
     fetch(`${window?.location.origin}/api/v1/media/image/${boardId}`, {
       method: "POST",
       headers: {
@@ -41318,6 +41361,14 @@ var uploadToTheStorage = async (hash, dataURL, accessToken, boardId) => {
     });
   });
 };
+var getBlobFromDataURL = (dataURL) => {
+  const base64String = dataURL.split(",")[1];
+  const mimeType = dataURL.split(",")[0].split(":")[1].split(";")[0];
+  const binaryString = window.atob(base64String);
+  const bytes = Uint8Array.from(binaryString, (char) => char.charCodeAt(0));
+  const blob = new Blob([bytes], { type: mimeType });
+  return { blob, base64String, mimeType };
+};
 var resizeAndConvertToPng = async (inp) => {
   return new Promise((resolve2, reject) => {
     if (typeof inp !== "string") {
@@ -41385,7 +41436,8 @@ var resizeAndConvertToPng = async (inp) => {
   });
 };
 var prepareImage = (inp, accessToken, boardId) => resizeAndConvertToPng(inp).then(({ width: width2, height: height2, dataURL, hash }) => {
-  return uploadToTheStorage(hash, dataURL, accessToken, boardId).then((src) => {
+  const { blob } = getBlobFromDataURL(dataURL);
+  return uploadMediaToStorage(hash, blob, accessToken, boardId, "image").then((src) => {
     return {
       imageDimension: { width: width2, height: height2 },
       base64: dataURL,
@@ -41456,7 +41508,7 @@ var prepareVideo = (file, accessToken, boardId) => {
         video.onseeked = null;
         prepareImage(captureFrame(0.1, video)?.src, accessToken, boardId).then((imageData) => {
           fileTosha256(file).then((hash) => {
-            uploadVideoToStorage(hash, file, accessToken, boardId).then((url) => {
+            uploadMediaToStorage(hash, file, accessToken, boardId, "video").then((url) => {
               resolve2({
                 url,
                 previewUrl: imageData.storageLink
@@ -41757,37 +41809,13 @@ class AudioItem extends BaseItem {
   }
 }
 // src/Items/Audio/AudioHelpers.ts
-var uploadAudioToStorage = async (hash, audioBlob, accessToken, boardId) => {
-  return new Promise((resolve2, reject) => {
-    fetch(`${window.location.origin}/api/v1/media/audio/${boardId}`, {
-      method: "POST",
-      headers: {
-        "Content-Type": audioBlob.type,
-        "x-audio-id": hash,
-        Authorization: `Bearer ${accessToken}`
-      },
-      body: audioBlob
-    }).then(async (response) => {
-      if (response.status !== 200) {
-        return conf.hooks.onUploadMediaError(response, "audio");
-      }
-      return response.json();
-    }).then((data) => {
-      console.log(data);
-      resolve2(data.src);
-    }).catch((error) => {
-      console.error("Media storage error:", error);
-      reject(error);
-    });
-  });
-};
 var prepareAudio = (file, accessToken, boardId) => {
   return new Promise((resolve2, reject) => {
     const audio = document.createElement("audio");
     audio.src = URL.createObjectURL(file);
     audio.onloadedmetadata = () => {
       fileTosha256(file).then((hash) => {
-        uploadAudioToStorage(hash, file, accessToken, boardId).then((url) => {
+        uploadMediaToStorage(hash, file, accessToken, boardId, "audio").then((url) => {
           resolve2(url);
         }).catch(reject);
       }).catch(() => {

package/dist/cjs/node.js

@@ -1715,6 +1715,7 @@ __export(exports_node, {
   getPlaceholderImage: () => getPlaceholderImage,
   getHotkeyLabel: () => getHotkeyLabel,
   getControlPointData: () => getControlPointData,
+  getBlobFromDataURL: () => getBlobFromDataURL,
   forceNumberIntoInterval: () => forceNumberIntoInterval,
   fileTosha256: () => fileTosha256,
   exportBoardSnapshot: () => exportBoardSnapshot,
@@ -43762,14 +43763,56 @@ async function fileTosha256(file) {
   return hashArray.map((byte) => byte.toString(16).padStart(2, "0")).join("");
 }
 
+// src/api/MediaHelpers.ts
+var uploadMediaToStorage = async (hash, blob, accessToken, boardId, type) => {
+  try {
+    const generateUrlResponse = await fetch(`${window.location.origin}/api/v1/media/generate-upload-url`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${accessToken}`
+      },
+      body: JSON.stringify({
+        fileSize: blob.size,
+        boardId,
+        hash
+      })
+    });
+    if (!generateUrlResponse.ok) {
+      conf.hooks.onUploadMediaError(generateUrlResponse, type);
+      throw new Error(`Failed to get presigned URL. Status: ${generateUrlResponse.status}`);
+    }
+    const data = await generateUrlResponse.json();
+    if (data.mediaUrl) {
+      console.log("Media already exists, skipping upload.");
+      return data.mediaUrl;
+    }
+    const { uploadUrl, promisedMediaUrl } = data;
+    if (!uploadUrl || !promisedMediaUrl) {
+      throw new Error("Server did not provide an uploadUrl or promisedMediaUrl in the response.");
+    }
+    const uploadResponse = await fetch(uploadUrl, {
+      method: "PUT",
+      headers: {
+        "Content-Type": blob.type
+      },
+      body: blob
+    });
+    if (!uploadResponse.ok) {
+      console.error("Direct upload to storage failed:", uploadResponse.status, uploadResponse.statusText);
+      throw new Error(`Direct upload to storage failed. Status: ${uploadResponse.status}`);
+    }
+    return promisedMediaUrl;
+  } catch (error) {
+    console.error("Media upload process error:", error);
+    throw error;
+  }
+};
+
 // src/Items/Image/ImageHelpers.ts
 var uploadToTheStorage = async (hash, dataURL, accessToken, boardId) => {
   return new Promise((resolve2, reject) => {
-    const base64String = dataURL.split(",")[1];
-    const mimeType = dataURL.split(",")[0].split(":")[1].split(";")[0];
-    const binaryString = window.atob(base64String);
-    const bytes = Uint8Array.from(binaryString, (char) => char.charCodeAt(0));
-    const blob = new Blob([bytes], { type: mimeType });
+    const { blob, mimeType } = getBlobFromDataURL(dataURL);
     fetch(`${window?.location.origin}/api/v1/media/image/${boardId}`, {
       method: "POST",
       headers: {
@@ -43791,6 +43834,14 @@ var uploadToTheStorage = async (hash, dataURL, accessToken, boardId) => {
     });
   });
 };
+var getBlobFromDataURL = (dataURL) => {
+  const base64String = dataURL.split(",")[1];
+  const mimeType = dataURL.split(",")[0].split(":")[1].split(";")[0];
+  const binaryString = window.atob(base64String);
+  const bytes = Uint8Array.from(binaryString, (char) => char.charCodeAt(0));
+  const blob = new Blob([bytes], { type: mimeType });
+  return { blob, base64String, mimeType };
+};
 var resizeAndConvertToPng = async (inp) => {
   return new Promise((resolve2, reject) => {
     if (typeof inp !== "string") {
@@ -43858,7 +43909,8 @@ var resizeAndConvertToPng = async (inp) => {
   });
 };
 var prepareImage = (inp, accessToken, boardId) => resizeAndConvertToPng(inp).then(({ width: width2, height: height2, dataURL, hash }) => {
-  return uploadToTheStorage(hash, dataURL, accessToken, boardId).then((src) => {
+  const { blob } = getBlobFromDataURL(dataURL);
+  return uploadMediaToStorage(hash, blob, accessToken, boardId, "image").then((src) => {
     return {
       imageDimension: { width: width2, height: height2 },
       base64: dataURL,
@@ -43929,7 +43981,7 @@ var prepareVideo = (file, accessToken, boardId) => {
         video.onseeked = null;
         prepareImage(captureFrame(0.1, video)?.src, accessToken, boardId).then((imageData) => {
           fileTosha256(file).then((hash) => {
-            uploadVideoToStorage(hash, file, accessToken, boardId).then((url) => {
+            uploadMediaToStorage(hash, file, accessToken, boardId, "video").then((url) => {
               resolve2({
                 url,
                 previewUrl: imageData.storageLink
@@ -44230,37 +44282,13 @@ class AudioItem extends BaseItem {
   }
 }
 // src/Items/Audio/AudioHelpers.ts
-var uploadAudioToStorage = async (hash, audioBlob, accessToken, boardId) => {
-  return new Promise((resolve2, reject) => {
-    fetch(`${window.location.origin}/api/v1/media/audio/${boardId}`, {
-      method: "POST",
-      headers: {
-        "Content-Type": audioBlob.type,
-        "x-audio-id": hash,
-        Authorization: `Bearer ${accessToken}`
-      },
-      body: audioBlob
-    }).then(async (response) => {
-      if (response.status !== 200) {
-        return conf.hooks.onUploadMediaError(response, "audio");
-      }
-      return response.json();
-    }).then((data) => {
-      console.log(data);
-      resolve2(data.src);
-    }).catch((error) => {
-      console.error("Media storage error:", error);
-      reject(error);
-    });
-  });
-};
 var prepareAudio = (file, accessToken, boardId) => {
   return new Promise((resolve2, reject) => {
     const audio = document.createElement("audio");
     audio.src = URL.createObjectURL(file);
     audio.onloadedmetadata = () => {
       fileTosha256(file).then((hash) => {
-        uploadAudioToStorage(hash, file, accessToken, boardId).then((url) => {
+        uploadMediaToStorage(hash, file, accessToken, boardId, "audio").then((url) => {
           resolve2(url);
         }).catch(reject);
       }).catch(() => {

package/dist/esm/browser.js

@@ -41135,14 +41135,56 @@ async function fileTosha256(file) {
   return hashArray.map((byte) => byte.toString(16).padStart(2, "0")).join("");
 }
 
+// src/api/MediaHelpers.ts
+var uploadMediaToStorage = async (hash, blob, accessToken, boardId, type) => {
+  try {
+    const generateUrlResponse = await fetch(`${window.location.origin}/api/v1/media/generate-upload-url`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${accessToken}`
+      },
+      body: JSON.stringify({
+        fileSize: blob.size,
+        boardId,
+        hash
+      })
+    });
+    if (!generateUrlResponse.ok) {
+      conf.hooks.onUploadMediaError(generateUrlResponse, type);
+      throw new Error(`Failed to get presigned URL. Status: ${generateUrlResponse.status}`);
+    }
+    const data = await generateUrlResponse.json();
+    if (data.mediaUrl) {
+      console.log("Media already exists, skipping upload.");
+      return data.mediaUrl;
+    }
+    const { uploadUrl, promisedMediaUrl } = data;
+    if (!uploadUrl || !promisedMediaUrl) {
+      throw new Error("Server did not provide an uploadUrl or promisedMediaUrl in the response.");
+    }
+    const uploadResponse = await fetch(uploadUrl, {
+      method: "PUT",
+      headers: {
+        "Content-Type": blob.type
+      },
+      body: blob
+    });
+    if (!uploadResponse.ok) {
+      console.error("Direct upload to storage failed:", uploadResponse.status, uploadResponse.statusText);
+      throw new Error(`Direct upload to storage failed. Status: ${uploadResponse.status}`);
+    }
+    return promisedMediaUrl;
+  } catch (error) {
+    console.error("Media upload process error:", error);
+    throw error;
+  }
+};
+
 // src/Items/Image/ImageHelpers.ts
 var uploadToTheStorage = async (hash, dataURL, accessToken, boardId) => {
   return new Promise((resolve2, reject) => {
-    const base64String = dataURL.split(",")[1];
-    const mimeType = dataURL.split(",")[0].split(":")[1].split(";")[0];
-    const binaryString = window.atob(base64String);
-    const bytes = Uint8Array.from(binaryString, (char) => char.charCodeAt(0));
-    const blob = new Blob([bytes], { type: mimeType });
+    const { blob, mimeType } = getBlobFromDataURL(dataURL);
     fetch(`${window?.location.origin}/api/v1/media/image/${boardId}`, {
       method: "POST",
       headers: {
@@ -41164,6 +41206,14 @@ var uploadToTheStorage = async (hash, dataURL, accessToken, boardId) => {
     });
   });
 };
+var getBlobFromDataURL = (dataURL) => {
+  const base64String = dataURL.split(",")[1];
+  const mimeType = dataURL.split(",")[0].split(":")[1].split(";")[0];
+  const binaryString = window.atob(base64String);
+  const bytes = Uint8Array.from(binaryString, (char) => char.charCodeAt(0));
+  const blob = new Blob([bytes], { type: mimeType });
+  return { blob, base64String, mimeType };
+};
 var resizeAndConvertToPng = async (inp) => {
   return new Promise((resolve2, reject) => {
     if (typeof inp !== "string") {
@@ -41231,7 +41281,8 @@ var resizeAndConvertToPng = async (inp) => {
   });
 };
 var prepareImage = (inp, accessToken, boardId) => resizeAndConvertToPng(inp).then(({ width: width2, height: height2, dataURL, hash }) => {
-  return uploadToTheStorage(hash, dataURL, accessToken, boardId).then((src) => {
+  const { blob } = getBlobFromDataURL(dataURL);
+  return uploadMediaToStorage(hash, blob, accessToken, boardId, "image").then((src) => {
     return {
       imageDimension: { width: width2, height: height2 },
       base64: dataURL,
@@ -41302,7 +41353,7 @@ var prepareVideo = (file, accessToken, boardId) => {
         video.onseeked = null;
         prepareImage(captureFrame(0.1, video)?.src, accessToken, boardId).then((imageData) => {
           fileTosha256(file).then((hash) => {
-            uploadVideoToStorage(hash, file, accessToken, boardId).then((url) => {
+            uploadMediaToStorage(hash, file, accessToken, boardId, "video").then((url) => {
               resolve2({
                 url,
                 previewUrl: imageData.storageLink
@@ -41603,37 +41654,13 @@ class AudioItem extends BaseItem {
   }
 }
 // src/Items/Audio/AudioHelpers.ts
-var uploadAudioToStorage = async (hash, audioBlob, accessToken, boardId) => {
-  return new Promise((resolve2, reject) => {
-    fetch(`${window.location.origin}/api/v1/media/audio/${boardId}`, {
-      method: "POST",
-      headers: {
-        "Content-Type": audioBlob.type,
-        "x-audio-id": hash,
-        Authorization: `Bearer ${accessToken}`
-      },
-      body: audioBlob
-    }).then(async (response) => {
-      if (response.status !== 200) {
-        return conf.hooks.onUploadMediaError(response, "audio");
-      }
-      return response.json();
-    }).then((data) => {
-      console.log(data);
-      resolve2(data.src);
-    }).catch((error) => {
-      console.error("Media storage error:", error);
-      reject(error);
-    });
-  });
-};
 var prepareAudio = (file, accessToken, boardId) => {
   return new Promise((resolve2, reject) => {
     const audio = document.createElement("audio");
     audio.src = URL.createObjectURL(file);
     audio.onloadedmetadata = () => {
       fileTosha256(file).then((hash) => {
-        uploadAudioToStorage(hash, file, accessToken, boardId).then((url) => {
+        uploadMediaToStorage(hash, file, accessToken, boardId, "audio").then((url) => {
           resolve2(url);
         }).catch(reject);
       }).catch(() => {
@@ -57068,6 +57095,7 @@ export {
   getPlaceholderImage,
   getHotkeyLabel,
   getControlPointData,
+  getBlobFromDataURL,
   forceNumberIntoInterval,
   fileTosha256,
   exportBoardSnapshot,

package/dist/esm/index.js

@@ -41128,14 +41128,56 @@ async function fileTosha256(file) {
   return hashArray.map((byte) => byte.toString(16).padStart(2, "0")).join("");
 }
 
+// src/api/MediaHelpers.ts
+var uploadMediaToStorage = async (hash, blob, accessToken, boardId, type) => {
+  try {
+    const generateUrlResponse = await fetch(`${window.location.origin}/api/v1/media/generate-upload-url`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${accessToken}`
+      },
+      body: JSON.stringify({
+        fileSize: blob.size,
+        boardId,
+        hash
+      })
+    });
+    if (!generateUrlResponse.ok) {
+      conf.hooks.onUploadMediaError(generateUrlResponse, type);
+      throw new Error(`Failed to get presigned URL. Status: ${generateUrlResponse.status}`);
+    }
+    const data = await generateUrlResponse.json();
+    if (data.mediaUrl) {
+      console.log("Media already exists, skipping upload.");
+      return data.mediaUrl;
+    }
+    const { uploadUrl, promisedMediaUrl } = data;
+    if (!uploadUrl || !promisedMediaUrl) {
+      throw new Error("Server did not provide an uploadUrl or promisedMediaUrl in the response.");
+    }
+    const uploadResponse = await fetch(uploadUrl, {
+      method: "PUT",
+      headers: {
+        "Content-Type": blob.type
+      },
+      body: blob
+    });
+    if (!uploadResponse.ok) {
+      console.error("Direct upload to storage failed:", uploadResponse.status, uploadResponse.statusText);
+      throw new Error(`Direct upload to storage failed. Status: ${uploadResponse.status}`);
+    }
+    return promisedMediaUrl;
+  } catch (error) {
+    console.error("Media upload process error:", error);
+    throw error;
+  }
+};
+
 // src/Items/Image/ImageHelpers.ts
 var uploadToTheStorage = async (hash, dataURL, accessToken, boardId) => {
   return new Promise((resolve2, reject) => {
-    const base64String = dataURL.split(",")[1];
-    const mimeType = dataURL.split(",")[0].split(":")[1].split(";")[0];
-    const binaryString = window.atob(base64String);
-    const bytes = Uint8Array.from(binaryString, (char) => char.charCodeAt(0));
-    const blob = new Blob([bytes], { type: mimeType });
+    const { blob, mimeType } = getBlobFromDataURL(dataURL);
     fetch(`${window?.location.origin}/api/v1/media/image/${boardId}`, {
       method: "POST",
       headers: {
@@ -41157,6 +41199,14 @@ var uploadToTheStorage = async (hash, dataURL, accessToken, boardId) => {
     });
   });
 };
+var getBlobFromDataURL = (dataURL) => {
+  const base64String = dataURL.split(",")[1];
+  const mimeType = dataURL.split(",")[0].split(":")[1].split(";")[0];
+  const binaryString = window.atob(base64String);
+  const bytes = Uint8Array.from(binaryString, (char) => char.charCodeAt(0));
+  const blob = new Blob([bytes], { type: mimeType });
+  return { blob, base64String, mimeType };
+};
 var resizeAndConvertToPng = async (inp) => {
   return new Promise((resolve2, reject) => {
     if (typeof inp !== "string") {
@@ -41224,7 +41274,8 @@ var resizeAndConvertToPng = async (inp) => {
   });
 };
 var prepareImage = (inp, accessToken, boardId) => resizeAndConvertToPng(inp).then(({ width: width2, height: height2, dataURL, hash }) => {
-  return uploadToTheStorage(hash, dataURL, accessToken, boardId).then((src) => {
+  const { blob } = getBlobFromDataURL(dataURL);
+  return uploadMediaToStorage(hash, blob, accessToken, boardId, "image").then((src) => {
     return {
       imageDimension: { width: width2, height: height2 },
       base64: dataURL,
@@ -41295,7 +41346,7 @@ var prepareVideo = (file, accessToken, boardId) => {
         video.onseeked = null;
         prepareImage(captureFrame(0.1, video)?.src, accessToken, boardId).then((imageData) => {
           fileTosha256(file).then((hash) => {
-            uploadVideoToStorage(hash, file, accessToken, boardId).then((url) => {
+            uploadMediaToStorage(hash, file, accessToken, boardId, "video").then((url) => {
               resolve2({
                 url,
                 previewUrl: imageData.storageLink
@@ -41596,37 +41647,13 @@ class AudioItem extends BaseItem {
   }
 }
 // src/Items/Audio/AudioHelpers.ts
-var uploadAudioToStorage = async (hash, audioBlob, accessToken, boardId) => {
-  return new Promise((resolve2, reject) => {
-    fetch(`${window.location.origin}/api/v1/media/audio/${boardId}`, {
-      method: "POST",
-      headers: {
-        "Content-Type": audioBlob.type,
-        "x-audio-id": hash,
-        Authorization: `Bearer ${accessToken}`
-      },
-      body: audioBlob
-    }).then(async (response) => {
-      if (response.status !== 200) {
-        return conf.hooks.onUploadMediaError(response, "audio");
-      }
-      return response.json();
-    }).then((data) => {
-      console.log(data);
-      resolve2(data.src);
-    }).catch((error) => {
-      console.error("Media storage error:", error);
-      reject(error);
-    });
-  });
-};
 var prepareAudio = (file, accessToken, boardId) => {
   return new Promise((resolve2, reject) => {
     const audio = document.createElement("audio");
     audio.src = URL.createObjectURL(file);
     audio.onloadedmetadata = () => {
       fileTosha256(file).then((hash) => {
-        uploadAudioToStorage(hash, file, accessToken, boardId).then((url) => {
+        uploadMediaToStorage(hash, file, accessToken, boardId, "audio").then((url) => {
           resolve2(url);
         }).catch(reject);
       }).catch(() => {
@@ -56966,6 +56993,7 @@ export {
   getPlaceholderImage,
   getHotkeyLabel,
   getControlPointData,
+  getBlobFromDataURL,
   forceNumberIntoInterval,
   fileTosha256,
   exportBoardSnapshot,

package/dist/esm/node.js

@@ -43596,14 +43596,56 @@ async function fileTosha256(file) {
   return hashArray.map((byte) => byte.toString(16).padStart(2, "0")).join("");
 }
 
+// src/api/MediaHelpers.ts
+var uploadMediaToStorage = async (hash, blob, accessToken, boardId, type) => {
+  try {
+    const generateUrlResponse = await fetch(`${window.location.origin}/api/v1/media/generate-upload-url`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${accessToken}`
+      },
+      body: JSON.stringify({
+        fileSize: blob.size,
+        boardId,
+        hash
+      })
+    });
+    if (!generateUrlResponse.ok) {
+      conf.hooks.onUploadMediaError(generateUrlResponse, type);
+      throw new Error(`Failed to get presigned URL. Status: ${generateUrlResponse.status}`);
+    }
+    const data = await generateUrlResponse.json();
+    if (data.mediaUrl) {
+      console.log("Media already exists, skipping upload.");
+      return data.mediaUrl;
+    }
+    const { uploadUrl, promisedMediaUrl } = data;
+    if (!uploadUrl || !promisedMediaUrl) {
+      throw new Error("Server did not provide an uploadUrl or promisedMediaUrl in the response.");
+    }
+    const uploadResponse = await fetch(uploadUrl, {
+      method: "PUT",
+      headers: {
+        "Content-Type": blob.type
+      },
+      body: blob
+    });
+    if (!uploadResponse.ok) {
+      console.error("Direct upload to storage failed:", uploadResponse.status, uploadResponse.statusText);
+      throw new Error(`Direct upload to storage failed. Status: ${uploadResponse.status}`);
+    }
+    return promisedMediaUrl;
+  } catch (error) {
+    console.error("Media upload process error:", error);
+    throw error;
+  }
+};
+
 // src/Items/Image/ImageHelpers.ts
 var uploadToTheStorage = async (hash, dataURL, accessToken, boardId) => {
   return new Promise((resolve2, reject) => {
-    const base64String = dataURL.split(",")[1];
-    const mimeType = dataURL.split(",")[0].split(":")[1].split(";")[0];
-    const binaryString = window.atob(base64String);
-    const bytes = Uint8Array.from(binaryString, (char) => char.charCodeAt(0));
-    const blob = new Blob([bytes], { type: mimeType });
+    const { blob, mimeType } = getBlobFromDataURL(dataURL);
     fetch(`${window?.location.origin}/api/v1/media/image/${boardId}`, {
       method: "POST",
       headers: {
@@ -43625,6 +43667,14 @@ var uploadToTheStorage = async (hash, dataURL, accessToken, boardId) => {
     });
   });
 };
+var getBlobFromDataURL = (dataURL) => {
+  const base64String = dataURL.split(",")[1];
+  const mimeType = dataURL.split(",")[0].split(":")[1].split(";")[0];
+  const binaryString = window.atob(base64String);
+  const bytes = Uint8Array.from(binaryString, (char) => char.charCodeAt(0));
+  const blob = new Blob([bytes], { type: mimeType });
+  return { blob, base64String, mimeType };
+};
 var resizeAndConvertToPng = async (inp) => {
   return new Promise((resolve2, reject) => {
     if (typeof inp !== "string") {
@@ -43692,7 +43742,8 @@ var resizeAndConvertToPng = async (inp) => {
   });
 };
 var prepareImage = (inp, accessToken, boardId) => resizeAndConvertToPng(inp).then(({ width: width2, height: height2, dataURL, hash }) => {
-  return uploadToTheStorage(hash, dataURL, accessToken, boardId).then((src) => {
+  const { blob } = getBlobFromDataURL(dataURL);
+  return uploadMediaToStorage(hash, blob, accessToken, boardId, "image").then((src) => {
     return {
       imageDimension: { width: width2, height: height2 },
       base64: dataURL,
@@ -43763,7 +43814,7 @@ var prepareVideo = (file, accessToken, boardId) => {
         video.onseeked = null;
         prepareImage(captureFrame(0.1, video)?.src, accessToken, boardId).then((imageData) => {
           fileTosha256(file).then((hash) => {
-            uploadVideoToStorage(hash, file, accessToken, boardId).then((url) => {
+            uploadMediaToStorage(hash, file, accessToken, boardId, "video").then((url) => {
               resolve2({
                 url,
                 previewUrl: imageData.storageLink
@@ -44064,37 +44115,13 @@ class AudioItem extends BaseItem {
   }
 }
 // src/Items/Audio/AudioHelpers.ts
-var uploadAudioToStorage = async (hash, audioBlob, accessToken, boardId) => {
-  return new Promise((resolve2, reject) => {
-    fetch(`${window.location.origin}/api/v1/media/audio/${boardId}`, {
-      method: "POST",
-      headers: {
-        "Content-Type": audioBlob.type,
-        "x-audio-id": hash,
-        Authorization: `Bearer ${accessToken}`
-      },
-      body: audioBlob
-    }).then(async (response) => {
-      if (response.status !== 200) {
-        return conf.hooks.onUploadMediaError(response, "audio");
-      }
-      return response.json();
-    }).then((data) => {
-      console.log(data);
-      resolve2(data.src);
-    }).catch((error) => {
-      console.error("Media storage error:", error);
-      reject(error);
-    });
-  });
-};
 var prepareAudio = (file, accessToken, boardId) => {
   return new Promise((resolve2, reject) => {
     const audio = document.createElement("audio");
     audio.src = URL.createObjectURL(file);
     audio.onloadedmetadata = () => {
       fileTosha256(file).then((hash) => {
-        uploadAudioToStorage(hash, file, accessToken, boardId).then((url) => {
+        uploadMediaToStorage(hash, file, accessToken, boardId, "audio").then((url) => {
           resolve2(url);
         }).catch(reject);
       }).catch(() => {
@@ -59601,6 +59628,7 @@ export {
   getPlaceholderImage,
   getHotkeyLabel,
   getControlPointData,
+  getBlobFromDataURL,
   forceNumberIntoInterval,
   fileTosha256,
   exportBoardSnapshot,

package/dist/types/Items/Image/ImageHelpers.d.ts

@@ -1,5 +1,10 @@
 import { ImageConstructorData } from './Image';
 export declare const uploadToTheStorage: (hash: string, dataURL: string, accessToken: string | null, boardId: string) => Promise<string>;
+export declare const getBlobFromDataURL: (dataURL: string) => {
+    blob: Blob;
+    base64String: string;
+    mimeType: string;
+};
 export declare const resizeAndConvertToPng: (inp: string | ArrayBuffer | null | undefined) => Promise<{
     dataURL: string;
     width: number;

package/dist/types/api/MediaHelpers.d.ts

@@ -0,0 +1 @@
+export declare const uploadMediaToStorage: (hash: string, blob: Blob, accessToken: string | null, boardId: string, type: "video" | "audio" | "image") => Promise<string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "microboard-temp",
-  "version": "0.5.68",
+  "version": "0.5.70",
   "description": "A flexible interactive whiteboard library",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",