feat: Send a frontend update when an upload or delete of trace has finished and handle the frontend update of the trace object

Author: pxor

src/common/common_types.nim

@@ -1349,6 +1349,11 @@ type
     trace*: Trace
     programName*: langstring
 
+  UploadedTraceData* = object
+    downloadKey*: langstring
+    controlId*: langstring
+    expireTime*: langstring
+
   DeleteTraceArg* = object
     traceId*: int
     controlId*: langstring

src/ct/codetracer.nim

@@ -796,11 +796,18 @@ proc uploadTrace(trace: Trace) =
   let jsonMessage = parseJson(output)
   let downloadKey = trace.program & "//" & jsonMessage["DownloadId"].getStr("") & "//" & aesKey
 
-  updateField(trace.id, "remoteShareDownloadId", downloadKey, false)
-  updateField(trace.id, "remoteShareControlId", jsonMessage["ControlId"].getStr(""), false)
-  updateField(trace.id, "remoteShareExpireTime", jsonMessage["Expires"].getInt(), false)
+  if jsonMessage["DownloadId"].getStr("") notin @["", "Errored"]:
 
-  echo downloadKey
+    updateField(trace.id, "remoteShareDownloadId", downloadKey, false)
+    updateField(trace.id, "remoteShareControlId", jsonMessage["ControlId"].getStr(""), false)
+    updateField(trace.id, "remoteShareExpireTime", jsonMessage["Expires"].getInt(), false)
+
+    echo downloadKey
+    echo jsonMessage["ControlId"].getStr("")
+    echo jsonMessage["Expires"].getInt()
+
+  else:
+    echo downloadKey
 
   removeFile(outputZip & ".enc")
 

src/frontend/index.nim

@@ -811,6 +811,33 @@ proc onUploadTraceFile(sender: js, response: UploadTraceArg) {.async.} =
     ]
   )
 
+  if res.isOk:
+    let splitData =  res.v.split("\n")
+    if splitData.len() == 4:
+      let uploadData = UploadedTraceData(
+        downloadKey: splitData[0],
+        controlId: splitData[1],
+        expireTime: splitData[2]
+      )
+      mainWindow.webContents.send(
+        "CODETRACER::uploaded-trace-received",
+        js{
+          "argId": j(response.trace.program & ":" & $response.trace.id),
+          "value": uploadData
+        }
+      )
+    else:
+      let uploadData = UploadedTraceData(
+        downloadKey: splitData[0],
+      )
+      mainWindow.webContents.send(
+        "CODETRACER::uploaded-trace-received",
+        js{
+          "argId": j(response.trace.program & ":" & $response.trace.id),
+          "value": uploadData
+        }
+      )
+
 proc onDownloadTraceFile(sender: js, response: jsobject(downloadKey = seq[cstring])) {.async.} =
   let res = await readProcessOutput(
     codetracerExe.cstring,
@@ -832,6 +859,14 @@ proc onDeleteOnlineTraceFile(sender: js, response: DeleteTraceArg) {.async.} =
     ]
   )
 
+  mainWindow.webContents.send(
+    "CODETRACER::deleted-online-trace-received",
+    js{
+      "argId": j($response.traceId & ":" & response.controlId),
+      "value": res.isOk
+    }
+  )
+
 proc onSendBugReportAndLogs(sender: js, response: BugReportArg) {.async.} =
   let process = await runProcess(
     codetracerExe.cstring,

src/frontend/renderer.nim

@@ -488,6 +488,12 @@ proc onContextStartHistory*(sender: js, response: jsobject(inState=bool, express
 proc onLoadParsedExprsReceived*(sender: js, response: jsobject(argId=cstring, value=JsAssoc[cstring, seq[FlowExpression]])) =
   jsAsFunction[proc(response: JsAssoc[cstring, seq[FlowExpression]]): void](data.network.futures["load-parsed-exprs"][response.argId])(response.value)
 
+proc onUploadedTraceReceived*(sender: js, response: jsobject(argId=cstring, value=UploadedTraceData)) =
+  jsAsFunction[proc(response: UploadedTraceData): void](data.network.futures["upload-trace-file"][response.argId])(response.value)
+
+proc onDeletedOnlineTraceReceived*(sender: js, response: jsobject(argId=cstring, value=bool)) =
+  jsAsFunction[proc(response: bool): void](data.network.futures["delete-online-trace-file"][response.argId])(response.value)
+
 # TODO: make some kind of dsl?
 # locals
 proc onLoadLocalsReceived*(sender: js, response: jsobject(argId=cstring, value=JsAssoc[cstring, Value])) =

src/frontend/ui/welcome_screen.nim

@@ -5,19 +5,41 @@ import
 
 const PROGRAM_NAME_LIMIT = 45
 
-proc uploadTrace(self: WelcomeScreenComponent, trace: Trace) =
-  self.data.ipc.send "CODETRACER::upload-trace-file",
+proc uploadTrace(self: WelcomeScreenComponent, trace: Trace) {.async.} =
+  var uploadedData = await self.data.asyncSend(
+    "upload-trace-file",
     UploadTraceArg(
       trace: trace,
       programName: trace.program
-    )
+    ),
+    &"{trace.program}:{trace.id}", UploadedTraceData
+  )
+
+  if uploadedData.downloadKey != "Errored":
+    trace.downloadKey = uploadedData.downloadKey
+    trace.controlId = uploadedData.controlId
+    trace.onlineExpireTime = ($uploadedData.expireTime).parseInt()
+  else:
+    trace.downloadKey = uploadedData.downloadKey
+
+  self.data.redraw()
 
-proc deleteUploadedTrace(self: WelcomeScreenComponent, trace: Trace) =
-  self.data.ipc.send "CODETRACER::delete-online-trace-file",
+proc deleteUploadedTrace(self: WelcomeScreenComponent, trace: Trace) {.async.} =
+  var deleted = await self.data.asyncSend(
+    "delete-online-trace-file",
     DeleteTraceArg(
       traceId: trace.id,
       controlId: trace.controlId
-    )
+    ),
+    &"{trace.id}:{trace.controlId}", bool
+  )
+
+  if deleted:
+    trace.controlId = ""
+    trace.downloadKey = ""
+    trace.onlineExpireTime = -1
+
+  self.data.redraw()
 
 proc recentProjectView(self: WelcomeScreenComponent, trace: Trace): VNode =
   buildHtml(
@@ -48,15 +70,15 @@ proc recentProjectView(self: WelcomeScreenComponent, trace: Trace): VNode =
           span(
             onclick = proc(ev: Event, tg: VNode) =
               ev.stopPropagation()
-              self.uploadTrace(trace)
+              discard self.uploadTrace(trace)
             ):
             text "upload"
       if trace.controlId != "":
         tdiv(class = "recent-trace-buttons", id = "delete-button"):
           span(
             onclick = proc(ev: Event, tg: VNode) =
               ev.stopPropagation()
-              self.deleteUploadedTrace(trace)
+              discard self.deleteUploadedTrace(trace)
             ):
             text "delete"
     # tdiv(class = "recent-trace-info"):

src/frontend/ui_js.nim

@@ -1090,6 +1090,9 @@ proc configureIPC(data: Data) =
 
     "follow-history"
 
+    "uploaded-trace-received"
+    "deleted-online-trace-received"
+
   duration("configureIPCRun")
 
 proc zoomInEditors*(data: Data) =