@wireapp/avs 0.0.4312 → 0.0.4316

package/dist/avs_pc.js

@@ -52,7 +52,7 @@ function callStreamHandler(pc, userid, clientid, ssrc, track_id) {
             pc.rtc.getTransceivers().forEach(function (trans) {
                 var track = trans.receiver.track;
                 pc_log(LOG_LEVEL_INFO, "vsh: label:".concat(track.label, " id:").concat(track.id, " looking for: ").concat(label_1));
-                if (trans.receiver.track.label === label_1) {
+                if (track.id === label_1) {
                     if (uinfo) {
                         uinfo.video_track_id = track.id;
                     }
@@ -619,10 +619,7 @@ function pc_Create(hnd, privacy, conv_type) {
                 for (var _b = 0, _c = stream.getTracks(); _b < _c.length; _b++) {
                     var track = _c[_b];
                     if (track) {
-                        if (pc_env === ENV_FIREFOX)
-                            label = track.id;
-                        else
-                            label = track.label;
+                        label = track.id;
                         pc_log(LOG_LEVEL_INFO, "onTrack: convid=".concat(pc.convid.substring(0, 8), " track=").concat(track.id, "/").concat(track.label, "=>").concat(label, " kind=").concat(track.kind, " enabled=").concat(track.enabled, "/").concat(track.muted, "/undefined/").concat(track.readyState, " remote=undefined"));
                         if (!track.enabled)
                             track.enabled = true;
@@ -669,10 +666,7 @@ function pc_Close(hnd) {
             var track = trans.receiver.track;
             if (track && track.kind === "audio") {
                 var label = '';
-                if (pc_env == ENV_FIREFOX)
-                    label = track.id;
-                else
-                    label = track.label;
+                label = track.id;
                 if (audioStreamHandler && pc.rtc) {
                     pc_log(LOG_LEVEL_INFO, "pc_Close: calling ash(".concat(pc.convid.substring(0, 8), ", ").concat(label, ") with 0 streams"));
                     audioStreamHandler(pc.convid, hnd.toString() + label, null);
@@ -1480,66 +1474,37 @@ function pc_GetLocalStats(hnd) {
             });
         }
     });
-    var self_audio_level = 0;
-    var apkts = 0;
-    var vpkts = 0;
-    var ploss = 0;
     rtc.getStats()
         .then(function (stats) {
-        var rtt = 0;
+        // !This does not work --> let report_json = JSON.stringify(stats);
+        // We need to create json from individual items
+        var report = '[';
         stats.forEach(function (stat) {
-            if (stat.type === 'inbound-rtp') {
-                ploss = ploss + stat.packetsLost;
-                var p = stat.packetsReceived;
-                if (stat.kind === 'audio') {
-                    apkts = apkts + p;
+            // Following information is not handled in avs atm.
+            if ((stat.type === 'inbound-rtp') && (stat.kind === 'video')) {
+                var user_info = null;
+                if (!!stat.trackIdentifier) {
+                    user_info = uinfo_from_video_track_id(pc, stat.trackIdentifier);
                 }
-                else if (stat.kind === 'video') {
-                    var user_info = null;
-                    if (!!stat.trackIdentifier) {
-                        user_info = uinfo_from_video_track_id(pc, stat.trackIdentifier);
+                if (user_info !== null) {
+                    var frame_height = !!stat.frameHeight ? stat === null || stat === void 0 ? void 0 : stat.frameHeight : 0;
+                    var frame_width = !!stat.frameWidth ? stat === null || stat === void 0 ? void 0 : stat.frameWidth : 0;
+                    if (user_info.frame_width !== frame_width || user_info.frame_height !== frame_height) {
+                        user_info.frame_width = frame_width;
+                        user_info.frame_height = frame_height;
+                        pc_log(LOG_LEVEL_INFO, "pc_user_resolution: label=".concat(user_info.label, " ").concat(user_info.userid.substring(0, 8), "/").concat(user_info.clientid.substring(0, 4), " resolution:").concat(user_info.frame_width, "x").concat(user_info.frame_height));
                     }
-                    if (user_info !== null) {
-                        var frame_height = !!stat.frameHeight ? stat === null || stat === void 0 ? void 0 : stat.frameHeight : 0;
-                        var frame_width = !!stat.frameWidth ? stat === null || stat === void 0 ? void 0 : stat.frameWidth : 0;
-                        if (user_info.frame_width !== frame_width || user_info.frame_height !== frame_height) {
-                            user_info.frame_width = frame_width;
-                            user_info.frame_height = frame_height;
-                            pc_log(LOG_LEVEL_INFO, "pc_user_resolution: label=".concat(user_info.label, " ").concat(user_info.userid.substring(0, 8), "/").concat(user_info.clientid.substring(0, 4), " resolution:").concat(user_info.frame_width, "x").concat(user_info.frame_height));
-                        }
-                    }
-                    vpkts = vpkts + p;
-                }
-            }
-            else if (stat.type === 'outbound-rtp') {
-                var p = stat.packetsSent;
-                if (stat.kind === 'audio') {
-                    pc.stats.sent_apkts = p;
                 }
-                else if (stat.kind === 'video') {
-                    pc.stats.sent_vpkts = p;
-                }
-            }
-            else if (stat.type === 'candidate-pair') {
-                rtt = stat.currentRoundTripTime * 1000;
-            }
-            else if (stat.type === 'media-source') {
-                if (stat.kind === 'audio')
-                    self_audio_level = stat.audioLevel ? ((stat.audioLevel * 512.0) | 0) : 0;
             }
+            report += JSON.stringify(stat);
+            report += ',';
         });
-        pc.stats.recv_apkts = apkts;
-        pc.stats.recv_vpkts = vpkts;
-        pc.stats.ploss = ploss - pc.stats.lastploss;
-        pc.stats.lastploss = ploss;
-        em_module.ccall("pc_set_stats", null, ["number", "number", "number", "number", "number", "number", "number", "number"], [
-            pc.self, self_audio_level,
-            pc.stats.recv_apkts,
-            pc.stats.recv_vpkts,
-            pc.stats.sent_apkts,
-            pc.stats.sent_vpkts,
-            pc.stats.ploss,
-            rtt
+        // remove tailing ',' if any
+        report = report.replace(/,$/, '');
+        report += ']';
+        // console.log("webrtc stats json", report);
+        em_module.ccall("pc_set_stats", null, ["number", "string"], [
+            pc.self, report
         ]);
     }).catch(function (err) { return pc_log(LOG_LEVEL_INFO, "pc_GetLocalStats: failed hnd=".concat(hnd, " err=").concat(err), err); });
 }

package/dist/avs_wcall.d.ts

@@ -29,7 +29,8 @@ export declare enum REASON {
     NOONE_JOINED = 12,
     EVERYONE_LEFT = 13,
     AUTH_FAILED = 14,
-    AUTH_FAILED_START = 15
+    AUTH_FAILED_START = 15,
+    DURATION = 16
 }
 export declare enum LOG_LEVEL {
     DEBUG = 0,
@@ -104,7 +105,7 @@ export type WcallSendHandler = (ctx: number, convid: string, userid_self: string
 export type WcallSftReqHandler = (ctx: number, url: string, data: string, len: number, arg: number) => number;
 export type WcallIncomingHandler = (convid: string, msg_time: number, userid: string, clientid: string, video_call: number, should_ring: number, conv_type: number, arg: number) => void;
 export type WcallMissedHandler = (convid: string, msg_time: number, userid: string, clientid: string, video_call: number, arg: number) => void;
-export type WcallNetworkQualityHandler = (convid: string, userid: string, clientid: string, quality: number, rtt: number, uploss: number, downloss: number, arg: number) => void;
+export type WcallNetworkQualityHandler = (convid: string, userid: string, clientid: string, quality_info: string, arg: number) => void;
 export type WcallAnsweredHandler = (convid: string, arg: number) => void;
 export type WcallEstabHandler = (convid: string, userid: string, clientid: string, arg: number) => void;
 export type WcallGroupChangedHandler = (convid: string, arg: number) => void;
@@ -157,6 +158,7 @@ export declare class Wcall {
     setLogHandler(logh: WcallLogHandler, arg?: number): void;
     setEpochInfo(wuser: number, convid: string, epochid: number, clients_json: string, key_base64: string): number;
     setReqNewEpochHandler(wuser: number, req_new_epochh: WcallReqNewEpochHandler): void;
+    setDuration(wuser: number, convid: string, duration: number): void;
     getMute(wuser: number): number;
     setMute(wuser: number, muted: number): void;
     setMuteHandler(wuser: number, muteh: WcallMuteHandler, arg?: number): void;
@@ -174,8 +176,13 @@ export declare class Wcall {
     audioRecord(wuser: number, path: string): number;
     poll(): void;
     setupEx(flags: number): number;
+    eventCreate(userid: string, clientid: string, incomingh: WcallIncomingHandler, missedh: WcallMissedHandler, closeh: WcallCloseHandler, arg?: number): number;
+    eventStart(wuser: number): void;
+    eventProcess(wuser: number, buf: string, len: number, curr_time: number, msg_time: number, convid: string, userid: string, clientid: string, conv_type: number): number;
+    eventEnd(wuser: number): void;
     setMode(mode: number): void;
     getMode(): number;
+    setConfigVersion(sft_version: number, turn_version: number): void;
     setUserMediaHandler(userMediaHandler: UserMediaHandler): void;
     setAudioStreamHandler(audioStreamHandler: AudioStreamHandler): void;
     setVideoStreamHandler(videoStreamHandler: VideoStreamHandler): void;

package/dist/avs_wcall.js

@@ -57,6 +57,7 @@ var REASON;
     REASON[REASON["EVERYONE_LEFT"] = 13] = "EVERYONE_LEFT";
     REASON[REASON["AUTH_FAILED"] = 14] = "AUTH_FAILED";
     REASON[REASON["AUTH_FAILED_START"] = 15] = "AUTH_FAILED_START";
+    REASON[REASON["DURATION"] = 16] = "DURATION";
 })(REASON = exports.REASON || (exports.REASON = {}));
 var LOG_LEVEL;
 (function (LOG_LEVEL) {
@@ -493,11 +494,13 @@ var Wcall = /** @class */ (function () {
     Wcall.prototype.setNetworkQualityHandler = function (wuser, netqh, interval, arg) {
         var _this = this;
         if (arg === void 0) { arg = 0; }
-        var fn_netqh = this.em_module.addFunction(function (convid, userid, clientid, quality, rtt, uploss, downloss, arg) {
+        var fn_netqh = this.em_module.addFunction(function (convid, userid, clientid, quality_info, arg) {
             if (netqh) {
-                netqh(convid == 0 ? null : _this.em_module.UTF8ToString(convid), userid == 0 ? null : _this.em_module.UTF8ToString(userid), clientid == 0 ? null : _this.em_module.UTF8ToString(clientid), quality, rtt, uploss, downloss, arg);
+                netqh(convid == 0 ? null : _this.em_module.UTF8ToString(convid), userid == 0 ? null : _this.em_module.UTF8ToString(userid), clientid == 0 ? null : _this.em_module.UTF8ToString(clientid), quality_info == 0
+                    ? null
+                    : _this.em_module.UTF8ToString(quality_info), arg);
             }
-        }, "viiiiiiii");
+        }, "viiiii");
         return this.em_module.ccall("wcall_set_network_quality_handler", "number", ["number", "number", "number", "number"], [wuser, fn_netqh, interval, arg]);
     };
     Wcall.prototype.setLogHandler = function (logh, arg) {
@@ -523,6 +526,9 @@ var Wcall = /** @class */ (function () {
         }, "viii");
         this.em_module.ccall("wcall_set_req_new_epoch_handler", "null", ["number", "number"], [wuser, fn_req_new_epochh]);
     };
+    Wcall.prototype.setDuration = function (wuser, convid, duration) {
+        this.em_module.ccall("wcall_set_duration", "null", ["number", "string", "number"], [wuser, convid, duration]);
+    };
     Wcall.prototype.getMute = function (wuser) {
         return this.em_module.ccall("wcall_get_mute", "number", ["number"], [wuser]);
     };
@@ -605,12 +611,64 @@ var Wcall = /** @class */ (function () {
     Wcall.prototype.setupEx = function (flags) {
         return this.em_module.ccall("wcall_setup_ex", "number", ["number"], [flags]);
     };
+    Wcall.prototype.eventCreate = function (userid, clientid, incomingh, missedh, closeh, arg) {
+        var _this = this;
+        if (arg === void 0) { arg = 0; }
+        var fn_incomingh = this.em_module.addFunction(function (convid, msg_time, userid, clientid, video_call, should_ring, conv_type, arg) {
+            if (incomingh) {
+                incomingh(convid == 0 ? null : _this.em_module.UTF8ToString(convid), msg_time, userid == 0 ? null : _this.em_module.UTF8ToString(userid), clientid == 0 ? null : _this.em_module.UTF8ToString(clientid), video_call, should_ring, conv_type, arg);
+            }
+        }, "viiiiiiii");
+        var fn_missedh = this.em_module.addFunction(function (convid, msg_time, userid, clientid, video_call, arg) {
+            if (missedh) {
+                missedh(convid == 0 ? null : _this.em_module.UTF8ToString(convid), msg_time, userid == 0 ? null : _this.em_module.UTF8ToString(userid), clientid == 0 ? null : _this.em_module.UTF8ToString(clientid), video_call, arg);
+            }
+        }, "viiiiii");
+        var fn_closeh = this.em_module.addFunction(function (reason, convid, msg_time, userid, clientid, arg) {
+            if (closeh) {
+                closeh(reason, convid == 0 ? null : _this.em_module.UTF8ToString(convid), msg_time, userid == 0 ? null : _this.em_module.UTF8ToString(userid), clientid == 0 ? null : _this.em_module.UTF8ToString(clientid), arg);
+            }
+        }, "viiiiii");
+        return this.em_module.ccall("wcall_event_create", "number", ["string", "string", "number", "number", "number", "number"], [userid, clientid, fn_incomingh, fn_missedh, fn_closeh, arg]);
+    };
+    Wcall.prototype.eventStart = function (wuser) {
+        this.em_module.ccall("wcall_event_start", "null", ["number"], [wuser]);
+    };
+    Wcall.prototype.eventProcess = function (wuser, buf, len, curr_time, msg_time, convid, userid, clientid, conv_type) {
+        return this.em_module.ccall("wcall_event_process", "number", [
+            "number",
+            "string",
+            "number",
+            "number",
+            "number",
+            "string",
+            "string",
+            "string",
+            "number",
+        ], [
+            wuser,
+            buf,
+            len,
+            curr_time,
+            msg_time,
+            convid,
+            userid,
+            clientid,
+            conv_type,
+        ]);
+    };
+    Wcall.prototype.eventEnd = function (wuser) {
+        this.em_module.ccall("wcall_event_end", "null", ["number"], [wuser]);
+    };
     Wcall.prototype.setMode = function (mode) {
         this.em_module.ccall("wcall_set_mode", "null", ["number"], [mode]);
     };
     Wcall.prototype.getMode = function () {
         return this.em_module.ccall("wcall_get_mode", "number", [], []);
     };
+    Wcall.prototype.setConfigVersion = function (sft_version, turn_version) {
+        this.em_module.ccall("wcall_set_config_version", "null", ["number", "number"], [sft_version, turn_version]);
+    };
     Wcall.prototype.setUserMediaHandler = function (userMediaHandler) {
         avs_pc_1.default.setUserMediaHandler(userMediaHandler);
     };

package/package.json

@@ -27,5 +27,5 @@
     "prepack": "prettier -w src/avs_wcall.ts && tsc && cp src/*.js src/*.d.ts dist/",
     "test": "karma start"
   },
-  "version": "0.0.4312"
+  "version": "0.0.4316"
 }