From 121a8a1def219500af661f0acc66bf632057f5e9 Mon Sep 17 00:00:00 2001
From: bogd <bogd@live.ru>
Date: Thu, 28 Mar 2024 12:58:47 +0200
Subject: [PATCH] added namespase to block data api

---
 cards/FilesCard.vue |  4 ++--
 network.js          | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/cards/FilesCard.vue b/cards/FilesCard.vue
index 02a2f57..03c4614 100644
--- a/cards/FilesCard.vue
+++ b/cards/FilesCard.vue
@@ -61,13 +61,13 @@ async function DownloadFile() {
   if (selected.value[0]) {
     const buf = new Uint8Array(selected.value[0].size);
     //await ReveiveFileChunks(buf);
-    await GetBlockObject(selected.value[0].name, selected.value[0].size, buf);
+    await GetBlockObject('file_block', selected.value[0].name, selected.value[0].size, buf);
     SaveFile(buf, selected.value[0].name);
   }
 }
 
 async function SendFile(buf) {
-  await PutBlockObject(file.value.name, file.value.size, buf);
+  await PutBlockObject('file_block', file.value.name, file.value.size, buf);
   PostData(data, 2, 0, null);
 }
 
diff --git a/network.js b/network.js
index d925937..e6edcab 100644
--- a/network.js
+++ b/network.js
@@ -7,9 +7,9 @@ const SHA256_HMAC_KEY = "mykey";
 let MessIdCounter = 1;
 
 const BLOCK_SIZE = 5120;
-function ReceiveChunk(cur, total, name) {
+function ReceiveChunk(cur, total, name, namespase) {
   let data = {
-    file_block: {
+    [namespase]: {
       opertype: 1,
       part: cur,
       parts: total,
@@ -33,7 +33,7 @@ function base64ToArrayBuffer(base64) {
   return bytes;
 }
 
-async function GetBlockObject(name, size, buf) {
+async function GetBlockObject(namespase, name, size, buf) {
   let partsnum = Math.floor(size / BLOCK_SIZE);
   if (size % BLOCK_SIZE)
     partsnum++;
@@ -42,7 +42,7 @@ async function GetBlockObject(name, size, buf) {
   let resp;
   const dialog = Dialog.create({ message: `File "${name}" download 0%`, progress: true, persistent: true, ok: false, style: 'border: none; box-shadow: none;' })
   for (i = 0; i < partsnum; i++) {
-    resp = await ReceiveChunk(i, partsnum, name);
+    resp = await ReceiveChunk(i, partsnum, name, namespase);
     if (typeof resp.file_block === 'string' || resp.file_block instanceof String) {
       dialog.hide();
       Notify.create({ color: "negative", position: "top", message: resp.file_block, icon: "report_problem", });
@@ -66,7 +66,7 @@ function ToBase64(bytes) {
   return window.btoa(binary);
 }
 
-function SendChunk(cur, total, name, buf) {
+function SendChunk(cur, total, name, namespase, buf) {
   return new Promise((resolve, reject) => {
     let arr;
     if (cur == (total - 1))
@@ -75,8 +75,9 @@ function SendChunk(cur, total, name, buf) {
       arr = new Uint8Array(buf, cur * BLOCK_SIZE, BLOCK_SIZE);
     let encode = ToBase64(arr);
     let length = encode.length;
+
     let data = {
-      file_block: {
+      [namespase]: {
         opertype: 3,
         part: cur,
         parts: total,
@@ -91,7 +92,7 @@ function SendChunk(cur, total, name, buf) {
   })
 }
 
-async function PutBlockObject(name, size, buf) {
+async function PutBlockObject(namespase, name, size, buf) {
   let partsnum = Math.floor(size / BLOCK_SIZE);
   if (size % BLOCK_SIZE)
     partsnum++;
@@ -100,7 +101,7 @@ async function PutBlockObject(name, size, buf) {
   let resp;
   const dialog = Dialog.create({ message: `File "${name}" upload 0%`, progress: true, persistent: true, ok: false, style: 'border: none; box-shadow: none;' })
   for (i = 0; i < partsnum; i++) {
-    resp = await SendChunk(i, partsnum, name, buf);
+    resp = await SendChunk(i, partsnum, name, namespase, buf);
     if (typeof resp.file_block === 'string' || resp.file_block instanceof String) {
       dialog.hide();
       Notify.create({ color: "negative", position: "top", message: resp.file_block, icon: "report_problem", });