@sonoransoftware/sonoran.js 1.0.38 → 1.0.39

package/dist/constants.d.ts

@@ -395,6 +395,7 @@ export interface CMSERLCAddNewRecordPromiseResult {
     logId?: string;
 }
 export interface CMSERLCExecuteCommandPayload {
+    serverId: string;
     type: string;
     args: unknown;
     discordId: string | number;

package/dist/libs/rest/src/lib/REST.js

@@ -305,7 +305,16 @@ class REST extends events_1.EventEmitter {
                 if (!Array.isArray(payload)) {
                     throw new Error('ERLC_EXECUTE_COMMAND requires an array of command payloads.');
                 }
-                return payload;
+                return payload.map((cmd) => {
+                    const serverId = cmd.serverId;
+                    if (typeof serverId !== 'string' || serverId.length === 0) {
+                        throw new Error('ERLC_EXECUTE_COMMAND requires each command to include a valid serverId.');
+                    }
+                    return {
+                        ...cmd,
+                        serverId
+                    };
+                });
             }
             case 'RADIO_GET_COMMUNITY_CHANNELS':
             case 'RADIO_GET_CONNECTED_USERS':

package/dist/libs/rest/src/lib/utils/constants.js

@@ -514,7 +514,7 @@ exports.ERLCMSAPITypes = [
     },
     {
         type: "ERLC_EXECUTE_COMMAND",
-        path: "erlc/execute_command",
+        path: "erlc/command",
         method: "POST",
         minVersion: 0
     }

package/dist/managers/CMSManager.js

@@ -634,10 +634,34 @@ class CMSManager extends BaseManager_1.BaseManager {
         if (!Array.isArray(commands) || commands.length === 0) {
             throw new Error('ERLC execute command requires at least one command payload.');
         }
+        const normalizedCommands = commands.map((cmd) => {
+            const type = cmd.type;
+            const args = cmd.args;
+            const discordId = cmd.discordId;
+            const includesPlayerNameOrId = cmd.includesPlayerNameOrId;
+            const serverId = cmd.serverId;
+            if (!type) {
+                throw new Error('Each ERLC command requires a type.');
+            }
+            if (!discordId) {
+                throw new Error('Each ERLC command requires a discordId.');
+            }
+            if (typeof serverId !== 'string' || serverId.length === 0) {
+                throw new Error('Each ERLC command requires a serverId.');
+            }
+            return {
+                ...cmd,
+                type,
+                args,
+                discordId,
+                includesPlayerNameOrId,
+                serverId,
+            };
+        });
         return new Promise(async (resolve, reject) => {
             var _a;
             try {
-                const erlcExecuteCommandRequest = await ((_a = this.rest) === null || _a === void 0 ? void 0 : _a.request('ERLC_EXECUTE_COMMAND', commands));
+                const erlcExecuteCommandRequest = await ((_a = this.rest) === null || _a === void 0 ? void 0 : _a.request('ERLC_EXECUTE_COMMAND', normalizedCommands));
                 resolve({ success: true, data: erlcExecuteCommandRequest });
             }
             catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sonoransoftware/sonoran.js",
-  "version": "1.0.38",
+  "version": "1.0.39",
   "description": "Sonoran.js is a library that allows you to interact with the Sonoran CAD and Sonoran CMS API. Based off of and utilizes several Discord.js library techniques for ease of use.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/constants.ts

@@ -444,6 +444,7 @@ export interface CMSERLCAddNewRecordPromiseResult {
 }
 
 export interface CMSERLCExecuteCommandPayload {
+	serverId: string;
 	type: string;
 	args: unknown;
 	discordId: string | number;

package/src/libs/rest/src/lib/REST.ts

@@ -409,7 +409,16 @@ export class REST extends EventEmitter {
 				if (!Array.isArray(payload)) {
 					throw new Error('ERLC_EXECUTE_COMMAND requires an array of command payloads.');
 				}
-				return payload;
+				return payload.map((cmd) => {
+					const serverId = cmd.serverId;
+					if (typeof serverId !== 'string' || serverId.length === 0) {
+						throw new Error('ERLC_EXECUTE_COMMAND requires each command to include a valid serverId.');
+					}
+					return {
+						...cmd,
+						serverId
+					};
+				});
 			}
 			case 'RADIO_GET_COMMUNITY_CHANNELS':
 			case 'RADIO_GET_CONNECTED_USERS':

package/src/libs/rest/src/lib/utils/constants.ts

@@ -551,7 +551,7 @@ export const ERLCMSAPITypes: APITypeData[] = [
 	},
 	{
 		type: "ERLC_EXECUTE_COMMAND",
-		path: "erlc/execute_command",
+		path: "erlc/command",
 		method: "POST",
 		minVersion: 0
 	}

package/src/managers/CMSManager.ts

@@ -570,9 +570,36 @@ export class CMSManager extends BaseManager {
       throw new Error('ERLC execute command requires at least one command payload.');
     }
 
+    const normalizedCommands = commands.map((cmd) => {
+      const type = cmd.type;
+      const args = cmd.args;
+      const discordId = cmd.discordId;
+      const includesPlayerNameOrId = cmd.includesPlayerNameOrId;
+      const serverId = cmd.serverId;
+
+      if (!type) {
+        throw new Error('Each ERLC command requires a type.');
+      }
+      if (!discordId) {
+        throw new Error('Each ERLC command requires a discordId.');
+      }
+      if (typeof serverId !== 'string' || serverId.length === 0) {
+        throw new Error('Each ERLC command requires a serverId.');
+      }
+
+      return {
+        ...cmd,
+        type,
+        args,
+        discordId,
+        includesPlayerNameOrId,
+        serverId,
+      };
+    });
+
     return new Promise(async (resolve, reject) => {
       try {
-        const erlcExecuteCommandRequest: any = await this.rest?.request('ERLC_EXECUTE_COMMAND', commands);
+        const erlcExecuteCommandRequest: any = await this.rest?.request('ERLC_EXECUTE_COMMAND', normalizedCommands);
         resolve({ success: true, data: erlcExecuteCommandRequest });
       } catch (err) {
         if (err instanceof APIError) {