@osimatic/helpers-js 1.0.28 → 1.0.31

package/details_sub_array.js

@@ -78,7 +78,7 @@ class DetailsSubArray {
 			$.ajax({
 				url: link.data("url_details"),
 				method: 'GET',
-				headers: httpHeaders,
+				headers: HTTPRequest.getHeaders(),
 				cache: false,
 				dataType: 'json',
 				success: function (jsonObj) {

package/file.js

@@ -103,7 +103,7 @@ class Img {
 		$.ajax({
 			type: 'GET',
 			url: url,
-			headers: httpHeaders,
+			headers: HTTPRequest.getHeaders(),
 			cache: false,
 			xhrFields: {responseType: 'blob'},
 			success: (data) => {

package/flash_message.js

@@ -33,7 +33,6 @@ class FlashMessage {
 		console.log('request failure. Status: ', status, ' Exception: ', exception);
 		this.display('danger', typeof labelErrorOccured != 'undefined' ? labelErrorOccured :  "Une erreur s'est produite.", false, modal);
 	}
-
 }
 
 module.exports = { FlashMessage };

package/location.js

@@ -8,19 +8,19 @@ class Country {
 	}
 
 	static fillCountrySelect(select, defaultValue) {
-		Object.entries(Country.getCountryList()).forEach(([countryCode, countryName]) => select.append('<option value="'+countryCode+'">'+countryName+'</option>'));
+		Object.entries(Country.getCountries()).forEach(([countryCode, countryName]) => select.append('<option value="'+countryCode+'">'+countryName+'</option>'));
 		if (typeof defaultValue != 'undefined') {
 			select.val(defaultValue);
 		}
 		select.selectpicker('refresh');
 	}
 	static getCountryName(countryCode) {
-		if (Country.getCountryList().hasOwnProperty(countryCode)) {
-			return Country.getCountryList()[countryCode];
+		if (Country.getCountries().hasOwnProperty(countryCode)) {
+			return Country.getCountries()[countryCode];
 		}
 		return countryCode;
 	}
-	static getCountryList() {
+	static getCountries() {
 		return {
 			AF:'Afghanistan',
 			AX:'Åland Islands',
@@ -268,6 +268,23 @@ class Country {
 			ZW:'Zimbabwe',
 		};
 	}
+
+	static getContinents() {
+		return {
+			1: "Europe",
+			2: "Moyen-Orient",
+			3: "Afrique",
+			4: "Amérique du Nord",
+			5: "Amérique du Sud",
+			6: "Asie",
+			7: "Océanie",
+		};
+	}
+
+	/** @deprecated **/
+	static getCountryList() {
+		return Country.getCountries();
+	}
 }
 
 class PostalAddress {

package/media.js

@@ -72,6 +72,49 @@ class AudioMedia {
 		}
 	}
 
+	static initAudioVisualization(canvas, audioStream) {
+		let canvasCtx = canvas.getContext("2d");
+		let canvasWidth = canvas.width;
+		let canvasHeight = canvas.height;
+		let audioCtx = new (window.AudioContext || window.webkitAudioContext)();
+		let analyser = audioCtx.createAnalyser();
+
+		let distortion = audioCtx.createWaveShaper();
+		let source = audioCtx.createMediaStreamSource(audioStream);
+		source.connect(analyser);
+		analyser.connect(distortion);
+		distortion.connect(audioCtx.destination);
+
+		analyser.fftSize = 256;
+		let bufferLength = analyser.frequencyBinCount;
+		console.log(bufferLength);
+		let dataArray = new Uint8Array(bufferLength);
+
+		canvasCtx.clearRect(0, 0, canvasWidth, canvasHeight);
+
+		function draw() {
+			let drawVisual = requestAnimationFrame(draw);
+
+			analyser.getByteFrequencyData(dataArray);
+
+			canvasCtx.fillStyle = 'rgb(0, 0, 0)';
+			canvasCtx.fillRect(0, 0, canvasWidth, canvasHeight);
+
+			let barWidth = (canvasWidth / bufferLength) * 2.5;
+			let barHeight;
+			let x = 0;
+			for (let i = 0; i < bufferLength; i++) {
+				barHeight = dataArray[i] / 2;
+
+				canvasCtx.fillStyle = 'rgb(' + (barHeight + 100) + ',50,50)';
+				canvasCtx.fillRect(x, canvasHeight - barHeight / 2, barWidth, barHeight);
+
+				x += barWidth + 1;
+			}
+		}
+
+		draw();
+	}
 }
 
 //Source : https://www.npmjs.com/package/mic-check

package/network.js

@@ -43,6 +43,15 @@ class HTTPRequest {
 		return data;
 	}
 
+	static formatFormData(data) {
+		if (!(data instanceof FormData)) {
+			let formData = new FormData();
+			Object.entries(data).forEach(([key, value]) => formData.append(key, value));
+			return formData;
+		}
+		return data;
+	}
+
 	static logRequestFailure(response, json) {
 		console.error('Request failure. Status: '+response.statusText+' ; HTTP Code : '+response.status, json);
 	}
@@ -52,18 +61,18 @@ class HTTPRequest {
 	}
 
 	static async get(url, data, successCallback, errorCallback) {
-		data = this.formatQueryString(data);
+		url += (!url.includes('?') ? '?' : '') + this.formatQueryString(data);
+		data = null;
 
 		if (window.fetch) {
-			let requestInit = {
+			const response = await fetch(url, {
 				method: 'GET',
 				headers: HTTPRequest.getHeaders(),
 				mode: 'cors',
 				cache: 'no-cache'
-			}
+			});
 
 			let jsonData = {};
-			const response = await fetch(url + (!url.includes('?') ? '?' : '') + data, requestInit);
 			try {
 				jsonData = await response.json();
 				//console.log(url, jsonData);
@@ -98,7 +107,7 @@ class HTTPRequest {
 		console.error('fetch\'s polyfill used');
 		$.ajax({
 			type: 'GET',
-			url: url + (!url.includes('?') ? '?' : '') + data,
+			url: url,
 			headers: HTTPRequest.getHeaders(),
 			dataType: 'json',
 			cache: false,
@@ -117,8 +126,13 @@ class HTTPRequest {
 		});
 	}
 
-	static async download(url, data, errorCallback, completeCallback) {
-		data = this.formatQueryString(data);
+	static async download(url, data, errorCallback, completeCallback, method) {
+		method = typeof method == 'undefined' || null == method ? 'GET' : method;
+
+		if ('POST' !== method) {
+			url += (!url.includes('?') ? '?' : '') + this.formatQueryString(data);
+			data = null;
+		}
 
 		if (window.fetch) {
 			let requestInit = {
@@ -128,14 +142,19 @@ class HTTPRequest {
 				cache: 'no-cache'
 			}
 
-			const response = await fetch(url + (!url.includes('?') ? '?' : '') + data, requestInit);
+			if ('POST' === method) {
+				requestInit['method'] = 'POST';
+				requestInit['body'] = this.formatFormData(data);
+			}
+
+			const response = await fetch(url, requestInit);
 			try {
 				const blobData = await response.blob();
 				/*console.log(url);
 				console.log(blobData);*/
 
 				if (response.status == 401 && response.statusText === "Expired JWT Token") {
-					HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback));
+					HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback, method));
 					return;
 				}
 
@@ -163,18 +182,29 @@ class HTTPRequest {
 
 		//l'api fetch n'est pas dispo pour ce navigateur => normalement ce cas ne devrait pas arriver car le polyfill est chargé
 		console.error('fetch\'s polyfill used');
-		$.ajax({
+
+
+		let ajaxOptions = {
 			type: 'GET',
-			url: url + (!url.includes('?') ? '?' : '') + data,
+			url: url,
 			headers: HTTPRequest.getHeaders(),
 			cache: false,
 			xhrFields: {
 				responseType: 'blob'
 			},
+		};
+		if ('POST' === method) {
+			ajaxOptions['type'] = 'POST';
+			ajaxOptions['data'] = this.formatFormData(data);
+			ajaxOptions['contentType'] = false;
+			ajaxOptions['processData'] = false;
+		}
+
+		$.ajax(Object.assign({...ajaxOptions}, {
 			success: (data, status, jqxhr) => File.download(data, jqxhr.getResponseHeader('Content-Type'), jqxhr.getResponseHeader('Content-Disposition')),
 			error: (jqxhr, status, errorThrown) => {
 				if (typeof jqxhr.responseJSON != 'undefined' && jqxhr.responseJSON.code == 401 && (jqxhr.responseJSON.message === "Expired JWT Token"  || (typeof jqxhr.responseJSON['error'] != 'undefined' && jqxhr.responseJSON['error'] === 'expired_token' ))) {
-					HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback));
+					HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback, method));
 					return;
 				}
 
@@ -188,33 +218,27 @@ class HTTPRequest {
 					completeCallback(jqxhr, status);
 				}
 			}
-		});
+		}));
 	}
 
 	static async post(url, formData, successCallback, errorCallback, formErrorCallback) {
-		if (!(formData instanceof FormData)) {
-			let formDataObject = new FormData();
-			Object.entries(formData).forEach(([key, value]) => formDataObject.append(key, value));
-			formData = formDataObject;
-		}
+		formData = this.formatFormData(formData);
 
 		if (window.fetch && false) {
-			let requestInit = {
+			const response = await fetch(url, {
 				method: 'POST',
 				body: formData,
 				headers: HTTPRequest.getHeaders(),
 				mode: 'cors',
 				cache: 'no-cache'
-			};
+			});
 
 			let jsonData = {};
-			const response = await fetch(url, requestInit);
-
 			try {
 				jsonData = await response.json();
 				//console.log(url, jsonData);
 
-				if (response.status == 401 && (response.statusText === "Expired JWT Token" || (typeof jsonData['error'] != 'undefined' && jsonData['error'] === 'expired_token'))) {
+				if (response.status == 401 && url !== HTTPRequest.refreshTokenUrl && (response.statusText === "Expired JWT Token" || (typeof jsonData['error'] != 'undefined' && jsonData['error'] === 'expired_token'))) {
 					HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback));
 					return;
 				}
@@ -263,7 +287,7 @@ class HTTPRequest {
 				}
 			},
 			error: (jqxhr, status, errorThrown) => {
-				if (typeof jqxhr.responseJSON != 'undefined' && jqxhr.responseJSON.code == 401 && (jqxhr.responseJSON.message === "Expired JWT Token"  || (typeof jqxhr.responseJSON['error'] != 'undefined' && jqxhr.responseJSON['error'] === 'expired_token' ))) {
+				if (typeof jqxhr.responseJSON != 'undefined' && jqxhr.responseJSON.code == 401 && url !== HTTPRequest.refreshTokenUrl && (jqxhr.responseJSON.message === "Expired JWT Token"  || (typeof jqxhr.responseJSON['error'] != 'undefined' && jqxhr.responseJSON['error'] === 'expired_token' ))) {
 					HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback));
 					return;
 				}
@@ -300,8 +324,7 @@ class HTTPRequest {
 				JwtSession.setRefreshToken(data.refresh_token);
 				onCompleteCallback();
 			}, 
-			(jqxhr, status, exception) => {
-				console.log(exception);
+			() => {
 				JwtSession.logout();
 			}
 		);
@@ -327,11 +350,12 @@ class HTTPRequest {
 
 		xhr.onreadystatechange = function () {
 			if (xhr.readyState == 4 && (xhr.status == 200 || xhr.status == 0)) {
+				let data;
 				if (formatRetour == 'xml') {
-					var data = xhr.responseXML;
+					data = xhr.responseXML;
 				}
 				else {
-					var data = eval('(' + xhr.responseText + ')');
+					data = eval('(' + xhr.responseText + ')');
 				}
 				callback(data);
 			}
@@ -573,6 +597,7 @@ class UrlAndQueryString {
 
 	// deprecated
 
+	/** @deprecated **/
 	static parseQueryString(string) {
 		if (string === "" || string == null) return {};
 		if (string.charAt(0) === "?") string = string.slice(1);
@@ -612,6 +637,7 @@ class UrlAndQueryString {
 		return data0;
 	}
 
+	/** @deprecated **/
 	static getQuery(url) {
 		var str = url;
 		var strpos = str.indexOf('?');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osimatic/helpers-js",
-  "version": "1.0.28",
+  "version": "1.0.31",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"