Skip to content

Commit 3b3eacf

Browse files
javascript-2020javascript-2020
committed
save file
1 parent 06d2ff7 commit 3b3eacf

File tree

1 file changed

+113
-22
lines changed

1 file changed

+113
-22
lines changed

‎utils/webrtc/webrtc-file-transfer-http/webrtc-file-transfer-http.html‎

Lines changed: 113 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -792,7 +792,7 @@ <h1 slot=seo-hdr class=visually-hidden>webrtc file transfer http</h1>
792792

793793
var txt = await res.text();
794794
ui.view.sys(txt);
795-
console.log(txt);
795+
debug(txt);
796796
}//init
797797

798798

@@ -806,11 +806,34 @@ <h1 slot=seo-hdr class=visually-hidden>webrtc file transfer http</h1>
806806
var str = JSON.stringify(offer);
807807
var body = str;
808808

809-
var res = await fetch(url,{headers,method:'post',body});
810-
var txt = await res.text();
811-
812-
console.log(txt);
809+
var err;
810+
try{
811+
812+
var res = await fetch(url,{headers,method:'post',body});
813+
814+
}//try
815+
catch(err2){
816+
817+
err = err2;
818+
819+
}//catch
820+
if(err){
821+
var error = err.toString();
822+
console.log('http offer error');
823+
console.error(err);
824+
ui.view.sys.red('http offer error');
825+
ui.view.sys.red(error);
826+
return;
827+
}
828+
if(!res.ok){
829+
var str = res.status+' '+res.statusText;
830+
ui.view.sys.red('http offer error');
831+
ui.view.sys.red(str);
832+
return;
833+
}
813834

835+
var txt = await res.text();
836+
debug(txt);
814837
}//offer
815838

816839

@@ -824,26 +847,71 @@ <h1 slot=seo-hdr class=visually-hidden>webrtc file transfer http</h1>
824847
var str = JSON.stringify(answer);
825848
var body = str;
826849

827-
var res = await fetch(url,{headers,method:'post',body});
828-
var txt = await res.text();
829-
830-
console.log(txt);
850+
var err;
851+
try{
852+
853+
var res = await fetch(url,{headers,method:'post',body});
854+
855+
}//try
856+
catch(err2){
857+
858+
err = err2;
859+
860+
}//catch
861+
if(err){
862+
var error = err.toString();
863+
ui.view.sys.red('http answer error');
864+
ui.view.sys.red(error);
865+
return;
866+
}
867+
if(!res.ok){
868+
var str = res.status+' '+res.statusText;
869+
ui.view.sys.red('http answer error');
870+
ui.view.sys.red(str);
871+
return;
872+
}
831873

874+
var txt = await res.text();
875+
debug(txt);
832876
}//answer
833877

834878

835879
http.ice = async function(ice){
836880
debug('http.ice');
837881
var url = $(root,'#server').value;
838882
url += '/ice';
883+
839884
var headers = {mode};
885+
840886
var str = JSON.stringify(ice);
841887
var body = str;
842888

843-
var res = await fetch(url,{headers,method:'post',body});
844-
var txt = await res.text();
845-
console.log(txt);
889+
var err;
890+
try{
891+
892+
var res = await fetch(url,{headers,method:'post',body});
893+
894+
}//try
895+
catch(err2){
896+
897+
err = err2;
898+
899+
}//catch
900+
if(err){
901+
var error = err.toString();
902+
ui.view.sys.red('http ice error');
903+
ui.view.sys.red(error);
904+
return;
905+
}
906+
if(!res.ok){
907+
var str = res.status+' '+res.statusText;
908+
ui.view.sys.red('http ice error');
909+
ui.view.sys.red(str);
910+
return;
911+
}
846912

913+
var txt = await res.text();
914+
debug(txt);
847915
}//ice
848916

849917

@@ -853,12 +921,35 @@ <h1 slot=seo-hdr class=visually-hidden>webrtc file transfer http</h1>
853921
url += '/read';
854922
var headers = {mode};
855923

856-
var res = await fetch(url,{headers});
857-
var txt = await res.text();
924+
var err;
925+
try{
926+
927+
var res = await fetch(url,{headers,method:'post',body});
928+
929+
}//try
930+
catch(err2){
931+
932+
err = err2;
933+
934+
}//catch
935+
if(err){
936+
var error = err.toString();
937+
ui.view.sys.red('http read error');
938+
ui.view.sys.red(error);
939+
return;
940+
}
941+
if(!res.ok){
942+
var str = res.status+' '+res.statusText;
943+
ui.view.sys.red('http read error');
944+
ui.view.sys.red(str);
945+
return;
946+
}
858947

948+
var txt = await res.text();
859949
if(!txt){
860950
return;
861951
}
952+
862953

863954
var con = JSON.parse(txt);
864955
console.log(con);
@@ -868,6 +959,7 @@ <h1 slot=seo-hdr class=visually-hidden>webrtc file transfer http</h1>
868959
if(con.answer){
869960
await read.answer(con.answer);
870961
}
962+
871963
var n = con.ice.length;
872964
for(var i=0;i<n;i++){
873965

@@ -933,15 +1025,15 @@ <h1 slot=seo-hdr class=visually-hidden>webrtc file transfer http</h1>
9331025

9341026

9351027
poll.start = function(){
936-
console.log('poll.start');
1028+
debug('poll.start');
9371029
setTimeout(poll.stop,poll.max);
9381030
poll.send();
9391031

9401032
}//start
9411033

9421034

9431035
poll.send = async function(){
944-
console.log('poll.send');
1036+
debug('poll.send');
9451037
await http.read();
9461038

9471039
poll.timer = setTimeout(poll.send,poll.time);
@@ -950,7 +1042,7 @@ <h1 slot=seo-hdr class=visually-hidden>webrtc file transfer http</h1>
9501042

9511043

9521044
poll.stop = function(){
953-
console.log('poll.stop');
1045+
debug('poll.stop');
9541046
clearTimeout(poll.timer);
9551047

9561048
}//stop
@@ -1015,7 +1107,7 @@ <h1 slot=seo-hdr class=visually-hidden>webrtc file transfer http</h1>
10151107

10161108

10171109
pc.close = function(){
1018-
1110+
debug('pc.close');
10191111
if(!pc.con){
10201112
return;
10211113
}
@@ -1030,9 +1122,8 @@ <h1 slot=seo-hdr class=visually-hidden>webrtc file transfer http</h1>
10301122

10311123
pc.on.connectionstatechange = function(e){
10321124

1033-
10341125
var state = peerConnection.connectionState;
1035-
1126+
debug('pc.on.connectionstatechange',state);
10361127
switch(state){
10371128

10381129
case 'new' : ui.view.sys('pc new'); break;
@@ -1143,7 +1234,7 @@ <h1 slot=seo-hdr class=visually-hidden>webrtc file transfer http</h1>
11431234
var buf2 = buf;
11441235
buf = [];
11451236

1146-
console.log('process',buf2.length);
1237+
debug('process',buf2.length);
11471238

11481239
buf2.forEach(async candidate=>{
11491240

@@ -1206,7 +1297,7 @@ <h1 slot=seo-hdr class=visually-hidden>webrtc file transfer http</h1>
12061297

12071298

12081299
dc.on.error = function(){
1209-
console.log('dc.on.error');
1300+
debug('dc.on.error');
12101301
ui.view.sys('data channel error');
12111302

12121303
}//dc.on.error

0 commit comments

Comments
 (0)