aotrautils-srv 0.0.597 → 0.0.599

aotrautils-srv/aotrautils-srv.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1_29072022-2359 (24/09/2023-21:30:09)»*/
+/*utils COMMONS library associated with aotra version : «1_29072022-2359 (24/09/2023-23:04:33)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -507,7 +507,7 @@ window.aotestMethods.getScenariiInTest=function(test){
 
 	// CAUTION : We ABSOLUTELY need to iterate over a deep copy, or else it will create weird incomprehensible bugs 
 	// if we do another recursive browsing on the initial object !!!
-	const scenario=JSON.parse(JSON.stringify(scenarioParam));
+	const scenario=parseJSON(stringifyObject(scenarioParam));
 
 
 	const basePath=valuePath;
@@ -3805,13 +3805,13 @@ window.instanciate=function(className=null){
 JSON.stringifyDecycle=function(obj){
 	let decycled=JSON.decycle(obj,null,"$className");
 	// CANNOT USE stringifyObject(...) function because we are in a common, lower-level library !
-	return JSON.stringify(decycled);
+	return stringifyObject(decycled);
 }
 
 
 JSON.parseRecycle=function(str){
 	
-	const parsedDecycled=JSON.parse(str);
+	const parsedDecycled=parseJSON(str);
 	let restoreClass=function(objParam){
 		
 		if(!objParam || isPrimitive(objParam))	return objParam;
@@ -4365,9 +4365,7 @@ window.getAsFlatStructureImpl=function(rawObject, stateOnly=false
 	});
 
 	
-//	// DBG
 // CANNOT USE stringifyObject(...) function because we are in a common, lower-level library !
-//	console.log("¬¬¬¬resultMap STRINGIFY",JSON.stringify(resultMap));
 	
 	return resultMap;
 };
@@ -4609,8 +4607,8 @@ window.getAsTreeStructureImpl=function(oldMap, stateOnly=false, removeTypeInfo=t
 	// as : {<POINTER_TO_ATTR_NAME> : "a uuid"} )*}) }
 
 	if(typeof(oldMap)==="string"){
-		oldMap=JSON.parse(oldMap);
-//	oldMap=JSON.parse(oldMap.replace(/"/gim,"'"));
+		oldMap=parseJSON(oldMap);
+//	oldMap=parseJSON(oldMap.replace(/"/gim,"'"));
 //	oldMap=eval(oldMap);
 	}
 	
@@ -4836,7 +4834,7 @@ JSON.decycle=function decycle(object, replacer, classNameAttributeName){
 
 //  var a=[];
 //  a[0]=a;
-//  return JSON.stringify(JSON.decycle(a));
+//  return stringifyObject(JSON.decycle(a));
 
 //produces the string '[{"$ref":"$"}]'.
 
@@ -4900,7 +4898,7 @@ JSON.decycle=function decycle(object, replacer, classNameAttributeName){
                 nu={};
                 Object.keys(value).forEach(function (name){
                 		// CANNOT USE stringifyObject(...) function because we are in a common, lower-level library !
-                    nu[name]=derez( value[name], path + "[" + JSON.stringify(name) + "]"
+                    nu[name]=derez( value[name], path + "[" + stringifyObject(name) + "]"
                     );
                 });
                 
@@ -4937,7 +4935,7 @@ JSON.recycle=function recycle($){
 	
 	//So,
 	//  var s='[{"$ref":"$"}]';
-	//  return JSON.recycle(JSON.parse(s));
+	//  return JSON.recycle(parseJSON(s));
 	//produces an array containing a single element which is the array itself.
 	
 	    var px=/^\$(?:\[(?:\d+|"(?:[^\\"\u0000-\u001f]|\\(?:[\\"\/bfnrt]|u[0-9a-zA-Z]{4}))*")\])*$/;
@@ -4985,7 +4983,66 @@ JSON.recycle=function recycle($){
 
 
 
+// JSON parsing management :
+function parseJSON(strParam){
+	
+	if(!isString(strParam))	return strParam;
+	
+	if (nothing(strParam))
+		return null;
+	var str=toOneSimplifiedLine(strParam.trim())
+					// OLD : Safer, but necessited to never use «'» in literal strings, and use «´» acute character instead !
+						.replace(/'/gim, "\"");
+	// DOES NOT WORK :
+//					.replace(/,'/gim, ",\"")
+//					.replace(/:'/gim, ":\"")
+//					.replace(/{'/gim, "{\"")
+//					.replace(/}'/gim, "}\"")
+//					.replace(/\['/gim, "[\"")
+//					.replace(/\]'/gim, "]\"");
+	try {
+
+		if((JSON && JSON.parse && typeof JSON.parse !== "undefined" && typeof JSON.parse === "function"
+			) || jQuery)
+			return JSON.parse(str);
+		if(typeof jQuery !== "undefined" && typeof jQuery.parseJSON !== "undefined" && typeof jQuery.parseJSON === "function"){
+			return jQuery.parseJSON(str);
+		}
+		throw new Error("ERROR : No JSON subsystem found to parse the JSON string.");
+		
+	} catch (error){
+		// TRACE
+		log("WARN : Error parsing string «" + strParam + "» as JSON. Trying last-chance fallback.");
+		try {
+			var obj=eval("(" + str + ")");
+
+			return obj;
+		} catch (error2){
+
+			// TRACE
+			log(error2);
+			log("ERROR : Error parsing string «" + strParam + "» as JSON. Last-chance fallback failed." +
+					" CHECK IF THERE IS ANY «'» SINGLE QUOTE CHARACTER IN YOUR LITERALS STRINGS, AND REPLACE IT WITH «´» ACUTE CHARACTER INSTEAD.");
+
+		}
+
+	}
+	return null;
+}
 
+function stringifyObject(objectToStringify){
+	
+	if(nothing(objectToStringify))	return null;
+	
+	if (JSON && JSON.stringify && typeof JSON.stringify !== "undefined" && typeof JSON.stringify === "function"){
+		return JSON.stringify(objectToStringify);
+	}
+	if(typeof jQuery !== "undefined" && typeof jQuery.stringify !== "undefined" && typeof jQuery.stringify === "function"){
+		return jQuery.stringify(objectToStringify);
+	}
+	log("ERROR : No JSON subsystem found to stringify the javascript object.");
+	return null;
+}
 
 
 
@@ -4997,7 +5054,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 
 
-/*utils SERVER library associated with aotra version : «1_29072022-2359 (24/09/2023-21:30:09)»*/
+/*utils SERVER library associated with aotra version : «1_29072022-2359 (24/09/2023-23:04:33)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -5102,7 +5159,7 @@ if(typeof(fs)==="undefined"){
 				let resultData={};
 				
 				// 1)
-				if(!empty(resultFlat))	resultData=JSON.parse(resultFlat);
+				if(!empty(resultFlat))	resultData=parseJSON(resultFlat);
 				
 				// 2)
 				if(!empty(resultData) && isFlatMap(resultData)){
@@ -5125,7 +5182,7 @@ if(typeof(fs)==="undefined"){
 				
 				// reserved characters : -/\^$*+?.()|[]{}
 				// CANNOT USE stringifyObject(...) function because we are in a common, lower-level library !
-				let dataFlatStr=JSON.stringify(dataFlatForClient)
+				let dataFlatStr=stringifyObject(dataFlatForClient)
 					// We «aerate» the produced JSON :
 					.replace(/":[\w]*\{/gim,"\":{\n").replace(/,"/gim,",\n\"")
 					// ...except for inline, escaped JSON string representations :
@@ -5314,11 +5371,11 @@ WebsocketImplementation={
 				let dataResult=eventOrMessage;
 				
 				try{
-					dataResult=(WebsocketImplementation.useFlatStrings || isString(eventOrMessage)?JSON.parse(eventOrMessage):eventOrMessage);
+					dataResult=(WebsocketImplementation.useFlatStrings || isString(eventOrMessage)?parseJSOn(eventOrMessage):eventOrMessage);
 				}catch(error1){
 					// TRACE
 					lognow(`ERROR : Failed to parse JSON for string «${dataResult}»`,error1);
-					dataResult=(isString(eventOrMessage)?eventOrMessage:JSON.stringify(eventOrMessage));
+					dataResult=(isString(eventOrMessage)?eventOrMessage:stringifyObject(eventOrMessage));
 				}
 				
 				return dataResult;
@@ -5392,7 +5449,7 @@ WebsocketImplementation={
 //							// DBG
 //							lognow("(SERVER) RECEIVED SOMETHING FROM CLIENT...", eventOrMessage.data);
 								
-//							dataWrapped=JSON.parse(dataWrapped);
+//							dataWrapped=parseJSON(dataWrapped);
 //							dataWrapped=getAt(dataWrapped,0);// We get the root element
 								
 
@@ -5477,7 +5534,7 @@ WebsocketImplementation={
 							   	let dataWrapped={channelName:channelName, data:data};
 					      	
 						      
-									dataWrapped=JSON.stringify(dataWrapped);
+									dataWrapped=stringifyObject(dataWrapped);
 									
 									// TODO : FIXME : Use one single interface !
 					      	if(!WebsocketImplementation.useSocketIOImplementation)	clientSocket.send(dataWrapped);
@@ -5502,7 +5559,7 @@ WebsocketImplementation={
 
 			      	// Channel information is stored in exchanged data :
 				      let dataWrapped={channelName:channelName, data:data};
-							dataWrapped=JSON.stringify(dataWrapped);
+							dataWrapped=stringifyObject(dataWrapped);
 							
 							
 							// DBG
@@ -5740,9 +5797,9 @@ WebsocketImplementation={
 								clientsRoomsTag:clientsRoomsTag, 
 								execute:(eventOrMessage)=>{
 										
-//								dataWrapped=JSON.parse(dataWrapped);
+//								dataWrapped=parseJSON(dataWrapped);
 //								dataWrapped=getAt(dataWrapped,0);// We get the root element
-//								const dataWrapped=(WebsocketImplementation.useFlatStrings?JSON.parse(eventOrMessage):eventOrMessage);
+//								const dataWrapped=(WebsocketImplementation.useFlatStrings?parseJSON(eventOrMessage):eventOrMessage);
 										
 									const dataWrapped=WebsocketImplementation.getMessageDataBothImplementations(eventOrMessage);
 									
@@ -5804,7 +5861,7 @@ WebsocketImplementation={
 //			    console.log("(NODE CLIENT) SENDING DATA ! dataWrapped:",dataWrapped);
 
 
-						dataWrapped=JSON.stringify(dataWrapped);
+						dataWrapped=stringifyObject(dataWrapped);
 	
 	
 //			            // DBG
@@ -6056,7 +6113,7 @@ WebsocketImplementation={
 				    console.log("(BROWSER) SENDING... : clientSocket :",clientSocket);
 
             
-						dataWrapped=JSON.stringify(dataWrapped);
+						dataWrapped=stringifyObject(dataWrapped);
 
 				   	
 		   			// TODO : FIXME : Use one single interface !
@@ -6313,7 +6370,7 @@ initNodeServerInfrastructureWrapper=function(doOnClientConnection=null, doOnFina
 		}else if(i==3){
 			if(!isHashAsked){
 				try{
-					const jsonConf=JSON.parse(val);	
+					const jsonConf=parseJSON(val);	
 					argCLPort=jsonConf.port;
 					argCLCertPath=jsonConf.sslCertPath;
 					argCLKeyPath=jsonConf.sslKeyPath;

aotrautils-srv/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "aotrautils-srv",
-	"version": "0.0.597",
+	"version": "0.0.599",
 	"main": "aotrautils-srv.build.js",
 	"description": "A library for vanilla javascript utils (server-side) used in aotra javascript CMS",
 	"author": "Jeremie Ratomposon <info@alqemia.com> (https://alqemia.com)",