@osimatic/helpers-js 1.0.40 → 1.0.43

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/.idea/helpers-js.iml +8 -0
  2. package/.idea/modules.xml +8 -0
  3. package/.idea/vcs.xml +6 -0
  4. package/network.js +9 -9
  5. package/package.json +1 -1
  6. package/web_rtc.js +15 -6
package/.idea/helpers-js.iml ADDED
@@ -0,0 +1,8 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <module type="WEB_MODULE" version="4">
3
+ <component name="NewModuleRootManager">
4
+ <content url="file://$MODULE_DIR$" />
5
+ <orderEntry type="inheritedJdk" />
6
+ <orderEntry type="sourceFolder" forTests="false" />
7
+ </component>
8
+ </module>
package/.idea/modules.xml ADDED
@@ -0,0 +1,8 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <project version="4">
3
+ <component name="ProjectModuleManager">
4
+ <modules>
5
+ <module fileurl="file://$PROJECT_DIR$/.idea/helpers-js.iml" filepath="$PROJECT_DIR$/.idea/helpers-js.iml" />
6
+ </modules>
7
+ </component>
8
+ </project>
package/.idea/vcs.xml ADDED
@@ -0,0 +1,6 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <project version="4">
3
+ <component name="VcsDirectoryMappings">
4
+ <mapping directory="$PROJECT_DIR$" vcs="Git" />
5
+ </component>
6
+ </project>
package/network.js CHANGED
@@ -101,7 +101,7 @@ class HTTPRequest {
101
101
  //console.log(url, jsonData);
102
102
  //console.log(response.status, response.statusText, jsonData['error']);
103
103
 
104
- if (response.status == 401 && (response.statusText === 'Expired JWT Token' || typeof jsonData['error'] != 'undefined' && jsonData['error'] === 'expired_token')) {
104
+ if (response.status === 401 && (response.statusText === 'Expired JWT Token' || typeof jsonData['error'] != 'undefined' && jsonData['error'] === 'expired_token')) {
105
105
  HTTPRequest.refreshToken(() => HTTPRequest.get(url, data, successCallback, errorCallback));
106
106
  return;
107
107
  }
@@ -139,7 +139,7 @@ class HTTPRequest {
139
139
  }
140
140
  },
141
141
  error: (jqxhr, status, errorThrown) => {
142
- if (jqxhr.status == 401 && (jqxhr.statusText === 'Expired JWT Token' || (typeof jqxhr.responseJSON['message'] != 'undefined' && jqxhr.responseJSON['message'] === 'Expired JWT Token') || (typeof jqxhr.responseJSON['error'] != 'undefined' && jqxhr.responseJSON['error'] === 'expired_token' ))) {
142
+ if (jqxhr.status === 401 && (jqxhr.statusText === 'Expired JWT Token' || (typeof jqxhr.responseJSON['message'] != 'undefined' && jqxhr.responseJSON['message'] === 'Expired JWT Token') || (typeof jqxhr.responseJSON['error'] != 'undefined' && jqxhr.responseJSON['error'] === 'expired_token' ))) {
143
143
  HTTPRequest.refreshToken(() => HTTPRequest.get(url, data, successCallback, errorCallback));
144
144
  return;
145
145
  }
@@ -179,7 +179,7 @@ class HTTPRequest {
179
179
  /*console.log(url);
180
180
  console.log(blobData);*/
181
181
 
182
- if (response.status == 401 && response.statusText === 'Expired JWT Token') {
182
+ if (response.status === 401 && response.statusText === 'Expired JWT Token') {
183
183
  HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback, method));
184
184
  return;
185
185
  }
@@ -226,7 +226,7 @@ class HTTPRequest {
226
226
  $.ajax(Object.assign({...ajaxOptions}, {
227
227
  success: (data, status, jqxhr) => File.download(data, jqxhr.getResponseHeader('Content-Type'), jqxhr.getResponseHeader('Content-Disposition')),
228
228
  error: (jqxhr, status, errorThrown) => {
229
- if (jqxhr.status == 401 && (jqxhr.statusText === 'Expired JWT Token' || (typeof jqxhr.responseJSON['message'] != 'undefined' && jqxhr.responseJSON['message'] === 'Expired JWT Token') || (typeof jqxhr.responseJSON['error'] != 'undefined' && jqxhr.responseJSON['error'] === 'expired_token' ))) {
229
+ if (jqxhr.status === 401 && (jqxhr.statusText === 'Expired JWT Token' || (typeof jqxhr.responseJSON['message'] != 'undefined' && jqxhr.responseJSON['message'] === 'Expired JWT Token') || (typeof jqxhr.responseJSON['error'] != 'undefined' && jqxhr.responseJSON['error'] === 'expired_token' ))) {
230
230
  HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback, method));
231
231
  return;
232
232
  }
@@ -258,12 +258,12 @@ class HTTPRequest {
258
258
 
259
259
  let jsonData = {};
260
260
  try {
261
- if (response.statusText !== 'No Content') {
261
+ if (response.status !== 204 && response.statusText !== 'No Content') {
262
262
  jsonData = await response.json();
263
263
  }
264
264
  //console.log(url, jsonData);
265
265
 
266
- if (response.status == 401 && url !== HTTPRequest.refreshTokenUrl && (response.statusText === 'Expired JWT Token' || (typeof jsonData['error'] != 'undefined' && jsonData['error'] === 'expired_token'))) {
266
+ if (response.status === 401 && url !== HTTPRequest.refreshTokenUrl && (response.statusText === 'Expired JWT Token' || (typeof jsonData['error'] != 'undefined' && jsonData['error'] === 'expired_token'))) {
267
267
  HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback));
268
268
  return;
269
269
  }
@@ -275,7 +275,7 @@ class HTTPRequest {
275
275
  return;
276
276
  }
277
277
 
278
- if (response.status == 400 && typeof formErrorCallback != 'undefined' && formErrorCallback != null) {
278
+ if (response.status === 400 && typeof formErrorCallback != 'undefined' && formErrorCallback != null) {
279
279
  formErrorCallback(jsonData, response);
280
280
  return;
281
281
  }
@@ -311,11 +311,11 @@ class HTTPRequest {
311
311
  }
312
312
  },
313
313
  error: (jqxhr, status, errorThrown) => {
314
- if (url !== HTTPRequest.refreshTokenUrl && jqxhr.status == 401 && (jqxhr.statusText === 'Expired JWT Token' || (typeof jqxhr.responseJSON['message'] != 'undefined' && jqxhr.responseJSON['message'] === 'Expired JWT Token') || (typeof jqxhr.responseJSON['error'] != 'undefined' && jqxhr.responseJSON['error'] === 'expired_token' ))) {
314
+ if (url !== HTTPRequest.refreshTokenUrl && jqxhr.status === 401 && (jqxhr.statusText === 'Expired JWT Token' || (typeof jqxhr.responseJSON['message'] != 'undefined' && jqxhr.responseJSON['message'] === 'Expired JWT Token') || (typeof jqxhr.responseJSON['error'] != 'undefined' && jqxhr.responseJSON['error'] === 'expired_token' ))) {
315
315
  HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback));
316
316
  return;
317
317
  }
318
- if (jqxhr.status == 400 && typeof formErrorCallback != 'undefined' && formErrorCallback != null) {
318
+ if (jqxhr.status === 400 && typeof formErrorCallback != 'undefined' && formErrorCallback != null) {
319
319
  formErrorCallback(jqxhr.responseJSON, jqxhr);
320
320
  return;
321
321
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@osimatic/helpers-js",
3
- "version": "1.0.40",
3
+ "version": "1.0.43",
4
4
  "main": "index.js",
5
5
  "scripts": {
6
6
  "test": "echo \"Error: no test specified\" && exit 1"
package/web_rtc.js CHANGED
@@ -8,7 +8,7 @@ class WebRTC {
8
8
  this.turnAccount = turnAccount;
9
9
  }
10
10
 
11
- static offer(stream) {
11
+ static offer(stream, iceCandidateCallback) {
12
12
  return new Promise((resolve, reject) => {
13
13
  try {
14
14
  let { username, password } = this.turnAccount;
@@ -22,7 +22,12 @@ class WebRTC {
22
22
  );
23
23
 
24
24
  stream.getTracks().forEach(track => peerConn.addTrack(track, stream));
25
-
25
+ peerConn.onicecandidate = ((event) => {
26
+ if (event.candidate) {
27
+ iceCandidateCallback(event.candidate);
28
+ }
29
+ });
30
+
26
31
  peerConn.createOffer()
27
32
  .then(sdp => peerConn.setLocalDescription(sdp))
28
33
  .then(() => resolve(peerConn));
@@ -32,7 +37,7 @@ class WebRTC {
32
37
  });
33
38
  }
34
39
 
35
- static answer (remoteDescription, onTrackCallback) {
40
+ static answer (remoteDescription, onTrackCallback, iceCandidateCallback) {
36
41
  return new Promise((resolve, reject) => {
37
42
  try {
38
43
  let { username, password } = this.turnAccount;
@@ -45,9 +50,13 @@ class WebRTC {
45
50
  }
46
51
  );
47
52
 
48
- //todo test si streams n'est pas vide ?
49
- peerConn.ontrack = event => onTrackCallback(event.streams);
50
-
53
+ peerConn.ontrack = (event) => onTrackCallback(event.streams);
54
+ peerConn.onicecandidate = ((event) => {
55
+ if (event.candidate) {
56
+ iceCandidateCallback(event.candidate);
57
+ }
58
+ });
59
+
51
60
  peerConn.setRemoteDescription(remoteDescription)
52
61
  .then(() => peerConn.createAnswer())
53
62
  .then(sdp => peerConn.setLocalDescription(sdp))