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

bug fixes

Browse Source
This commit is contained in:
Vivek Teega 2020-02-26 12:19:36 +00:00
parent f6c75c4602
commit 5f61e3afe8
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/webAppServer.html
View File

@ -4,7 +4,7 @@
<title>FLO webApp Server</title> <title>FLO webApp Server</title>
<script id="onLoadStartUp"> <script id="onLoadStartUp">
function onLoadStartUp() { function onLoadStartUp() {
const apps = ['TEST_MODE'] const apps = ['TEDxKanke']
webAppServer.setServeAppList(apps) webAppServer.setServeAppList(apps)
var consoleClear = setInterval(console.clear, 60 * 60000) // clear console every 1 hr var consoleClear = setInterval(console.clear, 60 * 60000) // clear console every 1 hr
webAppServer.initWebSocket() webAppServer.initWebSocket()
@ -81,20 +81,6 @@
}); });
}, },
writeData: function (obsName, data, key = false, dbName = this.dbName) {
return new Promise((resolve, reject) => {
this.openDB(dbName).then(db => {
var obs = db.transaction(obsName, "readwrite").objectStore(obsName);
let writeReq = (key ? obs.put(data, key) : obs.put(data));
writeReq.onsuccess = (evt) => resolve(`Write data Successful`);
writeReq.onerror = (evt) => reject(
`Write data unsuccessful [${evt.target.error.name}] ${evt.target.error.message}`
);
db.close();
}).catch(error => reject(error));
});
},
addData: function (obsName, data, key = false, dbName = this.dbName) { addData: function (obsName, data, key = false, dbName = this.dbName) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.openDB(dbName).then(db => { this.openDB(dbName).then(db => {
@ -194,11 +180,11 @@
return pos return pos
}, },
getNextGeneralData: function (generalData, filterStr, vectorClock) { getNextGeneralData: function (generalData, vectorClock) {
var filteredResult = [] var filteredResult = []
for (var i = 0; i < generalData[filterStr].length; i++) for (var i = 0; i < generalData.length; i++)
if (generalData[filter][i].vectorClock > vectorClock) if (generalData[i].vectorClock > vectorClock)
filteredResult.push(generalData[filter][i]) filteredResult.push(generalData[i])
return filteredResult return filteredResult
}, },
@ -249,20 +235,23 @@
if(request[1] == "appObjects"){ if(request[1] == "appObjects"){
compactIDB.readData(request[1], request[2], request[0]).then(result => { compactIDB.readData(request[1], request[2], request[0]).then(result => {
var response = [true, this.util.objectDataFetch(result, request.slice(2))] var response = [true, this.util.objectDataFetch(result, request.slice(3))]
console.log(request, response)
this.webSocket.send(`${requestor} ${JSON.stringify(response)}`) this.webSocket.send(`${requestor} ${JSON.stringify(response)}`)
}) })
} }
else if (request[1] == "generalData"){ else if (request[1] == "generalData"){
var filterStr = this.util.getFilterString(request[0], request[2]) var filterStr = this.util.getFilterString(request[0], request[2])
compactIDB.readData(request[1], filterStr, request[0]).then(result => { compactIDB.readData(request[1], filterStr, request[0]).then(result => {
var response = [true, this.util.getNextGeneralData(result, filterStr, request[3])] var response = [true, this.util.getNextGeneralData(result, request[3])]
console.log(request, response)
this.webSocket.send(`${requestor} ${JSON.stringify(response)}`) this.webSocket.send(`${requestor} ${JSON.stringify(response)}`)
}) })
} }
else if(request[1] == "subAdmins"){ else if(request[1] == "subAdmins"){
compactIDB.readAllData(request[1], request[0]).then(result => { compactIDB.readAllData(request[1], request[0]).then(result => {
var response = [true, Object.keys(result)] var response = [true, Object.keys(result)]
console.log(request, response)
this.webSocket.send(`${requestor} ${JSON.stringify(response)}`) this.webSocket.send(`${requestor} ${JSON.stringify(response)}`)
}) })
} }