lupine.components 1.0.6 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lupine.components",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "license": "MIT",
   "author": "uuware.com",
   "homepage": "https://uuware.com/",

package/src/lib/upload-file.ts

@@ -1,5 +1,8 @@
+import { getRenderPageProps } from "lupine.web";
+import { NotificationColor, NotificationMessage } from "../components";
+
 const _saveChunkSize = {
-  size: 1024 * 500,
+  size: 1024 * 200,
 };
 export const setChunkSize = (chunkSize: number) => {
   _saveChunkSize.size = chunkSize;
@@ -8,10 +11,11 @@ export const getChunkSize = () => {
   return _saveChunkSize.size;
 };
 export const checkUploadedFileSize = async (uploadUrl: string) => {
-  const response = await fetch(uploadUrl + '?check-size=1', {
-    method: 'POST',
-  });
-  const json = await response.json();
+  // const response = await fetch(uploadUrl + '?check-size=1', {
+  //   method: 'POST',
+  // });
+  // const json = await response.json();
+  const json = await getRenderPageProps().renderPageFunctions.fetchData(uploadUrl + '?check-size=1');
   return json && json.size ? json.size : 0;
 };
 
@@ -21,20 +25,35 @@ export const uploadFileChunk = async (
   chunkNumber: number,
   totalChunks: number,
   uploadUrl: string,
-  key: string
+  key: string,
+  retryCount = 3,
+  retryMessage = '', // can have ${tryCount}
 ) => {
-  // this must be the FE so we can use fetch
   let url = uploadUrl + (uploadUrl.indexOf('?') === -1 ? '?' : '');
   url += `&chunkNumber=${chunkNumber.toString()}`;
   url += `&totalChunks=${totalChunks.toString()}`;
   if (key) {
     url += `&key=${key}`;
   }
-  const response = await fetch(url, {
-    method: 'POST',
-    body: chunk,
-  });
-  const json = await response.json();
+  let tryCount = 0;
+  let json;
+  while (tryCount < retryCount) {
+    try {
+      json = await getRenderPageProps().renderPageFunctions.fetchData(url, chunk);
+      if (json && json.json) {
+        json = json.json;
+      }
+      if (json && json.status) { // ok or error
+        break;
+      }
+    } catch (error) {
+      console.log(`uploadFileChunk error, try: ${tryCount}`, error);
+    }
+    tryCount++;
+    if (retryMessage) {
+      NotificationMessage.sendMessage(retryMessage.replace('${tryCount}', tryCount.toString()), NotificationColor.Warning);
+    }
+  }
   return json;
 };
 
@@ -48,7 +67,11 @@ export const uploadFile = async (
   let key = '';
   const len = file instanceof File ? file.size : file.length;
   if (len <= chunkSize) {
-    return await uploadFileChunk(file, 0, 1, uploadUrl, key);
+    const uploaded = await uploadFileChunk(file, 0, 1, uploadUrl, key);
+    if (!uploaded || uploaded.status !== 'ok') {
+      return false;
+    }
+    return true;
   }
 
   const totalChunks = Math.ceil(len / chunkSize);
@@ -57,7 +80,7 @@ export const uploadFile = async (
     const end = Math.min((i + 1) * chunkSize, len);
     const chunk = file.slice(start, end);
     const uploaded = await uploadFileChunk(chunk, i, totalChunks, uploadUrl, key);
-    if (!uploaded || uploaded.chunkNumber === i.toString() || !uploaded.key) {
+    if (!uploaded || uploaded.status !== 'ok') {
       return false;
     }
     key = uploaded.key;