Skip to content

Commit 08ad3a6

Browse files
save file
1 parent 8389e98 commit 08ad3a6

File tree

1 file changed

+43
-9
lines changed

1 file changed

+43
-9
lines changed

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

Lines changed: 43 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,15 @@ <h3>
231231

232232

233233
<div id=server-root>
234+
234235

236+
<label>
237+
session
238+
</label>
239+
240+
<input id=session value=main>
241+
242+
235243
<label>
236244
server
237245
</label>
@@ -391,18 +399,24 @@ <h3>
391399
keydown.initdom();
392400

393401

394-
img.disconnected = $(root,'#status').src;
402+
ui.session = $(root,'#session');
395403

396404
$(root,'#server').value = url;
405+
397406
btn.connect = $(root,'[value=connect]');
398407
btn.connect.onclick = btn.click.connect;
408+
409+
img.disconnected = $(root,'#status').src;
399410
$(root,'#server-init').onclick = btn['server-init'];
400411

412+
401413
$(root,'[value=read]').onclick = btn.read;
402414
$(root,'[value=process]').onclick = btn.process;
415+
403416

404417
$(root,'[value="download server"]').onclick = btn.download;
405418

419+
406420

407421
filemod.initdom(root);
408422

@@ -554,10 +568,6 @@ <h3>
554568
if(error)return;
555569
zip.file(`${root}/webrtc-file-transfer-http-server.js`,blob);
556570

557-
var {blob,error} = await get('javascript-2020.github.io','utils/webrtc/file-transfer-http/file-transfer-http.html');
558-
if(error)return;
559-
zip.file(`${root}/file-transfer-http.html`,blob);
560-
561571
zip.folder(`${root}/node_modules`);
562572

563573
var libs = ['nodejs/keys/keys.js','nodejs/wsmod/wsmod.js','nodejs/server-cert/server-cert.js'];
@@ -726,17 +736,19 @@ <h3>
726736

727737
ui.view.sys(`connect ${url}`);
728738

739+
var body = ui.session.value;
740+
729741
var err;
730742
try{
731743

732-
var res = await fetch(url);
744+
var res = await fetch(url,{method:'post',body});
733745

734-
}
746+
}//try
735747
catch(err2){
736748

737749
err = err2;
738750

739-
}
751+
}//catch
740752
if(err){
741753
console.log('http.create error');
742754
console.error(err);
@@ -852,7 +864,28 @@ <h3>
852864
var res = await fetch(url,{headers});
853865
var txt = await res.text();
854866

867+
if(!txt){
868+
return;
869+
}
855870

871+
var con = JSON.parse(txt);
872+
console.log(con);
873+
if(con.offer){
874+
await http.read.offer(con.offer);
875+
}
876+
if(con.answer){
877+
await http.read.answer(con.answer);
878+
}
879+
var n = con.ice.length;
880+
for(var i=0;i<n;i++){
881+
882+
var ice = con.ice[i];
883+
await http.read.ice(ice);
884+
885+
}//for
886+
887+
888+
/*
856889
var parts = txt.split('\n\n').filter(Boolean);
857890
var n = parts.length;
858891
for(var i=0;i<n;i+=2){
@@ -871,6 +904,7 @@ <h3>
871904
}//switch
872905
873906
}//for
907+
*/
874908

875909
pc.process();
876910

@@ -1309,7 +1343,7 @@ <h3>
13091343
var buf2 = buf;
13101344
buf = [];
13111345

1312-
console.log('process',buf2.length);
1346+
console.log('process',buf2.length);
13131347

13141348
buf2.forEach(async candidate=>{
13151349

0 commit comments

Comments
 (0)