@wireapp/avs 10.6.7 → 10.6.9
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.
- package/dist/avs_connection_test.d.ts +40 -0
- package/dist/avs_connection_test.js +333 -0
- package/dist/avs_core.js +33 -156
- package/dist/avs_pc.js +169 -1
- package/dist/avs_scan.d.ts +27 -0
- package/dist/avs_scan.js +263 -0
- package/dist/avs_wcall.d.ts +11 -0
- package/dist/avs_wcall.js +65 -0
- package/package.json +1 -1
package/dist/avs_pc.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
var avs_connection_test_1 = require("./avs_connection_test");
|
|
3
4
|
var ENV_FIREFOX = 1;
|
|
4
5
|
var TIMEOUT_GATHER = 2000;
|
|
5
6
|
var em_module;
|
|
@@ -442,6 +443,148 @@ function setAudioJitterBufferMin(pc, receiver) {
|
|
|
442
443
|
pc_log(LOG_LEVEL_WARN, "setAudioJitterBufferMin failed: " + err, err);
|
|
443
444
|
}
|
|
444
445
|
}
|
|
446
|
+
function ccallAudioAdaptMaxBps() {
|
|
447
|
+
return em_module.ccall("pc_audio_adapt_max_bps", "number", [], []);
|
|
448
|
+
}
|
|
449
|
+
function ccallAudioPtime() {
|
|
450
|
+
return em_module.ccall("pc_audio_ptime", "number", [], []);
|
|
451
|
+
}
|
|
452
|
+
var AUDIO_RISE_HOLD_MS = 3000;
|
|
453
|
+
var AUDIO_OPUS_MIN_BPS = 6000;
|
|
454
|
+
var AUDIO_RED_HDR_BYTES = 5; /* RED headers of a packet with one copy */
|
|
455
|
+
var AUDIO_SRTP_UDP_BYTES = 18; /* SRTP auth tag 10 + UDP 8 */
|
|
456
|
+
function perPacketBps(bytes, frameMs) {
|
|
457
|
+
return bytes * 8 * 1000 / frameMs;
|
|
458
|
+
}
|
|
459
|
+
/* The native clients fit RED into the bandwidth estimate by giving opus its
|
|
460
|
+
* share of it, and hold rises of the opus target for 3 s (peerflow
|
|
461
|
+
* AdaptiveRedEncoder, LossFloorEncoder). The browser can do neither: RED,
|
|
462
|
+
* when negotiated, is on for the whole call with its copy on top of the
|
|
463
|
+
* bitrate allocated to the audio, and with adaptivePtime (Chromium) that
|
|
464
|
+
* allocation doesn't go below 16 kbps, so on a slow link it sends twice the
|
|
465
|
+
* estimate or more.
|
|
466
|
+
*
|
|
467
|
+
* The lever left is encodings[0].maxBitrate, which in libwebrtc sets both
|
|
468
|
+
* ends of the audio allocation: the minimum to it when below 16 kbps, the
|
|
469
|
+
* maximum to it plus the headers at the shortest frame length. So on each
|
|
470
|
+
* stats tick (1 s) this sets maxBitrate so that opus gets no more than its
|
|
471
|
+
* share at the current frame length: the estimate less the headers, halved
|
|
472
|
+
* with RED. At long frames that would need less than opus's 6 kbps, so the
|
|
473
|
+
* share then holds only where the estimate leaves room for it; below, what
|
|
474
|
+
* it gains is the lower minimum (6 kbps instead of 16). A drop goes through
|
|
475
|
+
* at once, a rise after it has been wanted for 3 s, to the lowest value of
|
|
476
|
+
* that time. Needs the estimate (availableOutgoingBitrate, not in Firefox);
|
|
477
|
+
* off while sending video (which shares the estimate), with plain audio and
|
|
478
|
+
* with adaptive RED off (pc_audio_adapt_max_bps).
|
|
479
|
+
*/
|
|
480
|
+
function adaptAudioBitrate(pc, stats) {
|
|
481
|
+
var rtc = pc.rtc;
|
|
482
|
+
var ar = pc.audioRate;
|
|
483
|
+
if (!rtc || ar.busy)
|
|
484
|
+
return;
|
|
485
|
+
var sender = rtc.getSenders().find(function (s) { return !!s.track && s.track.kind === 'audio'; });
|
|
486
|
+
if (!sender)
|
|
487
|
+
return;
|
|
488
|
+
var maxBps = ccallAudioAdaptMaxBps();
|
|
489
|
+
if (!maxBps || pc.sending_video) {
|
|
490
|
+
if (ar.maxBitrate)
|
|
491
|
+
setAudioMaxBitrate(pc, sender, 0, pc.sending_video ? 'video' : 'off');
|
|
492
|
+
ar.riseSince = 0;
|
|
493
|
+
return;
|
|
494
|
+
}
|
|
495
|
+
var out = null;
|
|
496
|
+
var pair = null;
|
|
497
|
+
stats.forEach(function (s) {
|
|
498
|
+
if (s.type === 'outbound-rtp' && s.kind === 'audio')
|
|
499
|
+
out = s;
|
|
500
|
+
else if (s.type === 'transport' && s.selectedCandidatePairId)
|
|
501
|
+
pair = stats.get(s.selectedCandidatePairId);
|
|
502
|
+
});
|
|
503
|
+
if (!out || !pair || !pair.availableOutgoingBitrate)
|
|
504
|
+
return;
|
|
505
|
+
var dt = out.timestamp - ar.ts;
|
|
506
|
+
var pkts = out.packetsSent - ar.pkts;
|
|
507
|
+
var hdrBytes = (out.headerBytesSent || 0) - ar.hdrBytes;
|
|
508
|
+
var first = ar.ts === 0;
|
|
509
|
+
ar.ts = out.timestamp;
|
|
510
|
+
ar.pkts = out.packetsSent;
|
|
511
|
+
ar.hdrBytes = out.headerBytesSent || 0;
|
|
512
|
+
if (first || dt <= 0 || pkts <= 0)
|
|
513
|
+
return;
|
|
514
|
+
/* Headers per packet as libwebrtc counts them for the allocation: RTP
|
|
515
|
+
* with its extensions, SRTP, UDP, IP, and TURN's on a relay.
|
|
516
|
+
*/
|
|
517
|
+
var local = stats.get(pair.localCandidateId);
|
|
518
|
+
var ipv6 = !!(local && local.address && local.address.indexOf(':') >= 0);
|
|
519
|
+
var relay = 0;
|
|
520
|
+
if (local && local.candidateType === 'relay')
|
|
521
|
+
relay = local.relayProtocol === 'udp' ? 4 : 16;
|
|
522
|
+
var rtpHdr = hdrBytes > 0 ? hdrBytes / pkts : 24;
|
|
523
|
+
var hdr = rtpHdr + AUDIO_SRTP_UDP_BYTES + (ipv6 ? 40 : 20) + relay;
|
|
524
|
+
var codec = out.codecId ? stats.get(out.codecId) : null;
|
|
525
|
+
var red = !!(codec && /\/red$/i.test(codec.mimeType));
|
|
526
|
+
var enc = sender.getParameters().encodings[0];
|
|
527
|
+
var adaptive = !!(enc && enc.adaptivePtime);
|
|
528
|
+
var frameMs = Math.min(120, Math.max(10, Math.round(dt / pkts / 10) * 10));
|
|
529
|
+
var minFrameMs = adaptive ? Math.max(ccallAudioPtime(), 20) : frameMs;
|
|
530
|
+
var bwe = pair.availableOutgoingBitrate;
|
|
531
|
+
var share = bwe - perPacketBps(hdr + (red ? AUDIO_RED_HDR_BYTES : 0), frameMs);
|
|
532
|
+
if (red)
|
|
533
|
+
share /= 2;
|
|
534
|
+
/* The allocation's maximum has the headers at the shortest frame */
|
|
535
|
+
var want = share - (perPacketBps(hdr, minFrameMs) - perPacketBps(hdr, frameMs));
|
|
536
|
+
want = Math.max(Math.floor(want / 1000) * 1000, AUDIO_OPUS_MIN_BPS);
|
|
537
|
+
if (want >= maxBps)
|
|
538
|
+
want = 0;
|
|
539
|
+
var cur = ar.maxBitrate || Infinity;
|
|
540
|
+
var w = want || Infinity;
|
|
541
|
+
var why = "bwe ".concat((bwe / 1000).toFixed(1), " kbps, ").concat(frameMs, " ms frames, ")
|
|
542
|
+
+ "".concat(Math.round(hdr), " B headers, red ").concat(red ? 'on' : 'off');
|
|
543
|
+
if (w < cur) {
|
|
544
|
+
ar.riseSince = 0;
|
|
545
|
+
setAudioMaxBitrate(pc, sender, want, why);
|
|
546
|
+
}
|
|
547
|
+
else if (w > cur) {
|
|
548
|
+
if (!ar.riseSince) {
|
|
549
|
+
ar.riseSince = out.timestamp;
|
|
550
|
+
ar.riseTo = w;
|
|
551
|
+
}
|
|
552
|
+
else {
|
|
553
|
+
ar.riseTo = Math.min(ar.riseTo, w);
|
|
554
|
+
}
|
|
555
|
+
if (out.timestamp - ar.riseSince >= AUDIO_RISE_HOLD_MS) {
|
|
556
|
+
ar.riseSince = 0;
|
|
557
|
+
setAudioMaxBitrate(pc, sender, ar.riseTo === Infinity ? 0 : ar.riseTo, why);
|
|
558
|
+
}
|
|
559
|
+
}
|
|
560
|
+
else {
|
|
561
|
+
ar.riseSince = 0;
|
|
562
|
+
}
|
|
563
|
+
}
|
|
564
|
+
function setAudioMaxBitrate(pc, sender, bps, why) {
|
|
565
|
+
var ar = pc.audioRate;
|
|
566
|
+
var params = sender.getParameters();
|
|
567
|
+
var enc = params.encodings && params.encodings[0];
|
|
568
|
+
var kbps = function (b) { return b ? "".concat(b / 1000, " kbps") : 'none'; };
|
|
569
|
+
if (!enc)
|
|
570
|
+
return;
|
|
571
|
+
if (bps)
|
|
572
|
+
enc.maxBitrate = bps;
|
|
573
|
+
else
|
|
574
|
+
delete enc.maxBitrate;
|
|
575
|
+
ar.busy = true;
|
|
576
|
+
sender.setParameters(params)
|
|
577
|
+
.then(function () {
|
|
578
|
+
pc_log(LOG_LEVEL_INFO, "adaptAudioBitrate: self=".concat(pc.self, " maxBitrate ")
|
|
579
|
+
+ "".concat(kbps(bps), " (was ").concat(kbps(ar.maxBitrate), "); ").concat(why));
|
|
580
|
+
ar.maxBitrate = bps;
|
|
581
|
+
ar.busy = false;
|
|
582
|
+
}, function (e) {
|
|
583
|
+
/* Keep busy: don't try again on this connection */
|
|
584
|
+
pc_log(LOG_LEVEL_WARN, "adaptAudioBitrate: self=".concat(pc.self, " maxBitrate ")
|
|
585
|
+
+ "".concat(kbps(bps), " failed: ").concat(e));
|
|
586
|
+
});
|
|
587
|
+
}
|
|
445
588
|
function ccallSignallingHandler(pc, state) {
|
|
446
589
|
em_module.ccall("pc_signalling_handler", null, ["number", "number"], [pc.self, state]);
|
|
447
590
|
}
|
|
@@ -539,6 +682,7 @@ function candidateHandler(pc, cand) {
|
|
|
539
682
|
gatheringComplete(pc);
|
|
540
683
|
return;
|
|
541
684
|
}
|
|
685
|
+
(0, avs_connection_test_1.observeTestCandidate)(pc.convid, pc.rtc, cand);
|
|
542
686
|
/* As soon as we get the first relay, we start a gathering timer
|
|
543
687
|
* this was we ensure that gathering never takes more than the
|
|
544
688
|
* timeout period.
|
|
@@ -631,7 +775,16 @@ function pc_New(self, convidPtr, audioIvPtr, videoIvPtr, ivlen) {
|
|
|
631
775
|
rtt: 0
|
|
632
776
|
},
|
|
633
777
|
streams: {},
|
|
634
|
-
gatherTimer: null
|
|
778
|
+
gatherTimer: null,
|
|
779
|
+
audioRate: {
|
|
780
|
+
ts: 0,
|
|
781
|
+
pkts: 0,
|
|
782
|
+
hdrBytes: 0,
|
|
783
|
+
maxBitrate: 0,
|
|
784
|
+
riseSince: 0,
|
|
785
|
+
riseTo: 0,
|
|
786
|
+
busy: false
|
|
787
|
+
}
|
|
635
788
|
};
|
|
636
789
|
worker.postMessage({ op: 'create', self: pc.self, iva: iva8, ivv: ivv8 });
|
|
637
790
|
var hnd = connectionsStore.storePeerConnection(pc);
|
|
@@ -657,6 +810,7 @@ function pc_Create(hnd, privacy, conv_type) {
|
|
|
657
810
|
pc_log(LOG_LEVEL_INFO, "pc_Create: configuring: ".concat(pc.turnServers.length, " TURN servers"));
|
|
658
811
|
var rtc = new RTCPeerConnection(config);
|
|
659
812
|
pc.rtc = rtc;
|
|
813
|
+
(0, avs_connection_test_1.observeTestPeer)(pc.convid, rtc);
|
|
660
814
|
rtc.onicegatheringstatechange = function () { return gatheringHandler(pc); };
|
|
661
815
|
rtc.onconnectionstatechange = function () { return connectionHandler(pc); };
|
|
662
816
|
rtc.onicecandidate = function (event) { return candidateHandler(pc, event.candidate); };
|
|
@@ -1013,6 +1167,7 @@ function createSdp(pc, callType, vstate, isOffer) {
|
|
|
1013
1167
|
if (userMediaHandler) {
|
|
1014
1168
|
userMediaHandler(pc.convid, true, use_video, use_ss)
|
|
1015
1169
|
.then(function (stream) {
|
|
1170
|
+
(0, avs_connection_test_1.observeTestMicrophone)(pc.convid, rtc, stream);
|
|
1016
1171
|
return update_tracks(pc, stream).then(function () { return stream; });
|
|
1017
1172
|
}).then(function (stream) {
|
|
1018
1173
|
var doSdp = isOffer
|
|
@@ -1031,14 +1186,19 @@ function createSdp(pc, callType, vstate, isOffer) {
|
|
|
1031
1186
|
})
|
|
1032
1187
|
.catch(function (err) {
|
|
1033
1188
|
pc_log(LOG_LEVEL_WARN, 'createSdp: doSdp failed: ' + err, err);
|
|
1189
|
+
(0, avs_connection_test_1.failTestPeer)(pc.convid, rtc, 'Could not create SDP');
|
|
1034
1190
|
ccallLocalSdpHandler(pc, 1, "sdp-error", err.toString());
|
|
1035
1191
|
});
|
|
1036
1192
|
})
|
|
1037
1193
|
.catch(function (err) {
|
|
1038
1194
|
pc_log(LOG_LEVEL_WARN, 'createSdp: userMedia failed: ' + err, err);
|
|
1195
|
+
(0, avs_connection_test_1.failTestPeer)(pc.convid, rtc, 'Could not open the microphone');
|
|
1039
1196
|
ccallLocalSdpHandler(pc, 1, "media-error", err.toString());
|
|
1040
1197
|
});
|
|
1041
1198
|
}
|
|
1199
|
+
else {
|
|
1200
|
+
(0, avs_connection_test_1.failTestPeer)(pc.convid, rtc, 'No microphone handler configured');
|
|
1201
|
+
}
|
|
1042
1202
|
}
|
|
1043
1203
|
function pc_CreateOffer(hnd, callType, vstate) {
|
|
1044
1204
|
var pc = connectionsStore.getPeerConnection(hnd);
|
|
@@ -1179,6 +1339,7 @@ function pc_SetRemoteDescription(hnd, typePtr, sdpPtr) {
|
|
|
1179
1339
|
.then(function () { })
|
|
1180
1340
|
.catch(function (err) {
|
|
1181
1341
|
pc_log(LOG_LEVEL_WARN, "setRemoteDescription failed: " + err, err);
|
|
1342
|
+
(0, avs_connection_test_1.failTestPeer)(pc.convid, rtc, 'Could not apply remote SDP');
|
|
1182
1343
|
});
|
|
1183
1344
|
if (pc_env != ENV_FIREFOX)
|
|
1184
1345
|
extractSSRCs(pc, sdp);
|
|
@@ -1213,6 +1374,7 @@ function pc_SetLocalDescription(hnd, typePtr, sdpPtr) {
|
|
|
1213
1374
|
})
|
|
1214
1375
|
.catch(function (err) {
|
|
1215
1376
|
pc_log(LOG_LEVEL_INFO, "setLocalDescription failed: " + err, err);
|
|
1377
|
+
(0, avs_connection_test_1.failTestPeer)(pc.convid, rtc, 'Could not apply local SDP');
|
|
1216
1378
|
});
|
|
1217
1379
|
}
|
|
1218
1380
|
function pc_LocalDescription(hnd, typePtr) {
|
|
@@ -1534,6 +1696,12 @@ function pc_GetLocalStats(hnd) {
|
|
|
1534
1696
|
});
|
|
1535
1697
|
rtc.getStats()
|
|
1536
1698
|
.then(function (stats) {
|
|
1699
|
+
try {
|
|
1700
|
+
adaptAudioBitrate(pc, stats);
|
|
1701
|
+
}
|
|
1702
|
+
catch (err) {
|
|
1703
|
+
pc_log(LOG_LEVEL_WARN, "adaptAudioBitrate: self=".concat(pc.self, " failed: ").concat(err), err);
|
|
1704
|
+
}
|
|
1537
1705
|
// !This does not work --> let report_json = JSON.stringify(stats);
|
|
1538
1706
|
// We need to create json from individual items
|
|
1539
1707
|
var report = '[';
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
export interface ScanCandidate {
|
|
2
|
+
id: string;
|
|
3
|
+
type: RTCIceCandidateType | null;
|
|
4
|
+
ip: string | null;
|
|
5
|
+
hostname?: string;
|
|
6
|
+
port: number | null;
|
|
7
|
+
protocol: RTCIceProtocol | null;
|
|
8
|
+
serverUrl: string | null;
|
|
9
|
+
}
|
|
10
|
+
export interface ScanRun {
|
|
11
|
+
serverUrl: string | null;
|
|
12
|
+
requestedTransport: "udp" | "tcp" | null;
|
|
13
|
+
status: "complete" | "timeout" | "failed";
|
|
14
|
+
gatheringDurationMs: number | null;
|
|
15
|
+
localCandidates: ScanCandidate[];
|
|
16
|
+
errors: {
|
|
17
|
+
url: string | null;
|
|
18
|
+
code: number | null;
|
|
19
|
+
message: string;
|
|
20
|
+
}[];
|
|
21
|
+
}
|
|
22
|
+
export interface ScanReport {
|
|
23
|
+
schemaVersion: 1;
|
|
24
|
+
runs: ScanRun[];
|
|
25
|
+
}
|
|
26
|
+
export declare function normalizeIceCandidate(candidate: RTCIceCandidate, id: string): ScanCandidate;
|
|
27
|
+
export declare function installScanDriver(module: any): (wuser: number) => Promise<ScanReport>;
|
package/dist/avs_scan.js
ADDED
|
@@ -0,0 +1,263 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __assign = (this && this.__assign) || function () {
|
|
3
|
+
__assign = Object.assign || function(t) {
|
|
4
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
+
s = arguments[i];
|
|
6
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
+
t[p] = s[p];
|
|
8
|
+
}
|
|
9
|
+
return t;
|
|
10
|
+
};
|
|
11
|
+
return __assign.apply(this, arguments);
|
|
12
|
+
};
|
|
13
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
14
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
15
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
16
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
17
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
18
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
19
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
20
|
+
});
|
|
21
|
+
};
|
|
22
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
23
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
24
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
25
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
26
|
+
function step(op) {
|
|
27
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
28
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
29
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
30
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
31
|
+
switch (op[0]) {
|
|
32
|
+
case 0: case 1: t = op; break;
|
|
33
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
34
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
35
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
36
|
+
default:
|
|
37
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
38
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
39
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
40
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
41
|
+
if (t[2]) _.ops.pop();
|
|
42
|
+
_.trys.pop(); continue;
|
|
43
|
+
}
|
|
44
|
+
op = body.call(thisArg, _);
|
|
45
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
46
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
47
|
+
}
|
|
48
|
+
};
|
|
49
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
50
|
+
exports.installScanDriver = exports.normalizeIceCandidate = void 0;
|
|
51
|
+
var SCAN_TIMEOUT_MS = 10000;
|
|
52
|
+
function requestedTransport(url) {
|
|
53
|
+
if (!url)
|
|
54
|
+
return null;
|
|
55
|
+
var transport = /[?&]transport=(udp|tcp)(?:&|$)/i.exec(url);
|
|
56
|
+
if (transport)
|
|
57
|
+
return transport[1].toLowerCase();
|
|
58
|
+
if (/^(stuns|turns):/i.test(url))
|
|
59
|
+
return "tcp";
|
|
60
|
+
if (/^(stun|turn):/i.test(url))
|
|
61
|
+
return "udp";
|
|
62
|
+
return null;
|
|
63
|
+
}
|
|
64
|
+
function normalizeIceCandidate(candidate, id) {
|
|
65
|
+
var _a, _b, _c;
|
|
66
|
+
var address = candidate.address || null;
|
|
67
|
+
var isIp = address !== null && (address.includes(":") || /^\d+(\.\d+){3}$/.test(address));
|
|
68
|
+
return __assign(__assign({ id: id, type: (_a = candidate.type) !== null && _a !== void 0 ? _a : null, ip: isIp ? address : null }, (address && !isIp ? { hostname: address } : {})), { port: (_b = candidate.port) !== null && _b !== void 0 ? _b : null, protocol: (_c = candidate.protocol) !== null && _c !== void 0 ? _c : null, serverUrl: candidate.url || null });
|
|
69
|
+
}
|
|
70
|
+
exports.normalizeIceCandidate = normalizeIceCandidate;
|
|
71
|
+
function gather(server, index, signal) {
|
|
72
|
+
return new Promise(function (resolve) {
|
|
73
|
+
var _a, _b;
|
|
74
|
+
var result = {
|
|
75
|
+
serverUrl: (_a = server === null || server === void 0 ? void 0 : server.urls) !== null && _a !== void 0 ? _a : null,
|
|
76
|
+
requestedTransport: requestedTransport((_b = server === null || server === void 0 ? void 0 : server.urls) !== null && _b !== void 0 ? _b : null),
|
|
77
|
+
status: "failed",
|
|
78
|
+
gatheringDurationMs: null,
|
|
79
|
+
localCandidates: [],
|
|
80
|
+
errors: [],
|
|
81
|
+
};
|
|
82
|
+
var pc;
|
|
83
|
+
var startedAt;
|
|
84
|
+
var timer;
|
|
85
|
+
var finished = false;
|
|
86
|
+
function finish(status) {
|
|
87
|
+
if (finished)
|
|
88
|
+
return;
|
|
89
|
+
finished = true;
|
|
90
|
+
clearTimeout(timer);
|
|
91
|
+
signal.removeEventListener("abort", abort);
|
|
92
|
+
result.status = status;
|
|
93
|
+
if (startedAt !== undefined) {
|
|
94
|
+
result.gatheringDurationMs = Math.round(performance.now() - startedAt);
|
|
95
|
+
}
|
|
96
|
+
if (pc) {
|
|
97
|
+
pc.onicecandidate = null;
|
|
98
|
+
pc.onicecandidateerror = null;
|
|
99
|
+
pc.close();
|
|
100
|
+
}
|
|
101
|
+
resolve(result);
|
|
102
|
+
}
|
|
103
|
+
function abort() { finish("failed"); }
|
|
104
|
+
function fail(error) {
|
|
105
|
+
if (finished)
|
|
106
|
+
return;
|
|
107
|
+
result.errors.push({ url: result.serverUrl, code: null, message: String(error) });
|
|
108
|
+
finish("failed");
|
|
109
|
+
}
|
|
110
|
+
if (signal.aborted) {
|
|
111
|
+
abort();
|
|
112
|
+
return;
|
|
113
|
+
}
|
|
114
|
+
signal.addEventListener("abort", abort);
|
|
115
|
+
try {
|
|
116
|
+
var rtc_1 = new RTCPeerConnection({ iceServers: server ? [server] : [] });
|
|
117
|
+
pc = rtc_1;
|
|
118
|
+
rtc_1.onicecandidate = function (_a) {
|
|
119
|
+
var candidate = _a.candidate;
|
|
120
|
+
if (finished)
|
|
121
|
+
return;
|
|
122
|
+
if (candidate === null) {
|
|
123
|
+
finish("complete");
|
|
124
|
+
}
|
|
125
|
+
else if (candidate.candidate) {
|
|
126
|
+
result.localCandidates.push(normalizeIceCandidate(candidate, "".concat(index, ":").concat(result.localCandidates.length)));
|
|
127
|
+
}
|
|
128
|
+
};
|
|
129
|
+
rtc_1.onicecandidateerror = function (event) {
|
|
130
|
+
var error = event;
|
|
131
|
+
result.errors.push({ url: error.url || null, code: error.errorCode, message: error.errorText });
|
|
132
|
+
};
|
|
133
|
+
rtc_1.createDataChannel("ice-scan");
|
|
134
|
+
timer = setTimeout(function () { return finish("timeout"); }, SCAN_TIMEOUT_MS);
|
|
135
|
+
rtc_1.createOffer().then(function (offer) {
|
|
136
|
+
if (finished)
|
|
137
|
+
return;
|
|
138
|
+
clearTimeout(timer);
|
|
139
|
+
startedAt = performance.now();
|
|
140
|
+
timer = setTimeout(function () { return finish("timeout"); }, SCAN_TIMEOUT_MS);
|
|
141
|
+
return rtc_1.setLocalDescription(offer);
|
|
142
|
+
}).catch(fail);
|
|
143
|
+
}
|
|
144
|
+
catch (error) {
|
|
145
|
+
fail(error);
|
|
146
|
+
}
|
|
147
|
+
});
|
|
148
|
+
}
|
|
149
|
+
function scan(config, signal) {
|
|
150
|
+
var _a;
|
|
151
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
152
|
+
var _b, entries, servers, _i, entries_1, entry, urls, _c, _d, url, inputs, runs, _e, inputs_1, server, _f, _g;
|
|
153
|
+
return __generator(this, function (_h) {
|
|
154
|
+
switch (_h.label) {
|
|
155
|
+
case 0:
|
|
156
|
+
_b = JSON.parse(config).ice_servers, entries = _b === void 0 ? [] : _b;
|
|
157
|
+
if (!Array.isArray(entries))
|
|
158
|
+
throw new Error("Invalid ICE server list");
|
|
159
|
+
servers = [];
|
|
160
|
+
for (_i = 0, entries_1 = entries; _i < entries_1.length; _i++) {
|
|
161
|
+
entry = entries_1[_i];
|
|
162
|
+
urls = (_a = entry.urls) !== null && _a !== void 0 ? _a : entry.url;
|
|
163
|
+
for (_c = 0, _d = Array.isArray(urls) ? urls : [urls]; _c < _d.length; _c++) {
|
|
164
|
+
url = _d[_c];
|
|
165
|
+
if (typeof url === "string" && url) {
|
|
166
|
+
servers.push({ urls: url, username: entry.username, credential: entry.credential });
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
if (entries.length && !servers.length)
|
|
171
|
+
throw new Error("ICE server list contains no URLs");
|
|
172
|
+
inputs = servers.length ? servers : [null];
|
|
173
|
+
runs = [];
|
|
174
|
+
_e = 0, inputs_1 = inputs;
|
|
175
|
+
_h.label = 1;
|
|
176
|
+
case 1:
|
|
177
|
+
if (!(_e < inputs_1.length)) return [3 /*break*/, 4];
|
|
178
|
+
server = inputs_1[_e];
|
|
179
|
+
if (signal.aborted)
|
|
180
|
+
return [3 /*break*/, 4];
|
|
181
|
+
_g = (_f = runs).push;
|
|
182
|
+
return [4 /*yield*/, gather(server, runs.length, signal)];
|
|
183
|
+
case 2:
|
|
184
|
+
_g.apply(_f, [_h.sent()]);
|
|
185
|
+
_h.label = 3;
|
|
186
|
+
case 3:
|
|
187
|
+
_e++;
|
|
188
|
+
return [3 /*break*/, 1];
|
|
189
|
+
case 4: return [2 /*return*/, { schemaVersion: 1, runs: runs }];
|
|
190
|
+
}
|
|
191
|
+
});
|
|
192
|
+
});
|
|
193
|
+
}
|
|
194
|
+
function installScanDriver(module) {
|
|
195
|
+
var active = new Map();
|
|
196
|
+
var pending = new Map();
|
|
197
|
+
var run = module.addFunction(function (wuser, id, config) {
|
|
198
|
+
if (!config) {
|
|
199
|
+
var current = active.get(wuser);
|
|
200
|
+
if ((current === null || current === void 0 ? void 0 : current.id) === id) {
|
|
201
|
+
active.delete(wuser);
|
|
202
|
+
current.abort.abort();
|
|
203
|
+
}
|
|
204
|
+
return;
|
|
205
|
+
}
|
|
206
|
+
var abort = new AbortController();
|
|
207
|
+
active.set(wuser, { id: id, abort: abort });
|
|
208
|
+
var complete = function (json) {
|
|
209
|
+
var _a;
|
|
210
|
+
if (((_a = active.get(wuser)) === null || _a === void 0 ? void 0 : _a.id) !== id)
|
|
211
|
+
return;
|
|
212
|
+
active.delete(wuser);
|
|
213
|
+
// A full multi-server report may be larger than the ccall stack.
|
|
214
|
+
var size = json === null ? 0 : module.lengthBytesUTF8(json) + 1;
|
|
215
|
+
var buffer = size ? module._malloc(size) : 0;
|
|
216
|
+
try {
|
|
217
|
+
if (buffer)
|
|
218
|
+
module.stringToUTF8(json, buffer, size);
|
|
219
|
+
module.ccall("wcall_scan_complete", null, ["number", "number", "number"], [wuser, id, buffer]);
|
|
220
|
+
}
|
|
221
|
+
finally {
|
|
222
|
+
if (buffer)
|
|
223
|
+
module._free(buffer);
|
|
224
|
+
}
|
|
225
|
+
};
|
|
226
|
+
scan(module.UTF8ToString(config), abort.signal).then(function (report) { return complete(JSON.stringify(report)); }, function () { return complete(null); });
|
|
227
|
+
}, "viii");
|
|
228
|
+
var result = module.addFunction(function (wuser, err, json) {
|
|
229
|
+
var request = pending.get(wuser);
|
|
230
|
+
pending.delete(wuser);
|
|
231
|
+
if (!request)
|
|
232
|
+
return;
|
|
233
|
+
if (err) {
|
|
234
|
+
request.reject(new Error("ICE scan failed (".concat(err, ")")));
|
|
235
|
+
}
|
|
236
|
+
else {
|
|
237
|
+
try {
|
|
238
|
+
request.resolve(JSON.parse(module.UTF8ToString(json)));
|
|
239
|
+
}
|
|
240
|
+
catch (error) {
|
|
241
|
+
request.reject(new Error("Invalid ICE scan result: ".concat(error)));
|
|
242
|
+
}
|
|
243
|
+
}
|
|
244
|
+
}, "viii");
|
|
245
|
+
module.ccall("wcall_scan_set_driver", null, ["number", "number"], [run, result]);
|
|
246
|
+
return function (wuser) { return new Promise(function (resolve, reject) {
|
|
247
|
+
if (pending.has(wuser)) {
|
|
248
|
+
reject(new Error("ICE scan already running"));
|
|
249
|
+
return;
|
|
250
|
+
}
|
|
251
|
+
pending.set(wuser, { resolve: resolve, reject: reject });
|
|
252
|
+
try {
|
|
253
|
+
var err = module.ccall("wcall_start_scan", "number", ["number"], [wuser]);
|
|
254
|
+
if (err)
|
|
255
|
+
throw new Error("Could not start ICE scan (".concat(err, ")"));
|
|
256
|
+
}
|
|
257
|
+
catch (error) {
|
|
258
|
+
pending.delete(wuser);
|
|
259
|
+
reject(error);
|
|
260
|
+
}
|
|
261
|
+
}); };
|
|
262
|
+
}
|
|
263
|
+
exports.installScanDriver = installScanDriver;
|
package/dist/avs_wcall.d.ts
CHANGED
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import { UserMediaHandler, AudioStreamHandler, VideoStreamHandler } from "./avs_pc";
|
|
2
|
+
import { ScanReport } from "./avs_scan";
|
|
3
|
+
export type { ScanCandidate, ScanReport, ScanRun } from "./avs_scan";
|
|
4
|
+
import { ConnectionTestProgress, ConnectionTestResult } from "./avs_connection_test";
|
|
5
|
+
export type { ConnectionTestProgress, ConnectionTestResult, } from "./avs_connection_test";
|
|
2
6
|
export declare enum ERROR {
|
|
3
7
|
NO_MEMORY = 12,
|
|
4
8
|
INVALID = 22,
|
|
@@ -129,7 +133,11 @@ export type WcallActiveSpeakerHandler = (wuser: number, convid: string, json_lev
|
|
|
129
133
|
export type WcallNetprobeHandler = (err: number, rtt_avg: number, n_pkt_sent: number, n_pkt_recv: number, arg: number) => void;
|
|
130
134
|
export declare class Wcall {
|
|
131
135
|
private em_module;
|
|
136
|
+
private runScan?;
|
|
137
|
+
private runWebTest?;
|
|
132
138
|
constructor(em_module: any);
|
|
139
|
+
scanTest(wuser: number): Promise<ScanReport>;
|
|
140
|
+
runConnectionTest(wuser: number, onProgress?: (progress: ConnectionTestProgress) => void): Promise<ConnectionTestResult>;
|
|
133
141
|
init(env: number): number;
|
|
134
142
|
close(): void;
|
|
135
143
|
create(userid: string, clientid: string, readyh: WcallReadyHandler, sendh: WcallSendHandler, sfth: WcallSftReqHandler, incomingh: WcallIncomingHandler, missedh: WcallMissedHandler, answerh: WcallAnsweredHandler, estabh: WcallEstabHandler, closeh: WcallCloseHandler, metricsh: WcallMetricsHandler, cfg_reqh: WcallConfigReqHandler, acbrh: WcallAudioCbrChangeHandler, vstateh: WcallVideoStateChangeHandler, arg?: number): number;
|
|
@@ -139,6 +147,8 @@ export declare class Wcall {
|
|
|
139
147
|
setTrace(wuser: number, trace: number): void;
|
|
140
148
|
setBackground(wuser: number, background: number): number;
|
|
141
149
|
start(wuser: number, convid: string, call_type: number, conv_type: number, audio_cbr: number, meeting: number): number;
|
|
150
|
+
startTest(wuser: number, video: number): number;
|
|
151
|
+
startScan(wuser: number): number;
|
|
142
152
|
answer(wuser: number, convid: string, call_type: number, audio_cbr: number): number;
|
|
143
153
|
resp(wuser: number, status: number, reason: string, ctx: number): void;
|
|
144
154
|
configUpdate(wuser: number, err: number, json_str: string): void;
|
|
@@ -171,6 +181,7 @@ export declare class Wcall {
|
|
|
171
181
|
setProxy(host: string, port: number): number;
|
|
172
182
|
setAudioParams(ptime: number, max_bitrate: number): void;
|
|
173
183
|
setLossParams(red: number, fec_loss_pct: number, max_bitrate: number, jb_min_ms: number): void;
|
|
184
|
+
setAdaptiveRed(enable: number): void;
|
|
174
185
|
setStatsLog(enable: number): void;
|
|
175
186
|
setReqClientsHandler(wuser: number, reqch: WcallReqClientsHandler): void;
|
|
176
187
|
setClientsForConv(wuser: number, convid: string, json: string): number;
|
package/dist/avs_wcall.js
CHANGED
|
@@ -16,6 +16,42 @@
|
|
|
16
16
|
* You should have received a copy of the GNU General Public License
|
|
17
17
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
18
18
|
*/
|
|
19
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
20
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
21
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
22
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
23
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
24
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
25
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
26
|
+
});
|
|
27
|
+
};
|
|
28
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
29
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
30
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
31
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
32
|
+
function step(op) {
|
|
33
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
34
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
35
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
36
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
37
|
+
switch (op[0]) {
|
|
38
|
+
case 0: case 1: t = op; break;
|
|
39
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
40
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
41
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
42
|
+
default:
|
|
43
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
44
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
45
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
46
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
47
|
+
if (t[2]) _.ops.pop();
|
|
48
|
+
_.trys.pop(); continue;
|
|
49
|
+
}
|
|
50
|
+
op = body.call(thisArg, _);
|
|
51
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
52
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
53
|
+
}
|
|
54
|
+
};
|
|
19
55
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
20
56
|
exports.getAvsInstance = exports.Wcall = exports.MODE = exports.RESOLUTION = exports.VSTREAMS = exports.STATE = exports.CONV_TYPE = exports.CALL_TYPE = exports.ENV = exports.VIDEO_STATE = exports.AUDIO_STATE = exports.LOG_LEVEL = exports.REASON = exports.QUALITY = exports.ERROR = void 0;
|
|
21
57
|
/* DO NOT edit this file by hand. It is generated by the AVS make
|
|
@@ -23,6 +59,8 @@ exports.getAvsInstance = exports.Wcall = exports.MODE = exports.RESOLUTION = exp
|
|
|
23
59
|
*/
|
|
24
60
|
var avs_core = require("./avs_core");
|
|
25
61
|
var avs_pc_1 = require("./avs_pc");
|
|
62
|
+
var avs_scan_1 = require("./avs_scan");
|
|
63
|
+
var avs_connection_test_1 = require("./avs_connection_test");
|
|
26
64
|
var ERROR;
|
|
27
65
|
(function (ERROR) {
|
|
28
66
|
ERROR[ERROR["NO_MEMORY"] = 12] = "NO_MEMORY";
|
|
@@ -141,6 +179,24 @@ var Wcall = /** @class */ (function () {
|
|
|
141
179
|
function Wcall(em_module) {
|
|
142
180
|
this.em_module = em_module;
|
|
143
181
|
}
|
|
182
|
+
Wcall.prototype.scanTest = function (wuser) {
|
|
183
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
184
|
+
return __generator(this, function (_a) {
|
|
185
|
+
if (!this.runScan)
|
|
186
|
+
this.runScan = (0, avs_scan_1.installScanDriver)(this.em_module);
|
|
187
|
+
return [2 /*return*/, this.runScan(wuser)];
|
|
188
|
+
});
|
|
189
|
+
});
|
|
190
|
+
};
|
|
191
|
+
Wcall.prototype.runConnectionTest = function (wuser, onProgress) {
|
|
192
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
193
|
+
return __generator(this, function (_a) {
|
|
194
|
+
if (!this.runWebTest)
|
|
195
|
+
this.runWebTest = (0, avs_connection_test_1.installConnectionTest)(this.em_module);
|
|
196
|
+
return [2 /*return*/, this.runWebTest(wuser, 0, onProgress)];
|
|
197
|
+
});
|
|
198
|
+
});
|
|
199
|
+
};
|
|
144
200
|
Wcall.prototype.init = function (env) {
|
|
145
201
|
avs_pc_1.default.init(this.em_module, logHandler);
|
|
146
202
|
this.em_module.ccall("wcall_setup", "number", [], []);
|
|
@@ -382,6 +438,12 @@ var Wcall = /** @class */ (function () {
|
|
|
382
438
|
Wcall.prototype.start = function (wuser, convid, call_type, conv_type, audio_cbr, meeting) {
|
|
383
439
|
return this.em_module.ccall("wcall_start", "number", ["number", "string", "number", "number", "number", "number"], [wuser, convid, call_type, conv_type, audio_cbr, meeting]);
|
|
384
440
|
};
|
|
441
|
+
Wcall.prototype.startTest = function (wuser, video) {
|
|
442
|
+
return this.em_module.ccall("wcall_start_test", "number", ["number", "number"], [wuser, video]);
|
|
443
|
+
};
|
|
444
|
+
Wcall.prototype.startScan = function (wuser) {
|
|
445
|
+
return this.em_module.ccall("wcall_start_scan", "number", ["number"], [wuser]);
|
|
446
|
+
};
|
|
385
447
|
Wcall.prototype.answer = function (wuser, convid, call_type, audio_cbr) {
|
|
386
448
|
return this.em_module.ccall("wcall_answer", "number", ["number", "string", "number", "number"], [wuser, convid, call_type, audio_cbr]);
|
|
387
449
|
};
|
|
@@ -581,6 +643,9 @@ var Wcall = /** @class */ (function () {
|
|
|
581
643
|
Wcall.prototype.setLossParams = function (red, fec_loss_pct, max_bitrate, jb_min_ms) {
|
|
582
644
|
this.em_module.ccall("wcall_set_loss_params", "null", ["number", "number", "number", "number"], [red, fec_loss_pct, max_bitrate, jb_min_ms]);
|
|
583
645
|
};
|
|
646
|
+
Wcall.prototype.setAdaptiveRed = function (enable) {
|
|
647
|
+
this.em_module.ccall("wcall_set_adaptive_red", "null", ["number"], [enable]);
|
|
648
|
+
};
|
|
584
649
|
Wcall.prototype.setStatsLog = function (enable) {
|
|
585
650
|
this.em_module.ccall("wcall_set_stats_log", "null", ["number"], [enable]);
|
|
586
651
|
};
|
package/package.json
CHANGED