From a80418ca028cfc7b20f08ce08dc2745712d986bd Mon Sep 17 00:00:00 2001
From: Rishi Ghan <rishi.ghan@gmail.com>
Date: Sun, 3 Apr 2022 01:01:39 -0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Attempting=20refactor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json             | 24 ++++++++++++------------
 services/comicvine.service.ts | 18 ++++++++++--------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6016546..2bf2b45 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8605,9 +8605,9 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "node_modules/mixin-deep": {
@@ -11464,9 +11464,9 @@
       }
     },
     "node_modules/strip-ansi/node_modules/ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -19279,9 +19279,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "mixin-deep": {
@@ -21431,9 +21431,9 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
           "dev": true
         }
       }
diff --git a/services/comicvine.service.ts b/services/comicvine.service.ts
index 1651984..a8235cf 100644
--- a/services/comicvine.service.ts
+++ b/services/comicvine.service.ts
@@ -170,12 +170,6 @@ export default class ComicVineService extends Service {
 				volumeBasedSearch: {
 					rest: "POST /volumeBasedSearch",
 					params: {},
-					headers: { Accept: "application/json" },
-					bulkhead: {
-						enabled: true,
-						concurrency: 10,
-						maxQueueSize: 10,
-					},
 					timeout: 10000000,
 					handler: async (
 						ctx: Context<{
@@ -246,13 +240,17 @@ export default class ComicVineService extends Service {
 
 						const issueMatches = await axios({
 							url: `https://comicvine.gamespot.com/api/issues?api_key=${process.env.COMICVINE_API_KEY}`,
+							method: "GET",
 							params: {
 								resources: "issues",
 								limit: "100",
 								format: "json",
 								filter: filterString,
 							},
-							headers: { "User-Agent": "ThreeTwo" },
+							headers: {
+								"User-Agent": "ThreeTwo",
+								"Accept": "application/json",
+							},
 						});
 						console.log(
 							`Total issues matching the criteria: ${issueMatches.data.results.length}`
@@ -290,8 +288,12 @@ export default class ComicVineService extends Service {
 					let currentPage = parseInt(params.page, 10);
 					const response = await axios.request({
 						url: `https://comicvine.gamespot.com/api/search?api_key=${process.env.COMICVINE_API_KEY}`,
+						method: "GET",
 						params,
-						headers: { "User-Agent": "ThreeTwo" },
+						headers: {
+							"User-Agent": "ThreeTwo",
+							"Accept": "application/json",
+						},
 					});
 
 					const { data } = response;