sending new users to peers on user creation

src/worker/handlers/handleQuestionsToPeers.ts

@@ -6,22 +6,9 @@ import { RecievedData } from '../../utils/actions'
 import { removeCacheFromQuestion } from '../../utils/qdbUtils'
 import { QuestionAddResponse } from '../../modules/api/submodules/qminingapi'
 import logger from '../../utils/logger'
-import {
-    loginToPeer,
-    peerToString,
-    updatePeersFile,
-} from '../../utils/p2putils'
+import { peerToString, loginAndPostDataToAllPeers } from '../../utils/p2putils'
 import { post } from '../../utils/networkUtils'
 
-const login = async (peer: PeerInfo): Promise<string> => {
-    const loginResult = await loginToPeer(peer)
-    if (typeof loginResult === 'string') {
-        return loginResult
-    } else {
-        return null
-    }
-}
-
 export type QuestionsToPeersTaskObject = {
     type: 'sendQuestionsToPeers'
     data: {
@@ -66,18 +53,6 @@ export const handleQuestionsToPeers = async (
         }),
     }
 
-    const results: {
-        errors: PeerInfo[]
-        hasNew: PeerInfo[]
-        sent: PeerInfo[]
-        loginErrors: PeerInfo[]
-    } = {
-        errors: [],
-        hasNew: [],
-        sent: [],
-        loginErrors: [],
-    }
-
     const postData = (peer: PeerInfo, sessionCookie: string) => {
         return post<QuestionAddResponse>({
             hostname: peer.host,
@@ -89,63 +64,17 @@ export const handleQuestionsToPeers = async (
         })
     }
 
-    for (const peer of peers) {
-        let sessionCookie = peer.sessionCookie
-
-        if (!sessionCookie) {
-            sessionCookie = await login(peer)
-            if (!sessionCookie) {
-                results.loginErrors.push(peer)
-                continue
+    const hadNewQuestions: string[] = []
+    loginAndPostDataToAllPeers<QuestionAddResponse & { success: boolean }>(
+        peers,
+        postData,
+        (peer, res) => {
+            if (res.data?.totalNewQuestions > 0) {
+                hadNewQuestions.push(peerToString(peer))
             }
-            updatePeersFile(peer, { sessionCookie: sessionCookie })
         }
-
-        let res = await postData(peer, sessionCookie)
-
-        if (res.data?.result === 'nouser' && sessionCookie) {
-            sessionCookie = await login(peer)
-            if (!sessionCookie) {
-                results.loginErrors.push(peer)
-                continue
-            }
-            updatePeersFile(peer, { sessionCookie: sessionCookie })
-            res = await postData(peer, sessionCookie)
-        }
-
-        if (res.error || !res.data?.success) {
-            results.errors.push(peer)
-            console.error(res.error || JSON.stringify(res.data))
-        } else if (res.data?.totalNewQuestions > 0) {
-            results.hasNew.push(peer)
-        } else {
-            results.sent.push(peer)
-        }
-    }
-
-    const logMsg: string[] = []
-    const addToLogMsg = (
-        peerResult: PeerInfo[],
-        prefix: string,
-        color: string
-    ) => {
-        if (peerResult.length > 0) {
-            logMsg.push(
-                `${logger.C(color)}${prefix}:${logger.C()} ` +
-                    peerResult.map((x) => peerToString(x)).join(', ')
-            )
-        }
-    }
-    addToLogMsg(results.loginErrors, 'Login error', 'red')
-    addToLogMsg(results.errors, 'Error', 'red')
-    addToLogMsg(results.hasNew, 'Had new questions', 'blue')
-    addToLogMsg(results.sent, 'Sent', 'green')
-
-    logger.Log(
-        `\t${logger.C(
-            'green'
-        )}Sent new questions to peers${logger.C()}; ${logMsg.join(', ')}`
     )
+    logger.Log(`Peers that added new questions: ${hadNewQuestions.join(', ')}`)
 
     parentPort.postMessage({
         msg: `From thread #${workerIndex}: sendQuestionsToPeers done`,