From 8df4339bdb3d96cb448e3acb727fdc534688bfc0 Mon Sep 17 00:00:00 2001
From: Ben Curtis <github@nosolutions.com>
Date: Sun, 31 Jan 2021 14:36:58 -0500
Subject: [PATCH] feat: clean up proxy logging with n/N in each lookup (#1839)

---
 src/logger.ts       | 24 +++++++++++++++++++-----
 src/store/lookup.ts | 30 ++++++++++++++++++++++--------
 2 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/src/logger.ts b/src/logger.ts
index 5cb4179870..7266ee548a 100644
--- a/src/logger.ts
+++ b/src/logger.ts
@@ -241,11 +241,25 @@ function buildSetupString(
 
 function buildProductString(link: Link, store: Store, color?: boolean): string {
   if (color) {
-    return (
-      chalk.cyan(`[${store.name}]`) +
-      chalk.grey(` [${link.brand} (${link.series})] ${link.model}`)
-    );
+    if (store.currentProxyIndex !== undefined && store.proxyList) {
+      const proxy = `${store.currentProxyIndex + 1}/${store.proxyList.length}`;
+      return (
+        chalk.gray(`[${proxy}]`) +
+        chalk.cyan(` [${store.name}]`) +
+        chalk.grey(` [${link.brand} (${link.series})] ${link.model}`)
+      );
+    } else {
+      return (
+        chalk.cyan(`[${store.name}]`) +
+        chalk.grey(` [${link.brand} (${link.series})] ${link.model}`)
+      );
+    }
   }
 
-  return `[${store.name}] [${link.brand} (${link.series})] ${link.model}`;
+  if (store.currentProxyIndex !== undefined && store.proxyList) {
+    const proxy = `${store.currentProxyIndex + 1}/${store.proxyList.length}`;
+    return `[${proxy}] [${store.name}] [${link.brand} (${link.series})] ${link.model}`;
+  } else {
+    return `[${store.name}] [${link.brand} (${link.series})] ${link.model}`;
+  }
 }
diff --git a/src/store/lookup.ts b/src/store/lookup.ts
index 569d9e0f7e..06e5ce578a 100644
--- a/src/store/lookup.ts
+++ b/src/store/lookup.ts
@@ -37,15 +37,18 @@ function nextProxy(store: Store) {
 
   if (store.currentProxyIndex === undefined) {
     store.currentProxyIndex = 0;
+  } else {
+    store.currentProxyIndex++;
   }
 
-  store.currentProxyIndex++;
   if (store.currentProxyIndex >= store.proxyList.length) {
     store.currentProxyIndex = 0;
   }
 
-  logger.info(
-    `ℹ [${store.name}] Next proxy index: ${store.currentProxyIndex} / Count: ${store.proxyList.length}`
+  logger.debug(
+    `ℹ [${store.name}] Next proxy index: ${store.currentProxyIndex} / Count: ${
+      store.proxyList.length
+    } (${store.proxyList[store.currentProxyIndex]})`
   );
 
   return store.proxyList[store.currentProxyIndex];
@@ -252,11 +255,22 @@ async function lookup(browser: Browser, store: Store) {
     try {
       statusCode = await lookupCard(browser, store, page, link);
     } catch (error: unknown) {
-      logger.error(
-        `✖ [${store.name}] ${link.brand} ${link.series} ${link.model} - ${
-          (error as Error).message
-        }`
-      );
+      if (store.currentProxyIndex !== undefined && store.proxyList) {
+        const proxy = `${store.currentProxyIndex + 1}/${
+          store.proxyList.length
+        }`;
+        logger.error(
+          `✖ [${proxy}] [${store.name}] ${link.brand} ${link.series} ${
+            link.model
+          } - ${(error as Error).message}`
+        );
+      } else {
+        logger.error(
+          `✖ [${store.name}] ${link.brand} ${link.series} ${link.model} - ${
+            (error as Error).message
+          }`
+        );
+      }
       const client = await page.target().createCDPSession();
       await client.send('Network.clearBrowserCookies');
     }