@osimatic/helpers-js 1.0.57 → 1.0.60

package/.idea/helpers-js.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/helpers-js.iml" filepath="$PROJECT_DIR$/.idea/helpers-js.iml" />
+    </modules>
+  </component>
+</project>

package/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

package/network.js

@@ -53,6 +53,48 @@ class HTTPRequest {
 		this.headers['Authorization'] = 'Bearer ' + accessToken;
 	}
 
+	static convertObjectToFormData(obj) {
+		// 30/05/2022 : ancienne version, qui ne fonctionne pas avec des tableaux
+		// let formData = new FormData();
+		// Object.entries(data).forEach(([key, value]) => formData.append(key, value));
+		// return formData;
+
+		var formData = new FormData();
+
+		function appendFormData(data, root) {
+			//console.log('appendFormData', data, root);
+			root = root || '';
+			if (data instanceof File) {
+				formData.append(root, data);
+			}
+			else if (Array.isArray(data)) {
+				for (var i = 0; i < data.length; i++) {
+					appendFormData(data[i], root + '[' + i + ']');
+				}
+			}
+			else if (typeof data === 'object' && data) {
+				for (var key in data) {
+					if (data.hasOwnProperty(key)) {
+						if (root === '') {
+							appendFormData(data[key], key);
+						} else {
+							appendFormData(data[key], root + '.' + key);
+						}
+					}
+				}
+			}
+			else {
+				if (data !== null && typeof data !== 'undefined') {
+					formData.append(root, data);
+				}
+			}
+		}
+
+		appendFormData(obj);
+
+		return formData;
+	}
+
 	static formatQueryString(data) {
 		if (data == null) {
 			return '';
@@ -68,9 +110,7 @@ class HTTPRequest {
 
 	static formatFormData(data) {
 		if (!(data instanceof FormData)) {
-			let formData = new FormData();
-			Object.entries(data).forEach(([key, value]) => formData.append(key, value));
-			return formData;
+			return HTTPRequest.convertObjectToFormData(data);
 		}
 		return data;
 	}
@@ -580,13 +620,18 @@ class UrlAndQueryString {
 			if (typeof (object) == 'object') {
 				for (var name in object) {
 					value = object[name];
+					// 06/06/2022 : ajout de ce if pour éviter bug sur fonction HTTPRequest.formatQueryString
+					if (typeof (value) == 'undefined') {
+						continue;
+					}
 					// 14/01/2020 : les tableaux avec param[0], param[1] en query string fonctionne pas, il faut mettre param[]=x&param[]=y
 					//name = p == '' ? name : '['+name+']';
 					name = p == '' ? name : '[]';
 					if (typeof (value) == 'object') {
 						buildStringFromParam(value, p + name);
 					}
-					else if (typeof (value) != 'function' && name != '') {
+					// 06/06/2022 : ajout null !== value pour éviter bug sur fonction HTTPRequest.formatQueryString
+					else if (null !== value && typeof (value) != 'function' && name != '') {
 						// 27/01/2020 : correction bug boolean affiché en string true/false
 						if (typeof (value) == 'boolean') {
 							value = (value ? 1 : 0);

package/package.json

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

package/web_rtc.js

@@ -8,7 +8,7 @@ class WebRTC {
         this.turnSecret = turnSecret;
     }
 
-    static offer(stream, iceCandidateCallback, connectionStateChangeCallback, iceFailureCallback) {
+    static offer(stream, iceCandidateCallback) {
         return new Promise(async (resolve, reject) => {
             try {
                 let { username, password } = this.getTurnCredentials(); 
@@ -25,16 +25,12 @@ class WebRTC {
                     }
                 );
 
-                peerConn.oniceconnectionstatechange = (event) => connectionStateChangeCallback(event);
-
                 peerConn.onicecandidate = ((event) => {
                     if (event.candidate) {
                         iceCandidateCallback(event.candidate);
                     }
                 });
 
-                peerConn.onicecandidateerror = (event) => iceFailureCallback(event);
-
                 stream.getTracks().forEach(track => peerConn.addTrack(track, stream));
 
                 const offer = await peerConn.createOffer();
@@ -47,7 +43,7 @@ class WebRTC {
         });
     }
     
-    static answer(remoteDescription, onTrackCallback, iceCandidateCallback, connectionStateChangeCallback, iceFailureCallback) {
+    static answer(remoteDescription, onTrackCallback, iceCandidateCallback) {
         return new Promise(async (resolve, reject) => {
             try {
                 let { username, password } = this.getTurnCredentials();
@@ -64,16 +60,12 @@ class WebRTC {
                     }
                 );
 
-                peerConn.oniceconnectionstatechange = (event) => connectionStateChangeCallback(event);
-
                 peerConn.onicecandidate = ((event) => {
                     if (event.candidate) {
                         iceCandidateCallback(event.candidate);
                     }
                 });
 
-                peerConn.onicecandidateerror = (event) => iceFailureCallback(event);
-
                 peerConn.ontrack = (event) => onTrackCallback(event.streams);
                 
                 peerConn.setRemoteDescription(new RTCSessionDescription(remoteDescription))