erlc-api 3.3.0 → 3.3.2-a

package/src/functions/server/getCommandLogs.js

@@ -1,47 +1,15 @@
-const { BASEURL } = require("../../constants.js");
-const { processError } = require("../../utils/errorHandler.js");
+const { requestServer } = require("./requestServer.js");
 
 /**
- * Retrieves command logs from a server
+ * Retrieves command logs from a server.
  * @param {string} serverToken - The server API key
  * @returns {Promise<Array>} Promise that resolves to array of command logs
  */
-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");
-
-      const headers = {
-        "Server-Key": serverToken,
-      };
-      if (config?.globalToken) {
-        headers["Authorization"] = config.globalToken;
-      }
-
-      const res = await fetch.default(`${BASEURL}/server/commandlogs`, {
-        headers: headers,
-        timeout: 10000, // 10 second timeout
-      });
-
-      if (!res.ok) {
-        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) {
-      const processedError = await processError(error);
-      reject(processedError);
-    }
+module.exports = (serverToken) =>
+  requestServer(serverToken, {
+    endpoint: "commandlogs",
+    includes: ["CommandLogs"],
+    defaultValue: [],
+    transform: (data) =>
+      Array.isArray(data?.CommandLogs) ? data.CommandLogs : [],
   });
-};

package/src/functions/server/getEmergencyCalls.js

@@ -0,0 +1,15 @@
+const { requestServer } = require("./requestServer.js");
+
+/**
+ * Retrieves emergency call logs from a server.
+ * @param {string} serverToken - The server API key
+ * @returns {Promise<Array>} Promise that resolves to array of emergency calls
+ */
+module.exports = (serverToken) =>
+  requestServer(serverToken, {
+    endpoint: "emergencycalls",
+    includes: ["EmergencyCalls"],
+    defaultValue: [],
+    transform: (data) =>
+      Array.isArray(data?.EmergencyCalls) ? data.EmergencyCalls : [],
+  });

package/src/functions/server/getJoinLogs.js

@@ -1,47 +1,14 @@
-const { BASEURL } = require("../../constants.js");
-const { processError } = require("../../utils/errorHandler.js");
+const { requestServer } = require("./requestServer.js");
 
 /**
- * Retrieves join/leave logs from a server
+ * Retrieves join/leave logs from a server.
  * @param {string} serverToken - The server API key
  * @returns {Promise<Array>} Promise that resolves to array of join logs
  */
-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");
-
-      const headers = {
-        "Server-Key": serverToken,
-      };
-      if (config?.globalToken) {
-        headers["Authorization"] = config.globalToken;
-      }
-
-      const res = await fetch.default(`${BASEURL}/server/joinlogs`, {
-        headers: headers,
-        timeout: 10000, // 10 second timeout
-      });
-
-      if (!res.ok) {
-        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) {
-      const processedError = await processError(error);
-      reject(processedError);
-    }
+module.exports = (serverToken) =>
+  requestServer(serverToken, {
+    endpoint: "joinlogs",
+    includes: ["JoinLogs"],
+    defaultValue: [],
+    transform: (data) => (Array.isArray(data?.JoinLogs) ? data.JoinLogs : []),
   });
-};

package/src/functions/server/getKillLogs.js

@@ -1,47 +1,14 @@
-const { BASEURL } = require("../../constants.js");
-const { processError } = require("../../utils/errorHandler.js");
+const { requestServer } = require("./requestServer.js");
 
 /**
- * Retrieves kill logs from a server
+ * Retrieves kill logs from a server.
  * @param {string} serverToken - The server API key
  * @returns {Promise<Array>} Promise that resolves to array of kill logs
  */
-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");
-
-      const headers = {
-        "Server-Key": serverToken,
-      };
-      if (config?.globalToken) {
-        headers["Authorization"] = config.globalToken;
-      }
-
-      const res = await fetch.default(`${BASEURL}/server/killlogs`, {
-        headers: headers,
-        timeout: 10000, // 10 second timeout
-      });
-
-      if (!res.ok) {
-        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) {
-      const processedError = await processError(error);
-      reject(processedError);
-    }
+module.exports = (serverToken) =>
+  requestServer(serverToken, {
+    endpoint: "killlogs",
+    includes: ["KillLogs"],
+    defaultValue: [],
+    transform: (data) => (Array.isArray(data?.KillLogs) ? data.KillLogs : []),
   });
-};

package/src/functions/server/getModcallLogs.js

@@ -1,47 +1,14 @@
-const { BASEURL } = require("../../constants.js");
-const { processError } = require("../../utils/errorHandler.js");
+const { requestServer } = require("./requestServer.js");
 
 /**
- * Retrieves moderator call logs from a server
+ * Retrieves moderator call logs from a server.
  * @param {string} serverToken - The server API key
  * @returns {Promise<Array>} Promise that resolves to array of modcall logs
  */
-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");
-
-      const headers = {
-        "Server-Key": serverToken,
-      };
-      if (config?.globalToken) {
-        headers["Authorization"] = config.globalToken;
-      }
-
-      const res = await fetch.default(`${BASEURL}/server/modcalls`, {
-        headers: headers,
-        timeout: 10000, // 10 second timeout
-      });
-
-      if (!res.ok) {
-        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) {
-      const processedError = await processError(error);
-      reject(processedError);
-    }
+module.exports = (serverToken) =>
+  requestServer(serverToken, {
+    endpoint: "modcalls",
+    includes: ["ModCalls"],
+    defaultValue: [],
+    transform: (data) => (Array.isArray(data?.ModCalls) ? data.ModCalls : []),
   });
-};

package/src/functions/server/getPlayers.js

@@ -1,47 +1,14 @@
-const { BASEURL } = require("../../constants.js");
-const { processError } = require("../../utils/errorHandler.js");
+const { requestServer } = require("./requestServer.js");
 
 /**
- * Retrieves current players from a server
+ * Retrieves current players from a server.
  * @param {string} serverToken - The server API key
  * @returns {Promise<Array>} Promise that resolves to array of current players
  */
-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");
-
-      const headers = {
-        "Server-Key": serverToken,
-      };
-      if (config?.globalToken) {
-        headers["Authorization"] = config.globalToken;
-      }
-
-      const res = await fetch.default(`${BASEURL}/server/players`, {
-        headers: headers,
-        timeout: 10000, // 10 second timeout
-      });
-
-      if (!res.ok) {
-        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) {
-      const processedError = await processError(error);
-      reject(processedError);
-    }
+module.exports = (serverToken) =>
+  requestServer(serverToken, {
+    endpoint: "players",
+    includes: ["Players"],
+    defaultValue: [],
+    transform: (data) => (Array.isArray(data?.Players) ? data.Players : []),
   });
-};

package/src/functions/server/getQueue.js

@@ -1,47 +1,14 @@
-const { BASEURL } = require("../../constants.js");
-const { processError } = require("../../utils/errorHandler.js");
+const { requestServer } = require("./requestServer.js");
 
 /**
- * Retrieves server queue information
+ * Retrieves server queue information.
  * @param {string} serverToken - The server API key
  * @returns {Promise<Array>} Promise that resolves to array of queued player IDs
  */
-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");
-
-      const headers = {
-        "Server-Key": serverToken,
-      };
-      if (config?.globalToken) {
-        headers["Authorization"] = config.globalToken;
-      }
-
-      const res = await fetch.default(`${BASEURL}/server/queue`, {
-        headers: headers,
-        timeout: 10000, // 10 second timeout
-      });
-
-      if (!res.ok) {
-        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) {
-      const processedError = await processError(error);
-      reject(processedError);
-    }
+module.exports = (serverToken) =>
+  requestServer(serverToken, {
+    endpoint: "queue",
+    includes: ["Queue"],
+    defaultValue: [],
+    transform: (data) => (Array.isArray(data?.Queue) ? data.Queue : []),
   });
-};

package/src/functions/server/getServer.js

@@ -1,100 +1,82 @@
-const { BASEURL, Vanity } = require("../../constants.js");
-const { processError } = require("../../utils/errorHandler.js");
+const { Vanity } = require("../../constants.js");
+const { requestServer } = require("./requestServer.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"));
+async function getUsername(fetch, userId) {
+  try {
+    const response = await fetch(`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}`);
+      return `User:${userId}`;
     }
 
-    try {
-      const fetch = await import("node-fetch");
-      const { config } = await import("../../erlc.js");
+    return userData.name;
+  } catch (error) {
+    console.warn(`Warning: Error fetching username for ID: ${userId}`, error);
+    return `User:${userId}`;
+  }
+}
 
-      const headers = {
-        "Server-Key": serverToken,
-      };
-      if (config?.globalToken) {
-        headers["Authorization"] = config.globalToken;
-      }
+function normalizeIncludes(options = {}) {
+  const includeMap = {
+    players: "Players",
+    staff: "Staff",
+    joinLogs: "JoinLogs",
+    queue: "Queue",
+    killLogs: "KillLogs",
+    commandLogs: "CommandLogs",
+    modCalls: "ModCalls",
+    emergencyCalls: "EmergencyCalls",
+    vehicles: "Vehicles",
+  };
 
-      const res = await fetch.default(`${BASEURL}/server`, {
-        headers: headers,
-        timeout: 10000, // 10 second timeout
-      });
+  return Object.entries(includeMap)
+    .filter(([option]) => options[option])
+    .map(([, include]) => include);
+}
 
-      if (!res.ok) {
-        const errorData = await res
-          .json()
-          .catch(() => ({ error: "Unknown API error" }));
-        const error = await processError(res, errorData);
-        return reject(error);
-      }
+module.exports = (serverToken, options = {}) => {
+  const includes = normalizeIncludes(options);
 
-      const data = await res.json();
-
-      const getUsername = async (userId) => {
-        try {
-          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}`);
-            return `User:${userId}`; // Fallback format
-          }
-          return userData.name;
-        } catch (error) {
-          console.warn(
-            `Warning: Error fetching username for ID: ${userId}`,
-            error
-          );
-          return `User:${userId}`; // Fallback format
-        }
-      };
+  return requestServer(serverToken, {
+    endpoint: "server",
+    includes,
+    transform: async (data) => {
+      const fetch =
+        typeof globalThis.fetch === "function"
+          ? globalThis.fetch
+          : (await import("node-fetch")).default;
 
       try {
-        // Get owner username
-        const ownerUsername = await getUsername(data.OwnerId);
-
-        // Get co-owner usernames (handle empty array case)
+        const ownerUsername = await getUsername(fetch, data.OwnerId);
         const coOwnerUsernames =
           data.CoOwnerIds && data.CoOwnerIds.length > 0
-            ? await Promise.all(data.CoOwnerIds.map(getUsername))
+            ? await Promise.all(data.CoOwnerIds.map((id) => getUsername(fetch, id)))
             : [];
 
-        // Create vanity URL
-        const vanityURL = `${Vanity}${data.JoinKey}`;
-
-        // Add the new properties to the response
         const enhancedData = {
           ...data,
           OwnerUsername: ownerUsername,
           CoOwnerUsernames: coOwnerUsernames,
-          VanityURL: vanityURL,
+          VanityURL: `${Vanity}${data.JoinKey}`,
         };
 
-        // Remove the original ID properties as they're now converted to usernames
         delete enhancedData.OwnerId;
         delete enhancedData.CoOwnerIds;
 
-        resolve(enhancedData);
+        return 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
+          error,
         );
-        const fallbackData = {
+
+        return {
           ...data,
           VanityURL: `${Vanity}${data.JoinKey}`,
         };
-        resolve(fallbackData);
       }
-    } catch (error) {
-      const processedError = await processError(error);
-      reject(processedError);
-    }
+    },
   });
 };

package/src/functions/server/getStaff.js

@@ -1,47 +1,14 @@
-const { BASEURL } = require("../../constants.js");
-const { processError } = require("../../utils/errorHandler.js");
+const { requestServer } = require("./requestServer.js");
 
 /**
- * Retrieves server staff information
+ * Retrieves server staff information.
  * @param {string} serverToken - The server API key
  * @returns {Promise<Object>} Promise that resolves to server staff object
  */
-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");
-
-      const headers = {
-        "Server-Key": serverToken,
-      };
-      if (config?.globalToken) {
-        headers["Authorization"] = config.globalToken;
-      }
-
-      const res = await fetch.default(`${BASEURL}/server/staff`, {
-        headers: headers,
-        timeout: 10000, // 10 second timeout
-      });
-
-      if (!res.ok) {
-        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) {
-      const processedError = await processError(error);
-      reject(processedError);
-    }
+module.exports = (serverToken) =>
+  requestServer(serverToken, {
+    endpoint: "staff",
+    includes: ["Staff"],
+    defaultValue: { Admins: {}, Mods: {}, Helpers: {} },
+    transform: (data) => data?.Staff || { Admins: {}, Mods: {}, Helpers: {} },
   });
-};

package/src/functions/server/getVehicles.js

@@ -1,47 +1,14 @@
-const { BASEURL } = require("../../constants.js");
-const { processError } = require("../../utils/errorHandler.js");
+const { requestServer } = require("./requestServer.js");
 
 /**
- * Retrieves server vehicles information
+ * Retrieves server vehicles information.
  * @param {string} serverToken - The server API key
  * @returns {Promise<Array>} Promise that resolves to array of vehicles
  */
-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");
-
-      const headers = {
-        "Server-Key": serverToken,
-      };
-      if (config?.globalToken) {
-        headers["Authorization"] = config.globalToken;
-      }
-
-      const res = await fetch.default(`${BASEURL}/server/vehicles`, {
-        headers: headers,
-        timeout: 10000, // 10 second timeout
-      });
-
-      if (!res.ok) {
-        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) {
-      const processedError = await processError(error);
-      reject(processedError);
-    }
+module.exports = (serverToken) =>
+  requestServer(serverToken, {
+    endpoint: "vehicles",
+    includes: ["Vehicles"],
+    defaultValue: [],
+    transform: (data) => (Array.isArray(data?.Vehicles) ? data.Vehicles : []),
   });
-};