@osimatic/helpers-js 1.0.36 → 1.0.39

package/index.js

@@ -33,6 +33,7 @@ const { CountDown } = require('./count_down');
 const { ImportFromCsv } = require('./import_from_csv');
 const { JwtToken, JwtSession } = require('./jwt');
 const { ListBox } = require('./list_box');
+const { WebRTC } = require('./web_rtc');
 
 // exports surcouche lib externe
 const { GoogleCharts } = require('./google_charts');
@@ -43,7 +44,7 @@ const { OpenStreetMap } = require('./open_street_map');
 module.exports = {
 	Array, Object, Number, String,
 	HTTPRequest, Cookie, UrlAndQueryString, IBAN, BankCard, AudioMedia, UserMedia, PersonName, Email, TelephoneNumber, DateTime, TimestampUnix, SqlDate, SqlTime, SqlDateTime, Duration, File, CSV, Img, FormHelper, Country, PostalAddress, GeographicCoordinates, SocialNetwork,
-	DataTable, Pagination, Navigation, DetailsSubArray, SelectAll, MultipleActionInTable, FormDate, InputPeriod, ShoppingCart, FlashMessage, CountDown, ImportFromCsv, JwtToken, JwtSession, ListBox,
+	DataTable, Pagination, Navigation, DetailsSubArray, SelectAll, MultipleActionInTable, FormDate, InputPeriod, ShoppingCart, FlashMessage, CountDown, ImportFromCsv, JwtToken, JwtSession, ListBox, WebRTC,
 	sleep, refresh, chr, ord, trim, empty,
 	GoogleCharts, GoogleRecaptcha, GoogleMap, OpenStreetMap
 };

package/package.json

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

package/web_rtc.js

@@ -1,14 +1,17 @@
 class WebRTC {
-    static init (turnSecret, turnUrl, stunUrl) {
-        this.turnSecret = turnSecret;
+    static setIceServers(turnUrl, stunUrl) {
         this.turnUrl = turnUrl;
         this.stunUrl = stunUrl;
     }
 
-    static offer(stream, onICECandidateCallback) {
+    static setTurnAccount(turnAccount) {
+        this.turnAccount = turnAccount;
+    }
+
+    static offer(stream) {
         return new Promise((resolve, reject) => {
             try {
-                let { username, password } = this.getTurnCredentials();
+                let { username, password } = this.turnAccount;
                 let peerConn = new RTCPeerConnection(
                     { 
                         iceServers: [
@@ -19,8 +22,6 @@ class WebRTC {
                 );
     
                 stream.getTracks().forEach(track => peerConn.addTrack(track, stream));
-
-                peerConn.onicecandidate = (event) => onICECandidateCallback(event);
     
                 peerConn.createOffer()
                 .then(sdp => peerConn.setLocalDescription(sdp))
@@ -31,10 +32,10 @@ class WebRTC {
         });
     }
     
-    static answer (remoteDescription, onTrackCallback, onICECandidateCallback) {
+    static answer (remoteDescription, onTrackCallback) {
         return new Promise((resolve, reject) => {
             try {
-                let { username, password } = this.getTurnCredentials();
+                let { username, password } = this.turnAcccount;
                 let peerConn = new RTCPeerConnection(
                     { 
                         iceServers: [
@@ -44,8 +45,8 @@ class WebRTC {
                     }
                 );
     
-                peerConn.ontrack = event => onTrackCallback(event);
-                peerConn.onicecandidate = event => onICECandidateCallback(event);
+                //todo test si streams n'est pas vide ?
+                peerConn.ontrack = event => onTrackCallback(event.streams);
     
                 peerConn.setRemoteDescription(remoteDescription)
                 .then(() => peerConn.createAnswer())
@@ -72,32 +73,6 @@ class WebRTC {
             
         return peerConn;
     }
-    
-    /*
-        The idea is that WebRTC (or other) clients receive temporary TURN credentials where the user name is comprised of the (Unix)
-        expiry timestamp and the password is derived from a secret shared between the service generating those credentials and eturnal. 
-        The service offering the credentials performs a Base64(HMAC-SHA1($secret, $timestamp)) operation to generate the ephemeral password, 
-        and eturnal does the same to verify it.
-    
-        https://eturnal.net/documentation/
-        https://datatracker.ietf.org/doc/html/draft-uberti-behave-turn-rest-00
-        https://stackoverflow.com/questions/35766382/coturn-how-to-use-turn-rest-api
-    */
-    static getTurnCredentials() {    
-        try {
-            let crypto = require('crypto');
-            let username = String(parseInt(Date.now() / 1000) + 24 * 3600);
-            let hmac = crypto.createHmac('sha1', this.turnSecret);
-        
-            hmac.setEncoding('base64');
-            hmac.write(username);
-            hmac.end();
-        
-            return { username: username, password: hmac.read() };
-        } catch(error) {
-            throw error;
-        }
-    }
 }
 
 module.exports = { WebRTC };