erlc-api 3.0.0 → 3.1.0

package/src/functions/server/getJoinLogs.js

@@ -1,4 +1,5 @@
 const { BASEURL } = require("../../constants.js");
+const { processError } = require("../../utils/errorHandler.js");
 
 /**
  * Retrieves join/leave logs from a server
@@ -8,8 +9,8 @@ const { BASEURL } = require("../../constants.js");
 module.exports = (serverToken) => {
   return new Promise(async (resolve, reject) => {
     // Input validation
-    if (!serverToken || typeof serverToken !== 'string') {
-      return reject(new Error('Server token is required and must be a string'));
+    if (!serverToken || typeof serverToken !== "string") {
+      return reject(new Error("Server token is required and must be a string"));
     }
 
     try {
@@ -18,37 +19,35 @@ module.exports = (serverToken) => {
 
       // Check if global token is configured
       if (!config?.globalToken) {
-        return reject(new Error('Global token not configured. Please initialize the client first.'));
+        const error = await processError(
+          new Error(
+            "Global token not configured. Please initialize the client first."
+          )
+        );
+        return reject(error);
       }
 
       const res = await fetch.default(`${BASEURL}/server/joinlogs`, {
         headers: {
-          "Authorization": config.globalToken,
+          Authorization: config.globalToken,
           "Server-Key": serverToken,
         },
         timeout: 10000, // 10 second timeout
       });
 
       if (!res.ok) {
-        const errorData = await res.json().catch(() => ({ error: 'Unknown API error' }));
-        const error = new Error(`API Error: ${res.status} - ${errorData.error || res.statusText}`);
-        error.status = res.status;
-        error.data = errorData;
+        const errorData = await res
+          .json()
+          .catch(() => ({ error: "Unknown API error" }));
+        const error = await processError(res, errorData);
         return reject(error);
       }
 
       const data = await res.json();
       resolve(Array.isArray(data) ? data : []);
-
     } catch (error) {
-      // Handle different types of errors
-      if (error.code === 'ENOTFOUND') {
-        reject(new Error('Network error: Unable to connect to ER:LC API'));
-      } else if (error.name === 'AbortError') {
-        reject(new Error('Request timeout: API took too long to respond'));
-      } else {
-        reject(error);
-      }
+      const processedError = await processError(error);
+      reject(processedError);
     }
   });
-};
+};

package/src/functions/server/getKillLogs.js

@@ -1,4 +1,5 @@
 const { BASEURL } = require("../../constants.js");
+const { processError } = require("../../utils/errorHandler.js");
 
 /**
  * Retrieves kill logs from a server
@@ -8,8 +9,8 @@ const { BASEURL } = require("../../constants.js");
 module.exports = (serverToken) => {
   return new Promise(async (resolve, reject) => {
     // Input validation
-    if (!serverToken || typeof serverToken !== 'string') {
-      return reject(new Error('Server token is required and must be a string'));
+    if (!serverToken || typeof serverToken !== "string") {
+      return reject(new Error("Server token is required and must be a string"));
     }
 
     try {
@@ -18,37 +19,35 @@ module.exports = (serverToken) => {
 
       // Check if global token is configured
       if (!config?.globalToken) {
-        return reject(new Error('Global token not configured. Please initialize the client first.'));
+        const error = await processError(
+          new Error(
+            "Global token not configured. Please initialize the client first."
+          )
+        );
+        return reject(error);
       }
 
       const res = await fetch.default(`${BASEURL}/server/killlogs`, {
         headers: {
-          "Authorization": config.globalToken,
+          Authorization: config.globalToken,
           "Server-Key": serverToken,
         },
         timeout: 10000, // 10 second timeout
       });
 
       if (!res.ok) {
-        const errorData = await res.json().catch(() => ({ error: 'Unknown API error' }));
-        const error = new Error(`API Error: ${res.status} - ${errorData.error || res.statusText}`);
-        error.status = res.status;
-        error.data = errorData;
+        const errorData = await res
+          .json()
+          .catch(() => ({ error: "Unknown API error" }));
+        const error = await processError(res, errorData);
         return reject(error);
       }
 
       const data = await res.json();
       resolve(Array.isArray(data) ? data : []);
-
     } catch (error) {
-      // Handle different types of errors
-      if (error.code === 'ENOTFOUND') {
-        reject(new Error('Network error: Unable to connect to ER:LC API'));
-      } else if (error.name === 'AbortError') {
-        reject(new Error('Request timeout: API took too long to respond'));
-      } else {
-        reject(error);
-      }
+      const processedError = await processError(error);
+      reject(processedError);
     }
   });
-};
+};

package/src/functions/server/getModcallLogs.js

@@ -1,4 +1,5 @@
 const { BASEURL } = require("../../constants.js");
+const { processError } = require("../../utils/errorHandler.js");
 
 /**
  * Retrieves moderator call logs from a server
@@ -8,8 +9,8 @@ const { BASEURL } = require("../../constants.js");
 module.exports = (serverToken) => {
   return new Promise(async (resolve, reject) => {
     // Input validation
-    if (!serverToken || typeof serverToken !== 'string') {
-      return reject(new Error('Server token is required and must be a string'));
+    if (!serverToken || typeof serverToken !== "string") {
+      return reject(new Error("Server token is required and must be a string"));
     }
 
     try {
@@ -18,37 +19,35 @@ module.exports = (serverToken) => {
 
       // Check if global token is configured
       if (!config?.globalToken) {
-        return reject(new Error('Global token not configured. Please initialize the client first.'));
+        const error = await processError(
+          new Error(
+            "Global token not configured. Please initialize the client first."
+          )
+        );
+        return reject(error);
       }
 
       const res = await fetch.default(`${BASEURL}/server/modcalls`, {
         headers: {
-          "Authorization": config.globalToken,
+          Authorization: config.globalToken,
           "Server-Key": serverToken,
         },
         timeout: 10000, // 10 second timeout
       });
 
       if (!res.ok) {
-        const errorData = await res.json().catch(() => ({ error: 'Unknown API error' }));
-        const error = new Error(`API Error: ${res.status} - ${errorData.error || res.statusText}`);
-        error.status = res.status;
-        error.data = errorData;
+        const errorData = await res
+          .json()
+          .catch(() => ({ error: "Unknown API error" }));
+        const error = await processError(res, errorData);
         return reject(error);
       }
 
       const data = await res.json();
       resolve(Array.isArray(data) ? data : []);
-
     } catch (error) {
-      // Handle different types of errors
-      if (error.code === 'ENOTFOUND') {
-        reject(new Error('Network error: Unable to connect to ER:LC API'));
-      } else if (error.name === 'AbortError') {
-        reject(new Error('Request timeout: API took too long to respond'));
-      } else {
-        reject(error);
-      }
+      const processedError = await processError(error);
+      reject(processedError);
     }
   });
-};
+};

package/src/functions/server/getPlayers.js

@@ -1,4 +1,5 @@
 const { BASEURL } = require("../../constants.js");
+const { processError } = require("../../utils/errorHandler.js");
 
 /**
  * Retrieves current players from a server
@@ -8,8 +9,8 @@ const { BASEURL } = require("../../constants.js");
 module.exports = (serverToken) => {
   return new Promise(async (resolve, reject) => {
     // Input validation
-    if (!serverToken || typeof serverToken !== 'string') {
-      return reject(new Error('Server token is required and must be a string'));
+    if (!serverToken || typeof serverToken !== "string") {
+      return reject(new Error("Server token is required and must be a string"));
     }
 
     try {
@@ -18,37 +19,35 @@ module.exports = (serverToken) => {
 
       // Check if global token is configured
       if (!config?.globalToken) {
-        return reject(new Error('Global token not configured. Please initialize the client first.'));
+        const error = await processError(
+          new Error(
+            "Global token not configured. Please initialize the client first."
+          )
+        );
+        return reject(error);
       }
 
       const res = await fetch.default(`${BASEURL}/server/players`, {
         headers: {
-          "Authorization": config.globalToken,
+          Authorization: config.globalToken,
           "Server-Key": serverToken,
         },
         timeout: 10000, // 10 second timeout
       });
 
       if (!res.ok) {
-        const errorData = await res.json().catch(() => ({ error: 'Unknown API error' }));
-        const error = new Error(`API Error: ${res.status} - ${errorData.error || res.statusText}`);
-        error.status = res.status;
-        error.data = errorData;
+        const errorData = await res
+          .json()
+          .catch(() => ({ error: "Unknown API error" }));
+        const error = await processError(res, errorData);
         return reject(error);
       }
 
       const data = await res.json();
       resolve(Array.isArray(data) ? data : []);
-
     } catch (error) {
-      // Handle different types of errors
-      if (error.code === 'ENOTFOUND') {
-        reject(new Error('Network error: Unable to connect to ER:LC API'));
-      } else if (error.name === 'AbortError') {
-        reject(new Error('Request timeout: API took too long to respond'));
-      } else {
-        reject(error);
-      }
+      const processedError = await processError(error);
+      reject(processedError);
     }
   });
-};
+};

package/src/functions/server/getQueue.js

@@ -1,4 +1,5 @@
 const { BASEURL } = require("../../constants.js");
+const { processError } = require("../../utils/errorHandler.js");
 
 /**
  * Retrieves server queue information
@@ -8,8 +9,8 @@ const { BASEURL } = require("../../constants.js");
 module.exports = (serverToken) => {
   return new Promise(async (resolve, reject) => {
     // Input validation
-    if (!serverToken || typeof serverToken !== 'string') {
-      return reject(new Error('Server token is required and must be a string'));
+    if (!serverToken || typeof serverToken !== "string") {
+      return reject(new Error("Server token is required and must be a string"));
     }
 
     try {
@@ -18,37 +19,35 @@ module.exports = (serverToken) => {
 
       // Check if global token is configured
       if (!config?.globalToken) {
-        return reject(new Error('Global token not configured. Please initialize the client first.'));
+        const error = await processError(
+          new Error(
+            "Global token not configured. Please initialize the client first."
+          )
+        );
+        return reject(error);
       }
 
       const res = await fetch.default(`${BASEURL}/server/queue`, {
         headers: {
-          "Authorization": config.globalToken,
+          Authorization: config.globalToken,
           "Server-Key": serverToken,
         },
         timeout: 10000, // 10 second timeout
       });
 
       if (!res.ok) {
-        const errorData = await res.json().catch(() => ({ error: 'Unknown API error' }));
-        const error = new Error(`API Error: ${res.status} - ${errorData.error || res.statusText}`);
-        error.status = res.status;
-        error.data = errorData;
+        const errorData = await res
+          .json()
+          .catch(() => ({ error: "Unknown API error" }));
+        const error = await processError(res, errorData);
         return reject(error);
       }
 
       const data = await res.json();
       resolve(Array.isArray(data) ? data : []);
-
     } catch (error) {
-      // Handle different types of errors
-      if (error.code === 'ENOTFOUND') {
-        reject(new Error('Network error: Unable to connect to ER:LC API'));
-      } else if (error.name === 'AbortError') {
-        reject(new Error('Request timeout: API took too long to respond'));
-      } else {
-        reject(error);
-      }
+      const processedError = await processError(error);
+      reject(processedError);
     }
   });
-};
+};

package/src/functions/server/getServer.js

@@ -1,29 +1,49 @@
 const { BASEURL, Vanity } = require("../../constants.js");
+const { processError } = require("../../utils/errorHandler.js");
 
 module.exports = (serverToken) => {
   return new Promise(async (resolve, reject) => {
+    // Input validation
+    if (!serverToken || typeof serverToken !== "string") {
+      return reject(new Error("Server token is required and must be a string"));
+    }
+
     try {
       const fetch = await import("node-fetch");
       const { config } = await import("../../erlc.js");
 
+      // Check if global token is configured
+      if (!config?.globalToken) {
+        return reject(
+          new Error(
+            "Global token not configured. Please initialize the client first."
+          )
+        );
+      }
+
       const res = await fetch.default(`${BASEURL}/server`, {
         headers: {
-          "Authorization": config?.globalToken,
+          Authorization: config?.globalToken,
           "Server-Key": serverToken,
         },
-      });
-
-      const data = await res.json().catch((err) => {
-        return reject(err);
+        timeout: 10000, // 10 second timeout
       });
 
       if (!res.ok) {
-        return reject(data);
+        const errorData = await res
+          .json()
+          .catch(() => ({ error: "Unknown API error" }));
+        const error = await processError(res, errorData);
+        return reject(error);
       }
 
+      const data = await res.json();
+
       const getUsername = async (userId) => {
         try {
-          const response = await fetch.default(`https://users.roblox.com/v1/users/${userId}`);
+          const response = await fetch.default(
+            `https://users.roblox.com/v1/users/${userId}`
+          );
           const userData = await response.json();
           if (!response.ok) {
             console.warn(`Warning: Could not fetch username for ID: ${userId}`);
@@ -31,7 +51,10 @@ module.exports = (serverToken) => {
           }
           return userData.name;
         } catch (error) {
-          console.warn(`Warning: Error fetching username for ID: ${userId}`, error);
+          console.warn(
+            `Warning: Error fetching username for ID: ${userId}`,
+            error
+          );
           return `User:${userId}`; // Fallback format
         }
       };
@@ -39,12 +62,13 @@ module.exports = (serverToken) => {
       try {
         // Get owner username
         const ownerUsername = await getUsername(data.OwnerId);
-        
+
         // Get co-owner usernames (handle empty array case)
-        const coOwnerUsernames = data.CoOwnerIds && data.CoOwnerIds.length > 0 
-          ? await Promise.all(data.CoOwnerIds.map(getUsername))
-          : [];
-        
+        const coOwnerUsernames =
+          data.CoOwnerIds && data.CoOwnerIds.length > 0
+            ? await Promise.all(data.CoOwnerIds.map(getUsername))
+            : [];
+
         // Create vanity URL
         const vanityURL = `${Vanity}${data.JoinKey}`;
 
@@ -53,7 +77,7 @@ module.exports = (serverToken) => {
           ...data,
           OwnerUsername: ownerUsername,
           CoOwnerUsernames: coOwnerUsernames,
-          VanityURL: vanityURL
+          VanityURL: vanityURL,
         };
 
         // Remove the original ID properties as they're now converted to usernames
@@ -63,16 +87,19 @@ module.exports = (serverToken) => {
         resolve(enhancedData);
       } catch (error) {
         // If username fetching fails, still return the original data with IDs
-        console.warn('Warning: Could not fetch usernames, returning data with IDs:', error);
+        console.warn(
+          "Warning: Could not fetch usernames, returning data with IDs:",
+          error
+        );
         const fallbackData = {
           ...data,
-          VanityURL: `${Vanity}${data.JoinKey}`
+          VanityURL: `${Vanity}${data.JoinKey}`,
         };
         resolve(fallbackData);
       }
-
     } catch (error) {
-      reject(error);
+      const processedError = await processError(error);
+      reject(processedError);
     }
   });
-};
+};

package/src/functions/server/getStaff.js

@@ -1,4 +1,5 @@
 const { BASEURL } = require("../../constants.js");
+const { processError } = require("../../utils/errorHandler.js");
 
 /**
  * Retrieves server staff information
@@ -8,8 +9,8 @@ const { BASEURL } = require("../../constants.js");
 module.exports = (serverToken) => {
   return new Promise(async (resolve, reject) => {
     // Input validation
-    if (!serverToken || typeof serverToken !== 'string') {
-      return reject(new Error('Server token is required and must be a string'));
+    if (!serverToken || typeof serverToken !== "string") {
+      return reject(new Error("Server token is required and must be a string"));
     }
 
     try {
@@ -18,37 +19,35 @@ module.exports = (serverToken) => {
 
       // Check if global token is configured
       if (!config?.globalToken) {
-        return reject(new Error('Global token not configured. Please initialize the client first.'));
+        const error = await processError(
+          new Error(
+            "Global token not configured. Please initialize the client first."
+          )
+        );
+        return reject(error);
       }
 
       const res = await fetch.default(`${BASEURL}/server/staff`, {
         headers: {
-          "Authorization": config.globalToken,
+          Authorization: config.globalToken,
           "Server-Key": serverToken,
         },
         timeout: 10000, // 10 second timeout
       });
 
       if (!res.ok) {
-        const errorData = await res.json().catch(() => ({ error: 'Unknown API error' }));
-        const error = new Error(`API Error: ${res.status} - ${errorData.error || res.statusText}`);
-        error.status = res.status;
-        error.data = errorData;
+        const errorData = await res
+          .json()
+          .catch(() => ({ error: "Unknown API error" }));
+        const error = await processError(res, errorData);
         return reject(error);
       }
 
       const data = await res.json();
       resolve(data || { CoOwners: [], Admins: {}, Mods: {} });
-
     } catch (error) {
-      // Handle different types of errors
-      if (error.code === 'ENOTFOUND') {
-        reject(new Error('Network error: Unable to connect to ER:LC API'));
-      } else if (error.name === 'AbortError') {
-        reject(new Error('Request timeout: API took too long to respond'));
-      } else {
-        reject(error);
-      }
+      const processedError = await processError(error);
+      reject(processedError);
     }
   });
-};
+};

package/src/functions/server/getVehicles.js

@@ -1,4 +1,5 @@
 const { BASEURL } = require("../../constants.js");
+const { processError } = require("../../utils/errorHandler.js");
 
 /**
  * Retrieves server vehicles information
@@ -8,8 +9,8 @@ const { BASEURL } = require("../../constants.js");
 module.exports = (serverToken) => {
   return new Promise(async (resolve, reject) => {
     // Input validation
-    if (!serverToken || typeof serverToken !== 'string') {
-      return reject(new Error('Server token is required and must be a string'));
+    if (!serverToken || typeof serverToken !== "string") {
+      return reject(new Error("Server token is required and must be a string"));
     }
 
     try {
@@ -18,37 +19,35 @@ module.exports = (serverToken) => {
 
       // Check if global token is configured
       if (!config?.globalToken) {
-        return reject(new Error('Global token not configured. Please initialize the client first.'));
+        const error = await processError(
+          new Error(
+            "Global token not configured. Please initialize the client first."
+          )
+        );
+        return reject(error);
       }
 
       const res = await fetch.default(`${BASEURL}/server/vehicles`, {
         headers: {
-          "Authorization": config.globalToken,
+          Authorization: config.globalToken,
           "Server-Key": serverToken,
         },
         timeout: 10000, // 10 second timeout
       });
 
       if (!res.ok) {
-        const errorData = await res.json().catch(() => ({ error: 'Unknown API error' }));
-        const error = new Error(`API Error: ${res.status} - ${errorData.error || res.statusText}`);
-        error.status = res.status;
-        error.data = errorData;
+        const errorData = await res
+          .json()
+          .catch(() => ({ error: "Unknown API error" }));
+        const error = await processError(res, errorData);
         return reject(error);
       }
 
       const data = await res.json();
       resolve(Array.isArray(data) ? data : []);
-
     } catch (error) {
-      // Handle different types of errors
-      if (error.code === 'ENOTFOUND') {
-        reject(new Error('Network error: Unable to connect to ER:LC API'));
-      } else if (error.name === 'AbortError') {
-        reject(new Error('Request timeout: API took too long to respond'));
-      } else {
-        reject(error);
-      }
+      const processedError = await processError(error);
+      reject(processedError);
     }
   });
-};
+};