fez5587/Superalgos
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fixed reading Json config

Browse Source
This commit is contained in:
Luis Fernando Molina committed 2021-06-30 12:57:52 +02:00
1 parent 22ef87ad80
commit fb68ab2f87
2 files changed
+91 -67
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Projects/Foundations/UI/Function-Libraries/UiObjectsFromNodes.js
+17 -2
View File
@@ -164,7 +164,16 @@ function newFoundationsFunctionLibraryUiObjectsFromNodes() {
if (err && err.result !== GLOBAL.DEFAULT_OK_RESPONSE.result) {
console.log('[WARN] Cannot load plugin ' + pluginFolder + ' ' + name + '. The Workspace will be loaded with this plugin file missing.')
} else {
let receivedNode = JSON.parse(text)
let receivedNode
try {
receivedNode = JSON.parse(text)
} catch (err) {
console.log('[ERROR] pluginAllTheseFiles -> Cannot load plugin ' + pluginFolder + ' ' + name + '. Received an invalid JSON object from the client.')
console.log('[ERROR] pluginAllTheseFiles -> text = ' + text)
console.log('[ERROR] pluginAllTheseFiles -> err.stack = ' + err.stack)
return
}
/*
If the workspace already contains a root node with the id of the head of the hirierchy
we are loading, we remove it because the plugin file has precedende.
@@ -180,7 +189,13 @@ function newFoundationsFunctionLibraryUiObjectsFromNodes() {
/*
We will force the Plugin codeName to the same to the fileName.
*/
let config = JSON.parse(receivedNode.config)
let config
try {
config = JSON.parse(receivedNode.config)
} catch (err) {
config = {}
}
config.codeName = name
receivedNode.config = JSON.stringify(config)
UI/AppPreLoader.js
+74 -65
View File
@@ -1,78 +1,78 @@
/* Callbacks default responses. */
let GLOBAL = {};
let GLOBAL = {}
GLOBAL.DEFAULT_OK_RESPONSE = {
result: "Ok",
message: "Operation Succeeded"
};
}
GLOBAL.DEFAULT_FAIL_RESPONSE = {
result: "Fail",
message: "Operation Failed"
};
}
GLOBAL.DEFAULT_RETRY_RESPONSE = {
result: "Retry",
message: "Retry Later"
};
}
GLOBAL.CUSTOM_OK_RESPONSE = {
result: "Ok, but check Message",
message: "Custom Message"
};
}
GLOBAL.CUSTOM_FAIL_RESPONSE = {
result: "Fail Because",
message: "Custom Message"
};
}
let browserCanvas; // This is the canvas object of the browser.
let browserCanvas // This is the canvas object of the browser.
function spacePad(str, max) {
str = str.toString();
return str.length < max ? spacePad(" " + str, max) : str;
str = str.toString()
return str.length < max ? spacePad(" " + str, max) : str
}
function loadSuperalgos() {
const MODULE_NAME = "App Pre-Loader";
const INFO_LOG = false;
const MODULE_NAME = "App Pre-Loader"
const INFO_LOG = false
let browser = checkBrowserVersion();
let browser = checkBrowserVersion()
setupHTMLTextArea()
setupHTMLInput()
setupHTMLCanvas()
loadDebugModule()
if ((browser.name !== "Chrome" && browser.name!=="Safari") || (browser.name === "Chrome" && parseInt(browser.version) < 85) || (browser.name === "Safari" && parseInt(browser.version) < 13)) {
alert("Superalgos is officially supported on Google Chrome 85 or Safari 13.1 and above. Your browser version has been detected as potentially beneath this. If you continue you may experience some functionaility issues.\n\nDetected Browser: " + browser.name + "\nVersion: " + browser.version);
alert("Superalgos is officially supported on Google Chrome 85 or Safari 13.1 and above. Your browser version has been detected as potentially beneath this. If you continue you may experience some functionaility issues.\n\nDetected Browser: " + browser.name + "\nVersion: " + browser.version)
}
function checkBrowserVersion () {
let ua=navigator.userAgent,tem,M=ua.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))\/?\s*(\d+)/i) || [];
let ua=navigator.userAgent,tem,M=ua.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))\/?\s*(\d+)/i) || []
if(/trident/i.test(M[1])){
tem=/\brv[ :]+(\d+)/g.exec(ua) || [];
return {name:'IE',version:(tem[1]||'')};
tem=/\brv[ :]+(\d+)/g.exec(ua) || []
return {name:'IE',version:(tem[1]||'')}
}
if(M[1]==='Chrome'){
tem=ua.match(/\bOPR|Edge\/(\d+)/)
if(tem!=null) {return {name:'Opera', version:tem[1]};}
if(tem!=null) {return {name:'Opera', version:tem[1]}}
}
M=M[2]? [M[1], M[2]]: [navigator.appName, navigator.appVersion, '-?'];
if((tem=ua.match(/version\/(\d+)/i))!=null) {M.splice(1,1,tem[1]);}
M=M[2]? [M[1], M[2]]: [navigator.appName, navigator.appVersion, '-?']
if((tem=ua.match(/version\/(\d+)/i))!=null) {M.splice(1,1,tem[1])}
return {
name: M[0],
version: M[1]
};
}
}
function setupHTMLTextArea() {
let textArea = document.createElement('textarea');
textArea.id = "textArea";
textArea.spellcheck = false;
let textArea = document.createElement('textarea')
textArea.id = "textArea"
textArea.spellcheck = false
textArea.style = 'resize: none;' +
' border: none;' +
' outline: none;' +
@@ -85,87 +85,96 @@ function loadSuperalgos() {
'width: ' + 600 + 'px;' +
'height: ' + 400 + 'px'
let textAreaDiv = document.getElementById('textAreaDiv');
textAreaDiv.appendChild(textArea);
let textAreaDiv = document.getElementById('textAreaDiv')
textAreaDiv.appendChild(textArea)
textAreaDiv.style = 'position:fixed; top:' + -1500 + 'px; left:' + 500 + 'px; z-index:10; '
}
function setupHTMLInput() {
let input = document.createElement('input');
input.id = "input";
input.spellcheck = false;
input.style = "border: none; outline: none; box-shadow: none; overflow:hidden; width: 0px; height: 0px;";
let input = document.createElement('input')
input.id = "input"
input.spellcheck = false
input.style = "border: none; outline: none; box-shadow: none; overflow:hidden; width: 0px; height: 0px;"
let inputDiv = document.getElementById('inputDiv');
inputDiv.appendChild(input);
let inputDiv = document.getElementById('inputDiv')
inputDiv.appendChild(input)
}
function setupHTMLCanvas() {
let canvas = document.createElement('canvas');
let canvas = document.createElement('canvas')
canvas.id = "canvas";
canvas.width = 1400;
canvas.height = 600;
canvas.style.border = "0";
canvas.style = "position:absolute; top:0px; left:0px; z-index:1";
canvas.id = "canvas"
canvas.width = 1400
canvas.height = 600
canvas.style.border = "0"
canvas.style = "position:absolute; top:0px; left:0px; z-index:1"
let canvasApp = document.getElementById('canvasApp');
canvasApp.appendChild(canvas);
let canvasApp = document.getElementById('canvasApp')
canvasApp.appendChild(canvas)
browserCanvas = document.getElementById('canvas');
browserCanvas = document.getElementById('canvas')
browserCanvas.width = window.innerWidth;
browserCanvas.height = window.innerHeight;
browserCanvas.style.border = "none";
browserCanvas.width = window.innerWidth
browserCanvas.height = window.innerHeight
browserCanvas.style.border = "none"
browserCanvas.style.top = 0 + 'px';
browserCanvas.style.top = 0 + 'px'
}
function loadDebugModule() {
let path = "WebDebugLog.js";
REQUIREJS([path], onRequired);
let path = "WebDebugLog.js"
REQUIREJS([path], onRequired)
function onRequired(pModule) {
if (INFO_LOG === true) { console.log(spacePad(MODULE_NAME, 50) + " : " + "[INFO] " + path + " downloaded."); }
loadModules();
if (INFO_LOG === true) { console.log(spacePad(MODULE_NAME, 50) + " : " + "[INFO] " + path + " downloaded.") }
loadModules()
}
}
/* And Finally, we start loading all the scripts we will inmediatelly need. */
function loadModules() {
let path = "AppLoader.js";
REQUIREJS([path], onRequired);
let path = "AppLoader.js"
REQUIREJS([path], onRequired)
function onRequired(pModule) {
if (INFO_LOG === true) { console.log(spacePad(MODULE_NAME, 50) + " : " + "[INFO] " + path + " downloaded."); }
let APP_LOADER_MODULE = newAppLoader();
APP_LOADER_MODULE.loadModules();
if (INFO_LOG === true) { console.log(spacePad(MODULE_NAME, 50) + " : " + "[INFO] " + path + " downloaded.") }
let APP_LOADER_MODULE = newAppLoader()
APP_LOADER_MODULE.loadModules()
}
}
}
function httpRequest(pContentToSend, pPath, callBackFunction) {
let xmlHttpRequest = new XMLHttpRequest();
let xmlHttpRequest = new XMLHttpRequest()
xmlHttpRequest.onreadystatechange = function () {
if (this.readyState === 4 && this.status === 200) {
callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE, xmlHttpRequest.responseText);
return;
try {
callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE, xmlHttpRequest.responseText)
} catch(err) {
console.log('[ERROR] httpRequest -> httpRequest -> err.stack = '+ err.stack)
console.log('[ERROR] httpRequest -> httpRequest -> pContentToSend = '+ pContentToSend)
console.log('[ERROR] httpRequest -> httpRequest -> pPath = '+ pPath)
console.log('[ERROR] httpRequest -> httpRequest -> xmlHttpRequest.responseText = '+ xmlHttpRequest.responseText)
console.log('[ERROR] httpRequest -> httpRequest -> callBackFunction = '+ callBackFunction)
}
return
} else if (this.readyState === 4 && this.status === 404) {
callBackFunction({ result: "Fail", message: xmlHttpRequest.responseText.trim(), code: xmlHttpRequest.responseText.trim() });
return;
callBackFunction({ result: "Fail", message: xmlHttpRequest.responseText.trim(), code: xmlHttpRequest.responseText.trim() })
return
}
};
}
if (pContentToSend === undefined) {
xmlHttpRequest.open("GET", pPath, true);
xmlHttpRequest.send();
xmlHttpRequest.open("GET", pPath, true)
xmlHttpRequest.send()
} else {
try {
let blob = new Blob([pContentToSend], { type: 'text/plain' });
xmlHttpRequest.open("POST", pPath, true);
xmlHttpRequest.send(blob);
let blob = new Blob([pContentToSend], { type: 'text/plain' })
xmlHttpRequest.open("POST", pPath, true)
xmlHttpRequest.send(blob)
} catch (err) {
if (ERROR_LOG === true) { console.log(spacePad(MODULE_NAME, 50) + " : " + "[ERROR] callServer -> err.message = " & err.message); }
if (ERROR_LOG === true) { console.log(spacePad(MODULE_NAME, 50) + " : " + "[ERROR] callServer -> err.message = " & err.message) }
callBackFunction({ result: "Fail", message: err.message })
}
}