@sonoransoftware/sonoran.js 1.0.47 → 1.0.48

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

@@ -139,6 +139,13 @@ class REST extends events_1.EventEmitter {
             case 'GET_PROFILE_FIELDS': {
                 return {};
             }
+            case 'GET_MY_CALL': {
+                const payload = args[0];
+                if (payload && typeof payload === 'object' && !Array.isArray(payload)) {
+                    return payload;
+                }
+                return { account: args[0] };
+            }
             case 'SET_CLOCK': {
                 if (args[0] && typeof args[0] === 'object' && !Array.isArray(args[0])) {
                     return args[0];
@@ -195,6 +202,18 @@ class REST extends events_1.EventEmitter {
                     type: args[5]
                 };
             }
+            case 'ADD_CALL_NOTE': {
+                const payload = args[0];
+                if (payload && typeof payload === 'object' && !Array.isArray(payload)) {
+                    return payload;
+                }
+                return {
+                    serverId: args[0],
+                    callId: args[1],
+                    note: args[2],
+                    label: args[3]
+                };
+            }
             case 'UNIT_STATUS': {
                 const payload = args[0];
                 if (payload && typeof payload === 'object' && !Array.isArray(payload)) {
@@ -207,6 +226,46 @@ class REST extends events_1.EventEmitter {
                     serverId: args[2]
                 };
             }
+            case 'UNIT_PANIC': {
+                const payload = args[0];
+                if (payload && typeof payload === 'object' && !Array.isArray(payload)) {
+                    const { apiId, account, isPanic } = payload;
+                    return { apiId, account, isPanic };
+                }
+                return {
+                    apiId: args[0],
+                    isPanic: args[1]
+                };
+            }
+            case 'ATTACH_UNIT': {
+                const payload = args[0];
+                if (payload && typeof payload === 'object' && !Array.isArray(payload)) {
+                    return payload;
+                }
+                const unitsOrAccount = args[2];
+                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
+                };
+            }
+            case 'DETACH_UNIT': {
+                const payload = args[0];
+                if (payload && typeof payload === 'object' && !Array.isArray(payload)) {
+                    return payload;
+                }
+                const unitsOrAccount = args[1];
+                const account = typeof unitsOrAccount === 'string' && !Array.isArray(unitsOrAccount) ? unitsOrAccount : undefined;
+                const units = Array.isArray(unitsOrAccount) ? unitsOrAccount : undefined;
+                return {
+                    serverId: args[0],
+                    units,
+                    account
+                };
+            }
             case 'CHECK_COM_APIID': {
                 return {
                     apiId: args[0]

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

@@ -205,6 +205,19 @@ class RequestManager extends events_1.EventEmitter {
                     apiData.data.data = [clonedData[0]];
                     break;
                 }
+                case 'GET_MY_CALL': {
+                    const payload = data.data;
+                    if (Array.isArray(payload)) {
+                        apiData.data.data = payload.length > 0 ? payload : [];
+                    }
+                    else if (payload !== undefined && payload !== null) {
+                        apiData.data.data = [payload];
+                    }
+                    else {
+                        apiData.data.data = [];
+                    }
+                    break;
+                }
                 case 'GET_ACTIVE_UNITS': {
                     apiData.data.data = [clonedData[0]];
                     break;
@@ -213,6 +226,58 @@ class RequestManager extends events_1.EventEmitter {
                     apiData.data.data = [clonedData[0]];
                     break;
                 }
+                case 'ADD_CALL_NOTE': {
+                    const payload = data.data;
+                    if (Array.isArray(payload)) {
+                        apiData.data.data = payload;
+                    }
+                    else if (payload !== undefined && payload !== null) {
+                        apiData.data.data = [payload];
+                    }
+                    else {
+                        apiData.data.data = [];
+                    }
+                    break;
+                }
+                case 'UNIT_PANIC': {
+                    const payload = data.data;
+                    if (Array.isArray(payload)) {
+                        apiData.data.data = payload;
+                    }
+                    else if (payload !== undefined && payload !== null) {
+                        apiData.data.data = [payload];
+                    }
+                    else {
+                        apiData.data.data = [];
+                    }
+                    break;
+                }
+                case 'ATTACH_UNIT': {
+                    const payload = data.data;
+                    if (Array.isArray(payload)) {
+                        apiData.data.data = payload;
+                    }
+                    else if (payload !== undefined && payload !== null) {
+                        apiData.data.data = [payload];
+                    }
+                    else {
+                        apiData.data.data = [];
+                    }
+                    break;
+                }
+                case 'DETACH_UNIT': {
+                    const payload = data.data;
+                    if (Array.isArray(payload)) {
+                        apiData.data.data = payload;
+                    }
+                    else if (payload !== undefined && payload !== null) {
+                        apiData.data.data = [payload];
+                    }
+                    else {
+                        apiData.data.data = [];
+                    }
+                    break;
+                }
                 case 'UNIT_LOCATION': {
                     apiData.data.data = [clonedData[0]];
                     break;

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

@@ -38,7 +38,7 @@ export declare const CommunitiesCMSAPITypes: APITypeData[];
 export declare const ERLCMSAPITypes: APITypeData[];
 export declare const RadioAPITypes: APITypeData[];
 export declare const AllAPITypes: AllAPITypeData[];
-export type AllAPITypesType = 'GET_SERVERS' | 'SET_SERVERS' | 'GET_VERSION' | 'SET_PENAL_CODES' | 'SET_API_ID' | 'GET_TEMPLATES' | 'NEW_RECORD' | 'EDIT_RECORD' | 'REMOVE_RECORD' | 'LOOKUP_INT' | 'LOOKUP' | 'GET_ACCOUNT' | 'CHECK_APIID' | 'APPLY_PERMISSION_KEY' | 'SET_ACCOUNT_PERMISSIONS' | 'BAN_USER' | 'VERIFY_SECRET' | 'AUTH_STREETSIGNS' | 'SET_POSTALS' | 'SEND_PHOTO' | 'SET_CLOCK' | 'JOIN_COMMUNITY' | 'LEAVE_COMMUNITY' | 'GET_CHARACTERS' | 'NEW_CHARACTER' | 'EDIT_CHARACTER' | 'REMOVE_CHARACTER' | 'GET_IDENTIFIERS' | 'MODIFY_IDENTIFIER' | 'SET_IDENTIFIER' | 'UNIT_PANIC' | 'UNIT_STATUS' | 'GET_BLIPS' | 'ADD_BLIP' | 'MODIFY_BLIP' | 'REMOVE_BLIP' | '911_CALL' | 'REMOVE_911' | 'GET_CALLS' | 'GET_ACTIVE_UNITS' | 'KICK_UNIT' | 'NEW_DISPATCH' | 'ATTACH_UNIT' | 'DETACH_UNIT' | 'SET_CALL_POSTAL' | 'SET_CALL_PRIMARY' | 'ADD_CALL_NOTE' | 'CLOSE_CALL' | 'UNIT_LOCATION' | 'SET_STREETSIGN_CONFIG' | 'UPDATE_STREETSIGN' | 'GET_COM_ACCOUNT' | 'GET_DEPARTMENTS' | 'GET_SUB_VERSION' | 'GET_CURRENT_CLOCK_IN' | 'GET_CLOCKIN_TYPES' | 'GET_LATEST_ACTIVITY' | 'GET_ACCOUNTS' | 'GET_PROFILE_FIELDS' | 'CHECK_COM_APIID' | 'VERIFY_WHITELIST' | 'CLOCK_IN_OUT' | 'FULL_WHITELIST' | 'GET_ACCOUNT_RANKS' | 'SET_ACCOUNT_RANKS' | 'RSVP' | 'CHANGE_FORM_STAGE' | 'GET_FORM_TEMPLATE_SUBMISSIONS' | 'KICK_ACCOUNT' | 'BAN_ACCOUNT' | 'LOOKUP' | 'EDIT_ACC_PROFLIE_FIELDS' | 'SET_ACCOUNT_NAME' | 'FORCE_SYNC' | 'TRIGGER_PROMOTION_FLOWS' | 'GET_PROMOTION_FLOWS' | 'SET_GAME_SERVERS' | 'ERLC_GET_ONLINE_PLAYERS' | 'ERLC_GET_PLAYER_QUEUE' | 'ERLC_ADD_NEW_RECORD' | 'ERLC_EXECUTE_COMMAND' | 'RADIO_GET_COMMUNITY_CHANNELS' | 'RADIO_GET_CONNECTED_USERS' | 'RADIO_GET_CONNECTED_USER' | 'RADIO_SET_USER_CHANNELS' | 'RADIO_SET_USER_DISPLAY_NAME' | 'RADIO_GET_SERVER_SUBSCRIPTION_FROM_IP' | 'RADIO_SET_SERVER_IP' | 'RADIO_SET_IN_GAME_SPEAKER_LOCATIONS' | 'PLAY_TONE';
+export type AllAPITypesType = 'GET_SERVERS' | 'SET_SERVERS' | 'GET_VERSION' | 'SET_PENAL_CODES' | 'SET_API_ID' | 'GET_TEMPLATES' | 'NEW_RECORD' | 'EDIT_RECORD' | 'REMOVE_RECORD' | 'LOOKUP_INT' | 'LOOKUP' | 'GET_ACCOUNT' | 'CHECK_APIID' | 'APPLY_PERMISSION_KEY' | 'SET_ACCOUNT_PERMISSIONS' | 'BAN_USER' | 'VERIFY_SECRET' | 'AUTH_STREETSIGNS' | 'SET_POSTALS' | 'SEND_PHOTO' | 'SET_CLOCK' | 'JOIN_COMMUNITY' | 'LEAVE_COMMUNITY' | 'GET_CHARACTERS' | 'NEW_CHARACTER' | 'EDIT_CHARACTER' | 'REMOVE_CHARACTER' | 'GET_IDENTIFIERS' | 'MODIFY_IDENTIFIER' | 'SET_IDENTIFIER' | 'UNIT_PANIC' | 'UNIT_STATUS' | 'GET_BLIPS' | 'ADD_BLIP' | 'MODIFY_BLIP' | 'REMOVE_BLIP' | '911_CALL' | 'REMOVE_911' | 'GET_CALLS' | 'GET_MY_CALL' | 'GET_ACTIVE_UNITS' | 'KICK_UNIT' | 'NEW_DISPATCH' | 'ATTACH_UNIT' | 'DETACH_UNIT' | 'SET_CALL_POSTAL' | 'SET_CALL_PRIMARY' | 'ADD_CALL_NOTE' | 'CLOSE_CALL' | 'UNIT_LOCATION' | 'SET_STREETSIGN_CONFIG' | 'UPDATE_STREETSIGN' | 'GET_COM_ACCOUNT' | 'GET_DEPARTMENTS' | 'GET_SUB_VERSION' | 'GET_CURRENT_CLOCK_IN' | 'GET_CLOCKIN_TYPES' | 'GET_LATEST_ACTIVITY' | 'GET_ACCOUNTS' | 'GET_PROFILE_FIELDS' | 'CHECK_COM_APIID' | 'VERIFY_WHITELIST' | 'CLOCK_IN_OUT' | 'FULL_WHITELIST' | 'GET_ACCOUNT_RANKS' | 'SET_ACCOUNT_RANKS' | 'RSVP' | 'CHANGE_FORM_STAGE' | 'GET_FORM_TEMPLATE_SUBMISSIONS' | 'KICK_ACCOUNT' | 'BAN_ACCOUNT' | 'LOOKUP' | 'EDIT_ACC_PROFLIE_FIELDS' | 'SET_ACCOUNT_NAME' | 'FORCE_SYNC' | 'TRIGGER_PROMOTION_FLOWS' | 'GET_PROMOTION_FLOWS' | 'SET_GAME_SERVERS' | 'ERLC_GET_ONLINE_PLAYERS' | 'ERLC_GET_PLAYER_QUEUE' | 'ERLC_ADD_NEW_RECORD' | 'ERLC_EXECUTE_COMMAND' | 'RADIO_GET_COMMUNITY_CHANNELS' | 'RADIO_GET_CONNECTED_USERS' | 'RADIO_GET_CONNECTED_USER' | 'RADIO_SET_USER_CHANNELS' | 'RADIO_SET_USER_DISPLAY_NAME' | 'RADIO_GET_SERVER_SUBSCRIPTION_FROM_IP' | 'RADIO_SET_SERVER_IP' | 'RADIO_SET_IN_GAME_SPEAKER_LOCATIONS' | 'PLAY_TONE';
 export interface CMSServerAPIStruct {
     id: number;
     name: string;
@@ -229,6 +229,15 @@ export interface CADGetCallsStruct {
     closedLimit?: number;
     closedOffset?: number;
 }
+export interface CADGetMyCallStruct {
+    account: string;
+}
+export interface CADAddCallNoteStruct {
+    serverId: number;
+    callId: number;
+    note: string;
+    label?: string;
+}
 export interface CADGetActiveUnitsStruct {
     serverId?: number;
     onlyUnits?: boolean;
@@ -236,6 +245,22 @@ export interface CADGetActiveUnitsStruct {
     limit?: number;
     offset?: number;
 }
+export interface CADAttachUnitsStruct {
+    serverId: number;
+    callId: number;
+    units?: string[];
+    account?: string;
+}
+export interface CADDetachUnitsStruct {
+    serverId: number;
+    units?: string[];
+    account?: string;
+}
+export interface CADUnitPanicStruct {
+    apiId?: string;
+    account?: string;
+    isPanic: boolean;
+}
 export declare enum CADDispatchOriginEnums {
     Caller = 0,
     RadioDispatch = 1,
@@ -350,6 +375,8 @@ export interface RESTTypedAPIDataStructs {
     UNIT_PANIC: [
         apiId: string | undefined,
         isPanic: boolean
+    ] | [
+        data: CADUnitPanicStruct
     ];
     UNIT_STATUS: [
         apiId: string | undefined,
@@ -364,6 +391,7 @@ export interface RESTTypedAPIDataStructs {
     REMOVE_BLIP: [id: number];
     REMOVE_911: [callId: number];
     GET_CALLS: [data: CADGetCallsStruct];
+    GET_MY_CALL: [data: CADGetMyCallStruct];
     GET_ACTIVE_UNITS: [data: CADGetActiveUnitsStruct];
     KICK_UNIT: [
         apiId: string | undefined,
@@ -375,10 +403,14 @@ export interface RESTTypedAPIDataStructs {
         serverId: number,
         callId: number,
         units: string[]
+    ] | [
+        data: CADAttachUnitsStruct
     ];
     DETACH_UNIT: [
         serverId: number,
         units: string[]
+    ] | [
+        data: CADDetachUnitsStruct
     ];
     SET_CALL_POSTAL: [
         serverId: number,
@@ -395,6 +427,8 @@ export interface RESTTypedAPIDataStructs {
         serverId: number,
         callId: number,
         note: string
+    ] | [
+        data: CADAddCallNoteStruct
     ];
     CLOSE_CALL: [
         serverId: number,
@@ -645,6 +679,10 @@ export type PossibleRequestData = undefined | {
 } | {
     apiId: string;
     isPanic: boolean;
+} | {
+    apiId?: string;
+    account?: string;
+    isPanic: boolean;
 } | {
     apiId?: string;
     account?: string;
@@ -655,10 +693,14 @@ export type PossibleRequestData = undefined | {
 } | {
     serverId: number;
     callId: number;
-    units: string[];
+    units?: string[];
+    account?: string;
 } | {
     serverId: number;
-    units: string[];
+    units?: string[];
+    account?: string;
+} | {
+    account: string;
 } | {
     serverId: number;
     callId: number;
@@ -672,6 +714,7 @@ export type PossibleRequestData = undefined | {
     serverId: number;
     callId: number;
     note: string;
+    label?: string;
 } | {
     serverId: number;
     callId: number;

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

@@ -260,6 +260,12 @@ exports.EmergencyCADAPITypes = [
         method: 'POST',
         minVersion: 3
     },
+    {
+        type: 'GET_MY_CALL',
+        path: 'emergency/get_my_call',
+        method: 'POST',
+        minVersion: 3
+    },
     {
         type: 'GET_ACTIVE_UNITS',
         path: 'emergency/get_active_units',

package/dist/managers/CADManager.d.ts

@@ -1,7 +1,7 @@
 import { Instance } from '../instance/Instance';
 import { CADSubscriptionVersionEnum } from '../constants';
 import { REST } from '../libs/rest/src';
-import type { CADPenalCodeStruct, CADSetAPIIDStruct, CADNewEditRecordOptionOneStruct, CADNewEditRecordOptionTwoStruct, CADLookupByIntStruct, CADLookupStruct, CADModifyAccountPermsStruct, CADKickBanUserStruct, CADSetPostalStruct, CADModifyIdentifierStruct, CADAddBlipStruct, CADModifyBlipStruct, CADGetCallsStruct, CADGetActiveUnitsStruct, CADNewDispatchStruct, CADStreetSignStruct, CADUnitLocationStruct } from '../libs/rest/src';
+import type { CADPenalCodeStruct, CADSetAPIIDStruct, CADNewEditRecordOptionOneStruct, CADNewEditRecordOptionTwoStruct, CADLookupByIntStruct, CADLookupStruct, CADModifyAccountPermsStruct, CADKickBanUserStruct, CADSetPostalStruct, CADModifyIdentifierStruct, CADAddBlipStruct, CADModifyBlipStruct, CADGetCallsStruct, CADGetMyCallStruct, CADAddCallNoteStruct, CADGetActiveUnitsStruct, CADNewDispatchStruct, CADAttachUnitsStruct, CADDetachUnitsStruct, CADStreetSignStruct, CADUnitLocationStruct, CADUnitPanicStruct } from '../libs/rest/src';
 import { BaseManager } from './BaseManager';
 import * as globalTypes from '../constants';
 import { CADServerManager } from './CADServerManager';
@@ -157,6 +157,7 @@ export declare class CADManager extends BaseManager {
      * Toggles panic state for a unit.
      */
     setUnitPanic(apiId: string | undefined, isPanic: boolean): Promise<globalTypes.CADStandardResponse>;
+    setUnitPanic(params: CADUnitPanicStruct): Promise<globalTypes.CADStandardResponse>;
     /**
      * Updates a unit's status.
      */
@@ -202,6 +203,10 @@ export declare class CADManager extends BaseManager {
      * Retrieves dispatch calls with optional pagination.
      */
     getCalls(options: CADGetCallsStruct): Promise<globalTypes.CADStandardResponse>;
+    /**
+     * Retrieves the current call associated with the given account UUID.
+     */
+    getMyCall(options: CADGetMyCallStruct): Promise<globalTypes.CADStandardResponse>;
     /**
      * Retrieves active units for the provided filters.
      */
@@ -217,11 +222,13 @@ export declare class CADManager extends BaseManager {
     /**
      * Attaches units to an existing dispatch call.
      */
-    attachUnits(serverId: number, callId: number, units: string[]): Promise<globalTypes.CADStandardResponse>;
+    attachUnits(serverId: number, callId: number, unitsOrAccount: string[] | string): Promise<globalTypes.CADStandardResponse>;
+    attachUnits(params: CADAttachUnitsStruct): Promise<globalTypes.CADStandardResponse>;
     /**
      * Detaches units from dispatch calls.
      */
-    detachUnits(serverId: number, units: string[]): Promise<globalTypes.CADStandardResponse>;
+    detachUnits(serverId: number, unitsOrAccount: string[] | string): Promise<globalTypes.CADStandardResponse>;
+    detachUnits(params: CADDetachUnitsStruct): Promise<globalTypes.CADStandardResponse>;
     /**
      * Updates the postal code on a call.
      */
@@ -233,7 +240,8 @@ export declare class CADManager extends BaseManager {
     /**
      * Adds a note to an active call.
      */
-    addCallNote(serverId: number, callId: number, note: string): Promise<globalTypes.CADStandardResponse>;
+    addCallNote(serverId: number, callId: number, note: string, label?: string): Promise<globalTypes.CADStandardResponse>;
+    addCallNote(params: CADAddCallNoteStruct): Promise<globalTypes.CADStandardResponse>;
     /**
      * Closes a CAD call.
      */

package/dist/managers/CADManager.js

@@ -377,11 +377,22 @@ class CADManager extends BaseManager_1.BaseManager {
         }
         return this.executeCadRequest('SET_IDENTIFIER', apiId, identId);
     }
-    /**
-     * Toggles panic state for a unit.
-     */
-    async setUnitPanic(apiId, isPanic) {
-        return this.executeCadRequest('UNIT_PANIC', apiId, isPanic);
+    async setUnitPanic(apiIdOrParams, isPanic) {
+        let payload;
+        if (apiIdOrParams && typeof apiIdOrParams === 'object') {
+            payload = { ...apiIdOrParams };
+        }
+        else {
+            payload = { apiId: apiIdOrParams, isPanic: isPanic };
+        }
+        const { apiId, account, isPanic: resolvedPanic } = payload;
+        if (resolvedPanic === undefined) {
+            throw new Error('isPanic is required when setting unit panic.');
+        }
+        if (!apiId && !account) {
+            throw new Error('Either apiId or account is required when setting unit panic.');
+        }
+        return this.executeCadRequest('UNIT_PANIC', { apiId, account, isPanic: resolvedPanic });
     }
     async setUnitStatus(apiIdOrParams, status, serverId) {
         let payload;
@@ -471,6 +482,15 @@ class CADManager extends BaseManager_1.BaseManager {
     async getCalls(options) {
         return this.executeCadRequest('GET_CALLS', options);
     }
+    /**
+     * Retrieves the current call associated with the given account UUID.
+     */
+    async getMyCall(options) {
+        if (!(options === null || options === void 0 ? void 0 : options.account)) {
+            throw new Error('account is required when fetching current call.');
+        }
+        return this.executeCadRequest('GET_MY_CALL', options);
+    }
     /**
      * Retrieves active units for the provided filters.
      */
@@ -495,29 +515,58 @@ class CADManager extends BaseManager_1.BaseManager {
     async createDispatch(data) {
         return this.executeCadRequest('NEW_DISPATCH', data);
     }
-    /**
-     * Attaches units to an existing dispatch call.
-     */
-    async attachUnits(serverId, callId, units) {
-        if (!Number.isInteger(serverId) || !Number.isInteger(callId)) {
+    async attachUnits(serverIdOrParams, callId, unitsOrAccount) {
+        let payload;
+        if (serverIdOrParams && typeof serverIdOrParams === 'object') {
+            payload = { ...serverIdOrParams };
+        }
+        else {
+            payload = {
+                serverId: serverIdOrParams,
+                callId: callId,
+                ...(Array.isArray(unitsOrAccount)
+                    ? { units: unitsOrAccount }
+                    : typeof unitsOrAccount === 'string'
+                        ? { account: unitsOrAccount }
+                        : {})
+            };
+        }
+        const { serverId, callId: resolvedCallId, units, account } = payload;
+        if (!Number.isInteger(serverId) || !Number.isInteger(resolvedCallId)) {
             throw new Error('serverId and callId must be integers when attaching units.');
         }
-        if (!Array.isArray(units) || units.length === 0) {
-            throw new Error('units must include at least one entry when attaching.');
+        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, units);
+        return this.executeCadRequest('ATTACH_UNIT', { serverId, callId: resolvedCallId, units: hasUnits ? units : undefined, account: hasAccount ? account : undefined });
     }
-    /**
-     * Detaches units from dispatch calls.
-     */
-    async detachUnits(serverId, units) {
+    async detachUnits(serverIdOrParams, unitsOrAccount) {
+        let payload;
+        if (serverIdOrParams && typeof serverIdOrParams === 'object') {
+            payload = { ...serverIdOrParams };
+        }
+        else {
+            payload = {
+                serverId: serverIdOrParams,
+                ...(Array.isArray(unitsOrAccount)
+                    ? { units: unitsOrAccount }
+                    : typeof unitsOrAccount === 'string'
+                        ? { account: unitsOrAccount }
+                        : {})
+            };
+        }
+        const { serverId, units, account } = payload;
         if (!Number.isInteger(serverId)) {
             throw new Error('serverId must be an integer when detaching units.');
         }
-        if (!Array.isArray(units) || units.length === 0) {
-            throw new Error('units must include at least one entry when detaching.');
+        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 detaching units.');
         }
-        return this.executeCadRequest('DETACH_UNIT', serverId, units);
+        return this.executeCadRequest('DETACH_UNIT', { serverId, units: hasUnits ? units : undefined, account: hasAccount ? account : undefined });
     }
     /**
      * Updates the postal code on a call.
@@ -540,17 +589,22 @@ class CADManager extends BaseManager_1.BaseManager {
         }
         return this.executeCadRequest('SET_CALL_PRIMARY', serverId, callId, primary, trackPrimary);
     }
-    /**
-     * Adds a note to an active call.
-     */
-    async addCallNote(serverId, callId, note) {
-        if (!Number.isInteger(serverId) || !Number.isInteger(callId)) {
+    async addCallNote(serverIdOrParams, callId, note, label) {
+        let payload;
+        if (serverIdOrParams && typeof serverIdOrParams === 'object') {
+            payload = { ...serverIdOrParams };
+        }
+        else {
+            payload = { serverId: serverIdOrParams, callId: callId, note: note, label };
+        }
+        const { serverId, callId: resolvedCallId, note: resolvedNote, label: resolvedLabel } = payload;
+        if (!Number.isInteger(serverId) || !Number.isInteger(resolvedCallId)) {
             throw new Error('serverId and callId must be integers when adding a call note.');
         }
-        if (!note) {
+        if (!resolvedNote) {
             throw new Error('note is required when adding a call note.');
         }
-        return this.executeCadRequest('ADD_CALL_NOTE', serverId, callId, note);
+        return this.executeCadRequest('ADD_CALL_NOTE', { serverId, callId: resolvedCallId, note: resolvedNote, label: resolvedLabel });
     }
     /**
      * Closes a CAD call.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sonoransoftware/sonoran.js",
-  "version": "1.0.47",
+  "version": "1.0.48",
   "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",
@@ -44,5 +44,6 @@
     "node-abort-controller": "^3.0.1",
     "node-fetch": "^2.6.5"
   },
-  "prepublish": "npm run build"
+  "prepublish": "npm run build",
+  "packageManager": "pnpm@10.26.0+sha512.3b3f6c725ebe712506c0ab1ad4133cf86b1f4b687effce62a9b38b4d72e3954242e643190fc51fa1642949c735f403debd44f5cb0edd657abe63a8b6a7e1e402"
 }

package/readme.md

@@ -104,7 +104,7 @@ const lookupByAccount = await instance.cad.lookupRecords({ account: 'd5663516-ee
 ### Identifiers & Units
 - **`getIdentifiers(apiId)`**
 - **`modifyIdentifier(change)`** / **`setIdentifier(apiId?, identId)`**
-- **`setUnitPanic(apiId?, isPanic)`** / **`setUnitStatus({ status, serverId, apiId?, account? })`**
+- **`setUnitPanic({ apiId?, account?, isPanic })`** / **`setUnitStatus({ status, serverId, apiId?, account? })`**
 - **`getActiveUnits(options)`** - direct CAD fetch for active units.
 - **`kickUnit(apiId?, reason, serverId)`**
 - **`updateUnitLocations(locations)`**
@@ -114,6 +114,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);
+// Trigger panic using account UUID
+await instance.cad.setUnitPanic({ account: '91de0ce8-c571-11e9-9714-5600023b2434', isPanic: true });
 ```
 
 ### Map & Streetsigns
@@ -125,10 +127,11 @@ await instance.cad.setUnitStatus('1234567890', 2, 1);
 ### Calls & Dispatch
 - **`create911Call(details)`** / **`remove911Call(callId)`**
 - **`getCalls(options)`**
+- **`getMyCall({ account })`**
 - **`createDispatch(data)`**
-- **`attachUnits(serverId, callId, units)`** / **`detachUnits(serverId, units)`**
+- **`attachUnits(serverId, callId, unitsOrAccount)`** / **`detachUnits(serverId, unitsOrAccount)`**
 - **`setCallPostal(serverId, callId, postal)`** / **`setCallPrimary(serverId, callId, primary, trackPrimary)`**
-- **`addCallNote(serverId, callId, note)`**
+- **`addCallNote({ serverId, callId, note, label? })`**
 - **`closeCall(serverId, callId)`**
 
 ```js
@@ -149,6 +152,14 @@ const dispatch = await instance.cad.createDispatch({
   units: ['unit-1']
 });
 await instance.cad.attachUnits(1, 1001, ['unit-2']);
+// Or attach a single unit by account UUID
+await instance.cad.attachUnits({ serverId: 1, callId: 1001, account: '91de0ce8-c571-11e9-9714-5600023b2434' });
+// Detach using account UUID
+await instance.cad.detachUnits({ serverId: 1, account: '91de0ce8-c571-11e9-9714-5600023b2434' });
+// Fetch the current call for an account UUID
+const myCall = await instance.cad.getMyCall({ account: '91de0ce8-c571-11e9-9714-5600023b2434' });
+// Add a call note with optional label
+await instance.cad.addCallNote({ serverId: 1, callId: 1001, note: 'This is a test!', label: 'A-10' });
 ```
 
 ## CAD Server Functions

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

@@ -245,6 +245,13 @@ export class REST extends EventEmitter {
 			case 'GET_PROFILE_FIELDS': {
 				return {};
 			}
+			case 'GET_MY_CALL': {
+				const payload = args[0];
+				if (payload && typeof payload === 'object' && !Array.isArray(payload)) {
+					return payload;
+				}
+				return { account: args[0] };
+			}
 			case 'SET_CLOCK': {
 				if (args[0] && typeof args[0] === 'object' && !Array.isArray(args[0])) {
 					return args[0];
@@ -299,6 +306,18 @@ export class REST extends EventEmitter {
 					type: args[5]
 				};
 			}
+			case 'ADD_CALL_NOTE': {
+				const payload = args[0];
+				if (payload && typeof payload === 'object' && !Array.isArray(payload)) {
+					return payload;
+				}
+				return {
+					serverId: args[0],
+					callId: args[1],
+					note: args[2],
+					label: args[3]
+				};
+			}
 			case 'UNIT_STATUS': {
 				const payload = args[0];
 				if (payload && typeof payload === 'object' && !Array.isArray(payload)) {
@@ -316,6 +335,46 @@ export class REST extends EventEmitter {
 					serverId: args[2]
 				};
 			}
+			case 'UNIT_PANIC': {
+				const payload = args[0];
+				if (payload && typeof payload === 'object' && !Array.isArray(payload)) {
+					const { apiId, account, isPanic } = payload as { apiId?: string; account?: string; isPanic: boolean };
+					return { apiId, account, isPanic };
+				}
+				return {
+					apiId: args[0],
+					isPanic: args[1]
+				};
+			}
+			case 'ATTACH_UNIT': {
+				const payload = args[0];
+				if (payload && typeof payload === 'object' && !Array.isArray(payload)) {
+					return payload;
+				}
+				const unitsOrAccount = args[2];
+				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
+				};
+			}
+			case 'DETACH_UNIT': {
+				const payload = args[0];
+				if (payload && typeof payload === 'object' && !Array.isArray(payload)) {
+					return payload;
+				}
+				const unitsOrAccount = args[1];
+				const account = typeof unitsOrAccount === 'string' && !Array.isArray(unitsOrAccount) ? unitsOrAccount : undefined;
+				const units = Array.isArray(unitsOrAccount) ? unitsOrAccount : undefined;
+				return {
+					serverId: args[0],
+					units,
+					account
+				};
+			}
 			case 'CHECK_COM_APIID': {
 				return {
 					apiId: args[0]

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

@@ -276,6 +276,17 @@ export class RequestManager extends EventEmitter {
           apiData.data.data = [clonedData[0]];
           break;
         }
+        case 'GET_MY_CALL': {
+          const payload = data.data;
+          if (Array.isArray(payload)) {
+            apiData.data.data = payload.length > 0 ? payload : [];
+          } else if (payload !== undefined && payload !== null) {
+            apiData.data.data = [payload];
+          } else {
+            apiData.data.data = [];
+          }
+          break;
+        }
         case 'GET_ACTIVE_UNITS': {
           apiData.data.data = [clonedData[0]];
           break;
@@ -284,6 +295,50 @@ export class RequestManager extends EventEmitter {
           apiData.data.data = [clonedData[0]];
           break;
         }
+        case 'ADD_CALL_NOTE': {
+          const payload = data.data;
+          if (Array.isArray(payload)) {
+            apiData.data.data = payload;
+          } else if (payload !== undefined && payload !== null) {
+            apiData.data.data = [payload];
+          } else {
+            apiData.data.data = [];
+          }
+          break;
+        }
+        case 'UNIT_PANIC': {
+          const payload = data.data;
+          if (Array.isArray(payload)) {
+            apiData.data.data = payload;
+          } else if (payload !== undefined && payload !== null) {
+            apiData.data.data = [payload];
+          } else {
+            apiData.data.data = [];
+          }
+          break;
+        }
+        case 'ATTACH_UNIT': {
+          const payload = data.data;
+          if (Array.isArray(payload)) {
+            apiData.data.data = payload;
+          } else if (payload !== undefined && payload !== null) {
+            apiData.data.data = [payload];
+          } else {
+            apiData.data.data = [];
+          }
+          break;
+        }
+        case 'DETACH_UNIT': {
+          const payload = data.data;
+          if (Array.isArray(payload)) {
+            apiData.data.data = payload;
+          } else if (payload !== undefined && payload !== null) {
+            apiData.data.data = [payload];
+          } else {
+            apiData.data.data = [];
+          }
+          break;
+        }
         case 'UNIT_LOCATION': {
           apiData.data.data = [clonedData[0]];
           break;

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

@@ -291,6 +291,12 @@ export const EmergencyCADAPITypes: APITypeData[] = [
 		method: 'POST',
 		minVersion: 3
 	},
+	{
+		type: 'GET_MY_CALL',
+		path: 'emergency/get_my_call',
+		method: 'POST',
+		minVersion: 3
+	},
 	{
 		type: 'GET_ACTIVE_UNITS',
 		path: 'emergency/get_active_units',
@@ -637,7 +643,7 @@ function formatForAll(array: APITypeData[], product: productEnums): AllAPITypeDa
 
 export const AllAPITypes: AllAPITypeData[] = [ ...formatForAll(GeneralCADAPITypes, productEnums.CAD), ...formatForAll(CivilianCADAPITypes, productEnums.CAD), ...formatForAll(EmergencyCADAPITypes, productEnums.CAD), ...formatForAll(GeneralCMSAPITypes, productEnums.CMS), ...formatForAll(ServersCMSAPITypes, productEnums.CMS), ...formatForAll(EventsCMSAPITypes, productEnums.CMS),  ...formatForAll(FormsCMSAPITypes, productEnums.CMS), ...formatForAll(CommunitiesCMSAPITypes, productEnums.CMS), ...formatForAll(ERLCMSAPITypes, productEnums.CMS), ...formatForAll(RadioAPITypes, productEnums.RADIO) ];
 
-export type AllAPITypesType = 'GET_SERVERS' | 'SET_SERVERS' | 'GET_VERSION' | 'SET_PENAL_CODES' | 'SET_API_ID' | 'GET_TEMPLATES' | 'NEW_RECORD' | 'EDIT_RECORD' | 'REMOVE_RECORD' | 'LOOKUP_INT' | 'LOOKUP' | 'GET_ACCOUNT' | 'CHECK_APIID' | 'APPLY_PERMISSION_KEY' | 'SET_ACCOUNT_PERMISSIONS' | 'BAN_USER' | 'VERIFY_SECRET' | 'AUTH_STREETSIGNS' | 'SET_POSTALS' | 'SEND_PHOTO' | 'SET_CLOCK' | 'JOIN_COMMUNITY' | 'LEAVE_COMMUNITY' | 'GET_CHARACTERS' | 'NEW_CHARACTER' | 'EDIT_CHARACTER' | 'REMOVE_CHARACTER' | 'GET_IDENTIFIERS' | 'MODIFY_IDENTIFIER' | 'SET_IDENTIFIER' | 'UNIT_PANIC' | 'UNIT_STATUS' | 'GET_BLIPS' | 'ADD_BLIP' | 'MODIFY_BLIP' | 'REMOVE_BLIP' | '911_CALL' | 'REMOVE_911' | 'GET_CALLS' | 'GET_ACTIVE_UNITS' | 'KICK_UNIT' | 'NEW_DISPATCH' | 'ATTACH_UNIT' | 'DETACH_UNIT' | 'SET_CALL_POSTAL' | 'SET_CALL_PRIMARY' | 'ADD_CALL_NOTE' | 'CLOSE_CALL' | 'UNIT_LOCATION' | 'SET_STREETSIGN_CONFIG' | 'UPDATE_STREETSIGN' | 'GET_COM_ACCOUNT' | 'GET_DEPARTMENTS' | 'GET_SUB_VERSION' | 'GET_CURRENT_CLOCK_IN' | 'GET_CLOCKIN_TYPES' | 'GET_LATEST_ACTIVITY' | 'GET_ACCOUNTS' | 'GET_PROFILE_FIELDS' | 'CHECK_COM_APIID' | 'VERIFY_WHITELIST' | 'CLOCK_IN_OUT' | 'FULL_WHITELIST' | 'GET_ACCOUNT_RANKS' | 'SET_ACCOUNT_RANKS' | 'RSVP' | 'CHANGE_FORM_STAGE' | 'GET_FORM_TEMPLATE_SUBMISSIONS' | 'KICK_ACCOUNT' | 'BAN_ACCOUNT' | 'LOOKUP' | 'EDIT_ACC_PROFLIE_FIELDS' | 'SET_ACCOUNT_NAME' | 'FORCE_SYNC' | 'TRIGGER_PROMOTION_FLOWS' | 'GET_PROMOTION_FLOWS' | 'SET_GAME_SERVERS' | 'ERLC_GET_ONLINE_PLAYERS' | 'ERLC_GET_PLAYER_QUEUE' | 'ERLC_ADD_NEW_RECORD' | 'ERLC_EXECUTE_COMMAND' | 'RADIO_GET_COMMUNITY_CHANNELS' | 'RADIO_GET_CONNECTED_USERS' | 'RADIO_GET_CONNECTED_USER' | 'RADIO_SET_USER_CHANNELS' | 'RADIO_SET_USER_DISPLAY_NAME' | 'RADIO_GET_SERVER_SUBSCRIPTION_FROM_IP' | 'RADIO_SET_SERVER_IP' | 'RADIO_SET_IN_GAME_SPEAKER_LOCATIONS' | 'PLAY_TONE';
+export type AllAPITypesType = 'GET_SERVERS' | 'SET_SERVERS' | 'GET_VERSION' | 'SET_PENAL_CODES' | 'SET_API_ID' | 'GET_TEMPLATES' | 'NEW_RECORD' | 'EDIT_RECORD' | 'REMOVE_RECORD' | 'LOOKUP_INT' | 'LOOKUP' | 'GET_ACCOUNT' | 'CHECK_APIID' | 'APPLY_PERMISSION_KEY' | 'SET_ACCOUNT_PERMISSIONS' | 'BAN_USER' | 'VERIFY_SECRET' | 'AUTH_STREETSIGNS' | 'SET_POSTALS' | 'SEND_PHOTO' | 'SET_CLOCK' | 'JOIN_COMMUNITY' | 'LEAVE_COMMUNITY' | 'GET_CHARACTERS' | 'NEW_CHARACTER' | 'EDIT_CHARACTER' | 'REMOVE_CHARACTER' | 'GET_IDENTIFIERS' | 'MODIFY_IDENTIFIER' | 'SET_IDENTIFIER' | 'UNIT_PANIC' | 'UNIT_STATUS' | 'GET_BLIPS' | 'ADD_BLIP' | 'MODIFY_BLIP' | 'REMOVE_BLIP' | '911_CALL' | 'REMOVE_911' | 'GET_CALLS' | 'GET_MY_CALL' | 'GET_ACTIVE_UNITS' | 'KICK_UNIT' | 'NEW_DISPATCH' | 'ATTACH_UNIT' | 'DETACH_UNIT' | 'SET_CALL_POSTAL' | 'SET_CALL_PRIMARY' | 'ADD_CALL_NOTE' | 'CLOSE_CALL' | 'UNIT_LOCATION' | 'SET_STREETSIGN_CONFIG' | 'UPDATE_STREETSIGN' | 'GET_COM_ACCOUNT' | 'GET_DEPARTMENTS' | 'GET_SUB_VERSION' | 'GET_CURRENT_CLOCK_IN' | 'GET_CLOCKIN_TYPES' | 'GET_LATEST_ACTIVITY' | 'GET_ACCOUNTS' | 'GET_PROFILE_FIELDS' | 'CHECK_COM_APIID' | 'VERIFY_WHITELIST' | 'CLOCK_IN_OUT' | 'FULL_WHITELIST' | 'GET_ACCOUNT_RANKS' | 'SET_ACCOUNT_RANKS' | 'RSVP' | 'CHANGE_FORM_STAGE' | 'GET_FORM_TEMPLATE_SUBMISSIONS' | 'KICK_ACCOUNT' | 'BAN_ACCOUNT' | 'LOOKUP' | 'EDIT_ACC_PROFLIE_FIELDS' | 'SET_ACCOUNT_NAME' | 'FORCE_SYNC' | 'TRIGGER_PROMOTION_FLOWS' | 'GET_PROMOTION_FLOWS' | 'SET_GAME_SERVERS' | 'ERLC_GET_ONLINE_PLAYERS' | 'ERLC_GET_PLAYER_QUEUE' | 'ERLC_ADD_NEW_RECORD' | 'ERLC_EXECUTE_COMMAND' | 'RADIO_GET_COMMUNITY_CHANNELS' | 'RADIO_GET_CONNECTED_USERS' | 'RADIO_GET_CONNECTED_USER' | 'RADIO_SET_USER_CHANNELS' | 'RADIO_SET_USER_DISPLAY_NAME' | 'RADIO_GET_SERVER_SUBSCRIPTION_FROM_IP' | 'RADIO_SET_SERVER_IP' | 'RADIO_SET_IN_GAME_SPEAKER_LOCATIONS' | 'PLAY_TONE';
 
 export interface CMSServerAPIStruct {
 	id: number;
@@ -853,6 +859,17 @@ export interface CADGetCallsStruct {
 	closedOffset?: number;
 }
 
+export interface CADGetMyCallStruct {
+	account: string;
+}
+
+export interface CADAddCallNoteStruct {
+	serverId: number;
+	callId: number;
+	note: string;
+	label?: string;
+}
+
 export interface CADGetActiveUnitsStruct {
 	serverId?: number;
 	onlyUnits?: boolean;
@@ -861,6 +878,25 @@ export interface CADGetActiveUnitsStruct {
 	offset?: number;
 }
 
+export interface CADAttachUnitsStruct {
+	serverId: number;
+	callId: number;
+	units?: string[];
+	account?: string;
+}
+
+export interface CADDetachUnitsStruct {
+	serverId: number;
+	units?: string[];
+	account?: string;
+}
+
+export interface CADUnitPanicStruct {
+	apiId?: string;
+	account?: string;
+	isPanic: boolean;
+}
+
 export enum CADDispatchOriginEnums {
 	Caller,
 	RadioDispatch,
@@ -980,6 +1016,8 @@ export interface RESTTypedAPIDataStructs {
 	UNIT_PANIC: [
 		apiId: string | undefined,
 		isPanic: boolean
+	] | [
+		data: CADUnitPanicStruct
 	];
 	UNIT_STATUS: [
 		apiId: string | undefined,
@@ -994,6 +1032,7 @@ export interface RESTTypedAPIDataStructs {
 	REMOVE_BLIP: [id: number];
 	REMOVE_911: [callId: number];
 	GET_CALLS: [data: CADGetCallsStruct];
+	GET_MY_CALL: [data: CADGetMyCallStruct];
 	GET_ACTIVE_UNITS: [data: CADGetActiveUnitsStruct];
 	KICK_UNIT: [
 		apiId: string | undefined,
@@ -1005,10 +1044,14 @@ export interface RESTTypedAPIDataStructs {
 		serverId: number,
 		callId: number,
 		units: string[]
+	] | [
+		data: CADAttachUnitsStruct
 	];
 	DETACH_UNIT: [
 		serverId: number,
 		units: string[]
+	] | [
+		data: CADDetachUnitsStruct
 	];
 	SET_CALL_POSTAL: [
 		serverId: number,
@@ -1025,6 +1068,8 @@ export interface RESTTypedAPIDataStructs {
 		serverId: number,
 		callId: number,
 		note: string
+	] | [
+		data: CADAddCallNoteStruct
 	];
 	CLOSE_CALL: [
 		serverId: number,
@@ -1297,6 +1342,11 @@ export type PossibleRequestData =
 		apiId: string;
 		isPanic: boolean;
 	} |
+	{
+		apiId?: string;
+		account?: string;
+		isPanic: boolean;
+	} |
 	{
 		apiId?: string;
 		account?: string;
@@ -1309,11 +1359,16 @@ export type PossibleRequestData =
 	{
 		serverId: number;
 		callId: number;
-		units: string[];
+		units?: string[];
+		account?: string;
 	} |
 	{
 		serverId: number;
-		units: string[];
+		units?: string[];
+		account?: string;
+	} |
+	{
+		account: string;
 	} |
 	{
 		serverId: number;
@@ -1330,6 +1385,7 @@ export type PossibleRequestData =
 		serverId: number;
 		callId: number;
 		note: string;
+		label?: string;
 	} |
 	{
 		serverId: number;

package/src/managers/CADManager.ts

@@ -16,11 +16,16 @@ import type {
   CADAddBlipStruct,
   CADModifyBlipStruct,
   CADGetCallsStruct,
+  CADGetMyCallStruct,
+  CADAddCallNoteStruct,
   CADGetActiveUnitsStruct,
   CADNewDispatchStruct,
+  CADAttachUnitsStruct,
+  CADDetachUnitsStruct,
   CADStreetSignStruct,
   CADUnitLocationStruct,
-  CADUnitStatusStruct
+  CADUnitStatusStruct,
+  CADUnitPanicStruct
 } from '../libs/rest/src';
 import { BaseManager } from './BaseManager';
 import * as globalTypes from '../constants';
@@ -400,8 +405,23 @@ export class CADManager extends BaseManager {
   /**
    * Toggles panic state for a unit.
    */
-  public async setUnitPanic(apiId: string | undefined, isPanic: boolean): Promise<globalTypes.CADStandardResponse> {
-    return this.executeCadRequest('UNIT_PANIC', apiId, isPanic);
+  public async setUnitPanic(apiId: string | undefined, isPanic: boolean): Promise<globalTypes.CADStandardResponse>;
+  public async setUnitPanic(params: CADUnitPanicStruct): Promise<globalTypes.CADStandardResponse>;
+  public async setUnitPanic(apiIdOrParams: string | CADUnitPanicStruct | undefined, isPanic?: boolean): Promise<globalTypes.CADStandardResponse> {
+    let payload: CADUnitPanicStruct;
+    if (apiIdOrParams && typeof apiIdOrParams === 'object') {
+      payload = { ...apiIdOrParams };
+    } else {
+      payload = { apiId: apiIdOrParams as string | undefined, isPanic: isPanic as boolean };
+    }
+    const { apiId, account, isPanic: resolvedPanic } = payload;
+    if (resolvedPanic === undefined) {
+      throw new Error('isPanic is required when setting unit panic.');
+    }
+    if (!apiId && !account) {
+      throw new Error('Either apiId or account is required when setting unit panic.');
+    }
+    return this.executeCadRequest('UNIT_PANIC', { apiId, account, isPanic: resolvedPanic });
   }
 
   /**
@@ -508,6 +528,16 @@ export class CADManager extends BaseManager {
     return this.executeCadRequest('GET_CALLS', options);
   }
 
+  /**
+   * Retrieves the current call associated with the given account UUID.
+   */
+  public async getMyCall(options: CADGetMyCallStruct): Promise<globalTypes.CADStandardResponse> {
+    if (!options?.account) {
+      throw new Error('account is required when fetching current call.');
+    }
+    return this.executeCadRequest('GET_MY_CALL', options);
+  }
+
   /**
    * Retrieves active units for the provided filters.
    */
@@ -538,27 +568,73 @@ export class CADManager extends BaseManager {
   /**
    * Attaches units to an existing dispatch call.
    */
-  public async attachUnits(serverId: number, callId: number, units: string[]): Promise<globalTypes.CADStandardResponse> {
-    if (!Number.isInteger(serverId) || !Number.isInteger(callId)) {
+  public async attachUnits(serverId: number, callId: number, unitsOrAccount: string[] | string): Promise<globalTypes.CADStandardResponse>;
+  public async attachUnits(params: CADAttachUnitsStruct): Promise<globalTypes.CADStandardResponse>;
+  public async attachUnits(
+    serverIdOrParams: number | CADAttachUnitsStruct,
+    callId?: number,
+    unitsOrAccount?: string[] | string
+  ): Promise<globalTypes.CADStandardResponse> {
+    let payload: CADAttachUnitsStruct;
+    if (serverIdOrParams && typeof serverIdOrParams === 'object') {
+      payload = { ...serverIdOrParams };
+    } else {
+      payload = {
+        serverId: serverIdOrParams as number,
+        callId: callId as number,
+        ...(Array.isArray(unitsOrAccount)
+          ? { units: unitsOrAccount }
+          : typeof unitsOrAccount === 'string'
+            ? { account: unitsOrAccount }
+            : {})
+      };
+    }
+
+    const { serverId, callId: resolvedCallId, units, account } = payload;
+    if (!Number.isInteger(serverId) || !Number.isInteger(resolvedCallId)) {
       throw new Error('serverId and callId must be integers when attaching units.');
     }
-    if (!Array.isArray(units) || units.length === 0) {
-      throw new Error('units must include at least one entry when attaching.');
+    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, units);
+    return this.executeCadRequest('ATTACH_UNIT', { serverId, callId: resolvedCallId, units: hasUnits ? units : undefined, account: hasAccount ? account : undefined });
   }
 
   /**
    * Detaches units from dispatch calls.
    */
-  public async detachUnits(serverId: number, units: string[]): Promise<globalTypes.CADStandardResponse> {
+  public async detachUnits(serverId: number, unitsOrAccount: string[] | string): Promise<globalTypes.CADStandardResponse>;
+  public async detachUnits(params: CADDetachUnitsStruct): Promise<globalTypes.CADStandardResponse>;
+  public async detachUnits(
+    serverIdOrParams: number | CADDetachUnitsStruct,
+    unitsOrAccount?: string[] | string
+  ): Promise<globalTypes.CADStandardResponse> {
+    let payload: CADDetachUnitsStruct;
+    if (serverIdOrParams && typeof serverIdOrParams === 'object') {
+      payload = { ...serverIdOrParams };
+    } else {
+      payload = {
+        serverId: serverIdOrParams as number,
+        ...(Array.isArray(unitsOrAccount)
+          ? { units: unitsOrAccount }
+          : typeof unitsOrAccount === 'string'
+            ? { account: unitsOrAccount }
+            : {})
+      };
+    }
+
+    const { serverId, units, account } = payload;
     if (!Number.isInteger(serverId)) {
       throw new Error('serverId must be an integer when detaching units.');
     }
-    if (!Array.isArray(units) || units.length === 0) {
-      throw new Error('units must include at least one entry when detaching.');
+    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 detaching units.');
     }
-    return this.executeCadRequest('DETACH_UNIT', serverId, units);
+    return this.executeCadRequest('DETACH_UNIT', { serverId, units: hasUnits ? units : undefined, account: hasAccount ? account : undefined });
   }
 
   /**
@@ -587,14 +663,28 @@ export class CADManager extends BaseManager {
   /**
    * Adds a note to an active call.
    */
-  public async addCallNote(serverId: number, callId: number, note: string): Promise<globalTypes.CADStandardResponse> {
-    if (!Number.isInteger(serverId) || !Number.isInteger(callId)) {
+  public async addCallNote(serverId: number, callId: number, note: string, label?: string): Promise<globalTypes.CADStandardResponse>;
+  public async addCallNote(params: CADAddCallNoteStruct): Promise<globalTypes.CADStandardResponse>;
+  public async addCallNote(
+    serverIdOrParams: number | CADAddCallNoteStruct,
+    callId?: number,
+    note?: string,
+    label?: string
+  ): Promise<globalTypes.CADStandardResponse> {
+    let payload: CADAddCallNoteStruct;
+    if (serverIdOrParams && typeof serverIdOrParams === 'object') {
+      payload = { ...serverIdOrParams };
+    } else {
+      payload = { serverId: serverIdOrParams as number, callId: callId as number, note: note as string, label };
+    }
+    const { serverId, callId: resolvedCallId, note: resolvedNote, label: resolvedLabel } = payload;
+    if (!Number.isInteger(serverId) || !Number.isInteger(resolvedCallId)) {
       throw new Error('serverId and callId must be integers when adding a call note.');
     }
-    if (!note) {
+    if (!resolvedNote) {
       throw new Error('note is required when adding a call note.');
     }
-    return this.executeCadRequest('ADD_CALL_NOTE', serverId, callId, note);
+    return this.executeCadRequest('ADD_CALL_NOTE', { serverId, callId: resolvedCallId, note: resolvedNote, label: resolvedLabel });
   }
 
   /**