From 09e88d41d14128f9ac222fc03b1e21f93b6fec73 Mon Sep 17 00:00:00 2001
From: Zack Scholl <zack.scholl@gmail.com>
Date: Tue, 12 Nov 2019 14:16:33 -0800
Subject: [PATCH] js seems to work

---
 src/webrtc/websend/index.html |  62 +++++++++++++++-------------------
 src/webrtc/websend/main.go    |   1 +
 src/webrtc/websend/main.wasm  | Bin 6514833 -> 6514833 bytes
 3 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/src/webrtc/websend/index.html b/src/webrtc/websend/index.html
index 610ff1c4..bb130eb7 100644
--- a/src/webrtc/websend/index.html
+++ b/src/webrtc/websend/index.html
@@ -29,6 +29,13 @@
     <div id="byte_content"></div>
     Base64: <textarea id="remoteSessionDescription"></textarea> <br />
     <button onclick="startSession()"> Send Message </button> <br />
+    <script src="wasm_exec.js"></script>
+    <script>
+    const go = new Go();
+    WebAssembly.instantiateStreaming(fetch("main.wasm"), go.importObject).then((result) => {
+        go.run(result.instance);
+    });
+    </script>
     <script>
     function readBlob(opt_startByte, opt_stopByte) {
 
@@ -117,46 +124,38 @@
     // websockets 
     var socket;
     var pakeData;
+    var croc = {
+        "key": "",
+    }
 
     var sendMessage = msg => {
         log(`sending ${JSON.stringify(msg)}`)
         socket.send(btoa(JSON.stringify(msg)));
     }
 
-    const socketMessageListener = (event) => {
-        var data;
-        if (event.data.includes("Message")) {
-            data = JSON.parse(event.data);
+    function waitForGolang() {
+        if (typeof writeWebsocketMessage !== "undefined") {
+            socket.send(writeWebsocketMessage("[1] you are offerer", "", ""))
         } else {
-            data = JSON.parse(atob(event.data));
+            setTimeout(waitForGolang, 250);
         }
-        if (data.Message == "pake") {
-            log("processing pake data");
-            console.log(data);
-            pakeData = pakeUpdate(pakeData, data.Payload);
-            console.log(pakeSessionKey(pakeData));
-            sendMessage({
-                "Message": "pake",
-                "Payload": pakePublic(pakeData),
-            })
-        } else if (data.Message == "offerer") {
-            log("i am the offerer")
-            log("offering the first pake");
-            sendMessage({
-                "Message": "answerer",
-            })
-            pakeData = pakeInit("test1", 0);
-            sendMessage({
-                "Message": "pake",
-                "Payload": pakePublic(pakeData),
-            })
+    }
+
+    const socketMessageListener = (event) => {
+        console.log(event.data);
+        var data = JSON.parse(readWebsocketMessage(event.data, croc.key));
+        console.log(data);
+        if (!("Message" in data)) {
+            console.log("no message")
+            return
         }
+        // if (data.Message == "[1] you are offerer") {
+
+        // }
     };
     const socketOpenListener = (event) => {
         log('connected to websockets');
-        sendMessage({
-            "Message": "offerer",
-        })
+        waitForGolang();
     }
     const socketCloseListener = (event) => {
         if (socket) {
@@ -172,13 +171,6 @@
     };
     socketCloseListener();
     </script>
-    <script src="wasm_exec.js"></script>
-    <script>
-    const go = new Go();
-    WebAssembly.instantiateStreaming(fetch("main.wasm"), go.importObject).then((result) => {
-        go.run(result.instance);
-    });
-    </script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/src/webrtc/websend/main.go b/src/webrtc/websend/main.go
index 86948e5c..cf382225 100644
--- a/src/webrtc/websend/main.go
+++ b/src/webrtc/websend/main.go
@@ -59,6 +59,7 @@ func writeWebsocketMessage(this js.Value, inputs []js.Value) interface{} {
 }
 
 // readWebsocketMessage(bundled,key)
+// returns stringified JSON
 // if key == "", then no decryption is used
 func readWebsocketMessage(this js.Value, inputs []js.Value) interface{} {
 	// initialize sender P ("0" indicates sender)
diff --git a/src/webrtc/websend/main.wasm b/src/webrtc/websend/main.wasm
index c41516a9e53da7771b93668d6cc8ebcd6290e629..c1d8a115a6163ea9fe1353d0de07fb5484ef8e2e 100755
GIT binary patch
delta 970
zcmZwCOH30{6b9fq_YS3q*!lobeB*<vP+O{iZ@}^vuqZ{*q9_Ebt<|Uq`F+MCB*w%V
z9}8KqVr5*I=%_0<x`0Gu;=+x%P}#WAjfo4RXAC9{F_UlZ%zy4Vb0_)shE9r`o|d4m
zxi8_bZm5fu9}aa_^c4p>>b%F>YU6u-CH<vgf8o(+ysW7$QQ?h-OQR=RV~N&qsI&W2
zRZCad@qTY_sOwNHP~X(w8!z)!cJ_8RGzKq&K@7#v43m+@a4^ytPDTb}8Y7c2osq?u
z!EiC$jG2sCjM<DijBG{@V=g0?F^@5yk;hoTSjbq!Sj<?$Sjt$&$Y(5PtYEBUtYQ=}
zJdD+hHH@{4LPin8%UH+oG5m~TMu4%Nv4K&-C}or}HZnFbHZ!&`wlcOo#`Y(7vfmqq
zu`l0c%#ro?Z^Ni0!|1W9?`}VP$ulI`>xC{OJ*8%63Af8|rDVg_L{53K!1M4w`|WJ%
z{zumEw({>K7yG34bdk%*Oqq3la>l$VnLT4^N_JJA?cSo4Y*3!<^KPD!*}Xd^vmRNq
z#r6B<fcspzs1TK6hX{%)Q7vjjt*8_AqCxBwjiO03i(MilTEuR#N3@EtXcK$IKG81r
zTkdlQ(!bG_d$~Q4A6YMmOmdnI{mN7?t-PZV7w!H`q{yL6rAVc#3?hfT51Hz|sl0j}
zd9`0T?OIy4%AKrUGZmXEsH-TbYm~#TI!#hK%UP=f8O3^mbs-wrL#rQ1L1Gy%>$p}Q
zw2J9C#dJd14P)|UHA-n`^bzaVvB-34AGI4~vrM#Go@@0?t0d`LL~_4PYJ&7fG8M_8
zKarCA7@2PQC+Sm4&;8q{oq5i2qBmN-)1>JOW!xb>XdQ_~)>6)}mc6EyL;btxv^qI3
S5|4-uaZntxM&g}cfBpfn*aHv%

delta 970
zcmZwCOGs2<6bJBozVAAYsm+wH)U@|Qb2Mv8D@$$0N7-X4waIF1GVnQ?nl{3pGU8+q
zQ5MxgdaPOmEn3tKiniIJA_!V$K@VtCo1jJ5xn?j(Tz>ca?*Dw}+<QmgT-2lDa^Aje
zz2Tm|lT{^swXLl^eJ%chV2iIP(pKD3=WX{!qTz6NG|(KW-qlhx7}!44*jqPHIpFCJ
zH%7WTs=e(+J+*;gXV1`(KUjKVXMLclwaGhp1`J{-hGv+IIEI4}&u}sl7_%6Oj3h=f
zV>ZLZa5LsG<}y+ksf;v6IwONIkCDm9Vq`PsGjbTYj0KE^j75yaj3tbvjAe}Fj1`QP
zj66m@V-=%-;b9aqiWsXI#f&wKwG1y~9b-MCgi*@az}U#x#3*BIW^7@UKSaf&YiaKc
z!)RLKGE!xooHPs{8AhvBbG>44IB!g{S2->tKBi`8$K5W&6_eezKBrfXuFSjtpYwJ$
z^ZWzrPI={zlG9PCJ<fF*i7~S<JtK2QX3tm@lbw~l-CG!wjmX~q-m)2)-Rqyu+GI@=
z7skvHceGM$6+Yn?Riawdh+45tY!`K6huA50iQOU~_K3Y=pQslNqEYM@L2*DdiG$*h
z<&GYX|4zd<=Cy@>CO;!G$!R+DxT&67+3g`0)qf;X<WQzkq~cT}kwczund+vgJi3rP
zdbM&+)lyV?!r$t7Q;nF)r~Ty9)yiR4ohB)r?5xpi5{h+}b*dxOK>7EiAhC>>bwaE6
zT6O9!>eSuJZg?SYR^t@cua8>4J3~oyaNKT?!!prsd8*YDtuB$iOeFU!q`s2=K&GP4
zM4w2>{Uw=h`6ua9N@q;<X=k=`g6OqYZ#8N9LJ3z%pR<ldLIsq5OUqeP%SZjYXi)W!
T-0cpDW^qJ>t-IYvzy10Hew75#