@sonoransoftware/sonoran.js 1.0.42 → 1.0.46

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

@@ -195,6 +195,18 @@ class REST extends events_1.EventEmitter {
                     type: args[5]
                 };
             }
+            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 };
+                }
+                return {
+                    apiId: args[0],
+                    status: args[1],
+                    serverId: args[2]
+                };
+            }
             case 'CHECK_COM_APIID': {
                 return {
                     apiId: args[0]
@@ -254,6 +266,10 @@ class REST extends events_1.EventEmitter {
                 };
             }
             case 'LOOKUP': {
+                const payload = args[0];
+                if (payload && typeof payload === 'object' && !Array.isArray(payload)) {
+                    return args;
+                }
                 return {
                     id: args[0],
                     uuid: args[1]
@@ -348,8 +364,9 @@ class REST extends events_1.EventEmitter {
             }
             case 'RADIO_SET_USER_CHANNELS': {
                 return {
-                    identity: args[0],
-                    options: (_c = args[1]) !== null && _c !== void 0 ? _c : {}
+                    roomId: args[0],
+                    identity: args[1],
+                    options: (_c = args[2]) !== null && _c !== void 0 ? _c : {}
                 };
             }
             case 'RADIO_SET_USER_DISPLAY_NAME': {

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

@@ -130,7 +130,15 @@ class RequestManager extends events_1.EventEmitter {
                     break;
                 }
                 case 'LOOKUP': {
-                    apiData.data.data = [clonedData[0]];
+                    if (Array.isArray(clonedData)) {
+                        apiData.data.data = clonedData.length > 0 ? clonedData : [];
+                    }
+                    else if (clonedData !== undefined && clonedData !== null) {
+                        apiData.data.data = [clonedData];
+                    }
+                    else {
+                        apiData.data.data = [];
+                    }
                     break;
                 }
                 case 'SET_ACCOUNT_PERMISSIONS': {
@@ -238,7 +246,7 @@ class RequestManager extends events_1.EventEmitter {
         return apiData;
     }
     static resolveRadioRequest(instance, apiURL, apiType, request, apiData) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         if (!apiURL || typeof apiURL !== 'string') {
             throw new Error('Radio API URL could not be resolved for request.');
         }
@@ -313,12 +321,20 @@ class RequestManager extends events_1.EventEmitter {
             }
             case 'RADIO_SET_USER_CHANNELS': {
                 const auth = ensureAuth();
+                const roomIdRaw = (_b = payload === null || payload === void 0 ? void 0 : payload.roomId) !== null && _b !== void 0 ? _b : payload === null || payload === void 0 ? void 0 : payload.roomID;
+                if (roomIdRaw === undefined) {
+                    throw new Error('roomId is required for RADIO_SET_USER_CHANNELS requests.');
+                }
+                const roomIdNumeric = typeof roomIdRaw === 'number' ? roomIdRaw : Number(roomIdRaw);
+                if (Number.isNaN(roomIdNumeric)) {
+                    throw new Error('roomId must be a number for RADIO_SET_USER_CHANNELS requests.');
+                }
                 const identity = payload === null || payload === void 0 ? void 0 : payload.identity;
                 if (!identity) {
                     throw new Error('identity is required for RADIO_SET_USER_CHANNELS requests.');
                 }
-                const options = (_b = payload === null || payload === void 0 ? void 0 : payload.options) !== null && _b !== void 0 ? _b : {};
-                path = `${apiType.path}/${auth.encodedId}/${auth.encodedKey}/${encodeSegment(identity)}`;
+                const options = (_c = payload === null || payload === void 0 ? void 0 : payload.options) !== null && _c !== void 0 ? _c : {};
+                path = `${apiType.path}/${auth.encodedId}/${auth.encodedKey}/${encodeSegment(roomIdNumeric)}/${encodeSegment(identity)}`;
                 method = 'POST';
                 const requestBody = {};
                 if ((options === null || options === void 0 ? void 0 : options.transmit) !== undefined) {
@@ -379,7 +395,7 @@ class RequestManager extends events_1.EventEmitter {
                     key: auth.key,
                     locations
                 };
-                const token = (_c = payload === null || payload === void 0 ? void 0 : payload.token) !== null && _c !== void 0 ? _c : auth.key;
+                const token = (_d = payload === null || payload === void 0 ? void 0 : payload.token) !== null && _d !== void 0 ? _d : auth.key;
                 if (token) {
                     headers.Authorization = `Bearer ${token}`;
                 }

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

@@ -161,6 +161,7 @@ export interface CADLookupByIntStruct {
 }
 export interface CADLookupStruct {
     apiId?: string;
+    account?: string;
     types: number[];
     first: string;
     last: string;
@@ -273,6 +274,12 @@ export interface CADUnitLocationStruct {
     apiId: string;
     location: string;
 }
+export interface CADUnitStatusStruct {
+    apiId?: string;
+    account?: string;
+    status: number;
+    serverId: number;
+}
 export interface RESTTypedAPIDataStructs {
     GET_SERVERS: [];
     SET_SERVERS: [
@@ -348,6 +355,8 @@ export interface RESTTypedAPIDataStructs {
         apiId: string | undefined,
         status: number,
         serverId: number
+    ] | [
+        data: CADUnitStatusStruct
     ];
     GET_BLIPS: [serverId: number];
     ADD_BLIP: [data: CADAddBlipStruct[]];
@@ -575,6 +584,7 @@ export interface RESTTypedAPIDataStructs {
         identity: string
     ];
     RADIO_SET_USER_CHANNELS: [
+        roomId: number,
         identity: string,
         options?: RadioSetUserChannelsOptions
     ];
@@ -636,7 +646,8 @@ export type PossibleRequestData = undefined | {
     apiId: string;
     isPanic: boolean;
 } | {
-    apiId: string;
+    apiId?: string;
+    account?: string;
     status: number;
     serverId: number;
 } | {

package/dist/managers/CADManager.d.ts

@@ -90,6 +90,7 @@ export declare class CADManager extends BaseManager {
     lookupByInt(data: CADLookupByIntStruct): Promise<globalTypes.CADStandardResponse>;
     /**
      * Executes a CAD lookup using first/last name, plate, or other values.
+     * Supports identifying the requester via `apiId` or `account` (UUID).
      */
     lookupRecords(data: CADLookupStruct): Promise<globalTypes.CADStandardResponse>;
     /**
@@ -160,6 +161,12 @@ export declare class CADManager extends BaseManager {
      * Updates a unit's status.
      */
     setUnitStatus(apiId: string | undefined, status: number, serverId: number): Promise<globalTypes.CADStandardResponse>;
+    setUnitStatus(params: {
+        apiId?: string;
+        account?: string;
+        status: number;
+        serverId: number;
+    }): Promise<globalTypes.CADStandardResponse>;
     /**
      * Retrieves live map blips for a CAD server.
      */

package/dist/managers/CADManager.js

@@ -243,6 +243,7 @@ class CADManager extends BaseManager_1.BaseManager {
     }
     /**
      * Executes a CAD lookup using first/last name, plate, or other values.
+     * Supports identifying the requester via `apiId` or `account` (UUID).
      */
     async lookupRecords(data) {
         return this.executeCadRequest('LOOKUP', data);
@@ -382,14 +383,30 @@ class CADManager extends BaseManager_1.BaseManager {
     async setUnitPanic(apiId, isPanic) {
         return this.executeCadRequest('UNIT_PANIC', apiId, isPanic);
     }
-    /**
-     * Updates a unit's status.
-     */
-    async setUnitStatus(apiId, status, serverId) {
-        if (!Number.isInteger(serverId)) {
+    async setUnitStatus(apiIdOrParams, status, serverId) {
+        let payload;
+        if (apiIdOrParams && typeof apiIdOrParams === 'object' && !Array.isArray(apiIdOrParams)) {
+            payload = {
+                apiId: apiIdOrParams.apiId,
+                account: apiIdOrParams.account,
+                status: apiIdOrParams.status,
+                serverId: apiIdOrParams.serverId
+            };
+        }
+        else {
+            payload = { apiId: apiIdOrParams, status: status, serverId: serverId };
+        }
+        const { apiId, account, status: resolvedStatus, serverId: resolvedServerId } = payload;
+        if (!Number.isInteger(resolvedServerId)) {
             throw new Error('serverId must be an integer when updating unit status.');
         }
-        return this.executeCadRequest('UNIT_STATUS', apiId, status, serverId);
+        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.');
+        }
+        return this.executeCadRequest('UNIT_STATUS', { apiId, account, status: resolvedStatus, serverId: resolvedServerId });
     }
     /**
      * Retrieves live map blips for a CAD server.

package/dist/managers/RadioManager.d.ts

@@ -27,10 +27,11 @@ export declare class RadioManager extends BaseManager {
     getConnectedUser(roomId: number, identity: string): Promise<globalTypes.RadioGetConnectedUserPromiseResult>;
     /**
      * Updates a user's transmit and scanned channel configuration.
+     * @param {number} roomId Multi-server room id.
      * @param {string} identity The user's UUID.
      * @param {RadioSetUserChannelsOptions} options Transmit and scan channel configuration.
      */
-    setUserChannels(identity: string, options?: globalTypes.RadioSetUserChannelsOptions): Promise<globalTypes.RadioSetUserChannelsPromiseResult>;
+    setUserChannels(roomId: number, identity: string, options?: globalTypes.RadioSetUserChannelsOptions): Promise<globalTypes.RadioSetUserChannelsPromiseResult>;
     /**
      * Updates a user's display name.
      * @param {string} accId The user's account UUID.

package/dist/managers/RadioManager.js

@@ -115,14 +115,15 @@ class RadioManager extends BaseManager_1.BaseManager {
     }
     /**
      * Updates a user's transmit and scanned channel configuration.
+     * @param {number} roomId Multi-server room id.
      * @param {string} identity The user's UUID.
      * @param {RadioSetUserChannelsOptions} options Transmit and scan channel configuration.
      */
-    async setUserChannels(identity, options = {}) {
+    async setUserChannels(roomId, identity, options = {}) {
         return new Promise(async (resolve, reject) => {
             var _a, _b;
             try {
-                const response = await ((_a = this.rest) === null || _a === void 0 ? void 0 : _a.request('RADIO_SET_USER_CHANNELS', identity, options));
+                const response = await ((_a = this.rest) === null || _a === void 0 ? void 0 : _a.request('RADIO_SET_USER_CHANNELS', roomId, identity, options));
                 resolve({ success: true, result: (_b = response === null || response === void 0 ? void 0 : response.result) !== null && _b !== void 0 ? _b : response });
             }
             catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sonoransoftware/sonoran.js",
-  "version": "1.0.42",
+  "version": "1.0.46",
   "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

@@ -94,6 +94,7 @@ const permissionUpdate = await instance.cad.setAccountPermissions({ apiId: '1234
 ```js
 await instance.cad.createRecord({ user: '1234567890', useDictionary: true, recordTypeId: 2, replaceValues: { NAME: 'Jane Doe' } });
 const lookup = await instance.cad.lookupRecords({ apiId: '1234567890', types: [2], first: 'Jane', last: 'Doe', mi: '', plate: '', partial: false });
+const lookupByAccount = await instance.cad.lookupRecords({ account: 'd5663516-ee35-11e9-9714-5600023b2434', types: [2], first: 'Jane', last: 'Doe', mi: '', plate: '', partial: false });
 ```
 
 ### Civilian Tools
@@ -103,11 +104,18 @@ const lookup = await instance.cad.lookupRecords({ apiId: '1234567890', types: [2
 ### Identifiers & Units
 - **`getIdentifiers(apiId)`**
 - **`modifyIdentifier(change)`** / **`setIdentifier(apiId?, identId)`**
-- **`setUnitPanic(apiId?, isPanic)`** / **`setUnitStatus(apiId?, status, serverId)`**
+- **`setUnitPanic(apiId?, isPanic)`** / **`setUnitStatus({ status, serverId, apiId?, account? })`**
 - **`getActiveUnits(options)`** - direct CAD fetch for active units.
 - **`kickUnit(apiId?, reason, serverId)`**
 - **`updateUnitLocations(locations)`**
 
+```js
+// Update a unit's status using an account UUID
+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);
+```
+
 ### Map & Streetsigns
 - **`getBlips(serverId)`**
 - **`addBlips(blips)`** / **`updateBlips(blips)`** / **`removeBlip(id)`**
@@ -448,10 +456,10 @@ Fetches a specific connected radio user by room and identity.
 const user = await instance.radio.getConnectedUser(1, 'account-uuid');
 ```
 
-### setUserChannels(identity, options)
-Updates a user's transmit or scan channels.
+### setUserChannels(roomId, identity, options)
+Updates a user's transmit or scan channels for a specific radio room.
 ```js
-await instance.radio.setUserChannels('account-uuid', { transmit: 12, scan: [10, 11, 12] });
+await instance.radio.setUserChannels(1, 'account-uuid', { transmit: 12, scan: [10, 11, 12] });
 ```
 
 ### setUserDisplayName(accId, displayName)

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

@@ -299,6 +299,23 @@ export class REST extends EventEmitter {
 					type: args[5]
 				};
 			}
+			case 'UNIT_STATUS': {
+				const payload = args[0];
+				if (payload && typeof payload === 'object' && !Array.isArray(payload)) {
+					const { apiId, account, status, serverId } = payload as {
+						apiId?: string;
+						account?: string;
+						status: number;
+						serverId: number;
+					};
+					return { apiId, account, status, serverId };
+				}
+				return {
+					apiId: args[0],
+					status: args[1],
+					serverId: args[2]
+				};
+			}
 			case 'CHECK_COM_APIID': {
 				return {
 					apiId: args[0]
@@ -358,6 +375,10 @@ export class REST extends EventEmitter {
 				};
 			}
 			case 'LOOKUP': {
+				const payload = args[0];
+				if (payload && typeof payload === 'object' && !Array.isArray(payload)) {
+					return args;
+				}
 				return {
 					id: args[0],
 					uuid: args[1]
@@ -452,8 +473,9 @@ export class REST extends EventEmitter {
 			}
 			case 'RADIO_SET_USER_CHANNELS': {
 				return {
-					identity: args[0],
-					options: args[1] ?? {}
+					roomId: args[0],
+					identity: args[1],
+					options: args[2] ?? {}
 				}
 			}
 			case 'RADIO_SET_USER_DISPLAY_NAME': {

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

@@ -203,7 +203,13 @@ export class RequestManager extends EventEmitter {
           break;
         }
         case 'LOOKUP': {
-          apiData.data.data = [clonedData[0]];
+          if (Array.isArray(clonedData)) {
+            apiData.data.data = clonedData.length > 0 ? clonedData : [];
+          } else if (clonedData !== undefined && clonedData !== null) {
+            apiData.data.data = [clonedData];
+          } else {
+            apiData.data.data = [];
+          }
           break;
         }
         case 'SET_ACCOUNT_PERMISSIONS': {
@@ -392,12 +398,20 @@ export class RequestManager extends EventEmitter {
       }
       case 'RADIO_SET_USER_CHANNELS': {
         const auth = ensureAuth();
+        const roomIdRaw = payload?.roomId ?? payload?.roomID;
+        if (roomIdRaw === undefined) {
+          throw new Error('roomId is required for RADIO_SET_USER_CHANNELS requests.');
+        }
+        const roomIdNumeric = typeof roomIdRaw === 'number' ? roomIdRaw : Number(roomIdRaw);
+        if (Number.isNaN(roomIdNumeric)) {
+          throw new Error('roomId must be a number for RADIO_SET_USER_CHANNELS requests.');
+        }
         const identity = payload?.identity;
         if (!identity) {
           throw new Error('identity is required for RADIO_SET_USER_CHANNELS requests.');
         }
         const options = payload?.options ?? {};
-        path = `${apiType.path}/${auth.encodedId}/${auth.encodedKey}/${encodeSegment(identity)}`;
+        path = `${apiType.path}/${auth.encodedId}/${auth.encodedKey}/${encodeSegment(roomIdNumeric)}/${encodeSegment(identity)}`;
         method = 'POST';
         const requestBody: Record<string, unknown> = {};
         if (options?.transmit !== undefined) {

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

@@ -775,6 +775,7 @@ export interface CADLookupByIntStruct {
 
 export interface CADLookupStruct {
 	apiId?: string;
+	account?: string;
 	types: number[];
 	first: string;
 	last: string;
@@ -900,7 +901,14 @@ export interface CADStreetSignStruct {
 
 export interface CADUnitLocationStruct {
 	apiId: string;
-location: string;
+	location: string;
+}
+
+export interface CADUnitStatusStruct {
+	apiId?: string;
+	account?: string;
+	status: number;
+	serverId: number;
 }
 
 export interface RESTTypedAPIDataStructs {
@@ -977,6 +985,8 @@ export interface RESTTypedAPIDataStructs {
 		apiId: string | undefined,
 		status: number,
 		serverId: number
+	] | [
+		data: CADUnitStatusStruct
 	];
 	GET_BLIPS: [serverId: number];
 	ADD_BLIP: [data: CADAddBlipStruct[]];
@@ -1209,6 +1219,7 @@ export interface RESTTypedAPIDataStructs {
 		identity: string
 	];
 	RADIO_SET_USER_CHANNELS: [
+		roomId: number,
 		identity: string,
 		options?: RadioSetUserChannelsOptions
 	];
@@ -1287,7 +1298,8 @@ export type PossibleRequestData =
 		isPanic: boolean;
 	} |
 	{
-		apiId: string;
+		apiId?: string;
+		account?: string;
 		status: number;
 		serverId: number;
 	} |

package/src/managers/CADManager.ts

@@ -19,7 +19,8 @@ import type {
   CADGetActiveUnitsStruct,
   CADNewDispatchStruct,
   CADStreetSignStruct,
-  CADUnitLocationStruct
+  CADUnitLocationStruct,
+  CADUnitStatusStruct
 } from '../libs/rest/src';
 import { BaseManager } from './BaseManager';
 import * as globalTypes from '../constants';
@@ -246,6 +247,7 @@ export class CADManager extends BaseManager {
 
   /**
    * Executes a CAD lookup using first/last name, plate, or other values.
+   * Supports identifying the requester via `apiId` or `account` (UUID).
    */
   public async lookupRecords(data: CADLookupStruct): Promise<globalTypes.CADStandardResponse> {
     return this.executeCadRequest('LOOKUP', data);
@@ -405,11 +407,35 @@ export class CADManager extends BaseManager {
   /**
    * Updates a unit's status.
    */
-  public async setUnitStatus(apiId: string | undefined, status: number, serverId: number): Promise<globalTypes.CADStandardResponse> {
-    if (!Number.isInteger(serverId)) {
+  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(
+    apiIdOrParams: string | undefined | { apiId?: string; account?: string; status: number; serverId: number },
+    status?: number,
+    serverId?: number
+  ): Promise<globalTypes.CADStandardResponse> {
+    let payload: CADUnitStatusStruct;
+    if (apiIdOrParams && typeof apiIdOrParams === 'object' && !Array.isArray(apiIdOrParams)) {
+      payload = {
+        apiId: apiIdOrParams.apiId,
+        account: apiIdOrParams.account,
+        status: apiIdOrParams.status,
+        serverId: apiIdOrParams.serverId
+      };
+    } else {
+      payload = { apiId: apiIdOrParams as string | undefined, status: status as number, serverId: serverId as number };
+    }
+    const { apiId, account, status: resolvedStatus, serverId: resolvedServerId } = payload;
+    if (!Number.isInteger(resolvedServerId)) {
       throw new Error('serverId must be an integer when updating unit status.');
     }
-    return this.executeCadRequest('UNIT_STATUS', apiId, status, serverId);
+    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.');
+    }
+    return this.executeCadRequest('UNIT_STATUS', { apiId, account, status: resolvedStatus, serverId: resolvedServerId });
   }
 
   /**

package/src/managers/RadioManager.ts

@@ -90,13 +90,14 @@ export class RadioManager extends BaseManager {
 
   /**
    * Updates a user's transmit and scanned channel configuration.
+   * @param {number} roomId Multi-server room id.
    * @param {string} identity The user's UUID.
    * @param {RadioSetUserChannelsOptions} options Transmit and scan channel configuration.
    */
-  public async setUserChannels(identity: string, options: globalTypes.RadioSetUserChannelsOptions = {}): Promise<globalTypes.RadioSetUserChannelsPromiseResult> {
+  public async setUserChannels(roomId: number, identity: string, options: globalTypes.RadioSetUserChannelsOptions = {}): Promise<globalTypes.RadioSetUserChannelsPromiseResult> {
     return new Promise(async (resolve, reject) => {
       try {
-        const response: any = await this.rest?.request('RADIO_SET_USER_CHANNELS', identity, options);
+        const response: any = await this.rest?.request('RADIO_SET_USER_CHANNELS', roomId, identity, options);
         resolve({ success: true, result: response?.result ?? response });
       } catch (err) {
         if (err instanceof APIError) {