Add goset replication progressbar to frontend

Author: jannickheisch

android/tinySSB/app/src/main/assets/web/tremola.html

@@ -252,16 +252,27 @@
 
   <div id='connection-overlay' class='qr-overlay'>
     <div style='font-size:18px; padding-bottom: 10px;'><b>Replication Status</b></div>
-    <div style="position: relative; margin-bottom: 10px;">
-      <img src='img/fountain.png' alt="Icon" class="progress-icon">
-      <progress id='connection-overlay-progressbar-gift' class='connection-overlay-progressbar' value="0" max="100"></progress>
-      <div id='connection-overlay-progressbar-label-gift' class="connection-overlay-progressbar-label"></div>
+    <div id='progress-container'>
+      <div style="position: relative; margin-bottom: 10px;">
+        <img src='img/fountain.png' alt="Icon" class="progress-icon">
+        <progress id='connection-overlay-progressbar-gift' class='connection-overlay-progressbar' value="0" max="100"></progress>
+        <div id='connection-overlay-progressbar-label-gift' class="connection-overlay-progressbar-label"></div>
+      </div>
+      <div style="position: relative; margin-bottom: 10px;">
+        <img src='img/receive.png' alt="Icon" class="progress-icon">
+        <progress id='connection-overlay-progressbar-want' class='connection-overlay-progressbar' value="0" max="100"></progress>
+        <div id='connection-overlay-progressbar-label-want' class="connection-overlay-progressbar-label"></div>
+      </div>
     </div>
-    <div style="position: relative; margin-bottom: 10px;">
-      <img src='img/receive.png' alt="Icon" class="progress-icon">
-      <progress id='connection-overlay-progressbar-want' class='connection-overlay-progressbar' value="0" max="100"></progress>
-      <div id='connection-overlay-progressbar-label-want' class="connection-overlay-progressbar-label"></div>
+
+    <div id='goset-progress-container' style="display: none;">
+      <div style="position: relative; margin-bottom: 10px;">
+        <img src='img/fountain.png' alt="Icon" class="progress-icon">
+        <progress id='connection-overlay-progressbar-goset' class='connection-overlay-progressbar' value="0" max="100"></progress>
+        <div id='connection-overlay-progressbar-label-goset' class="connection-overlay-progressbar-label"></div>
+      </div>
     </div>
+
     <div id='connection-overlay-hdr' style='font-size:18px; padding-bottom: 10px;'><b>Connected Devices</b></div>
     <div id='connection-overlay-content'></div>
   </div>

android/tinySSB/app/src/main/assets/web/tremola.js

@@ -543,6 +543,8 @@ function save_content_alias() {
     var val = document.getElementById('old_contact_alias').value;
     var deleteAlias = false
 
+    val.trim()
+
     if (val == '') {
         deleteAlias = true
         if (c.iam != "" && new_contact_id != myId) {

android/tinySSB/app/src/main/assets/web/tremola_ui.js

@@ -452,6 +452,25 @@ function refresh_connection_entry(id) {
 
 }
 
+function refresh_goset_progressbar(curr, max) {
+
+    console.log("refresh_goset_progressbar", curr, max)
+
+    var delta = max - curr
+
+    document.getElementById('connection-overlay-progressbar-goset').value = (curr / max) * 100
+    document.getElementById('connection-overlay-progressbar-label-goset').textContent = delta + " key" + (delta > 1 ? "s" : "") + " left"
+    if (delta > 0) {
+        console.log("display progress")
+        document.getElementById('goset-progress-container').style.display = "initial"
+        document.getElementById('progress-container').style.display = "none"
+    } else {
+        document.getElementById('goset-progress-container').style.display = "none"
+        document.getElementById('progress-container').style.display = "initial"
+    }
+
+}
+
 function refresh_connection_progressbar(min_entries, old_min_entries, old_want_entries, curr_want_entries, max_entries) {
 
     console.log("min:", min_entries)

android/tinySSB/app/src/main/java/nz/scuttlebutt/tremolavossbol/tssb/GOset.kt

@@ -91,8 +91,11 @@ class GOset(val context: MainActivity) {
         if (buf.size != CLAIM_LEN || buf[0] != 'c'.toByte())
             return;
         val cl = mkClaim(buf)
+
         if (cl.sz > largest_claim_span)
             largest_claim_span = cl.sz
+        if (context.tinyRepo.isLoaded())
+            context.wai.eval("refresh_goset_progressbar(${keys.size}, ${largest_claim_span})") // notify frontend
         // Log.d("rx", "state = ${state.toHex()}, cl.sz=${cl.sz}, k.sz=${keys.size}")
         if (cl.sz == keys.size && byteArrayCmp(state, cl.xo) == 0) {
             Log.d("goset", "seems we are synced (with at least someone), |GOset|=${keys.size}")
@@ -138,7 +141,7 @@ class GOset(val context: MainActivity) {
         }
         */
         // Log.d("GOset", "beacon")
-        if (keys.size == 0) return
+        if (keys.size == 0 || !context.tinyRepo.isLoaded()) return
         while (novelty_credit-- > 0 && pending_novelty.size > 0)
             context.tinyIO.enqueue(pending_novelty.removeFirst().wire, goset_dmx, null)
         novelty_credit = NOVELTY_PER_ROUND

android/tinySSB/app/src/main/java/nz/scuttlebutt/tremolavossbol/tssb/Node.kt

@@ -175,6 +175,8 @@ class Node(val context: MainActivity) {
     var old_min: List<Int>? = null
     var old_min_from: String? = null
 
+
+
     // calculates current replication progress and sends update to frontend
     fun update_progress(want_vector: List<Int>, from: String) {
 

android/tinySSB/app/src/main/java/nz/scuttlebutt/tremolavossbol/tssb/Repo.kt

@@ -1,6 +1,7 @@
 package nz.scuttlebutt.tremolavossbol.tssb
 
 import android.content.Context.MODE_PRIVATE
+import android.util.Log
 import nz.scuttlebutt.tremolavossbol.MainActivity
 import nz.scuttlebutt.tremolavossbol.crypto.SodiumAPI.Companion.sha256
 import nz.scuttlebutt.tremolavossbol.utils.Bipf
@@ -21,6 +22,7 @@ import kotlin.random.Random
 class Repo(val context: MainActivity) {
     val TINYSSB_DIR = "tinyssb"
     val FEED_DIR = "feeds"
+    private var loadingFinished = false // indicates whether all replicas have already been loaded into the repo.
     private val replicas = ArrayList<Replica>()
     private var want_is_valid = false
     private var chnk_is_valid = false
@@ -50,8 +52,11 @@ class Repo(val context: MainActivity) {
 
         for (f in fdir.listFiles { file -> file.isDirectory && file.name.length == 2 * FID_LEN} ?: emptyArray()) {
             add_replica(f.name.decodeHex())
+            context.tinyGoset._add_key(f.name.decodeHex())
         }
 
+        loadingFinished = true
+
     }
 
     fun add_replica(fid: ByteArray) {
@@ -71,6 +76,8 @@ class Repo(val context: MainActivity) {
             context.tinyDemux.arm_blb(p.hptr, chunk_fct,fid,seq, p.cnr)
         }
 
+
+
         if (context.tinyGoset.keys.size > 1) {
             want_offs = Random.nextInt(0, context.tinyGoset.keys.size - 1)
             chnk_offs = Random.nextInt(0, context.tinyGoset.keys.size - 1)
@@ -159,10 +166,11 @@ class Repo(val context: MainActivity) {
 
 
         if(lst.size > 1) {
+            // notify frontend
             var vec = lst.slice(1 .. lst.lastIndex) // want_vector without offset
-            vec = vec.mapIndexed { index, i ->
-                val new_idx =(index + want_offs) % vec.size
-                lst.slice(1 .. lst.lastIndex)[new_idx]}
+            val front = vec.subList(vec.size - lst[0], vec.size)
+            val back = vec.subList(0, vec.size - lst[0])
+            vec = front + back
             context.tinyNode.update_progress(vec, "me")
 
             return Bipf.encode(Bipf.mkList(lst))
@@ -322,4 +330,8 @@ class Repo(val context: MainActivity) {
 
     }
 
+    fun isLoaded(): Boolean {
+        return loadingFinished
+    }
+
 }