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

Fix for flosight changes

Browse Source
This commit is contained in:
sairajzero 2023-05-19 02:21:28 +05:30
parent b4a911947c
commit 9d2c31688a
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/base_tables.json
View File

@ -1,7 +1,7 @@
{ {
"LastTxs": { "LastTxs": {
"ID": "CHAR(34) NOT NULL", "ID": "CHAR(34) NOT NULL",
"N": "INT NOT NULL", "N": "VARCHAR(128) NOT NULL",
"PRIMARY": "KEY (ID)" "PRIMARY": "KEY (ID)"
}, },
"Configs": { "Configs": {

34
src/main.js
View File

@ -123,11 +123,15 @@ function refreshBlockchainData(base, flag) {
function readSupernodeConfigFromAPI(base, flag) { function readSupernodeConfigFromAPI(base, flag) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
floBlockchainAPI.readData(floGlobals.SNStorageID, {
ignoreOld: base.lastTx[floGlobals.SNStorageID], var query_options = { sentOnly: true, pattern: "SuperNodeStorage" };
sentOnly: true, let lastTx = base.lastTx[floGlobals.SNStorageID] ? base.lastTx[floGlobals.SNStorageID] : undefined;
pattern: "SuperNodeStorage" if (typeof lastTx == 'string' && /^[0-9a-f]{64}/i.test(lastTx))//lastTx is txid of last tx
}).then(result => { query_options.after = lastTx;
else if (!isNaN(lastTx))//lastTx is tx count (*backward support)
query_options.ignoreOld = parseInt(lastTx);
floBlockchainAPI.readData(floGlobals.SNStorageID, query_options).then(result => {
let promises = [], let promises = [],
node_change = {}, node_change = {},
node_update = new Set(); node_update = new Set();
@ -176,7 +180,8 @@ function readSupernodeConfigFromAPI(base, flag) {
base.appList[app] = content.addApps[app]; base.appList[app] = content.addApps[app];
}; };
}); });
promises.push(DB.setLastTx(floGlobals.SNStorageID, result.totalTxs)); promises.push(DB.setLastTx(floGlobals.SNStorageID, result.lastItem));
base.lastTx[floGlobals.SNStorageID] = result.lastItem;
//Check if all save process were successful //Check if all save process were successful
Promise.allSettled(promises).then(results => { Promise.allSettled(promises).then(results => {
if (results.reduce((a, r) => r.status === "rejected" ? ++a : a, 0)) if (results.reduce((a, r) => r.status === "rejected" ? ++a : a, 0))
@ -202,11 +207,15 @@ function readAppSubAdminListFromAPI(base) {
//Load for each apps //Load for each apps
for (let app in base.appList) { for (let app in base.appList) {
promises.push(new Promise((resolve, reject) => { promises.push(new Promise((resolve, reject) => {
floBlockchainAPI.readData(base.appList[app], {
ignoreOld: base.lastTx[base.appList[app]] || 0, var query_options = { sentOnly: true, pattern: app };
sentOnly: true, let lastTx = base.lastTx[base.appList[app]] ? base.lastTx[base.appList[app]] : undefined;
pattern: app if (typeof lastTx == 'string' && /^[0-9a-f]{64}/i.test(lastTx))//lastTx is txid of last tx
}).then(result => { query_options.after = lastTx;
else if (!isNaN(lastTx))//lastTx is tx count (*backward support)
query_options.ignoreOld = parseInt(lastTx);
floBlockchainAPI.readData(base.appList[app], query_options).then(result => {
let subAdmins = new Set(base.appSubAdmins[app]), let subAdmins = new Set(base.appSubAdmins[app]),
trustedIDs = new Set(base.appTrustedIDs[app]); trustedIDs = new Set(base.appTrustedIDs[app]);
result.data.reverse().forEach(data => { result.data.reverse().forEach(data => {
@ -222,8 +231,9 @@ function readAppSubAdminListFromAPI(base) {
}); });
base.appSubAdmins[app] = Array.from(subAdmins); base.appSubAdmins[app] = Array.from(subAdmins);
base.appTrustedIDs[app] = Array.from(trustedIDs); base.appTrustedIDs[app] = Array.from(trustedIDs);
base.lastTx[base.appList[app]] = result.lastItem;
Promise.allSettled([ Promise.allSettled([
DB.setLastTx(base.appList[app], result.totalTxs), DB.setLastTx(base.appList[app], result.lastItem),
DB.setSubAdmin(app, base.appSubAdmins[app]), DB.setSubAdmin(app, base.appSubAdmins[app]),
DB.setTrustedIDs(app, base.appTrustedIDs[app]) DB.setTrustedIDs(app, base.appTrustedIDs[app])
]).then(results => { ]).then(results => {