@sonoransoftware/sonoran.js 1.0.61 → 1.0.63

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

@@ -251,13 +251,14 @@ class REST extends events_1.EventEmitter {
             case 'UNIT_STATUS': {
                 const payload = args[0];
                 if (payload && typeof payload === 'object' && !Array.isArray(payload)) {
-                    const { apiId, account, status, serverId } = payload;
-                    return { apiId, account, status, serverId };
+                    const { apiId, account, status, serverId, identIds } = payload;
+                    return { apiId, account, status, serverId, identIds };
                 }
                 return {
                     apiId: args[0],
                     status: args[1],
-                    serverId: args[2]
+                    serverId: args[2],
+                    identIds: args[3]
                 };
             }
             case 'UNIT_PANIC': {
@@ -284,13 +285,15 @@ class REST extends events_1.EventEmitter {
                     return payload;
                 }
                 const unitsOrAccount = args[2];
+                const identIds = args[3];
                 const account = typeof unitsOrAccount === 'string' && !Array.isArray(unitsOrAccount) ? unitsOrAccount : undefined;
                 const units = Array.isArray(unitsOrAccount) ? unitsOrAccount : undefined;
                 return {
                     serverId: args[0],
                     callId: args[1],
                     units,
-                    account
+                    account,
+                    identIds
                 };
             }
             case 'DETACH_UNIT': {

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

@@ -262,6 +262,7 @@ export interface CADAttachUnitsStruct {
     callId: number;
     units?: string[];
     account?: string;
+    identIds?: number[];
 }
 export interface CADDetachUnitsStruct {
     serverId: number;
@@ -323,6 +324,7 @@ export interface CADUnitStatusStruct {
     account?: string;
     status: number;
     serverId: number;
+    identIds?: number[];
 }
 export interface RESTTypedAPIDataStructs {
     GET_SERVERS: [];
@@ -401,7 +403,8 @@ export interface RESTTypedAPIDataStructs {
     UNIT_STATUS: [
         apiId: string | undefined,
         status: number,
-        serverId: number
+        serverId: number,
+        identIds?: number[]
     ] | [
         data: CADUnitStatusStruct
     ];
@@ -422,7 +425,8 @@ export interface RESTTypedAPIDataStructs {
     ATTACH_UNIT: [
         serverId: number,
         callId: number,
-        units: string[]
+        units: string[],
+        identIds?: number[]
     ] | [
         data: CADAttachUnitsStruct
     ];
@@ -753,6 +757,7 @@ export type PossibleRequestData = undefined | {
     callId: number;
     units?: string[];
     account?: string;
+    identIds?: number[];
 } | {
     serverId: number;
     units?: string[];

package/dist/managers/CADManager.d.ts

@@ -165,12 +165,13 @@ export declare class CADManager extends BaseManager {
     /**
      * Updates a unit's status.
      */
-    setUnitStatus(apiId: string | undefined, status: number, serverId: number): Promise<globalTypes.CADStandardResponse>;
+    setUnitStatus(apiId: string | undefined, status: number, serverId: number, identIds?: number[]): Promise<globalTypes.CADStandardResponse>;
     setUnitStatus(params: {
         apiId?: string;
         account?: string;
         status: number;
         serverId: number;
+        identIds?: number[];
     }): Promise<globalTypes.CADStandardResponse>;
     /**
      * Retrieves live map blips for a CAD server.
@@ -226,7 +227,7 @@ export declare class CADManager extends BaseManager {
     /**
      * Attaches units to an existing dispatch call.
      */
-    attachUnits(serverId: number, callId: number, unitsOrAccount: string[] | string): Promise<globalTypes.CADStandardResponse>;
+    attachUnits(serverId: number, callId: number, unitsOrAccount: string[] | string, identIds?: number[]): Promise<globalTypes.CADStandardResponse>;
     attachUnits(params: CADAttachUnitsStruct): Promise<globalTypes.CADStandardResponse>;
     /**
      * Detaches units from dispatch calls.

package/dist/managers/CADManager.js

@@ -424,30 +424,41 @@ class CADManager extends BaseManager_1.BaseManager {
         }
         return this.executeCadRequest('UNIT_PANIC', { apiId, account, isPanic: resolvedPanic });
     }
-    async setUnitStatus(apiIdOrParams, status, serverId) {
+    async setUnitStatus(apiIdOrParams, status, serverId, identIds) {
         let payload;
         if (apiIdOrParams && typeof apiIdOrParams === 'object' && !Array.isArray(apiIdOrParams)) {
             payload = {
                 apiId: apiIdOrParams.apiId,
                 account: apiIdOrParams.account,
                 status: apiIdOrParams.status,
-                serverId: apiIdOrParams.serverId
+                serverId: apiIdOrParams.serverId,
+                identIds: apiIdOrParams.identIds
             };
         }
         else {
-            payload = { apiId: apiIdOrParams, status: status, serverId: serverId };
+            payload = { apiId: apiIdOrParams, status: status, serverId: serverId, identIds };
         }
-        const { apiId, account, status: resolvedStatus, serverId: resolvedServerId } = payload;
+        const { apiId, account, status: resolvedStatus, serverId: resolvedServerId, identIds: resolvedIdentIds } = payload;
         if (!Number.isInteger(resolvedServerId)) {
             throw new Error('serverId must be an integer when updating unit status.');
         }
         if (resolvedStatus === undefined) {
             throw new Error('status is required when updating unit status.');
         }
-        if (!apiId && !account) {
-            throw new Error('Either apiId or account is required when updating unit status.');
+        if (resolvedIdentIds !== undefined && (!Array.isArray(resolvedIdentIds) || resolvedIdentIds.some((id) => !Number.isInteger(id)))) {
+            throw new Error('identIds must be an array of integers when updating unit status.');
+        }
+        const hasIdentIds = Array.isArray(resolvedIdentIds) && resolvedIdentIds.length > 0;
+        if (!apiId && !account && !hasIdentIds) {
+            throw new Error('Either apiId, account, or identIds is required when updating unit status.');
         }
-        return this.executeCadRequest('UNIT_STATUS', { apiId, account, status: resolvedStatus, serverId: resolvedServerId });
+        return this.executeCadRequest('UNIT_STATUS', {
+            apiId,
+            account,
+            status: resolvedStatus,
+            serverId: resolvedServerId,
+            identIds: hasIdentIds ? resolvedIdentIds : undefined
+        });
     }
     /**
      * Retrieves live map blips for a CAD server.
@@ -552,7 +563,7 @@ class CADManager extends BaseManager_1.BaseManager {
         };
         return this.executeCadRequest('NEW_DISPATCH', payload);
     }
-    async attachUnits(serverIdOrParams, callId, unitsOrAccount) {
+    async attachUnits(serverIdOrParams, callId, unitsOrAccount, identIds) {
         let payload;
         if (serverIdOrParams && typeof serverIdOrParams === 'object') {
             payload = { ...serverIdOrParams };
@@ -565,19 +576,30 @@ class CADManager extends BaseManager_1.BaseManager {
                     ? { units: unitsOrAccount }
                     : typeof unitsOrAccount === 'string'
                         ? { account: unitsOrAccount }
-                        : {})
+                        : {}),
+                ...(Array.isArray(identIds) ? { identIds } : {})
             };
         }
-        const { serverId, callId: resolvedCallId, units, account } = payload;
+        const { serverId, callId: resolvedCallId, units, account, identIds: resolvedIdentIds } = payload;
         if (!Number.isInteger(serverId) || !Number.isInteger(resolvedCallId)) {
             throw new Error('serverId and callId must be integers when attaching units.');
         }
         const hasUnits = Array.isArray(units) && units.length > 0;
         const hasAccount = typeof account === 'string' && account.length > 0;
-        if (!hasUnits && !hasAccount) {
-            throw new Error('Either units or account is required when attaching units.');
-        }
-        return this.executeCadRequest('ATTACH_UNIT', { serverId, callId: resolvedCallId, units: hasUnits ? units : undefined, account: hasAccount ? account : undefined });
+        if (resolvedIdentIds !== undefined && (!Array.isArray(resolvedIdentIds) || resolvedIdentIds.some((id) => !Number.isInteger(id)))) {
+            throw new Error('identIds must be an array of integers when attaching units.');
+        }
+        const hasIdentIds = Array.isArray(resolvedIdentIds) && resolvedIdentIds.length > 0;
+        if (!hasUnits && !hasAccount && !hasIdentIds) {
+            throw new Error('Either units, account, or identIds is required when attaching units.');
+        }
+        return this.executeCadRequest('ATTACH_UNIT', {
+            serverId,
+            callId: resolvedCallId,
+            units: hasUnits ? units : undefined,
+            account: hasAccount ? account : undefined,
+            identIds: hasIdentIds ? resolvedIdentIds : undefined
+        });
     }
     async detachUnits(serverIdOrParams, unitsOrAccount) {
         let payload;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sonoransoftware/sonoran.js",
-  "version": "1.0.61",
+  "version": "1.0.63",
   "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/readme.md

@@ -105,7 +105,7 @@ const lookupByAccount = await instance.cad.lookupRecords({ account: 'd5663516-ee
 - **`getIdentifiers(apiId)`**
 - **`modifyIdentifier(change)`** / **`setIdentifier(apiId?, identId)`**
 - **`setIdentifiersToGroup(entries)`** - assigns identifiers to a group name (empty string clears).
-- **`setUnitPanic({ apiId?, account?, isPanic })`** / **`setUnitStatus({ status, serverId, apiId?, account? })`**
+- **`setUnitPanic({ apiId?, account?, isPanic })`** / **`setUnitStatus({ status, serverId, apiId?, account?, identIds? })`**
 - **`getActiveUnits(options)`** - direct CAD fetch for active units.
 - **`kickUnit(apiId?, reason, serverId)`**
 - **`updateUnitLocations(locations)`**
@@ -115,6 +115,8 @@ const lookupByAccount = await instance.cad.lookupRecords({ account: 'd5663516-ee
 await instance.cad.setUnitStatus({ account: 'd5663516-ee35-11e9-9714-5600023b2434', status: 2, serverId: 1 });
 // Legacy positional call using an API ID
 await instance.cad.setUnitStatus('1234567890', 2, 1);
+// Update status by identifier IDs
+await instance.cad.setUnitStatus({ identIds: [101, 102], status: 2, serverId: 1 });
 // Trigger panic using account UUID
 await instance.cad.setUnitPanic({ account: '91de0ce8-c571-11e9-9714-5600023b2434', isPanic: true });
 ```

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

@@ -355,18 +355,20 @@ export class REST extends EventEmitter {
 			case 'UNIT_STATUS': {
 				const payload = args[0];
 				if (payload && typeof payload === 'object' && !Array.isArray(payload)) {
-					const { apiId, account, status, serverId } = payload as {
+					const { apiId, account, status, serverId, identIds } = payload as {
 						apiId?: string;
 						account?: string;
 						status: number;
 						serverId: number;
+						identIds?: number[];
 					};
-					return { apiId, account, status, serverId };
+					return { apiId, account, status, serverId, identIds };
 				}
 				return {
 					apiId: args[0],
 					status: args[1],
-					serverId: args[2]
+					serverId: args[2],
+					identIds: args[3]
 				};
 			}
 			case 'UNIT_PANIC': {
@@ -393,13 +395,15 @@ export class REST extends EventEmitter {
 					return payload;
 				}
 				const unitsOrAccount = args[2];
+				const identIds = args[3];
 				const account = typeof unitsOrAccount === 'string' && !Array.isArray(unitsOrAccount) ? unitsOrAccount : undefined;
 				const units = Array.isArray(unitsOrAccount) ? unitsOrAccount : undefined;
 				return {
 					serverId: args[0],
 					callId: args[1],
 					units,
-					account
+					account,
+					identIds
 				};
 			}
 			case 'DETACH_UNIT': {

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

@@ -957,6 +957,7 @@ export interface CADAttachUnitsStruct {
 	callId: number;
 	units?: string[];
 	account?: string;
+	identIds?: number[];
 }
 
 export interface CADDetachUnitsStruct {
@@ -1023,6 +1024,7 @@ export interface CADUnitStatusStruct {
 	account?: string;
 	status: number;
 	serverId: number;
+	identIds?: number[];
 }
 
 export interface RESTTypedAPIDataStructs {
@@ -1101,7 +1103,8 @@ export interface RESTTypedAPIDataStructs {
 	UNIT_STATUS: [
 		apiId: string | undefined,
 		status: number,
-		serverId: number
+		serverId: number,
+		identIds?: number[]
 	] | [
 		data: CADUnitStatusStruct
 	];
@@ -1122,7 +1125,8 @@ export interface RESTTypedAPIDataStructs {
 	ATTACH_UNIT: [
 		serverId: number,
 		callId: number,
-		units: string[]
+		units: string[],
+		identIds?: number[]
 	] | [
 		data: CADAttachUnitsStruct
 	];
@@ -1480,6 +1484,7 @@ export type PossibleRequestData =
 		callId: number;
 		units?: string[];
 		account?: string;
+		identIds?: number[];
 	} |
 	{
 		serverId: number;

package/src/managers/CADManager.ts

@@ -459,12 +459,13 @@ export class CADManager extends BaseManager {
   /**
    * Updates a unit's status.
    */
-  public async setUnitStatus(apiId: string | undefined, status: number, serverId: number): Promise<globalTypes.CADStandardResponse>;
-  public async setUnitStatus(params: { apiId?: string; account?: string; status: number; serverId: number }): Promise<globalTypes.CADStandardResponse>;
+  public async setUnitStatus(apiId: string | undefined, status: number, serverId: number, identIds?: number[]): Promise<globalTypes.CADStandardResponse>;
+  public async setUnitStatus(params: { apiId?: string; account?: string; status: number; serverId: number; identIds?: number[] }): Promise<globalTypes.CADStandardResponse>;
   public async setUnitStatus(
-    apiIdOrParams: string | undefined | { apiId?: string; account?: string; status: number; serverId: number },
+    apiIdOrParams: string | undefined | { apiId?: string; account?: string; status: number; serverId: number; identIds?: number[] },
     status?: number,
-    serverId?: number
+    serverId?: number,
+    identIds?: number[]
   ): Promise<globalTypes.CADStandardResponse> {
     let payload: CADUnitStatusStruct;
     if (apiIdOrParams && typeof apiIdOrParams === 'object' && !Array.isArray(apiIdOrParams)) {
@@ -472,22 +473,33 @@ export class CADManager extends BaseManager {
         apiId: apiIdOrParams.apiId,
         account: apiIdOrParams.account,
         status: apiIdOrParams.status,
-        serverId: apiIdOrParams.serverId
+        serverId: apiIdOrParams.serverId,
+        identIds: apiIdOrParams.identIds
       };
     } else {
-      payload = { apiId: apiIdOrParams as string | undefined, status: status as number, serverId: serverId as number };
+      payload = { apiId: apiIdOrParams as string | undefined, status: status as number, serverId: serverId as number, identIds };
     }
-    const { apiId, account, status: resolvedStatus, serverId: resolvedServerId } = payload;
+    const { apiId, account, status: resolvedStatus, serverId: resolvedServerId, identIds: resolvedIdentIds } = payload;
     if (!Number.isInteger(resolvedServerId)) {
       throw new Error('serverId must be an integer when updating unit status.');
     }
     if (resolvedStatus === undefined) {
       throw new Error('status is required when updating unit status.');
     }
-    if (!apiId && !account) {
-      throw new Error('Either apiId or account is required when updating unit status.');
+    if (resolvedIdentIds !== undefined && (!Array.isArray(resolvedIdentIds) || resolvedIdentIds.some((id) => !Number.isInteger(id)))) {
+      throw new Error('identIds must be an array of integers when updating unit status.');
+    }
+    const hasIdentIds = Array.isArray(resolvedIdentIds) && resolvedIdentIds.length > 0;
+    if (!apiId && !account && !hasIdentIds) {
+      throw new Error('Either apiId, account, or identIds is required when updating unit status.');
     }
-    return this.executeCadRequest('UNIT_STATUS', { apiId, account, status: resolvedStatus, serverId: resolvedServerId });
+    return this.executeCadRequest('UNIT_STATUS', {
+      apiId,
+      account,
+      status: resolvedStatus,
+      serverId: resolvedServerId,
+      identIds: hasIdentIds ? resolvedIdentIds : undefined
+    });
   }
 
   /**
@@ -607,12 +619,13 @@ export class CADManager extends BaseManager {
   /**
    * Attaches units to an existing dispatch call.
    */
-  public async attachUnits(serverId: number, callId: number, unitsOrAccount: string[] | string): Promise<globalTypes.CADStandardResponse>;
+  public async attachUnits(serverId: number, callId: number, unitsOrAccount: string[] | string, identIds?: number[]): Promise<globalTypes.CADStandardResponse>;
   public async attachUnits(params: CADAttachUnitsStruct): Promise<globalTypes.CADStandardResponse>;
   public async attachUnits(
     serverIdOrParams: number | CADAttachUnitsStruct,
     callId?: number,
-    unitsOrAccount?: string[] | string
+    unitsOrAccount?: string[] | string,
+    identIds?: number[]
   ): Promise<globalTypes.CADStandardResponse> {
     let payload: CADAttachUnitsStruct;
     if (serverIdOrParams && typeof serverIdOrParams === 'object') {
@@ -625,20 +638,31 @@ export class CADManager extends BaseManager {
           ? { units: unitsOrAccount }
           : typeof unitsOrAccount === 'string'
             ? { account: unitsOrAccount }
-            : {})
+            : {}),
+        ...(Array.isArray(identIds) ? { identIds } : {})
       };
     }
 
-    const { serverId, callId: resolvedCallId, units, account } = payload;
+    const { serverId, callId: resolvedCallId, units, account, identIds: resolvedIdentIds } = payload;
     if (!Number.isInteger(serverId) || !Number.isInteger(resolvedCallId)) {
       throw new Error('serverId and callId must be integers when attaching units.');
     }
     const hasUnits = Array.isArray(units) && units.length > 0;
     const hasAccount = typeof account === 'string' && account.length > 0;
-    if (!hasUnits && !hasAccount) {
-      throw new Error('Either units or account is required when attaching units.');
-    }
-    return this.executeCadRequest('ATTACH_UNIT', { serverId, callId: resolvedCallId, units: hasUnits ? units : undefined, account: hasAccount ? account : undefined });
+    if (resolvedIdentIds !== undefined && (!Array.isArray(resolvedIdentIds) || resolvedIdentIds.some((id) => !Number.isInteger(id)))) {
+      throw new Error('identIds must be an array of integers when attaching units.');
+    }
+    const hasIdentIds = Array.isArray(resolvedIdentIds) && resolvedIdentIds.length > 0;
+    if (!hasUnits && !hasAccount && !hasIdentIds) {
+      throw new Error('Either units, account, or identIds is required when attaching units.');
+    }
+    return this.executeCadRequest('ATTACH_UNIT', {
+      serverId,
+      callId: resolvedCallId,
+      units: hasUnits ? units : undefined,
+      account: hasAccount ? account : undefined,
+      identIds: hasIdentIds ? resolvedIdentIds : undefined
+    });
   }
 
   /**