Merge pull request #393 from the-hideout/graphql-errors

Razzmatazzz · web-flow · commit 6dd485a597fa · 2025-07-23T08:27:29.000-05:00
Graphql errors
diff --git a/datasources/archived-prices.mjs b/datasources/archived-prices.mjs
@@ -1,3 +1,5 @@
+import { GraphQLError } from 'graphql';
+
 import WorkerKVSplit from '../utils/worker-kv-split.mjs';
 
 class ArchivedPricesAPI extends WorkerKVSplit {
@@ -9,7 +11,7 @@ class ArchivedPricesAPI extends WorkerKVSplit {
     async getByItemId(context, info, itemId) {
         const { cache } = await this.getCache(context, info, itemId);
         if (!cache) {
-            return Promise.reject(new Error('Archived prices data is empty'));
+            return Promise.reject(new GraphQLError('Archived prices data is empty'));
         }
         
         let prices = cache.ArchivedPrices[itemId];
diff --git a/datasources/handbook.mjs b/datasources/handbook.mjs
@@ -1,3 +1,5 @@
+import { GraphQLError } from 'graphql';
+
 import WorkerKV from '../utils/worker-kv.mjs';
 
 class HandbookAPI extends WorkerKV {
@@ -20,7 +22,7 @@ class HandbookAPI extends WorkerKV {
     async getCategories(context, info) {
         const { cache } = await this.getCache(context, info);
         if (!cache) {
-            return Promise.reject(new Error('Item cache is empty'));
+            return Promise.reject(new GraphQLError('Item cache is empty'));
         }
         const categories = [];
         for (const id in cache.ItemCategory) {
@@ -46,7 +48,7 @@ class HandbookAPI extends WorkerKV {
     async getHandbookCategories(context, info) {
         const { cache } = await this.getCache(context, info);
         if (!cache) {
-            return Promise.reject(new Error('Item cache is empty'));
+            return Promise.reject(new GraphQLError('Item cache is empty'));
         }
         return Object.values(cache.HandbookCategory);
     }
diff --git a/datasources/hideout.mjs b/datasources/hideout.mjs
@@ -1,3 +1,5 @@
+import { GraphQLError } from 'graphql';
+
 import WorkerKV from '../utils/worker-kv.mjs';
 
 class HideoutAPI extends WorkerKV {
@@ -20,7 +22,7 @@ class HideoutAPI extends WorkerKV {
                 }
             }
         }
-        return Promise.reject(new Error(`No hideout station level found with id ${id}`));
+        return Promise.reject(new GraphQLError(`No hideout station level found with id ${id}`));
     }
 
     async getModuleByLevel(context, info, stationId, level) {
@@ -33,15 +35,15 @@ class HideoutAPI extends WorkerKV {
                 }
             }
         }
-        return Promise.reject(new Error(`No hideout station level found with id ${stationId} and level ${level}`));
+        return Promise.reject(new GraphQLError(`No hideout station level found with id ${stationId} and level ${level}`));
     }
 
     async getStation(context, info, id) {
         const { cache } = await this.getCache(context, info);
         for (const station of cache.HideoutStation) {
             if (station.id === id) return station;
         }
-        return Promise.reject(new Error(`No hideout station found with id ${id}`));
+        return Promise.reject(new GraphQLError(`No hideout station found with id ${id}`));
     }
 
     async getLegacyList(context, info) {
@@ -56,7 +58,7 @@ class HideoutAPI extends WorkerKV {
                 return module;
             }
         }
-        return Promise.reject(new Error(`No hideout module with id ${id} found`));
+        return Promise.reject(new GraphQLError(`No hideout module with id ${id} found`));
     }
 }
 
diff --git a/datasources/historical-prices.mjs b/datasources/historical-prices.mjs
@@ -1,3 +1,5 @@
+import { GraphQLError } from 'graphql';
+
 import WorkerKVSplit from '../utils/worker-kv-split.mjs';
 
 class historicalPricesAPI extends WorkerKVSplit {
@@ -12,7 +14,7 @@ class historicalPricesAPI extends WorkerKVSplit {
     async getByItemId(context, info, itemId, days = this.defaultDays, halfResults = false) {
         const { cache } = await this.getCache(context, info, itemId);
         if (!cache) {
-            return Promise.reject(new Error('Historical prices cache is empty'));
+            return Promise.reject(new GraphQLError('Historical prices cache is empty'));
         }
         
         if (days > this.maxDays || days < 1) {
diff --git a/datasources/items.mjs b/datasources/items.mjs
@@ -1,3 +1,5 @@
+import { GraphQLError } from 'graphql';
+
 import WorkerKV from '../utils/worker-kv.mjs';
 
 class ItemsAPI extends WorkerKV {
@@ -63,7 +65,7 @@ class ItemsAPI extends WorkerKV {
         const { cache } = await this.getCache(context, info);
         let item = cache.Item[id];
         if (!item) {
-            return Promise.reject(new Error(`No item found with id ${id}`));
+            return Promise.reject(new GraphQLError(`No item found with id ${id}`));
         }
 
         if (contains && Array.isArray(contains)) {
@@ -114,7 +116,7 @@ class ItemsAPI extends WorkerKV {
             items = Object.values(cache.Item);
         }
         const searchString = name.toLowerCase();
-        if (searchString === '') return Promise.reject(new Error('Searched item name cannot be blank'));
+        if (searchString === '') return Promise.reject(new GraphQLError('Searched item name cannot be blank'));
 
         return items.filter((item) => {
             if (this.getLocale(item.name, context, info).toString().toLowerCase().includes(searchString)) {
@@ -133,7 +135,7 @@ class ItemsAPI extends WorkerKV {
             items = Object.values(cache.Item);
         }
         const searchStrings = names.map(name => {
-            if (name === '') throw new Error('Searched item name cannot be blank');
+            if (name === '') throw new GraphQLError('Searched item name cannot be blank');
             return name.toLowerCase();
         });
         return items.filter((item) => {
diff --git a/datasources/maps.mjs b/datasources/maps.mjs
@@ -1,3 +1,5 @@
+import { GraphQLError } from 'graphql';
+
 import WorkerKV from '../utils/worker-kv.mjs';
 
 class MapAPI extends WorkerKV {
@@ -16,7 +18,7 @@ class MapAPI extends WorkerKV {
         for (const map of cache.Map) {
             if (map.id === id || map.tarkovDataId === id) return map;
         }
-        return Promise.reject(new Error(`No map found with id ${id}`));
+        return Promise.reject(new GraphQLError(`No map found with id ${id}`));
     }
 
     async getMapsByNames(context, info, names, maps = false) {
@@ -25,7 +27,7 @@ class MapAPI extends WorkerKV {
             maps = cache.Map;
         }
         const searchStrings = names.map(name => {
-            if (name === '') throw new Error('Searched map name cannot be blank');
+            if (name === '') throw new GraphQLError('Searched map name cannot be blank');
             return name.toLowerCase();
         });
 
@@ -45,7 +47,7 @@ class MapAPI extends WorkerKV {
             maps = cache.Map;
         }
         const searchStrings = enemies.map(name => {
-            if (name === '') throw new Error('Searched enemy name cannot be blank');
+            if (name === '') throw new GraphQLError('Searched enemy name cannot be blank');
             return name.toLowerCase();
         });
 
@@ -76,7 +78,7 @@ class MapAPI extends WorkerKV {
             bosses = Object.values(cache.MobInfo);
         }
         const searchStrings = names.map(name => {
-            if (name === '') throw new Error('Searched boss name cannot be blank');
+            if (name === '') throw new GraphQLError('Searched boss name cannot be blank');
             return name.toLowerCase();
         });
 
diff --git a/datasources/schema.mjs b/datasources/schema.mjs
@@ -1,3 +1,5 @@
+import { GraphQLError } from 'graphql';
+
 import WorkerKV from '../utils/worker-kv.mjs';
 
 class SchemaAPI extends WorkerKV {
@@ -8,31 +10,31 @@ class SchemaAPI extends WorkerKV {
     async getCategories(context) {
         const { cache } = await this.getCache(context);
         if (!cache) {
-            return Promise.reject(new Error('Schema cache is empty'));
+            return Promise.reject(new GraphQLError('Schema cache is empty'));
         }
         return cache.ItemCategory;
     }
 
     async getHandbookCategories(context) {
         const { cache } = await this.getCache(context);
         if (!cache) {
-            return Promise.reject(new Error('Schema cache is empty'));
+            return Promise.reject(new GraphQLError('Schema cache is empty'));
         }
         return cache.HandbookCategory;
     }
 
     async getItemTypes(context) {
         const { cache } = await this.getCache(context);
         if (!cache) {
-            return Promise.reject(new Error('Schema cache is empty'));
+            return Promise.reject(new GraphQLError('Schema cache is empty'));
         }
         return cache.ItemType;
     }
 
     async getLanguageCodes(context) {
         const { cache } = await this.getCache(context);
         if (!cache) {
-            return Promise.reject(new Error('Schema cache is empty'));
+            return Promise.reject(new GraphQLError('Schema cache is empty'));
         }
         return cache.LanguageCode;
     }
diff --git a/datasources/status.mjs b/datasources/status.mjs
@@ -1,3 +1,5 @@
+import { GraphQLError } from 'graphql';
+
 import WorkerKV from '../utils/worker-kv.mjs';
 
 class StatusAPI extends WorkerKV {
@@ -8,7 +10,7 @@ class StatusAPI extends WorkerKV {
     async getStatus(context) {
         const { cache } = await this.getCache(context);
         if (!cache) {
-            return Promise.reject(new Error('Status cache is empty'));
+            return Promise.reject(new GraphQLError('Status cache is empty'));
         }
         return cache.ServerStatus;
     }
diff --git a/datasources/tasks.mjs b/datasources/tasks.mjs
@@ -1,3 +1,5 @@
+import { GraphQLError } from 'graphql';
+
 import WorkerKV from '../utils/worker-kv.mjs';
 
 class TasksAPI extends WorkerKV {
@@ -16,7 +18,7 @@ class TasksAPI extends WorkerKV {
         for (const task of cache.Task) {
             if (task.id === id || task.tarkovDataId === id) return task;
         }
-        return Promise.reject(new Error(`No task found with id ${id}`));
+        return Promise.reject(new GraphQLError(`No task found with id ${id}`));
     }
 
     async getTasksRequiringItem(context, info, itemId) {
@@ -114,7 +116,7 @@ class TasksAPI extends WorkerKV {
                 return quest;
             }
         }
-        return Promise.reject(new Error(`No quest with id ${id} found`));
+        return Promise.reject(new GraphQLError(`No quest with id ${id} found`));
     }
 
     async getQuestItems(context, info) {
@@ -139,7 +141,7 @@ class TasksAPI extends WorkerKV {
                 return achievement;
             }
         }
-        return Promise.reject(new Error(`No achievement with id ${id} found`));
+        return Promise.reject(new GraphQLError(`No achievement with id ${id} found`));
     }
 }
 
diff --git a/datasources/traders.mjs b/datasources/traders.mjs
@@ -1,3 +1,5 @@
+import { GraphQLError } from 'graphql';
+
 import WorkerKV from '../utils/worker-kv.mjs';
 
 const currencyMap = {
@@ -55,7 +57,7 @@ class TradersAPI extends WorkerKV {
             }
         }
 
-        return Promise.reject(new Error(`No trader found with id ${id}`));
+        return Promise.reject(new GraphQLError(`No trader found with id ${id}`));
     }
 
     async getByName(context, info, name) {
@@ -66,7 +68,7 @@ class TradersAPI extends WorkerKV {
             }
         }
 
-        return Promise.reject(new Error(`No trader found with name ${name}`));
+        return Promise.reject(new GraphQLError(`No trader found with name ${name}`));
     }
 
     async getByLevel(context, info, traderId, level) {
@@ -79,7 +81,7 @@ class TradersAPI extends WorkerKV {
                 }
             }
         }
-        return Promise.reject(new Error(`No trader found with id ${traderId} and level ${level}`));
+        return Promise.reject(new GraphQLError(`No trader found with id ${traderId} and level ${level}`));
     }
 
     getByDataId(context, info, dataId) {
diff --git a/resolvers/itemResolver.mjs b/resolvers/itemResolver.mjs
@@ -1,9 +1,11 @@
+import { GraphQLError } from 'graphql';
+
 export default {
     Query: {
         item(obj, args, context, info) {
             if (args.id) return context.data.worker.item.getItem(context, info, args.id);
             if (args.normalizedName) return context.data.worker.item.getItemByNormalizedName(context, info, args.normalizedName);
-            return Promise.reject(new Error('You must specify either the id or the normalizedName argument'));
+            return Promise.reject(new GraphQLError('You must specify either the id or the normalizedName argument'));
         },
         async items(obj, args, context, info) {
             let items = false;
diff --git a/resolvers/mapResolver.mjs b/resolvers/mapResolver.mjs
@@ -1,3 +1,5 @@
+import { GraphQLError } from 'graphql';
+
 export default {
     Query: {
         async bosses(obj, args, context, info) {
@@ -10,7 +12,7 @@ export default {
             const nonFilterArgs = ['lang', 'gameMode', 'limit', 'offset'];
             for (const argName in args) {
                 if (nonFilterArgs.includes(argName)) continue;
-                if (!filters[argName]) return Promise.reject(new Error(`${argName} is not a recognized argument`));
+                if (!filters[argName]) return Promise.reject(new GraphQLError(`${argName} is not a recognized argument`));
                 bosses = await filters[argName](args[argName], bosses);
             }
             if (!bosses) {
@@ -39,7 +41,7 @@ export default {
             const nonFilterArgs = ['lang', 'gameMode', 'limit', 'offset'];
             for (const argName in args) {
                 if (nonFilterArgs.includes(argName)) continue;
-                if (!filters[argName]) return Promise.reject(new Error(`${argName} is not a recognized argument`));
+                if (!filters[argName]) return Promise.reject(new GraphQLError(`${argName} is not a recognized argument`));
                 maps = await filters[argName](args[argName], maps);
             }
             if (!maps) {
diff --git a/utils/graphql-util.mjs b/utils/graphql-util.mjs
@@ -1,3 +1,5 @@
+import { GraphQLError } from 'graphql';
+
 import { v4 as uuidv4 } from 'uuid';
 
 const graphqlUtil =  {
@@ -12,7 +14,7 @@ const graphqlUtil =  {
     },
     testDepthLimit: (info, depthLimit) => {
         const depth = graphqlUtil.getDepth(info);
-        if (depth > depthLimit) throw new Error(`Query depth ${depth} exceeds maximum (${depthLimit}) for ${info.parentType}.${info.fieldName}.`);
+        if (depth > depthLimit) throw new GraphQLError(`Query depth ${depth} exceeds maximum (${depthLimit}) for ${info.parentType}.${info.fieldName}.`);
     },
     getDefaultContext: (dataSource, requestId) => {
         return {
diff --git a/utils/worker-kv.mjs b/utils/worker-kv.mjs
@@ -1,3 +1,5 @@
+import { GraphQLError } from 'graphql';
+
 class WorkerKV {
     constructor(kvName, dataSource) {
         this.cache = {};
@@ -76,7 +78,7 @@ class WorkerKV {
             const metadata = response.metadata;
             let responseValue = response.value;
             if (metadata && metadata.compression) {
-                return Promise.reject(new Error(`${metadata.compression} compression is not supported`));
+                return Promise.reject(new GraphQLError(`${metadata.compression} compression is not supported`));
             }
             const parsedValue = JSON.parse(responseValue);
             if (!parsedValue && requestKv !== this.kvName) {

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+import { GraphQLError } from 'graphql';`
	`2`	`+`
`1`	`3`	`import WorkerKV from '../utils/worker-kv.mjs';`
`2`	`4`
`3`	`5`	`class HideoutAPI extends WorkerKV {`
`@@ -20,7 +22,7 @@ class HideoutAPI extends WorkerKV {`
`20`	`22`	`}`
`21`	`23`	`}`
`22`	`24`	`}`
`23`		- return Promise.reject(new Error(`No hideout station level found with id ${id}`));
	`25`	+ return Promise.reject(new GraphQLError(`No hideout station level found with id ${id}`));
`24`	`26`	`}`
`25`	`27`
`26`	`28`	`async getModuleByLevel(context, info, stationId, level) {`
`@@ -33,15 +35,15 @@ class HideoutAPI extends WorkerKV {`
`33`	`35`	`}`
`34`	`36`	`}`
`35`	`37`	`}`
`36`		- return Promise.reject(new Error(`No hideout station level found with id ${stationId} and level ${level}`));
	`38`	+ return Promise.reject(new GraphQLError(`No hideout station level found with id ${stationId} and level ${level}`));
`37`	`39`	`}`
`38`	`40`
`39`	`41`	`async getStation(context, info, id) {`
`40`	`42`	`const { cache } = await this.getCache(context, info);`
`41`	`43`	`for (const station of cache.HideoutStation) {`
`42`	`44`	`if (station.id === id) return station;`
`43`	`45`	`}`
`44`		- return Promise.reject(new Error(`No hideout station found with id ${id}`));
	`46`	+ return Promise.reject(new GraphQLError(`No hideout station found with id ${id}`));
`45`	`47`	`}`
`46`	`48`
`47`	`49`	`async getLegacyList(context, info) {`
`@@ -56,7 +58,7 @@ class HideoutAPI extends WorkerKV {`
`56`	`58`	`return module;`
`57`	`59`	`}`
`58`	`60`	`}`
`59`		- return Promise.reject(new Error(`No hideout module with id ${id} found`));
	`61`	+ return Promise.reject(new GraphQLError(`No hideout module with id ${id} found`));
`60`	`62`	`}`
`61`	`63`	`}`
`62`	`64`