RanchiMall/flopay
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

floCloudAPI v2.4.5a: bug fix

Browse Source 
- Fixed: floCloudAPI.requestApplicationData on single request not decoding the result data (message)
This commit is contained in:
sairajzero 2023-08-01 18:27:43 +05:30
parent 2c656d40ba
commit 07a6d6b4d6
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
floCloudAPI.js
View File

@ -1,4 +1,4 @@
(function (EXPORTS) { //floCloudAPI v2.4.5 (function (EXPORTS) { //floCloudAPI v2.4.5a
/* FLO Cloud operations to send/request application data*/ /* FLO Cloud operations to send/request application data*/
'use strict'; 'use strict';
const floCloudAPI = EXPORTS; const floCloudAPI = EXPORTS;
@ -551,7 +551,7 @@
} }
//request any data from supernode cloud //request any data from supernode cloud
const requestApplicationData = floCloudAPI.requestApplicationData = function (type, options = {}) { const _requestApplicationData = function (type, options = {}) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
var request = { var request = {
receiverID: options.receiverID || DEFAULT.adminID, receiverID: options.receiverID || DEFAULT.adminID,
@ -582,6 +582,17 @@
}) })
} }
floCloudAPI.requestApplicationData = function (type, options = {}) {
return new Promise((resolve, reject) => {
let single_request_mode = !(options.callback instanceof Function);
_requestApplicationData(type, options).then(data => {
if (single_request_mode)
resolve(objectifier(data))
else resolve(data);
}).catch(error => reject(error))
})
}
/*(NEEDS UPDATE) /*(NEEDS UPDATE)
//delete data from supernode cloud (received only) //delete data from supernode cloud (received only)
floCloudAPI.deleteApplicationData = function(vectorClocks, options = {}) { floCloudAPI.deleteApplicationData = function(vectorClocks, options = {}) {
@ -615,7 +626,7 @@
//request the data from cloud for resigning //request the data from cloud for resigning
let req_options = Object.assign({}, options); let req_options = Object.assign({}, options);
req_options.atVectorClock = vectorClock; req_options.atVectorClock = vectorClock;
requestApplicationData(undefined, req_options).then(result => { _requestApplicationData(undefined, req_options).then(result => {
if (!result.length) if (!result.length)
return reject("Data not found"); return reject("Data not found");
let data = result[0]; let data = result[0];
@ -709,11 +720,11 @@
storeGeneral(fk, d); storeGeneral(fk, d);
options.callback(d, e) options.callback(d, e)
} }
requestApplicationData(type, new_options) _requestApplicationData(type, new_options)
.then(result => resolve(result)) .then(result => resolve(result))
.catch(error => reject(error)) .catch(error => reject(error))
} else { } else {
requestApplicationData(type, options).then(dataSet => { _requestApplicationData(type, options).then(dataSet => {
storeGeneral(fk, objectifier(dataSet)) storeGeneral(fk, objectifier(dataSet))
resolve(dataSet) resolve(dataSet)
}).catch(error => reject(error)) }).catch(error => reject(error))
@ -738,7 +749,7 @@
} }
delete options.callback; delete options.callback;
} }
requestApplicationData(objectName, options).then(dataSet => { _requestApplicationData(objectName, options).then(dataSet => {
updateObject(objectName, objectifier(dataSet)); updateObject(objectName, objectifier(dataSet));
delete options.comment; delete options.comment;
options.lowerVectorClock = lastVC[objectName] + 1; options.lowerVectorClock = lastVC[objectName] + 1;
@ -746,11 +757,11 @@
if (callback) { if (callback) {
let new_options = Object.create(options); let new_options = Object.create(options);
new_options.callback = callback; new_options.callback = callback;
requestApplicationData(objectName, new_options) _requestApplicationData(objectName, new_options)
.then(result => resolve(result)) .then(result => resolve(result))
.catch(error => reject(error)) .catch(error => reject(error))
} else { } else {
requestApplicationData(objectName, options).then(dataSet => { _requestApplicationData(objectName, options).then(dataSet => {
updateObject(objectName, objectifier(dataSet)) updateObject(objectName, objectifier(dataSet))
resolve(appObjects[objectName]) resolve(appObjects[objectName])
}).catch(error => reject(error)) }).catch(error => reject(error))
@ -825,7 +836,7 @@
floCloudAPI.downloadFile = function (vectorClock, options = {}) { floCloudAPI.downloadFile = function (vectorClock, options = {}) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
options.atVectorClock = vectorClock; options.atVectorClock = vectorClock;
requestApplicationData(options.type, options).then(result => { _requestApplicationData(options.type, options).then(result => {
if (!result.length) if (!result.length)
return reject("File not found"); return reject("File not found");
result = result[0]; result = result[0];