From cd5c210eac11831100380b2192736e4dbaae4f09 Mon Sep 17 00:00:00 2001
From: marcobaobao <marco.piovanello@gmail.com>
Date: Sun, 29 Oct 2023 15:07:42 +0100
Subject: [PATCH] code refactoring

---
 frontend/src/components/SocketSubscriber.tsx | 11 ++++++-----
 server/internal/memory_db.go                 |  9 +++------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/SocketSubscriber.tsx b/frontend/src/components/SocketSubscriber.tsx
index 543ee9e..d2bde78 100644
--- a/frontend/src/components/SocketSubscriber.tsx
+++ b/frontend/src/components/SocketSubscriber.tsx
@@ -1,7 +1,7 @@
 import * as O from 'fp-ts/Option'
 import { useMemo } from 'react'
 import { useRecoilState, useRecoilValue } from 'recoil'
-import { interval, share, take } from 'rxjs'
+import { share, take, timer } from 'rxjs'
 import { downloadsState } from '../atoms/downloads'
 import { serverAddressAndPortState } from '../atoms/settings'
 import { connectedState } from '../atoms/status'
@@ -34,8 +34,9 @@ const SocketSubscriber: React.FC<Props> = ({ children }) => {
     )
   })
 
-  useSubscription(sharedSocket$,
-    (event) => {
+  useSubscription(
+    sharedSocket$,
+    event => {
       if (!isRPCResponse(event)) { return }
       if (!Array.isArray(event.result)) { return }
 
@@ -52,7 +53,7 @@ const SocketSubscriber: React.FC<Props> = ({ children }) => {
 
       setDownloads(O.none)
     },
-    (err) => {
+    err => {
       console.error(err)
       pushMessage(
         `${i18n.t('rpcConnErr')} (${serverAddressAndPort})`,
@@ -61,7 +62,7 @@ const SocketSubscriber: React.FC<Props> = ({ children }) => {
     }
   )
 
-  useSubscription(interval(1000), () => client.running())
+  useSubscription(timer(0, 1000), () => client.running())
 
   return (
     <>{children}</>
diff --git a/server/internal/memory_db.go b/server/internal/memory_db.go
index 864ad38..ab9d71c 100644
--- a/server/internal/memory_db.go
+++ b/server/internal/memory_db.go
@@ -30,7 +30,7 @@ func (m *MemoryDB) Get(id string) (*Process, error) {
 
 // Store a pointer of a process and return its id
 func (m *MemoryDB) Set(process *Process) string {
-	id := uuid.Must(uuid.NewRandom()).String()
+	id := uuid.NewString()
 	m.table.Store(id, process)
 	process.Id = id
 	return id
@@ -97,12 +97,9 @@ func (m *MemoryDB) All() *[]ProcessResponse {
 func (m *MemoryDB) Persist() {
 	running := m.All()
 
-	sessionFile := filepath.Join(
-		config.Instance().SessionFilePath,
-		"session.dat",
-	)
+	sf := filepath.Join(config.Instance().SessionFilePath, "session.dat")
 
-	fd, err := os.Create(sessionFile)
+	fd, err := os.Create(sf)
 	if err != nil {
 		log.Println(cli.Red, "Failed to persist session", cli.Reset)
 	}