From b86a97c9c0836508f21f195ad42c07119ad9e2a6 Mon Sep 17 00:00:00 2001
From: Matt Hill <matthewonthemoon@gmail.com>
Date: Wed, 7 Jun 2023 16:37:36 -0600
Subject: [PATCH] add resetTor to rpc client

---
 frontend/projects/ui/src/app/services/api/api.types.ts    | 6 ++++++
 .../ui/src/app/services/api/embassy-api.service.ts        | 2 ++
 .../ui/src/app/services/api/embassy-live-api.service.ts   | 8 ++++++--
 .../ui/src/app/services/api/embassy-mock-api.service.ts   | 5 +++++
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/frontend/projects/ui/src/app/services/api/api.types.ts b/frontend/projects/ui/src/app/services/api/api.types.ts
index f9911b61d..7c8ca9bd6 100644
--- a/frontend/projects/ui/src/app/services/api/api.types.ts
+++ b/frontend/projects/ui/src/app/services/api/api.types.ts
@@ -62,6 +62,12 @@ export module RR {
   export type SystemRebuildReq = {} // server.rebuild
   export type SystemRebuildRes = null
 
+  export type ResetTorReq = {
+    'wipe-state': boolean
+    reason: string
+  } // net.tor.reset
+  export type ResetTorRes = null
+
   // sessions
 
   export type GetSessionsReq = {} // sessions.list
diff --git a/frontend/projects/ui/src/app/services/api/embassy-api.service.ts b/frontend/projects/ui/src/app/services/api/embassy-api.service.ts
index 4f159aa48..20169943c 100644
--- a/frontend/projects/ui/src/app/services/api/embassy-api.service.ts
+++ b/frontend/projects/ui/src/app/services/api/embassy-api.service.ts
@@ -111,6 +111,8 @@ export abstract class ApiService {
 
   abstract repairDisk(params: RR.SystemRebuildReq): Promise<RR.SystemRebuildRes>
 
+  abstract resetTor(params: RR.ResetTorReq): Promise<RR.ResetTorRes>
+
   // marketplace URLs
 
   abstract marketplaceProxy<T>(
diff --git a/frontend/projects/ui/src/app/services/api/embassy-live-api.service.ts b/frontend/projects/ui/src/app/services/api/embassy-live-api.service.ts
index 5a91d45d6..c8a1b48e5 100644
--- a/frontend/projects/ui/src/app/services/api/embassy-live-api.service.ts
+++ b/frontend/projects/ui/src/app/services/api/embassy-live-api.service.ts
@@ -136,7 +136,7 @@ export class LiveApiService extends ApiService {
   }
 
   async getTorLogs(params: RR.GetServerLogsReq): Promise<RR.GetServerLogsRes> {
-    return this.rpcRequest({ method: 'server.tor-logs', params })
+    return this.rpcRequest({ method: 'net.tor.logs', params })
   }
 
   async followServerLogs(
@@ -154,7 +154,7 @@ export class LiveApiService extends ApiService {
   async followTorLogs(
     params: RR.FollowServerLogsReq,
   ): Promise<RR.FollowServerLogsRes> {
-    return this.rpcRequest({ method: 'server.tor-logs.follow', params })
+    return this.rpcRequest({ method: 'net.tor.logs.follow', params })
   }
 
   async getServerMetrics(
@@ -192,6 +192,10 @@ export class LiveApiService extends ApiService {
     return this.rpcRequest({ method: 'disk.repair', params })
   }
 
+  async resetTor(params: RR.ResetTorReq): Promise<RR.ResetTorRes> {
+    return this.rpcRequest({ method: 'net.tor.reset', params })
+  }
+
   // marketplace URLs
 
   async marketplaceProxy<T>(
diff --git a/frontend/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/frontend/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index 59a2934a9..166a2978a 100644
--- a/frontend/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/frontend/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -322,6 +322,11 @@ export class MockApiService extends ApiService {
     return null
   }
 
+  async resetTor(params: RR.ResetTorReq): Promise<RR.ResetTorRes> {
+    await pauseFor(2000)
+    return null
+  }
+
   // marketplace URLs
 
   async marketplaceProxy(